diff options
Diffstat (limited to 'vcl/inc/vcl')
69 files changed, 68 insertions, 104 deletions
diff --git a/vcl/inc/vcl/accel.hxx b/vcl/inc/vcl/accel.hxx index cef418cc2907..ee4f949427c0 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 12969bef4d02..188c727726a7 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 8b11318ffb1b..3dbee5050613 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 3b973c81e36e..5c4779765f01 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 dcd1ef467b05..da61e396b0c6 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 89d4d8e3fff0..51b6034c0659 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 77c994cf4c2b..33190d43f989 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 0cb68906040b..43f168dfe198 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 cb4eff2cf6a7..83827bbed0a5 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 40bdb2c74a29..8ab27777414e 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 2d03af5aa5ff..c4dc0c6d1574 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 7ba82d380f58..1fac69ca489c 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 167ca138c0f5..7726e9fb70c9 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 b425d84b1ff5..9632f9eca4a5 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 f912a39a6d41..13f4784284e0 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 67dd7dbee7aa..eb458acea3d8 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 a89490594aff..63f094d0509d 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 6fc957f4e5fc..feaa892a8f9a 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 d86973b5686c..960d0b87393a 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 b92693675606..c9f816677a8c 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 c5d57f4de535..f8688b3c8e55 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 3334988c7877..24a7202e5b50 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 54cdea8ccb25..7f8530121c44 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 cef4efa56a4d..a789c5cbc239 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 eaaec5e7bd1d..c06fca31dd07 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 81c32d28ce2f..9445c4322c91 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 7df5853bb736..89f15e4e71a0 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 e0faa4a16904..a29b30843507 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 2c6fa38bd49b..ffc1080ecf31 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 bf666bc782cb..b4f1a9d7e60e 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 c9388ee81991..6ed2c8539b0f 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 4488753bd599..c9906c9dd162 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 04ae32653d2a..c6991da511ac 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 fb960b847ff7..b1d53b43faf0 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 dd10edab5191..79e047f0bc97 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 d5d2a49b33f0..3944ad5b6c87 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 302670cce840..f2fd35bf6f9a 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 e660428bf3c7..bcf7e779c14a 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 174e590955a4..c8080cba9fa3 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 262130f71a86..30a3de6cbbe4 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 5d3eccdfbee1..a8794da14bc9 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 fc323c7deb86..e4bd2cb77141 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 7f994f452f2c..03f282db6339 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 a3bf0efed2c6..918f5e7b17b2 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 a3399e14925d..580bba264083 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 aadc70f1398d..f4e023fe45ba 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 170a51173726..e91b6210fc49 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 f7b69cbf2a16..6c2964b4486b 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 02141bccd448..1597408d3fa1 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 becfe4be426f..3518728fafb1 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 62cc35c0f951..3faa18190d32 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 f60de25a443c..c893e591128f 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 52d2863ab55c..ac28972e133d 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 cd9b87f9c535..a9254c20048f 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 543e08caec8f..000000000000 --- 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 af766f4a9762..acea6866f5d5 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 f15a399e172b..c3cc1a1d7f6a 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 3a55d0b45a2c..6dacf76c10a1 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 4ca02c4b5c99..c61b970328b7 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 c9d858310dca..e4bc81a78101 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 0b654b409f33..56bb29c385a3 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 92a00f892845..c09e75169b15 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 efc4b00924a7..c935bee7d31b 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 8e1270ff8c77..5d6eae3815b1 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 49c1be7d49ed..d22f706b2d42 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 1bbdd04506e9..88fda2c103e0 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 f85d58c1200f..6b23620d659c 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 eaa90d99392d..5d48ebb0df3f 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 c9a3da94b0a2..0b5852a83e4b 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> |