mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

split the creation of SfxStyleFamilies into a method

Browse Source 
Change-Id: I2590180fc30d75c89e758c72246a8294b5c4b9a2
This commit is contained in:
Caolán McNamara
2016-10-25 14:11:44 +01:00
parent a6ff21250b
commit 45a646f2fa
4 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/sfx2/module.hxx
View File

@@ -37,6 +37,7 @@ class SfxObjectFactory;
class SfxModule; class SfxModule;
class SfxModule_Impl; class SfxModule_Impl;
class SfxSlotPool; class SfxSlotPool;
class SfxStyleFamilies;
struct SfxChildWinContextFactory; struct SfxChildWinContextFactory;
struct SfxChildWinFactory; struct SfxChildWinFactory;
struct SfxStbCtrlFactory; struct SfxStbCtrlFactory;
@@ -84,6 +85,8 @@ public:
const SfxItemSet& rSet ); const SfxItemSet& rSet );
virtual void Invalidate(sal_uInt16 nId = 0) override; virtual void Invalidate(sal_uInt16 nId = 0) override;
SfxStyleFamilies* CreateStyleFamilies();
static SfxModule* GetActiveModule( SfxViewFrame* pFrame=nullptr ); static SfxModule* GetActiveModule( SfxViewFrame* pFrame=nullptr );
static FieldUnit GetCurrentFieldUnit(); static FieldUnit GetCurrentFieldUnit();
/** retrieves the field unit of the module belonging to the document displayed in the given frame /** retrieves the field unit of the module belonging to the document displayed in the given frame

15
sfx2/source/appl/module.cxx
View File

@@ -23,6 +23,7 @@
#include <sfx2/module.hxx> #include <sfx2/module.hxx>
#include <sfx2/app.hxx> #include <sfx2/app.hxx>
#include <sfx2/sfxresid.hxx> #include <sfx2/sfxresid.hxx>
#include <sfx2/styfitem.hxx>
#include <sfx2/msgpool.hxx> #include <sfx2/msgpool.hxx>
#include <sfx2/tbxctrl.hxx> #include <sfx2/tbxctrl.hxx>
#include <sfx2/stbitem.hxx> #include <sfx2/stbitem.hxx>
@@ -291,4 +292,18 @@ FieldUnit SfxModule::GetFieldUnit() const
return eUnit; return eUnit;
} }
SfxStyleFamilies* SfxModule::CreateStyleFamilies()
{
SfxStyleFamilies *pStyleFamilies = nullptr;
ResMgr* pMgr = GetResMgr();
if (pMgr)
{
ResId aFamId(DLG_STYLE_DESIGNER, *pMgr);
aFamId.SetRT(RSC_SFX_STYLE_FAMILIES);
if (pMgr->IsAvailable(aFamId))
pStyleFamilies = new SfxStyleFamilies(aFamId);
}
return pStyleFamilies;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
sfx2/source/dialog/mgetempl.cxx
View File

@@ -95,9 +95,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(vcl::Window* pParent, const Sfx
else else
m_pEditLinkStyleBtn->Enable(); m_pEditLinkStyleBtn->Enable();
ResMgr* pResMgr = SfxApplication::GetModule_Impl()->GetResMgr(); pFamilies = SfxApplication::GetModule_Impl()->CreateStyleFamilies();
OSL_ENSURE( pResMgr, "No ResMgr in Module" );
pFamilies = new SfxStyleFamilies( ResId( DLG_STYLE_DESIGNER, *pResMgr ) );
SfxStyleSheetBasePool* pPool = nullptr; SfxStyleSheetBasePool* pPool = nullptr;
SfxObjectShell* pDocShell = SfxObjectShell::Current(); SfxObjectShell* pDocShell = SfxObjectShell::Current();

10
sfx2/source/dialog/templdlg.cxx
View File

@@ -736,14 +736,8 @@ void SfxCommonTemplateDialog_Impl::ReadResource()
SfxViewFrame* pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame(); SfxViewFrame* pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame();
pCurObjShell = pViewFrame->GetObjectShell(); pCurObjShell = pViewFrame->GetObjectShell();
pModule = pCurObjShell ? pCurObjShell->GetModule() : nullptr; pModule = pCurObjShell ? pCurObjShell->GetModule() : nullptr;
ResMgr* pMgr = pModule ? pModule->GetResMgr() : nullptr; if (pModule)
if (pMgr) pStyleFamilies = pModule->CreateStyleFamilies();
{
ResId aFamId( DLG_STYLE_DESIGNER, *pMgr );
aFamId.SetRT(RSC_SFX_STYLE_FAMILIES);
if (pMgr->IsAvailable(aFamId))
pStyleFamilies = new SfxStyleFamilies( aFamId );
}
if (!pStyleFamilies) if (!pStyleFamilies)
pStyleFamilies = new SfxStyleFamilies; pStyleFamilies = new SfxStyleFamilies;