sw/inc/swmodule.hxx | 7 ------- sw/source/uibase/app/swdll.cxx | 7 ------- sw/source/uibase/app/swmodule.cxx | 14 -------------- 3 files changed, 28 deletions(-)
New commits: commit ca6b1677cc3d923f0c13b2253b48a0ea90485b41 Author: Xisco Fauli <[email protected]> AuthorDate: Tue Jun 3 11:59:57 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Jun 4 11:29:43 2025 +0200 sw: no need to create a dummy attr pool Since commit 7b0b5cdfeed656b279bc32cd929630d5fc25878b Author: Jens-Heiner Rechtien <[email protected]> Date: Mon Sep 18 16:15:01 2000 +0000 initial import Change-Id: I3699ee17b11fdcb58646de312ccde5c7faf94cc9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186143 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> Tested-by: Noel Grandin <[email protected]> diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index ce9cead72925..fbd29640a160 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -51,7 +51,6 @@ class SwStdFontConfig; class SwNavigationConfig; class SwTransferable; class SwToolbarConfigItem; -class SwAttrPool; namespace svtools{ class ColorConfig;} class SvtUserOptions; enum class SwCompareMode; @@ -95,7 +94,6 @@ class SAL_DLLPUBLIC_RTTI SwModule final : public SfxModule, public SfxListener, std::unique_ptr<SwTableAutoFormatTable> m_xTableAutoFormatTable; - rtl::Reference<SwAttrPool> m_pAttrPool; // Current view is held here in order to avoid one's being forced // to work via GetActiveView. @@ -235,11 +233,6 @@ public: virtual std::unique_ptr<SfxTabPage> CreateTabPage( sal_uInt16 nId, weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet ) override; SW_DLLPUBLIC virtual SfxStyleFamilies CreateStyleFamilies() override; - // Pool is created here and set at SfxShell. - void InitAttrPool(); - // Delete pool before it is too late. - void RemoveAttrPool(); - // Invalidates online spell-wrong-lists if necessary. static void CheckSpellChanges( bool bOnlineSpelling, bool bIsSpellWrongAgain, bool bIsSpellAllAgain, bool bSmartTags ); diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx index e46ce62b9454..765330c9c257 100644 --- a/sw/source/uibase/app/swdll.cxx +++ b/sw/source/uibase/app/swdll.cxx @@ -95,7 +95,6 @@ SwDLL::SwDLL() SfxObjectFactory* pWDocFact = &SwWebDocShell::Factory(); auto pUniqueModule = std::make_unique<SwModule>(pWDocFact, pDocFact, pGlobDocFact); - SwModule* pModule = pUniqueModule.get(); SfxApplication::SetModule(SfxToolsModule::Writer, std::move(pUniqueModule)); pWDocFact->SetDocumentServiceName(u"com.sun.star.text.WebDocument"_ustr); @@ -120,9 +119,6 @@ SwDLL::SwDLL() m_pFilters.reset(new sw::Filters); ::InitUI(); - pModule->InitAttrPool(); - // now SWModule can create its Pool - // register your view-factories here RegisterFactories(); @@ -150,9 +146,6 @@ SwDLL::~SwDLL() COVERITY_NOEXCEPT_FALSE m_pAutoCorrCfg->SetAutoCorrect(nullptr); // delete SwAutoCorrect before exit handlers } - // Pool has to be deleted before statics are - SwModule::get()->RemoveAttrPool(); - ::FinitUI(); m_pFilters.reset(); ::FinitCore(); diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index 4241ca1446f7..76986353f844 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -337,20 +337,6 @@ void SwDLL::RegisterControls() SwJumpToSpecificPageControl::RegisterControl(SID_JUMP_TO_SPECIFIC_PAGE, pMod); } -// Load Module (only dummy for linking of the DLL) -void SwModule::InitAttrPool() -{ - OSL_ENSURE(!m_pAttrPool, "Pool already exists!"); - m_pAttrPool = new SwAttrPool(nullptr); - SetPool(m_pAttrPool.get()); -} - -void SwModule::RemoveAttrPool() -{ - SetPool(nullptr); - m_pAttrPool.clear(); -} - SfxStyleFamilies SwModule::CreateStyleFamilies() { SfxStyleFamilies aStyleFamilies;
