diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-18 15:12:06 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-18 15:12:06 +0000 |
| commit | 43186607aaba2e8d98625af22e12ae1d82fd4ab0 (patch) | |
| tree | b477f19e5d20cb074e57e0c90bc82b1a7e03ae6e /sfx2 | |
| parent | 9d033ac69037aa8bab56acdfcb7891a4c52664ca (diff) | |
INTEGRATION: CWS fwkbugfix04 (1.50.6); FILE MERGED
2005/01/06 17:42:50 mba 1.50.6.2: RESYNC: (1.50-1.51); FILE MERGED
2004/12/06 18:00:26 mba 1.50.6.1: #i38334#: get rid of all code based on SfxConfigManager
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/objcont.cxx | 41 |
1 files changed, 7 insertions, 34 deletions
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index a66f197b47dc..75490ae9bfca 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -2,9 +2,9 @@ * * $RCSfile: objcont.cxx,v $ * - * $Revision: 1.52 $ + * $Revision: 1.53 $ * - * last change: $Author: rt $ $Date: 2005-01-11 13:30:44 $ + * last change: $Author: kz $ $Date: 2005-01-18 16:12:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -112,19 +112,16 @@ #include <svtools/saveopt.hxx> #include <svtools/useroptions.hxx> #include <unotools/localfilehelper.hxx> +#include <vcl/virdev.hxx> #include "sfxresid.hxx" -#include "stbmgr.hxx" #include "dinfdlg.hxx" #include "fltfnc.hxx" #include "docfac.hxx" -#include "cfgmgr.hxx" #include "viewsh.hxx" #include "objsh.hxx" #include "objshimp.hxx" -#include "cfgitem.hxx" #include "evntconf.hxx" -//#include "interno.hxx" #include "sfxhelp.hxx" #include "dispatch.hxx" #include "urlframe.hxx" @@ -135,10 +132,6 @@ #include "doc.hrc" #include "appdata.hxx" #include "sfxbasemodel.hxx" -#include "accmgr.hxx" -#include "mnumgr.hxx" -#include "imgmgr.hxx" -#include "tbxconf.hxx" #include "docfile.hxx" #include "objuno.hxx" #include "request.hxx" @@ -1471,6 +1464,7 @@ void SfxObjectShell::UpdateFromTemplate_Impl( ) } } +/* SfxEventConfigItem_Impl* SfxObjectShell::GetEventConfig_Impl( BOOL bForce ) { if ( bForce && !pImp->pEventConfig ) @@ -1483,7 +1477,7 @@ SfxEventConfigItem_Impl* SfxObjectShell::GetEventConfig_Impl( BOOL bForce ) } return pImp->pEventConfig; -} +} */ //REMOVE SvStorageRef SfxObjectShell::GetConfigurationStorage( SotStorage* pStor ) //REMOVE { @@ -1518,28 +1512,6 @@ SfxEventConfigItem_Impl* SfxObjectShell::GetEventConfig_Impl( BOOL bForce ) //REMOVE return xStream; //REMOVE } -SfxAcceleratorManager* SfxObjectShell::GetAccMgr_Impl() -{ - //TODO/LATER: new API after recync to docking1 cws??? -//REMOVE // already constructed ?! -//REMOVE if ( pImp->pAccMgr ) -//REMOVE return pImp->pAccMgr; -//REMOVE -//REMOVE // get the typId ( = ResourceId ) -//REMOVE const ResId* pResId = GetFactory().GetAccelId(); -//REMOVE if ( !pResId ) -//REMOVE return NULL; -//REMOVE -//REMOVE if ( GetConfigManager() && pImp->pCfgMgr->HasConfigItem( pResId->GetId() ) ) -//REMOVE { -//REMOVE // document has configuration -//REMOVE pImp->pAccMgr = new SfxAcceleratorManager( *pResId, pImp->pCfgMgr ); -//REMOVE return pImp->pAccMgr; -//REMOVE } -//REMOVE else - return GetFactory().GetAccMgr_Impl(); -} - SfxMenuBarManager* SfxObjectShell::CreateMenuBarManager_Impl( SfxViewFrame* pViewFrame ) { const ResId* pId = GetFactory().GetMenuBarId(); @@ -1596,6 +1568,7 @@ SfxObjectShellRef MakeObjectShellForOrganizer_Impl( const String& aTargetURL, BO return xDoc; } +/* SfxToolBoxConfig* SfxObjectShell::GetToolBoxConfig_Impl() { //TODO/LATER: new API after recync to docking1 cws??? @@ -1607,7 +1580,7 @@ SfxToolBoxConfig* SfxObjectShell::GetToolBoxConfig_Impl() } return pImp->pTbxConfig; -} +} */ sal_Bool SfxObjectShell::IsHelpDocument() const |