CWS gnumake2: move delivered header files in from svtools/inc to svtools/inc/svtools; remove ununsed files; remove svp.res

20 files changed, 22 insertions, 103 deletions

diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx
index 1e47c71de5d4..4296920d5c02 100644
--- a/svtools/source/control/asynclink.cxx
+++ b/svtools/source/control/asynclink.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#include <asynclink.hxx>
+#include <svtools/asynclink.hxx>
 #include <vos/mutex.hxx>
 #include <tools/debug.hxx>
 #include <vcl/timer.hxx>
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 481f6f2ceeae..99b4a453cb54 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -31,30 +31,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#ifndef _APP_HXX
 #include <vcl/svapp.hxx>
-#endif
-#ifndef _TABLE_HXX
 #include <tools/table.hxx>
-#endif
-#ifndef _HELP_HXX
 #include <vcl/help.hxx>
-#endif
-#ifndef _MENU_HXX
 #include <vcl/menu.hxx>
-#endif
-#ifndef _DECOVIEW_HXX
 #include <vcl/decoview.hxx>
-#endif
-#ifndef _FLOATWIN_HXX
 #include <vcl/floatwin.hxx>
-#endif
-#ifndef _BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
-#ifndef _FIXED_HXX
 #include <vcl/fixed.hxx>
-#endif
 #include <unotools/calendarwrapper.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <com/sun/star/i18n/Weekdays.hpp>
@@ -64,7 +48,7 @@
 #define _SV_CALENDAR_CXX
 #include <svl/svtools.hrc>
 #include <svtools/svtdata.hxx>
-#include <calendar.hxx>
+#include <svtools/calendar.hxx>
 
 // =======================================================================
 
diff --git a/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx
index c976d7442bc0..be8615ec7995 100644
--- a/svtools/source/control/collatorres.cxx
+++ b/svtools/source/control/collatorres.cxx
@@ -33,9 +33,7 @@
 #include "precompiled_svtools.hxx"
 #include <svtools/svtdata.hxx>
 #include <svl/svtools.hrc>
-
-
-#include <collatorres.hxx>
+#include <svtools/collatorres.hxx>
 
 // -------------------------------------------------------------------------
 //
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index b0d20bf7ce30..ef1a8289980a 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -33,19 +33,15 @@
 
 #define _CTRLBOX_CXX
 #include <tools/debug.hxx>
-#ifndef _APP_HXX
 #include <vcl/svapp.hxx>
-#endif
-#ifndef _FIELD_HXX
 #include <vcl/field.hxx>
-#endif
 #include <comphelper/processfactory.hxx>
 #include <unotools/charclass.hxx>
 
 #include <svtools/svtdata.hxx>
 #include <svl/svtools.hrc>
-#include <ctrlbox.hxx>
-#include <ctrltool.hxx>
+#include <svtools/ctrlbox.hxx>
+#include <svtools/ctrltool.hxx>
 
 #include <vcl/i18nhelp.hxx>
 
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index 1573ed531662..3c3bee6e240e 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -35,19 +35,14 @@
 
 #include <string.h>
 
-#ifndef TOOLS_DEBUG_HXX
 #include <tools/debug.hxx>
-#endif
 #include <i18npool/mslangid.hxx>
-#ifndef _VCL_WINDOW_HXX
 #include <vcl/window.hxx>
-#endif
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
-
 #include <svl/svtools.hrc>
 #include <svtools/svtdata.hxx>
-#include <ctrltool.hxx>
+#include <svtools/ctrltool.hxx>
 
 // =======================================================================
 
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index d820dce097ed..0f58f4ae595a 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -34,13 +34,8 @@
 #define _SV_FIELCTRL_CXX
 #include <tools/urlobj.hxx>
 #include <svtools/svtdata.hxx>
-#include <filectrl.hxx>
-#ifndef _SV_FILECTRL_HRC
+#include <svtools/filectrl.hxx>
 #include <filectrl.hrc>
-#endif
-
-#ifndef GCC
-#endif
 
 // =======================================================================
 
diff --git a/svtools/source/control/filectrl2.cxx b/svtools/source/control/filectrl2.cxx
index 0ea28fbf96bd..22ad930215c1 100644
--- a/svtools/source/control/filectrl2.cxx
+++ b/svtools/source/control/filectrl2.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_svtools.hxx"
 
 // this file contains code from filectrl.cxx which needs to be compiled with enabled exception hanling
-#include <filectrl.hxx>
+#include <svtools/filectrl.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
 #include <vcl/unohelp.hxx>
diff --git a/svtools/source/control/indexentryres.cxx b/svtools/source/control/indexentryres.cxx
index f69e9b34e5ea..820eca0f8c85 100644
--- a/svtools/source/control/indexentryres.cxx
+++ b/svtools/source/control/indexentryres.cxx
@@ -33,9 +33,7 @@
 #include "precompiled_svtools.hxx"
 #include <svtools/svtdata.hxx>
 #include <svl/svtools.hrc>
-
-
-#include <indexentryres.hxx>
+#include <svtools/indexentryres.hxx>
 
 // -------------------------------------------------------------------------
 //
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index b4904afee418..11d6fefe5f6a 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -36,7 +36,6 @@
 #include <sys/types.h>
 #endif
 
-
 #include <svtools/inettbc.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
@@ -44,27 +43,16 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
-
-#ifndef  _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HDL_
 #include <com/sun/star/task/XInteractionHandler.hdl>
-#endif
 #include <com/sun/star/ucb/NumberedSortingInfo.hpp>
 #include <com/sun/star/ucb/XAnyCompareFactory.hpp>
 #include <com/sun/star/ucb/XProgressHandler.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/ucb/XSortedDynamicResultSetFactory.hpp>
-
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
-#endif
-
 #include <vcl/toolbox.hxx>
-#ifndef _VOS_THREAD_HXX //autogen
 #include <vos/thread.hxx>
-#endif
-#ifndef _VOS_MUTEX_HXX //autogen
 #include <vos/mutex.hxx>
-#endif
 #include <vcl/svapp.hxx>
 #include <unotools/historyoptions.hxx>
 #include <svl/eitem.hxx>
@@ -80,9 +68,8 @@
 #include <ucbhelper/content.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <unotools/ucbhelper.hxx>
-
 #include "iodlg.hrc"
-#include <asynclink.hxx>
+#include <svtools/asynclink.hxx>
 #include <svl/urlfilter.hxx>
 
 #include <vector>
diff --git a/svtools/source/control/prgsbar.cxx b/svtools/source/control/prgsbar.cxx
index b6702e93af4d..164744f2b7d3 100644
--- a/svtools/source/control/prgsbar.cxx
+++ b/svtools/source/control/prgsbar.cxx
@@ -33,13 +33,9 @@
 
 #define _SV_PRGSBAR_CXX
 
-#ifndef _TOOLS_DEBUGS_HXX
 #include <tools/debug.hxx>
-#endif
-#ifndef _VCL_STATUS_HXX
 #include <vcl/status.hxx>
-#endif
-#include <prgsbar.hxx>
+#include <svtools/prgsbar.hxx>
 
 // =======================================================================
 
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index 693bca733813..f2bcdcb4603d 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -30,23 +30,16 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-#include <roadmap.hxx>
+#include <svtools/roadmap.hxx>
 
 #ifndef _STRING_HXX
 #define _STRING_HXX
 #endif
 
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
-
 #include <algorithm>
 #include <vcl/bitmap.hxx>
 #include <tools/color.hxx>
-
-#ifndef _RTL_USTRING_HXX_
-#include <rtl/OUString.hxx>
-#endif
 #include <memory>
 
 #define ROADMAP_INDENT_X        4
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index c3f10f1866aa..489e43732489 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -35,11 +35,10 @@
 #include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/poly.hxx>
-
 #include <vcl/i18nhelp.hxx>
 
 #define _SV_RULER_CXX
-#include <ruler.hxx>
+#include <svtools/ruler.hxx>
 
 // =======================================================================
 
diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx
index 04f3d55c35b0..540c18a16702 100644
--- a/svtools/source/control/scriptedtext.cxx
+++ b/svtools/source/control/scriptedtext.cxx
@@ -30,11 +30,8 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-#include "scriptedtext.hxx"
-
-#ifndef __SGI_STL_VECTOR
+#include <svtools/scriptedtext.hxx>
 #include <vector>
-#endif
 #include <rtl/ustring.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/font.hxx>
diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx
index 162f23948385..18387bda989c 100644
--- a/svtools/source/control/scrwin.cxx
+++ b/svtools/source/control/scrwin.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_svtools.hxx"
 
 #define _SVT_SCRWIN_CXX
-#include <scrwin.hxx>
+#include <svtools/scrwin.hxx>
 
 //===================================================================
 
diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx
index 35250753de1e..f60370428e2e 100644
--- a/svtools/source/control/stdmenu.cxx
+++ b/svtools/source/control/stdmenu.cxx
@@ -32,15 +32,10 @@
 #include "precompiled_svtools.hxx"
 
 #include <string.h>
-
-#ifndef _APP_HXX
 #include <vcl/svapp.hxx>
-#endif
-
 #include <vcl/i18nhelp.hxx>
-
-#include <ctrltool.hxx>
-#include <stdmenu.hxx>
+#include <svtools/ctrltool.hxx>
+#include <svtools/stdmenu.hxx>
 
 // ========================================================================
 
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index ed1abbe53a2a..6259433951f4 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#include "tabbar.hxx"
+#include <svtools/tabbar.hxx>
 #include <tools/time.hxx>
 #include <tools/debug.hxx>
 #include <tools/poly.hxx>
diff --git a/svtools/source/control/taskbar.cxx b/svtools/source/control/taskbar.cxx
index 146fa4933af3..45b6c36cf3a0 100644
--- a/svtools/source/control/taskbar.cxx
+++ b/svtools/source/control/taskbar.cxx
@@ -33,16 +33,11 @@
 
 #define _TASKBAR_CXX
 
-#ifndef _TOOLS_LIST_HXX
 #include <tools/list.hxx>
-#endif
 #include <tools/debug.hxx>
-
-#ifndef _VCL_FLOATWIN_HXX
 #include <vcl/floatwin.hxx>
-#endif
 
-#include <taskbar.hxx>
+#include <svtools/taskbar.hxx>
 
 // =======================================================================
 
diff --git a/svtools/source/control/taskbox.cxx b/svtools/source/control/taskbox.cxx
index 72a7345f1660..4633e509f40c 100644
--- a/svtools/source/control/taskbox.cxx
+++ b/svtools/source/control/taskbox.cxx
@@ -33,14 +33,11 @@
 
 #define _TASKBAR_CXX
 
-#ifndef _TOOLS_LIST_HXX
 #include <tools/list.hxx>
-#endif
 #include <tools/debug.hxx>
 #include <vcl/image.hxx>
 #include <vcl/help.hxx>
-
-#include <taskbar.hxx>
+#include <svtools/taskbar.hxx>
 
 // =======================================================================
 
diff --git a/svtools/source/control/taskmisc.cxx b/svtools/source/control/taskmisc.cxx
index bada5926d639..c86702ed5554 100644
--- a/svtools/source/control/taskmisc.cxx
+++ b/svtools/source/control/taskmisc.cxx
@@ -33,13 +33,10 @@
 
 #define _TASKBAR_CXX
 
-#ifndef _TOOLS_LIST_HXX
 #include <tools/list.hxx>
-#endif
 #include <tools/debug.hxx>
 #include <vcl/help.hxx>
-
-#include <taskbar.hxx>
+#include <svtools/taskbar.hxx>
 
 // =======================================================================
 
diff --git a/svtools/source/control/taskstat.cxx b/svtools/source/control/taskstat.cxx
index 82165a711285..6ec8680c6bfe 100644
--- a/svtools/source/control/taskstat.cxx
+++ b/svtools/source/control/taskstat.cxx
@@ -33,18 +33,15 @@
 
 #define _TASKBAR_CXX
 
-#ifndef _TOOLS_LIST_HXX
 #include <tools/list.hxx>
-#endif
 #include <tools/debug.hxx>
 #include <tools/date.hxx>
 #include <vcl/image.hxx>
 #include <vcl/help.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/calendarwrapper.hxx>
-
 #include <unotools/syslocale.hxx>
-#include <taskbar.hxx>
+#include <svtools/taskbar.hxx>
 
 // =======================================================================