[Libreoffice-commits] .: Branch 'feature/gnumake2.1' - cui/source

[Norbert Thiebaud]

 cui/source/customize/acccfg.cxx |    3 ++-
 cui/source/customize/acccfg.src |    4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 040b77643c99af4d3fed209b2a0f864317a212f4
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Jan 12 09:11:05 2011 -0600

    deliver sfx2/sfxresid.hxx

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 20a92b0..304b5fe 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -41,6 +41,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/minfitem.hxx>
+#include <sfx2/sfxresid.hxx>
 #include <svl/stritem.hxx>
 
 #include <sal/macros.h>
@@ -763,7 +764,6 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt
     , aResetButton		      (this   , CUI_RES(BTN_RESET               ))
     , aLoadAccelConfigStr			  ( CUI_RES( STR_LOADACCELCONFIG ) )
     , aSaveAccelConfigStr			  ( CUI_RES( STR_SAVEACCELCONFIG ) )
-    , aFilterAllStr					  ( CUI_RES( STR_SFX_FILTERNAME_ALL ) )
     , aFilterCfgStr					  ( CUI_RES( STR_FILTERNAME_CFG ) )
     , m_bStylesInfoInitialized(sal_False)
     , m_xGlobal               ()
@@ -772,6 +772,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt
 {
     FreeResource();
 
+    aFilterAllStr = String( SfxResId( STR_SFX_FILTERNAME_ALL ) );
 // install handler functions
     aChangeButton.SetClickHdl( LINK( this, SfxAcceleratorConfigPage, ChangeHdl ));
     aRemoveButton.SetClickHdl( LINK( this, SfxAcceleratorConfigPage, RemoveHdl ));
diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src
index c993aca..7385437 100644
--- a/cui/source/customize/acccfg.src
+++ b/cui/source/customize/acccfg.src
@@ -192,10 +192,6 @@ TabPage RID_SVXPAGE_KEYBOARD
     {
         Text [ en-US ] = "Save Keyboard Configuration" ;
     };
-    String STR_SFX_FILTERNAME_ALL
-    {
-        Text [ en-US ] = "All files (*.*)" ;
-    };
     String STR_FILTERNAME_CFG
     {
         Text [ en-US ] = "Configuration" ;