diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-04-26 09:09:25 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-04-26 09:09:25 +0000 |
| commit | f0521aa0ca200b230547f4f615422088a4d95c3b (patch) | |
| tree | aae091fe50a4ac6c4656eb9e7d4e7327e84b389e /sfx2/source | |
| parent | 93459efc123d8d0a98ceb06375a5a6c67557b587 (diff) | |
INTEGRATION: CWS residcleanup (1.16.140); FILE MERGED
2007/02/20 16:12:51 pl 1.16.140.1: #i74635# get rid of global ResMgr
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/control/objface.cxx | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index 6b2a2bbb58c0..7f063a6f3c28 100644 --- a/sfx2/source/control/objface.cxx +++ b/sfx2/source/control/objface.cxx @@ -4,9 +4,9 @@ * * $RCSfile: objface.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: rt $ $Date: 2007-04-25 15:02:50 $ + * last change: $Author: rt $ $Date: 2007-04-26 10:09:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -92,7 +92,7 @@ struct SfxObjectUI_Impl SfxObjectUI_Impl(USHORT n, const ResId& rResId, BOOL bVis, sal_uInt32 nFeat) : nPos(n), - aResId(rResId.GetId(), rResId.GetResMgr()), + aResId(rResId.GetId(), *rResId.GetResMgr()), bVisible(bVis), bContext(FALSE), pName(0), @@ -119,8 +119,8 @@ struct SfxInterface_Impl BOOL bRegistered; SfxInterface_Impl() : - aPopupRes((USHORT)0), - aStatBarRes((USHORT)0) + aPopupRes(0,*SfxApplication::GetOrCreate()->GetSfxResManager()), + aStatBarRes(0,*SfxApplication::GetOrCreate()->GetSfxResManager()) , bRegistered(FALSE) { pObjectBars = new SfxObjectUIArr_Impl; @@ -155,10 +155,9 @@ SfxInterface::SfxInterface( const char *pClassName, pName(pClassName), pGenoType(pParent), nClassId(nId), - aNameResId(rNameResId.GetId()), + aNameResId(rNameResId.GetId(),*rNameResId.GetResMgr()), pImpData(0) { - aNameResId.SetResMgr(rNameResId.GetResMgr()); pImpData = new SfxInterface_Impl; SetSlotMap( rSlotMap, nSlotCount ); } @@ -451,7 +450,9 @@ SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, sal_ ResId aResId(rResId); aResId.SetRT(RSC_STRING); aResId.SetResMgr(rResId.GetResMgr()); - if ( !Resource::GetResManager()->IsAvailable(aResId) ) + if( ! aResId.GetResMgr() ) + aResId.SetResMgr( SfxApplication::GetOrCreate()->GetOffResManager_Impl() ); + if ( !aResId.GetResMgr()->IsAvailable(aResId) ) pUI->pName = new String (DEFINE_CONST_UNICODE("NoName")); else pUI->pName = new String(aResId); @@ -526,7 +527,7 @@ void SfxInterface::RegisterChildWindow(USHORT nId, BOOL bContext, const String* void SfxInterface::RegisterChildWindow(USHORT nId, BOOL bContext, sal_uInt32 nFeature, const String*) { - SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(0, nId, TRUE, nFeature); + SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(0, ResId(nId, *SfxApplication::GetOrCreate()->GetOffResManager_Impl()), TRUE, nFeature); pUI->bContext = bContext; pImpData->pChildWindows->Append(pUI); } |