diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-18 15:00:19 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-18 15:00:19 +0000 |
| commit | b937e0590715d76af85f34aad859fda68a414cc4 (patch) | |
| tree | 3164e924c961de10d82e3c162d32ae9084021913 /sfx2/source/appl/appcfg.cxx | |
| parent | da35ca02f9a5325887f082b21d28a2eceae6e870 (diff) | |
INTEGRATION: CWS fwkbugfix04 (1.55.6); FILE MERGED
2004/12/08 15:10:48 mba 1.55.6.2: RESYNC: (1.55-1.56); FILE MERGED
2004/12/06 17:53:00 mba 1.55.6.1: #i38334#: get rid of all code based on SfxConfigManager
Diffstat (limited to 'sfx2/source/appl/appcfg.cxx')
| -rw-r--r-- | sfx2/source/appl/appcfg.cxx | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 8bbd4652d5..ecbc465782 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appcfg.cxx,v $ * - * $Revision: 1.56 $ + * $Revision: 1.57 $ * - * last change: $Author: rt $ $Date: 2004-11-26 14:37:09 $ + * last change: $Author: kz $ $Date: 2005-01-18 16:00:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -159,6 +159,7 @@ #include <unotools/localfilehelper.hxx> #include <comphelper/processfactory.hxx> #include <rtl/ustrbuf.hxx> +#include <svtools/misccfg.hxx> #include "docfile.hxx" #include "viewfrm.hxx" @@ -170,18 +171,15 @@ #include "viewsh.hxx" #include "request.hxx" #include "evntconf.hxx" -#include "cfgmgr.hxx" #include "docinf.hxx" #include "appdata.hxx" #include "workwin.hxx" -#include <svtools/misccfg.hxx> -#include <macrconf.hxx> +#include "macrconf.hxx" #include "appimp.hxx" #include "helper.hxx" // SfxContentHelper::... #include "app.hrc" #include "sfxresid.hxx" #include "shutdownicon.hxx" -#include "imgmgr.hxx" using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; @@ -315,7 +313,7 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet ) case SID_ATTR_BUTTON_BIGSIZE : { sal_Int16 eOptSymbolSet = aMiscOptions.GetSymbolSet(); - if ( eOptSymbolSet == SFX_SYMBOLS_AUTO ) + if ( eOptSymbolSet == SFX_SYMBOLS_AUTO ) { // Use system settings, we have to retrieve the toolbar icon size from the // Application class @@ -1156,7 +1154,6 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet ) // geaenderte Daten speichern aInetOptions.flush(); - SaveConfiguration(); } //-------------------------------------------------------------------- @@ -1375,19 +1372,6 @@ SfxEventConfiguration* SfxApplication::GetEventConfig() const //-------------------------------------------------------------------- -void SfxApplication::SaveConfiguration() const -{ - // Workingset schreiben? -// if ( SvtOptions().IsSaveWorkingSet() ) -// SfxTaskManager::SaveWorkingSet(); -//(mba/task): Implementierung fehlt - - if ( !pCfgMgr->StoreConfiguration() ) - HandleConfigError_Impl( (sal_uInt16)pCfgMgr->GetErrorCode() ); - - utl::ConfigManager::GetConfigManager()->StoreConfigItems(); -} - //-------------------------------------------------------------------- void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, FASTBOOL bSynchron ) { |