[Libreoffice-commits] .: sfx2/source

[Michael Meeks]

 sfx2/source/appl/app.cxx     |    1 -
 sfx2/source/appl/appdata.cxx |   14 --------------
 sfx2/source/inc/appdata.hxx  |    1 -
 3 files changed, 16 deletions(-)

New commits:
commit b2210abf71534a1f2ab75c83c688d6ad56039aa0
Author: Christian Dywan <christian.dywan at lanedo.com>
Date:   Wed Apr 27 12:56:40 2011 +0200

    Remove UpdateApplicationSettings function
    
    The function did nothing else than set STYLE_OPTION_HIDEDISABLED.
    
    It was also extremely misleading when reading the code.

diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 4f7a7bd..4d4e9c6 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -330,7 +330,6 @@ SfxApplication::SfxApplication()
     SvtViewOptions::AcquireOptions();
 
     pAppData_Impl = new SfxAppData_Impl( this );
-    pAppData_Impl->UpdateApplicationSettings( SvtMenuOptions().IsEntryHidingEnabled() );
     pAppData_Impl->m_xImeStatusWindow->init();
     pApp->PreInit();
 
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 0eb99fa..327af69 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -149,20 +149,6 @@ SfxAppData_Impl::~SfxAppData_Impl()
     delete pBasMgrListener;
 }
 
-void SfxAppData_Impl::UpdateApplicationSettings( sal_Bool bDontHide )
-{
-    AllSettings aAllSet = Application::GetSettings();
-    StyleSettings aStyleSet = aAllSet.GetStyleSettings();
-    sal_uInt32 nStyleOptions = aStyleSet.GetOptions();
-    if ( bDontHide )
-        nStyleOptions &= ~STYLE_OPTION_HIDEDISABLED;
-    else
-        nStyleOptions |= STYLE_OPTION_HIDEDISABLED;
-    aStyleSet.SetOptions( nStyleOptions );
-    aAllSet.SetStyleSettings( aStyleSet );
-    Application::SetSettings( aAllSet );
-}
-
 SfxDocumentTemplates* SfxAppData_Impl::GetDocumentTemplates()
 {
     if ( !pTemplates )
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index 8df9b89..1b6f286 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -164,7 +164,6 @@ public:
                                 SfxAppData_Impl( SfxApplication* );
                                 ~SfxAppData_Impl();
 
-    void                        UpdateApplicationSettings( sal_Bool bDontHide );
     SfxDocumentTemplates*       GetDocumentTemplates();
     void                        DeInitDDE();