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 | 3637c03ada13f8b900f97109a3ed6de4798a8ff5 (patch) | |
tree | bf3d0fcbe7422077db33cef045148480e99f58c2 | |
parent | 6e78bac73e72e1c73285d362c05760f96984fd19 (diff) |
undo previous erroneous change, solar.hrc belongs to svl instead vcl now
43 files changed, 43 insertions, 43 deletions
diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc index 5ba6c40881..4ce7f12962 100644 --- a/avmedia/inc/helpids.hrc +++ b/avmedia/inc/helpids.hrc @@ -31,7 +31,7 @@ #ifndef _AVMEDIA_HELPIDS_HRC #define _AVMEDIA_HELPIDS_HRC -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #define HID_AVMEDIA_TOOLBOXITEM_PLAY (HID_AVMEDIA_START+0) #define HID_AVMEDIA_TOOLBOXITEM_PAUSE (HID_AVMEDIA_START+1) diff --git a/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx index 88c86dfb1b..f52cabf231 100644 --- a/avmedia/source/framework/mediamisc.cxx +++ b/avmedia/source/framework/mediamisc.cxx @@ -29,7 +29,7 @@ ************************************************************************/ #include <tools/resmgr.hxx> -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include <vcl/svapp.hxx> namespace avmedia { diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx index 505705bd5a..f1c120b261 100644 --- a/basic/inc/pch/precompiled_basic.hxx +++ b/basic/inc/pch/precompiled_basic.hxx @@ -183,7 +183,7 @@ #include "unotools/pathoptions.hxx" #include "svtools/sfxecode.hxx" #include "svl/smplhint.hxx" -#include "vcl/solar.hrc" +#include "svl/solar.hrc" #include "svtools/stringtransfer.hxx" #include "svl/svarray.hxx" #include "svl/svdde.hxx" diff --git a/basic/inc/sb.hrc b/basic/inc/sb.hrc index 59ed2efca4..6caf7ade5c 100644 --- a/basic/inc/sb.hrc +++ b/basic/inc/sb.hrc @@ -31,7 +31,7 @@ #ifndef _SB_HRC #define _SB_HRC -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #ifndef IDS_SBERR_START #define IDS_SBERR_START RID_BASIC_START diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx index 2758e490bc..2fc7baffe1 100644 --- a/basic/source/app/dialogs.cxx +++ b/basic/source/app/dialogs.cxx @@ -66,7 +66,7 @@ // Ohne Includeschutz #include <svtools/svtdata.hxx> -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include <basic/dispdefs.hxx> diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx index 52d77bc064..929a71a942 100644 --- a/basic/source/runtime/basrdll.cxx +++ b/basic/source/runtime/basrdll.cxx @@ -32,7 +32,7 @@ #include "precompiled_basic.hxx" #include <tools/shl.hxx> #include <vcl/svapp.hxx> -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include <tools/debug.hxx> #include <vcl/msgbox.hxx> diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc index b1469bdba9..0a67c2017f 100644 --- a/desktop/source/app/desktop.hrc +++ b/desktop/source/app/desktop.hrc @@ -32,7 +32,7 @@ #define _DESKTOP_HRC_ #ifndef _SOLAR_HRC -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #endif #define RID_DESKTOP_DIALOG_START 2000 diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc index 103493ae34..7bbc194670 100644 --- a/desktop/source/inc/helpid.hrc +++ b/desktop/source/inc/helpid.hrc @@ -31,7 +31,7 @@ #if ! defined INCLUDED_DESKTOP_HELPID_HRC #define INCLUDED_DESKTOP_HELPID_HRC -#include "vcl/solar.hrc" +#include "svl/solar.hrc" #define HID_GLOBAL_FALLBACK 0xFFFFFFFF diff --git a/formula/inc/helpids.hrc b/formula/inc/helpids.hrc index 1a805c4e81..be01c94513 100644 --- a/formula/inc/helpids.hrc +++ b/formula/inc/helpids.hrc @@ -31,7 +31,7 @@ #define FORMULA_HELPID_HRC #ifndef _SOLAR_HRC -#include <vcl/solar.hrc> // HID_FORMULA_START +#include <svl/solar.hrc> // HID_FORMULA_START #endif #define HID_FORMULADLG_FORMULA (HID_FORMULA_START + 0) diff --git a/formula/source/core/inc/core_resource.hrc b/formula/source/core/inc/core_resource.hrc index a5ca304fd9..ecb21ef55b 100644 --- a/formula/source/core/inc/core_resource.hrc +++ b/formula/source/core/inc/core_resource.hrc @@ -31,7 +31,7 @@ #ifndef _FORMULA_CORE_RESOURCE_HRC_ #define _FORMULA_CORE_RESOURCE_HRC_ -#include <vcl/solar.hrc> +#include <svl/solar.hrc> //------------------------------------------------------------------------------ #define RID_CORE_STRINGS_START RID_FORMULA_START diff --git a/formula/source/core/resource/core_resource.cxx b/formula/source/core/resource/core_resource.cxx index b0245af9ed..d61c479462 100644 --- a/formula/source/core/resource/core_resource.cxx +++ b/formula/source/core/resource/core_resource.cxx @@ -37,7 +37,7 @@ // ---- needed as long as we have no contexts for components --- #include <vcl/svapp.hxx> -#include <vcl/solar.hrc> +#include <svl/solar.hrc> //......................................................................... namespace formula diff --git a/formula/source/ui/inc/ForResId.hrc b/formula/source/ui/inc/ForResId.hrc index 46a6b84bbf..e170c08c6d 100644 --- a/formula/source/ui/inc/ForResId.hrc +++ b/formula/source/ui/inc/ForResId.hrc @@ -34,7 +34,7 @@ // include ----------------------------------------------------------- #ifndef _SOLAR_HRC -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #endif #define RID_DIALOG_START RID_FORMULA_START diff --git a/formula/source/ui/resource/ModuleHelper.cxx b/formula/source/ui/resource/ModuleHelper.cxx index 09c9f81e18..8fca1dff65 100644 --- a/formula/source/ui/resource/ModuleHelper.cxx +++ b/formula/source/ui/resource/ModuleHelper.cxx @@ -37,7 +37,7 @@ #include <rtl/uri.hxx> #include <tools/debug.hxx> #ifndef _SOLAR_HRC -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #endif #define EXPAND_PROTOCOL "vnd.sun.star.expand:" diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc index 23a8156d8d..f7d9152ba5 100644 --- a/framework/inc/framework.hrc +++ b/framework/inc/framework.hrc @@ -31,7 +31,7 @@ #ifndef _FRAMEWORK_HRC #define _FRAMEWORK_HRC -#include "vcl/solar.hrc" +#include "svl/solar.hrc" #define RID_FWK_START 260 diff --git a/framework/inc/helpid.hrc b/framework/inc/helpid.hrc index 7b60bb7f59..71f5253833 100644 --- a/framework/inc/helpid.hrc +++ b/framework/inc/helpid.hrc @@ -32,7 +32,7 @@ // include ------------------------------------------------------------------ -#include <vcl/solar.hrc> +#include <svl/solar.hrc> // Help-Ids ----------------------------------------------------------------- diff --git a/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx index 79f25b6211..fd211dd81e 100644 --- a/framework/inc/pch/precompiled_framework.hxx +++ b/framework/inc/pch/precompiled_framework.hxx @@ -399,7 +399,7 @@ #include "unotools/pathoptions.hxx" #include "svtools/sfxecode.hxx" #include "svl/smplhint.hxx" -#include "vcl/solar.hrc" +#include "svl/solar.hrc" #include "svtools/statusbarcontroller.hxx" #include "svl/svarray.hxx" #include "svtools/svmedit.hxx" diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx index ef981f7feb..f1deffa53b 100644 --- a/framework/source/services/backingcomp.cxx +++ b/framework/source/services/backingcomp.cxx @@ -75,7 +75,7 @@ #include <rtl/ustrbuf.hxx> #ifndef _SOLAR_HRC -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #endif #include <svl/urihelper.hxx> #include <osl/file.hxx> diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 842aff1bb4..56cbdde695 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -62,7 +62,7 @@ #include <rtl/ustrbuf.hxx> #include <rtl/strbuf.hxx> #ifndef _SOLAR_HRC -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #endif #include <tools/rcid.h> #include <vcl/image.hxx> diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx index 104f8aa230..0af35427d8 100644 --- a/sfx2/inc/pch/precompiled_sfx2.hxx +++ b/sfx2/inc/pch/precompiled_sfx2.hxx @@ -560,7 +560,7 @@ #include "svl/slstitm.hxx" #include "svl/smplhint.hxx" #include "svtools/soerr.hxx" -#include "vcl/solar.hrc" +#include "svl/solar.hrc" #include "unotools/startoptions.hxx" #include "svtools/statusbarcontroller.hxx" #include "svl/stritem.hxx" diff --git a/sfx2/inc/sfx2/cntids.hrc b/sfx2/inc/sfx2/cntids.hrc index 1641ee85e0..984925d95e 100644 --- a/sfx2/inc/sfx2/cntids.hrc +++ b/sfx2/inc/sfx2/cntids.hrc @@ -36,7 +36,7 @@ #endif #ifndef _SOLAR_HRC -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #endif // Slot-ID's ----------------------------------------------------------------- diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc index 2b31062432..45669204cf 100644 --- a/sfx2/inc/sfx2/sfx.hrc +++ b/sfx2/inc/sfx2/sfx.hrc @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #ifndef _SOLAR_HRC -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #endif #ifndef _MEMBERID_HRC diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc index da97794c33..525916f8d3 100644 --- a/sfx2/inc/sfx2/sfxsids.hrc +++ b/sfx2/inc/sfx2/sfxsids.hrc @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #ifndef _SOLAR_HRC -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #endif #define SID_SFX_START 5000 diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc index f07be203fa..9185f0c114 100644 --- a/sfx2/source/inc/helpid.hrc +++ b/sfx2/source/inc/helpid.hrc @@ -32,7 +32,7 @@ // include ------------------------------------------------------------------ -#include <vcl/solar.hrc> +#include <svl/solar.hrc> // Help-Ids ----------------------------------------------------------------- diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc index 8e5afcb77e..6c07ffd5da 100644 --- a/svx/inc/fmhelp.hrc +++ b/svx/inc/fmhelp.hrc @@ -31,7 +31,7 @@ #define _SVX_FMHELP_HRC // include ----------------------------------------------------------- -#include <vcl/solar.hrc> +#include <svl/solar.hrc> // in solar.hrc //#define HID_FORMS_START (HID_LIB_START+4000) diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc index d7602abe8d..3e9fbfb64b 100644 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpid.hrc @@ -31,7 +31,7 @@ #define _SVX_HELPID_HRC // include --------------------------------------------------------------- -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include <svx/exthelpid.hrc> diff --git a/svx/inc/svx/svdattr.hxx b/svx/inc/svx/svdattr.hxx index 4adc8c1ca7..ea38817559 100644 --- a/svx/inc/svx/svdattr.hxx +++ b/svx/inc/svx/svdattr.hxx @@ -32,7 +32,7 @@ #define _SVDATTR_HXX #ifndef _SOLAR_HRC -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #endif #include <tools/solar.h> #include <svx/sdangitm.hxx> diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx index d40185bf98..0fd8967c1a 100644 --- a/svx/inc/svx/svdhdl.hxx +++ b/svx/inc/svx/svdhdl.hxx @@ -39,7 +39,7 @@ #include <tools/contnr.hxx> #ifndef _SOLAR_HRC -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #endif #include <svx/xpoly.hxx> diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx index dbbd27903d..159e5c38ab 100644 --- a/svx/inc/svx/svdundo.hxx +++ b/svx/inc/svx/svdundo.hxx @@ -32,7 +32,7 @@ #define _SVDUNDO_HXX #ifndef _SOLAR_HRC -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #endif #include <svl/undo.hxx> #include <tools/contnr.hxx> diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc index 244cd80d65..4bf16135aa 100644 --- a/svx/inc/svx/svxids.hrc +++ b/svx/inc/svx/svxids.hrc @@ -32,7 +32,7 @@ // include ------------------------------------------------------------------ #include <svl/memberid.hrc> -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include <sfx2/sfx.hrc> #include <sfx2/sfxsids.hrc> diff --git a/svx/inc/svx/svxitems.hrc b/svx/inc/svx/svxitems.hrc index f2083b1014..8800b7cb46 100644 --- a/svx/inc/svx/svxitems.hrc +++ b/svx/inc/svx/svxitems.hrc @@ -33,7 +33,7 @@ // include ------------------------------------------------------------------ #ifndef _SOLAR_HRC -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #endif // BOOL --------------------------------------------------------------------- diff --git a/svx/source/dialog/dialmgr.cxx b/svx/source/dialog/dialmgr.cxx index e66cb7c765..0a05a75b3d 100644 --- a/svx/source/dialog/dialmgr.cxx +++ b/svx/source/dialog/dialmgr.cxx @@ -39,7 +39,7 @@ #include <svx/dialmgr.hxx> #include <tools/rc.hxx> -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include <vcl/svapp.hxx> static ResMgr* pResMgr=0; diff --git a/svx/source/editeng/editdbg.hxx b/svx/source/editeng/editdbg.hxx index 912f538191..78764a0c9a 100644 --- a/svx/source/editeng/editdbg.hxx +++ b/svx/source/editeng/editdbg.hxx @@ -31,7 +31,7 @@ #ifndef _EDITDBG_HXX #define _EDITDBG_HXX -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include <tools/string.hxx> #include <stdio.h> diff --git a/svx/source/editeng/editeng.hrc b/svx/source/editeng/editeng.hrc index 6db50d1b0d..f023ad546d 100644 --- a/svx/source/editeng/editeng.hrc +++ b/svx/source/editeng/editeng.hrc @@ -31,7 +31,7 @@ #define _EDITENG_HRC #ifndef _SOLAR_HRC -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #endif #define RID_EDITUNDO_DEL ( RID_EDIT_START + 0 ) diff --git a/svx/source/editeng/eerdll.cxx b/svx/source/editeng/eerdll.cxx index 8b3d76434e..0951d2c6e4 100644 --- a/svx/source/editeng/eerdll.cxx +++ b/svx/source/editeng/eerdll.cxx @@ -36,7 +36,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include <eerdll.hxx> #include <eerdll2.hxx> #include <svx/lspcitem.hxx> diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 6a2291ea5b..0353af86ef 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -37,7 +37,7 @@ #include <ucbhelper/content.hxx> #include <tools/resmgr.hxx> #include <tools/urlobj.hxx> -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include <svl/urihelper.hxx> #include <svtools/filter.hxx> #include <svl/itempool.hxx> diff --git a/svx/source/inc/fmresids.hrc b/svx/source/inc/fmresids.hrc index 823206cb10..0eb47b4108 100644 --- a/svx/source/inc/fmresids.hrc +++ b/svx/source/inc/fmresids.hrc @@ -31,7 +31,7 @@ #define _SVX_FMRESIDS_HRC // include ----------------------------------------------------------- -#include <vcl/solar.hrc> +#include <svl/solar.hrc> // unnamed ressources ------------------------------------------------------- // sub ressources ..................... diff --git a/svx/source/outliner/outliner.hrc b/svx/source/outliner/outliner.hrc index 3ab5857d73..1b60bf32f5 100644 --- a/svx/source/outliner/outliner.hrc +++ b/svx/source/outliner/outliner.hrc @@ -31,7 +31,7 @@ #define _OUTLINER_HRC #ifndef _SOLAR_HRC -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #endif #ifndef RID_OUTL_START diff --git a/svx/source/src/app.hrc b/svx/source/src/app.hrc index c79b34447e..60b5197257 100644 --- a/svx/source/src/app.hrc +++ b/svx/source/src/app.hrc @@ -39,7 +39,7 @@ // include --------------------------------------------------------------- -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include <sfx2/sfxsids.hrc> // Ranges ---------------------------------------------------------------- diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index fa77d3ff10..37366c4f36 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -52,7 +52,7 @@ #include <svx/svdattrx.hxx> #include <svx/svdpool.hxx> -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include "xmlcnitm.hxx" #include <svx/svxids.hrc> diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 153dad3ca5..162d3522e6 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -36,7 +36,7 @@ #include <svtools/accessibilityoptions.hxx> #include <svx/svdedxv.hxx> -#include <vcl/solar.hrc> +#include <svl/solar.hrc> //#include <tools/string.h> #include <svl/itemiter.hxx> diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 1008a469a5..7f2dde332a 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -73,7 +73,7 @@ #include <svtools/transfer.hxx> #include <cppuhelper/implbase5.hxx> -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include <svl/urihelper.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index 5337dd864f..0d8df75d8d 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -38,7 +38,7 @@ #include <tools/poly.hxx> #include <vcl/virdev.hxx> #include <vcl/wrkwin.hxx> -#include <vcl/solar.hrc> +#include <svl/solar.hrc> #include <sfx2/docfile.hxx> #include <sfx2/app.hxx> #include "svx/impgrf.hxx" diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc index 3e33915cd0..de76cced22 100644 --- a/uui/source/ids.hrc +++ b/uui/source/ids.hrc @@ -32,7 +32,7 @@ #define UUI_IDS_HRC #ifndef _SOLAR_HRC -#include "vcl/solar.hrc" +#include "svl/solar.hrc" #endif #ifndef _ERRCODE_HXX #include "tools/errcode.hxx" |