CWS-TOOLING: integrate CWS vcl117ooo/DEV300_m97

22 files changed, 21 insertions, 66 deletions

diff --git a/binfilter/bf_forms/source/component/forms_Filter.cxx b/binfilter/bf_forms/source/component/forms_Filter.cxx
index e8d73c1c8..52bd269a2 100644
--- a/binfilter/bf_forms/source/component/forms_Filter.cxx
+++ b/binfilter/bf_forms/source/component/forms_Filter.cxx
@@ -94,9 +94,7 @@
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ 
 #include <toolkit/helper/vclunohelper.hxx>
 #endif
-#ifndef _SV_WINTYPES_HXX
-#include <vcl/wintypes.hxx>
-#endif
+#include <tools/wintypes.hxx>
 #ifndef _SV_SVAPP_HXX 
 #include <vcl/svapp.hxx>
 #endif
diff --git a/binfilter/bf_sc/source/ui/inc/ui_pch.hxx b/binfilter/bf_sc/source/ui/inc/ui_pch.hxx
index dfd6df539..c83f71660 100644
--- a/binfilter/bf_sc/source/ui/inc/ui_pch.hxx
+++ b/binfilter/bf_sc/source/ui/inc/ui_pch.hxx
@@ -86,7 +86,7 @@
 #include <vcl/outdev.hxx>
 #include <vcl/pointr.hxx>
 #include <vcl/ptrstyle.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <vcl/event.hxx>
 #include <limits.h>
 #include <tools/errinf.hxx>
@@ -202,7 +202,6 @@
 #include <scresid.hxx>
 #include <docsh.hxx>
 #include <bf_sfx2/interno.hxx>
-#include <vcl/wintypes.hxx>
 #include <bf_sfx2/docfac.hxx>
 #include <scitems.hxx>
 #include <vcl/virdev.hxx>
diff --git a/binfilter/bf_sch/source/ui/inc/globopt.hxx b/binfilter/bf_sch/source/ui/inc/globopt.hxx
index 88316a290..19ae3b7c6 100644
--- a/binfilter/bf_sch/source/ui/inc/globopt.hxx
+++ b/binfilter/bf_sch/source/ui/inc/globopt.hxx
@@ -27,9 +27,7 @@
 #ifndef _SCH_GLOBOPT_HXX
 #define _SCH_GLOBOPT_HXX
 
-#ifndef _VCL_FLDUNIT_HXX
-#include <vcl/fldunit.hxx>
-#endif
+#include <tools/fldunit.hxx>
 namespace binfilter {
 
 namespace sch
diff --git a/binfilter/bf_svtools/source/misc/svt_ehdl.cxx b/binfilter/bf_svtools/source/misc/svt_ehdl.cxx
index 18671b7bb..5ee41c66a 100644
--- a/binfilter/bf_svtools/source/misc/svt_ehdl.cxx
+++ b/binfilter/bf_svtools/source/misc/svt_ehdl.cxx
@@ -37,9 +37,7 @@
 #ifndef _TOOLS_RCID_H //autogen
 #include <tools/rcid.h>
 #endif
-#ifndef _SV_WINTYPES_HXX //autogen
-#include <vcl/wintypes.hxx>
-#endif
+#include <tools/wintypes.hxx>
 #ifndef _SV_MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoprov.cxx b/binfilter/bf_svx/source/unodraw/svx_unoprov.cxx
index ba54d8edc..82976c3f3 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoprov.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoprov.cxx
@@ -35,9 +35,7 @@
 #include <com/sun/star/util/MeasureUnit.hpp>
 #endif
 
-#ifndef _VCL_FLDUNIT_HXX
-#include <vcl/fldunit.hxx>
-#endif
+#include <tools/fldunit.hxx>
 
 #ifndef _SHL_HXX 
 #include <tools/shl.hxx>
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmliteme.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmliteme.cxx
index 417965d05..b51f557ff 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmliteme.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmliteme.cxx
@@ -69,9 +69,7 @@
 #include <bf_svx/unomid.hxx>
 #endif
 
-#ifndef _VCL_FLDUNIT_HXX
-#include <vcl/fldunit.hxx>
-#endif
+#include <tools/fldunit.hxx>
 
 #ifndef _SWMODULE_HXX //autogen wg. SW_MOD
 #include <swmodule.hxx>
diff --git a/binfilter/bf_sw/source/ui/inc/modcfg.hxx b/binfilter/bf_sw/source/ui/inc/modcfg.hxx
index f6b6a85e5..45da990ca 100644
--- a/binfilter/bf_sw/source/ui/inc/modcfg.hxx
+++ b/binfilter/bf_sw/source/ui/inc/modcfg.hxx
@@ -31,9 +31,7 @@
 #ifndef _STRING_HXX //autogen
 #include <tools/string.hxx>
 #endif
-#ifndef _SV_WINTYPES_HXX
-#include <vcl/wintypes.hxx>
-#endif
+#include <tools/wintypes.hxx>
 #ifndef _SV_FIELD_HXX
 #include <vcl/field.hxx>
 #endif
diff --git a/binfilter/bf_sw/source/ui/inc/uitool.hxx b/binfilter/bf_sw/source/ui/inc/uitool.hxx
index 375707d01..5f6381046 100644
--- a/binfilter/bf_sw/source/ui/inc/uitool.hxx
+++ b/binfilter/bf_sw/source/ui/inc/uitool.hxx
@@ -28,9 +28,7 @@
 #ifndef _UITOOL_HXX
 #define _UITOOL_HXX
 
-#ifndef _SV_WINTYPES_HXX //autogen
-#include <vcl/wintypes.hxx>
-#endif
+#include <tools/wintypes.hxx>
 #ifndef _SV_FIELD_HXX
 #include <vcl/field.hxx>
 #endif
diff --git a/binfilter/bf_sw/source/ui/inc/usrpref.hxx b/binfilter/bf_sw/source/ui/inc/usrpref.hxx
index 8c39c6f88..1b99028e6 100644
--- a/binfilter/bf_sw/source/ui/inc/usrpref.hxx
+++ b/binfilter/bf_sw/source/ui/inc/usrpref.hxx
@@ -37,9 +37,7 @@
 #endif
 #include "viewopt.hxx"
 
-#ifndef _VCL_FLDUNIT_HXX
-#include <vcl/fldunit.hxx>
-#endif
+#include <tools/fldunit.hxx>
 namespace binfilter {
 
 /* -----------------------------28.09.00 09:45--------------------------------
diff --git a/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx b/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx
index 7fce5e5b3..3dc6fea7c 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx
@@ -57,9 +57,7 @@
 
 #endif
 
-#ifndef _VCL_FLDUNIT_HXX
-#include <vcl/fldunit.hxx>
-#endif
+#include <tools/fldunit.hxx>
 
 // #110680#
 //#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
diff --git a/binfilter/bf_xmloff/source/forms/xmloff_elementexport.cxx b/binfilter/bf_xmloff/source/forms/xmloff_elementexport.cxx
index 6d3a15157..afa2061e4 100644
--- a/binfilter/bf_xmloff/source/forms/xmloff_elementexport.cxx
+++ b/binfilter/bf_xmloff/source/forms/xmloff_elementexport.cxx
@@ -72,9 +72,7 @@
 #ifndef _COM_SUN_STAR_FORM_LISTSOURCETYPE_HPP_
 #include <com/sun/star/form/ListSourceType.hpp>
 #endif
-#ifndef _SV_WINTYPES_HXX
-#include <vcl/wintypes.hxx>		// for check states
-#endif
+#include <tools/wintypes.hxx>		// for check states
 #ifndef _XMLOFF_XMLEVENTEXPORT_HXX
 #include "XMLEventExport.hxx"
 #endif
diff --git a/binfilter/bf_xmloff/source/forms/xmloff_formenums.cxx b/binfilter/bf_xmloff/source/forms/xmloff_formenums.cxx
index 900b17a66..1d32ca4e1 100644
--- a/binfilter/bf_xmloff/source/forms/xmloff_formenums.cxx
+++ b/binfilter/bf_xmloff/source/forms/xmloff_formenums.cxx
@@ -62,9 +62,7 @@
 #ifndef _COM_SUN_STAR_AWT_FONTRELIEF_HPP_
 #include <com/sun/star/awt/FontRelief.hpp>
 #endif
-#ifndef _SV_WINTYPES_HXX
-#include <vcl/wintypes.hxx>		// for check states
-#endif
+#include <tools/wintypes.hxx>		// for check states
 namespace binfilter {
 
 //.........................................................................
diff --git a/binfilter/bf_xmloff/source/forms/xmloff_layerimport.cxx b/binfilter/bf_xmloff/source/forms/xmloff_layerimport.cxx
index 826f29d98..71ebb25b5 100644
--- a/binfilter/bf_xmloff/source/forms/xmloff_layerimport.cxx
+++ b/binfilter/bf_xmloff/source/forms/xmloff_layerimport.cxx
@@ -73,9 +73,7 @@
 #ifndef _COM_SUN_STAR_FORM_LISTSOURCETYPE_HPP_
 #include <com/sun/star/form/ListSourceType.hpp>
 #endif
-#ifndef _SV_WINTYPES_HXX
-#include <vcl/wintypes.hxx>		// for check states
-#endif
+#include <tools/wintypes.hxx>		// for check states
 
 // #110680#
 //#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
diff --git a/binfilter/inc/bf_sfx2/saveopt.hxx b/binfilter/inc/bf_sfx2/saveopt.hxx
index 902ace8bc..b3ed5590d 100644
--- a/binfilter/inc/bf_sfx2/saveopt.hxx
+++ b/binfilter/inc/bf_sfx2/saveopt.hxx
@@ -28,9 +28,7 @@
 #define _SFX_SAVEOPT_HXX
 
 
-#ifndef _SV_WINTYPES_HXX //autogen
-#include <vcl/wintypes.hxx>
-#endif
+#include <tools/wintypes.hxx>
 #ifndef _SV_FIELD_HXX //autogen
 #include <vcl/field.hxx>
 #endif
diff --git a/binfilter/inc/bf_so3/ipenv.hxx b/binfilter/inc/bf_so3/ipenv.hxx
index d553b24f9..e7e313e31 100644
--- a/binfilter/inc/bf_so3/ipenv.hxx
+++ b/binfilter/inc/bf_so3/ipenv.hxx
@@ -29,9 +29,7 @@
 #define _IPENV_HXX
 
 #include <bf_so3/client.hxx>
-#ifndef _TOOLS_VCLRSC_HXX
-#include <vcl/mapunit.hxx>
-#endif
+//#include <tools/mapunit.hxx>
 
 #ifndef INCLUDED_SO3DLLAPI_H
 #include "bf_so3/so3dllapi.h"
diff --git a/binfilter/inc/bf_sw/swmodule.hxx b/binfilter/inc/bf_sw/swmodule.hxx
index 3c59adc1f..611e0c96a 100644
--- a/binfilter/inc/bf_sw/swmodule.hxx
+++ b/binfilter/inc/bf_sw/swmodule.hxx
@@ -48,9 +48,7 @@
 #ifndef _COM_SUN_STAR_LINGUISTIC2_XLINGUSERVICEEVENTLISTENER_HPP_
 #include <com/sun/star/linguistic2/XLinguServiceEventListener.hpp>
 #endif
-#ifndef _VCL_FLDUNIT_HXX
-#include <vcl/fldunit.hxx>
-#endif
+#include <tools/fldunit.hxx>
 namespace com{ namespace sun{ namespace star{ namespace scanner{
     class XScannerManager;
 }}}}
diff --git a/binfilter/inc/bf_xmloff/VisAreaContext.hxx b/binfilter/inc/bf_xmloff/VisAreaContext.hxx
index a7ff33f6a..01581f024 100644
--- a/binfilter/inc/bf_xmloff/VisAreaContext.hxx
+++ b/binfilter/inc/bf_xmloff/VisAreaContext.hxx
@@ -32,9 +32,7 @@
 #include <bf_xmloff/xmlictxt.hxx>
 #endif
 
-#ifndef _VCL_MAPUNIT_HXX
-#include <vcl/mapunit.hxx>
-#endif
+#include <tools/mapunit.hxx>
 class Rectangle;
 namespace com { namespace sun { namespace star { namespace awt {
     struct Rectangle;
diff --git a/binfilter/inc/bf_xmloff/styleexp.hxx b/binfilter/inc/bf_xmloff/styleexp.hxx
index 6cbe626cf..047403b85 100644
--- a/binfilter/inc/bf_xmloff/styleexp.hxx
+++ b/binfilter/inc/bf_xmloff/styleexp.hxx
@@ -34,10 +34,6 @@
 #include <com/sun/star/uno/Reference.h>
 #endif
 
-#ifndef _VCL_MAPUNIT_HXX
-//#include <vcl/mapunit.hxx>
-#endif
-
 #ifndef _UNIVERSALL_REFERENCE_HXX
 #include <bf_xmloff/uniref.hxx>
 #endif
diff --git a/binfilter/inc/bf_xmloff/xmlehelp.hxx b/binfilter/inc/bf_xmloff/xmlehelp.hxx
index 82d0de806..68d6047b6 100644
--- a/binfilter/inc/bf_xmloff/xmlehelp.hxx
+++ b/binfilter/inc/bf_xmloff/xmlehelp.hxx
@@ -28,9 +28,7 @@
 #ifndef _XMLOFF_XMLEHELP_HXX
 #define _XMLOFF_XMLEHELP_HXX
 
-#ifndef _VCL_MAPUNIT_HXX
-#include <vcl/mapunit.hxx>
-#endif
+#include <tools/mapunit.hxx>
 namespace rtl { class OUStringBuffer; }
 namespace binfilter {
 
diff --git a/binfilter/inc/bf_xmloff/xmlexp.hxx b/binfilter/inc/bf_xmloff/xmlexp.hxx
index 701e415d8..895b2db60 100644
--- a/binfilter/inc/bf_xmloff/xmlexp.hxx
+++ b/binfilter/inc/bf_xmloff/xmlexp.hxx
@@ -56,9 +56,7 @@
 #ifndef _RTL_USTRING_HXX_
 #include <rtl/ustring.hxx>
 #endif
-#ifndef _VCL_MAPUNIT_HXX
-#include <vcl/mapunit.hxx>
-#endif
+#include <tools/mapunit.hxx>
 
 #ifndef _XMLOFF_TEXTPARAE_HXX_
 #include <bf_xmloff/txtparae.hxx>
diff --git a/binfilter/inc/bf_xmloff/xmlnume.hxx b/binfilter/inc/bf_xmloff/xmlnume.hxx
index 7251accf7..89ef0b127 100644
--- a/binfilter/inc/bf_xmloff/xmlnume.hxx
+++ b/binfilter/inc/bf_xmloff/xmlnume.hxx
@@ -31,9 +31,7 @@
 #ifndef _RTL_USTRING_HXX_
 #include <rtl/ustring.hxx>
 #endif
-#ifndef _VCL_MAPUNIT_HXX
-#include <vcl/mapunit.hxx>
-#endif
+#include <tools/mapunit.hxx>
 
 #ifndef _XMLOFF_ATTRLIST_HXX
 #include <bf_xmloff/attrlist.hxx>
diff --git a/binfilter/inc/bf_xmloff/xmluconv.hxx b/binfilter/inc/bf_xmloff/xmluconv.hxx
index facbe247d..ca148b406 100644
--- a/binfilter/inc/bf_xmloff/xmluconv.hxx
+++ b/binfilter/inc/bf_xmloff/xmluconv.hxx
@@ -38,9 +38,7 @@
 #include <tools/color.hxx>
 #endif
 
-#ifndef _VCL_MAPUNIT_HXX
-#include <vcl/mapunit.hxx>
-#endif
+#include <tools/mapunit.hxx>
 
 #ifndef _XMLOFF_XMLEMENT_HXX
 #include <bf_xmloff/xmlement.hxx>