filter/source/graphicfilter/eps/eps.cxx | 2 - filter/source/graphicfilter/ieps/ieps.cxx | 2 - sc/source/core/inc/core_pch.hxx | 1 sc/source/filter/inc/filt_pch.hxx | 1 sc/source/ui/inc/ui_pch.hxx | 1 starmath/source/math_pch.cxx | 1 vcl/Package_inc.mk | 1 vcl/inc/accel.h | 2 - vcl/inc/accmgr.hxx | 2 - vcl/inc/brdwin.hxx | 2 - vcl/inc/dbggui.hxx | 2 - vcl/inc/generic/geninst.h | 2 - vcl/inc/idlemgr.hxx | 2 - vcl/inc/ilstbox.hxx | 2 - vcl/inc/impbmp.hxx | 2 - vcl/inc/jobset.h | 2 - vcl/inc/outdata.hxx | 2 - vcl/inc/print.h | 2 - vcl/inc/salframe.hxx | 2 - vcl/inc/salgdi.hxx | 2 - vcl/inc/salinst.hxx | 2 - vcl/inc/salmenu.hxx | 2 - vcl/inc/salobj.hxx | 2 - vcl/inc/salprn.hxx | 2 - vcl/inc/salptype.hxx | 2 - vcl/inc/saltimer.hxx | 2 - vcl/inc/salvd.hxx | 2 - vcl/inc/salwtype.hxx | 2 - vcl/inc/svdata.hxx | 2 - vcl/inc/toolbox.h | 2 - vcl/inc/unx/gtk/gtkobject.hxx | 2 - vcl/inc/unx/salinst.h | 2 - vcl/inc/unx/salmenu.h | 2 - vcl/inc/unx/salobj.h | 2 - vcl/inc/unx/salstd.hxx | 2 - vcl/inc/unx/x11/x11sys.hxx | 2 - vcl/inc/vcl/accel.hxx | 2 - vcl/inc/vcl/apptypes.hxx | 2 - vcl/inc/vcl/bitmap.hxx | 2 - vcl/inc/vcl/bmpacc.hxx | 2 - vcl/inc/vcl/btndlg.hxx | 2 - vcl/inc/vcl/button.hxx | 2 - vcl/inc/vcl/cmdevt.hxx | 2 - vcl/inc/vcl/ctrl.hxx | 2 - vcl/inc/vcl/cursor.hxx | 2 - vcl/inc/vcl/decoview.hxx | 2 - vcl/inc/vcl/dialog.hxx | 2 - vcl/inc/vcl/dockingarea.hxx | 2 - vcl/inc/vcl/dockwin.hxx | 2 - vcl/inc/vcl/edit.hxx | 2 - vcl/inc/vcl/event.hxx | 2 - vcl/inc/vcl/fixbrd.hxx | 2 - vcl/inc/vcl/fixed.hxx | 2 - vcl/inc/vcl/floatwin.hxx | 2 - vcl/inc/vcl/gfxlink.hxx | 2 - vcl/inc/vcl/graph.h | 2 - vcl/inc/vcl/graph.hxx | 2 - vcl/inc/vcl/group.hxx | 2 - vcl/inc/vcl/help.hxx | 2 - vcl/inc/vcl/image.hxx | 2 - vcl/inc/vcl/inputctx.hxx | 2 - vcl/inc/vcl/introwin.hxx | 2 - vcl/inc/vcl/jobset.hxx | 2 - vcl/inc/vcl/keycod.hxx | 2 - vcl/inc/vcl/keycodes.hxx | 2 - vcl/inc/vcl/mapmod.hxx | 2 - vcl/inc/vcl/menu.hxx | 2 - vcl/inc/vcl/menubtn.hxx | 2 - vcl/inc/vcl/morebtn.hxx | 2 - vcl/inc/vcl/msgbox.hxx | 2 - vcl/inc/vcl/outdev.hxx | 2 - vcl/inc/vcl/pointr.hxx | 2 - vcl/inc/vcl/print.hxx | 2 - vcl/inc/vcl/prntypes.hxx | 2 - vcl/inc/vcl/ptrstyle.hxx | 2 - vcl/inc/vcl/regband.hxx | 2 - vcl/inc/vcl/region.hxx | 2 - vcl/inc/vcl/salbtype.hxx | 2 - vcl/inc/vcl/salgtype.hxx | 2 - vcl/inc/vcl/scrbar.hxx | 2 - vcl/inc/vcl/settings.hxx | 2 - vcl/inc/vcl/slider.hxx | 2 - vcl/inc/vcl/sndstyle.hxx | 2 - vcl/inc/vcl/spin.h | 2 - vcl/inc/vcl/spin.hxx | 2 - vcl/inc/vcl/spinfld.hxx | 2 - vcl/inc/vcl/split.hxx | 2 - vcl/inc/vcl/splitwin.hxx | 2 - vcl/inc/vcl/status.hxx | 2 - vcl/inc/vcl/stdtext.hxx | 2 - vcl/inc/vcl/sv.h | 36 ------------------------------ vcl/inc/vcl/svapp.hxx | 2 - vcl/inc/vcl/symbol.hxx | 2 - vcl/inc/vcl/syschild.hxx | 2 - vcl/inc/vcl/syswin.hxx | 2 - vcl/inc/vcl/tabctrl.hxx | 2 - vcl/inc/vcl/tabdlg.hxx | 2 - vcl/inc/vcl/tabpage.hxx | 2 - vcl/inc/vcl/timer.hxx | 2 - vcl/inc/vcl/toolbox.hxx | 2 - vcl/inc/vcl/virdev.hxx | 2 - vcl/inc/vcl/waitobj.hxx | 2 - vcl/inc/vcl/wall.hxx | 2 - vcl/inc/vcl/window.hxx | 2 - vcl/inc/vcl/wrkwin.hxx | 2 - vcl/inc/window.h | 2 - 106 files changed, 100 insertions(+), 141 deletions(-)
New commits: commit 1e26c563731b239590da1b2f479f7a924be6eccf Author: Tor Lillqvist <[email protected]> Date: Sun Jun 10 19:26:30 2012 +0300 Bin pointless <vcl/sv.h> header It only included <tools/solar.h>, so include that directly instead. Change-Id: Ic5db474c16ca33dcdcaabb5b5f00535b4b27dc8f diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 9350687..4cb6509 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -27,7 +27,7 @@ ************************************************************************/ -#include <vcl/sv.h> +#include <tools/solar.h> #include <tools/stream.hxx> #include <tools/poly.hxx> #include <vcl/svapp.hxx> diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index dd5d101..008e7f7 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -30,7 +30,7 @@ #include <stdio.h> // -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/svapp.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> diff --git a/sc/source/core/inc/core_pch.hxx b/sc/source/core/inc/core_pch.hxx index 5f98f67..f2ad272 100644 --- a/sc/source/core/inc/core_pch.hxx +++ b/sc/source/core/inc/core_pch.hxx @@ -43,7 +43,6 @@ #include <tools/stream.hxx> #include <tools/errinf.hxx> #include <tools/errcode.hxx> -#include <vcl/sv.h> #include <global.hxx> #include <tools/color.hxx> #include <i18npool/lang.h> diff --git a/sc/source/filter/inc/filt_pch.hxx b/sc/source/filter/inc/filt_pch.hxx index 43a449f..5e3b92e 100644 --- a/sc/source/filter/inc/filt_pch.hxx +++ b/sc/source/filter/inc/filt_pch.hxx @@ -56,7 +56,6 @@ #include <tools/link.hxx> #include <tools/time.hxx> #include <svl/svarray.hxx> -#include <vcl/sv.h> #include <vcl/timer.hxx> #include <tools/gen.hxx> #include <tools/color.hxx> diff --git a/sc/source/ui/inc/ui_pch.hxx b/sc/source/ui/inc/ui_pch.hxx index c9ec843..47fab6e 100644 --- a/sc/source/ui/inc/ui_pch.hxx +++ b/sc/source/ui/inc/ui_pch.hxx @@ -38,7 +38,6 @@ #include <tools/rtti.hxx> #include <string.h> #include <tools/contnr.hxx> -#include <vcl/sv.h> #include <tools/ref.hxx> #include <tools/link.hxx> #include <i18npool/lang.h> diff --git a/starmath/source/math_pch.cxx b/starmath/source/math_pch.cxx index 945025c..5c6d706 100644 --- a/starmath/source/math_pch.cxx +++ b/starmath/source/math_pch.cxx @@ -51,7 +51,6 @@ #include <sot/sotref.hxx> #include <tools/globname.hxx> #include <sot/factory.hxx> -#include <vcl/sv.h> #include <basic/sbxdef.hxx> #include <tools/time.hxx> #include <tools/gen.hxx> diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk index 18d6ff9..f2f02c2 100644 --- a/vcl/Package_inc.mk +++ b/vcl/Package_inc.mk @@ -144,7 +144,6 @@ $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/status.hxx,vcl/status.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/stdtext.hxx,vcl/stdtext.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/strhelper.hxx,vcl/strhelper.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/svapp.hxx,vcl/svapp.hxx)) -$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sv.h,vcl/sv.h)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/svgread.hxx,vcl/svgread.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/symbol.hxx,vcl/symbol.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/syschild.hxx,vcl/syschild.hxx)) diff --git a/vcl/inc/accel.h b/vcl/inc/accel.h index bf3006c..162bdf3 100644 --- a/vcl/inc/accel.h +++ b/vcl/inc/accel.h @@ -29,7 +29,7 @@ #ifndef _SV_ACCEL_H #define _SV_ACCEL_H -#include <vcl/sv.h> +#include <tools/solar.h> #ifndef _SV_KEYCOD_HXX #include <vcl/keycod.hxx> #endif diff --git a/vcl/inc/accmgr.hxx b/vcl/inc/accmgr.hxx index 2ffa2b3..6c3a83c 100644 --- a/vcl/inc/accmgr.hxx +++ b/vcl/inc/accmgr.hxx @@ -29,7 +29,7 @@ #ifndef _SV_ACCMGR_HXX #define _SV_ACCMGR_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vector> class Accelerator; diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx index 394503d..63302f3 100644 --- a/vcl/inc/brdwin.hxx +++ b/vcl/inc/brdwin.hxx @@ -29,7 +29,7 @@ #ifndef _SV_BRDWIN_HXX #define _SV_BRDWIN_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/window.hxx> class ImplBorderWindowView; diff --git a/vcl/inc/dbggui.hxx b/vcl/inc/dbggui.hxx index 61d878d..dbed698 100644 --- a/vcl/inc/dbggui.hxx +++ b/vcl/inc/dbggui.hxx @@ -29,7 +29,7 @@ #ifndef _SV_DBGGUI_HXX #define _SV_DBGGUI_HXX -#include <vcl/sv.h> +#include <tools/solar.h> // ------------ // - DBG_UITL - diff --git a/vcl/inc/generic/geninst.h b/vcl/inc/generic/geninst.h index 240ebe6..4962804 100644 --- a/vcl/inc/generic/geninst.h +++ b/vcl/inc/generic/geninst.h @@ -28,7 +28,7 @@ #ifndef _SV_GENERIC_INST_H #define _SV_GENERIC_INST_H -#include <vcl/sv.h> +#include <tools/solar.h> #include <osl/thread.hxx> #include <vclpluginapi.h> #include <vcl/solarmutex.hxx> diff --git a/vcl/inc/idlemgr.hxx b/vcl/inc/idlemgr.hxx index 66664fe..862d4b2 100644 --- a/vcl/inc/idlemgr.hxx +++ b/vcl/inc/idlemgr.hxx @@ -29,7 +29,7 @@ #ifndef _SV_IDLEMGR_HXX #define _SV_IDLEMGR_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/timer.hxx> #include <vector> diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index cecf3b8..e8074eb 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -31,7 +31,7 @@ #include <boost/ptr_container/ptr_vector.hpp> -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/image.hxx> #include <vcl/ctrl.hxx> #include <vcl/button.hxx> diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx index f474a7e..ba93d72 100644 --- a/vcl/inc/impbmp.hxx +++ b/vcl/inc/impbmp.hxx @@ -30,7 +30,7 @@ #define _SV_IMPBMP_HXX #include <tools/gen.hxx> -#include <vcl/sv.h> +#include <tools/solar.h> // --------------- // - ImpBitmap - diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h index 19f3c5e..563f2ff 100644 --- a/vcl/inc/jobset.h +++ b/vcl/inc/jobset.h @@ -29,7 +29,7 @@ #ifndef _SV_JOBSET_H #define _SV_JOBSET_H -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/prntypes.hxx> #include <boost/unordered_map.hpp> #include <rtl/ustring.hxx> diff --git a/vcl/inc/outdata.hxx b/vcl/inc/outdata.hxx index 2f4a9b5..027eed1 100644 --- a/vcl/inc/outdata.hxx +++ b/vcl/inc/outdata.hxx @@ -29,7 +29,7 @@ #ifndef _SV_OUTDATA_HXX #define _SV_OUTDATA_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <tools/color.hxx> #include <vcl/salgtype.hxx> diff --git a/vcl/inc/print.h b/vcl/inc/print.h index dc54ca2..94ac9eb 100644 --- a/vcl/inc/print.h +++ b/vcl/inc/print.h @@ -29,7 +29,7 @@ #ifndef _SV_PRINT_H #define _SV_PRINT_H -#include "vcl/sv.h" +#include "tools/solar.h" #include "vcl/dllapi.h" #include "rtl/ustring.hxx" diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx index e210287..6af1a28 100644 --- a/vcl/inc/salframe.hxx +++ b/vcl/inc/salframe.hxx @@ -29,7 +29,7 @@ #ifndef _SV_SALFRAME_HXX #define _SV_SALFRAME_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #ifdef __cplusplus diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index 6c99e46..0a68c20 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -29,7 +29,7 @@ #ifndef _SV_SALGDI_HXX #define _SV_SALGDI_HXX -#include "vcl/sv.h" +#include "tools/solar.h" #include "vcl/dllapi.h" #include "vcl/salgtype.hxx" #include "osl/thread.hxx" diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx index a676eb0..944d16e 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -34,7 +34,7 @@ #include "com/sun/star/ui/dialogs/XFilePicker2.hpp" #include "com/sun/star/ui/dialogs/XFolderPicker.hpp" -#include "vcl/sv.h" +#include "tools/solar.h" #include "vcl/displayconnectiondispatch.hxx" #include "vcl/dllapi.h" diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx index 1d14a7e..4fb94d8 100644 --- a/vcl/inc/salmenu.hxx +++ b/vcl/inc/salmenu.hxx @@ -29,7 +29,7 @@ #ifndef _SV_SALMENU_HXX #define _SV_SALMENU_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include "vcl/dllapi.h" #include <vcl/menu.hxx> #include <vcl/keycod.hxx> diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx index 32c1d3f..df0e4cb 100644 --- a/vcl/inc/salobj.hxx +++ b/vcl/inc/salobj.hxx @@ -29,7 +29,7 @@ #ifndef _SV_SALOBJ_HXX #define _SV_SALOBJ_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/salgtype.hxx> #include <salwtype.hxx> diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx index 0164acf..99a3af4 100644 --- a/vcl/inc/salprn.hxx +++ b/vcl/inc/salprn.hxx @@ -31,7 +31,7 @@ #include <rtl/ustring.hxx> -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/prntypes.hxx> diff --git a/vcl/inc/salptype.hxx b/vcl/inc/salptype.hxx index ca47f59..e93cfd1 100644 --- a/vcl/inc/salptype.hxx +++ b/vcl/inc/salptype.hxx @@ -29,7 +29,7 @@ #ifndef _SV_SALPTYPE_HXX #define _SV_SALPTYPE_HXX -#include <vcl/sv.h> +#include <tools/solar.h> // -------------------- // - SalJobSetupFlags - diff --git a/vcl/inc/saltimer.hxx b/vcl/inc/saltimer.hxx index 11a90dc..4bd4e62 100644 --- a/vcl/inc/saltimer.hxx +++ b/vcl/inc/saltimer.hxx @@ -29,7 +29,7 @@ #ifndef _SV_SALTIMER_HXX #define _SV_SALTIMER_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <salwtype.hxx> diff --git a/vcl/inc/salvd.hxx b/vcl/inc/salvd.hxx index 68ed56a..77904ac 100644 --- a/vcl/inc/salvd.hxx +++ b/vcl/inc/salvd.hxx @@ -29,7 +29,7 @@ #ifndef _SV_SALVD_HXX #define _SV_SALVD_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> class SalGraphics; diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx index 4ba0f33..549d521 100644 --- a/vcl/inc/salwtype.hxx +++ b/vcl/inc/salwtype.hxx @@ -31,7 +31,7 @@ #include <i18npool/lang.h> #include <tools/string.hxx> -#include <vcl/sv.h> +#include <tools/solar.h> class SalGraphics; class SalFrame; diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index a0f610d..0da401f 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -41,7 +41,7 @@ #include "tools/debug.hxx" #include "vcl/vclevent.hxx" -#include "vcl/sv.h" +#include "tools/solar.h" #include "vcl/svapp.hxx" #include "vcl/dllapi.h" diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h index aec0c11..f38afa5 100644 --- a/vcl/inc/toolbox.h +++ b/vcl/inc/toolbox.h @@ -31,7 +31,7 @@ #include <tools/gen.hxx> #include <tools/string.hxx> -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/image.hxx> #include <vcl/toolbox.hxx> #include <vcl/controllayout.hxx> diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx index 7b1a410..b715bb1 100644 --- a/vcl/inc/unx/gtk/gtkobject.hxx +++ b/vcl/inc/unx/gtk/gtkobject.hxx @@ -29,7 +29,7 @@ #ifndef _VCL_GTKOBJECT_HXX #define _VCL_GTKOBJECT_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/sysdata.hxx> #include <salobj.hxx> #include <unx/gtk/gtkframe.hxx> diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h index 7d8b45e..00c4434 100644 --- a/vcl/inc/unx/salinst.h +++ b/vcl/inc/unx/salinst.h @@ -30,7 +30,7 @@ #ifndef _SV_SALINST_H #define _SV_SALINST_H -#include <vcl/sv.h> +#include <tools/solar.h> #include <osl/thread.hxx> #include <vclpluginapi.h> #include <salinst.hxx> diff --git a/vcl/inc/unx/salmenu.h b/vcl/inc/unx/salmenu.h index f693a33..9fc25d6 100644 --- a/vcl/inc/unx/salmenu.h +++ b/vcl/inc/unx/salmenu.h @@ -29,7 +29,7 @@ #ifndef _SV_SALMENU_H #define _SV_SALMENU_H -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/bitmap.hxx> #include <vcl/salmenu.hxx> diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h index 74225cf..e2cbc09 100644 --- a/vcl/inc/unx/salobj.h +++ b/vcl/inc/unx/salobj.h @@ -29,7 +29,7 @@ #ifndef _SV_SALOBJ_H #define _SV_SALOBJ_H -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/sysdata.hxx> #include <vclpluginapi.h> diff --git a/vcl/inc/unx/salstd.hxx b/vcl/inc/unx/salstd.hxx index 57af89e..976c653 100644 --- a/vcl/inc/unx/salstd.hxx +++ b/vcl/inc/unx/salstd.hxx @@ -31,7 +31,7 @@ // -=-= includes -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= #include <tools/gen.hxx> -#include <vcl/sv.h> +#include <tools/solar.h> // -=-= X-Lib forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= #ifndef _SVUNX_H diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx index 80b5d58..ca28aca 100644 --- a/vcl/inc/unx/x11/x11sys.hxx +++ b/vcl/inc/unx/x11/x11sys.hxx @@ -30,7 +30,7 @@ #ifndef _SV_X11SYS_H #define _SV_X11SYS_H -#include <vcl/sv.h> +#include <tools/solar.h> #include <osl/mutex.hxx> #include <osl/thread.hxx> #include <generic/gensys.h> diff --git a/vcl/inc/vcl/accel.hxx b/vcl/inc/vcl/accel.hxx index cef418c..ee4f949 100644 --- a/vcl/inc/vcl/accel.hxx +++ b/vcl/inc/vcl/accel.hxx @@ -29,7 +29,7 @@ #ifndef _SV_ACCEL_HXX #define _SV_ACCEL_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <tools/link.hxx> #include <tools/resid.hxx> diff --git a/vcl/inc/vcl/apptypes.hxx b/vcl/inc/vcl/apptypes.hxx index 12969be..188c727 100644 --- a/vcl/inc/vcl/apptypes.hxx +++ b/vcl/inc/vcl/apptypes.hxx @@ -29,7 +29,7 @@ #ifndef _VCL_APPTYPES_HXX #define _VCL_APPTYPES_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <tools/rtti.hxx> diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx index 8b11318..3dbee50 100644 --- a/vcl/inc/vcl/bitmap.hxx +++ b/vcl/inc/vcl/bitmap.hxx @@ -30,7 +30,7 @@ #define _SV_BITMAP_HXX #include <tools/link.hxx> -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/mapmod.hxx> #include <vcl/region.hxx> diff --git a/vcl/inc/vcl/bmpacc.hxx b/vcl/inc/vcl/bmpacc.hxx index 3b973c8..5c47797 100644 --- a/vcl/inc/vcl/bmpacc.hxx +++ b/vcl/inc/vcl/bmpacc.hxx @@ -29,7 +29,7 @@ #ifndef _SV_BMPACC_HXX #define _SV_BMPACC_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/salbtype.hxx> #include <vcl/bitmap.hxx> diff --git a/vcl/inc/vcl/btndlg.hxx b/vcl/inc/vcl/btndlg.hxx index dcd1ef4..da61e39 100644 --- a/vcl/inc/vcl/btndlg.hxx +++ b/vcl/inc/vcl/btndlg.hxx @@ -31,7 +31,7 @@ #include <boost/ptr_container/ptr_vector.hpp> -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/dialog.hxx> diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx index 89d4d8e..51b6034 100644 --- a/vcl/inc/vcl/button.hxx +++ b/vcl/inc/vcl/button.hxx @@ -29,7 +29,7 @@ #ifndef _SV_BUTTON_HXX #define _SV_BUTTON_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/image.hxx> #include <vcl/symbol.hxx> diff --git a/vcl/inc/vcl/cmdevt.hxx b/vcl/inc/vcl/cmdevt.hxx index 77c994c..33190d4 100644 --- a/vcl/inc/vcl/cmdevt.hxx +++ b/vcl/inc/vcl/cmdevt.hxx @@ -30,7 +30,7 @@ #define _VCL_CMDEVT_HXX #include <tools/gen.hxx> -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/keycod.hxx> #include <vcl/font.hxx> diff --git a/vcl/inc/vcl/ctrl.hxx b/vcl/inc/vcl/ctrl.hxx index 0cb6890..43f168d 100644 --- a/vcl/inc/vcl/ctrl.hxx +++ b/vcl/inc/vcl/ctrl.hxx @@ -30,7 +30,7 @@ #define _SV_CTRL_HXX #include <tools/link.hxx> -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/window.hxx> #include <vcl/salnativewidgets.hxx> diff --git a/vcl/inc/vcl/cursor.hxx b/vcl/inc/vcl/cursor.hxx index cb4eff2..83827bb 100644 --- a/vcl/inc/vcl/cursor.hxx +++ b/vcl/inc/vcl/cursor.hxx @@ -31,7 +31,7 @@ #include <tools/gen.hxx> #include <tools/link.hxx> -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> class AutoTimer; diff --git a/vcl/inc/vcl/decoview.hxx b/vcl/inc/vcl/decoview.hxx index 40bdb2c..8ab2777 100644 --- a/vcl/inc/vcl/decoview.hxx +++ b/vcl/inc/vcl/decoview.hxx @@ -29,7 +29,7 @@ #ifndef _SV_DECOVIEW_HXX #define _SV_DECOVIEW_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/symbol.hxx> diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx index 2d03af5..c4dc0c6 100644 --- a/vcl/inc/vcl/dialog.hxx +++ b/vcl/inc/vcl/dialog.hxx @@ -29,7 +29,7 @@ #ifndef _SV_DIALOG_HXX #define _SV_DIALOG_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/syswin.hxx> diff --git a/vcl/inc/vcl/dockingarea.hxx b/vcl/inc/vcl/dockingarea.hxx index 7ba82d3..1fac69c 100644 --- a/vcl/inc/vcl/dockingarea.hxx +++ b/vcl/inc/vcl/dockingarea.hxx @@ -29,7 +29,7 @@ #ifndef _SV_DOCKINGAREA_HXX #define _SV_DOCKINGAREA_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/window.hxx> // ------------------------------------------ diff --git a/vcl/inc/vcl/dockwin.hxx b/vcl/inc/vcl/dockwin.hxx index 167ca13..7726e9f 100644 --- a/vcl/inc/vcl/dockwin.hxx +++ b/vcl/inc/vcl/dockwin.hxx @@ -29,7 +29,7 @@ #ifndef _SV_DOCKWIN_HXX #define _SV_DOCKWIN_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/floatwin.hxx> #include <vector> diff --git a/vcl/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx index b425d84..9632f9e 100644 --- a/vcl/inc/vcl/edit.hxx +++ b/vcl/inc/vcl/edit.hxx @@ -29,7 +29,7 @@ #ifndef _SV_EDIT_HXX #define _SV_EDIT_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/timer.hxx> #include <vcl/ctrl.hxx> diff --git a/vcl/inc/vcl/event.hxx b/vcl/inc/vcl/event.hxx index f912a39..13f4784 100644 --- a/vcl/inc/vcl/event.hxx +++ b/vcl/inc/vcl/event.hxx @@ -29,7 +29,7 @@ #ifndef _SV_EVENT_HXX #define _SV_EVENT_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <tools/gen.hxx> #include <vcl/keycod.hxx> diff --git a/vcl/inc/vcl/fixbrd.hxx b/vcl/inc/vcl/fixbrd.hxx index 67dd7db..eb458ac 100644 --- a/vcl/inc/vcl/fixbrd.hxx +++ b/vcl/inc/vcl/fixbrd.hxx @@ -29,7 +29,7 @@ #ifndef _SV_FIXBRD_HXX #define _SV_FIXBRD_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/decoview.hxx> #include <vcl/ctrl.hxx> diff --git a/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx index a894905..63f094d 100644 --- a/vcl/inc/vcl/fixed.hxx +++ b/vcl/inc/vcl/fixed.hxx @@ -29,7 +29,7 @@ #ifndef _SV_FIXED_HXX #define _SV_FIXED_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/bitmap.hxx> #include <vcl/image.hxx> diff --git a/vcl/inc/vcl/floatwin.hxx b/vcl/inc/vcl/floatwin.hxx index 6fc957f..feaa892 100644 --- a/vcl/inc/vcl/floatwin.hxx +++ b/vcl/inc/vcl/floatwin.hxx @@ -29,7 +29,7 @@ #ifndef _SV_FLOATWIN_HXX #define _SV_FLOATWIN_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/syswin.hxx> diff --git a/vcl/inc/vcl/gfxlink.hxx b/vcl/inc/vcl/gfxlink.hxx index d86973b..960d0b8 100644 --- a/vcl/inc/vcl/gfxlink.hxx +++ b/vcl/inc/vcl/gfxlink.hxx @@ -30,7 +30,7 @@ #define _SV_GFXLINK_HXX #include <vcl/dllapi.h> -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/mapmod.hxx> #include <tools/stream.hxx> diff --git a/vcl/inc/vcl/graph.h b/vcl/inc/vcl/graph.h index b926936..c9f8166 100644 --- a/vcl/inc/vcl/graph.h +++ b/vcl/inc/vcl/graph.h @@ -31,7 +31,7 @@ #include <vcl/dllapi.h> #include <tools/string.hxx> -#include <vcl/sv.h> +#include <tools/solar.h> // --------------- // - GraphicType - diff --git a/vcl/inc/vcl/graph.hxx b/vcl/inc/vcl/graph.hxx index c5d57f4..f8688b3 100644 --- a/vcl/inc/vcl/graph.hxx +++ b/vcl/inc/vcl/graph.hxx @@ -31,7 +31,7 @@ #include <tools/stream.hxx> #include <vcl/dllapi.h> -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/animate.hxx> diff --git a/vcl/inc/vcl/group.hxx b/vcl/inc/vcl/group.hxx index 3334988..24a7202 100644 --- a/vcl/inc/vcl/group.hxx +++ b/vcl/inc/vcl/group.hxx @@ -29,7 +29,7 @@ #ifndef _SV_GROUP_HXX #define _SV_GROUP_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/ctrl.hxx> diff --git a/vcl/inc/vcl/help.hxx b/vcl/inc/vcl/help.hxx index 54cdea8..7f85301 100644 --- a/vcl/inc/vcl/help.hxx +++ b/vcl/inc/vcl/help.hxx @@ -30,7 +30,7 @@ #define _SV_HELP_HXX #include <tools/string.hxx> -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> class Point; diff --git a/vcl/inc/vcl/image.hxx b/vcl/inc/vcl/image.hxx index cef4efa..a789c5c 100644 --- a/vcl/inc/vcl/image.hxx +++ b/vcl/inc/vcl/image.hxx @@ -32,7 +32,7 @@ #include <vcl/dllapi.h> #include <tools/gen.hxx> #include <tools/resid.hxx> -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/bitmapex.hxx> #include <com/sun/star/uno/Reference.hxx> diff --git a/vcl/inc/vcl/inputctx.hxx b/vcl/inc/vcl/inputctx.hxx index eaaec5e..c06fca3 100644 --- a/vcl/inc/vcl/inputctx.hxx +++ b/vcl/inc/vcl/inputctx.hxx @@ -29,7 +29,7 @@ #ifndef _VCL_INPUTCTX_HXX #define _VCL_INPUTCTX_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/font.hxx> diff --git a/vcl/inc/vcl/introwin.hxx b/vcl/inc/vcl/introwin.hxx index 81c32d2..9445c43 100644 --- a/vcl/inc/vcl/introwin.hxx +++ b/vcl/inc/vcl/introwin.hxx @@ -29,7 +29,7 @@ #ifndef _SV_INTROWIN_HXX #define _SV_INTROWIN_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/wrkwin.hxx> #include <vcl/bitmapex.hxx> diff --git a/vcl/inc/vcl/jobset.hxx b/vcl/inc/vcl/jobset.hxx index 7df5853..89f15e4 100644 --- a/vcl/inc/vcl/jobset.hxx +++ b/vcl/inc/vcl/jobset.hxx @@ -29,7 +29,7 @@ #ifndef _SV_JOBSET_HXX #define _SV_JOBSET_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/prntypes.hxx> diff --git a/vcl/inc/vcl/keycod.hxx b/vcl/inc/vcl/keycod.hxx index e0faa4a..a29b308 100644 --- a/vcl/inc/vcl/keycod.hxx +++ b/vcl/inc/vcl/keycod.hxx @@ -30,7 +30,7 @@ #define _SV_KEYCODE_HXX #include <tools/string.hxx> -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <tools/resid.hxx> #include <vcl/keycodes.hxx> diff --git a/vcl/inc/vcl/keycodes.hxx b/vcl/inc/vcl/keycodes.hxx index 2c6fa38..ffc1080 100644 --- a/vcl/inc/vcl/keycodes.hxx +++ b/vcl/inc/vcl/keycodes.hxx @@ -29,7 +29,7 @@ #ifndef _SV_KEYCODES_HXX #define _SV_KEYCODES_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #undef DELETE #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyGroup.hpp> diff --git a/vcl/inc/vcl/mapmod.hxx b/vcl/inc/vcl/mapmod.hxx index bf666bc..b4f1a9d 100644 --- a/vcl/inc/vcl/mapmod.hxx +++ b/vcl/inc/vcl/mapmod.hxx @@ -31,7 +31,7 @@ #include <tools/gen.hxx> #include <tools/fract.hxx> -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <tools/resid.hxx> #include <tools/mapunit.hxx> diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx index c9388ee..6ed2c85 100644 --- a/vcl/inc/vcl/menu.hxx +++ b/vcl/inc/vcl/menu.hxx @@ -29,7 +29,7 @@ #ifndef _SV_MENU_HXX #define _SV_MENU_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <tools/rc.hxx> #include <tools/resid.hxx> diff --git a/vcl/inc/vcl/menubtn.hxx b/vcl/inc/vcl/menubtn.hxx index 4488753..c9906c9 100644 --- a/vcl/inc/vcl/menubtn.hxx +++ b/vcl/inc/vcl/menubtn.hxx @@ -29,7 +29,7 @@ #ifndef _SV_MENUBTN_HXX #define _SV_MENUBTN_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/button.hxx> diff --git a/vcl/inc/vcl/morebtn.hxx b/vcl/inc/vcl/morebtn.hxx index 04ae326..c6991da 100644 --- a/vcl/inc/vcl/morebtn.hxx +++ b/vcl/inc/vcl/morebtn.hxx @@ -29,7 +29,7 @@ #ifndef _SV_MOREBTN_HXX #define _SV_MOREBTN_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/mapmod.hxx> #include <vcl/button.hxx> diff --git a/vcl/inc/vcl/msgbox.hxx b/vcl/inc/vcl/msgbox.hxx index fb960b8..b1d53b4 100644 --- a/vcl/inc/vcl/msgbox.hxx +++ b/vcl/inc/vcl/msgbox.hxx @@ -29,7 +29,7 @@ #ifndef _SV_MSGBOX_HXX #define _SV_MSGBOX_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/btndlg.hxx> #include <vcl/image.hxx> diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx index dd10eda..79e047f 100644 --- a/vcl/inc/vcl/outdev.hxx +++ b/vcl/inc/vcl/outdev.hxx @@ -31,7 +31,7 @@ #include <tools/gen.hxx> #include <tools/string.hxx> -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <tools/rc.hxx> #include <tools/color.hxx> diff --git a/vcl/inc/vcl/pointr.hxx b/vcl/inc/vcl/pointr.hxx index d5d2a49..3944ad5 100644 --- a/vcl/inc/vcl/pointr.hxx +++ b/vcl/inc/vcl/pointr.hxx @@ -29,7 +29,7 @@ #ifndef _VCL_POINTR_HXX #define _VCL_POINTR_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/ptrstyle.hxx> diff --git a/vcl/inc/vcl/print.hxx b/vcl/inc/vcl/print.hxx index 302670c..f2fd35b 100644 --- a/vcl/inc/vcl/print.hxx +++ b/vcl/inc/vcl/print.hxx @@ -32,7 +32,7 @@ #include <rtl/ustring.hxx> #include "tools/errcode.hxx" -#include "vcl/sv.h" +#include "tools/solar.h" #include "vcl/dllapi.h" #include "vcl/outdev.hxx" #include "vcl/prntypes.hxx" diff --git a/vcl/inc/vcl/prntypes.hxx b/vcl/inc/vcl/prntypes.hxx index e660428..bcf7e77 100644 --- a/vcl/inc/vcl/prntypes.hxx +++ b/vcl/inc/vcl/prntypes.hxx @@ -29,7 +29,7 @@ #ifndef _SV_PRNTYPES_HXX #define _SV_PRNTYPES_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <i18nutil/paper.hxx> // --------------- diff --git a/vcl/inc/vcl/ptrstyle.hxx b/vcl/inc/vcl/ptrstyle.hxx index 174e590..c8080cb 100644 --- a/vcl/inc/vcl/ptrstyle.hxx +++ b/vcl/inc/vcl/ptrstyle.hxx @@ -29,7 +29,7 @@ #ifndef _VCL_PTRSTYLE_HXX #define _VCL_PTRSTYLE_HXX -#include <vcl/sv.h> +#include <tools/solar.h> // ----------------- // - Pointer-Types - diff --git a/vcl/inc/vcl/regband.hxx b/vcl/inc/vcl/regband.hxx index 262130f..30a3de6 100644 --- a/vcl/inc/vcl/regband.hxx +++ b/vcl/inc/vcl/regband.hxx @@ -29,7 +29,7 @@ #ifndef _SV_REGBAND_HXX #define _SV_REGBAND_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <tools/poly.hxx> /* ======================================================================= diff --git a/vcl/inc/vcl/region.hxx b/vcl/inc/vcl/region.hxx index 5d3eccd..a8794da 100644 --- a/vcl/inc/vcl/region.hxx +++ b/vcl/inc/vcl/region.hxx @@ -30,7 +30,7 @@ #define _SV_REGION_HXX #include <tools/gen.hxx> -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <basegfx/polygon/b2dpolypolygon.hxx> diff --git a/vcl/inc/vcl/salbtype.hxx b/vcl/inc/vcl/salbtype.hxx index fc323c7..e4bd2cb 100644 --- a/vcl/inc/vcl/salbtype.hxx +++ b/vcl/inc/vcl/salbtype.hxx @@ -36,7 +36,7 @@ #include <vcl/salgtype.hxx> #include <tools/color.hxx> #include <tools/gen.hxx> -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> // ---------- diff --git a/vcl/inc/vcl/salgtype.hxx b/vcl/inc/vcl/salgtype.hxx index 7f994f4..03f282d 100644 --- a/vcl/inc/vcl/salgtype.hxx +++ b/vcl/inc/vcl/salgtype.hxx @@ -29,7 +29,7 @@ #ifndef _SV_SALGTYPE_HXX #define _SV_SALGTYPE_HXX -#include <vcl/sv.h> +#include <tools/solar.h> // ------------ // - SalColor - diff --git a/vcl/inc/vcl/scrbar.hxx b/vcl/inc/vcl/scrbar.hxx index a3bf0ef..918f5e7 100644 --- a/vcl/inc/vcl/scrbar.hxx +++ b/vcl/inc/vcl/scrbar.hxx @@ -29,7 +29,7 @@ #ifndef _SV_SCRBAR_HXX #define _SV_SCRBAR_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/ctrl.hxx> diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx index a3399e1..580bba2 100644 --- a/vcl/inc/vcl/settings.hxx +++ b/vcl/inc/vcl/settings.hxx @@ -29,7 +29,7 @@ #ifndef _SV_SETTINGS_HXX #define _SV_SETTINGS_HXX -#include "vcl/sv.h" +#include "tools/solar.h" #include "vcl/dllapi.h" #include "tools/color.hxx" #include "vcl/font.hxx" diff --git a/vcl/inc/vcl/slider.hxx b/vcl/inc/vcl/slider.hxx index aadc70f..f4e023f 100644 --- a/vcl/inc/vcl/slider.hxx +++ b/vcl/inc/vcl/slider.hxx @@ -29,7 +29,7 @@ #ifndef _SV_SLIDER_HXX #define _SV_SLIDER_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/ctrl.hxx> // for enum ScrollType diff --git a/vcl/inc/vcl/sndstyle.hxx b/vcl/inc/vcl/sndstyle.hxx index 170a511..e91b621 100644 --- a/vcl/inc/vcl/sndstyle.hxx +++ b/vcl/inc/vcl/sndstyle.hxx @@ -29,7 +29,7 @@ #ifndef _SV_SNDSTYLE_HXX #define _SV_SNDSTYLE_HXX -#include <vcl/sv.h> +#include <tools/solar.h> // --------------- // - Sound-Types - diff --git a/vcl/inc/vcl/spin.h b/vcl/inc/vcl/spin.h index f7b69cb..6c2964b 100644 --- a/vcl/inc/vcl/spin.h +++ b/vcl/inc/vcl/spin.h @@ -29,7 +29,7 @@ #ifndef _SV_SPIN_H #define _SV_SPIN_H -#include <vcl/sv.h> +#include <tools/solar.h> class Rectangle; class OutputDevice; diff --git a/vcl/inc/vcl/spin.hxx b/vcl/inc/vcl/spin.hxx index 02141bc..1597408 100644 --- a/vcl/inc/vcl/spin.hxx +++ b/vcl/inc/vcl/spin.hxx @@ -29,7 +29,7 @@ #ifndef _SV_SPIN_HXX #define _SV_SPIN_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/ctrl.hxx> #include <vcl/timer.hxx> diff --git a/vcl/inc/vcl/spinfld.hxx b/vcl/inc/vcl/spinfld.hxx index becfe4b..3518728 100644 --- a/vcl/inc/vcl/spinfld.hxx +++ b/vcl/inc/vcl/spinfld.hxx @@ -29,7 +29,7 @@ #ifndef _SV_SPINFLD_HXX #define _SV_SPINFLD_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/edit.hxx> #include <vcl/timer.hxx> diff --git a/vcl/inc/vcl/split.hxx b/vcl/inc/vcl/split.hxx index 62cc35c..3faa181 100644 --- a/vcl/inc/vcl/split.hxx +++ b/vcl/inc/vcl/split.hxx @@ -29,7 +29,7 @@ #ifndef _SV_SPLIT_HXX #define _SV_SPLIT_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/window.hxx> diff --git a/vcl/inc/vcl/splitwin.hxx b/vcl/inc/vcl/splitwin.hxx index f60de25..c893e59 100644 --- a/vcl/inc/vcl/splitwin.hxx +++ b/vcl/inc/vcl/splitwin.hxx @@ -29,7 +29,7 @@ #ifndef _SV_SPLITWIN_HXX #define _SV_SPLITWIN_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/dockwin.hxx> diff --git a/vcl/inc/vcl/status.hxx b/vcl/inc/vcl/status.hxx index 52d2863..ac28972 100644 --- a/vcl/inc/vcl/status.hxx +++ b/vcl/inc/vcl/status.hxx @@ -29,7 +29,7 @@ #ifndef _SV_STATUS_HXX #define _SV_STATUS_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/window.hxx> #include <vector> diff --git a/vcl/inc/vcl/stdtext.hxx b/vcl/inc/vcl/stdtext.hxx index cd9b87f..a9254c2 100644 --- a/vcl/inc/vcl/stdtext.hxx +++ b/vcl/inc/vcl/stdtext.hxx @@ -30,7 +30,7 @@ #define _VCL_STDTEXT_HXX #include <tools/string.hxx> -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> class Window; diff --git a/vcl/inc/vcl/sv.h b/vcl/inc/vcl/sv.h deleted file mode 100644 index 543e08c..0000000 --- a/vcl/inc/vcl/sv.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * 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. - * - ************************************************************************/ - -#ifndef _SV_SV_H -#define _SV_SV_H - -#include <tools/solar.h> - -#endif // _SV_SV_H - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx index af766f4..acea686 100644 --- a/vcl/inc/vcl/svapp.hxx +++ b/vcl/inc/vcl/svapp.hxx @@ -37,7 +37,7 @@ #include <osl/mutex.hxx> #include <tools/string.hxx> #include <tools/link.hxx> -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/apptypes.hxx> #include <vcl/settings.hxx> diff --git a/vcl/inc/vcl/symbol.hxx b/vcl/inc/vcl/symbol.hxx index f15a399..c3cc1a1 100644 --- a/vcl/inc/vcl/symbol.hxx +++ b/vcl/inc/vcl/symbol.hxx @@ -29,7 +29,7 @@ #ifndef _SV_SYMBOL_HXX #define _SV_SYMBOL_HXX -#include <vcl/sv.h> +#include <tools/solar.h> // ---------------- // - Symbol-Types - diff --git a/vcl/inc/vcl/syschild.hxx b/vcl/inc/vcl/syschild.hxx index 3a55d0b..6dacf76 100644 --- a/vcl/inc/vcl/syschild.hxx +++ b/vcl/inc/vcl/syschild.hxx @@ -29,7 +29,7 @@ #ifndef _SV_SYSCHILD_HXX #define _SV_SYSCHILD_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/window.hxx> diff --git a/vcl/inc/vcl/syswin.hxx b/vcl/inc/vcl/syswin.hxx index 4ca02c4..c61b970 100644 --- a/vcl/inc/vcl/syswin.hxx +++ b/vcl/inc/vcl/syswin.hxx @@ -29,7 +29,7 @@ #ifndef _SV_SYSWIN_HXX #define _SV_SYSWIN_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/window.hxx> diff --git a/vcl/inc/vcl/tabctrl.hxx b/vcl/inc/vcl/tabctrl.hxx index c9d8583..e4bc81a 100644 --- a/vcl/inc/vcl/tabctrl.hxx +++ b/vcl/inc/vcl/tabctrl.hxx @@ -29,7 +29,7 @@ #ifndef _SV_TABCTRL_HXX #define _SV_TABCTRL_HXX -#include "vcl/sv.h" +#include "tools/solar.h" #include "vcl/dllapi.h" #include "vcl/ctrl.hxx" diff --git a/vcl/inc/vcl/tabdlg.hxx b/vcl/inc/vcl/tabdlg.hxx index 0b654b4..56bb29c 100644 --- a/vcl/inc/vcl/tabdlg.hxx +++ b/vcl/inc/vcl/tabdlg.hxx @@ -29,7 +29,7 @@ #ifndef _SV_TABDLG_HXX #define _SV_TABDLG_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/dialog.hxx> diff --git a/vcl/inc/vcl/tabpage.hxx b/vcl/inc/vcl/tabpage.hxx index 92a00f8..c09e751 100644 --- a/vcl/inc/vcl/tabpage.hxx +++ b/vcl/inc/vcl/tabpage.hxx @@ -29,7 +29,7 @@ #ifndef _SV_TABPAGE_HXX #define _SV_TABPAGE_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/window.hxx> diff --git a/vcl/inc/vcl/timer.hxx b/vcl/inc/vcl/timer.hxx index efc4b00..c935bee 100644 --- a/vcl/inc/vcl/timer.hxx +++ b/vcl/inc/vcl/timer.hxx @@ -30,7 +30,7 @@ #define _SV_TIMER_HXX #include <tools/link.hxx> -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> struct ImplTimerData; diff --git a/vcl/inc/vcl/toolbox.hxx b/vcl/inc/vcl/toolbox.hxx index 8e1270f..5d6eae3 100644 --- a/vcl/inc/vcl/toolbox.hxx +++ b/vcl/inc/vcl/toolbox.hxx @@ -29,7 +29,7 @@ #ifndef _SV_TOOLBOX_HXX #define _SV_TOOLBOX_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/dockwin.hxx> #include <vcl/image.hxx> diff --git a/vcl/inc/vcl/virdev.hxx b/vcl/inc/vcl/virdev.hxx index 49c1be7..d22f706 100644 --- a/vcl/inc/vcl/virdev.hxx +++ b/vcl/inc/vcl/virdev.hxx @@ -29,7 +29,7 @@ #ifndef _SV_VIRDEV_HXX #define _SV_VIRDEV_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/outdev.hxx> diff --git a/vcl/inc/vcl/waitobj.hxx b/vcl/inc/vcl/waitobj.hxx index 1bbdd04..88fda2c 100644 --- a/vcl/inc/vcl/waitobj.hxx +++ b/vcl/inc/vcl/waitobj.hxx @@ -29,7 +29,7 @@ #ifndef _SV_WAITOBJ_HXX #define _SV_WAITOBJ_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/window.hxx> diff --git a/vcl/inc/vcl/wall.hxx b/vcl/inc/vcl/wall.hxx index f85d58c..6b23620 100644 --- a/vcl/inc/vcl/wall.hxx +++ b/vcl/inc/vcl/wall.hxx @@ -29,7 +29,7 @@ #ifndef _SV_WALL_HXX #define _SV_WALL_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <tools/color.hxx> diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index eaa90d9..5d48ebb 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -29,7 +29,7 @@ #ifndef _SV_WINDOW_HXX #define _SV_WINDOW_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/outdev.hxx> #include <tools/resid.hxx> diff --git a/vcl/inc/vcl/wrkwin.hxx b/vcl/inc/vcl/wrkwin.hxx index c9a3da9..0b5852a 100644 --- a/vcl/inc/vcl/wrkwin.hxx +++ b/vcl/inc/vcl/wrkwin.hxx @@ -29,7 +29,7 @@ #ifndef _SV_WRKWIN_HXX #define _SV_WRKWIN_HXX -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/syswin.hxx> diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 106fe96..fc61f53 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -30,7 +30,7 @@ #define _SV_WINDOW_H #include <vector> -#include <vcl/sv.h> +#include <tools/solar.h> #include <vcl/outdev.hxx> #include <vcl/timer.hxx> #ifndef _SV_INPUTCTX_HXX _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
