chart2/source/controller/chartapiwrapper/TitleWrapper.hxx | 2 cui/source/dialogs/hltpbase.cxx | 6 cui/source/factory/dlgfact.cxx | 4 cui/source/factory/dlgfact.hxx | 2 cui/source/inc/macroass.hxx | 4 cui/source/tabpages/macroass.cxx | 10 - editeng/source/editeng/impedit.hxx | 5 framework/inc/helper/wakeupthread.hxx | 3 framework/source/helper/wakeupthread.cxx | 17 -- include/linguistic/lngprophelp.hxx | 1 include/sfx2/dinfdlg.hxx | 1 include/svtools/recorditemwindow.hxx | 1 include/svx/svxdlg.hxx | 2 sc/inc/markarr.hxx | 1 sc/source/core/data/markarr.cxx | 76 ------------ sc/source/ui/drawfunc/drawsh.cxx | 8 - sd/source/ui/dlg/NavigatorChildWindow.cxx | 5 sd/source/ui/inc/navigatr.hxx | 1 sd/source/ui/inc/sdtreelb.hxx | 5 svx/source/dialog/imapwnd.cxx | 10 - sw/inc/modcfg.hxx | 4 sw/source/core/inc/drawfont.hxx | 5 sw/source/filter/ww8/ww8scan.hxx | 1 sw/source/ui/dialog/macassgn.cxx | 28 ---- sw/source/ui/misc/glossary.cxx | 8 - sw/source/uibase/inc/macassgn.hxx | 2 sw/source/uibase/inc/wrtsh.hxx | 2 sw/source/writerfilter/dmapper/DomainMapperTableManager.cxx | 8 - sw/source/writerfilter/dmapper/DomainMapperTableManager.hxx | 1 sw/source/writerfilter/dmapper/PropertyMap.hxx | 5 sw/source/writerfilter/dmapper/TablePositionHandler.hxx | 12 - vcl/inc/graphic/MemoryManaged.hxx | 2 vcl/inc/unx/gtk/gtkdata.hxx | 4 vcl/unx/gtk3/a11y/atkutil.cxx | 11 - 34 files changed, 29 insertions(+), 228 deletions(-)
New commits: commit 1683eb45c59a8609215685e31efb1bda707f6066 Author: Noel Grandin <[email protected]> AuthorDate: Thu Aug 1 10:58:40 2024 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Oct 14 14:34:31 2024 +0200 tdf#161968 UI Assign macro to shape crashes CALC regression from commit f690e8218a74a0f7792407a1d46198883d2528ff Author: Noel Grandin <[email protected]> Date: Tue Jan 23 13:24:29 2024 +0200 make event config dialog async Change-Id: Ie68aeb1171831da3b457afd945ccaaa248e652af Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171370 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins (cherry picked from commit 514d7384470434a0b0b119e369ff615e2a1499c9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172071 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 9ac9be2baf8b..854c3aa6d3d7 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -334,12 +334,12 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, weld::Button&, voi aItem.SetMacroTable( *pMacroTbl ); // create empty itemset for macro-dlg - SfxItemSetFixed<SID_ATTR_MACROITEM, SID_ATTR_MACROITEM> aItemSet( SfxGetpApp()->GetPool() ); - aItemSet.Put ( aItem ); + auto xItemSet = std::make_unique<SfxItemSetFixed<SID_ATTR_MACROITEM, SID_ATTR_MACROITEM>>( SfxGetpApp()->GetPool() ); + xItemSet->Put( aItem ); DisableClose( true ); - SfxMacroAssignDlg aDlg(mpDialog->getDialog(), mxDocumentFrame, aItemSet); + SfxMacroAssignDlg aDlg(mpDialog->getDialog(), mxDocumentFrame, std::move(xItemSet)); // add events SfxMacroTabPage *pMacroPage = aDlg.GetTabPage(); diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index e3556334e6a3..46afb253ba6b 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1206,10 +1206,10 @@ VclPtr<SfxAbstractDialog> AbstractDialogFactory_Impl::CreateCharMapDialog(weld:: } VclPtr<SfxAbstractDialog> AbstractDialogFactory_Impl::CreateEventConfigDialog(weld::Widget* pParent, - const SfxItemSet& rAttr, + std::unique_ptr<const SfxItemSet> xAttr, const Reference< XFrame >& rDocumentFrame) { - return VclPtr<CuiAbstractSingleTabController_Impl>::Create(std::make_unique<SfxMacroAssignDlg>(pParent, rDocumentFrame, rAttr)); + return VclPtr<CuiAbstractSingleTabController_Impl>::Create(std::make_unique<SfxMacroAssignDlg>(pParent, rDocumentFrame, std::move(xAttr))); } VclPtr<SfxAbstractDialog> AbstractDialogFactory_Impl::CreateSfxDialog(weld::Window* pParent, diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index ca11ec7427dc..b1c82104c7a0 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -444,7 +444,7 @@ public: const SfxItemSet& rAttr, const css::uno::Reference< css::frame::XFrame >& rFrame) override; virtual VclPtr<SfxAbstractDialog> CreateEventConfigDialog(weld::Widget* pParent, - const SfxItemSet& rAttr, + std::unique_ptr<const SfxItemSet> xAttr, const css::uno::Reference< css::frame::XFrame >& rFrame) override; virtual VclPtr<VclAbstractDialog> CreateFrameDialog(weld::Window* pParent, const css::uno::Reference< css::frame::XFrame >& rxFrame, sal_uInt32 nResId, sal_uInt16 nPageId, const OUString& rParameter) override; diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index ba3c1de11717..3142cb4068ef 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -80,11 +80,13 @@ class SfxMacroAssignDlg : public SfxSingleTabDialogController public: SfxMacroAssignDlg(weld::Widget* pParent, const css::uno::Reference< css::frame::XFrame >& rxDocumentFrame, - const SfxItemSet& rSet); + std::unique_ptr<const SfxItemSet> xSet); SfxMacroTabPage* GetTabPage() { return static_cast<SfxMacroTabPage*>(m_xSfxPage.get()); } +private: + std::unique_ptr<const SfxItemSet> mxItemSet; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 9da8e8ce83fe..c0442e7fceaa 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -387,11 +387,13 @@ std::unique_ptr<SfxTabPage> SfxMacroTabPage::Create(weld::Container* pPage, weld } SfxMacroAssignDlg::SfxMacroAssignDlg(weld::Widget* pParent, - const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet) - : SfxSingleTabDialogController(pParent, &rSet,u"cui/ui/eventassigndialog.ui"_ustr, - u"EventAssignDialog"_ustr) + const Reference< XFrame >& rxDocumentFrame, std::unique_ptr<const SfxItemSet> xSet) + : SfxSingleTabDialogController(pParent, nullptr, u"cui/ui/eventassigndialog.ui"_ustr, + u"EventAssignDialog"_ustr), + mxItemSet(std::move(xSet)) { - std::unique_ptr<SfxMacroTabPage> xPage = CreateSfxMacroTabPage(get_content_area(), this, rSet); + SetInputSet(mxItemSet.get()); + std::unique_ptr<SfxMacroTabPage> xPage = CreateSfxMacroTabPage(get_content_area(), this, *mxItemSet); xPage->SetFrame(rxDocumentFrame); SetTabPage(std::move(xPage)); GetTabPage()->LaunchFillGroup(); diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index aa73fb57e5c2..b92adec13b3d 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -418,7 +418,7 @@ public: sal_uInt32 nResId )=0; virtual VclPtr<SfxAbstractDialog> CreateCharMapDialog(weld::Window* pParent, const SfxItemSet& rAttr, const css::uno::Reference<css::frame::XFrame>& rFrame) = 0; - virtual VclPtr<SfxAbstractDialog> CreateEventConfigDialog(weld::Widget* pParent, const SfxItemSet& rAttr, + virtual VclPtr<SfxAbstractDialog> CreateEventConfigDialog(weld::Widget* pParent, std::unique_ptr<const SfxItemSet> xAttr, const css::uno::Reference< css::frame::XFrame >& rFrame) = 0; virtual VclPtr<AbstractSvxPostItDialog> CreateSvxPostItDialog(weld::Widget* pParent, const SfxItemSet& rCoreSet, bool bPrevNext = false) = 0; virtual VclPtr<VclAbstractDialog> CreateSvxScriptOrgDialog(weld::Window* pParent, const OUString& rLanguage) override = 0; diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index 53ca99000933..b24888e5c0f5 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -426,19 +426,19 @@ void ScDrawShell::ExecuteMacroAssign(SdrObject* pObj, weld::Window* pWin) } // create empty itemset for macro-dlg - SfxItemSetFixed<SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, SID_EVENTCONFIG, SID_EVENTCONFIG> aItemSet(SfxGetpApp()->GetPool() ); - aItemSet.Put ( aItem ); + auto xItemSet = std::make_unique<SfxItemSetFixed<SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, SID_EVENTCONFIG, SID_EVENTCONFIG>>( SfxGetpApp()->GetPool() ); + xItemSet->Put ( aItem ); SfxEventNamesItem aNamesItem(SID_EVENTCONFIG); aNamesItem.AddEvent( ScResId(RID_SCSTR_ONCLICK), OUString(), SvMacroItemId::OnClick ); - aItemSet.Put( aNamesItem ); + xItemSet->Put( aNamesItem ); css::uno::Reference < css::frame::XFrame > xFrame; if (GetViewShell()) xFrame = GetViewShell()->GetViewFrame().GetFrame().GetFrameInterface(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - VclPtr<SfxAbstractDialog> pMacroDlg(pFact->CreateEventConfigDialog( pWin, aItemSet, xFrame )); + VclPtr<SfxAbstractDialog> pMacroDlg(pFact->CreateEventConfigDialog( pWin, std::move(xItemSet), xFrame )); pMacroDlg->StartExecuteAsync( [this, pMacroDlg, pObj, pInfo] (sal_Int32 nResult) mutable -> void { diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 0de8de06a050..fc7b540b83a3 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -673,21 +673,21 @@ void IMapWindow::DoMacroAssign() if ( !pSdrObj ) return; - SfxItemSetFixed<SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, SID_EVENTCONFIG, SID_EVENTCONFIG> - aSet(*pIMapPool); + auto xSet = std::make_unique<SfxItemSetFixed<SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, SID_EVENTCONFIG, SID_EVENTCONFIG>> + (*pIMapPool); SfxEventNamesItem aNamesItem(SID_EVENTCONFIG); aNamesItem.AddEvent( u"MouseOver"_ustr, u""_ustr, SvMacroItemId::OnMouseOver ); aNamesItem.AddEvent( u"MouseOut"_ustr, u""_ustr, SvMacroItemId::OnMouseOut ); - aSet.Put( aNamesItem ); + xSet->Put( aNamesItem ); SvxMacroItem aMacroItem(SID_ATTR_MACROITEM); IMapObject* pIMapObj = GetIMapObj( pSdrObj ); aMacroItem.SetMacroTable( pIMapObj->GetMacroTable() ); - aSet.Put( aMacroItem ); + xSet->Put( aMacroItem ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - VclPtr<SfxAbstractDialog> pMacroDlg(pFact->CreateEventConfigDialog(GetDrawingArea(), aSet, mxDocumentFrame)); + VclPtr<SfxAbstractDialog> pMacroDlg(pFact->CreateEventConfigDialog(GetDrawingArea(), std::move(xSet), mxDocumentFrame)); pMacroDlg->StartExecuteAsync( [this, pMacroDlg, pIMapObj] (sal_Int32 nResult)->void diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 985c597efefa..85d6d52eb68b 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -633,7 +633,7 @@ IMPL_LINK(SwGlossaryDlg, MenuHdl, const OUString&, rItemIdent, void) } else if (rItemIdent == "macro") { - SfxItemSetFixed<RES_FRMMACRO, RES_FRMMACRO, SID_EVENTCONFIG, SID_EVENTCONFIG> aSet( m_pShell->GetAttrPool() ); + auto xSet = std::make_unique<SfxItemSetFixed<RES_FRMMACRO, RES_FRMMACRO, SID_EVENTCONFIG, SID_EVENTCONFIG>>( m_pShell->GetAttrPool() ); SvxMacro aStart(OUString(), OUString(), STARBASIC); SvxMacro aEnd(OUString(), OUString(), STARBASIC); @@ -645,11 +645,11 @@ IMPL_LINK(SwGlossaryDlg, MenuHdl, const OUString&, rItemIdent, void) if( aEnd.HasMacro() ) aItem.SetMacro( SvMacroItemId::SwEndInsGlossary, aEnd ); - aSet.Put( aItem ); - aSet.Put( SwMacroAssignDlg::AddEvents( MACASSGN_AUTOTEXT ) ); + xSet->Put( aItem ); + xSet->Put( SwMacroAssignDlg::AddEvents( MACASSGN_AUTOTEXT ) ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - VclPtr<SfxAbstractDialog> pMacroDlg(pFact->CreateEventConfigDialog(m_xDialog.get(), aSet, + VclPtr<SfxAbstractDialog> pMacroDlg(pFact->CreateEventConfigDialog(m_xDialog.get(), std::move(xSet), m_pShell->GetView().GetViewFrame().GetFrame().GetFrameInterface() )); if (pMacroDlg) pMacroDlg->StartExecuteAsync( commit 449d6893cbe23bd44b374908443e95419581ca4f Author: Noel Grandin <[email protected]> AuthorDate: Thu Jun 20 10:46:59 2024 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Oct 14 14:34:24 2024 +0200 loplugin:unusedmethods Change-Id: Ia216da9bd7764f2d21aaee761a02eafda88d892e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169257 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174884 diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx index aecf5f304231..91a48258174d 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx @@ -95,8 +95,6 @@ private: virtual const css::uno::Sequence< css::beans::Property >& getPropertySequence() override; virtual std::vector< std::unique_ptr<WrappedProperty> > createWrappedProperties() override; - css::uno::Reference< css::beans::XPropertySet > getFirstCharacterPropertySet(); - css::uno::Reference< css::chart2::XTitle > getTitleObject(); std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 4b6679a640b5..76d510830c8f 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -1252,11 +1252,6 @@ public: void setScalingParameters(ScalingParameters const& rScalingParameters); - void resetScalingParameters() - { - setScalingParameters(ScalingParameters()); - } - ScalingParameters getScalingParameters() { return maScalingParameters; diff --git a/framework/inc/helper/wakeupthread.hxx b/framework/inc/helper/wakeupthread.hxx index b25a933dc8c8..962f4b724fa2 100644 --- a/framework/inc/helper/wakeupthread.hxx +++ b/framework/inc/helper/wakeupthread.hxx @@ -39,9 +39,6 @@ class WakeUpThread final public: WakeUpThread(css::uno::Reference<css::util::XUpdatable> const& updatable); void stop(); - - static void joinThread(); - static void startThread(); }; } diff --git a/framework/source/helper/wakeupthread.cxx b/framework/source/helper/wakeupthread.cxx index 63d52a82da76..9a9fc37f7442 100644 --- a/framework/source/helper/wakeupthread.cxx +++ b/framework/source/helper/wakeupthread.cxx @@ -88,13 +88,6 @@ public: } } - static void startThread() - { - std::unique_lock g(getMutex()); - if (!updatables.empty() && !wakeupThread) - wakeupThread = new SharedWakeUpThread(); - } - void stopWithLock(std::unique_lock<std::mutex>& g) { terminate = true; @@ -142,12 +135,6 @@ public: if (updatables.empty()) disposeThreadWithLock(g); } - - static void joinThread() - { - std::unique_lock g(getMutex()); - disposeThreadWithLock(g); - } }; rtl::Reference<SharedWakeUpThread> SharedWakeUpThread::wakeupThread; @@ -156,8 +143,6 @@ std::vector<css::uno::WeakReference<css::util::XUpdatable>> SharedWakeUpThread:: namespace framework { -/* static */ void WakeUpThread::startThread() { SharedWakeUpThread::startThread(); } - WakeUpThread::WakeUpThread(css::uno::Reference<css::util::XUpdatable> const& up) : _updatable(up) { @@ -167,8 +152,6 @@ WakeUpThread::WakeUpThread(css::uno::Reference<css::util::XUpdatable> const& up) void WakeUpThread::stop() { SharedWakeUpThread::remove(_updatable); } -/* static */ void WakeUpThread::joinThread() { SharedWakeUpThread::joinThread(); } - } // namespace framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/linguistic/lngprophelp.hxx b/include/linguistic/lngprophelp.hxx index b0ee8467ada7..19bef926c243 100644 --- a/include/linguistic/lngprophelp.hxx +++ b/include/linguistic/lngprophelp.hxx @@ -276,7 +276,6 @@ public: sal_Int16 GetMinTrailing() const { return nResHyphMinTrailing; } sal_Int16 GetCompoundMinLeading() const { return nResHyphCompoundMinLeading; } sal_Int16 GetMinWordLength() const { return nResHyphMinWordLength; } - sal_Int16 GetTextHyphenZone() const { return nResHyphTextHyphenZone; } bool IsNoHyphenateCaps() const { return bResNoHyphenateCaps; } }; diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index c602a940c6f2..b541c67c8336 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -150,7 +150,6 @@ public: const OUString& getTitle() const { return m_Title; } void setTitle(const OUString& i_val) { m_Title = i_val; } sal_Int64 getFileSize() const { return m_nFileSize; } - void setFileSize(sal_Int64 i_val) { m_nFileSize = i_val; } /// reset user-specific data (author, modified-by, ...) void resetUserData(const OUString & i_rAuthor); diff --git a/include/svtools/recorditemwindow.hxx b/include/svtools/recorditemwindow.hxx index 68d642ce4b7f..580ac1789171 100644 --- a/include/svtools/recorditemwindow.hxx +++ b/include/svtools/recorditemwindow.hxx @@ -19,7 +19,6 @@ public: virtual ~RecordItemWindowBase(); void set_text(const OUString& rText) { m_xWidget->set_text(rText); } - void set_font(const vcl::Font& rFont) { m_xWidget->set_font(rFont); } void set_help_id(const OUString& rHelpId) { m_xWidget->set_help_id(rHelpId); } protected: diff --git a/sc/inc/markarr.hxx b/sc/inc/markarr.hxx index c0542a9aafd8..45fcba6e28b8 100644 --- a/sc/inc/markarr.hxx +++ b/sc/inc/markarr.hxx @@ -72,7 +72,6 @@ public: SCROW GetMarkEnd( SCROW nRow, bool bUp ) const; void Shift( SCROW nStartRow, tools::Long nOffset ); - void Intersect( const ScMarkArray& rOther ); }; class SC_DLLPUBLIC ScMarkArrayIter // iterate over selected range diff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxx index 9b93c32f2d42..41bd0a98016f 100644 --- a/sc/source/core/data/markarr.cxx +++ b/sc/source/core/data/markarr.cxx @@ -348,82 +348,6 @@ void ScMarkArray::Shift(SCROW nStartRow, tools::Long nOffset) } } -void ScMarkArray::Intersect(const ScMarkArray& rOther) -{ - size_t i = 0; - size_t j = 0; - - std::vector<ScMarkEntry> aEntryArray; - aEntryArray.reserve(std::max(mvData.size(), rOther.mvData.size())); - - while (i < mvData.size() && j < rOther.mvData.size()) - { - const auto& rEntry = mvData[i]; - const auto& rOtherEntry = rOther.mvData[j]; - - if (rEntry.bMarked != rOtherEntry.bMarked) - { - if (!rOtherEntry.bMarked) - { - aEntryArray.push_back(rOther.mvData[j++]); - while (i < mvData.size() && mvData[i].nRow <= rOtherEntry.nRow) - ++i; - } - else // rEntry not marked - { - aEntryArray.push_back(mvData[i++]); - while (j < rOther.mvData.size() && rOther.mvData[j].nRow <= rEntry.nRow) - ++j; - } - } - else // rEntry.bMarked == rOtherEntry.bMarked - { - if (rEntry.bMarked) // both marked - { - if (rEntry.nRow <= rOtherEntry.nRow) - { - aEntryArray.push_back(mvData[i++]); // upper row - if (rEntry.nRow == rOtherEntry.nRow) - ++j; - } - else - { - aEntryArray.push_back(rOther.mvData[j++]); // upper row - } - } - else // both not marked - { - if (rEntry.nRow <= rOtherEntry.nRow) - { - aEntryArray.push_back(rOther.mvData[j++]); // lower row - while (i < mvData.size() && mvData[i].nRow <= rOtherEntry.nRow) - ++i; - } - else - { - aEntryArray.push_back(mvData[i++]); // lower row - while (j < rOther.mvData.size() && rOther.mvData[j].nRow <= rEntry.nRow) - ++j; - } - } - } - } - - assert((i == mvData.size() || j == rOther.mvData.size()) && "Unexpected case."); - - if (i == mvData.size()) - { - aEntryArray.insert(aEntryArray.end(), rOther.mvData.begin() + j, rOther.mvData.end()); - } - else // j == rOther.nCount - { - aEntryArray.insert(aEntryArray.end(), mvData.begin() + i, mvData.end()); - } - - mvData = std::move(aEntryArray); -} - - // -------------- Iterator ---------------------------------------------- ScMarkArrayIter::ScMarkArrayIter( const ScMarkArray* pNewArray ) : diff --git a/sd/source/ui/dlg/NavigatorChildWindow.cxx b/sd/source/ui/dlg/NavigatorChildWindow.cxx index a9746b607601..42d07e80fef9 100644 --- a/sd/source/ui/dlg/NavigatorChildWindow.cxx +++ b/sd/source/ui/dlg/NavigatorChildWindow.cxx @@ -70,11 +70,6 @@ void SdNavigatorFloat::InitTreeLB(const SdDrawDocument* pDoc) m_xNavWin->InitTreeLB(pDoc); } -void SdNavigatorFloat::FreshTree(const SdDrawDocument* pDoc) -{ - m_xNavWin->FreshTree(pDoc); -} - void SdNavigatorFloat::dispose() { m_xNavWin.reset(); diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index 4f84244bc96a..e3d963121904 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -92,7 +92,6 @@ public: SdNavigatorFloat(SfxBindings* _pBindings, SfxChildWindow* pMgr, vcl::Window* pParent, SfxChildWinInfo* pInfo); void InitTreeLB(const SdDrawDocument* pDoc); - void FreshTree(const SdDrawDocument* pDoc); virtual void Activate() override; virtual void dispose() override; virtual ~SdNavigatorFloat() override; diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 1ea80f011426..1b8f3683179e 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -175,11 +175,6 @@ public: bool IsEditingActive() const {return m_bEditing;} - void set_sensitive(bool bSensitive) - { - m_xTreeView->set_sensitive(bSensitive); - } - void hide() { m_xTreeView->hide(); diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index abfea9159e29..1c7e5cac0a78 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -382,12 +382,8 @@ public: m_aCompareConfig.SetModified(); } bool IsIgnorePieces() const { return m_aCompareConfig.m_bIgnorePieces; } - void SetIgnorePieces( bool b ) { m_aCompareConfig.m_bIgnorePieces = b; - m_aCompareConfig.SetModified(); } sal_uInt16 GetPieceLen() const { return m_aCompareConfig.m_nPieceLen; } - void SetPieceLen( sal_uInt16 nLen ) { m_aCompareConfig.m_nPieceLen = nLen; - m_aCompareConfig.SetModified(); } bool IsStoreRsid() const { diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx index c262cb931581..0251888959ff 100644 --- a/sw/source/core/inc/drawfont.hxx +++ b/sw/source/core/inc/drawfont.hxx @@ -435,11 +435,6 @@ public: m_nLen = nNewLen; } - void SetLayoutContext(std::optional<SwLinePortionLayoutContext> nNew) - { - m_nLayoutContext = nNew; - } - void SetWrong(sw::WrongListIterator *const pNew) { m_pWrong = pNew; diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 320d3e3cb10e..b82cd1adb777 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -1080,7 +1080,6 @@ public: ~WW8ScannerBase(); bool AreThereFootnotes() const { return m_pFootnotePLCF->Count() > 0; }; bool AreThereEndnotes() const { return m_pEdnPLCF->Count() > 0; }; - tools::Long GetEndnoteCount() const { return m_pEdnPLCF->Count(); }; //If you use WW8Fc2Cp you are almost certainly doing the wrong thing //when it comes to fastsaved files, avoid like the plague. For export diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx index fe059dc04993..8eadf107eda5 100644 --- a/sw/source/ui/dialog/macassgn.cxx +++ b/sw/source/ui/dialog/macassgn.cxx @@ -100,32 +100,4 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType ) return aItem; } -void SwMacroAssignDlg::INetFormatDlg(weld::Window* pParent, SwWrtShell& rSh, const SvxMacroItem& rItem, - const std::function<void(const SvxMacroItem&)>& onItemSelectedFunc ) -{ - SfxItemSetFixed<RES_FRMMACRO, RES_FRMMACRO, SID_EVENTCONFIG, SID_EVENTCONFIG> aSet( rSh.GetAttrPool() ); - aSet.Put( rItem ); - aSet.Put( AddEvents( MACASSGN_INETFMT ) ); - - SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - VclPtr<SfxAbstractDialog> pMacroDlg( pFact->CreateEventConfigDialog(pParent, aSet, - rSh.GetView().GetViewFrame().GetFrame().GetFrameInterface() ) ); - if ( !pMacroDlg ) - return; - pMacroDlg->StartExecuteAsync( - [pMacroDlg, onItemSelectedFunc] (sal_Int32 nResult)->void - { - if (nResult == RET_OK) - { - const SfxItemSet* pOutSet = pMacroDlg->GetOutputItemSet(); - if( const SvxMacroItem* pItem = pOutSet->GetItemIfSet( RES_FRMMACRO, false )) - { - onItemSelectedFunc(*pItem); - } - } - pMacroDlg->disposeOnce(); - } - ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/macassgn.hxx b/sw/source/uibase/inc/macassgn.hxx index 29da5e6eb7a8..4e26c39fa92b 100644 --- a/sw/source/uibase/inc/macassgn.hxx +++ b/sw/source/uibase/inc/macassgn.hxx @@ -40,8 +40,6 @@ class SwMacroAssignDlg { public: static SfxEventNamesItem AddEvents(DlgEventType eType); - static void INetFormatDlg(weld::Window* pParent, SwWrtShell& rSh, const SvxMacroItem& rItem, - const std::function<void(const SvxMacroItem&)>& onItemSelectedFunc); }; #endif diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index 66f2ad2f730f..06f833040948 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -239,8 +239,6 @@ typedef bool (SwWrtShell::*FNSimpleMove)(); { SimpleMove( &SwWrtShell::BwdPara_, false/*bSelect*/ ); } void FwdSentence( bool bSelect = false ) { SimpleMove( &SwWrtShell::FwdSentence_, bSelect ); } - void EndSentence( bool bSelect = false ) - { SimpleMove( &SwWrtShell::EndSentence_, bSelect ); } void BwdSentence( bool bSelect = false ) { SimpleMove( &SwWrtShell::BwdSentence_, bSelect ); } diff --git a/sw/source/writerfilter/dmapper/DomainMapperTableManager.cxx b/sw/source/writerfilter/dmapper/DomainMapperTableManager.cxx index 1d4fd5f31b5b..81d470076d80 100644 --- a/sw/source/writerfilter/dmapper/DomainMapperTableManager.cxx +++ b/sw/source/writerfilter/dmapper/DomainMapperTableManager.cxx @@ -413,14 +413,6 @@ uno::Sequence<beans::PropertyValue> DomainMapperTableManager::getCurrentTablePos return uno::Sequence< beans::PropertyValue >(); } -TablePositionHandler* DomainMapperTableManager::getCurrentTableRealPosition() -{ - if ( !m_aTablePositions.empty( ) && m_aTablePositions.back() ) - return m_aTablePositions.back().get(); - else - return nullptr; -} - const TableParagraphVectorPtr & DomainMapperTableManager::getCurrentParagraphs( ) { return m_aParagraphsToEndTable.top( ); diff --git a/sw/source/writerfilter/dmapper/DomainMapperTableManager.hxx b/sw/source/writerfilter/dmapper/DomainMapperTableManager.hxx index 6b5cee85743f..9174b88ed92c 100644 --- a/sw/source/writerfilter/dmapper/DomainMapperTableManager.hxx +++ b/sw/source/writerfilter/dmapper/DomainMapperTableManager.hxx @@ -95,7 +95,6 @@ public: /// Turn the attributes collected so far in m_aTableLook into a property and clear the container. void finishTableLook(); css::uno::Sequence<css::beans::PropertyValue> getCurrentTablePosition(); - TablePositionHandler* getCurrentTableRealPosition(); virtual void cellProps(const TablePropertyMapPtr& pProps) override { diff --git a/sw/source/writerfilter/dmapper/PropertyMap.hxx b/sw/source/writerfilter/dmapper/PropertyMap.hxx index a232604ccbff..565b42c020e4 100644 --- a/sw/source/writerfilter/dmapper/PropertyMap.hxx +++ b/sw/source/writerfilter/dmapper/PropertyMap.hxx @@ -364,9 +364,6 @@ public: return m_sPageStyleName; } - bool getFirstPageHeader() { return m_bFirstPageHeaderLinkToPrevious; } - bool getFirstPageFooter() { return m_bFirstPageFooterLinkToPrevious; } - // @throws css::beans::UnknownPropertyException // @throws css::beans::PropertyVetoException // @throws css::lang::IllegalArgumentException @@ -391,8 +388,6 @@ public: void SetPageNumber( sal_Int32 nSet ) { m_nPageNumber = nSet; } void SetPageNumberType( sal_Int32 nSet ) { m_nPageNumberType = nSet; } void SetBreakType( sal_Int32 nSet ) { m_nBreakType = nSet; } - // GetBreakType returns -1 if the breakType has not yet been identified for the section - sal_Int32 GetBreakType() const { return m_nBreakType; } void SetLeftMargin( sal_Int32 nSet ) { m_nLeftMargin = nSet; } sal_Int32 GetLeftMargin() const { return m_nLeftMargin; } diff --git a/sw/source/writerfilter/dmapper/TablePositionHandler.hxx b/sw/source/writerfilter/dmapper/TablePositionHandler.hxx index 353c34d169f8..8ef0f87495f0 100644 --- a/sw/source/writerfilter/dmapper/TablePositionHandler.hxx +++ b/sw/source/writerfilter/dmapper/TablePositionHandler.hxx @@ -37,18 +37,6 @@ class TablePositionHandler : public LoggedProperties void lcl_sprm(Sprm& sprm) override; public: - sal_Int32 getY() const { return m_nY; } - sal_Int32 getX() const { return m_nX; } - sal_Int32 getLeftFromText() const { return m_nLeftFromText; } - sal_Int32 getRightFromText() const { return m_nRightFromText; } - sal_Int32 getTopFromText() const { return m_nTopFromText; } - sal_Int32 getBottomFromText() const { return m_nBottomFromText; } - - const OUString& getVertAnchor() const { return m_aVertAnchor; } - const OUString& getYSpec() const { return m_aYSpec; } - const OUString& getHorzAnchor() const { return m_aHorzAnchor; } - const OUString& getXSpec() const { return m_aXSpec; } - void setTableOverlap(Id nTableOverlap) { m_nTableOverlap = nTableOverlap; } TablePositionHandler(); diff --git a/vcl/inc/graphic/MemoryManaged.hxx b/vcl/inc/graphic/MemoryManaged.hxx index d88e87979ba9..530ebdb674f3 100644 --- a/vcl/inc/graphic/MemoryManaged.hxx +++ b/vcl/inc/graphic/MemoryManaged.hxx @@ -66,8 +66,6 @@ protected: } } - bool isRegistered() const { return mbIsRegistered; } - void changeExisting(sal_Int64 nNewSize) { if (mbIsRegistered) diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx index 704490e821d4..76fff77dc236 100644 --- a/vcl/inc/unx/gtk/gtkdata.hxx +++ b/vcl/inc/unx/gtk/gtkdata.hxx @@ -283,14 +283,10 @@ class GtkSalData final : public GenericUnixSalData osl::Condition m_aDispatchCondition; std::exception_ptr m_aException; - unotools::WeakReference<DocumentFocusListener> m_xDocumentFocusListener; - public: GtkSalData(); virtual ~GtkSalData() override; - rtl::Reference<DocumentFocusListener> GetDocumentFocusListener(); - void Init(); virtual void Dispose() override; diff --git a/vcl/unx/gtk3/a11y/atkutil.cxx b/vcl/unx/gtk3/a11y/atkutil.cxx index 971cad08fc9c..0babcefba93b 100644 --- a/vcl/unx/gtk3/a11y/atkutil.cxx +++ b/vcl/unx/gtk3/a11y/atkutil.cxx @@ -270,15 +270,4 @@ void DocumentFocusListener::detachRecursive( } } -rtl::Reference<DocumentFocusListener> GtkSalData::GetDocumentFocusListener() -{ - rtl::Reference<DocumentFocusListener> xDFL = m_xDocumentFocusListener.get(); - if (!xDFL) - { - xDFL = new DocumentFocusListener; - m_xDocumentFocusListener = xDFL.get(); - } - return xDFL; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
