gridsort: pulled CWS dba34b

65 files changed, 10 insertions, 55 deletions

diff --git a/svtools/inc/makefile.mk b/svtools/inc/makefile.mk
deleted file mode 100644
index cde85ffe82ca..000000000000
--- a/svtools/inc/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=svtools
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/svtools/inc/DocumentInfoPreview.hxx b/svtools/inc/svtools/DocumentInfoPreview.hxx
index ae57b1a68b32..ae57b1a68b32 100644
--- a/svtools/inc/DocumentInfoPreview.hxx
+++ b/svtools/inc/svtools/DocumentInfoPreview.hxx
diff --git a/svtools/inc/QueryFolderName.hxx b/svtools/inc/svtools/QueryFolderName.hxx
index 971b4b26e13e..971b4b26e13e 100644
--- a/svtools/inc/QueryFolderName.hxx
+++ b/svtools/inc/svtools/QueryFolderName.hxx
diff --git a/svtools/inc/acceleratorexecute.hxx b/svtools/inc/svtools/acceleratorexecute.hxx
index 3ee79e1fca0c..3ee79e1fca0c 100644
--- a/svtools/inc/acceleratorexecute.hxx
+++ b/svtools/inc/svtools/acceleratorexecute.hxx
diff --git a/svtools/inc/addresstemplate.hxx b/svtools/inc/svtools/addresstemplate.hxx
index f29ea2478b4e..bb4ee44647e9 100644
--- a/svtools/inc/addresstemplate.hxx
+++ b/svtools/inc/svtools/addresstemplate.hxx
@@ -33,7 +33,7 @@
 #include <vcl/group.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/combobox.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/scrbar.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/svtools/inc/apearcfg.hxx b/svtools/inc/svtools/apearcfg.hxx
index 8e6018424c4c..8e6018424c4c 100644
--- a/svtools/inc/apearcfg.hxx
+++ b/svtools/inc/svtools/apearcfg.hxx
diff --git a/svtools/inc/asynclink.hxx b/svtools/inc/svtools/asynclink.hxx
index 41c6f3e92388..41c6f3e92388 100644
--- a/svtools/inc/asynclink.hxx
+++ b/svtools/inc/svtools/asynclink.hxx
diff --git a/svtools/inc/calendar.hxx b/svtools/inc/svtools/calendar.hxx
index f85887873bb0..f85887873bb0 100644
--- a/svtools/inc/calendar.hxx
+++ b/svtools/inc/svtools/calendar.hxx
diff --git a/svtools/inc/cliplistener.hxx b/svtools/inc/svtools/cliplistener.hxx
index ab20d6d7aa20..ab20d6d7aa20 100644
--- a/svtools/inc/cliplistener.hxx
+++ b/svtools/inc/svtools/cliplistener.hxx
diff --git a/svtools/inc/collatorres.hxx b/svtools/inc/svtools/collatorres.hxx
index 63b4e7ef64f3..63b4e7ef64f3 100644
--- a/svtools/inc/collatorres.hxx
+++ b/svtools/inc/svtools/collatorres.hxx
diff --git a/svtools/inc/contextmenuhelper.hxx b/svtools/inc/svtools/contextmenuhelper.hxx
index 54d254309b1e..54d254309b1e 100644
--- a/svtools/inc/contextmenuhelper.hxx
+++ b/svtools/inc/svtools/contextmenuhelper.hxx
diff --git a/svtools/inc/controldims.hrc b/svtools/inc/svtools/controldims.hrc
index 5e26f132897d..5e26f132897d 100644
--- a/svtools/inc/controldims.hrc
+++ b/svtools/inc/svtools/controldims.hrc
diff --git a/svtools/inc/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx
index 9e6e942daf1e..9e6e942daf1e 100644
--- a/svtools/inc/ctrlbox.hxx
+++ b/svtools/inc/svtools/ctrlbox.hxx
diff --git a/svtools/inc/ctrltool.hxx b/svtools/inc/svtools/ctrltool.hxx
index a0eb5db2b955..a0eb5db2b955 100644
--- a/svtools/inc/ctrltool.hxx
+++ b/svtools/inc/svtools/ctrltool.hxx
diff --git a/svtools/inc/dialogclosedlistener.hxx b/svtools/inc/svtools/dialogclosedlistener.hxx
index 3712d408af52..3712d408af52 100644
--- a/svtools/inc/dialogclosedlistener.hxx
+++ b/svtools/inc/svtools/dialogclosedlistener.hxx
diff --git a/svtools/inc/dialogcontrolling.hxx b/svtools/inc/svtools/dialogcontrolling.hxx
index cd60736527f5..cd60736527f5 100644
--- a/svtools/inc/dialogcontrolling.hxx
+++ b/svtools/inc/svtools/dialogcontrolling.hxx
diff --git a/svtools/inc/svtools/editbrowsebox.hxx b/svtools/inc/svtools/editbrowsebox.hxx
index f97449e1880c..26ff11e11ca2 100644
--- a/svtools/inc/svtools/editbrowsebox.hxx
+++ b/svtools/inc/svtools/editbrowsebox.hxx
@@ -37,7 +37,7 @@
 #include <vcl/lstbox.hxx>
 
 #ifndef _IMAGEBTN_HXX
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #endif
 #include <svtools/brwbox.hxx>
 #include <vcl/timer.hxx>
diff --git a/svtools/inc/expander.hxx b/svtools/inc/svtools/expander.hxx
index c0f3cfc7632a..c0f3cfc7632a 100644
--- a/svtools/inc/expander.hxx
+++ b/svtools/inc/svtools/expander.hxx
diff --git a/svtools/inc/extcolorcfg.hxx b/svtools/inc/svtools/extcolorcfg.hxx
index 44167f63287c..44167f63287c 100644
--- a/svtools/inc/extcolorcfg.hxx
+++ b/svtools/inc/svtools/extcolorcfg.hxx
diff --git a/svtools/inc/filectrl.hxx b/svtools/inc/svtools/filectrl.hxx
index dd314bb23ca1..dd314bb23ca1 100644
--- a/svtools/inc/filectrl.hxx
+++ b/svtools/inc/svtools/filectrl.hxx
diff --git a/svtools/inc/filedlg.hxx b/svtools/inc/svtools/filedlg.hxx
index c04e48fc7658..c04e48fc7658 100644
--- a/svtools/inc/filedlg.hxx
+++ b/svtools/inc/svtools/filedlg.hxx
diff --git a/svtools/inc/filedlg2.hrc b/svtools/inc/svtools/filedlg2.hrc
index a87bd6ebcad0..a87bd6ebcad0 100644
--- a/svtools/inc/filedlg2.hrc
+++ b/svtools/inc/svtools/filedlg2.hrc
diff --git a/svtools/inc/fileview.hxx b/svtools/inc/svtools/fileview.hxx
index db704a0e6784..db704a0e6784 100644
--- a/svtools/inc/fileview.hxx
+++ b/svtools/inc/svtools/fileview.hxx
diff --git a/svtools/inc/fltdefs.hxx b/svtools/inc/svtools/fltdefs.hxx
index 86462c2faa33..86462c2faa33 100644
--- a/svtools/inc/fltdefs.hxx
+++ b/svtools/inc/svtools/fltdefs.hxx
diff --git a/svtools/inc/fontsubstconfig.hxx b/svtools/inc/svtools/fontsubstconfig.hxx
index 7bdb0dc412c3..7bdb0dc412c3 100644
--- a/svtools/inc/fontsubstconfig.hxx
+++ b/svtools/inc/svtools/fontsubstconfig.hxx
diff --git a/svtools/inc/framestatuslistener.hxx b/svtools/inc/svtools/framestatuslistener.hxx
index fd068ac5f86b..fd068ac5f86b 100644
--- a/svtools/inc/framestatuslistener.hxx
+++ b/svtools/inc/svtools/framestatuslistener.hxx
diff --git a/svtools/inc/helpagentwindow.hxx b/svtools/inc/svtools/helpagentwindow.hxx
index 45b2917c500a..45b2917c500a 100644
--- a/svtools/inc/helpagentwindow.hxx
+++ b/svtools/inc/svtools/helpagentwindow.hxx
diff --git a/svtools/inc/htmlkywd.hxx b/svtools/inc/svtools/htmlkywd.hxx
index 13928eaeaa39..13928eaeaa39 100644
--- a/svtools/inc/htmlkywd.hxx
+++ b/svtools/inc/svtools/htmlkywd.hxx
diff --git a/svtools/inc/htmltokn.h b/svtools/inc/svtools/htmltokn.h
index 7c43c1463e25..7c43c1463e25 100644
--- a/svtools/inc/htmltokn.h
+++ b/svtools/inc/svtools/htmltokn.h
diff --git a/svtools/inc/imagemgr.hrc b/svtools/inc/svtools/imagemgr.hrc
index 19cc2942d6f4..19cc2942d6f4 100644
--- a/svtools/inc/imagemgr.hrc
+++ b/svtools/inc/svtools/imagemgr.hrc
diff --git a/svtools/inc/imagemgr.hxx b/svtools/inc/svtools/imagemgr.hxx
index efd15c5f4cde..efd15c5f4cde 100644
--- a/svtools/inc/imagemgr.hxx
+++ b/svtools/inc/svtools/imagemgr.hxx
diff --git a/svtools/inc/imageresourceaccess.hxx b/svtools/inc/svtools/imageresourceaccess.hxx
index d77b1c97a512..d77b1c97a512 100644
--- a/svtools/inc/imageresourceaccess.hxx
+++ b/svtools/inc/svtools/imageresourceaccess.hxx
diff --git a/svtools/inc/imgdef.hxx b/svtools/inc/svtools/imgdef.hxx
index 7cdcec0fd642..7cdcec0fd642 100644
--- a/svtools/inc/imgdef.hxx
+++ b/svtools/inc/svtools/imgdef.hxx
diff --git a/svtools/inc/indexentryres.hxx b/svtools/inc/svtools/indexentryres.hxx
index f2c73000ed67..f2c73000ed67 100644
--- a/svtools/inc/indexentryres.hxx
+++ b/svtools/inc/svtools/indexentryres.hxx
diff --git a/svtools/inc/inetimg.hxx b/svtools/inc/svtools/inetimg.hxx
index 924bbad831d6..924bbad831d6 100644
--- a/svtools/inc/inetimg.hxx
+++ b/svtools/inc/svtools/inetimg.hxx
diff --git a/svtools/inc/itemdel.hxx b/svtools/inc/svtools/itemdel.hxx
index 51af97730079..51af97730079 100644
--- a/svtools/inc/itemdel.hxx
+++ b/svtools/inc/svtools/itemdel.hxx
diff --git a/svtools/inc/ivctrl.hxx b/svtools/inc/svtools/ivctrl.hxx
index 5bea4675b62e..5bea4675b62e 100644
--- a/svtools/inc/ivctrl.hxx
+++ b/svtools/inc/svtools/ivctrl.hxx
diff --git a/svtools/inc/localresaccess.hxx b/svtools/inc/svtools/localresaccess.hxx
index c72f68f64f03..c72f68f64f03 100644
--- a/svtools/inc/localresaccess.hxx
+++ b/svtools/inc/svtools/localresaccess.hxx
diff --git a/svtools/inc/prgsbar.hxx b/svtools/inc/svtools/prgsbar.hxx
index c02d400c6931..c02d400c6931 100644
--- a/svtools/inc/prgsbar.hxx
+++ b/svtools/inc/svtools/prgsbar.hxx
diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/svtools/roadmap.hxx
index ff94cc966f4d..ff94cc966f4d 100644
--- a/svtools/inc/roadmap.hxx
+++ b/svtools/inc/svtools/roadmap.hxx
diff --git a/svtools/inc/rtfkeywd.hxx b/svtools/inc/svtools/rtfkeywd.hxx
index de59e1d8faf9..de59e1d8faf9 100644
--- a/svtools/inc/rtfkeywd.hxx
+++ b/svtools/inc/svtools/rtfkeywd.hxx
diff --git a/svtools/inc/rtfout.hxx b/svtools/inc/svtools/rtfout.hxx
index b9bfbc901848..b9bfbc901848 100644
--- a/svtools/inc/rtfout.hxx
+++ b/svtools/inc/svtools/rtfout.hxx
diff --git a/svtools/inc/rtftoken.h b/svtools/inc/svtools/rtftoken.h
index f292682a0236..f292682a0236 100644
--- a/svtools/inc/rtftoken.h
+++ b/svtools/inc/svtools/rtftoken.h
diff --git a/svtools/inc/ruler.hxx b/svtools/inc/svtools/ruler.hxx
index c2649b298ba6..c2649b298ba6 100644
--- a/svtools/inc/ruler.hxx
+++ b/svtools/inc/svtools/ruler.hxx
diff --git a/svtools/inc/scriptedtext.hxx b/svtools/inc/svtools/scriptedtext.hxx
index 5bb89969785b..5bb89969785b 100644
--- a/svtools/inc/scriptedtext.hxx
+++ b/svtools/inc/svtools/scriptedtext.hxx
diff --git a/svtools/inc/scrwin.hxx b/svtools/inc/svtools/scrwin.hxx
index 1542ed667133..1542ed667133 100644
--- a/svtools/inc/scrwin.hxx
+++ b/svtools/inc/svtools/scrwin.hxx
diff --git a/svtools/inc/sfxecode.hxx b/svtools/inc/svtools/sfxecode.hxx
index 59611eb35844..59611eb35844 100644
--- a/svtools/inc/sfxecode.hxx
+++ b/svtools/inc/svtools/sfxecode.hxx
diff --git a/svtools/inc/soerr.hxx b/svtools/inc/svtools/soerr.hxx
index 41e488480039..41e488480039 100644
--- a/svtools/inc/soerr.hxx
+++ b/svtools/inc/svtools/soerr.hxx
diff --git a/svtools/inc/sores.hxx b/svtools/inc/svtools/sores.hxx
index e5a7e51b54cf..e5a7e51b54cf 100644
--- a/svtools/inc/sores.hxx
+++ b/svtools/inc/svtools/sores.hxx
diff --git a/svtools/inc/statusbarcontroller.hxx b/svtools/inc/svtools/statusbarcontroller.hxx
index 7856d96bcd77..7856d96bcd77 100644
--- a/svtools/inc/statusbarcontroller.hxx
+++ b/svtools/inc/svtools/statusbarcontroller.hxx
diff --git a/svtools/inc/stdmenu.hxx b/svtools/inc/svtools/stdmenu.hxx
index 1b7e9816a103..1b7e9816a103 100644
--- a/svtools/inc/stdmenu.hxx
+++ b/svtools/inc/svtools/stdmenu.hxx
diff --git a/svtools/inc/svtools/svtdata.hxx b/svtools/inc/svtools/svtdata.hxx
index eb5c5dad1b75..ad7b60b3f2b7 100644
--- a/svtools/inc/svtools/svtdata.hxx
+++ b/svtools/inc/svtools/svtdata.hxx
@@ -28,6 +28,7 @@
 #ifndef _SVTOOLS_SVTDATA_HXX
 #define _SVTOOLS_SVTDATA_HXX
 
+#include "svtools/svtdllapi.h"
 #include <tools/resid.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 
@@ -56,13 +57,11 @@ public:
 };
 
 //============================================================================
-class SvtResId: public ResId
+class SVT_DLLPUBLIC SvtResId: public ResId
 {
 public:
-    SvtResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale):
-        ResId(nId, *ImpSvtData::GetSvtData().GetResMgr(aLocale)) {}
-
-    SvtResId(USHORT nId): ResId(nId, *ImpSvtData::GetSvtData().GetResMgr()) {}
+    SvtResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale);
+    SvtResId(USHORT nId);
      // VCL dependant, only available in SVT, not in SVL!
 };
 
diff --git a/svtools/inc/svtools/svtools.hrc b/svtools/inc/svtools/svtools.hrc
index 3dd2f0706a2e..0461064f7d96 100644
--- a/svtools/inc/svtools/svtools.hrc
+++ b/svtools/inc/svtools/svtools.hrc
@@ -89,6 +89,10 @@
 #define STR_BASICKEY_FORMAT_TRUE        (RID_SVTOOLS_START+107)
 #define STR_BASICKEY_FORMAT_FALSE       (RID_SVTOOLS_START+108)
 #define CONFIG_BASIC_FORMAT_END         (RID_SVTOOLS_START+109)
+#define STR_UNDO                        (RID_SVTOOLS_START+110)
+#define STR_REDO                        (RID_SVTOOLS_START+111)
+#define STR_REPEAT                      (RID_SVTOOLS_START+112)
+
 
 #define STR_INVALIDTRYBUY               (RID_SVTOOLS_START+120)
 #define STR_OLDTRYBUY                   (RID_SVTOOLS_START+121)
diff --git a/svtools/inc/sychconv.hxx b/svtools/inc/svtools/sychconv.hxx
index 4056556a2100..4056556a2100 100644
--- a/svtools/inc/sychconv.hxx
+++ b/svtools/inc/svtools/sychconv.hxx
diff --git a/svtools/inc/tabbar.hxx b/svtools/inc/svtools/tabbar.hxx
index 2757811ba34e..2757811ba34e 100644
--- a/svtools/inc/tabbar.hxx
+++ b/svtools/inc/svtools/tabbar.hxx
diff --git a/svtools/inc/taskbar.hxx b/svtools/inc/svtools/taskbar.hxx
index d4a6699e2d5e..d4a6699e2d5e 100644
--- a/svtools/inc/taskbar.hxx
+++ b/svtools/inc/svtools/taskbar.hxx
diff --git a/svtools/inc/templatefoldercache.hxx b/svtools/inc/svtools/templatefoldercache.hxx
index 25d5080bd748..25d5080bd748 100644
--- a/svtools/inc/templatefoldercache.hxx
+++ b/svtools/inc/svtools/templatefoldercache.hxx
diff --git a/svtools/inc/templdlg.hxx b/svtools/inc/svtools/templdlg.hxx
index f08f7cc8770d..f08f7cc8770d 100644
--- a/svtools/inc/templdlg.hxx
+++ b/svtools/inc/svtools/templdlg.hxx
diff --git a/svtools/inc/testtool.hxx b/svtools/inc/svtools/testtool.hxx
index ea00fe33cdbf..ea00fe33cdbf 100644
--- a/svtools/inc/testtool.hxx
+++ b/svtools/inc/svtools/testtool.hxx
diff --git a/svtools/inc/tooltiplbox.hxx b/svtools/inc/svtools/tooltiplbox.hxx
index e50d516f5aa1..e50d516f5aa1 100644
--- a/svtools/inc/tooltiplbox.hxx
+++ b/svtools/inc/svtools/tooltiplbox.hxx
diff --git a/svtools/inc/txtattr.hxx b/svtools/inc/svtools/txtattr.hxx
index 29723a38129b..29723a38129b 100644
--- a/svtools/inc/txtattr.hxx
+++ b/svtools/inc/svtools/txtattr.hxx
diff --git a/svtools/inc/txtcmp.hxx b/svtools/inc/svtools/txtcmp.hxx
index 7b30b76e69a7..7b30b76e69a7 100644
--- a/svtools/inc/txtcmp.hxx
+++ b/svtools/inc/svtools/txtcmp.hxx
diff --git a/svtools/inc/unoevent.hxx b/svtools/inc/svtools/unoevent.hxx
index 5d5378bf909b..5d5378bf909b 100644
--- a/svtools/inc/unoevent.hxx
+++ b/svtools/inc/svtools/unoevent.hxx
diff --git a/svtools/inc/unoimap.hxx b/svtools/inc/svtools/unoimap.hxx
index 9ed2afe8dc6c..9ed2afe8dc6c 100644
--- a/svtools/inc/unoimap.hxx
+++ b/svtools/inc/svtools/unoimap.hxx
diff --git a/svtools/inc/wallitem.hxx b/svtools/inc/svtools/wallitem.hxx
index 533d5ae3f6d3..533d5ae3f6d3 100644
--- a/svtools/inc/wallitem.hxx
+++ b/svtools/inc/svtools/wallitem.hxx