diff options
Diffstat (limited to 'vcl/source')
150 files changed, 824 insertions, 2295 deletions
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index 6649f19e0030..94ebbf3ad9d8 100644..100755 --- 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,18 @@ #include "vcl/wrkwin.hxx" #include "vcl/sound.hxx" #include "vcl/threadex.hxx" -#include "vcl/dbggui.hxx" -#include "com/sun/star/i18n/XCharacterClassification.hpp" + +#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> @@ -626,10 +627,9 @@ sal_Bool DbgWindow::Close() // remember window position ByteString aState( GetWindowState() ); DbgData* pData = DbgGetData(); - strncpy( pData->aDbgWinState, - aState.GetBuffer(), - std::min( sizeof( pData->aDbgWinState ), - size_t(aState.Len() + 1U )) ); + size_t nCopy = (sizeof( pData->aDbgWinState ) < size_t(aState.Len() + 1U )) + ? sizeof( pData->aDbgWinState ) : size_t(aState.Len() + 1U ); + strncpy( pData->aDbgWinState, aState.GetBuffer(), nCopy ); pData->aDbgWinState[ sizeof( pData->aDbgWinState ) - 1 ] = 0; // and save for next session DbgSaveData( *pData ); diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 13fb2d3c0893..ce582916ea62 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -28,16 +28,18 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "vcl/svdata.hxx" +#include "tools/debug.hxx" +#include "tools/diagnose_ex.h" +#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/diagnose_ex.h" -#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 5b2f302adaa7..b7ae51615c08 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 42e4cf09fdb0..de1c2b985f4a 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/makefile.mk b/vcl/source/app/makefile.mk deleted file mode 100644 index 5d14f0032b4a..000000000000 --- a/vcl/source/app/makefile.mk +++ /dev/null @@ -1,69 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=vcl -TARGET=app -ENABLE_EXCEPTIONS=TRUE - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -CDEFS+=-DDLLPOSTFIX=$(DLLPOSTFIX) - -# --- Files -------------------------------------------------------- - -SLOFILES= $(SLO)$/dbggui.obj \ - $(SLO)$/help.obj \ - $(SLO)$/idlemgr.obj \ - $(SLO)$/settings.obj \ - $(SLO)$/sound.obj \ - $(SLO)$/stdtext.obj \ - $(SLO)$/svapp.obj \ - $(SLO)$/svdata.obj \ - $(SLO)$/svmain.obj \ - $(SLO)$/svmainhook.obj \ - $(SLO)$/timer.obj \ - $(SLO)$/dndhelp.obj \ - $(SLO)$/unohelp.obj \ - $(SLO)$/unohelp2.obj \ - $(SLO)$/vclevent.obj \ - $(SLO)$/i18nhelp.obj \ - $(SLO)$/salvtables.obj \ - $(SLO)$/session.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk - diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 8ee732acf981..3bb06c03ebdb 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 c8d55d109134..780d91c4e41a 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 480817f26b37..55974b57815c 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 7411baaf470e..bbe09eb1b411 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 c61ddc0af6ae..da70672b7b2d 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 b749fa78ea59..51bbbef353a8 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -31,36 +31,36 @@ #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 "vcl/xconnection.hxx" - -#include "unotools/fontcfg.hxx" -#include "vos/mutex.hxx" - -#include "cppuhelper/implbase1.hxx" -#include "uno/current_context.hxx" +#include "salinst.hxx" +#include "salframe.hxx" +#include "svdata.hxx" +#include "window.h" +#include "salimestatus.hxx" +#include "salsys.hxx" +#include "svids.hrc" #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 c075e1b108f3..47321e45edcb 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 f31779f759c6..ec421651637e 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 711f9fb06ae1..c67abda51f60 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 1ae5f7537ca6..33f22a3a50d5 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/components/makefile.mk b/vcl/source/components/makefile.mk deleted file mode 100644 index 982687104c01..000000000000 --- a/vcl/source/components/makefile.mk +++ /dev/null @@ -1,52 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=vcl -TARGET=components -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES= $(SLO)$/display.obj \ - $(SLO)$/dtranscomp.obj \ - $(SLO)$/fontident.obj \ - $(SLO)$/stringmirror.obj \ - $(SLO)$/factory.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk - diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 5ffe94212d20..1a6439a0502e 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 2fd0ade0f65d..2d6cb76b0512 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 6bbe5bb32c38..26ef9b076d8c 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 769614a9259b..cd8d64516919 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 4a42abd3ea79..fd69457c8026 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 4b14a5a4b199..9aac58e1a30a 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 db92cd0b09af..5455f9410f54 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 5b09bf6bb3b5..6bf4d519a64b 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 793d12a0e93e..016facae8e2c 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 aae78baa3fb7..40b897bbb35c 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 594b76684a1a..1d2f5ee63b0f 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/makefile.mk b/vcl/source/control/makefile.mk deleted file mode 100644 index de2613b1084f..000000000000 --- a/vcl/source/control/makefile.mk +++ /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. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=vcl -TARGET=ctrl - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -.IF "$(COM)"=="ICC" -CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE -.ENDIF - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES= \ - $(SLO)$/button.obj \ - $(SLO)$/ctrl.obj \ - $(SLO)$/edit.obj \ - $(SLO)$/field2.obj \ - $(SLO)$/ilstbox.obj \ - $(SLO)$/tabctrl.obj \ - $(SLO)$/throbber.obj - -SLOFILES= $(EXCEPTIONSFILES) \ - $(SLO)$/combobox.obj \ - $(SLO)$/field.obj \ - $(SLO)$/fixbrd.obj \ - $(SLO)$/fixed.obj \ - $(SLO)$/group.obj \ - $(SLO)$/imgctrl.obj \ - $(SLO)$/longcurr.obj \ - $(SLO)$/lstbox.obj \ - $(SLO)$/morebtn.obj \ - $(SLO)$/menubtn.obj \ - $(SLO)$/scrbar.obj \ - $(SLO)$/slider.obj \ - $(SLO)$/spinfld.obj \ - $(SLO)$/spinbtn.obj \ - $(SLO)$/quickselectionengine.obj - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk - diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index 9bc71f1a55e3..17ecbd4a6ce8 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 d7501a6f99b6..ed0bb4374c53 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 3140d100aa86..6cc07e85ffb7 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/fontsubset/makefile.mk b/vcl/source/fontsubset/makefile.mk deleted file mode 100644 index 25dde00af521..000000000000 --- a/vcl/source/fontsubset/makefile.mk +++ /dev/null @@ -1,51 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=vcl -TARGET=fontsubset - -# --- Settings ----------------------------------------------------- -ENABLE_EXCEPTIONS=true - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -SLOFILES=\ - $(SLO)$/list.obj \ - $(SLO)$/sft.obj \ - $(SLO)$/cff.obj \ - $(SLO)$/fontsubset.obj \ - $(SLO)$/xlat.obj \ - $(SLO)$/ttcr.obj \ - $(SLO)$/gsub.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx index 8d831961f8af..bcf141a8e005 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 4905646d3563..d39b0f7169d0 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 abee1ed9bf67..743326df04d5 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 1c7b41b51de6..ed0dc6225a0f 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 ac2e09df832f..fc3e031f260e 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 ac3a80612fe5..a3b729e69244 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 3f95f56315f6..61a08df4ddc0 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 4a3a2f265374..4f1aad4d36cb 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> @@ -874,9 +877,6 @@ namespace bool identifyTrueTypeFont( const void* i_pBuffer, sal_uInt32 i_nSize, Font& o_rResult ) { bool bResult = false; -// FIXME: This is HACK. We do not build psprint's part on aqua... -// How to solve this? -#ifndef QUARTZ TrueTypeFont* pTTF = NULL; if( OpenTTFontBuffer( const_cast<void*>(i_pBuffer), i_nSize, 0, &pTTF ) == SF_OK ) { @@ -950,7 +950,6 @@ namespace // success bResult = true; } -#endif return bResult; } diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx index 1a8201706212..1aae4e2dc060 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 ee6060b7d8f3..d33709787d2d 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 af39ed615874..f8d71112d3a1 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 500ba9549b9e..8ca2fec6e037 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 0d0af3365c00..735f912f0782 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 8321e56443f3..b44a99b2789d 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/makefile.mk b/vcl/source/gdi/makefile.mk deleted file mode 100755 index ac2e586a41cb..000000000000 --- a/vcl/source/gdi/makefile.mk +++ /dev/null @@ -1,122 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=vcl -TARGET=gdi - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -.IF "$(COM)"=="ICC" -CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE -.ENDIF -.IF "$(ENABLE_GRAPHITE)" == "TRUE" -CDEFS+=-DENABLE_GRAPHITE -.ENDIF - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES= $(SLO)$/salmisc.obj \ - $(SLO)$/outdev.obj \ - $(SLO)$/outdev3.obj \ - $(SLO)$/outdevnative.obj \ - $(SLO)$/gfxlink.obj \ - $(SLO)$/print.obj \ - $(SLO)$/print2.obj \ - $(SLO)$/print3.obj \ - $(SLO)$/oldprintadaptor.obj \ - $(SLO)$/configsettings.obj \ - $(SLO)$/sallayout.obj \ - $(SLO)$/image.obj \ - $(SLO)$/impimage.obj \ - $(SLO)$/impgraph.obj \ - $(SLO)$/metric.obj \ - $(SLO)$/pdfwriter_impl.obj \ - $(SLO)$/pdfwriter_impl2.obj \ - $(SLO)$/pdffontcache.obj\ - $(SLO)$/bmpconv.obj \ - $(SLO)$/pdfextoutdevdata.obj \ - $(SLO)$/jobset.obj \ - $(SLO)$/impimagetree.obj \ - $(SLO)$/pngread.obj \ - $(SLO)$/pngwrite.obj \ - $(SLO)$/virdev.obj \ - $(SLO)$/gdimtf.obj \ - $(SLO)$/graphictools.obj \ - $(SLO)$/textlayout.obj \ - $(SLO)$/lineinfo.obj - -SLOFILES= $(EXCEPTIONSFILES) \ - $(SLO)$/animate.obj \ - $(SLO)$/impanmvw.obj \ - $(SLO)$/bitmap.obj \ - $(SLO)$/bitmap2.obj \ - $(SLO)$/bitmap3.obj \ - $(SLO)$/bitmap4.obj \ - $(SLO)$/alpha.obj \ - $(SLO)$/bitmapex.obj \ - $(SLO)$/bmpacc.obj \ - $(SLO)$/bmpacc2.obj \ - $(SLO)$/bmpacc3.obj \ - $(SLO)$/bmpfast.obj \ - $(SLO)$/cvtsvm.obj \ - $(SLO)$/cvtgrf.obj \ - $(SLO)$/font.obj \ - $(SLO)$/gradient.obj \ - $(SLO)$/hatch.obj \ - $(SLO)$/graph.obj \ - $(SLO)$/impbmp.obj \ - $(SLO)$/imagerepository.obj \ - $(SLO)$/impvect.obj \ - $(SLO)$/mapmod.obj \ - $(SLO)$/metaact.obj \ - $(SLO)$/octree.obj \ - $(SLO)$/outmap.obj \ - $(SLO)$/outdev2.obj \ - $(SLO)$/outdev4.obj \ - $(SLO)$/outdev5.obj \ - $(SLO)$/outdev6.obj \ - $(SLO)$/regband.obj \ - $(SLO)$/region.obj \ - $(SLO)$/wall.obj \ - $(SLO)$/base14.obj \ - $(SLO)$/pdfwriter.obj \ - $(SLO)$/salgdilayout.obj \ - $(SLO)$/extoutdevdata.obj \ - $(SLO)$/salnativewidgets-none.obj - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/vcl/source/gdi/metric.cxx b/vcl/source/gdi/metric.cxx index 01f88e9d8860..b05ae27a8f5f 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 658856dbe100..be69d34bff7e 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 b5ecb0761949..dcad34c363ad 100755 --- a/vcl/source/gdi/outdev.cxx +++ b/vcl/source/gdi/outdev.cxx @@ -29,35 +29,34 @@ #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> +// declare system types in sysdata.hxx +#include <svsys.h> #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 6d98f79dcaaa..46b0d81c348d 100755 --- 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 10f618d6e7c1..1681e1eeec7c 100644..100755 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -30,49 +30,57 @@ #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" +// declare system types in sysdata.hxx +#include <svsys.h> #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 a18b7ff48413..84fc4fd7c524 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 627f75e88282..0a28203dbdfd 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 eb4b76fb4b41..6752cb881b65 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 cb472762338b..c31188fc357e 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 1bdd86e13ecb..72bcd2cc8a14 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 4a37d3a5d601..09d3e7372c22 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -33,42 +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 <vcl/cvtgrf.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 c73be7c037e5..4d0f2234fc31 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 143c55a83ab1..1e4301b5a686 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -35,9 +35,12 @@ #include "vcl/metaact.hxx" #include "vcl/bmpacc.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 7c69f79d50e6..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 ) ); -} - -// ------------------------------------------------------------------------ - -sal_Bool PolyScanline::GetFirstSegment( PolyScanSegment& rSegment ) -{ - sal_Bool bRet = GetFirstX( rSegment.mnStart ); - - if( bRet && !GetNextX( rSegment.mnEnd ) ) - rSegment.mnEnd = rSegment.mnStart; - - return bRet; -} - -// ------------------------------------------------------------------------ - -sal_Bool PolyScanline::GetNextSegment( PolyScanSegment& rSegment ) -{ - sal_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 ); - sal_uLong nHeight; - - aRect.Justify(); - mnLeft = aRect.Left(); - mnTop = aRect.Top(); - mnRight = aRect.Right(); - mnBottom = aRect.Bottom(); - mpArray = new PolyScanline[ nHeight = Height() ]; - - for( sal_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[ (sal_uInt16) nLast ] ); - - while( nLast && ( aLast == aFirst ) ) - aLast = rPoly[ (sal_uInt16) --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() ); - sal_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[ (sal_uInt16) 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[]( sal_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; - sal_Bool bLast = sal_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 = sal_False; - } - else - bLast = sal_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 = sal_False; - } - else - bLast = sal_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 e5e19dff3771..daf0d6352c46 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -31,32 +31,30 @@ #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/resary.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 <vcl/svids.hrc> +#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 d86df6e2816b..51ca67bff9d7 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 3873cdc6cb14..3bc47e6cf8fb 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 96e67aaabffa..fe2e0f763e08 100755 --- 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 9f2ee0924555..0b6677b2426f 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 f77ce914fd4d..d1cf56f6a044 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 4cbce4c5298a..50048831f3b3 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 be0c9cd7dcc9..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, sal_uInt16 nStreamMode, sal_uInt16 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 sal_uInt32 nEndPos = mpRWStm->Tell(); - - mpRWStm->Seek( mnCompatPos ); - *mpRWStm << ( nEndPos - mnTotalSize ); - mpRWStm->Seek( nEndPos ); - } - else - { - const sal_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 6d69bc67b982..fa674d1a712b 100755 --- 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 e6e100072679..cfea7205ee34 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 5b865038bb2b..ebad1e68a8ca 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 4e94df4810da..fc23dba23bfb 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 e607af2a90a8..747219451b64 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 84f1eef2e477..3fb0a21bd13c 100755 --- 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 f5e259d8852c..34d0d4104590 100755 --- 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/gcach_vdev.cxx b/vcl/source/glyphs/gcach_vdev.cxx deleted file mode 100644 index b2ed9e891516..000000000000 --- a/vcl/source/glyphs/gcach_vdev.cxx +++ /dev/null @@ -1,287 +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 <gcach_vdev.hxx> - -#include <vcl/svapp.hxx> -#include <vcl/bitmap.hxx> -#include <vcl/outfont.hxx> -#include <vcl/virdev.hxx> -#include <vcl/metric.hxx> - -// ======================================================================= -// VirtDevServerFont -// ======================================================================= - -// ----------------------------------------------------------------------- - -void VirtDevServerFont::AnnounceFonts( ImplDevFontList* pToAdd ) -{ - // TODO: get fonts on server but not on client, - // problem is that currently there is no serverside virtual device... - VirtualDevice vdev( 1 ); - long nCount = vdev.GetDevFontCount(); - - for( int i = 0; i < nCount; ++i ) - { - const FontInfo aFontInfo = vdev.GetDevFont( i ); - - ImplFontData& rData = *new ImplFontData; - rData.SetSysData( new FontSysData( (void*)SERVERFONT_MAGIC ) ); - - rData.maName = aFontInfo.GetName(); - rData.maStyleName = aFontInfo.GetStyleName(); - rData.mnWidth = aFontInfo.GetWidth(); - rData.mnHeight = aFontInfo.GetHeight(); - rData.meFamily = aFontInfo.GetFamily(); - rData.meCharSet = aFontInfo.GetCharSet(); - rData.mePitch = aFontInfo.GetPitch(); - rData.meWidthType = aFontInfo.GetWidthType(); - rData.meWeight = aFontInfo.GetWeight(); - rData.meItalic = aFontInfo.GetItalic(); - rData.meType = aFontInfo.GetType(); - rData.meFamily = aFontInfo.GetFamily(); - - rData.mbOrientation = true; // TODO: where to get this info? - rData.mbDevice = false; - rData.mnQuality = 0; // prefer client-side fonts if available - - pToAdd->Add( &rData ); - } -} - -// ----------------------------------------------------------------------- - -void VirtDevServerFont::ClearFontList() -{ - // TODO -} - -// ----------------------------------------------------------------------- - -VirtDevServerFont* VirtDevServerFont::CreateFont( const ImplFontSelectData& rFSD ) -{ - VirtDevServerFont* pServerFont = NULL; - // TODO: search list of VirtDevServerFonts, return NULL if not found - // pServerFont = new VirtDevServerFont( rFSD ); - return pServerFont; -} - -// ----------------------------------------------------------------------- - -VirtDevServerFont::VirtDevServerFont( const ImplFontSelectData& rFSD ) -: ServerFont( rFSD) -{} - -// ----------------------------------------------------------------------- - -void VirtDevServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const -{ - const ImplFontSelectData& aFSD = GetFontSelData(); - - Font aFont; - aFont.SetName ( aFSD.maName ); - aFont.SetStyleName ( aFSD.maStyleName ); - aFont.SetHeight ( aFSD.mnHeight ); - aFont.SetWidth ( aFSD.mnWidth ); - aFont.SetOrientation( aFSD.mnOrientation ); - aFont.SetVertical ( GetFontSelData().mbVertical ); - - VirtualDevice vdev( 1 ); - FontMetric aMetric( vdev.GetFontMetric( aFont ) ); - - rFactor = 0x100; - - rTo.mnAscent = aMetric.GetAscent(); - rTo.mnDescent = aMetric.GetDescent(); - rTo.mnIntLeading = aMetric.GetIntLeading(); - rTo.mnExtLeading = aMetric.GetExtLeading(); - rTo.mnSlant = aMetric.GetSlant(); - rTo.meType = aMetric.GetType(); - rTo.mnFirstChar = 0x0020; // TODO: where to get this info? - rTo.mnLastChar = 0xFFFE; // TODO: where to get this info? - - rTo.mnWidth = aFSD.mnWidth; - rTo.maName = aFSD.maName; - rTo.maStyleName = aFSD.maStyleName; - rTo.mnOrientation = aFSD.mnOrientation; - rTo.meFamily = aFSD.meFamily; - rTo.meCharSet = aFSD.meCharSet; - rTo.meWeight = aFSD.meWeight; - rTo.meItalic = aFSD.meItalic; - rTo.mePitch = aFSD.mePitch; - rTo.mbDevice = sal_False; -} - -// ----------------------------------------------------------------------- - -int VirtDevServerFont::GetGlyphIndex( sal_Unicode aChar ) const -{ - return aChar; -} - -// ----------------------------------------------------------------------- - -void VirtDevServerFont::InitGlyphData( int nGlyphIndex, GlyphData& rGD ) const -{ - Font aFont; - aFont.SetName ( GetFontSelData().maName ); - aFont.SetStyleName ( GetFontSelData().maStyleName ); - aFont.SetHeight ( GetFontSelData().mnHeight ); - aFont.SetWidth ( GetFontSelData().mnWidth ); - aFont.SetOrientation( GetFontSelData().mnOrientation ); - aFont.SetVertical ( GetFontSelData().mbVertical ); - - VirtualDevice vdev( 1 ); - vdev.SetFont( aFont ); - - // get glyph metrics - sal_Int32 nCharWidth = 10; -// TODO: vdev.GetCharWidth( nGlyphIndex, nGlyphIndex, &nCharWidth ); - rGD.SetCharWidth( nCharWidth ); - - sal_Unicode aChar = nGlyphIndex; - String aGlyphStr( &aChar, 1 ); - Rectangle aRect; - if( vdev.GetTextBoundRect( aRect, aGlyphStr, 0, 1 ) ) - { - rGD.SetOffset( aRect.Top(), aRect.Left() ); - rGD.SetDelta( vdev.GetTextWidth( nGlyphIndex ), 0 ); - rGD.SetSize( aRect.GetSize() ); - } -} - -// ----------------------------------------------------------------------- - -bool VirtDevServerFont::GetAntialiasAdvice( void ) const -{ - return false; -} - -// ----------------------------------------------------------------------- - -bool VirtDevServerFont::GetGlyphBitmap1( int nGlyphIndex, RawBitmap& ) const -{ - /* - sal_Unicode aChar = nGlyphIndex; - String aGlyphStr( &aChar, 1 ); - - // draw bitmap - vdev.SetOutputSizePixel( aSize, sal_True ); - vdev.DrawText( Point(0,0)-rGD.GetMetric().GetOffset(), aGlyphStr ); - - // create new glyph item - - const Bitmap& rBitmap = vdev.GetBitmap( Point(0,0), aSize ); - rGD.SetBitmap( new Bitmap( rBitmap ) ); - return true; - */ - return false; -} - -// ----------------------------------------------------------------------- - -bool VirtDevServerFont::GetGlyphBitmap8( int nGlyphIndex, RawBitmap& ) const -{ - return false; -} - -// ----------------------------------------------------------------------- - -int VirtDevServerFont::GetGlyphKernValue( int, int ) const -{ - return 0; -} - -// ----------------------------------------------------------------------- - -sal_uLong VirtDevServerFont::GetKernPairs( ImplKernPairData** ppImplKernPairs ) const -{ - Font aFont; - aFont.SetName ( GetFontSelData().maName ); - aFont.SetStyleName ( GetFontSelData().maStyleName ); - aFont.SetHeight ( GetFontSelData().mnHeight ); - aFont.SetWidth ( GetFontSelData().mnWidth ); - aFont.SetOrientation( GetFontSelData().mnOrientation ); - aFont.SetVertical ( GetFontSelData().mbVertical ); - - VirtualDevice vdev( 1 ); - vdev.SetFont( aFont ); - - sal_uLong nPairs = vdev.GetKerningPairCount(); - if( nPairs > 0 ) - { - KerningPair* const pKernPairs = new KerningPair[ nPairs ]; - vdev.GetKerningPairs( nPairs, pKernPairs ); - - *ppImplKernPairs = new ImplKernPairData[ nPairs ]; - ImplKernPairData* pTo = *ppImplKernPairs; - KerningPair* pFrom = pKernPairs; - for ( sal_uLong n = 0; n < nPairs; n++ ) - { - pTo->mnChar1 = pFrom->nChar1; - pTo->mnChar2 = pFrom->nChar2; - pTo->mnKern = pFrom->nKern; - ++pFrom; - ++pTo; - } - - delete[] pKernPairs; - } - - return nPairs; -} - -// ----------------------------------------------------------------------- - -bool VirtDevServerFont::GetGlyphOutline( int nGlyphIndex, PolyPolygon& rPolyPoly ) const -{ - return false; - /* - Font aFont; - aFont.SetName ( GetFontSelData().maName ); - aFont.SetStyleName ( GetFontSelData().maStyleName ); - aFont.SetHeight ( GetFontSelData().mnHeight ); - aFont.SetWidth ( GetFontSelData().mnWidth ); - aFont.SetOrientation( GetFontSelData().mnOrientation ); - aFont.SetVertical ( GetFontSelData().mbVertical ); - - VirtualDevice vdev( 1 ); - vdev.SetFont( aFont ); - - const bool bOptimize = true; - - sal_Unicode aChar = nGlyphIndex; - String aGlyphStr( &aChar, 1 ); - return vdev.GetTextOutline( rPolyPoly, aGlyphStr, 0, 1, bOptimize ); - */ -} - -// ======================================================================= diff --git a/vcl/source/glyphs/gcach_vdev.hxx b/vcl/source/glyphs/gcach_vdev.hxx deleted file mode 100644 index 4e7d36a69f80..000000000000 --- a/vcl/source/glyphs/gcach_vdev.hxx +++ /dev/null @@ -1,57 +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. - * - ************************************************************************/ - -#include <vcl/glyphcache.hxx> - -// ----------------------------------------------------------------------- - -class VirtDevServerFont : public ServerFont -{ -public: - virtual bool GetAntialiasAdvice( void ) const; - virtual bool GetGlyphBitmap1( int nGlyphIndex, RawBitmap& ) const; - virtual bool GetGlyphBitmap8( int nGlyphIndex, RawBitmap& ) const; - virtual bool GetGlyphOutline( int nGlyphIndex, PolyPolygon& ) const; - -protected: - friend class GlyphCache; - static void AnnounceFonts( ImplDevFontList* ); - static void ClearFontList(); - - static VirtDevServerFont* CreateFont( const ImplFontSelectData& ); - virtual void FetchFontMetric( ImplFontMetricData&, long& rFactor ) const; - virtual sal_uLong GetKernPairs( ImplKernPairData** ) const; - virtual int GetGlyphKernValue( int, int ) const; - - virtual int GetGlyphIndex( sal_Unicode ) const; - virtual void InitGlyphData( int nGlyphIndex, GlyphData& ) const; - -private: - VirtDevServerFont( const ImplFontSelectData& ); -}; - -// ----------------------------------------------------------------------- diff --git a/vcl/source/glyphs/glyphcache.cxx b/vcl/source/glyphs/glyphcache.cxx index 3b4b77cb5358..5dbec89e9619 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 8507e55065f2..27c9eb02da64 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/glyphs/makefile.mk b/vcl/source/glyphs/makefile.mk deleted file mode 100644 index 74811aba6204..000000000000 --- a/vcl/source/glyphs/makefile.mk +++ /dev/null @@ -1,80 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=vcl -TARGET=glyphs - -ENABLE_EXCEPTIONS=true -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -CFLAGS+= $(FREETYPE_CFLAGS) - -# --- Files -------------------------------------------------------- - -.IF "$(USE_BUILTIN_RASTERIZER)" != "" -# GlyphCache + FreeType support (only on UNX platforms currently) -SLOFILES=\ - $(SLO)$/glyphcache.obj \ - $(SLO)$/gcach_rbmp.obj \ - $(SLO)$/gcach_layout.obj \ - $(SLO)$/gcach_ftyp.obj - -.IF "$(ENABLE_GRAPHITE)" != "" -# Graphite support using the glyphcache infrastructure -CFLAGS+=-DENABLE_GRAPHITE -SLOFILES+= $(SLO)$/graphite_adaptors.obj \ - $(SLO)$/graphite_features.obj \ - $(SLO)$/graphite_cache.obj \ - $(SLO)$/graphite_textsrc.obj \ - $(SLO)$/graphite_serverfont.obj \ - $(SLO)$/graphite_layout.obj -.ENDIF - -.ELSE - -.IF "$(ENABLE_GRAPHITE)" == "TRUE" -# Graphite support on non-UNX platforms -# make use of stlport headerfiles -EXT_USE_STLPORT=TRUE -SLOFILES=\ - $(SLO)$/graphite_textsrc.obj \ - $(SLO)$/graphite_cache.obj \ - $(SLO)$/graphite_features.obj \ - $(SLO)$/graphite_layout.obj -.ENDIF -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx index 711a985b6fe5..f541ad92b552 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 36fdd514efe9..1ab4f9a619d0 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 f5ecd02f39ae..b8ede1b5220a 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/makefile.mk b/vcl/source/helper/makefile.mk deleted file mode 100644 index 1a417417dbe4..000000000000 --- a/vcl/source/helper/makefile.mk +++ /dev/null @@ -1,55 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -ENABLE_EXCEPTIONS=TRUE -PRJNAME=vcl -TARGET=helper -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES=\ - $(SLO)$/strhelper.obj \ - $(SLO)$/evntpost.obj \ - $(SLO)$/canvasbitmap.obj \ - $(SLO)$/canvastools.obj \ - $(SLO)$/xconnection.obj \ - $(SLO)$/threadex.obj \ - $(SLO)$/lazydelete.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/vcl/source/helper/xconnection.cxx b/vcl/source/helper/xconnection.cxx index a0cc8c35e5e2..d8bd96cfd0cf 100644 --- a/vcl/source/helper/xconnection.cxx +++ b/vcl/source/helper/xconnection.cxx @@ -28,13 +28,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "svsys.h" -#include "rtl/ref.hxx" -#include "vcl/xconnection.hxx" -#include "vcl/svdata.hxx" -#include "vcl/salinst.hxx" #include "vcl/svapp.hxx" +#include "xconnection.hxx" +#include "svdata.hxx" +#include "salinst.hxx" + namespace { namespace css = com::sun::star; diff --git a/vcl/source/salmain/makefile.mk b/vcl/source/salmain/makefile.mk deleted file mode 100644 index 9c790bf28d75..000000000000 --- a/vcl/source/salmain/makefile.mk +++ /dev/null @@ -1,41 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ = ..$/.. -PRJNAME = vcl -TARGET = salmain -ENABLE_EXCEPTIONS = TRUE - -.INCLUDE: settings.mk - -OBJFILES = $(OBJ)$/salmain.obj - -LIB1TARGET=$(LB)$/vclmain.lib -LIB1ARCHIV=$(LB)$/libvclmain.a -LIB1FILES=$(LB)$/salmain.lib - -.INCLUDE: target.mk 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/makefile.mk b/vcl/source/src/makefile.mk deleted file mode 100644 index 161d821573b9..000000000000 --- a/vcl/source/src/makefile.mk +++ /dev/null @@ -1,57 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=vcl -TARGET=svsrc -RESTARGET=vcl - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES= images.src \ - menu.src \ - stdtext.src \ - helptext.src \ - units.src \ - btntext.src \ - print.src \ - throbber.src \ - -RESLIB1NAME= $(RESTARGET) -RESLIB1IMAGES= $(PRJ)$/source/src -RESLIB1SRSFILES= $(SRS)$/svsrc.srs - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - 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 f41e65f4939f..82b0c00c2e15 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/abstdlg.cxx b/vcl/source/window/abstdlg.cxx index 7f00b73b0808..58f235bea25e 100644 --- a/vcl/source/window/abstdlg.cxx +++ b/vcl/source/window/abstdlg.cxx @@ -29,7 +29,6 @@ #include "precompiled_vcl.hxx" #include <vcl/abstdlg.hxx> -#include "cuilib.hxx" #include <osl/module.hxx> #include <tools/string.hxx> @@ -42,7 +41,7 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create() { FuncPtrCreateDialogFactory fp = 0; static ::osl::Module aDialogLibrary; - if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME ) ) ) ) + if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( CUI_DLL_NAME ) ) ) ) fp = ( VclAbstractDialogFactory* (__LOADONCALLAPI*)() ) aDialogLibrary.getFunctionSymbol( ::rtl::OUString::createFromAscii("CreateDialogFactory") ); if ( fp ) diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx index be71aa3e02e6..29f6cc16a176 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 6b30dd3a3c23..0781b50eb37b 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 79454d8b1fe5..3a00b522952e 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 4ce3c34d65e4..08132496dc36 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 c59978077412..b086fdc05e1b 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 73a3bc7eb981..031e947cbf13 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 32fc4755a62d..cf49dad4173a 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 6c8519b68a1e..4d1c77ab09b5 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 c59cb4da5dc8..314aa67597b2 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 eb16832e5c00..a3caabce0c5c 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 170fcbd65cee..f8bf9a97d6dd 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 968c72abd383..44c0a8b79d0b 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/makefile.mk b/vcl/source/window/makefile.mk deleted file mode 100644 index 1c63376dfda5..000000000000 --- a/vcl/source/window/makefile.mk +++ /dev/null @@ -1,106 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=vcl -TARGET=win -ENABLE_EXCEPTIONS=TRUE - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES= \ - $(SLO)$/arrange.obj \ - $(SLO)$/abstdlg.obj \ - $(SLO)$/accel.obj \ - $(SLO)$/accmgr.obj \ - $(SLO)$/brdwin.obj \ - $(SLO)$/btndlg.obj \ - $(SLO)$/cmdevt.obj \ - $(SLO)$/cursor.obj \ - $(SLO)$/decoview.obj \ - $(SLO)$/dialog.obj \ - $(SLO)$/dlgctrl.obj \ - $(SLO)$/dndevdis.obj \ - $(SLO)$/dndlcon.obj \ - $(SLO)$/dockingarea.obj \ - $(SLO)$/dockmgr.obj \ - $(SLO)$/dockwin.obj \ - $(SLO)$/floatwin.obj \ - $(SLO)$/introwin.obj \ - $(SLO)$/keycod.obj \ - $(SLO)$/keyevent.obj \ - $(SLO)$/mouseevent.obj \ - $(SLO)$/menu.obj \ - $(SLO)$/mnemonic.obj \ - $(SLO)$/mnemonicengine.obj \ - $(SLO)$/msgbox.obj \ - $(SLO)$/popupmenuwindow.obj \ - $(SLO)$/scrwnd.obj \ - $(SLO)$/printdlg.obj \ - $(SLO)$/seleng.obj \ - $(SLO)$/split.obj \ - $(SLO)$/splitwin.obj \ - $(SLO)$/status.obj \ - $(SLO)$/syschild.obj \ - $(SLO)$/javachild.obj \ - $(SLO)$/syswin.obj \ - $(SLO)$/tabdlg.obj \ - $(SLO)$/tabpage.obj \ - $(SLO)$/taskpanelist.obj \ - $(SLO)$/toolbox.obj \ - $(SLO)$/toolbox2.obj \ - $(SLO)$/window.obj \ - $(SLO)$/winproc.obj \ - $(SLO)$/window2.obj \ - $(SLO)$/window3.obj \ - $(SLO)$/window4.obj \ - $(SLO)$/wpropset.obj \ - $(SLO)$/wrkwin.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk - -$(INCCOM)$/cuilib.hxx: makefile.mk -.IF "$(GUI)"=="UNX" - @$(RM) $@ - @echo \#define DLL_NAME \"libcui$(DLLPOSTFIX)$(DLLPOST)\" >$@ -.ELSE - @echo $(EMQ)#define DLL_NAME $(EMQ)"cui$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@ -.ENDIF - -$(SLO)$/abstdlg.obj : $(INCCOM)$/cuilib.hxx diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index dda796ba41e4..72715139f699 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 6e0c109a564d..9f36b9ed5109 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 d38128e04f1e..094567c7f15c 100755 --- 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 31740214532b..178692ff45c2 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 face35a179d8..976c56cfea56 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 3a66ead3944c..1d701752389c 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 a261b6bd96a7..ee673e87c4b5 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 9e7a30e983cb..25e693ae72a2 100644..100755 --- a/vcl/source/window/syschild.cxx +++ b/vcl/source/window/syschild.cxx @@ -28,21 +28,26 @@ // 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> + +// declare system types in sysdata.hxx +#include <svsys.h> + #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 +58,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; // ======================================================================= @@ -240,6 +243,7 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle( sal_Bool bUseJava ) { sal_IntPtr nRet = 0; + (void)bUseJava; #if defined WNT nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->hWnd ); #elif defined QUARTZ diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 48c7629c2026..3313402dfef6 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 dcb95b9b52a2..459e07f97042 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 71a8f2ec2a30..f4f40f6722bf 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 105cf18bb43a..682c65e47a6f 100644..100755 --- 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,18 @@ #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> +#if defined WNT +#include <svsys.h> +#endif #include <string.h> #include <vector> diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index c993c9143a2c..fd6fb5dffb6b 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 96e787928772..08ada337e124 100644..100755 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -27,48 +27,58 @@ // 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" + +// declare system types in sysdata.hxx +#include "svsys.h" +#include "vcl/sysdata.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 +95,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> @@ -9703,7 +9703,7 @@ sal_Bool Window::IsNativeWidgetEnabled() const } #ifdef WNT // see #140456# -#include <salframe.h> +#include <win/salframe.h> #endif uno::Reference< rendering::XCanvas > Window::ImplGetCanvas( const Size& rFullscreenSize, diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 669fce05a791..2513170a4d25 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 9cb38756e770..c011fb667f21 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 fcb0c560291e..10e3e8fa5e2f 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 81c2b36345eb..0e667de73067 100644..100755 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -28,22 +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/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> +// declare system types in sysdata.hxx +#include <svsys.h> #include <vcl/sysdata.hxx> +#include <svdata.hxx> +#include <salframe.hxx> +#include <brdwin.hxx> +#include <window.h> + // ======================================================================= #define WORKWIN_WINDOWSTATE_FULLSCREEN ((sal_uLong)0x00010000) |