diff options
Diffstat (limited to 'vcl/source')
137 files changed, 803 insertions, 1223 deletions
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index b48db1d6ee97..f5fa628b3c28 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -37,14 +37,10 @@ #include <cmath> #include <limits.h> -#include "vcl/svdata.hxx" -#include "svsys.h" - -#ifdef WNT -#undef min -#endif #include "tools/debug.hxx" -#include "vcl/svdata.hxx" + +#include "vos/mutex.hxx" + #include "vcl/svapp.hxx" #include "vcl/event.hxx" #include "vcl/lstbox.hxx" @@ -57,13 +53,21 @@ #include "vcl/wrkwin.hxx" #include "vcl/sound.hxx" #include "vcl/threadex.hxx" -#include "vcl/dbggui.hxx" -#include "com/sun/star/i18n/XCharacterClassification.hpp" + +#ifdef WNT +#undef min +#endif +#include "svdata.hxx" +#include "dbggui.hxx" #include "vcl/unohelp.hxx" #include "vcl/unohelp2.hxx" -#include "vos/mutex.hxx" -#include "vcl/salinst.hxx" + +#include "salinst.hxx" +#include "svdata.hxx" +// #include "svsys.h" + +#include "com/sun/star/i18n/XCharacterClassification.hpp" #include <map> #include <algorithm> diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 2c7ad2fa9c3e..a952ad798655 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -28,15 +28,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "vcl/svdata.hxx" +#include "tools/debug.hxx" +#include "tools/time.hxx" + #include "vcl/window.hxx" #include "vcl/event.hxx" #include "vcl/svapp.hxx" #include "vcl/wrkwin.hxx" #include "vcl/help.hxx" -#include "vcl/helpwin.hxx" -#include "tools/debug.hxx" -#include "tools/time.hxx" + +#include "helpwin.hxx" +#include "svdata.hxx" // ======================================================================= diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx index 17bc760ff5fc..1083b3e26899 100644 --- a/vcl/source/app/i18nhelp.cxx +++ b/vcl/source/app/i18nhelp.cxx @@ -28,16 +28,18 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "vcl/i18nhelp.hxx" - -#include "com/sun/star/lang/XMultiServiceFactory.hpp" -#include "com/sun/star/i18n/TransliterationModules.hpp" #include "unotools/localedatawrapper.hxx" #include "unotools/transliterationwrapper.hxx" + #include "i18npool/mslangid.hxx" #include "rtl/ustrbuf.hxx" +#include "vcl/i18nhelp.hxx" + +#include "com/sun/star/lang/XMultiServiceFactory.hpp" +#include "com/sun/star/i18n/TransliterationModules.hpp" + using namespace ::com::sun::star; vcl::I18nHelper::I18nHelper( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMSF, const ::com::sun::star::lang::Locale& rLocale ) diff --git a/vcl/source/app/idlemgr.cxx b/vcl/source/app/idlemgr.cxx index 0318bc5d6f2d..0507f2174476 100644 --- a/vcl/source/app/idlemgr.cxx +++ b/vcl/source/app/idlemgr.cxx @@ -27,10 +27,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/list.hxx> -#include <vcl/idlemgr.hxx> + #include <vcl/svapp.hxx> +#include <idlemgr.hxx> + // ======================================================================= struct ImplIdleData diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 73eaa8f965d2..cd92eb146fd7 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -28,16 +28,16 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/salframe.hxx> -#include <vcl/salinst.hxx> -#include <vcl/salvd.hxx> -#include <vcl/salprn.hxx> -#include <vcl/saltimer.hxx> -#include <vcl/salimestatus.hxx> -#include <vcl/salsys.hxx> -#include <vcl/salbmp.hxx> -#include <vcl/salobj.hxx> -#include <vcl/salmenu.hxx> +#include <salframe.hxx> +#include <salinst.hxx> +#include <salvd.hxx> +#include <salprn.hxx> +#include <saltimer.hxx> +#include <salimestatus.hxx> +#include <salsys.hxx> +#include <salbmp.hxx> +#include <salobj.hxx> +#include <salmenu.hxx> // this file contains the virtual destructors of the sal interface // compilers ususally put their vtables where the destructor is diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx index c65eb13224e1..b7c952b6eff9 100644 --- a/vcl/source/app/session.cxx +++ b/vcl/source/app/session.cxx @@ -27,12 +27,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/svapp.hxx> -#include <vcl/svdata.hxx> -#include <vcl/salinst.hxx> -#include <vcl/salsession.hxx> + #include <cppuhelper/compbase1.hxx> + #include <tools/debug.hxx> + +#include <vcl/svapp.hxx> + +#include <svdata.hxx> +#include <salinst.hxx> +#include <salsession.hxx> + #include <com/sun/star/frame/XSessionManagerClient.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XSessionManagerListener2.hpp> diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index dbc792039f80..81865de12e14 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -27,24 +27,26 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include "tools/debug.hxx" + #include "i18npool/mslangid.hxx" + #include "vcl/svapp.hxx" -#include "vcl/svdata.hxx" #include "vcl/event.hxx" #include "vcl/settings.hxx" #include "vcl/i18nhelp.hxx" -#include "unotools/fontcfg.hxx" #include "vcl/configsettings.hxx" #include "vcl/gradient.hxx" #include "vcl/unohelp.hxx" #include "vcl/bitmapex.hxx" -#include "vcl/impimagetree.hxx" + +#include "unotools/fontcfg.hxx" #include "unotools/localedatawrapper.hxx" #include "unotools/collatorwrapper.hxx" #include "unotools/configmgr.hxx" #include "unotools/confignode.hxx" -#include <unotools/syslocaleoptions.hxx> +#include "unotools/syslocaleoptions.hxx" #ifdef WNT #include "tools/prewin.h" @@ -52,6 +54,9 @@ #include "tools/postwin.h" #endif +#include "svdata.hxx" +#include "impimagetree.hxx" + using namespace rtl; // ======================================================================= diff --git a/vcl/source/app/sound.cxx b/vcl/source/app/sound.cxx index d180f2647135..9c9caa81da49 100644 --- a/vcl/source/app/sound.cxx +++ b/vcl/source/app/sound.cxx @@ -27,22 +27,21 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/urlobj.hxx> +#include <tools/debug.hxx> + #include <unotools/localfilehelper.hxx> -#ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX #include <unotools/ucbstreamhelper.hxx> -#endif -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salframe.hxx> -#include <tools/debug.hxx> -#include <vcl/svdata.hxx> + #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/salbtype.hxx> #include <vcl/sound.hxx> -#include <vcl/salinst.hxx> + +#include <salframe.hxx> +#include <svdata.hxx> +#include <salinst.hxx> void Sound::Beep( SoundType eType, Window* pWindow ) { diff --git a/vcl/source/app/stdtext.cxx b/vcl/source/app/stdtext.cxx index 176ec5a1b4c6..a34da349da17 100644 --- a/vcl/source/app/stdtext.cxx +++ b/vcl/source/app/stdtext.cxx @@ -28,13 +28,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif -#include <vcl/svdata.hxx> #include <vcl/msgbox.hxx> #include <vcl/stdtext.hxx> +#include <svids.hrc> +#include <svdata.hxx> // ======================================================================= diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index dd1ea7c0469e..6f810c3cc470 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -28,52 +28,58 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "svsys.h" -#include "vcl/salinst.hxx" -#include "vcl/salframe.hxx" -#include "vcl/salsys.hxx" +//#include "svsys.h" + +#include "comphelper/processfactory.hxx" + +#include "osl/module.h" +#include "osl/file.hxx" +#include "osl/thread.h" + +#include "rtl/tencinfo.h" +#include "rtl/instance.hxx" + #include "vos/process.hxx" #include "vos/mutex.hxx" + #include "tools/tools.h" #include "tools/debug.hxx" #include "tools/time.hxx" + #include "i18npool/mslangid.hxx" -#include "vcl/svdata.hxx" + +#include "unotools/syslocaleoptions.hxx" + #include "vcl/settings.hxx" -#include "vcl/accmgr.hxx" #include "vcl/keycod.hxx" #include "vcl/event.hxx" #include "vcl/vclevent.hxx" #include "vcl/virdev.hxx" -#include "vcl/window.h" #include "vcl/wrkwin.hxx" -#include "vcl/idlemgr.hxx" #include "vcl/svapp.hxx" #include "vcl/cvtgrf.hxx" #include "vcl/unowrap.hxx" -#include "vcl/xconnection.hxx" -#include "vcl/svids.hrc" #include "vcl/timer.hxx" - #include "vcl/unohelp.hxx" +#include "vcl/lazydelete.hxx" + +#include "salinst.hxx" +#include "salframe.hxx" +#include "salsys.hxx" +#include "svdata.hxx" +#include "salimestatus.hxx" +#include "xconnection.hxx" +#include "window.h" +#include "accmgr.hxx" +#include "idlemgr.hxx" +#include "svids.hrc" #include "com/sun/star/uno/Reference.h" #include "com/sun/star/awt/XToolkit.hpp" #include "com/sun/star/uno/XNamingService.hpp" #include "com/sun/star/lang/XMultiServiceFactory.hpp" -#include "comphelper/processfactory.hxx" - -#include "osl/module.h" -#include "osl/file.hxx" - -#include "osl/thread.h" -#include "rtl/tencinfo.h" -#include "rtl/instance.hxx" -#include "vcl/salimestatus.hxx" #include <utility> -#include <vcl/lazydelete.hxx> -#include <unotools/syslocaleoptions.hxx> using namespace ::com::sun::star::uno; diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index 935d2c1894ea..023bd332d0a1 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -31,35 +31,37 @@ #include <string.h> #include "rtl/instance.hxx" + #include "osl/process.h" #include "osl/file.hxx" -#include "svsys.h" - #include "tools/debug.hxx" #include "tools/resary.hxx" -#include "vcl/salinst.hxx" -#include "vcl/salframe.hxx" +#include "unotools/fontcfg.hxx" + +#include "vos/mutex.hxx" + +#include "cppuhelper/implbase1.hxx" + +#include "uno/current_context.hxx" + #include "vcl/configsettings.hxx" -#include "vcl/svdata.hxx" -#include "vcl/window.h" #include "vcl/svapp.hxx" #include "vcl/wrkwin.hxx" #include "vcl/msgbox.hxx" #include "vcl/unohelp.hxx" #include "vcl/button.hxx" // for Button::GetStandardText #include "vcl/dockwin.hxx" // for DockingManager -#include "vcl/salimestatus.hxx" -#include "vcl/salsys.hxx" -#include "vcl/svids.hrc" -#include "unotools/fontcfg.hxx" +#include "salinst.hxx" +#include "salframe.hxx" +#include "svdata.hxx" +#include "window.h" +#include "salimestatus.hxx" +#include "salsys.hxx" +#include "svids.hrc" -#include "vos/mutex.hxx" - -#include "cppuhelper/implbase1.hxx" -#include "uno/current_context.hxx" #include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "com/sun/star/lang/XComponent.hpp" diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 4efa2b659e7c..1fc6b4952802 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -28,6 +28,32 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" +#include "rtl/logfile.hxx" + +#include "osl/file.hxx" + +#include "vos/signal.hxx" +#include "vos/process.hxx" + +#include "tools/tools.h" +#include "tools/debug.hxx" +#include "tools/unqid.hxx" +#include "tools/resmgr.hxx" + +#include "comphelper/processfactory.hxx" + +#include "unotools/syslocaleoptions.hxx" +#include "unotools/fontcfg.hxx" + +#include "vcl/svapp.hxx" +#include "vcl/wrkwin.hxx" +#include "vcl/cvtgrf.hxx" +#include "vcl/image.hxx" +#include "vcl/settings.hxx" +#include "vcl/unowrap.hxx" +#include "vcl/configsettings.hxx" +#include "vcl/lazydelete.hxx" + #ifdef WNT #include <tools/prewin.h> #include <process.h> // for _beginthreadex @@ -40,46 +66,28 @@ // building X11 graphics layers. #if defined UNX && ! defined QUARTZ -#include "svunx.h" +//#include "svunx.h" #endif -#include "svsys.h" -#include "vcl/salinst.hxx" -#include "vcl/salwtype.hxx" -#include "vos/signal.hxx" -#include "tools/tools.h" -#include "tools/debug.hxx" -#include "tools/unqid.hxx" -#include "vcl/svdata.hxx" -#include "vcl/dbggui.hxx" -#include "vcl/svapp.hxx" -#include "vcl/wrkwin.hxx" -#include "vcl/cvtgrf.hxx" -#include "vcl/image.hxx" -#include "tools/resmgr.hxx" -#include "vcl/accmgr.hxx" -#include "vcl/idlemgr.hxx" -#include "vcl/outdev.h" -#include "vcl/outfont.hxx" -#include "vcl/print.h" -#include "vcl/settings.hxx" -#include "vcl/unowrap.hxx" -#include "vcl/salsys.hxx" -#include "vcl/saltimer.hxx" -#include "vcl/salimestatus.hxx" -#include "vcl/impimagetree.hxx" -#include "vcl/xconnection.hxx" +//#include "svsys.h" + +#include "salinst.hxx" +#include "salwtype.hxx" +#include "svdata.hxx" +#include "dbggui.hxx" +#include "accmgr.hxx" +#include "idlemgr.hxx" +#include "outdev.h" +#include "outfont.hxx" +#include "print.h" +#include "salsys.hxx" +#include "saltimer.hxx" +#include "salimestatus.hxx" +#include "impimagetree.hxx" +#include "xconnection.hxx" -#include "vos/process.hxx" -#include "osl/file.hxx" -#include "comphelper/processfactory.hxx" #include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "com/sun/star/lang/XComponent.hpp" -#include "rtl/logfile.hxx" -#include <unotools/syslocaleoptions.hxx> -#include "unotools/fontcfg.hxx" -#include "vcl/configsettings.hxx" -#include "vcl/lazydelete.hxx" #include "cppuhelper/implbase1.hxx" #include "uno/current_context.hxx" diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx index 356608e7fbfc..903380036ebb 100644 --- a/vcl/source/app/timer.cxx +++ b/vcl/source/app/timer.cxx @@ -28,17 +28,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/saltimer.hxx> #include <tools/time.hxx> -#include <vcl/svdata.hxx> -#include <vcl/svapp.hxx> -#include <vcl/salinst.hxx> #include <tools/debug.hxx> + +#include <vcl/svapp.hxx> #include <vcl/timer.hxx> +#include <saltimer.hxx> +#include <svdata.hxx> +#include <salinst.hxx> // ======================================================================= diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx index 237156a5f9f7..907a32ea700f 100644 --- a/vcl/source/app/unohelp.cxx +++ b/vcl/source/app/unohelp.cxx @@ -28,35 +28,29 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" +#include <tools/tempfile.hxx> +#include <osl/file.hxx> +#include <cppuhelper/servicefactory.hxx> + +#include <vcl/svapp.hxx> #include <vcl/unohelp.hxx> + +#include <svdata.hxx> + #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> -#ifndef _COM_SUN_STAR_TEXT_XBREAKITERATOR_HPP_ #include <com/sun/star/i18n/XBreakIterator.hpp> -#endif #include <com/sun/star/i18n/XCharacterClassification.hpp> - -#ifndef _COM_SUN_STAR_UTIL_XCOLLATOR_HPP_ #include <com/sun/star/i18n/XCollator.hpp> -#endif #include <com/sun/star/awt/XExtendedToolkit.hpp> #include <com/sun/star/accessibility/AccessibleEventObject.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> - - #include <com/sun/star/registry/XImplementationRegistration.hpp> -#include <cppuhelper/servicefactory.hxx> - -#include <tools/tempfile.hxx> -#include <osl/file.hxx> - -#include <vcl/svdata.hxx> -#include <vcl/svapp.hxx> using namespace ::com::sun::star; using namespace ::rtl; diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx index 0c98da48e6d0..40b1491b44c9 100644 --- a/vcl/source/app/vclevent.cxx +++ b/vcl/source/app/vclevent.cxx @@ -29,7 +29,8 @@ #include "precompiled_vcl.hxx" #include "vcl/vclevent.hxx" -#include "vcl/svdata.hxx" + +#include "svdata.hxx" #include <com/sun/star/accessibility/XAccessible.hpp> diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index 9c88deccec23..f988c58f953e 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -28,6 +28,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" +#include "vos/mutex.hxx" + +#include "osl/mutex.hxx" + +#include "vcl/svapp.hxx" + +#include "svdata.hxx" +#include "salinst.hxx" + #include "com/sun/star/lang/XServiceInfo.hpp" #include "com/sun/star/lang/XSingleServiceFactory.hpp" #include "com/sun/star/lang/XInitialization.hpp" @@ -41,12 +50,6 @@ #include "com/sun/star/datatransfer/dnd/XDropTarget.hpp" #include "com/sun/star/datatransfer/dnd/DNDConstants.hpp" -#include "vcl/svapp.hxx" -#include "vcl/svdata.hxx" -#include "vcl/salinst.hxx" -#include "vos/mutex.hxx" -#include "osl/mutex.hxx" - #include "cppuhelper/compbase1.hxx" #include "cppuhelper/compbase2.hxx" #include "cppuhelper/compbase3.hxx" diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx index ad309e4f2560..2cbea1628f4e 100644 --- a/vcl/source/components/fontident.cxx +++ b/vcl/source/components/fontident.cxx @@ -28,6 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" +#include <tools/debug.hxx> + +#include "vcl/svapp.hxx" +#include "vcl/font.hxx" + +#include "svdata.hxx" + #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XMaterialHolder.hpp> #include <com/sun/star/awt/FontDescriptor.hpp> @@ -38,15 +45,8 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/DisposedException.hpp> -#include "vcl/svapp.hxx" -#include "vcl/svdata.hxx" -#include "vcl/font.hxx" - #include <cppuhelper/implbase3.hxx> -#include <tools/debug.hxx> - - using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 82bec2214dff..f75a659b5872 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -29,14 +29,10 @@ #include "precompiled_vcl.hxx" #include <tools/debug.hxx> +#include <tools/poly.hxx> +#include <tools/rc.h> -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif -#include <vcl/svdata.hxx> -#ifndef _SV_IAMGE_HXX #include <vcl/image.hxx> -#endif #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/decoview.hxx> @@ -44,20 +40,14 @@ #include <vcl/svapp.hxx> #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> -#include <tools/poly.hxx> #include <vcl/button.hxx> -#include <vcl/window.h> -#include <vcl/controldata.hxx> -#ifndef _SV_NATIVEWIDGET_HXX #include <vcl/salnativewidgets.hxx> -#endif #include <vcl/edit.hxx> -#ifndef _SV_RC_H -#include <tools/rc.h> -#endif - - +#include <svids.hrc> +#include <svdata.hxx> +#include <window.h> +#include <controldata.hxx> // ======================================================================= diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 5b2e8755e5c8..b045f9e29341 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -27,23 +27,21 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/table.hxx> #include <tools/debug.hxx> - -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> + #include <vcl/decoview.hxx> -#include <vcl/ilstbox.hxx> #include <vcl/lstbox.h> #include <vcl/button.hxx> -#include <vcl/subedit.hxx> #include <vcl/event.hxx> #include <vcl/combobox.hxx> -#include <vcl/controldata.hxx> - +#include <svdata.hxx> +#include <subedit.hxx> +#include <ilstbox.hxx> +#include <controldata.hxx> // ======================================================================= diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index 918675cc0783..ea63b9eefdfd 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -28,20 +28,21 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_RC_H +#include <comphelper/processfactory.hxx> + +#include <tools/diagnose_ex.h> #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> + #include <vcl/svapp.hxx> #include <vcl/event.hxx> #include <vcl/ctrl.hxx> #include <vcl/decoview.hxx> -#include <vcl/controldata.hxx> #include <vcl/salnativewidgets.hxx> -#include <vcl/textlayout.hxx> -#include <comphelper/processfactory.hxx> -#include <tools/diagnose_ex.h> +#include <textlayout.hxx> +#include <svdata.hxx> +#include <controldata.hxx> + using namespace vcl; diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 5091a4722845..6acd34e70607 100755 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -28,25 +28,22 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> #include <vcl/decoview.hxx> #include <vcl/event.hxx> #include <vcl/cursor.hxx> #include <vcl/virdev.hxx> -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif #include <vcl/menu.hxx> #include <vcl/cmdevt.h> -#include <vcl/subedit.hxx> #include <vcl/edit.hxx> #include <vcl/svapp.hxx> -#include <vcl/controldata.hxx> #include <vcl/msgbox.hxx> -#include <vcl/window.h> + +#include <window.h> +#include <svdata.hxx> +#include <svids.hrc> +#include <subedit.hxx> +#include <controldata.hxx> #include <vos/mutex.hxx> diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 4c4e3c870429..c66a844979ac 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -37,12 +37,15 @@ #include "tools/rc.h" #include "tools/resary.hxx" -#include "vcl/svids.hrc" + #include "vcl/field.hxx" #include "vcl/event.hxx" #include "vcl/svapp.hxx" -#include "vcl/svdata.hxx" #include "vcl/unohelp.hxx" + +#include "svids.hrc" +#include "svdata.hxx" + #include "i18nutil/unicode.hxx" #include "rtl/math.hxx" diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 8ae2ecff41b9..f9bce6fa8fa1 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -29,21 +29,18 @@ #include "precompiled_vcl.hxx" #include <tools/debug.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> -#ifndef _SV_EVENT_HXX -#include <vcl/field.hxx> -#endif + #include <vcl/svapp.hxx> #include <vcl/sound.hxx> #include <vcl/event.hxx> #include <vcl/field.hxx> -#include <i18npool/mslangid.hxx> - #include <vcl/unohelp.hxx> +#include <svdata.hxx> + +#include <i18npool/mslangid.hxx> + #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/i18n/XCharacterClassification.hpp> #include <com/sun/star/i18n/KCharacterType.hpp> diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index f73cf008a5e5..24f495402c10 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -27,13 +27,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + +#include "tools/rc.h" + #include "vcl/decoview.hxx" #include "vcl/event.hxx" #include "vcl/fixed.hxx" -#include "vcl/controldata.hxx" -#include "vcl/window.h" -#include "tools/rc.h" +#include "controldata.hxx" +#include "window.h" // ======================================================================= diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx index ecf00568e11f..bbec6f2997d9 100644 --- a/vcl/source/control/group.cxx +++ b/vcl/source/control/group.cxx @@ -27,15 +27,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/event.hxx> -#include <vcl/group.hxx> -#include <vcl/controldata.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif +#include <vcl/event.hxx> +#include <vcl/group.hxx> +#include <controldata.hxx> // ======================================================================= diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index bd0179ffe454..5f253a2971c4 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -27,29 +27,25 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/debug.hxx> -#include <vcl/svdata.hxx> + #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/event.hxx> #include <vcl/scrbar.hxx> #include <vcl/help.hxx> #include <vcl/lstbox.h> -#include <vcl/ilstbox.hxx> -#include <vcl/i18nhelp.hxx> -#include <vcl/controldata.hxx> #include <vcl/unohelp.hxx> -#ifndef _COM_SUN_STAR_UTIL_XCOLLATOR_HPP_ -#include <com/sun/star/i18n/XCollator.hpp> -#endif +#include <vcl/i18nhelp.hxx> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HDL_ -#include <com/sun/star/accessibility/XAccessible.hpp> -#endif +#include <ilstbox.hxx> +#include <controldata.hxx> +#include <svdata.hxx> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEROLE_HPP_ +#include <com/sun/star/i18n/XCollator.hpp> +#include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> -#endif #define MULTILINE_ENTRY_DRAW_FLAGS ( TEXT_DRAW_WORDBREAK | TEXT_DRAW_MULTILINE | TEXT_DRAW_VCENTER ) diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index 65fe11929d1e..8e19a265d0cc 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -34,15 +34,13 @@ #include <tools/debug.hxx> #include <tools/bigint.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <vcl/event.hxx> #include <vcl/svapp.hxx> -#include <vcl/svdata.hxx> #include <vcl/longcurr.hxx> +#include <svdata.hxx> #include <unotools/localedatawrapper.hxx> diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index 03527bf083a7..68bd53469983 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -29,22 +29,23 @@ #include "precompiled_vcl.hxx" #include "tools/rc.h" +#include "tools/debug.hxx" + -#include "vcl/svdata.hxx" #include "vcl/decoview.hxx" #include "vcl/event.hxx" #include "vcl/scrbar.hxx" #include "vcl/button.hxx" #include "vcl/edit.hxx" -#include "vcl/subedit.hxx" -#include "vcl/ilstbox.hxx" #include "vcl/lstbox.hxx" #include "vcl/combobox.hxx" -#include "vcl/controldata.hxx" -#include "tools/debug.hxx" +#include "svdata.hxx" +#include "controldata.hxx" +#include "subedit.hxx" +#include "ilstbox.hxx" +#include "dndevdis.hxx" -#include <vcl/dndevdis.hxx> #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp> // ======================================================================= diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index 4261965995fa..4af77177b4b8 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -33,7 +33,8 @@ #include "vcl/decoview.hxx" #include "vcl/scrbar.hxx" #include "vcl/timer.hxx" -#include "vcl/svdata.hxx" + +#include "svdata.hxx" #include "rtl/string.hxx" #include "tools/rc.h" diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index c51ac834f1b4..b42f77375737 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -29,12 +29,14 @@ #include "precompiled_vcl.hxx" #include "tools/rc.h" + #include "vcl/event.hxx" #include "vcl/decoview.hxx" #include "vcl/spin.h" #include "vcl/spinfld.hxx" -#include "vcl/controldata.hxx" -#include "vcl/svdata.hxx" + +#include "controldata.hxx" +#include "svdata.hxx" // ======================================================================= diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 2c81b6af241b..b61842ebe363 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -27,10 +27,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "tools/debug.hxx" +#include "tools/debug.hxx" #include "tools/rc.h" -#include "vcl/svdata.hxx" + #include "vcl/svapp.hxx" #include "vcl/help.hxx" #include "vcl/event.hxx" @@ -39,11 +39,12 @@ #include "vcl/tabpage.hxx" #include "vcl/tabctrl.hxx" #include "vcl/controllayout.hxx" -#include "vcl/controldata.hxx" #include "vcl/sound.hxx" #include "vcl/lstbox.hxx" -#include "vcl/window.h" +#include "controldata.hxx" +#include "svdata.hxx" +#include "window.h" #include <hash_map> #include <vector> diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index cb565122ea63..45172002bff6 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -32,7 +32,8 @@ #include <cstring> #include <assert.h> -#include <vcl/fontsubset.hxx> +#include <fontsubset.hxx> + #include <vcl/strhelper.hxx> //#define IGNORE_HINTS diff --git a/vcl/source/fontsubset/fontsubset.cxx b/vcl/source/fontsubset/fontsubset.cxx index 64cf243c6a9d..26382e245996 100644 --- a/vcl/source/fontsubset/fontsubset.cxx +++ b/vcl/source/fontsubset/fontsubset.cxx @@ -28,10 +28,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/fontsubset.hxx> -#include <sft.hxx> #include <tools/debug.hxx> +#include <fontsubset.hxx> +#include <sft.hxx> + // ==================================================================== FontSubsetInfo::FontSubsetInfo() diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx index 074935086b0b..91785fae5641 100644 --- a/vcl/source/gdi/bitmap.cxx +++ b/vcl/source/gdi/bitmap.cxx @@ -27,22 +27,23 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <rtl/crc.h> -#include <vcl/salbtype.hxx> #include <tools/stream.hxx> -#include <vcl/bmpacc.hxx> #include <tools/poly.hxx> -#include <vcl/outdev.hxx> -#include <vcl/impbmp.hxx> -#include <vcl/salbmp.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif + +#include <vcl/salbtype.hxx> +#include <vcl/bmpacc.hxx> +#include <vcl/outdev.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/svapp.hxx> #include <vcl/image.hxx> +#include <impbmp.hxx> +#include <salbmp.hxx> + // ---------- // - Bitmap - // ---------- diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index ec476157fbeb..8c6c2f10bd7c 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -29,13 +29,15 @@ #include "precompiled_vcl.hxx" #include <stdlib.h> + #include <vcl/bmpacc.hxx> -#include <vcl/impoct.hxx> #include <vcl/octree.hxx> -#include <impvect.hxx> #include <vcl/bitmapex.hxx> #include <vcl/bitmap.hxx> +#include <impoct.hxx> +#include <impvect.hxx> + // ----------- // - Defines - // ----------- diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 38402af626c2..5e3145a541ee 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -27,25 +27,26 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <ctype.h> + #include <rtl/crc.h> -#include <vcl/salbtype.hxx> + #include <tools/stream.hxx> #include <tools/debug.hxx> +#include <tools/rc.h> + +#include <vcl/salbtype.hxx> #include <vcl/outdev.hxx> #include <vcl/alpha.hxx> -#include <vcl/image.h> #include <vcl/bitmapex.hxx> #include <vcl/pngread.hxx> -#ifndef _SV_IMPIMAGETREE_H -#include <vcl/impimagetree.hxx> -#endif -#ifndef _SV_RC_H -#include <tools/rc.h> -#endif #include <vcl/svapp.hxx> #include <vcl/bmpacc.hxx> +#include <image.h> +#include <impimagetree.hxx> + // ------------ // - BitmapEx - // ------------ diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx index c963ea32542e..50fdca07605d 100644 --- a/vcl/source/gdi/bmpacc.cxx +++ b/vcl/source/gdi/bmpacc.cxx @@ -27,10 +27,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <vcl/salbtype.hxx> -#include <vcl/impbmp.hxx> #include <vcl/bitmap.hxx> #include <vcl/bmpacc.hxx> + +#include <impbmp.hxx> + #include <string.h> // -------------------- diff --git a/vcl/source/gdi/bmpacc3.cxx b/vcl/source/gdi/bmpacc3.cxx index a89015d12351..3aef42dfeb02 100644 --- a/vcl/source/gdi/bmpacc3.cxx +++ b/vcl/source/gdi/bmpacc3.cxx @@ -27,12 +27,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + +#include <tools/poly.hxx> + #include <vcl/salbtype.hxx> #include <vcl/bitmap.hxx> -#include <tools/poly.hxx> #include <vcl/region.hxx> #include <vcl/bmpacc.hxx> -#include <vcl/bmpfast.hxx> + +#include <bmpfast.hxx> // --------------------- // - BitmapWriteAccess - diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx index e6c94ba0475e..4901491e2ed1 100644 --- a/vcl/source/gdi/bmpfast.cxx +++ b/vcl/source/gdi/bmpfast.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/bmpfast.hxx> +#include <bmpfast.hxx> #ifndef NO_OPTIMIZED_BITMAP_ACCESS diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx index b11b9ab822f4..ce39c70e243f 100644 --- a/vcl/source/gdi/configsettings.cxx +++ b/vcl/source/gdi/configsettings.cxx @@ -29,7 +29,9 @@ #include "precompiled_vcl.hxx" #include <vcl/configsettings.hxx> -#include <vcl/svdata.hxx> + +#include <svdata.hxx> + #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/vcl/source/gdi/cvtgrf.cxx b/vcl/source/gdi/cvtgrf.cxx index 8ba963bc4718..dd0173f17423 100644 --- a/vcl/source/gdi/cvtgrf.cxx +++ b/vcl/source/gdi/cvtgrf.cxx @@ -28,14 +28,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif #include <vcl/metaact.hxx> -#include <vcl/salinst.hxx> -#include <vcl/svdata.hxx> #include <vcl/cvtgrf.hxx> +#include <salinst.hxx> +#include <svdata.hxx> + // -------------- // - Callback - // -------------- diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index e26c15309c54..d7f0aac5bdeb 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -28,15 +28,18 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "sft.hxx" +#include "unotools/fontcfg.hxx" #include "tools/stream.hxx" #include "tools/vcompat.hxx" #include "tools/debug.hxx" + #include "vcl/font.hxx" -#include "vcl/impfont.hxx" -#include "vcl/outfont.hxx" -#include "unotools/fontcfg.hxx" + +#include "impfont.hxx" +#include "outfont.hxx" +#include "sft.hxx" + #include <algorithm> diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx index 790c3d43bb85..51a01db868c1 100644 --- a/vcl/source/gdi/graph.cxx +++ b/vcl/source/gdi/graph.cxx @@ -27,11 +27,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/impgraph.hxx> + #include <vcl/outdev.hxx> #include <vcl/svapp.hxx> #include <vcl/graph.hxx> + +#include <impgraph.hxx> + #include <comphelper/processfactory.hxx> + #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx index e79308b2664e..3a6e81e8d48a 100644 --- a/vcl/source/gdi/image.cxx +++ b/vcl/source/gdi/image.cxx @@ -31,25 +31,22 @@ #include <boost/scoped_array.hpp> #include <rtl/logfile.hxx> + #include <tools/debug.hxx> #include <tools/stream.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <tools/rc.hxx> -#ifndef _SV_RESMGR_HXX #include <tools/resmgr.hxx> -#endif + #include <vcl/settings.hxx> #include <vcl/outdev.hxx> #include <vcl/graph.hxx> #include <vcl/svapp.hxx> -#ifndef _SV_IMPIMAGETREE_H -#include <vcl/impimagetree.hxx> -#endif -#include <vcl/image.h> #include <vcl/image.hxx> +#include <impimagetree.hxx> +#include <image.h> + #if OSL_DEBUG_LEVEL > 0 #include <rtl/strbuf.hxx> #endif diff --git a/vcl/source/gdi/imagerepository.cxx b/vcl/source/gdi/imagerepository.cxx index d97999311751..0118acc13146 100644 --- a/vcl/source/gdi/imagerepository.cxx +++ b/vcl/source/gdi/imagerepository.cxx @@ -27,12 +27,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <vcl/bitmapex.hxx> #include <vcl/imagerepository.hxx> #include <vcl/svapp.hxx> -#ifndef _SV_IMPIMAGETREE_H -#include "vcl/impimagetree.hxx" -#endif + +#include "impimagetree.hxx" //........................................................................ namespace vcl diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx index 3e328b7db7a4..244e688601a5 100644 --- a/vcl/source/gdi/impbmp.cxx +++ b/vcl/source/gdi/impbmp.cxx @@ -28,15 +28,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salbmp.hxx> #include <tools/debug.hxx> -#include <vcl/impbmp.hxx> + #include <vcl/bitmap.hxx> -#include <vcl/svdata.hxx> -#include <vcl/salinst.hxx> + +#include <svdata.hxx> +#include <salinst.hxx> +#include <salbmp.hxx> +#include <impbmp.hxx> // -------------- // - ImpBitmap - diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 397a5d6b704a..14326371c89e 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -27,24 +27,27 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/vcompat.hxx> #include <tools/urlobj.hxx> #include <tools/debug.hxx> +#include <tools/stream.hxx> + #include <ucbhelper/content.hxx> + #include <unotools/ucbstreamhelper.hxx> -#ifndef _UNTOOLS_TEMPFILE_HXX #include <unotools/tempfile.hxx> -#endif + #include <vcl/outdev.hxx> #include <vcl/virdev.hxx> -#include <tools/debug.hxx> -#include <tools/stream.hxx> -#include <vcl/impgraph.hxx> #include <vcl/gfxlink.hxx> #include <vcl/cvtgrf.hxx> #include <vcl/salbtype.hxx> #include <vcl/graph.hxx> #include <vcl/metaact.hxx> + +#include <impgraph.hxx> + #include <com/sun/star/ucb/CommandAbortedException.hpp> // ----------- diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx index 3105850c4fbf..f68c844c73f9 100644 --- a/vcl/source/gdi/impimage.cxx +++ b/vcl/source/gdi/impimage.cxx @@ -27,15 +27,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <vcl/outdev.hxx> #include <vcl/bitmapex.hxx> #include <vcl/alpha.hxx> #include <vcl/window.hxx> #include <vcl/bmpacc.hxx> #include <vcl/virdev.hxx> -#include <vcl/image.h> #include <vcl/image.hxx> +#include <image.h> + // ----------- // - Defines - // ----------- diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx index 03e4c1dbbb2a..19947679567c 100644 --- a/vcl/source/gdi/impimagetree.cxx +++ b/vcl/source/gdi/impimagetree.cxx @@ -26,13 +26,13 @@ ***********************************************************************/ #include "precompiled_vcl.hxx" + #include "sal/config.h" #include <list> #include <memory> #include <utility> #include <vector> - #include <hash_map> #include "com/sun/star/container/XNameAccess.hpp" @@ -43,24 +43,31 @@ #include "com/sun/star/uno/Reference.hxx" #include "com/sun/star/uno/RuntimeException.hpp" #include "com/sun/star/uno/Sequence.hxx" + #include "comphelper/processfactory.hxx" + #include "osl/file.hxx" #include "osl/diagnose.h" + #include "rtl/bootstrap.hxx" #include "rtl/string.h" #include "rtl/textenc.h" #include "rtl/ustrbuf.hxx" #include "rtl/ustring.h" #include "rtl/ustring.hxx" + #include "sal/types.h" + #include "tools/stream.hxx" #include "tools/urlobj.hxx" + #include "vcl/bitmapex.hxx" -#include "vcl/impimagetree.hxx" #include "vcl/pngread.hxx" #include "vcl/settings.hxx" #include "vcl/svapp.hxx" +#include "impimagetree.hxx" + namespace { namespace css = com::sun::star; diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index 2bc0addaa93c..d813629668d7 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -27,13 +27,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/debug.hxx> #include <tools/stream.hxx> -#ifndef _RTL_ALLOC_H + #include <rtl/alloc.h> -#endif + #include <vcl/jobset.hxx> -#include <vcl/jobset.h> + +#include <jobset.h> // ======================================================================= diff --git a/vcl/source/gdi/metric.cxx b/vcl/source/gdi/metric.cxx index 6d225ad7e0dc..1f0d89e6926c 100644 --- a/vcl/source/gdi/metric.cxx +++ b/vcl/source/gdi/metric.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/impfont.hxx> +#include <impfont.hxx> #include <vcl/metric.hxx> #include <vector> diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx index 0660728fc8a5..26860097d1ee 100644 --- a/vcl/source/gdi/octree.cxx +++ b/vcl/source/gdi/octree.cxx @@ -27,11 +27,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <limits.h> + #include <vcl/bmpacc.hxx> -#include <vcl/impoct.hxx> #include <vcl/octree.hxx> +#include <impoct.hxx> + // --------- // - pMask - // --------- diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx index 847a8d7a299a..195f3cf6dc42 100644 --- a/vcl/source/gdi/outdev.cxx +++ b/vcl/source/gdi/outdev.cxx @@ -29,35 +29,32 @@ #include "precompiled_vcl.hxx" #include <tools/ref.hxx> -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salgdi.hxx> -#include <vcl/sallayout.hxx> -#include <vcl/salframe.hxx> -#include <vcl/salvd.hxx> -#include <vcl/salprn.hxx> #include <tools/debug.hxx> -#include <vcl/svdata.hxx> +#include <tools/poly.hxx> + #include <vcl/svapp.hxx> #include <vcl/ctrl.hxx> -#ifndef _POLY_HXX -#include <tools/poly.hxx> -#endif #include <vcl/region.hxx> -#include <vcl/region.h> #include <vcl/virdev.hxx> -#include <vcl/window.h> #include <vcl/window.hxx> #include <vcl/metaact.hxx> #include <vcl/gdimtf.hxx> -#include <vcl/outdata.hxx> #include <vcl/print.hxx> -#include <vcl/outdev.h> #include <vcl/outdev.hxx> #include <vcl/unowrap.hxx> #include <vcl/sysdata.hxx> +#include <salgdi.hxx> +#include <sallayout.hxx> +#include <salframe.hxx> +#include <salvd.hxx> +#include <salprn.hxx> +#include <svdata.hxx> +#include <window.h> +#include <outdev.h> +#include <region.h> +#include <outdata.hxx> + #include <basegfx/point/b2dpoint.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx index 06dcd73cc3d4..fb14751fa9e9 100755..100644 --- a/vcl/source/gdi/outdev2.cxx +++ b/vcl/source/gdi/outdev2.cxx @@ -28,30 +28,29 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salbmp.hxx> -#include <vcl/salgdi.hxx> -#include <vcl/impbmp.hxx> #include <tools/debug.hxx> + #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/window.hxx> #include <vcl/metaact.hxx> #include <vcl/gdimtf.hxx> #include <vcl/virdev.hxx> -#include <vcl/outdata.hxx> -#include <vcl/outdev.h> #include <vcl/bmpacc.hxx> -#include <vcl/region.h> #include <vcl/outdev.hxx> #include <vcl/window.hxx> -#include <vcl/window.h> -#include <vcl/sallayout.hxx> -#include <vcl/image.h> #include <vcl/image.hxx> -#include <vcl/bmpfast.hxx> + +#include <bmpfast.hxx> +#include <salbmp.hxx> +#include <salgdi.hxx> +#include <impbmp.hxx> +#include <sallayout.hxx> +#include <image.h> +#include <outdev.h> +#include <window.h> +#include <region.h> +#include <outdata.hxx> #define BAND_MAX_SIZE 512000 diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index ca50e4bf6c82..cfee741657e1 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -30,49 +30,55 @@ #include "i18npool/mslangid.hxx" -#include "svsys.h" -#include "vcl/salgdi.hxx" -#include "vcl/sallayout.hxx" #include "rtl/tencinfo.h" +#include "rtl/logfile.hxx" + #include "tools/debug.hxx" -#include "vcl/svdata.hxx" -#include "vcl/metric.hxx" -#include "vcl/impfont.hxx" -#include "vcl/metaact.hxx" -#include "vcl/gdimtf.hxx" -#include "vcl/outdata.hxx" -#include "vcl/outfont.hxx" +#include "tools/poly.hxx" + #include "basegfx/polygon/b2dpolygon.hxx" #include "basegfx/polygon/b2dpolypolygon.hxx" #include "basegfx/matrix/b2dhommatrix.hxx" -#include "tools/poly.hxx" -#include "vcl/outdev.h" + +#include "vcl/metric.hxx" +#include "vcl/metaact.hxx" +#include "vcl/gdimtf.hxx" #include "vcl/virdev.hxx" #include "vcl/print.hxx" #include "vcl/event.hxx" -#include "vcl/window.h" #include "vcl/window.hxx" #include "vcl/svapp.hxx" #include "vcl/bmpacc.hxx" -#include "unotools/fontcvt.hxx" #include "vcl/outdev.hxx" #include "vcl/edit.hxx" -#include "unotools/fontcfg.hxx" #include "vcl/sysdata.hxx" -#include "vcl/textlayout.hxx" -#include "vcl/svids.hrc" +#include "vcl/unohelp.hxx" +#include "vcl/controllayout.hxx" + +#include "salgdi.hxx" +#include "sallayout.hxx" +#include "svdata.hxx" +#include "impfont.hxx" +#include "outdata.hxx" +#include "outfont.hxx" +#include "outdev.h" +#include "textlayout.hxx" +#include "svids.hrc" +#include "window.h" + +#include "unotools/fontcvt.hxx" +#include "unotools/fontcfg.hxx" + #include "osl/file.h" + #ifdef ENABLE_GRAPHITE -#include "vcl/graphite_features.hxx" +#include "graphite_features.hxx" #endif #ifdef USE_BUILTIN_RASTERIZER -#include "vcl/glyphcache.hxx" +#include "glyphcache.hxx" #endif -#include "vcl/unohelp.hxx" #include "pdfwriter_impl.hxx" -#include "vcl/controllayout.hxx" -#include "rtl/logfile.hxx" #include "com/sun/star/beans/PropertyValues.hpp" #include "com/sun/star/i18n/XBreakIterator.hpp" diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx index 8ad02ed2d818..e1b20a1b7aff 100644 --- a/vcl/source/gdi/outdev4.cxx +++ b/vcl/source/gdi/outdev4.cxx @@ -28,25 +28,26 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <svsys.h> -#include <vcl/salgdi.hxx> #include <tools/debug.hxx> -#include <vcl/svdata.hxx> +#include <tools/line.hxx> +#include <tools/poly.hxx> + #include <vcl/gradient.hxx> #include <vcl/metaact.hxx> #include <vcl/gdimtf.hxx> -#include <vcl/outdata.hxx> -#include <tools/poly.hxx> #include <vcl/salbtype.hxx> -#include <tools/line.hxx> #include <vcl/hatch.hxx> #include <vcl/window.hxx> #include <vcl/virdev.hxx> #include <vcl/outdev.hxx> #include "pdfwriter_impl.hxx" -#include "vcl/window.h" -#include "vcl/salframe.hxx" + +#include "window.h" +#include "salframe.hxx" +#include "salgdi.hxx" +#include "svdata.hxx" +#include "outdata.hxx" #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> diff --git a/vcl/source/gdi/outdev5.cxx b/vcl/source/gdi/outdev5.cxx index d42723215c55..e509ce716d7a 100644 --- a/vcl/source/gdi/outdev5.cxx +++ b/vcl/source/gdi/outdev5.cxx @@ -29,20 +29,19 @@ #include "precompiled_vcl.hxx" #include <tools/ref.hxx> -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salgdi.hxx> #include <tools/debug.hxx> -#include <vcl/svdata.hxx> #include <tools/poly.hxx> + #include <vcl/metaact.hxx> #include <vcl/gdimtf.hxx> -#include <vcl/outdata.hxx> -#include <vcl/outdev.h> #include <vcl/outdev.hxx> #include <vcl/virdev.hxx> +#include <salgdi.hxx> +#include <svdata.hxx> +#include <outdata.hxx> +#include <outdev.h> + // ======================================================================= DBG_NAMEEX( OutputDevice ) diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx index 5b8d228bb141..a597ccc1d5bf 100644 --- a/vcl/source/gdi/outdev6.cxx +++ b/vcl/source/gdi/outdev6.cxx @@ -28,12 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salgdi.hxx> #include <tools/debug.hxx> -#include <vcl/outdev.h> #include <vcl/outdev.hxx> #include <vcl/virdev.hxx> #include <vcl/bmpacc.hxx> @@ -42,16 +37,21 @@ #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> #include <vcl/graph.hxx> -#include <vcl/wall2.hxx> + +#include <wall2.hxx> +#include <salgdi.hxx> +#include <window.h> +#include <svdata.hxx> +#include <outdev.h> + #include <com/sun/star/uno/Sequence.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> + #include <math.h> -#include <vcl/window.h> -#include <vcl/svdata.hxx> // ======================================================================== diff --git a/vcl/source/gdi/outdevnative.cxx b/vcl/source/gdi/outdevnative.cxx index b5b745b708fa..c3427cf9bb0f 100755 --- a/vcl/source/gdi/outdevnative.cxx +++ b/vcl/source/gdi/outdevnative.cxx @@ -30,10 +30,11 @@ #include "vcl/outdev.hxx" #include "vcl/window.hxx" -#include "vcl/salgdi.hxx" #include "vcl/salnativewidgets.hxx" #include "vcl/pdfextoutdevdata.hxx" +#include "salgdi.hxx" + // ----------------------------------------------------------------------- static bool lcl_enableNativeWidget( const OutputDevice& i_rDevice ) diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx index 189ba4c29e59..d93c27c06211 100644 --- a/vcl/source/gdi/outmap.cxx +++ b/vcl/source/gdi/outmap.cxx @@ -30,25 +30,25 @@ #include <limits.h> -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif #include <tools/bigint.hxx> #include <tools/debug.hxx> -#include <vcl/virdev.hxx> -#include <vcl/svdata.hxx> #include <tools/poly.hxx> + +#include <vcl/virdev.hxx> #include <vcl/region.hxx> -#include <vcl/region.h> -#include <vcl/window.h> #include <vcl/wrkwin.hxx> #include <vcl/cursor.hxx> #include <vcl/metaact.hxx> #include <vcl/gdimtf.hxx> #include <vcl/lineinfo.hxx> #include <vcl/outdev.hxx> -#include <vcl/outdev.h> -#include <vcl/salgdi.hxx> + +#include <svdata.hxx> +#include <region.h> +#include <window.h> +#include <outdev.h> +#include <salgdi.hxx> + #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> diff --git a/vcl/source/gdi/pdffontcache.cxx b/vcl/source/gdi/pdffontcache.cxx index 507ede81ef24..f0842c6bc1ba 100644 --- a/vcl/source/gdi/pdffontcache.cxx +++ b/vcl/source/gdi/pdffontcache.cxx @@ -28,9 +28,9 @@ #include "precompiled_vcl.hxx" #include "pdffontcache.hxx" -#include <vcl/salgdi.hxx> -#include <vcl/outfont.hxx> -#include <vcl/sallayout.hxx> +#include <salgdi.hxx> +#include <outfont.hxx> +#include <sallayout.hxx> using namespace vcl; diff --git a/vcl/source/gdi/pdffontcache.hxx b/vcl/source/gdi/pdffontcache.hxx index 06ffff86b070..b9997c1e6fc9 100644 --- a/vcl/source/gdi/pdffontcache.hxx +++ b/vcl/source/gdi/pdffontcache.hxx @@ -30,8 +30,8 @@ #include <sal/types.h> -#include <vcl/sallayout.hxx> -#include <vcl/salgdi.hxx> +#include <sallayout.hxx> +#include <salgdi.hxx> namespace vcl { diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 325ccef1c3a6..30f51af0c401 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -33,41 +33,52 @@ #include <algorithm> #include <tools/urlobj.hxx> + #include <pdfwriter_impl.hxx> + #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/polygon/b2dpolypolygoncutter.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> + +#include <osl/thread.h> +#include <osl/file.h> + +#include <rtl/crc.h> +#include <rtl/digest.h> #include <rtl/ustrbuf.hxx> + #include <tools/debug.hxx> #include <tools/zcodec.hxx> #include <tools/stream.hxx> + #include <i18npool/mslangid.hxx> + #include <vcl/virdev.hxx> #include <vcl/bmpacc.hxx> #include <vcl/bitmapex.hxx> #include <vcl/image.hxx> -#include <vcl/outdev.h> -#include <vcl/sallayout.hxx> #include <vcl/metric.hxx> -#include <vcl/fontsubset.hxx> -#include <vcl/textlayout.hxx> -#include <svsys.h> -#include <vcl/salgdi.hxx> #include <vcl/svapp.hxx> -#include <osl/thread.h> -#include <osl/file.h> -#include <rtl/crc.h> -#include <rtl/digest.h> +#include <vcl/lineinfo.hxx> +#include "vcl/strhelper.hxx" + +#include <fontsubset.hxx> +#include <outdev.h> +#include <sallayout.hxx> +#include <textlayout.hxx> +#include <salgdi.hxx> + +#include <icc/sRGB-IEC61966-2.1.hxx> + #include <comphelper/processfactory.hxx> + #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/URL.hpp> + #include "cppuhelper/implbase1.hxx" -#include <icc/sRGB-IEC61966-2.1.hxx> -#include <vcl/lineinfo.hxx> -#include "vcl/strhelper.hxx" using namespace vcl; using namespace rtl; diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index 5702bee23ea5..bd7d6973004d 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -37,14 +37,14 @@ #include "vcl/gradient.hxx" #include "vcl/hatch.hxx" #include "vcl/wall.hxx" -#include "vcl/outdata.hxx" +#include "outdata.hxx" #include "rtl/strbuf.hxx" #include "rtl/cipher.h" #include "rtl/digest.h" #include "com/sun/star/util/XURLTransformer.hpp" #include "com/sun/star/lang/Locale.hpp" -#include <vcl/sallayout.hxx> +#include <sallayout.hxx> #include "pdffontcache.hxx" #include <vector> diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index ee1fe1cc6bc5..d43d210db7a1 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -34,9 +34,12 @@ #include "vcl/gdimtf.hxx" #include "vcl/metaact.hxx" #include "vcl/graph.hxx" -#include "vcl/svdata.hxx" + +#include "svdata.hxx" + #include "unotools/streamwrap.hxx" #include "unotools/processfactory.hxx" + #include "comphelper/processfactory.hxx" #include "com/sun/star/beans/PropertyValue.hpp" diff --git a/vcl/source/gdi/polyscan.cxx b/vcl/source/gdi/polyscan.cxx deleted file mode 100644 index eb329f8c6869..000000000000 --- a/vcl/source/gdi/polyscan.cxx +++ /dev/null @@ -1,358 +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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_vcl.hxx" - -#include <string.h> -#include <tools/new.hxx> -#include <vcl/salbtype.hxx> -#include "polyscan.hxx" -#include <tools/poly.hxx> - -// ---------------- -// - PolyScanline - -// ---------------- - -PolyScanline::PolyScanline() : - mpFirst ( NULL ), - mpLast ( NULL ), - mpAct ( NULL ), - mnLeft ( 0L ), - mnRight ( 0L ) -{ -} - -// ------------------------------------------------------------------------ - -PolyScanline::~PolyScanline() -{ - ImplDelete(); -} - -// ------------------------------------------------------------------------ - -void PolyScanline::ImplDelete() -{ - ScanlinePoint* pAct = mpFirst; - - while( pAct ) - { - ScanlinePoint* pNext = pAct->mpNext; - delete pAct; - pAct = pNext; - } - - mnLeft = mnRight = 0L; - mpFirst = mpAct = mpLast = NULL; -} - -// ------------------------------------------------------------------------ - -void PolyScanline::Insert( long nX ) -{ - // first point to insert? - if( !mpFirst ) - mpLast = mpFirst = new ScanlinePoint( mnLeft = mnRight = nX, NULL ); - else - { - // insert at the beginning of the scanline - if( nX <= mpFirst->mnX ) - mpFirst = new ScanlinePoint( mnLeft = nX, mpFirst ); - else if( nX >= mnRight ) - mpLast = mpLast->mpNext = new ScanlinePoint( mnRight = nX, NULL ); - else - { - ScanlinePoint* pLast = mpFirst; - ScanlinePoint* pAct = mpFirst->mpNext; - - while( pAct ) - { - // insert in the midlle of the scanline? - if( nX <= pAct->mnX ) - { - pLast->mpNext = new ScanlinePoint( nX, pAct ); - break; - } - - pLast = pAct; - pAct = pAct->mpNext; - } - } - } -} - -// ------------------------------------------------------------------------ - -void PolyScanline::Set( long nStart, long nEnd ) -{ - if( mpFirst ) - ImplDelete(); - - if( nStart <= nEnd ) - mpFirst = new ScanlinePoint( mnLeft = nStart, mpLast = new ScanlinePoint( mnRight = nEnd, NULL ) ); - else - mpFirst = new ScanlinePoint( mnLeft = nEnd, mpLast = new ScanlinePoint( mnRight = nStart, NULL ) ); -} - -// ------------------------------------------------------------------------ - -BOOL PolyScanline::GetFirstSegment( PolyScanSegment& rSegment ) -{ - BOOL bRet = GetFirstX( rSegment.mnStart ); - - if( bRet && !GetNextX( rSegment.mnEnd ) ) - rSegment.mnEnd = rSegment.mnStart; - - return bRet; -} - -// ------------------------------------------------------------------------ - -BOOL PolyScanline::GetNextSegment( PolyScanSegment& rSegment ) -{ - BOOL bRet = GetNextX( rSegment.mnStart ); - - if( bRet && !GetNextX( rSegment.mnEnd ) ) - rSegment.mnEnd = rSegment.mnStart; - - return bRet; -} - -// --------------- -// - PolyScanner - -// --------------- - -PolyScanner::PolyScanner( const Rectangle& rRect ) -{ - if( !rRect.IsEmpty() ) - { - Rectangle aRect( rRect ); - ULONG nHeight; - - aRect.Justify(); - mnLeft = aRect.Left(); - mnTop = aRect.Top(); - mnRight = aRect.Right(); - mnBottom = aRect.Bottom(); - mpArray = new PolyScanline[ nHeight = Height() ]; - - for( ULONG i = 0UL; i < nHeight; i++ ) - mpArray[ i ].Set( mnLeft, mnRight ); - } - else - { - mnLeft = mnTop = mnRight = mnBottom = 0L; - mpArray = NULL; - } -} - -// ------------------------------------------------------------------------ - -PolyScanner::PolyScanner( const Polygon& rPoly ) -{ - const long nCount = rPoly.GetSize(); - - if( nCount ) - { - long nLast = nCount - 1; - Point aFirst( rPoly[ 0 ] ); - Point aLast( rPoly[ (USHORT) nLast ] ); - - while( nLast && ( aLast == aFirst ) ) - aLast = rPoly[ (USHORT) --nLast ]; - - if( !nLast ) - { - aLast = rPoly[ 0 ]; - mnLeft = mnRight = aLast.X(); - mnTop = mnBottom = aLast.Y(); - mpArray = new PolyScanline[ 1UL ]; - mpArray[ 0 ].Set( mnLeft, mnRight ); - } - else - { - const Rectangle aRect( rPoly.GetBoundRect() ); - ULONG nHeight; - - mnLeft = aRect.Left(); - mnTop = aRect.Top(); - mnRight = aRect.Right(); - mnBottom = aRect.Bottom(); - aLast = aFirst; - mpArray = new PolyScanline[ nHeight = Height() ]; - - for( long i = 1L; i <= nLast; i++ ) - { - const Point& rPt = rPoly[ (USHORT) i ]; - - if( rPt != aLast ) - { - InsertLine( aLast, rPt ); - aLast = rPt; - } - } - - InsertLine( aLast, aFirst ); - } - } - else - mpArray = NULL; -} - -// ------------------------------------------------------------------------ - -PolyScanner::PolyScanner( const PolyPolygon& rPolyPoly ) -{ - mpArray = NULL; -} - -// ------------------------------------------------------------------------ - -PolyScanner::~PolyScanner() -{ - delete[] mpArray; -} - -// ------------------------------------------------------------------------ - -PolyScanline* PolyScanner::operator[]( ULONG nPos ) const -{ - DBG_ASSERT( nPos < Count(), "nPos out of range!" ); - return( mpArray ? ( mpArray + nPos ) : NULL ); -} - -// ------------------------------------------------------------------------ - -void PolyScanner::InsertLine( const Point& rStart, const Point& rEnd ) -{ - long nX, nY; - - if( rStart.Y() == rEnd.Y() ) - mpArray[ rStart.Y() - mnTop ].Insert( rStart.X() ); - else if( rStart.X() == rEnd.X() ) - { - // vertical line - const long nEndY = rEnd.Y(); - - nX = rStart.X(); - nY = rStart.Y(); - - if( nEndY > nY ) - while( nY < nEndY ) - mpArray[ nY++ - mnTop ].Insert( nX ); - else - while( nY > nEndY ) - mpArray[ nY-- - mnTop ].Insert( nX ); - } - else - { - const long nDX = labs( rEnd.X() - rStart.X() ); - const long nDY = labs( rEnd.Y() - rStart.Y() ); - const long nStartX = rStart.X(); - const long nStartY = rStart.Y(); - const long nEndX = rEnd.X(); - const long nEndY = rEnd.Y(); - const long nXInc = ( nStartX < nEndX ) ? 1L : -1L; - const long nYInc = ( nStartY < nEndY ) ? 1L : -1L; - long nLastX = nStartX; - long nLastY = nStartY; - BOOL bLast = FALSE; - - mpArray[ nStartY - mnTop ].Insert( nStartX ); - - if( nDX >= nDY ) - { - const long nDYX = ( nDY - nDX ) << 1; - const long nDY2 = nDY << 1; - long nD = nDY2 - nDX; - - for( nX = nStartX, nY = nLastY = nStartY; nX != nEndX; ) - { - if( nY != nLastY ) - { - if( bLast ) - mpArray[ nLastY - mnTop ].Insert( nLastX ); - - mpArray[ nY - mnTop ].Insert( nX ); - bLast = FALSE; - } - else - bLast = TRUE; - - nLastX = nX; - nLastY = nY; - - if( nD < 0L ) - nD += nDY2; - else - { - nD += nDYX; - nY += nYInc; - } - - nX += nXInc; - } - } - else - { - const long nDYX = ( nDX - nDY ) << 1; - const long nDY2 = nDX << 1; - long nD = nDY2 - nDY; - - for( nX = nStartX, nY = nStartY; nY != nEndY; ) - { - if( nY != nLastY ) - { - if( bLast ) - mpArray[ nLastY - mnTop ].Insert( nLastX ); - - mpArray[ nY - mnTop ].Insert( nX ); - bLast = FALSE; - } - else - bLast = TRUE; - - nLastX = nX; - nLastY = nY; - - if( nD < 0L ) - nD += nDY2; - else - { - nD += nDYX; - nX += nXInc; - } - - nY += nYInc; - } - } - - if( bLast ) - mpArray[ nLastY - mnTop ].Insert( nLastX ); - } -} diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 78456992340f..3dd9b37c5b10 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -31,30 +31,28 @@ #define ENABLE_BYTESTRING_STREAM_OPERATORS #include <list> -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salinst.hxx> -#include <vcl/salgdi.hxx> -#include <vcl/salptype.hxx> -#include <vcl/salprn.hxx> - -#include <vcl/unohelp.hxx> #include <tools/debug.hxx> #include <tools/stream.hxx> #include <tools/vcompat.hxx> -#include <vcl/svdata.hxx> + +#include <vcl/unohelp.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> -#include <vcl/jobset.h> -#include <vcl/outdev.h> #include <vcl/virdev.hxx> #include <vcl/window.hxx> -#include <vcl/print.h> #include <vcl/gdimtf.hxx> #include <vcl/metaact.hxx> #include <vcl/print.hxx> +#include <salinst.hxx> +#include <salgdi.hxx> +#include <salptype.hxx> +#include <salprn.hxx> +#include <svdata.hxx> +#include <jobset.h> +#include <outdev.h> +#include <print.h> + #include <comphelper/processfactory.hxx> #include "com/sun/star/beans/XPropertySet.hpp" diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index 5c2a742a10ba..a87dbad5276f 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -33,19 +33,22 @@ #include <utility> #include <list> #include <vector> + #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> + #include <tools/debug.hxx> + #include <vcl/virdev.hxx> #include <vcl/metaact.hxx> #include <vcl/gdimtf.hxx> -#include <vcl/print.h> #include <vcl/salbtype.hxx> #include <vcl/print.hxx> #include <vcl/svapp.hxx> -#include <vcl/sallayout.hxx> #include <vcl/bmpacc.hxx> +#include <print.h> + #include "pdfwriter_impl.hxx" // ----------- diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index 8207282add99..11f5e187c61d 100755 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -28,16 +28,17 @@ #include "precompiled_vcl.hxx" #include "vcl/print.hxx" -#include "vcl/prndlg.hxx" #include "vcl/svapp.hxx" -#include "vcl/svdata.hxx" -#include "vcl/salinst.hxx" -#include "vcl/salprn.hxx" -#include "vcl/svids.hrc" #include "vcl/metaact.hxx" #include "vcl/msgbox.hxx" #include "vcl/configsettings.hxx" +#include "printdlg.hxx" +#include "svdata.hxx" +#include "salinst.hxx" +#include "salprn.hxx" +#include "svids.hrc" + #include "tools/urlobj.hxx" #include "com/sun/star/ui/dialogs/XFilePicker.hpp" diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index 4931ee66e93f..087497549cc3 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -29,19 +29,16 @@ #include "precompiled_vcl.hxx" #include <limits.h> + #include <tools/vcompat.hxx> -#include <vcl/salbtype.hxx> #include <tools/stream.hxx> #include <tools/debug.hxx> -#ifndef _REGION_H -#include <vcl/region.h> -#endif -#ifndef _REGION_HXX + #include <vcl/region.hxx> -#endif -#ifndef _REGBAND_HXX #include <vcl/regband.hxx> -#endif +#include <vcl/salbtype.hxx> + +#include <region.h> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx index 97e11c5a6aa4..0a616a84eddb 100755 --- a/vcl/source/gdi/salgdilayout.cxx +++ b/vcl/source/gdi/salgdilayout.cxx @@ -29,30 +29,31 @@ #include "precompiled_vcl.hxx" #include <tools/ref.hxx> -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salgdi.hxx> -#include <vcl/salframe.hxx> -#include <vcl/salvd.hxx> -#include <vcl/salprn.hxx> #include <tools/debug.hxx> -#include <vcl/svdata.hxx> -#include <vcl/svapp.hxx> #include <tools/poly.hxx> + +#include <vcl/svapp.hxx> #include <vcl/region.hxx> -#include <vcl/region.h> #include <vcl/virdev.hxx> -#include <vcl/window.h> #include <vcl/window.hxx> #include <vcl/metaact.hxx> #include <vcl/gdimtf.hxx> -#include <vcl/outdata.hxx> #include <vcl/print.hxx> -#include <vcl/outdev.h> #include <vcl/outdev.hxx> #include <vcl/unowrap.hxx> -#include <vcl/sallayout.hxx> + +#include <window.h> +#include <region.h> +#include <outdev.h> +#include <sallayout.hxx> +#include <salgdi.hxx> +#include <salframe.hxx> +#include <salvd.hxx> +#include <salprn.hxx> +#include <svdata.hxx> +#include <outdata.hxx> + + #include "basegfx/polygon/b2dpolygon.hxx" // ---------------------------------------------------------------------------- diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 5e187944c706..3a2251da5d84 100755 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -34,19 +34,16 @@ #include <math.h> #include <sal/alloca.h> -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salgdi.hxx> -#include <vcl/sallayout.hxx> +#include <salgdi.hxx> +#include <sallayout.hxx> + #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> + #include <i18npool/lang.h> -#ifndef _TL_DEBUG_HXX #include <tools/debug.hxx> -#endif #include <limits.h> diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx index 31df581f50a2..6fdafe04e88b 100644 --- a/vcl/source/gdi/salmisc.cxx +++ b/vcl/source/gdi/salmisc.cxx @@ -30,7 +30,7 @@ #include <rtl/memory.h> #include <vcl/bmpacc.hxx> #include <vcl/salbtype.hxx> -#include <vcl/bmpfast.hxx> +#include <bmpfast.hxx> // ----------- // - Defines - diff --git a/vcl/source/gdi/salnativewidgets-none.cxx b/vcl/source/gdi/salnativewidgets-none.cxx index 8aa0e47f1a35..d2a0b1aebf0c 100644 --- a/vcl/source/gdi/salnativewidgets-none.cxx +++ b/vcl/source/gdi/salnativewidgets-none.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/salgdi.hxx> +#include <salgdi.hxx> using namespace rtl; diff --git a/vcl/source/gdi/svcompat.cxx b/vcl/source/gdi/svcompat.cxx deleted file mode 100644 index 415cad128a49..000000000000 --- a/vcl/source/gdi/svcompat.cxx +++ /dev/null @@ -1,78 +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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_vcl.hxx" -#include <tools/stream.hxx> -#include <svcompat.hxx> - -// -------------- -// - ImplCompat - -// -------------- - -ImplCompat::ImplCompat( SvStream& rStm, USHORT nStreamMode, USHORT nVersion ) : - mpRWStm ( &rStm ), - mnStmMode ( nStreamMode ), - mnVersion ( nVersion ) -{ - if( !mpRWStm->GetError() ) - { - if( STREAM_WRITE == mnStmMode ) - { - *mpRWStm << mnVersion; - mnTotalSize = ( mnCompatPos = mpRWStm->Tell() ) + 4UL; - mpRWStm->SeekRel( 4L ); - } - else - { - *mpRWStm >> mnVersion; - *mpRWStm >> mnTotalSize; - mnCompatPos = mpRWStm->Tell(); - } - } -} - -// ------------------------------------------------------------------------ - -ImplCompat::~ImplCompat() -{ - if( STREAM_WRITE == mnStmMode ) - { - const UINT32 nEndPos = mpRWStm->Tell(); - - mpRWStm->Seek( mnCompatPos ); - *mpRWStm << ( nEndPos - mnTotalSize ); - mpRWStm->Seek( nEndPos ); - } - else - { - const UINT32 nReadSize = mpRWStm->Tell() - mnCompatPos; - - if( mnTotalSize > nReadSize ) - mpRWStm->SeekRel( mnTotalSize - nReadSize ); - } -} diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx index 78ce197525ec..33bdf6b05bcc 100644 --- a/vcl/source/gdi/textlayout.cxx +++ b/vcl/source/gdi/textlayout.cxx @@ -30,8 +30,9 @@ #include "vcl/ctrl.hxx" #include "vcl/outdev.hxx" -#include "vcl/outfont.hxx" -#include "vcl/textlayout.hxx" + +#include "outfont.hxx" +#include "textlayout.hxx" #include <com/sun/star/i18n/ScriptDirection.hpp> diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index 4c1439ffe6f4..9088ce51de6a 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -28,21 +28,20 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salinst.hxx> -#include <vcl/salgdi.hxx> -#include <vcl/salframe.hxx> -#include <vcl/salvd.hxx> #include <tools/debug.hxx> -#include <vcl/svdata.hxx> + #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> -#include <vcl/outdev.h> #include <vcl/virdev.hxx> +#include <salinst.hxx> +#include <salgdi.hxx> +#include <salframe.hxx> +#include <salvd.hxx> +#include <outdev.h> +#include <svdata.hxx> + using namespace ::com::sun::star::uno; // ======================================================================= diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx index 10aa4431f69d..3eb7e654a829 100644 --- a/vcl/source/gdi/wall.cxx +++ b/vcl/source/gdi/wall.cxx @@ -27,15 +27,18 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/stream.hxx> #include <tools/vcompat.hxx> #include <tools/debug.hxx> + #include <vcl/bitmapex.hxx> #include <vcl/gradient.hxx> #include <vcl/wall.hxx> -#include <vcl/wall2.hxx> #include <vcl/svapp.hxx> +#include <wall2.hxx> + DBG_NAME( Wallpaper ); diff --git a/vcl/source/glyphs/gcach_ftyp.cxx b/vcl/source/glyphs/gcach_ftyp.cxx index 601e46411cd8..57e948b55843 100644 --- a/vcl/source/glyphs/gcach_ftyp.cxx +++ b/vcl/source/glyphs/gcach_ftyp.cxx @@ -36,12 +36,13 @@ #include "gcach_ftyp.hxx" #include "vcl/svapp.hxx" -#include "vcl/outfont.hxx" -#include "vcl/impfont.hxx" + +#include "outfont.hxx" +#include "impfont.hxx" #include "tools/poly.hxx" #include "basegfx/matrix/b2dhommatrix.hxx" -#include <basegfx/matrix/b2dhommatrixtools.hxx> +#include "basegfx/matrix/b2dhommatrixtools.hxx" #include "basegfx/polygon/b2dpolypolygon.hxx" #include "osl/file.hxx" diff --git a/vcl/source/glyphs/gcach_ftyp.hxx b/vcl/source/glyphs/gcach_ftyp.hxx index d760ce1d1fed..5ee155db3008 100644 --- a/vcl/source/glyphs/gcach_ftyp.hxx +++ b/vcl/source/glyphs/gcach_ftyp.hxx @@ -28,7 +28,7 @@ #ifndef _SV_GCACHFTYP_HXX #define _SV_GCACHFTYP_HXX -#include <vcl/glyphcache.hxx> +#include <glyphcache.hxx> #include <rtl/textcvt.h> #include <ft2build.h> diff --git a/vcl/source/glyphs/gcach_layout.cxx b/vcl/source/glyphs/gcach_layout.cxx index a9f9167062ba..b212b036425a 100644 --- a/vcl/source/glyphs/gcach_layout.cxx +++ b/vcl/source/glyphs/gcach_layout.cxx @@ -30,8 +30,8 @@ #define ENABLE_ICU_LAYOUT #include <gcach_ftyp.hxx> -#include <vcl/sallayout.hxx> -#include <vcl/salgdi.hxx> +#include <sallayout.hxx> +#include <salgdi.hxx> #include <vcl/svapp.hxx> diff --git a/vcl/source/glyphs/gcach_rbmp.cxx b/vcl/source/glyphs/gcach_rbmp.cxx index 5ea80da77794..8e3fe158b1f5 100644 --- a/vcl/source/glyphs/gcach_rbmp.cxx +++ b/vcl/source/glyphs/gcach_rbmp.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/glyphcache.hxx> +#include <glyphcache.hxx> #include <string.h> //------------------------------------------------------------------------ diff --git a/vcl/source/glyphs/glyphcache.cxx b/vcl/source/glyphs/glyphcache.cxx index 7181db56dd4d..29b5ec8bac2d 100644 --- a/vcl/source/glyphs/glyphcache.cxx +++ b/vcl/source/glyphs/glyphcache.cxx @@ -31,15 +31,17 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <vcl/salbtype.hxx> + #include <gcach_ftyp.hxx> #include <vcl/svapp.hxx> #include <vcl/bitmap.hxx> -#include <vcl/outfont.hxx> +#include <vcl/salbtype.hxx> + +#include <outfont.hxx> #ifdef ENABLE_GRAPHITE -#include <vcl/graphite_features.hxx> +#include <graphite_features.hxx> #endif #include <rtl/ustring.hxx> // used only for string=>hashvalue diff --git a/vcl/source/glyphs/graphite_adaptors.cxx b/vcl/source/glyphs/graphite_adaptors.cxx index f82e3afe39c8..46bce54f6298 100644 --- a/vcl/source/glyphs/graphite_adaptors.cxx +++ b/vcl/source/glyphs/graphite_adaptors.cxx @@ -45,17 +45,17 @@ #include <i18npool/mslangid.hxx> // Platform #ifndef WNT -#include <saldisp.hxx> +#include <unx/saldisp.hxx> -#include <vcl/salgdi.hxx> +#include <salgdi.hxx> #include <freetype/ftsynth.h> // Module #include "gcach_ftyp.hxx" -#include <vcl/graphite_features.hxx> -#include <vcl/graphite_adaptors.hxx> +#include <graphite_features.hxx> +#include <graphite_adaptors.hxx> // Module private type definitions and forward declarations. // diff --git a/vcl/source/glyphs/graphite_cache.cxx b/vcl/source/glyphs/graphite_cache.cxx index 7682cdb6c8ba..a19f5c5a2c9d 100644 --- a/vcl/source/glyphs/graphite_cache.cxx +++ b/vcl/source/glyphs/graphite_cache.cxx @@ -34,7 +34,7 @@ #endif #include <tools/debug.hxx> -#include <vcl/sallayout.hxx> +#include <sallayout.hxx> #include <preextstl.h> #include <graphite/GrClient.h> @@ -42,8 +42,8 @@ #include <postextstl.h> #include <rtl/ustring.hxx> -#include <vcl/graphite_layout.hxx> -#include <vcl/graphite_cache.hxx> +#include <graphite_layout.hxx> +#include <graphite_cache.hxx> #include "graphite_textsrc.hxx" diff --git a/vcl/source/glyphs/graphite_features.cxx b/vcl/source/glyphs/graphite_features.cxx index 1cb25306c4ee..4aba41c4b6d3 100644 --- a/vcl/source/glyphs/graphite_features.cxx +++ b/vcl/source/glyphs/graphite_features.cxx @@ -40,7 +40,7 @@ #include <svsys.h> #endif -#include <vcl/graphite_features.hxx> +#include <graphite_features.hxx> using namespace grutils; // These mustn't conflict with font name lists which use ; and , diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx index 8a011606ab41..267454d825c5 100644 --- a/vcl/source/glyphs/graphite_layout.cxx +++ b/vcl/source/glyphs/graphite_layout.cxx @@ -57,10 +57,10 @@ #endif #ifdef UNX -#include <vcl/graphite_adaptors.hxx> +#include <graphite_adaptors.hxx> #endif -#include <vcl/salgdi.hxx> +#include <salgdi.hxx> #include <unicode/uchar.h> #include <unicode/ubidi.h> @@ -75,8 +75,8 @@ #include <graphite/SegmentPainter.h> #include <postextstl.h> -#include <vcl/graphite_layout.hxx> -#include <vcl/graphite_features.hxx> +#include <graphite_layout.hxx> +#include <graphite_features.hxx> #include "graphite_textsrc.hxx" @@ -102,7 +102,7 @@ FILE * grLog() #endif #ifdef GRCACHE -#include <vcl/graphite_cache.hxx> +#include <graphite_cache.hxx> #endif diff --git a/vcl/source/glyphs/graphite_serverfont.cxx b/vcl/source/glyphs/graphite_serverfont.cxx index eda97f509f03..ceba4dd4f6c8 100644 --- a/vcl/source/glyphs/graphite_serverfont.cxx +++ b/vcl/source/glyphs/graphite_serverfont.cxx @@ -35,12 +35,12 @@ // // Platform -#include <vcl/sallayout.hxx> +#include <sallayout.hxx> // Module #include "gcach_ftyp.hxx" -#include <vcl/graphite_features.hxx> +#include <graphite_features.hxx> #include "graphite_textsrc.hxx" -#include <vcl/graphite_serverfont.hxx> +#include <graphite_serverfont.hxx> #ifndef WNT diff --git a/vcl/source/glyphs/graphite_textsrc.cxx b/vcl/source/glyphs/graphite_textsrc.cxx index 5764ba9454c9..ac5fd0c558af 100644 --- a/vcl/source/glyphs/graphite_textsrc.cxx +++ b/vcl/source/glyphs/graphite_textsrc.cxx @@ -37,7 +37,7 @@ #include <string> #include <cassert> #include "graphite_textsrc.hxx" -#include <vcl/graphite_features.hxx> +#include <graphite_features.hxx> // class TextSourceAdaptor implementation. // diff --git a/vcl/source/glyphs/graphite_textsrc.hxx b/vcl/source/glyphs/graphite_textsrc.hxx index 388f8a631b49..ece01cc1a532 100644 --- a/vcl/source/glyphs/graphite_textsrc.hxx +++ b/vcl/source/glyphs/graphite_textsrc.hxx @@ -43,17 +43,9 @@ #include <tools/svwin.h> #endif -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif - -#ifndef _SV_SALGDI_HXX -#include <vcl/salgdi.hxx> -#endif - -#ifndef _SV_SALLAYOUT_HXX -#include <vcl/sallayout.hxx> -#endif +#include <salgdi.hxx> +#include <sallayout.hxx> // Module #include "vcl/dllapi.h" diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx index 2bc0ab94d272..2caddb0ced7a 100644 --- a/vcl/source/helper/canvasbitmap.cxx +++ b/vcl/source/helper/canvasbitmap.cxx @@ -37,7 +37,7 @@ #include <vos/mutex.hxx> #include <tools/diagnose_ex.h> -#include <vcl/canvasbitmap.hxx> +#include <canvasbitmap.hxx> #include <vcl/canvastools.hxx> #include <vcl/bmpacc.hxx> #include <vcl/svapp.hxx> diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index 71c306ff9bbb..03956568e057 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -69,7 +69,7 @@ #include <vcl/bmpacc.hxx> #include <vcl/bitmapex.hxx> -#include <vcl/canvasbitmap.hxx> +#include <canvasbitmap.hxx> #include <vcl/canvastools.hxx> #include <hash_map> diff --git a/vcl/source/helper/lazydelete.cxx b/vcl/source/helper/lazydelete.cxx index 7b244781c3c7..5ef79f92d401 100644 --- a/vcl/source/helper/lazydelete.cxx +++ b/vcl/source/helper/lazydelete.cxx @@ -33,7 +33,7 @@ #include "vcl/window.hxx" #include "vcl/menu.hxx" #include "vcl/lazydelete.hxx" -#include "vcl/svdata.hxx" +#include "svdata.hxx" namespace vcl { diff --git a/vcl/source/helper/xconnection.cxx b/vcl/source/helper/xconnection.cxx index caf7ee237d67..0e19478bcfbc 100644 --- a/vcl/source/helper/xconnection.cxx +++ b/vcl/source/helper/xconnection.cxx @@ -28,10 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "svsys.h" -#include "vcl/xconnection.hxx" -#include "vcl/svdata.hxx" -#include "vcl/salinst.hxx" +#include "xconnection.hxx" +#include "svdata.hxx" +#include "salinst.hxx" #include "vcl/svapp.hxx" namespace vcl diff --git a/vcl/source/salmain/salmain.cxx b/vcl/source/salmain/salmain.cxx index c2e3af01635a..56f197966276 100644 --- a/vcl/source/salmain/salmain.cxx +++ b/vcl/source/salmain/salmain.cxx @@ -32,7 +32,8 @@ #include "sal/main.h" #include "tools/extendapplicationenvironment.hxx" -#include "vcl/salinst.hxx" + +#include "salinst.hxx" SAL_IMPLEMENT_MAIN() { tools::extendApplicationEnvironment(); diff --git a/vcl/source/src/btntext.src b/vcl/source/src/btntext.src index b786184fa2f3..a8962044b47d 100644 --- a/vcl/source/src/btntext.src +++ b/vcl/source/src/btntext.src @@ -27,9 +27,7 @@ #define _SV_BTNTEXT_SRC -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif +#include <svids.hrc> String SV_BUTTONTEXT_OK { diff --git a/vcl/source/src/helptext.src b/vcl/source/src/helptext.src index a42a9531d9ee..f66683bfd5dc 100644 --- a/vcl/source/src/helptext.src +++ b/vcl/source/src/helptext.src @@ -27,9 +27,7 @@ #define _SV_HELPTEXT_SRC -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif +#include <svids.hrc> String SV_HELPTEXT_CLOSE { diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src index 000d7215d80d..987ee29277c7 100644 --- a/vcl/source/src/images.src +++ b/vcl/source/src/images.src @@ -27,9 +27,7 @@ #define _SV_IMAGES_SRC -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif +#include <svids.hrc> // ======================================================================= diff --git a/vcl/source/src/menu.src b/vcl/source/src/menu.src index 1833093adfac..cead04b9f6ec 100644 --- a/vcl/source/src/menu.src +++ b/vcl/source/src/menu.src @@ -25,9 +25,8 @@ * ************************************************************************/ #define _SV_MENU_SRC -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif + +#include <svids.hrc> String SV_RESID_STRING_NOSELECTIONPOSSIBLE { diff --git a/vcl/source/src/print.src b/vcl/source/src/print.src index 04ab77f09288..6b0c378939f6 100644 --- a/vcl/source/src/print.src +++ b/vcl/source/src/print.src @@ -25,7 +25,7 @@ * ************************************************************************/ -#include "vcl/svids.hrc" +#include "svids.hrc" ModalDialog SV_DLG_PRINT { diff --git a/vcl/source/src/stdtext.src b/vcl/source/src/stdtext.src index 1b95f7bb1d72..9fd1487ce522 100644 --- a/vcl/source/src/stdtext.src +++ b/vcl/source/src/stdtext.src @@ -27,9 +27,7 @@ #define _SV_STDTEXT_SRC -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif +#include <svids.hrc> String SV_STDTEXT_SERVICENOTAVAILABLE { diff --git a/vcl/source/src/units.src b/vcl/source/src/units.src index 16b40b3f41a3..ea5f6ecad2ce 100644 --- a/vcl/source/src/units.src +++ b/vcl/source/src/units.src @@ -26,9 +26,7 @@ ************************************************************************/ #define _SV_UNITS_SRC -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif +#include <svids.hrc> StringArray SV_FUNIT_STRINGS { diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx index 3018236fff1a..ccb6360a25fe 100644 --- a/vcl/source/window/accel.cxx +++ b/vcl/source/window/accel.cxx @@ -28,16 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" #include <tools/list.hxx> -#ifndef _TABLE_HXX #include <tools/table.hxx> -#endif #include <tools/debug.hxx> +#include <tools/rc.h> + #include <vcl/svapp.hxx> -#include <vcl/accel.h> +#include <accel.h> #include <vcl/accel.hxx> -#ifndef _RC_H -#include <tools/rc.h> -#endif diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx index 81699bcaabb0..6078ab77404d 100644 --- a/vcl/source/window/accmgr.cxx +++ b/vcl/source/window/accmgr.cxx @@ -29,9 +29,10 @@ #include "precompiled_vcl.hxx" #include <tools/list.hxx> #include <tools/debug.hxx> -#include <vcl/accel.h> + +#include <accel.h> #include <vcl/accel.hxx> -#include <vcl/accmgr.hxx> +#include <accmgr.hxx> diff --git a/vcl/source/window/arrange.cxx b/vcl/source/window/arrange.cxx index f016ef2c053b..90f8bc9a4c1e 100644 --- a/vcl/source/window/arrange.cxx +++ b/vcl/source/window/arrange.cxx @@ -27,9 +27,10 @@ #include "precompiled_vcl.hxx" +#include "svdata.hxx" + #include "vcl/arrange.hxx" #include "vcl/edit.hxx" -#include "vcl/svdata.hxx" #include "vcl/svapp.hxx" #include "com/sun/star/beans/PropertyValue.hpp" diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 2ff7d0a687e7..855b2e827952 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -27,10 +27,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif -#include <vcl/svdata.hxx> + +#include <svids.hrc> +#include <svdata.hxx> +#include <brdwin.hxx> +#include <window.h> + #include <vcl/event.hxx> #include <vcl/decoview.hxx> #include <vcl/syswin.hxx> @@ -42,9 +44,8 @@ #include <vcl/virdev.hxx> #include <vcl/help.hxx> #include <vcl/edit.hxx> -#include <vcl/brdwin.hxx> -#include <vcl/window.h> #include <vcl/metric.hxx> + #include <tools/debug.hxx> using namespace ::com::sun::star::uno; diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx index 9a0452027737..070a4324a54e 100644 --- a/vcl/source/window/btndlg.cxx +++ b/vcl/source/window/btndlg.cxx @@ -30,14 +30,13 @@ #include <tools/ref.hxx> #include <tools/debug.hxx> -#include <vcl/svdata.hxx> +#include <tools/rc.h> + +#include <svdata.hxx> + #include <vcl/button.hxx> #include <vcl/btndlg.hxx> -#ifndef _SV_RC_H -#include <tools/rc.h> -#endif - // ======================================================================= diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx index 5725189e10c3..10bf2b40ae15 100644 --- a/vcl/source/window/cursor.cxx +++ b/vcl/source/window/cursor.cxx @@ -27,14 +27,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <vcl/svapp.hxx> #include <vcl/timer.hxx> #include <vcl/settings.hxx> #include <vcl/window.hxx> -#include <vcl/window.h> -#include <tools/poly.hxx> #include <vcl/cursor.hxx> +#include <window.h> + +#include <tools/poly.hxx> + // ======================================================================= diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 3b5585d3bc63..c963b96197ea 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -29,14 +29,14 @@ #include "precompiled_vcl.hxx" #include <tools/debug.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> + +#include <svdata.hxx> +#include <window.h> +#include <brdwin.hxx> + #include <vcl/svapp.hxx> -#include <vcl/window.h> #include <vcl/event.hxx> -#include <vcl/brdwin.hxx> #include <vcl/wrkwin.hxx> #include <vcl/button.hxx> #include <vcl/mnemonic.hxx> diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index 055b7e9fe80b..4116248f892f 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -27,15 +27,18 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/debug.hxx> -#include <vcl/svdata.hxx> + +#include <svdata.hxx> +#include <window.h> + #include <vcl/event.hxx> #include <vcl/svapp.hxx> #include <vcl/tabpage.hxx> #include <vcl/tabctrl.hxx> #include <vcl/tabdlg.hxx> #include <vcl/button.hxx> -#include <vcl/window.h> #include <vcl/unohelp.hxx> #include <com/sun/star/i18n/XCharacterClassification.hpp> diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx index e4d5a8c4c0eb..70453d6c4f9a 100644 --- a/vcl/source/window/dndevdis.cxx +++ b/vcl/source/window/dndevdis.cxx @@ -28,13 +28,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/dndevdis.hxx> -#include <vcl/dndlcon.hxx> -#include <vcl/window.h> +#include <dndevdis.hxx> +#include <dndlcon.hxx> +#include <window.h> +#include <svdata.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> -#include <vcl/svdata.hxx> + using namespace ::osl; using namespace ::vos; using namespace ::cppu; diff --git a/vcl/source/window/dndlcon.cxx b/vcl/source/window/dndlcon.cxx index 07819e76f957..9d768ad49ac9 100644 --- a/vcl/source/window/dndlcon.cxx +++ b/vcl/source/window/dndlcon.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/dndlcon.hxx> +#include <dndlcon.hxx> using namespace ::cppu; using namespace ::com::sun::star::uno; diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx index 9ea407e52ee3..aaacf074a802 100644 --- a/vcl/source/window/dockingarea.cxx +++ b/vcl/source/window/dockingarea.cxx @@ -27,11 +27,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/debug.hxx> + #include <vcl/dockingarea.hxx> #include <vcl/syswin.hxx> #include <vcl/menu.hxx> -#include <vcl/svdata.hxx> + +#include <svdata.hxx> #include <map> diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index e67c2d9ecfd5..91a6cfabb754 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -28,25 +28,24 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif #include <tools/time.hxx> #ifndef _SV_RC_H #include <tools/rc.h> #endif + +#include <brdwin.hxx> +#include <svdata.hxx> +#include <salframe.hxx> +#include <window.h> + #include <vcl/event.hxx> -#include <vcl/brdwin.hxx> #include <vcl/floatwin.hxx> #include <vcl/dockwin.hxx> #include <vcl/toolbox.hxx> #include <vcl/svapp.hxx> -#include <vcl/svdata.hxx> #include <vcl/timer.hxx> #include <vcl/lineinfo.hxx> -#include <vcl/window.h> #include <vcl/unowrap.hxx> -#include <vcl/salframe.hxx> // ======================================================================= diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index c8e382bad982..77dc10771acd 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -28,23 +28,20 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif #include <tools/time.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif + #include <vcl/event.hxx> -#include <vcl/brdwin.hxx> #include <vcl/floatwin.hxx> #include <vcl/dockwin.hxx> #include <vcl/svapp.hxx> -#include <vcl/svdata.hxx> #include <vcl/timer.hxx> -#include <vcl/window.h> #include <vcl/unowrap.hxx> -#include <vcl/salframe.hxx> + +#include <svdata.hxx> +#include <window.h> +#include <brdwin.hxx> +#include <salframe.hxx> diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 323bbe3b0d74..c5e57da71e75 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -28,21 +28,18 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/svdata.hxx> +#include <svdata.hxx> +#include <brdwin.hxx> +#include <window.h> +#include <salframe.hxx> + #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> -#include <vcl/brdwin.hxx> #include <vcl/event.hxx> #include <vcl/toolbox.hxx> #include <vcl/floatwin.hxx> -#include <vcl/window.h> -#ifndef _SV_RC_H + #include <tools/rc.h> -#endif -#include <vcl/salframe.hxx> #include <tools/debug.hxx> diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx index 03f88adc3566..4ed808852336 100644 --- a/vcl/source/window/introwin.cxx +++ b/vcl/source/window/introwin.cxx @@ -28,18 +28,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salframe.hxx> #include <tools/debug.hxx> -#include <vcl/svdata.hxx> -#include <vcl/wrkwin.hxx> +#include <vcl/wrkwin.hxx> #include <vcl/bitmap.hxx> -#include <vcl/impbmp.hxx> #include <vcl/introwin.hxx> +#include <impbmp.hxx> +#include <svdata.hxx> +#include <salframe.hxx> diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx index bcc5536fd028..c8da4e5c1d8a 100644 --- a/vcl/source/window/keycod.cxx +++ b/vcl/source/window/keycod.cxx @@ -28,21 +28,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salinst.hxx> -#include <vcl/salframe.hxx> -#include <vcl/svdata.hxx> +#include <salinst.hxx> +#include <salframe.hxx> +#include <svdata.hxx> + #include <vcl/window.hxx> -#ifndef _SV_KEYCOD_HXX #include <vcl/keycod.hxx> -#endif -#ifndef _RC_H #include <tools/rc.h> -#endif - // ======================================================================= diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 5909ab9f8489..f20eb67cca69 100755 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -28,38 +28,39 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "svsys.h" -#include "vcl/salinst.hxx" #include "tools/list.hxx" #include "tools/debug.hxx" #include "tools/diagnose_ex.h" -#include "vcl/svdata.hxx" +#include "tools/rc.h" +#include "tools/stream.hxx" + #include "vcl/svapp.hxx" #include "vcl/mnemonic.hxx" #include "vcl/image.hxx" #include "vcl/event.hxx" #include "vcl/help.hxx" -#include "vcl/svids.hrc" #include "vcl/floatwin.hxx" #include "vcl/wrkwin.hxx" #include "vcl/timer.hxx" #include "vcl/sound.hxx" #include "vcl/decoview.hxx" #include "vcl/bitmap.hxx" -#include "tools/rc.h" #include "vcl/menu.hxx" #include "vcl/button.hxx" #include "vcl/gradient.hxx" #include "vcl/i18nhelp.hxx" #include "vcl/taskpanelist.hxx" -#include "vcl/window.h" #include "vcl/controllayout.hxx" #include "vcl/toolbox.hxx" -#include "tools/stream.hxx" -#include "vcl/salmenu.hxx" -#include "vcl/salframe.hxx" #include "vcl/dockingarea.hxx" +#include "salinst.hxx" +#include "svdata.hxx" +#include "svids.hrc" +#include "window.h" +#include "salmenu.hxx" +#include "salframe.hxx" + #include <com/sun/star/uno/Reference.h> #include <com/sun/star/i18n/XCharacterClassification.hpp> diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index d00d569883d5..132703758e5c 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -28,23 +28,21 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif -#include <vcl/svdata.hxx> +#include <tools/rc.h> + +#include <svids.hrc> +#include <svdata.hxx> +#include <brdwin.hxx> +#include <window.h> + #include <vcl/metric.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> #include <vcl/fixed.hxx> #include <vcl/sound.hxx> -#include <vcl/brdwin.hxx> #include <vcl/msgbox.hxx> #include <vcl/button.hxx> -#ifndef _SV_RC_H -#include <tools/rc.h> -#endif #include <vcl/mnemonic.hxx> -#include <vcl/window.h> diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 574cef4e5a07..efa6a693d6dd 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -27,14 +27,15 @@ #include "precompiled_vcl.hxx" +#include "printdlg.hxx" +#include "svdata.hxx" +#include "svids.hrc" +#include "jobset.h" + #include "vcl/print.hxx" -#include "vcl/prndlg.hxx" #include "vcl/dialog.hxx" #include "vcl/button.hxx" -#include "vcl/svdata.hxx" -#include "vcl/svids.hrc" #include "vcl/wall.hxx" -#include "vcl/jobset.h" #include "vcl/status.hxx" #include "vcl/decoview.hxx" #include "vcl/arrange.hxx" diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index 735add842518..a5103fa663e1 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -33,19 +33,12 @@ #include <tools/time.hxx> #include <tools/debug.hxx> -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif -#include <vcl/svdata.hxx> -#ifndef _VCL_TIMER_HXX +#include <svids.hrc> +#include <svdata.hxx> +#include <scrwnd.hxx> + #include <vcl/timer.hxx> -#endif -#ifndef _VCL_EVENT_HXX #include <vcl/event.hxx> -#endif -#ifndef _VCL_SCRWND_HXX -#include <scrwnd.hxx> -#endif #include <math.h> #include <limits.h> diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index b4553a4cf8a7..2c0d584f8ba4 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -28,19 +28,20 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_RC_H #include <tools/rc.h> -#endif +#include <tools/poly.hxx> + #include <vcl/event.hxx> #include <vcl/split.hxx> #include <vcl/svapp.hxx> #include <vcl/syswin.hxx> #include <vcl/taskpanelist.hxx> #include <vcl/gradient.hxx> -#include <tools/poly.hxx> #include <vcl/lineinfo.hxx> + #include <rtl/instance.hxx> -#include <vcl/window.h> + +#include <window.h> namespace { diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index 62fbe2e507f3..51da3077518c 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -29,22 +29,22 @@ #include "precompiled_vcl.hxx" #include <string.h> + #include <tools/list.hxx> #include <tools/debug.hxx> #include <tools/rcid.h> + #include <vcl/event.hxx> #include <vcl/wall.hxx> #include <vcl/bitmap.hxx> #include <vcl/decoview.hxx> #include <vcl/symbol.hxx> -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif #include <vcl/image.hxx> -#include <vcl/svdata.hxx> #include <vcl/help.hxx> #include <vcl/splitwin.hxx> +#include <svdata.hxx> +#include <svids.hrc> // ======================================================================= diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index 36f27b1ceee7..e7a82ae1ef0a 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -27,20 +27,20 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/list.hxx> #include <tools/debug.hxx> - -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> + #include <vcl/event.hxx> #include <vcl/decoview.hxx> #include <vcl/svapp.hxx> #include <vcl/help.hxx> #include <vcl/status.hxx> #include <vcl/virdev.hxx> -#include <vcl/window.h> + +#include <svdata.hxx> +#include <window.h> // ======================================================================= diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx index 4e897eef4a8b..513f0a39dff7 100644 --- a/vcl/source/window/syschild.cxx +++ b/vcl/source/window/syschild.cxx @@ -28,21 +28,23 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <svsys.h> #include <rtl/process.h> #include <rtl/ref.hxx> + #include <tools/rc.h> -#include <vcl/window.h> -#include <vcl/salinst.hxx> -#include <vcl/salframe.hxx> + #include <vcl/window.hxx> -#include <vcl/salobj.hxx> -#include <vcl/svdata.hxx> #include <vcl/sysdata.hxx> #include <vcl/svapp.hxx> #include <vcl/syschild.hxx> #include <vcl/unohelp.hxx> +#include <window.h> +#include <salinst.hxx> +#include <salframe.hxx> +#include <salobj.hxx> +#include <svdata.hxx> + #ifdef SOLAR_JAVA #include <jni.h> #endif @@ -53,8 +55,6 @@ #include <com/sun/star/java/XJavaThreadRegister_11.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <vcl/syschild.hxx> - using namespace ::com::sun::star; // ======================================================================= diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index f6a37658b79f..5621ed5b6516 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -29,16 +29,8 @@ #include "precompiled_vcl.hxx" #include <tools/debug.hxx> -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salframe.hxx> -#include <vcl/svdata.hxx> #include <vcl/svapp.hxx> -#include <vcl/brdwin.hxx> #include <vcl/menu.hxx> -#include <vcl/window.h> -#include <vcl/brdwin.hxx> #include <vcl/sound.hxx> #include <vcl/svapp.hxx> #include <vcl/event.hxx> @@ -46,6 +38,10 @@ #include <vcl/taskpanelist.hxx> #include <vcl/unowrap.hxx> +#include <salframe.hxx> +#include <svdata.hxx> +#include <brdwin.hxx> +#include <window.h> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx index 0589d57009f4..552807ab9235 100644 --- a/vcl/source/window/tabpage.cxx +++ b/vcl/source/window/tabpage.cxx @@ -29,20 +29,17 @@ #include "precompiled_vcl.hxx" #include <tools/ref.hxx> - -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> + #include <vcl/svapp.hxx> #include <vcl/event.hxx> #include <vcl/tabpage.hxx> #include <vcl/tabctrl.hxx> #include <vcl/bitmapex.hxx> -#include <com/sun/star/accessibility/XAccessible.hpp> - +#include <svdata.hxx> +#include <com/sun/star/accessibility/XAccessible.hpp> // ======================================================================= diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx index 1adabe487492..3db85093582e 100644 --- a/vcl/source/window/taskpanelist.cxx +++ b/vcl/source/window/taskpanelist.cxx @@ -27,11 +27,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/svdata.hxx> + #include <tools/rcid.h> -#include <vcl/dockwin.hxx> +#include <vcl/dockwin.hxx> #include <vcl/taskpanelist.hxx> + +#include <svdata.hxx> + #include <functional> #include <algorithm> diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index b71cf1c13c8d..021b7e53402c 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -28,17 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif #include <rtl/logfile.hxx> + #include <tools/list.hxx> #include <tools/debug.hxx> - -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> +#include <tools/poly.hxx> + #include <vcl/event.hxx> #include <vcl/decoview.hxx> #include <vcl/accel.hxx> @@ -48,14 +44,15 @@ #include <vcl/virdev.hxx> #include <vcl/spin.h> #include <vcl/toolbox.hxx> -#include <vcl/toolbox.h> #include <vcl/bitmap.hxx> -#include <tools/poly.hxx> -#include <vcl/salframe.hxx> #include <vcl/mnemonic.hxx> #include <vcl/gradient.hxx> #include <vcl/menu.hxx> -#include <vcl/window.h> + +#include <svdata.hxx> +#include <window.h> +#include <toolbox.h> +#include <salframe.hxx> #include <string.h> #include <vector> diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 35a39676353a..3394da1153aa 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -27,26 +27,26 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/list.hxx> #include <tools/debug.hxx> - -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> + #include <vcl/svapp.hxx> #include <vcl/help.hxx> #include <vcl/bitmap.hxx> #include <vcl/toolbox.hxx> -#include <vcl/toolbox.h> #include <vcl/mnemonic.hxx> #include <vcl/menu.hxx> -#include <vcl/brdwin.hxx> - #include <vcl/unohelp.hxx> +#include <vcl/ImageListProvider.hxx> + +#include <svdata.hxx> +#include <brdwin.hxx> +#include <toolbox.h> + #include <unotools/confignode.hxx> -#include <vcl/ImageListProvider.hxx> #include <com/sun/star/lang/IllegalArgumentException.hpp> using namespace vcl; diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 0762a07476e2..9b4af1f01503 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -27,48 +27,55 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include "svsys.h" -#endif -#include "vcl/salframe.hxx" -#include "vcl/salobj.hxx" -#include "vcl/salinst.hxx" -#include "vcl/salgtype.hxx" -#include "vcl/salgdi.hxx" -#include "vcl/unohelp.hxx" #include "tools/time.hxx" #include "tools/debug.hxx" -#ifndef _SV_RC_H #include "tools/rc.h" -#endif -#include "vcl/svdata.hxx" -#include "vcl/dbggui.hxx" -#include "vcl/outfont.hxx" -#include "vcl/outdev.h" -#include "vcl/region.h" + +#include "unotools/fontcfg.hxx" +#include "unotools/confignode.hxx" + +#include "vcl/unohelp.hxx" +#include "vcl/salgtype.hxx" #include "vcl/event.hxx" #include "vcl/help.hxx" #include "vcl/cursor.hxx" #include "vcl/svapp.hxx" -#include "vcl/window.h" #include "vcl/window.hxx" #include "vcl/syswin.hxx" #include "vcl/syschild.hxx" -#include "vcl/brdwin.hxx" -#include "vcl/helpwin.hxx" #include "vcl/dockwin.hxx" #include "vcl/menu.hxx" #include "vcl/wrkwin.hxx" #include "vcl/wall.hxx" #include "vcl/gradient.hxx" -#include "vcl/toolbox.h" -#include "unotools/fontcfg.hxx" #include "vcl/sysdata.hxx" -#include "vcl/sallayout.hxx" #include "vcl/salctype.hxx" -#include "vcl/button.hxx" // Button::GetStandardText +#include "vcl/button.hxx" #include "vcl/taskpanelist.hxx" +#include "vcl/dialog.hxx" +#include "vcl/unowrap.hxx" +#include "vcl/gdimtf.hxx" +#include "vcl/pdfextoutdevdata.hxx" +#include "vcl/lazydelete.hxx" + +#include "salframe.hxx" +#include "salobj.hxx" +#include "salinst.hxx" +#include "salgdi.hxx" +#include "svdata.hxx" +#include "dbggui.hxx" +#include "outfont.hxx" +#include "window.h" +#include "toolbox.h" +#include "outdev.h" +#include "region.h" +#include "brdwin.hxx" +#include "helpwin.hxx" +#include "sallayout.hxx" +#include "dndlcon.hxx" +#include "dndevdis.hxx" + #include "com/sun/star/awt/XWindowPeer.hpp" #include "com/sun/star/rendering/XCanvas.hpp" #include "com/sun/star/rendering/XSpriteCanvas.hpp" @@ -85,16 +92,6 @@ #include "com/sun/star/accessibility/XAccessible.hpp" #include "com/sun/star/accessibility/AccessibleRole.hpp" -#include "vcl/dialog.hxx" -#include "vcl/unowrap.hxx" -#include "vcl/dndlcon.hxx" -#include "vcl/dndevdis.hxx" -#include "unotools/confignode.hxx" -#include "vcl/gdimtf.hxx" - -#include "vcl/pdfextoutdevdata.hxx" -#include "vcl/lazydelete.hxx" - #include <set> #include <typeinfo> diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index e5b58a8b6f3c..00391b2814bb 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -29,31 +29,28 @@ #include "precompiled_vcl.hxx" #include <limits.h> -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salbmp.hxx> -#include <vcl/salgdi.hxx> -#include <vcl/salframe.hxx> + #include <tools/debug.hxx> -#include <vcl/svdata.hxx> -#include <vcl/impbmp.hxx> +#include <tools/poly.hxx> + #include <vcl/bitmap.hxx> #include <vcl/event.hxx> #include <vcl/timer.hxx> #include <vcl/metric.hxx> -#include <vcl/outfont.hxx> -#include <vcl/outdev.h> -#include <tools/poly.hxx> #include <vcl/virdev.hxx> -#include <vcl/window.h> #include <vcl/window.hxx> #include <vcl/scrbar.hxx> -#ifndef _SV_SCRWND_HXX -#include <scrwnd.hxx> -#endif #include <vcl/dockwin.hxx> +#include <window.h> +#include <outfont.hxx> +#include <outdev.h> +#include <svdata.hxx> +#include <impbmp.hxx> +#include <salbmp.hxx> +#include <salgdi.hxx> +#include <salframe.hxx> +#include <scrwnd.hxx> // ======================================================================= diff --git a/vcl/source/window/window4.cxx b/vcl/source/window/window4.cxx index 577a573c2015..775249c450ee 100644 --- a/vcl/source/window/window4.cxx +++ b/vcl/source/window/window4.cxx @@ -28,10 +28,11 @@ #include "precompiled_vcl.hxx" #include "vcl/window.hxx" -#include "vcl/window.h" -#include "vcl/svdata.hxx" #include "vcl/arrange.hxx" +#include "window.h" +#include "svdata.hxx" + #include "com/sun/star/beans/PropertyValue.hpp" #include <map> diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 2fce7e52f24c..72e9b581526a 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -28,40 +28,37 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salwtype.hxx> -#include <vcl/salframe.hxx> #include <tools/debug.hxx> -#ifndef _INTN_HXX -//#include <tools/intn.hxx> -#endif + +#include <unotools/localedatawrapper.hxx> + #include <vcl/i18nhelp.hxx> #include <vcl/unohelp.hxx> -#include <unotools/localedatawrapper.hxx> -#include <vcl/svdata.hxx> -#include <vcl/dbggui.hxx> #include <vcl/timer.hxx> #include <vcl/event.hxx> #include <vcl/sound.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/cursor.hxx> -#include <vcl/accmgr.hxx> -#include <vcl/print.h> -#include <vcl/window.h> #include <vcl/wrkwin.hxx> #include <vcl/floatwin.hxx> #include <vcl/dialog.hxx> #include <vcl/help.hxx> -#include <vcl/helpwin.hxx> -#include <vcl/brdwin.hxx> #include <vcl/dockwin.hxx> -#include <vcl/salgdi.hxx> #include <vcl/menu.hxx> -#include <vcl/dndlcon.hxx> +#include <svdata.hxx> +#include <dbggui.hxx> +#include <salwtype.hxx> +#include <salframe.hxx> +#include <accmgr.hxx> +#include <print.h> +#include <window.h> +#include <helpwin.hxx> +#include <brdwin.hxx> +#include <salgdi.hxx> +#include <dndlcon.hxx> + #include <com/sun/star/datatransfer/dnd/XDragSource.hpp> #include <com/sun/star/awt/MouseEvent.hpp> diff --git a/vcl/source/window/wpropset.cxx b/vcl/source/window/wpropset.cxx index 4aaa3f987b77..e10715922572 100644 --- a/vcl/source/window/wpropset.cxx +++ b/vcl/source/window/wpropset.cxx @@ -30,7 +30,8 @@ #include "vcl/wpropset.hxx" #include "vcl/window.hxx" #include "vcl/vclevent.hxx" -#include "vcl/svdata.hxx" + +#include "svdata.hxx" #include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "com/sun/star/beans/PropertyValue.hpp" diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index 8fb2f2f8346a..cd3522d431f4 100644 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -28,22 +28,18 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salframe.hxx> #include <tools/debug.hxx> - -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> + #include <vcl/svapp.hxx> -#include <vcl/brdwin.hxx> -#include <vcl/window.h> #include <vcl/wrkwin.hxx> #include <vcl/sysdata.hxx> +#include <svdata.hxx> +#include <salframe.hxx> +#include <brdwin.hxx> +#include <window.h> + // ======================================================================= #define WORKWIN_WINDOWSTATE_FULLSCREEN ((ULONG)0x00010000) |