diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-11-24 20:43:02 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-24 20:43:38 +0000 |
| commit | c98c650ac4235cebc019e9c80fdc22cab6e077cd (patch) | |
| tree | 6c966ea51a0e2035b8bb92c3e14e652c4912c8cf /sfx2 | |
| parent | 8ccf559473f185bdb7640e438e131f17ddc1861c (diff) | |
SfxModule has GetResMgr so SfxShell and SfxInterface don't need GetResMgr
Change-Id: I6160f8b396ac5e5fb799ee03c5b0181fb088cb54
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/control/shell.cxx | 5 | ||||
| -rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 10 |
2 files changed, 2 insertions, 13 deletions
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 9ad1b8ada695..1365b5414a92 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -395,11 +395,6 @@ void SfxShell::ParentDeactivate { } -ResMgr* SfxShell::GetResMgr() const -{ - return GetInterface()->GetResMgr(); -} - bool SfxShell::CanExecuteSlot_Impl( const SfxSlot &rSlot ) { // Get Slot status diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 0aaf37bc4b04..aa9bac7cf633 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -714,7 +714,8 @@ void SfxCommonTemplateDialog_Impl::ReadResource() SfxViewFrame* pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame(); pCurObjShell = pViewFrame->GetObjectShell(); - ResMgr* pMgr = pCurObjShell ? pCurObjShell->GetResMgr() : NULL; + pModule = pCurObjShell ? pCurObjShell->GetModule() : NULL; + ResMgr* pMgr = pModule ? pModule->GetResMgr() : NULL; ResId aFamId( DLG_STYLE_DESIGNER, *pMgr ); aFamId.SetRT(RSC_SFX_STYLE_FAMILIES); m_pStyleFamiliesId = new ResId( aFamId.GetId(), *pMgr ); @@ -800,12 +801,8 @@ void SfxCommonTemplateDialog_Impl::ReadResource() for ( i = nStart; i <= nEnd; i++ ) pBindings->Update(i); - - pModule = pCurObjShell ? pCurObjShell->GetModule() : NULL; } - - void SfxCommonTemplateDialog_Impl::ClearResource() { ClearFamilyList(); @@ -834,7 +831,6 @@ SfxCommonTemplateDialog_Impl::impl_setDeletionWatcher( return pRet; } - void SfxCommonTemplateDialog_Impl::Initialize() { // Read global user resource @@ -855,8 +851,6 @@ void SfxCommonTemplateDialog_Impl::Initialize() aFmtLb.Show(); } - - SfxCommonTemplateDialog_Impl::~SfxCommonTemplateDialog_Impl() { OUString aEmpty; |