[Libreoffice-commits] core.git: sfx2/source

[Thomas Arnhold]

 sfx2/source/appl/app.hrc     |    1 -
 sfx2/source/appl/app.src     |    5 -----
 sfx2/source/appl/appdata.cxx |    1 -
 sfx2/source/inc/appdata.hxx  |    1 -
 4 files changed, 8 deletions(-)

New commits:
commit e72072029ad22fdde8310e22667fd8f2f46db28e
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Tue Apr 2 22:31:21 2013 +0200

    some fallout of slots.cfg removal
    
    follow-up of a2bf98857b675b2d10a4fd93a0413229abebf3f1
    
    Change-Id: I450ae523ad3dd7642caab2de03cd3926bf1c1820

diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index 6197d7a..899324f 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -38,7 +38,6 @@
 #define RID_STR_HELP                            (RID_SFX_APP_START+79)
 #define RID_STR_NOAUTOSTARTHELPAGENT            (RID_SFX_APP_START+80)
 #define RID_HELPBAR                             (RID_SFX_APP_START+81)
-#define RID_SPECIALCONFIG_ERROR                 (RID_SFX_APP_START+82)
 
 #define CONFIG_PATH_START               (RID_SFX_APP_START+98)
 
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index eff4970..c05081e 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -331,11 +331,6 @@ String RID_ENVTOOLBOX
     Text [ en-US ] = "Function Bar" ;
 };
 
-String RID_SPECIALCONFIG_ERROR
-{
-    Text [ en-US ] = "An error has occurred in the special configuration.\nPlease contact your administrator." ;
-};
-
 String STR_QUICKSTART_EXIT
 {
     Text [ en-US ] = "Exit Quickstarter" ;
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index e31065d..2988d8b 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -93,7 +93,6 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* )
     , pAppDispatch(NULL)
     , pTemplates( 0 )
     , pPool(0)
-    , pDisabledSlotList( 0 )
     , pSaveOptions( 0 )
     , pHelpOptions( 0 )
     , pProgress(0)
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index 6b711fa..786528a 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -102,7 +102,6 @@ public:
 
     // global pointers
     SfxItemPool*                        pPool;
-    std::vector<sal_uInt16>*            pDisabledSlotList;
     SvtSaveOptions*                     pSaveOptions;
     SvtHelpOptions*                     pHelpOptions;