diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-19 10:35:00 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-19 10:35:00 +0000 |
| commit | 25d1cc2d8734f0734d6361074c1638fa71e2ef40 (patch) | |
| tree | 5b1162b2965c7921e86d681045d6812aff5dd689 /sfx2/source/doc/objcont.cxx | |
| parent | 2ed1b09794ada3004e40cd2d731d88dd5791c091 (diff) | |
INTEGRATION: CWS oooicons (1.49.2); FILE MERGED
2004/10/29 15:56:47 cd 1.49.2.1: #i35368# Removed all obsolete occurrences of SfxImageManager - added a static image list manager
Diffstat (limited to 'sfx2/source/doc/objcont.cxx')
| -rw-r--r-- | sfx2/source/doc/objcont.cxx | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index fa39fac19b70..076aab598974 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -2,9 +2,9 @@ * * $RCSfile: objcont.cxx,v $ * - * $Revision: 1.49 $ + * $Revision: 1.50 $ * - * last change: $Author: kz $ $Date: 2004-10-04 20:55:35 $ + * last change: $Author: obo $ $Date: 2004-11-19 11:35:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1558,22 +1558,6 @@ SfxAcceleratorManager* SfxObjectShell::GetAccMgr_Impl() SfxMenuBarManager* SfxObjectShell::CreateMenuBarManager_Impl( SfxViewFrame* pViewFrame ) { -/* - SfxBindings& rBindings = pViewFrame->GetBindings(); - sal_Bool bCheckPlugin = SfxApplication::IsPlugin(); - const ResId* pId = bCheckPlugin ? GetFactory().GetPluginMenuBarId() : GetFactory().GetMenuBarId(); - DBG_ASSERT( pId && pId->GetId(), "Component must have own window!" ); - if ( !pId ) - return NULL; - - SfxConfigManager *pCfgMgr = SFX_APP()->GetConfigManager_Impl(); - if ( GetConfigManager() && pImp->pCfgMgr->HasConfigItem( pId->GetId() ) ) - pCfgMgr = pImp->pCfgMgr; - - SfxMenuBarManager* pMgr = new SfxMenuBarManager( *pId, rBindings, pCfgMgr, pViewFrame->ISA( SfxInPlaceFrame ) ); - return pMgr; -*/ - const ResId* pId = GetFactory().GetMenuBarId(); if ( pId ) { @@ -1589,8 +1573,6 @@ SfxMenuBarManager* SfxObjectShell::CreateMenuBarManager_Impl( SfxViewFrame* pVie if ( xLayoutManager.is() ) { rtl::OUString aMenuBarURL( RTL_CONSTASCII_USTRINGPARAM( "private:resource/menubar/menubar" )); -// aMenuBarURL += rtl::OUString::valueOf( sal_Int32( pId->GetId() )); - xLayoutManager->createElement( aMenuBarURL ); } } @@ -1599,16 +1581,6 @@ SfxMenuBarManager* SfxObjectShell::CreateMenuBarManager_Impl( SfxViewFrame* pVie } -SfxImageManager* SfxObjectShell::GetImageManager_Impl() -{ - if ( pImp->pImageManager ) - return pImp->pImageManager; - - // every document has its own ImageManager, but they may use the global configuration! - pImp->pImageManager = new SfxImageManager( this ); - return pImp->pImageManager; -} - SfxObjectShellRef MakeObjectShellForOrganizer_Impl( const String& aTargetURL, BOOL bForWriting ) { // check for own format |