CWS-TOOLING: integrate CWS gnumake2

7 files changed, 8 insertions, 11 deletions

diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index de24ee12e98a..d1e46125d965 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -55,7 +55,6 @@
 #include "boost/scoped_ptr.hpp"
 #include "boost/shared_ptr.hpp"
 #include "boost/spirit/core.hpp"
-#include "bootstrp/sstring.hxx"
 #include "com/sun/star/accessibility/AccessibleEventId.hpp"
 #include "com/sun/star/accessibility/AccessibleEventObject.hpp"
 #include "com/sun/star/accessibility/AccessibleRelationType.hpp"
@@ -754,7 +753,6 @@
 #include "svtools/apearcfg.hxx"
 #include "svl/brdcst.hxx"
 #include "unotools/cacheoptions.hxx"
-#include "svl/cancel.hxx"
 #include "svl/cjkoptions.hxx"
 #include "unotools/cmdoptions.hxx"
 #include "svl/cntwall.hxx"
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index e074c0a19ff5..25ccabf2789b 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -40,6 +40,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/minfitem.hxx>
+#include <sfx2/sfxresid.hxx>
 #include <svl/stritem.hxx>
 
 #include "cuires.hrc"
@@ -721,7 +722,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               ()
@@ -730,6 +730,8 @@ 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 b94ea163e0c7..de5d4b89f186 100644
--- a/cui/source/customize/acccfg.src
+++ b/cui/source/customize/acccfg.src
@@ -199,10 +199,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" ;
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index 9766a1b5130f..aea3e5a16ffb 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -31,7 +31,7 @@
 
 #include <svx/orienthelper.hxx>
 #include <vcl/field.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 #include <sfx2/tabdlg.hxx>
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 56aedff40de1..954866383c4b 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -46,7 +46,8 @@
 #include <com/sun/star/media/XPlayer.hpp>
 #include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
 #include <svtools/dialogclosedlistener.hxx>
-#include <bootstrp/sstring.hxx>
+
+DECLARE_LIST( StringList, String* )
 
 // ------------
 // - Forwards -
diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index 0a7b92438db4..701546225bf4 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -33,7 +33,7 @@
 #include <vcl/group.hxx>
 #endif
 #ifndef _IMAGEBTN_HXX //autogen
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #endif
 #ifndef _EDIT_HXX //autogen
 #include <vcl/edit.hxx>
diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx
index fc1640fd1dea..4e08cebf2866 100644
--- a/cui/source/inc/splitcelldlg.hxx
+++ b/cui/source/inc/splitcelldlg.hxx
@@ -29,7 +29,7 @@
 
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/button.hxx>
 
 #include <svx/stddlg.hxx>