From c0835b075cbd5bd943c303545c4af94c1e9660e6 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Thu, 14 Jan 2010 22:27:44 +0100 Subject: undo previous erroneous change, solar.hrc belongs to svl instead vcl now --- avmedia/inc/helpids.hrc | 2 +- avmedia/source/framework/mediamisc.cxx | 2 +- basic/inc/pch/precompiled_basic.hxx | 2 +- basic/inc/sb.hrc | 2 +- basic/source/app/dialogs.cxx | 2 +- basic/source/runtime/basrdll.cxx | 2 +- desktop/source/app/desktop.hrc | 2 +- desktop/source/inc/helpid.hrc | 2 +- formula/inc/helpids.hrc | 2 +- formula/source/core/inc/core_resource.hrc | 2 +- formula/source/core/resource/core_resource.cxx | 2 +- formula/source/ui/inc/ForResId.hrc | 2 +- formula/source/ui/resource/ModuleHelper.cxx | 2 +- framework/inc/framework.hrc | 2 +- framework/inc/helpid.hrc | 2 +- framework/inc/pch/precompiled_framework.hxx | 2 +- framework/source/services/backingcomp.cxx | 2 +- framework/source/uielement/controlmenucontroller.cxx | 2 +- sfx2/inc/pch/precompiled_sfx2.hxx | 2 +- sfx2/inc/sfx2/cntids.hrc | 2 +- sfx2/inc/sfx2/sfx.hrc | 2 +- sfx2/inc/sfx2/sfxsids.hrc | 2 +- sfx2/source/inc/helpid.hrc | 2 +- svx/inc/fmhelp.hrc | 2 +- svx/inc/helpid.hrc | 2 +- svx/inc/svx/svdattr.hxx | 2 +- svx/inc/svx/svdhdl.hxx | 2 +- svx/inc/svx/svdundo.hxx | 2 +- svx/inc/svx/svxids.hrc | 2 +- svx/inc/svx/svxitems.hrc | 2 +- svx/source/dialog/dialmgr.cxx | 2 +- svx/source/editeng/editdbg.hxx | 2 +- svx/source/editeng/editeng.hrc | 2 +- svx/source/editeng/eerdll.cxx | 2 +- svx/source/gallery2/galmisc.cxx | 2 +- svx/source/inc/fmresids.hrc | 2 +- svx/source/outliner/outliner.hrc | 2 +- svx/source/src/app.hrc | 2 +- svx/source/svdraw/svdattr.cxx | 2 +- svx/source/svdraw/svdedxv.cxx | 2 +- svx/source/svdraw/svdoole2.cxx | 2 +- svx/source/xoutdev/_xoutbmp.cxx | 2 +- uui/source/ids.hrc | 2 +- 43 files changed, 43 insertions(+), 43 deletions(-) diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc index 6f12579ec41d..2e51b0500441 100644 --- a/avmedia/inc/helpids.hrc +++ b/avmedia/inc/helpids.hrc @@ -31,7 +31,7 @@ #ifndef _AVMEDIA_HELPIDS_HRC #define _AVMEDIA_HELPIDS_HRC -#include +#include #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 a8f59bdfa65b..367ad725fa9a 100644 --- a/avmedia/source/framework/mediamisc.cxx +++ b/avmedia/source/framework/mediamisc.cxx @@ -29,7 +29,7 @@ ************************************************************************/ #include -#include +#include #include namespace avmedia { diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx index 505705bd5ad9..f1c120b2618f 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 83b7897110e9..89db04cef511 100644 --- a/basic/inc/sb.hrc +++ b/basic/inc/sb.hrc @@ -31,7 +31,7 @@ #ifndef _SB_HRC #define _SB_HRC -#include +#include #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 8536ac087383..00eba2fbac6c 100644 --- a/basic/source/app/dialogs.cxx +++ b/basic/source/app/dialogs.cxx @@ -66,7 +66,7 @@ // Ohne Includeschutz #include -#include +#include #include diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx index 69d4530885d0..a13569ee0a9f 100644 --- a/basic/source/runtime/basrdll.cxx +++ b/basic/source/runtime/basrdll.cxx @@ -32,7 +32,7 @@ #include "precompiled_basic.hxx" #include #include -#include +#include #include #include diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc index 81e351a68a3a..81110d665868 100644 --- a/desktop/source/app/desktop.hrc +++ b/desktop/source/app/desktop.hrc @@ -32,7 +32,7 @@ #define _DESKTOP_HRC_ #ifndef _SOLAR_HRC -#include +#include #endif #define RID_DESKTOP_DIALOG_START 2000 diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc index e6263609f8bd..c6c18e4bfc01 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 d5b838b89c42..9eebceec0482 100644 --- a/formula/inc/helpids.hrc +++ b/formula/inc/helpids.hrc @@ -31,7 +31,7 @@ #define FORMULA_HELPID_HRC #ifndef _SOLAR_HRC -#include // HID_FORMULA_START +#include // 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 ea2dc8b6aa58..ee82732ae119 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 +#include //------------------------------------------------------------------------------ #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 24ce35d36423..6663a9470a2e 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 -#include +#include //......................................................................... namespace formula diff --git a/formula/source/ui/inc/ForResId.hrc b/formula/source/ui/inc/ForResId.hrc index 70a257d9ade3..472564d9f229 100644 --- a/formula/source/ui/inc/ForResId.hrc +++ b/formula/source/ui/inc/ForResId.hrc @@ -34,7 +34,7 @@ // include ----------------------------------------------------------- #ifndef _SOLAR_HRC -#include +#include #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 6e91e1150a01..d1bc06c36ace 100644 --- a/formula/source/ui/resource/ModuleHelper.cxx +++ b/formula/source/ui/resource/ModuleHelper.cxx @@ -37,7 +37,7 @@ #include #include #ifndef _SOLAR_HRC -#include +#include #endif #define EXPAND_PROTOCOL "vnd.sun.star.expand:" diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc index 85b3a8e77144..57fb2e94b07a 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 af67b8674180..6195a6372452 100644 --- a/framework/inc/helpid.hrc +++ b/framework/inc/helpid.hrc @@ -32,7 +32,7 @@ // include ------------------------------------------------------------------ -#include +#include // Help-Ids ----------------------------------------------------------------- diff --git a/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx index 79f25b6211a7..fd211dd81ee9 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 267bc5a2c883..7f190a678763 100644 --- a/framework/source/services/backingcomp.cxx +++ b/framework/source/services/backingcomp.cxx @@ -75,7 +75,7 @@ #include #ifndef _SOLAR_HRC -#include +#include #endif #include #include diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index ae00f02423e9..caa356d850fa 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -62,7 +62,7 @@ #include #include #ifndef _SOLAR_HRC -#include +#include #endif #include #include diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx index 104f8aa2305f..0af35427d855 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 35a983fa995a..7351672f13ae 100644 --- a/sfx2/inc/sfx2/cntids.hrc +++ b/sfx2/inc/sfx2/cntids.hrc @@ -36,7 +36,7 @@ #endif #ifndef _SOLAR_HRC -#include +#include #endif // Slot-ID's ----------------------------------------------------------------- diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc index 014a7d984de3..9bba3997a71f 100644 --- a/sfx2/inc/sfx2/sfx.hrc +++ b/sfx2/inc/sfx2/sfx.hrc @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #ifndef _SOLAR_HRC -#include +#include #endif #ifndef _MEMBERID_HRC diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc index 12f5442f1511..bcbb39c96638 100644 --- a/sfx2/inc/sfx2/sfxsids.hrc +++ b/sfx2/inc/sfx2/sfxsids.hrc @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #ifndef _SOLAR_HRC -#include +#include #endif #define SID_SFX_START 5000 diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc index 9aa4f3d8d29c..b8beacafee3a 100644 --- a/sfx2/source/inc/helpid.hrc +++ b/sfx2/source/inc/helpid.hrc @@ -32,7 +32,7 @@ // include ------------------------------------------------------------------ -#include +#include // Help-Ids ----------------------------------------------------------------- diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc index 86b24d35e452..ef445ab11f82 100644 --- a/svx/inc/fmhelp.hrc +++ b/svx/inc/fmhelp.hrc @@ -31,7 +31,7 @@ #define _SVX_FMHELP_HRC // include ----------------------------------------------------------- -#include +#include // in solar.hrc //#define HID_FORMS_START (HID_LIB_START+4000) diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc index 899e12a10048..bc36634e24c3 100644 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpid.hrc @@ -31,7 +31,7 @@ #define _SVX_HELPID_HRC // include --------------------------------------------------------------- -#include +#include #include diff --git a/svx/inc/svx/svdattr.hxx b/svx/inc/svx/svdattr.hxx index ab3980b049ef..6149916f0d6c 100644 --- a/svx/inc/svx/svdattr.hxx +++ b/svx/inc/svx/svdattr.hxx @@ -32,7 +32,7 @@ #define _SVDATTR_HXX #ifndef _SOLAR_HRC -#include +#include #endif #include #include diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx index 402b7c77d9c7..8d7d4552ea6c 100644 --- a/svx/inc/svx/svdhdl.hxx +++ b/svx/inc/svx/svdhdl.hxx @@ -39,7 +39,7 @@ #include #ifndef _SOLAR_HRC -#include +#include #endif #include diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx index db7ab0191465..803b454a6f0c 100644 --- a/svx/inc/svx/svdundo.hxx +++ b/svx/inc/svx/svdundo.hxx @@ -32,7 +32,7 @@ #define _SVDUNDO_HXX #ifndef _SOLAR_HRC -#include +#include #endif #include #include diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc index f4985c76ea0f..5c541b3b24dd 100644 --- a/svx/inc/svx/svxids.hrc +++ b/svx/inc/svx/svxids.hrc @@ -32,7 +32,7 @@ // include ------------------------------------------------------------------ #include -#include +#include #include #include diff --git a/svx/inc/svx/svxitems.hrc b/svx/inc/svx/svxitems.hrc index b9850ee3fc2f..5d554cf67ebf 100644 --- a/svx/inc/svx/svxitems.hrc +++ b/svx/inc/svx/svxitems.hrc @@ -33,7 +33,7 @@ // include ------------------------------------------------------------------ #ifndef _SOLAR_HRC -#include +#include #endif // BOOL --------------------------------------------------------------------- diff --git a/svx/source/dialog/dialmgr.cxx b/svx/source/dialog/dialmgr.cxx index 0ea6e49d396f..574a68a6ce91 100644 --- a/svx/source/dialog/dialmgr.cxx +++ b/svx/source/dialog/dialmgr.cxx @@ -39,7 +39,7 @@ #include #include -#include +#include #include static ResMgr* pResMgr=0; diff --git a/svx/source/editeng/editdbg.hxx b/svx/source/editeng/editdbg.hxx index 3a8f5e59fc85..e75a0baef217 100644 --- a/svx/source/editeng/editdbg.hxx +++ b/svx/source/editeng/editdbg.hxx @@ -31,7 +31,7 @@ #ifndef _EDITDBG_HXX #define _EDITDBG_HXX -#include +#include #include #include diff --git a/svx/source/editeng/editeng.hrc b/svx/source/editeng/editeng.hrc index 043575f1aa12..280c90f66341 100644 --- a/svx/source/editeng/editeng.hrc +++ b/svx/source/editeng/editeng.hrc @@ -31,7 +31,7 @@ #define _EDITENG_HRC #ifndef _SOLAR_HRC -#include +#include #endif #define RID_EDITUNDO_DEL ( RID_EDIT_START + 0 ) diff --git a/svx/source/editeng/eerdll.cxx b/svx/source/editeng/eerdll.cxx index f83854c939cd..fb715925546c 100644 --- a/svx/source/editeng/eerdll.cxx +++ b/svx/source/editeng/eerdll.cxx @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 85fb240694b6..bbf0771c65de 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/inc/fmresids.hrc b/svx/source/inc/fmresids.hrc index 74076801cf0b..67cb5d36e5bb 100644 --- a/svx/source/inc/fmresids.hrc +++ b/svx/source/inc/fmresids.hrc @@ -31,7 +31,7 @@ #define _SVX_FMRESIDS_HRC // include ----------------------------------------------------------- -#include +#include // unnamed ressources ------------------------------------------------------- // sub ressources ..................... diff --git a/svx/source/outliner/outliner.hrc b/svx/source/outliner/outliner.hrc index 271e7670bf85..36c5f1728fcd 100644 --- a/svx/source/outliner/outliner.hrc +++ b/svx/source/outliner/outliner.hrc @@ -31,7 +31,7 @@ #define _OUTLINER_HRC #ifndef _SOLAR_HRC -#include +#include #endif #ifndef RID_OUTL_START diff --git a/svx/source/src/app.hrc b/svx/source/src/app.hrc index 82ac350c55db..2c4e03a5d181 100644 --- a/svx/source/src/app.hrc +++ b/svx/source/src/app.hrc @@ -39,7 +39,7 @@ // include --------------------------------------------------------------- -#include +#include #include // Ranges ---------------------------------------------------------------- diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index dcbb4cfc483f..356546e409a0 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -52,7 +52,7 @@ #include #include -#include +#include #include "xmlcnitm.hxx" #include diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 2e6d86b7ad21..e3d2f3390201 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -36,7 +36,7 @@ #include #include -#include +#include //#include #include diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 97d50113a332..67505e12ba73 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -73,7 +73,7 @@ #include #include -#include +#include #include #include #include diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index aeded47008b2..0eda2eeb375f 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include "svx/impgrf.hxx" diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc index b6d05a27b0c6..a9960a58e3f2 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" -- cgit