diff options
author | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-01-14 22:27:44 +0100 |
---|---|---|
committer | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-01-14 22:27:44 +0100 |
commit | 6ac5d627b946828fdf791cca381e9c526c755582 (patch) | |
tree | 419569b09a67c4f06526419fcb761e47ccf3d9aa | |
parent | b2fa4ba9756e52f4ddbadb112673c7ed445ade00 (diff) |
undo previous erroneous change, solar.hrc belongs to svl instead vcl now
27 files changed, 25 insertions, 26 deletions
diff --git a/goodies/inc/goodies.hrc b/goodies/inc/goodies.hrc index 0cad63e4efdd..139987c4f6ee 100644 --- a/goodies/inc/goodies.hrc +++ b/goodies/inc/goodies.hrc @@ -31,7 +31,7 @@ #define _GOODIES_HRC #ifndef _SOLAR_HRC -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #endif // Dialoge --------------------------------------------------------------- diff --git a/goodies/inc/pch/precompiled_goodies.hxx b/goodies/inc/pch/precompiled_goodies.hxx index 754e737467b4..fe6f2ec433e5 100644 --- a/goodies/inc/pch/precompiled_goodies.hxx +++ b/goodies/inc/pch/precompiled_goodies.hxx @@ -100,7 +100,7 @@ #include "svtools/fltcall.hxx" #include "svl/itemprop.hxx" #include "svl/lstner.hxx" -#include "vcl/solar.hrc" +#include "svl/solar.hrc" #include "svtools/stdctrl.hxx" #include "svl/svarray.hxx" diff --git a/goodies/source/filter.vcl/egif/egif.cxx b/goodies/source/filter.vcl/egif/egif.cxx index 6cef33de0187..9f2aeaddd686 100644 --- a/goodies/source/filter.vcl/egif/egif.cxx +++ b/goodies/source/filter.vcl/egif/egif.cxx @@ -35,7 +35,7 @@ #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> #include <vcl/window.hxx> -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include <svtools/fltcall.hxx> #include <svtools/FilterConfigItem.hxx> #include "giflzwc.hxx" diff --git a/goodies/source/filter.vcl/eos2met/eos2met.cxx b/goodies/source/filter.vcl/eos2met/eos2met.cxx index 74db6f344492..b818e9cd26ba 100644 --- a/goodies/source/filter.vcl/eos2met/eos2met.cxx +++ b/goodies/source/filter.vcl/eos2met/eos2met.cxx @@ -47,7 +47,7 @@ #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include "strings.hrc" #include "dlgeos2.hxx" diff --git a/goodies/source/filter.vcl/epbm/epbm.cxx b/goodies/source/filter.vcl/epbm/epbm.cxx index 2913452df4a9..a624e7f45cfb 100644 --- a/goodies/source/filter.vcl/epbm/epbm.cxx +++ b/goodies/source/filter.vcl/epbm/epbm.cxx @@ -35,7 +35,7 @@ #include <vcl/graph.hxx> #include <vcl/bmpacc.hxx> #include <vcl/msgbox.hxx> -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include <svtools/fltcall.hxx> #include <svtools/FilterConfigItem.hxx> #include "strings.hrc" diff --git a/goodies/source/filter.vcl/epgm/epgm.cxx b/goodies/source/filter.vcl/epgm/epgm.cxx index 435a53da6b9f..32d6e74a5cfe 100644 --- a/goodies/source/filter.vcl/epgm/epgm.cxx +++ b/goodies/source/filter.vcl/epgm/epgm.cxx @@ -35,7 +35,7 @@ #include <vcl/graph.hxx> #include <vcl/bmpacc.hxx> #include <vcl/msgbox.hxx> -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include <svtools/fltcall.hxx> #include <svtools/FilterConfigItem.hxx> #include "strings.hrc" diff --git a/goodies/source/filter.vcl/epict/epict.cxx b/goodies/source/filter.vcl/epict/epict.cxx index 4f20619eb185..cd9e33edd5d9 100644 --- a/goodies/source/filter.vcl/epict/epict.cxx +++ b/goodies/source/filter.vcl/epict/epict.cxx @@ -33,7 +33,7 @@ #include <vcl/metaact.hxx> #include <svtools/filter.hxx> -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include <svtools/fltcall.hxx> #include <math.h> diff --git a/goodies/source/filter.vcl/eppm/eppm.cxx b/goodies/source/filter.vcl/eppm/eppm.cxx index 5d682a215f6a..d17b4f7777ae 100644 --- a/goodies/source/filter.vcl/eppm/eppm.cxx +++ b/goodies/source/filter.vcl/eppm/eppm.cxx @@ -35,7 +35,7 @@ #include <vcl/graph.hxx> #include <vcl/bmpacc.hxx> #include <vcl/msgbox.hxx> -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include <svtools/fltcall.hxx> #include <svtools/FilterConfigItem.hxx> #include "strings.hrc" diff --git a/goodies/source/filter.vcl/eps/eps.cxx b/goodies/source/filter.vcl/eps/eps.cxx index d3580bf4ebc6..83b5a94f97f2 100644 --- a/goodies/source/filter.vcl/eps/eps.cxx +++ b/goodies/source/filter.vcl/eps/eps.cxx @@ -46,7 +46,7 @@ #include <vcl/msgbox.hxx> #include <vcl/cvtgrf.hxx> #include <vcl/gradient.hxx> -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include <svtools/fltcall.hxx> #include <svtools/FilterConfigItem.hxx> #include <vcl/graphictools.hxx> diff --git a/goodies/source/filter.vcl/etiff/etiff.cxx b/goodies/source/filter.vcl/etiff/etiff.cxx index c4bd6524627b..3cdec42d0978 100644 --- a/goodies/source/filter.vcl/etiff/etiff.cxx +++ b/goodies/source/filter.vcl/etiff/etiff.cxx @@ -35,7 +35,7 @@ #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> #include <vcl/bmpacc.hxx> -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include <svtools/fltcall.hxx> #include <svtools/FilterConfigItem.hxx> diff --git a/goodies/source/filter.vcl/ipcd/ipcd.cxx b/goodies/source/filter.vcl/ipcd/ipcd.cxx index b0d7cbc1eabb..f7a5f3652cbf 100644 --- a/goodies/source/filter.vcl/ipcd/ipcd.cxx +++ b/goodies/source/filter.vcl/ipcd/ipcd.cxx @@ -36,7 +36,7 @@ #include <vcl/bmpacc.hxx> #include <vcl/svapp.hxx> #include <svtools/fltcall.hxx> -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include <svtools/FilterConfigItem.hxx> //============================ PCDReader ================================== diff --git a/goodies/source/inv/invader.cxx b/goodies/source/inv/invader.cxx index 4e91536e577b..0aed6e76848f 100644 --- a/goodies/source/inv/invader.cxx +++ b/goodies/source/inv/invader.cxx @@ -37,7 +37,7 @@ #include "invader.hrc" #include "strings.hrc" #include "score.hxx" -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include <cppuhelper/servicefactory.hxx> #include <comphelper/processfactory.hxx> #include <vcl/msgbox.hxx> diff --git a/goodies/source/unographic/provider.cxx b/goodies/source/unographic/provider.cxx index b332dd4233e2..1f7de99d4473 100644 --- a/goodies/source/unographic/provider.cxx +++ b/goodies/source/unographic/provider.cxx @@ -46,7 +46,7 @@ #include <tools/resmgr.hxx> #include <unotools/ucbstreamhelper.hxx> #include <svtools/filter.hxx> -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include <vcl/salbtype.hxx> #include <vcl/virdev.hxx> #include <com/sun/star/io/XStream.hpp> diff --git a/goodies/source/unographic/transformer.cxx b/goodies/source/unographic/transformer.cxx index ee4371172514..7e18c10cdd41 100644 --- a/goodies/source/unographic/transformer.cxx +++ b/goodies/source/unographic/transformer.cxx @@ -43,7 +43,7 @@ #include <tools/resid.hxx> #include <tools/resmgr.hxx> #include <unotools/ucbstreamhelper.hxx> -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include <vcl/salbtype.hxx> #include <vcl/virdev.hxx> #include <vcl/bmpacc.hxx> diff --git a/vcl/inc/vcl/solar.hrc b/svl/inc/svl/solar.hrc index 26ab8a959c5e..26ab8a959c5e 100644 --- a/vcl/inc/vcl/solar.hrc +++ b/svl/inc/svl/solar.hrc diff --git a/svl/inc/svl/svtools.hrc b/svl/inc/svl/svtools.hrc index ec3bf093d753..e4cc91cfcb49 100644 --- a/svl/inc/svl/svtools.hrc +++ b/svl/inc/svl/svtools.hrc @@ -30,7 +30,7 @@ #ifndef _SVTOOLS_HRC #define _SVTOOLS_HRC "$Revision: 1.0" -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #define RID_SVTOOLS_BITMAP_START (RID_SVTOOLS_START + 0) #define RID_SVTOOLS_IMAGELIST_START (RID_SVTOOLS_START + 0) diff --git a/svtools/bmpmaker/bmp.cxx b/svtools/bmpmaker/bmp.cxx index 52e2cb5fa7b0..b91dae79bbad 100644 --- a/svtools/bmpmaker/bmp.cxx +++ b/svtools/bmpmaker/bmp.cxx @@ -43,7 +43,7 @@ using namespace std; #include <vcl/svapp.hxx> -#include "vcl/solar.hrc" +#include "svl/solar.hrc" #include "filedlg.hxx" #include "bmpcore.hxx" #include "bmp.hrc" diff --git a/svtools/bmpmaker/bmpsum.cxx b/svtools/bmpmaker/bmpsum.cxx index 6ba0ac3cfc78..3eee49ef695d 100644 --- a/svtools/bmpmaker/bmpsum.cxx +++ b/svtools/bmpmaker/bmpsum.cxx @@ -45,7 +45,7 @@ #include <vcl/bmpacc.hxx> #include <vcl/pngread.hxx> -#include "vcl/solar.hrc" +#include "svl/solar.hrc" #define EXIT_NOERROR 0x00000000 #define EXIT_INVALIDFILE 0x00000001 diff --git a/svtools/inc/svtools/helpid.hrc b/svtools/inc/svtools/helpid.hrc index d18120b8c0d4..937898f37af1 100644 --- a/svtools/inc/svtools/helpid.hrc +++ b/svtools/inc/svtools/helpid.hrc @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- -#include <vcl/solar.hrc> +#include <svl/solar.hrc> // Help-Ids -------------------------------------------------------------- diff --git a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx index d07251079919..584814dd9e92 100644 --- a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx +++ b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx @@ -37,7 +37,7 @@ #include "FilterConfigCache.hxx" #include <osl/file.hxx> #include <osl/module.hxx> -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include <svtools/fltcall.hxx> #include "dlgexpor.hxx" #include "dlgejpg.hxx" diff --git a/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter.vcl/filter/filter.cxx index 372b7496920b..306307a0bf91 100644 --- a/svtools/source/filter.vcl/filter/filter.cxx +++ b/svtools/source/filter.vcl/filter/filter.cxx @@ -54,7 +54,7 @@ #include "jpeg.hxx" #include "xbmread.hxx" #include "xpmread.hxx" -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include "strings.hrc" #include "sgffilt.hxx" #include "osl/module.hxx" diff --git a/svtools/source/plugapp/testtool.src b/svtools/source/plugapp/testtool.src index 4333dedd4255..78b63c2fb819 100644 --- a/svtools/source/plugapp/testtool.src +++ b/svtools/source/plugapp/testtool.src @@ -28,7 +28,7 @@ * ************************************************************************/ #include "testtool.hrc" -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #define Control_Control 5 diff --git a/svtools/source/uno/unoifac2.hrc b/svtools/source/uno/unoifac2.hrc index 64941b1c3013..4f46edffdc51 100644 --- a/svtools/source/uno/unoifac2.hrc +++ b/svtools/source/uno/unoifac2.hrc @@ -33,7 +33,7 @@ #ifndef _SOLAR_HRC -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #endif //! Um den berblick ber alle benutzten HelpID's zu behalten sind diese diff --git a/svtools/workben/unodialog/udlg_global.hrc b/svtools/workben/unodialog/udlg_global.hrc index 6fa2679e3386..bde0e5e86ce2 100644 --- a/svtools/workben/unodialog/udlg_global.hrc +++ b/svtools/workben/unodialog/udlg_global.hrc @@ -31,7 +31,7 @@ #ifndef SVTOOLS_UDLG_GLOBAL_HRC #define SVTOOLS_UDLG_GLOBAL_HRC -#include <vcl/solar.hrc> +#include <svl/solar.hrc> //===================================================================== //= bases diff --git a/vcl/inc/vcl/svids.hrc b/vcl/inc/vcl/svids.hrc index 695fa6f849e8..e2a8226ac878 100644 --- a/vcl/inc/vcl/svids.hrc +++ b/vcl/inc/vcl/svids.hrc @@ -31,7 +31,7 @@ #ifndef _SV_SVIDS_HRC #define _SV_SVIDS_HRC -#include "vcl/solar.hrc" +#include "svl/solar.hrc" #define SV_RESID_STDOFFSET 0 #define SV_RESID_WINOFFSET 1 diff --git a/vcl/prj/build.lst b/vcl/prj/build.lst index 5d2aaf90c6f7..cf2824f72942 100644 --- a/vcl/prj/build.lst +++ b/vcl/prj/build.lst @@ -1,4 +1,4 @@ -vc vcl : l10n apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools transex3 icc SO:print_header cpputools shell NULL +vc vcl : l10n apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools transex3 icc SO:print_header cpputools shell svl NULL vc vcl usr1 - all vc_mkout NULL vc vcl\inc nmake - all vc_inc NULL vc vcl\source\glyphs nmake - all vc_glyphs vc_inc NULL diff --git a/vcl/prj/d.lst b/vcl/prj/d.lst index afe8a5808be7..b106ff73729e 100644 --- a/vcl/prj/d.lst +++ b/vcl/prj/d.lst @@ -13,7 +13,6 @@ mkdir: %_DEST%\inc%_EXT%\vcl ..\%__SRC%\obj\salmain.obj %_DEST%\lib%_EXT%\salmain.obj ..\%__SRC%\obj\salmain.o %_DEST%\lib%_EXT%\salmain.o -..\inc\vcl\solar.hrc %_DEST%\inc%_EXT%\vcl\solar.hrc ..\inc\vcl\accel.hxx %_DEST%\inc%_EXT%\vcl\accel.hxx ..\inc\vcl\alpha.hxx %_DEST%\inc%_EXT%\vcl\alpha.hxx ..\inc\vcl\animate.hxx %_DEST%\inc%_EXT%\vcl\animate.hxx |