Commits

Anonymous committed 01b1547

vcl117: removed obsolete header

Comments (0)

Files changed (90)

accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx

 #include "accessibility/extended/accessiblebrowseboxcell.hxx"
 #endif
 #include <cppuhelper/implbase2.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 // ============================================================================
 namespace accessibility
 {

accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx

 
 #include <tools/gen.hxx>
 #include <tools/string.hxx>
-#include <vcl/wintypes.hxx>
-#include <tools/gen.hxx>
+#include <tools/wintypes.hxx>
 
 namespace com { namespace sun { namespace star { namespace datatransfer { namespace clipboard {
     class XClipboard;

automation/source/server/statemnt.cxx

 #include <comphelper/processfactory.hxx>
 #include <comphelper/uieventslogger.hxx>
 
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #ifndef _DIALOG_HXX //autogen
 #include <vcl/dialog.hxx>
 #endif
 #include <vcl/fixed.hxx>
 #include <vcl/wrkwin.hxx>
 #include <osl/diagnose.h>
-#include <vcl/wintypes.hxx>
 #include <svtools/valueset.hxx>
 #include <svtools/roadmap.hxx>
 #include <svtools/table/tablecontrol.hxx>

automation/source/server/statemnt.hxx

 #ifndef _STATEMNT_HXX
 #define _STATEMNT_HXX
 
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <tools/string.hxx>
 #include <tools/debug.hxx>
 #include <tools/time.hxx>

basic/inc/pch/precompiled_basic.hxx

 #include "vcl/timer.hxx"
 #include "vcl/toolbox.hxx"
 #include "vcl/window.hxx"
-#include "vcl/wintypes.hxx"
+#include "tools/wintypes.hxx"
 #include "vcl/wrkwin.hxx"
 
 #include "vos/diagnose.hxx"

basic/source/runtime/methods.cxx

 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/sound.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <vcl/msgbox.hxx>
 #include <basic/sbx.hxx>
 #include <svl/zforlist.hxx>

binfilter/bf_forms/source/component/forms_Filter.cxx

 #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

binfilter/bf_sc/source/ui/inc/ui_pch.hxx

 #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>
 #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>

binfilter/bf_sch/source/ui/inc/globopt.hxx

 #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

binfilter/bf_svtools/source/misc/svt_ehdl.cxx

 #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

binfilter/bf_svx/source/unodraw/svx_unoprov.cxx

 #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>

binfilter/bf_sw/source/filter/xml/sw_xmliteme.cxx

 #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>

binfilter/bf_sw/source/ui/inc/modcfg.hxx

 #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

binfilter/bf_sw/source/ui/inc/uitool.hxx

 #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

binfilter/bf_sw/source/ui/inc/usrpref.hxx

 #endif
 #include "viewopt.hxx"
 
-#ifndef _VCL_FLDUNIT_HXX
-#include <vcl/fldunit.hxx>
-#endif
+#include <tools/fldunit.hxx>
 namespace binfilter {
 
 /* -----------------------------28.09.00 09:45--------------------------------

binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx

 
 #endif
 
-#ifndef _VCL_FLDUNIT_HXX
-#include <vcl/fldunit.hxx>
-#endif
+#include <tools/fldunit.hxx>
 
 // #110680#
 //#ifndef _COMPHELPER_PROCESSFACTORY_HXX_

binfilter/bf_xmloff/source/forms/xmloff_elementexport.cxx

 #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

binfilter/bf_xmloff/source/forms/xmloff_formenums.cxx

 #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 {
 
 //.........................................................................

binfilter/bf_xmloff/source/forms/xmloff_layerimport.cxx

 #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_

binfilter/inc/bf_sfx2/saveopt.hxx

 #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

binfilter/inc/bf_so3/ipenv.hxx

 #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"

binfilter/inc/bf_sw/swmodule.hxx

 #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;
 }}}}

binfilter/inc/bf_xmloff/VisAreaContext.hxx

 #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;

binfilter/inc/bf_xmloff/styleexp.hxx

 #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

binfilter/inc/bf_xmloff/xmlehelp.hxx

 #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 {
 

binfilter/inc/bf_xmloff/xmlexp.hxx

 #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>

binfilter/inc/bf_xmloff/xmlnume.hxx

 #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>

binfilter/inc/bf_xmloff/xmluconv.hxx

 #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>

chart2/source/controller/inc/ConfigurationAccess.hxx

 #define _CHART2_CONFIGURATIONACCESS_HXX
 
 // header for enum FieldUnit
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
 
 //.............................................................................
 namespace chart

extensions/source/propctrlr/formcomponenthandler.hxx

 #include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/form/XForm.hpp>
 /** === end UNO includes === **/
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
 #include <vcl/waitobj.hxx>
 #include <connectivity/dbtools.hxx>
 

forms/inc/pch/precompiled_forms.hxx

 #include "vcl/mapunit.hxx"
 #include "vcl/stdtext.hxx"
 #include "vcl/timer.hxx"
-#include "vcl/wintypes.hxx"
+#include "tools/wintypes.hxx"
 
 #include "vos/mutex.hxx"
 #include "vos/thread.hxx"

forms/source/component/Edit.cxx

 #include <com/sun/star/awt/XVclWindowPeer.hpp>
 
 #include <vcl/svapp.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 
 #include <connectivity/dbtools.hxx>
 #include <connectivity/formattedcolumnvalue.hxx>

forms/source/component/Filter.cxx

 #include <unotools/localedatawrapper.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 
 //--------------------------------------------------------------------------
 extern "C" void SAL_CALL createRegistryInfo_OFilterControl()

forms/source/component/FormattedField.cxx

 #include <svl/numuno.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/debug.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <i18npool/mslangid.hxx>
 #include <rtl/textenc.h>
 #include <com/sun/star/sdbc/DataType.hpp>

forms/source/richtext/richtextcontrol.hxx

 #include <comphelper/uno3.hxx>
 #include <comphelper/implementationreference.hxx>
 #include <cppuhelper/implbase1.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include "rtattributes.hxx"
 #include "attributedispatcher.hxx"
 

forms/source/richtext/richtextengine.cxx

 #define ITEMID_LANGUAGE     EE_CHAR_LANGUAGE
 #include <editeng/langitem.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/outdev.hxx>
 #include <unotools/lingucfg.hxx>

forms/source/richtext/richtextimplcontrol.cxx

 #include <editeng/editobj.hxx>
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
 

forms/source/richtext/rtattributehandler.cxx

 #include <editeng/eeitem.hxx>
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/outdev.hxx>
 

forms/source/solar/component/navbarcontrol.hxx

 #include <toolkit/awt/vclxwindow.hxx>
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/implbase1.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 
 //.........................................................................
 namespace frm

fpicker/source/office/OfficeFilePicker.hxx

 #endif
 
 
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include "commonpicker.hxx"
 #include "pickercallbacks.hxx"
 

framework/inc/pch/precompiled_framework.hxx

 #include "vcl/keycod.hxx"
 #include "vcl/keycodes.hxx"
 #include "vcl/lstbox.hxx"
-#include "vcl/mapunit.hxx"
+#include "tools/mapunit.hxx"
 #include "vcl/menu.hxx"
 #include "vcl/mnemonic.hxx"
 #include "vcl/morebtn.hxx"
 #include "vcl/timer.hxx"
 #include "vcl/wall.hxx"
 #include "vcl/window.hxx"
-#include "vcl/wintypes.hxx"
+#include "tools/wintypes.hxx"
 
 #include "vos/mutex.hxx"
 #include "vos/process.hxx"

framework/inc/services/layoutmanager.hxx

 #include <cppuhelper/implbase9.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <comphelper/propertycontainer.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <svtools/miscopt.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/timer.hxx>

framework/source/helper/tagwindowasmodified.cxx

 #include <vcl/syswin.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 
 //_________________________________________________________________________________________________________________
 //	namespace

framework/source/uielement/fontsizemenucontroller.cxx

 #ifndef _VCL_MENU_HXX_
 #include <vcl/menu.hxx>
 #endif
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 #ifndef _VCL_SVAPP_HXX_
 #include <vcl/svapp.hxx>
 #endif

reportdesign/source/ui/inspection/DataProviderHandler.cxx

 #include <com/sun/star/inspection/XNumericControl.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/util/MeasureUnit.hpp>
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
 #include "metadata.hxx"
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>

reportdesign/source/ui/inspection/GeometryHandler.cxx

 
 #include <vcl/msgbox.hxx>
 #include <vcl/waitobj.hxx>
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
 #include <vcl/stdtext.hxx>
 
 #include "ModuleHelper.hxx"

reportdesign/source/ui/inspection/ReportComponentHandler.cxx

 #include <com/sun/star/inspection/XNumericControl.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/util/MeasureUnit.hpp>
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
 #include "metadata.hxx"
 
 //........................................................................

sc/source/core/inc/core_pch.hxx

 #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 <tools/ownlist.hxx>
 #include <svl/itempool.hxx>

sc/source/filter/inc/filt_pch.hxx

 #include <tools/fract.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/mapmod.hxx>
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/region.hxx>
 #include <svl/lstner.hxx>
 #include <patattr.hxx>
 #include <vcl/window.hxx>
 #include <vcl/pointr.hxx>
 #include <vcl/ptrstyle.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <vcl/inputctx.hxx>
 #include <vcl/event.hxx>
 #include <tools/ownlist.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/combobox.h>
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XFrame.hdl>
 #include <com/sun/star/awt/XWindow.hpp>

sc/source/filter/inc/xlescher.hxx

 #define SC_XLESCHER_HXX
 
 #include <tools/gen.hxx>
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 #include "fapihelper.hxx"
 #include "xladdress.hxx"
 #include "xlstyle.hxx"

sc/source/ui/cctrl/dpcontrol.cxx

 
 #include <vcl/outdev.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <vcl/decoview.hxx>
 #include "strload.hxx"
 #include "global.hxx"

sc/source/ui/inc/ui_pch.hxx

 #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>
 #include <sfx2/ipfrm.hxx>
 #include <docsh.hxx>
 //REMOVE	#include <sfx2/interno.hxx>
-#include <vcl/wintypes.hxx>
 #include <sfx2/docfac.hxx>
 #include <scitems.hxx>
 #include <vcl/virdev.hxx>

sd/source/ui/dlg/dlgass.cxx

 #include <svl/undo.hxx>
 #include "DrawDocShell.hxx"
 #include <vcl/gdimtf.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include "docprev.hxx"
 #include <sfx2/app.hxx>
 #include <sfx2/docfile.hxx>

sfx2/inc/pch/precompiled_sfx2.hxx

 #include "vcl/stdtext.hxx"
 #include "vcl/timer.hxx"
 #include "vcl/unohelp.hxx"
-#include "vcl/wintypes.hxx"
+#include "tools/wintypes.hxx"
 #include "vos/diagnose.hxx"
 #include "vos/module.hxx"
 #include "vos/mutex.hxx"

sfx2/inc/sfx2/mnumgr.hxx

 #ifndef _MENU_HXX //autogen //wg. MENU_APPEND !!!!
 #include <vcl/menu.hxx>
 #endif
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <tools/link.hxx>
 #include <com/sun/star/embed/VerbDescriptor.hpp>
 #include <com/sun/star/uno/Sequence.hxx>

sfx2/inc/sfx2/module.hxx

 #include <sfx2/shell.hxx>
 #include <sfx2/imgdef.hxx>
 #include <sal/types.h>
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
 
 class ImageList;
 

soldep/inc/soldep/soldlg.hxx

 #ifndef _FMRWRK_SOLDLG_HXX
 #define _FMRWRK_SOLDLG_HXX
 
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <vcl/button.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/msgbox.hxx>

starmath/source/document.cxx

 #include <editeng/unolingu.hxx>
 #include <ucbhelper/content.hxx>
 #include <vcl/mapmod.hxx>
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/msgbox.hxx>
 #include <sfx2/sfx.hrc>
 #include <document.hxx>

starmath/source/math_pch.cxx

-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_starmath.hxx"
-
-#define SMDLL 1
-
-#include "starmath.hrc"
-
-#define ITEMID_FONT 		1
-#define ITEMID_FONTHEIGHT	2
-#define ITEMID_LRSPACE		3
-#define ITEMID_WEIGHT		4
-
-//--------- ab hier die "generierten"
-#include <tools/string.hxx>
-#include <tools/solar.h>
-#include <tools/list.hxx>
-#include <tools/contnr.hxx>
-#include <tools/rtti.hxx>
-#include <tools/ref.hxx>
-#include <tools/link.hxx>
-#include <svl/brdcst.hxx>
-#include <svl/svarray.hxx>
-#include <tools/debug.hxx>
-#include <svl/hint.hxx>
-#include <svl/smplhint.hxx>
-#include <sot/sotref.hxx>
-#include <tools/globname.hxx>
-#include <sot/factory.hxx>
-#include <vcl/sv.h>
-#include <basic/sbxdef.hxx>
-#include <tools/time.hxx>
-#include <tools/gen.hxx>
-#include <tools/stream.hxx>
-#include <tools/errinf.hxx>
-#include <tools/errcode.hxx>
-#include <sot/object.hxx>
-#include <sot/sotdata.hxx>
-#include <sfx2/shell.hxx>
-#include <sal/types.h>
-#include <sal/config.h>
-#include <tools/date.hxx>
-#include <tools/ownlist.hxx>
-#include <vcl/accel.hxx>
-#include <tools/resid.hxx>
-#include <tools/rc.hxx>
-#include <tools/rc.hxx>
-#include <i18npool/lang.h>
-#include <tools/resmgr.hxx>
-#include <vcl/keycod.hxx>
-#include <vcl/keycodes.hxx>
-#include <vcl/vclenum.hxx>
-#include <vcl/timer.hxx>
-#include <vcl/cmdevt.hxx>
-#include <vcl/font.hxx>
-#include <tools/color.hxx>
-#include <vcl/outdev.hxx>
-#include <vcl/region.hxx>
-#include <vcl/mapmod.hxx>
-#include <tools/fract.hxx>
-#include <vcl/wall.hxx>
-#include <vcl/settings.hxx>
-#include <vcl/bitmap.hxx>
-#include <vcl/pointr.hxx>
-#include <vcl/ptrstyle.hxx>
-#include <vcl/wintypes.hxx>
-#include <vcl/inputctx.hxx>
-#include <vcl/event.hxx>
-#include <format.hxx>
-#include <utility.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/image.hxx>
-#include <vcl/ctrl.hxx>
-#include <vcl/window.hxx>
-#include <sfx2/minarray.hxx>
-#include <vcl/combobox.hxx>
-#include <vcl/combobox.h>
-#include <vcl/edit.hxx>
-#include <vcl/menu.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/lstbox.h>
-#include <usr/guid.hxx>
-#include <usr/sequ.hxx>
-#include <uno/types.h>
-#include <uno/macros.h>
-#include <vos/xception.hxx>
-#include <osl/mutex.h>
-#include <tools/shl.hxx>
-#include <sfx2/module.hxx>
-#include <sfx2/imgdef.hxx>
-#include <usr/uno.hxx>
-#include <usr/xiface.hxx>
-#include <usr/ustring.hxx>
-#include <vos/refernce.hxx>
-#include <vos/types.hxx>
-#include <osl/types.h>
-#include <osl/interlck.h>
-#include <vos/object.hxx>
-#include <vos/macros.hxx>
-#include <smdll.hxx>
-#include <sfx2/sfxsids.hrc>
-#include <chaos/cntids.hrc>
-#include <svl/cntwids.hrc>
-#include <svl/solar.hrc>
-#include <svl/lstner.hxx>
-#include <starmath.hrc>
-#include <basic/sbx.hxx>
-#include <basic/sbxform.hxx>
-#include <basic/sbxobj.hxx>
-#include <basic/sbxvar.hxx>
-#include <basic/sbxcore.hxx>
-#include <basic/sbxprop.hxx>
-#include <basic/sbxmeth.hxx>
-#include <tools/unqid.hxx>
-#include <tools/unqidx.hxx>
-#include <svl/poolitem.hxx>
-#include <svtools/args.hxx>
-#include <smmod.hxx>
-#include <vos/thread.hxx>
-#include <osl/thread.h>
-#include <vos/runnable.hxx>
-#include <vcl/apptypes.hxx>
-#include <tools/dynary.hxx>
-#include <vcl/metric.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/timer.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/sfx.hrc>
-#include <svl/memberid.hrc>
-#include <vcl/syswin.hxx>
-#include <vcl/virdev.hxx>
-#include <tools/datetime.hxx>
-#include <tools/wldcrd.hxx>
-#include <parse.hxx>
-#include <tools/stack.hxx>
-#include <types.hxx>
-#include <config.hxx>
-#include <svtools/confitem.hxx>
-#include <tools/poly.hxx>
-#include <svx/xpoly.hxx>
-#include <rect.hxx>
-#include <vcl/outdev.hxx>
-#ifndef _SMART_COM_SUN_STAR_FRAME_XDISPATCHPROVIDERINTERCEPTOR_HXX_
-#include <smart/com/sun/star/frame/XDispatchProviderInterceptor.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_XDISPATCH_HXX_
-#include <smart/com/sun/star/frame/XDispatch.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HXX_
-#include <smart/com/sun/star/frame/XDispatchProvider.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_XSTATUSLISTENER_HXX_
-#include <smart/com/sun/star/frame/XStatusListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_FRAMESEARCHFLAG_HXX_
-#include <smart/com/sun/star/frame/FrameSearchFlag.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_XDISPATCHPROVIDERINTERCEPTION_HXX_
-#include <smart/com/sun/star/frame/XDispatchProviderInterception.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_FEATURESTATEEVENT_HXX_
-#include <smart/com/sun/star/frame/FeatureStateEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_DISPATCHDESCRIPTOR_HXX_
-#include <smart/com/sun/star/frame/DispatchDescriptor.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_XFRAMEACTIONLISTENER_HXX_
-#include <smart/com/sun/star/frame/XFrameActionListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HXX_
-#include <smart/com/sun/star/frame/XComponentLoader.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_XFRAME_HXX_
-#include <smart/com/sun/star/frame/XFrame.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_FRAMEACTIONEVENT_HXX_
-#include <smart/com/sun/star/frame/FrameActionEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_FRAMEACTION_HXX_
-#include <smart/com/sun/star/frame/FrameAction.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_UTIL_XURLTRANSFORMER_HXX_
-#include <smart/com/sun/star/util/XURLTransformer.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_TASK_XSTATUSINDICATORFACTORY_HXX_
-#include <smart/com/sun/star/task/XStatusIndicatorFactory.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_TASK_XSTATUSINDICATORSUPPLIER_HXX_
-#include <smart/com/sun/star/task/XStatusIndicatorSupplier.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_TASK_XSTATUSINDICATOR_HXX_
-#include <smart/com/sun/star/task/XStatusIndicator.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_XBROWSEHISTORYREGISTRY_HXX_
-#include <smart/com/sun/star/frame/XBrowseHistoryRegistry.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_IO_BUFFERSIZEEXCEEDEDEXCEPTION_HXX_
-#include <smart/com/sun/star/io/BufferSizeExceededException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_IO_NOTCONNECTEDEXCEPTION_HXX_
-#include <smart/com/sun/star/io/NotConnectedException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_IO_IOEXCEPTION_HXX_
-#include <smart/com/sun/star/io/IOException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_IO_UNEXPECTEDEOFEXCEPTION_HXX_
-#include <smart/com/sun/star/io/UnexpectedEOFException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_IO_WRONGFORMATEXCEPTION_HXX_
-#include <smart/com/sun/star/io/WrongFormatException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_SERVICENOTREGISTEREDEXCEPTION_HXX_
-#include <smart/com/sun/star/lang/ServiceNotRegisteredException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_NULLPOINTEREXCEPTION_HXX_
-#include <smart/com/sun/star/lang/NullPointerException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_CLASSNOTFOUNDEXCEPTION_HXX_
-#include <smart/com/sun/star/lang/ClassNotFoundException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_NOSUCHMETHODEXCEPTION_HXX_
-#include <smart/com/sun/star/lang/NoSuchMethodException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_SECURITYEXCEPTION_HXX_
-#include <smart/com/sun/star/lang/SecurityException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_NOSUCHFIELDEXCEPTION_HXX_
-#include <smart/com/sun/star/lang/NoSuchFieldException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HXX_
-#include <smart/com/sun/star/lang/DisposedException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_ARRAYINDEXOUTOFBOUNDSEXCEPTION_HXX_
-#include <smart/com/sun/star/lang/ArrayIndexOutOfBoundsException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_ILLEGALACCESSEXCEPTION_HXX_
-#include <smart/com/sun/star/lang/IllegalAccessException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_INDEXOUTOFBOUNDSEXCEPTION_HXX_
-#include <smart/com/sun/star/lang/IndexOutOfBoundsException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_HXX_
-#include <smart/com/sun/star/lang/IllegalArgumentException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_NOSUPPORTEXCEPTION_HXX_
-#include <smart/com/sun/star/lang/NoSupportException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_WRAPPEDTARGETEXCEPTION_HXX_
-#include <smart/com/sun/star/lang/WrappedTargetException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_REFLECTION_PARAMINFO_HXX_
-#include <smart/com/sun/star/reflection/ParamInfo.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLARRAY_HXX_
-#include <smart/com/sun/star/reflection/XIdlArray.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLCLASSPROVIDER_HXX_
-#include <smart/com/sun/star/reflection/XIdlClassProvider.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_REFLECTION_FIELDACCESSMODE_HXX_
-#include <smart/com/sun/star/reflection/FieldAccessMode.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLCLASS_HXX_
-#include <smart/com/sun/star/reflection/XIdlClass.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLFIELD_HXX_
-#include <smart/com/sun/star/reflection/XIdlField.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_REFLECTION_PARAMMODE_HXX_
-#include <smart/com/sun/star/reflection/ParamMode.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_REFLECTION_METHODMODE_HXX_
-#include <smart/com/sun/star/reflection/MethodMode.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLMEMBER_HXX_
-#include <smart/com/sun/star/reflection/XIdlMember.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLREFLECTION_HXX_
-#include <smart/com/sun/star/reflection/XIdlReflection.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLMETHOD_HXX_
-#include <smart/com/sun/star/reflection/XIdlMethod.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_REFLECTION_INVOCATIONTARGETEXCEPTION_HXX_
-#include <smart/com/sun/star/reflection/InvocationTargetException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYVALUES_HXX_
-#include <smart/com/sun/star/beans/PropertyValues.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYSET_HXX_
-#include <smart/com/sun/star/beans/XPropertySet.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYVALUE_HXX_
-#include <smart/com/sun/star/beans/PropertyValue.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYSTATE_HXX_
-#include <smart/com/sun/star/beans/PropertyState.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYSETINFO_HXX_
-#include <smart/com/sun/star/beans/XPropertySetInfo.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_XMULTIPROPERTYSET_HXX_
-#include <smart/com/sun/star/beans/XMultiPropertySet.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_XFASTPROPERTYSET_HXX_
-#include <smart/com/sun/star/beans/XFastPropertySet.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_XVETOABLECHANGELISTENER_HXX_
-#include <smart/com/sun/star/beans/XVetoableChangeListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYSTATE_HXX_
-#include <smart/com/sun/star/beans/XPropertyState.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYSTATECHANGELISTENER_HXX_
-#include <smart/com/sun/star/beans/XPropertyStateChangeListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HXX_
-#include <smart/com/sun/star/beans/PropertyAttribute.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTIESCHANGELISTENER_HXX_
-#include <smart/com/sun/star/beans/XPropertiesChangeListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYCHANGELISTENER_HXX_
-#include <smart/com/sun/star/beans/XPropertyChangeListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYACCESS_HXX_
-#include <smart/com/sun/star/beans/XPropertyAccess.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYCONTAINER_HXX_
-#include <smart/com/sun/star/beans/XPropertyContainer.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYSTATECHANGEEVENT_HXX_
-#include <smart/com/sun/star/beans/PropertyStateChangeEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYCHANGEEVENT_HXX_
-#include <smart/com/sun/star/beans/PropertyChangeEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_UNKNOWNPROPERTYEXCEPTION_HXX_
-#include <smart/com/sun/star/beans/UnknownPropertyException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_INTROSPECTIONEXCEPTION_HXX_
-#include <smart/com/sun/star/beans/IntrospectionException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYEXISTEXCEPTION_HXX_
-#include <smart/com/sun/star/beans/PropertyExistException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_ILLEGALTYPEEXCEPTION_HXX_
-#include <smart/com/sun/star/beans/IllegalTypeException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYVETOEXCEPTION_HXX_
-#include <smart/com/sun/star/beans/PropertyVetoException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_CONTAINER_XENUMERATIONACCESS_HXX_
-#include <smart/com/sun/star/container/XEnumerationAccess.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_CONTAINER_XHIERARCHICALNAMEACCESS_HXX_
-#include <smart/com/sun/star/container/XHierarchicalNameAccess.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_CONTAINER_XNAMEACCESS_HXX_
-#include <smart/com/sun/star/container/XNameAccess.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_CONTAINER_XCONTENTENUMERATIONACCESS_HXX_
-#include <smart/com/sun/star/container/XContentEnumerationAccess.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_CONTAINER_XENUMERATION_HXX_
-#include <smart/com/sun/star/container/XEnumeration.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_CONTAINER_XELEMENTACCESS_HXX_
-#include <smart/com/sun/star/container/XElementAccess.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_CONTAINER_XINDEXACCESS_HXX_
-#include <smart/com/sun/star/container/XIndexAccess.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_XEVENTLISTENER_HXX_
-#include <smart/com/sun/star/lang/XEventListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_EVENTOBJECT_HXX_
-#include <smart/com/sun/star/lang/EventObject.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_SCRIPT_XALLLISTENERADAPTERSERVICE_HXX_
-#include <smart/com/sun/star/script/XAllListenerAdapterService.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_SCRIPT_XALLLISTENER_HXX_
-#include <smart/com/sun/star/script/XAllListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_SCRIPT_ALLEVENTOBJECT_HXX_
-#include <smart/com/sun/star/script/AllEventObject.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_CONTAINER_XCOMPONENTENUMERATION_HXX_
-#include <smart/com/sun/star/container/XComponentEnumeration.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_XCOMPONENT_HXX_
-#include <smart/com/sun/star/lang/XComponent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_CONTAINER_XCOMPONENTENUMERATIONACCESS_HXX_
-#include <smart/com/sun/star/container/XComponentEnumerationAccess.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_LISTENEREXISTEXCEPTION_HXX_
-#include <smart/com/sun/star/lang/ListenerExistException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_CONTAINER_ELEMENTEXISTEXCEPTION_HXX_
-#include <smart/com/sun/star/container/ElementExistException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_INVALIDLISTENEREXCEPTION_HXX_
-#include <smart/com/sun/star/lang/InvalidListenerException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_CONTAINER_NOSUCHELEMENTEXCEPTION_HXX_
-#include <smart/com/sun/star/container/NoSuchElementException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XKEYLISTENER_HXX_
-#include <smart/com/sun/star/awt/XKeyListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XPAINTLISTENER_HXX_
-#include <smart/com/sun/star/awt/XPaintListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_KEYEVENT_HXX_
-#include <smart/com/sun/star/awt/KeyEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_KEYMODIFIER_HXX_
-#include <smart/com/sun/star/awt/KeyModifier.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XMOUSEMOTIONLISTENER_HXX_
-#include <smart/com/sun/star/awt/XMouseMotionListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_FOCUSEVENT_HXX_
-#include <smart/com/sun/star/awt/FocusEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XWINDOWLISTENER_HXX_
-#include <smart/com/sun/star/awt/XWindowListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XACTIVATELISTENER_HXX_
-#include <smart/com/sun/star/awt/XActivateListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_MOUSEEVENT_HXX_
-#include <smart/com/sun/star/awt/MouseEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XTOPWINDOWLISTENER_HXX_
-#include <smart/com/sun/star/awt/XTopWindowListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_PAINTEVENT_HXX_
-#include <smart/com/sun/star/awt/PaintEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_INPUTEVENT_HXX_
-#include <smart/com/sun/star/awt/InputEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_KEYGROUP_HXX_
-#include <smart/com/sun/star/awt/KeyGroup.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_KEY_HXX_
-#include <smart/com/sun/star/awt/Key.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_WINDOWEVENT_HXX_
-#include <smart/com/sun/star/awt/WindowEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XMOUSELISTENER_HXX_
-#include <smart/com/sun/star/awt/XMouseListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_KEYFUNCTION_HXX_
-#include <smart/com/sun/star/awt/KeyFunction.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_FOCUSCHANGEREASON_HXX_
-#include <smart/com/sun/star/awt/FocusChangeReason.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_MOUSEBUTTON_HXX_
-#include <smart/com/sun/star/awt/MouseButton.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XFOCUSLISTENER_HXX_
-#include <smart/com/sun/star/awt/XFocusListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XADJUSTMENTLISTENER_HXX_
-#include <smart/com/sun/star/awt/XAdjustmentListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XACTIONLISTENER_HXX_
-#include <smart/com/sun/star/awt/XActionListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XTEXTLISTENER_HXX_
-#include <smart/com/sun/star/awt/XTextListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XSPINLISTENER_HXX_
-#include <smart/com/sun/star/awt/XSpinListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XITEMLISTENER_HXX_
-#include <smart/com/sun/star/awt/XItemListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XVCLCONTAINERLISTENER_HXX_
-#include <smart/com/sun/star/awt/XVclContainerListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XFILEDIALOG_HXX_
-#include <smart/com/sun/star/awt/XFileDialog.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XTEXTCOMPONENT_HXX_
-#include <smart/com/sun/star/awt/XTextComponent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XLISTBOX_HXX_
-#include <smart/com/sun/star/awt/XListBox.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XPROGRESSMONITOR_HXX_
-#include <smart/com/sun/star/awt/XProgressMonitor.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_TEXTALIGN_HXX_
-#include <smart/com/sun/star/awt/TextAlign.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XSCROLLBAR_HXX_
-#include <smart/com/sun/star/awt/XScrollBar.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XVCLCONTAINERPEER_HXX_
-#include <smart/com/sun/star/awt/XVclContainerPeer.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XTABCONTROLLERMODEL_HXX_
-#include <smart/com/sun/star/awt/XTabControllerModel.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XMESSAGEBOX_HXX_
-#include <smart/com/sun/star/awt/XMessageBox.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XTEXTEDITFIELD_HXX_
-#include <smart/com/sun/star/awt/XTextEditField.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_STYLE_HXX_
-#include <smart/com/sun/star/awt/Style.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XTIMEFIELD_HXX_
-#include <smart/com/sun/star/awt/XTimeField.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XVCLWINDOWPEER_HXX_
-#include <smart/com/sun/star/awt/XVclWindowPeer.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XCONTROLMODEL_HXX_
-#include <smart/com/sun/star/awt/XControlModel.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XSPINFIELD_HXX_
-#include <smart/com/sun/star/awt/XSpinField.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XUNOCONTROLCONTAINER_HXX_
-#include <smart/com/sun/star/awt/XUnoControlContainer.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XTEXTLAYOUTCONSTRAINS_HXX_
-#include <smart/com/sun/star/awt/XTextLayoutConstrains.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XNUMERICFIELD_HXX_
-#include <smart/com/sun/star/awt/XNumericField.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XBUTTON_HXX_
-#include <smart/com/sun/star/awt/XButton.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XTEXTAREA_HXX_
-#include <smart/com/sun/star/awt/XTextArea.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XIMAGEBUTTON_HXX_
-#include <smart/com/sun/star/awt/XImageButton.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XFIXEDTEXT_HXX_
-#include <smart/com/sun/star/awt/XFixedText.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XCONTROLCONTAINER_HXX_
-#include <smart/com/sun/star/awt/XControlContainer.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XDIALOG_HXX_
-#include <smart/com/sun/star/awt/XDialog.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_SCROLLBARORIENTATION_HXX_
-#include <smart/com/sun/star/awt/ScrollBarOrientation.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XRADIOBUTTON_HXX_
-#include <smart/com/sun/star/awt/XRadioButton.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XCURRENCYFIELD_HXX_
-#include <smart/com/sun/star/awt/XCurrencyField.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XPATTERNFIELD_HXX_
-#include <smart/com/sun/star/awt/XPatternField.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_VCLWINDOWPEERATTRIBUTE_HXX_
-#include <smart/com/sun/star/awt/VclWindowPeerAttribute.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XTABCONTROLLER_HXX_
-#include <smart/com/sun/star/awt/XTabController.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XVCLCONTAINER_HXX_
-#include <smart/com/sun/star/awt/XVclContainer.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XDATEFIELD_HXX_
-#include <smart/com/sun/star/awt/XDateField.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XCOMBOBOX_HXX_
-#include <smart/com/sun/star/awt/XComboBox.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XCONTROL_HXX_
-#include <smart/com/sun/star/awt/XControl.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XCHECKBOX_HXX_
-#include <smart/com/sun/star/awt/XCheckBox.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_MESSAGEBOXCOMMAND_HXX_
-#include <smart/com/sun/star/awt/MessageBoxCommand.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XLAYOUTCONSTRAINS_HXX_
-#include <smart/com/sun/star/awt/XLayoutConstrains.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XPROGRESSBAR_HXX_
-#include <smart/com/sun/star/awt/XProgressBar.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_SIMPLEFONTMETRIC_HXX_
-#include <smart/com/sun/star/awt/SimpleFontMetric.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_FONTWEIGHT_HXX_
-#include <smart/com/sun/star/awt/FontWeight.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_FONTSLANT_HXX_
-#include <smart/com/sun/star/awt/FontSlant.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_CHARSET_HXX_
-#include <smart/com/sun/star/awt/CharSet.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_FONTDESCRIPTOR_HXX_
-#include <smart/com/sun/star/awt/FontDescriptor.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_FONTWIDTH_HXX_
-#include <smart/com/sun/star/awt/FontWidth.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XFONT_HXX_
-#include <smart/com/sun/star/awt/XFont.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_FONTTYPE_HXX_
-#include <smart/com/sun/star/awt/FontType.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_FONTUNDERLINE_HXX_
-#include <smart/com/sun/star/awt/FontUnderline.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_FONTSTRIKEOUT_HXX_
-#include <smart/com/sun/star/awt/FontStrikeout.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_FONTFAMILY_HXX_
-#include <smart/com/sun/star/awt/FontFamily.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_FONTPITCH_HXX_
-#include <smart/com/sun/star/awt/FontPitch.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XTOPWINDOW_HXX_
-#include <smart/com/sun/star/awt/XTopWindow.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XWINDOW_HXX_
-#include <smart/com/sun/star/awt/XWindow.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_POSSIZE_HXX_
-#include <smart/com/sun/star/awt/PosSize.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_VCLCONTAINEREVENT_HXX_
-#include <smart/com/sun/star/awt/VclContainerEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_ITEMEVENT_HXX_
-#include <smart/com/sun/star/awt/ItemEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_SPINEVENT_HXX_
-#include <smart/com/sun/star/awt/SpinEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_TEXTEVENT_HXX_
-#include <smart/com/sun/star/awt/TextEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_ADJUSTMENTTYPE_HXX_
-#include <smart/com/sun/star/awt/AdjustmentType.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_ACTIONEVENT_HXX_
-#include <smart/com/sun/star/awt/ActionEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_ADJUSTMENTEVENT_HXX_
-#include <smart/com/sun/star/awt/AdjustmentEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_RECTANGLE_HXX_
-#include <smart/com/sun/star/awt/Rectangle.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_SELECTION_HXX_
-#include <smart/com/sun/star/awt/Selection.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_SIZE_HXX_
-#include <smart/com/sun/star/awt/Size.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_WINDOWDESCRIPTOR_HXX_
-#include <smart/com/sun/star/awt/WindowDescriptor.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_INVALIDATESTYLE_HXX_
-#include <smart/com/sun/star/awt/InvalidateStyle.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XTOOLKIT_HXX_
-#include <smart/com/sun/star/awt/XToolkit.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XWINDOWPEER_HXX_
-#include <smart/com/sun/star/awt/XWindowPeer.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_WINDOWCLASS_HXX_
-#include <smart/com/sun/star/awt/WindowClass.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XSYSTEMDEPENDENTWINDOWPEER_HXX_
-#include <smart/com/sun/star/awt/XSystemDependentWindowPeer.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_WINDOWATTRIBUTE_HXX_
-#include <smart/com/sun/star/awt/WindowAttribute.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XPOINTER_HXX_
-#include <smart/com/sun/star/awt/XPointer.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_SYSTEMPOINTER_HXX_
-#include <smart/com/sun/star/awt/SystemPointer.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XVIEW_HXX_
-#include <smart/com/sun/star/awt/XView.hxx>
-#endif
-#include <usr/refl.hxx>
-#include <sfx2/msg.hxx>
-#include <svl/itemset.hxx>
-#include <sfx2/basedlgs.hxx>
-#include <vcl/floatwin.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/window.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/frame.hxx>
-#include <sfx2/objface.hxx>
-#include <vcl/event.hxx>
-#include <svl/eitem.hxx>
-#include <svl/intitem.hxx>
-#include <symbol.hxx>
-#include <svl/itempool.hxx>
-#include <vcl/image.hxx>
-#include <vcl/metric.hxx>
-#include <sfx2/inimgr.hxx>
-#include <node.hxx>
-#include <tools/pstm.hxx>
-#include <tools/table.hxx>
-#include <sfx2/docfac.hxx>
-#include <svl/ownlist.hxx>
-#include <sfx2/objsh.hxx>
-#include <svl/stritem.hxx>
-#include <vcl/mapmod.hxx>
-#include <sfx2/ipfrm.hxx>
-#include <vcl/dialog.hxx>
-#include <sfx2/dispatch.hxx>
-#include <svl/svstdarr.hxx>
-#include <sfx2/bindings.hxx>
-#include <dialog.hxx>
-#include <vcl/button.hxx>
-#include <vcl/symbol.hxx>
-#include <sfx2/tabdlg.hxx>
-#include <vcl/button.hxx>
-#include <vcl/tabdlg.hxx>
-#include <vcl/tabpage.hxx>
-#include <vcl/tabctrl.hxx>
-#include <vcl/group.hxx>
-#include <svx/optgenrl.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/group.hxx>
-#include <document.hxx>
-#include <vcl/field.hxx>
-#include <vcl/spinfld.hxx>
-#include <vcl/menubtn.hxx>
-#include <vcl/scrbar.hxx>
-#include <svtools/ctrlbox.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/combobox.hxx>
-#include <vcl/field.hxx>
-#include <svtools/ctrltool.hxx>
-#include <sfx2/interno.hxx>
-#include <sfx2/sfxdefs.hxx>
-#include <sfx2/childwin.hxx>
-#include <sfx2/chalign.hxx>
-#include <vcl/floatwin.hxx>
-#include <sot/storage.hxx>
-#include <rsc/rscsfx.hxx>
-#include <vcl/msgbox.hxx>
-#include <vcl/btndlg.hxx>
-#include <uno/uno.h>
-#include <uno/string.h>
-#include <uno/sequence.h>
-#include <uno/any.h>
-#include <uno/exceptn.h>
-#include <uno/intrface.h>
-#include <uno/factory.h>
-#include <uno/api.h>
-#include <svx/svxids.hrc>
-#include <view.hxx>
-#include <sfx2/dockwin.hxx>
-#include <vcl/dockwin.hxx>
-#include <sfx2/viewsh.hxx>
-#include <sfx2/clientsh.hxx>
-#include <svtools/scrwin.hxx>
-#include <vcl/scrbar.hxx>
-#include <sfx2/ctrlitem.hxx>
-#include <sfx2/viewfac.hxx>
-#include <edit.hxx>
-#include <editeng/editdata.hxx>
-#include <toolbox.hxx>
-#include <vcl/toolbox.hxx>
-#include <vcl/dockwin.hxx>
-#include <smslots.hxx>
-#include <svl/undo.hxx>
-#include <sfx2/request.hxx>
-#include <svl/whiter.hxx>
-#include <vcl/prntypes.hxx>
-#include <vcl/jobset.hxx>
-#include <vcl/gdimtf.hxx>
-#include <sot/exchange.hxx>
-#include <vcl/wrkwin.hxx>
-#include <tools/sstring.hxx>
-#include <action.hxx>
-#include <sfx2/filedlg.hxx>
-#include <sfx2/iodlg.hxx>

svtools/inc/pch/precompiled_svtools.hxx

 #include <unotools/processfactory.hxx>
 
 #include <vcl/dndhelp.hxx>
-#include <vcl/fldunit.hxx>
-#include <vcl/mapunit.hxx>
+#include <tools/fldunit.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/unohelp.hxx>
 
 #include <vos/mutex.hxx>

svtools/inc/svtools/embedhlp.hxx

 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <vcl/graph.hxx>
-#ifndef _SV_MAPUNIT_HXX
-#include <vcl/mapunit.hxx>
-#endif
+#include <tools/mapunit.hxx>
 #include <rtl/ustring.hxx>
 
 #define NS_UNO ::com::sun::star::uno

svtools/inc/svtools/svmedit.hxx

 #ifndef _SVEDIT_HXX
 #define _SVEDIT_HXX
 
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <vcl/edit.hxx>
 
 #include <svtools/syntaxhighlight.hxx>

svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx

 #ifndef _SV_FILTER_OPTIONS_DIALOG_HXX_
 #define _SV_FILTER_OPTIONS_DIALOG_HXX_
 
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
 #include <cppuhelper/implbase5.hxx>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>

svtools/source/misc/ehdl.cxx

 #include <vos/mutex.hxx>
 #include <tools/debug.hxx>
 #include <tools/rcid.h>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 #if defined(OS2)

svtools/source/misc/embedtransfer.cxx

 #include <com/sun/star/embed/Aspects.hpp>
 
 #include <svtools/embedtransfer.hxx>
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/outdev.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <unotools/ucbstreamhelper.hxx>

svx/inc/fmgridif.hxx

 #include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
 
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <toolkit/controls/unocontrol.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <comphelper/uno3.hxx>

svx/inc/pch/precompiled_svx.hxx

 #include "vcl/cursor.hxx"
 #include "vcl/decoview.hxx"
 #include "vcl/dndhelp.hxx"
-#include "vcl/fldunit.hxx"
+#include "tools/fldunit.hxx"
 #include "vcl/fntstyle.hxx"
 #include "unotools/fontcvt.hxx"
 #include "vcl/gdimtf.hxx"
 #include "vcl/unohelp.hxx"
 #include "vcl/unohelp2.hxx"
 #include "vcl/wall.hxx"
-#include "vcl/wintypes.hxx"
+#include "tools/wintypes.hxx"
 #include "vos/mutex.hxx"
 #include "vos/ref.hxx"
 #include "vos/refernce.hxx"

svx/inc/svx/fmtools.hxx

 #include <com/sun/star/util/XNumberFormatter.hpp>
 #include <com/sun/star/util/XNumberFormats.hpp>
 
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <comphelper/uno3.hxx>
 #include <comphelper/stl_types.hxx>

svx/source/unodraw/unoprov.cxx

 #include <com/sun/star/media/ZoomLevel.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
 #include <tools/shl.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>

sw/inc/modcfg.hxx

 #define _MODOPT_HXX
 
 #include <tools/string.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <vcl/field.hxx>
 #include <svl/svarray.hxx>
 #include <unotools/configitem.hxx>

sw/inc/swmodule.hxx

 #define _SWMODULE_HXX
 #include <tools/link.hxx>
 #include <tools/string.hxx>
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
 #include <svl/lstner.hxx>
 #include <unotools/options.hxx>
 #include <sfx2/module.hxx>

sw/source/filter/xml/xmliteme.cxx

 #include "xmlbrshe.hxx"
 #include <editeng/tstpitem.hxx>
 #include <editeng/brshitem.hxx>
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
 #include <swmodule.hxx>
 #include <doc.hxx>
 #include "fmtornt.hxx"

sw/source/ui/inc/uitool.hxx

 #ifndef _UITOOL_HXX
 #define _UITOOL_HXX
 
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <vcl/field.hxx>
 #include <swtypes.hxx>
 #include "swdllapi.h"

sw/source/ui/inc/usrpref.hxx

 #include <unotools/configitem.hxx>
 #include <fldupde.hxx>
 #include "viewopt.hxx"
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
 
 /* -----------------------------28.09.00 09:45--------------------------------
 

toolkit/inc/layout/layout.hxx

 #include <tools/string.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/combobox.h>
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
 #include <vcl/lstbox.h>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 
 class Button;
 class ComboBox;

toolkit/inc/pch/precompiled_toolkit.hxx

 #include "vcl/gradient.hxx"
 #include "vcl/image.hxx"
 #include "vcl/jobset.hxx"
-#include "vcl/mapunit.hxx"
+#include "tools/mapunit.hxx"
 #include "vcl/menu.hxx"
 #include "vcl/metric.hxx"
 #include "vcl/outdev.hxx"

toolkit/inc/toolkit/awt/vclxtoolkit.hxx

 #include <osl/mutex.hxx>
 #include <osl/module.h>
 #include <tools/link.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 
 #include <toolkit/dllapi.h>
 

toolkit/inc/toolkit/helper/vclunohelper.hxx

 #include <vcl/bitmapex.hxx>
 #include <vcl/region.hxx>
 #include <vcl/metric.hxx>
-#include <vcl/mapunit.hxx>
-#include <vcl/fldunit.hxx>
+#include <tools/mapunit.hxx>
+#include <tools/fldunit.hxx>
 #include <tools/poly.hxx>
 
 class Window;

toolkit/source/awt/vclxplugin.hxx

 #define LAYOUT_AWT_VCLXPLUGIN_HXX
 
 #include <toolkit/awt/vclxwindow.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 
 class Control;
 namespace layoutimpl