Commits

Anonymous committed accbde9

undo previous erroneous change, solar.hrc belongs to svl instead vcl now

Comments (0)

Files changed (128)

avmedia/inc/helpids.hrc

 #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)

avmedia/source/framework/mediamisc.cxx

  ************************************************************************/
 
 #include <tools/resmgr.hxx>
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #include <vcl/svapp.hxx>
 
 namespace avmedia {

basctl/inc/helpid.hrc

 
 // include ---------------------------------------------------------------
 
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 
 // Help-Ids --------------------------------------------------------------
 

basctl/source/basicide/brkdlg.hrc

 #ifndef _BRKDLG_HRC
 #define _BRKDLG_HRC
 
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 
 #define RID_BASICIDE_BREAKPOINTDLG		( RID_BASICIDE_START + 80 )
 

basctl/source/basicide/iderdll.cxx

 #include <sfx2/genlink.hxx>
 
 
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #include <iderdll.hxx>
 #include <iderdll2.hxx>
 #include <iderid.hxx>

basctl/source/basicide/macrodlg.hrc

 #ifndef _MACRODLG_HRC
 #define _MACRODLG_HRC
 
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 
 #define RID_MACROCHOOSER				( RID_BASICIDE_START + 50 )
 #define RID_STR_BTNDEL					( RID_BASICIDE_START + 51 )

basctl/source/basicide/moduldlg.hrc

 #ifndef _MODULDLG_HRC
 #define _MODULDLG_HRC
 
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 
 #define RID_STR_LIB				1
 #define RID_TRLBOX				2

basctl/source/basicide/moptions.hrc

 #ifndef _MOPTIONS_HRC
 #define _MOPTIONS_HRC
 
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 
 #define RID_MACROOPTIONS		( RID_BASICIDE_START + 55 )
 

basctl/source/basicide/objdlg.hrc

 #ifndef _OBJDLG_HRC
 #define _OBJDLG_HRC
 
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 
 #define RID_BASICIDE_OBJCAT		( RID_BASICIDE_START + 70 )
 #define RID_FT_MACRODESCR   8

basctl/source/basicide/tbxctl.hrc

  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 
 #define RID_TBXCONTROLS			( RID_BASICIDE_START + 65 )
 #define RID_TOOLBOX				( RID_BASICIDE_START + 66 )

basctl/source/inc/dlgresid.hrc

 
 // include	   -----------------------------------------------------------
 
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 
 // Dialog Control Id's -----------------------------------------------------------
 

basic/inc/pch/precompiled_basic.hxx

 #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"
 #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

basic/source/app/dialogs.cxx

 
 // Ohne Includeschutz
 #include <svtools/svtdata.hxx>
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 
 
 #include <basic/dispdefs.hxx>

basic/source/runtime/basrdll.cxx

 #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>
 

chart2/source/controller/dialogs/Bitmaps.hrc

 #define CHART_BITMAPS_HRC
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #ifndef STD_MASKCOLOR

chart2/source/controller/dialogs/Bitmaps_HC.hrc

  *
  ************************************************************************/
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 // RID_SCH_START is 30512 (see svl/solar.hrc)

chart2/source/controller/inc/HelpIds.hrc

 #ifndef CHART_HELPIDS_HRC
 #define CHART_HELPIDS_HRC
 
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 //next is 120
 
 //see old chart: schhids.h

chart2/source/inc/Strings.hrc

 #define CHART_STRINGS_HRC
 
 // this includes no link dependency
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 
 //next free is 290
 //single free is: 134

cui/source/dialogs/scriptdlg.hrc

 #ifndef _SCRIPTDLG_HRC
 #define _SCRIPTDLG_HRC
 
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 
 #define SCRIPTDLG_OFFSET		400
 

cui/source/dialogs/svuidlg.hrc

  *
  ************************************************************************/
 
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #include <helpid.hrc>
 
 #define TB_LINKS                32014

cui/source/options/connpooloptions.hxx

 #ifndef _OFFAPP_CONNPOOLOPTIONS_HXX_
 #define _OFFAPP_CONNPOOLOPTIONS_HXX_
 
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #include <sfx2/tabdlg.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>

dbaccess/inc/dbaccess_helpid.hrc

 #define _DBA_DBACCESS_HELPID_HRC_
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>	// HID_DBACCESS_START
+#include <svl/solar.hrc>	// HID_DBACCESS_START
 #endif
 
 #define HID_DSADMIN_CHARSET							(HID_DBACCESS_START +  9)

dbaccess/inc/pch/precompiled_dbaccess.hxx

 #include "svtools/miscopt.hxx"
 #include "svtools/rtfkeywd.hxx"
 #include "svtools/rtftoken.h"
-#include "vcl/solar.hrc"
+#include "svl/solar.hrc"
 #include "svtools/toolboxcontroller.hxx"
 #include "unotools/viewoptions.hxx"
 

dbaccess/source/core/inc/core_resource.hrc

 #define _DBA_CORE_RESOURCE_HRC_
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 //------------------------------------------------------------------------------

dbaccess/source/core/resource/core_resource.cxx

 //---------------------------------------------------
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 //.........................................................................

dbaccess/source/ext/adabas/Acomponentmodule.cxx

 #include <tools/resmgr.hxx>
 #endif
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 #ifndef _COMPHELPER_SEQUENCE_HXX_
 #include <comphelper/sequence.hxx>

dbaccess/source/ext/adabas/adabasui_resource.hrc

 #define _ADABASUI_RESOURCE_HRC_
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #define RID_DIALOG_START				RID_DB_EXTENSIONS_START

dbaccess/source/ext/macromigration/dbmm_global.hrc

 #ifndef DBACCESS_DBMM_GLOBAL_HRC
 #define DBACCESS_DBMM_GLOBAL_HRC
 
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 
 //=====================================================================
 //= bases

dbaccess/source/sdbtools/inc/sdbt_resource.hrc

 #define DBACCESS_SDBT_RESOURCE_HRC
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 //------------------------------------------------------------------------------

dbaccess/source/ui/inc/dbu_resource.hrc

 #define _DBU_RESOURCE_HRC_
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #define RID_DIALOG_START				RID_DBACCESS_START

dbaccess/source/ui/misc/moduledbu.cxx

 #include <tools/resmgr.hxx>
 #endif
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 #ifndef _TOOLS_DEBUG_HXX
 #include <tools/debug.hxx>

desktop/source/app/desktop.hrc

 #define _DESKTOP_HRC_
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #define RID_DESKTOP_DIALOG_START			2000

desktop/source/inc/helpid.hrc

 #if ! defined INCLUDED_DESKTOP_HELPID_HRC
 #define INCLUDED_DESKTOP_HELPID_HRC
 
-#include "vcl/solar.hrc"
+#include "svl/solar.hrc"
 
 #define HID_GLOBAL_FALLBACK                         0xFFFFFFFF
 

extensions/inc/extensio.hrc

 #ifndef EXTENSIONS_INC_EXTENSIO_HRC
 #define EXTENSIONS_INC_EXTENSIO_HRC
 
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 
 // -----------------------------------------------------------------------
 // - resource id ranges

extensions/source/bibliography/menu.src

  *
  ************************************************************************/
 
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #include <svx/svxids.hrc>
 #ifndef _GLOBLMN_HRC
 #include <svx/globlmn.hrc>

extensions/source/inc/componentmodule.cxx

 #include "componentmodule.hxx"
 #include <tools/resmgr.hxx>
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 #include <comphelper/sequence.hxx>
 #include <tools/debug.hxx>

filter/inc/filter.hrc

 
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 // Help-Ids --------------------------------------------------------------

filter/source/flash/swfdialog.cxx

 #include "impswfdialog.hxx" 
 #include <vcl/svapp.hxx>
 #include <vcl/dialog.hxx>
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #include <com/sun/star/view/XRenderable.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>

filter/source/pdf/pdfdialog.cxx

 #include "impdialog.hxx" 
 #include <vcl/svapp.hxx>
 #include <vcl/dialog.hxx>
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #include <com/sun/star/view/XRenderable.hpp>
 
 using namespace ::rtl;

filter/source/pdf/pdfexport.cxx

 #include <unotools/processfactory.hxx>
 #include <svtools/FilterConfigItem.hxx>
 #include <svtools/filter.hxx>
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #include <comphelper/string.hxx>
 
 #include <unotools/saveopt.hxx> // only for testing of relative saving options in PDF

filter/source/xsltdialog/xmlfilterdialogcomponent.cxx

 #include <tools/resmgr.hxx>
 #include <vcl/svapp.hxx>
 
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 
 #include "xmlfiltersettingsdialog.hxx"
 

forms/inc/pch/precompiled_forms.hxx

 #include "unotools/lingucfg.hxx"
 #include "svl/numuno.hxx"
 #include "svl/poolitem.hxx"
-#include "vcl/solar.hrc"
+#include "svl/solar.hrc"
 #include "svtools/transfer.hxx"
 
 #include "svx/editdata.hxx"

forms/source/inc/frm_resource.hrc

 #define _FRM_RESOURCE_HRC_
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 //------------------------------------------------------------------------------

forms/source/resource/frm_resource.cxx

 //---------------------------------------------------
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 //.........................................................................

formula/inc/helpids.hrc

 #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)

formula/source/core/inc/core_resource.hrc

 #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

formula/source/core/resource/core_resource.cxx

 
 // ---- needed as long as we have no contexts for components ---
 #include <vcl/svapp.hxx>
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 
 //.........................................................................
 namespace formula

formula/source/ui/inc/ForResId.hrc

 // include	   -----------------------------------------------------------
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #define RID_DIALOG_START				RID_FORMULA_START

formula/source/ui/resource/ModuleHelper.cxx

 #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:"

framework/inc/framework.hrc

 #ifndef _FRAMEWORK_HRC
 #define _FRAMEWORK_HRC
 
-#include "vcl/solar.hrc"
+#include "svl/solar.hrc"
 
 #define RID_FWK_START				260
 

framework/inc/helpid.hrc

 
 // include ------------------------------------------------------------------
 
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 
 // Help-Ids -----------------------------------------------------------------
 

framework/inc/pch/precompiled_framework.hxx

 #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"

framework/source/services/backingcomp.cxx

 #include <rtl/ustrbuf.hxx>
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 #include <svl/urihelper.hxx>
 #include <osl/file.hxx>

framework/source/uielement/controlmenucontroller.cxx

 #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>

goodies/inc/goodies.hrc

 #define _GOODIES_HRC
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 // Dialoge ---------------------------------------------------------------

goodies/inc/pch/precompiled_goodies.hxx

 #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"
 

goodies/source/filter.vcl/egif/egif.cxx

 #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"

goodies/source/filter.vcl/eos2met/eos2met.cxx

 #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"
 

goodies/source/filter.vcl/epbm/epbm.cxx

 #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"

goodies/source/filter.vcl/epgm/epgm.cxx

 #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"

goodies/source/filter.vcl/epict/epict.cxx

 
 #include <vcl/metaact.hxx>
 #include <svtools/filter.hxx>
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #include <svtools/fltcall.hxx>
 
 #include <math.h>

goodies/source/filter.vcl/eppm/eppm.cxx

 #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"

goodies/source/filter.vcl/eps/eps.cxx

 #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>

goodies/source/filter.vcl/etiff/etiff.cxx

 #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>
 

goodies/source/filter.vcl/ipcd/ipcd.cxx

 #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 ==================================

goodies/source/inv/invader.cxx

 #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>

goodies/source/unographic/provider.cxx

 #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>

goodies/source/unographic/transformer.cxx

 #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>

reportdesign/inc/RptResId.hrc

 // include	   -----------------------------------------------------------
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #define RID_DIALOG_START				RID_RPT_START

reportdesign/inc/helpids.hrc

 #define RTPUI_REPORTDESIGN_HELPID_HRC
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>	// HID_RPT_DBACCESS_START
+#include <svl/solar.hrc>	// HID_RPT_DBACCESS_START
 #endif
 
 #define UID_RPT_RPT_APP_VIEW		(HID_RPT_START +  0)

reportdesign/source/core/inc/core_resource.hrc

 #define REPORTDESIGN_CORE_RESOURCE_HRC_
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 //------------------------------------------------------------------------------

reportdesign/source/core/resource/core_resource.cxx

 #include <rtl/uri.hxx>
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 #include "ModuleHelper.hxx"
 //.........................................................................

reportdesign/source/core/sdr/ModuleHelper.cxx

 #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:"

reportdesign/source/ui/dlg/Navigator.cxx

 #include "cppuhelper/basemutex.hxx"
 #include "comphelper/SelectionMultiplex.hxx"
 #include <svtools/svtreebx.hxx>
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #include "ReportVisitor.hxx"
 #include "ModuleHelper.hxx"
 #include <rtl/ref.hxx>

reportdesign/source/ui/dlg/Navigator.src

 #ifndef _SBASLTID_HRC
 #include <svx/svxids.hrc>
 #endif
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 
 #define RID_SVXIMG_COLLAPSEDNODE					(RID_FORMS_START + 2)
 #define RID_SVXIMG_EXPANDEDNODE						(RID_FORMS_START + 3)

sc/inc/pch/precompiled_sc.hxx

 #include <svl/listener.hxx>
 #include <svl/lstner.hxx>
 #include <unotools/pathoptions.hxx>
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #include <unotools/useroptions.hxx>
 #include <svx/editobj.hxx>
 #include <svx/eeitem.hxx>

sc/source/core/inc/core_pch.hxx

 #include <svl/lstner.hxx>
 #include <svl/poolitem.hxx>
 #include <tools/time.hxx>
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #include <tools/date.hxx>
 #include <svl/brdcst.hxx>
 #include <svx/svxids.hrc>

sc/source/filter/inc/filt_pch.hxx

 #include <markarr.hxx>
 #include <root.hxx>
 #include <flttypes.hxx>
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #include <sfx2/sfxsids.hrc>
 #include <svl/cntwids.hrc>
 #include <sfx2/cntids.hrc>

sc/source/ui/inc/ui_pch.hxx

 
 #include <tools/solar.h>
 #include <tools/string.hxx>
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #include <tools/rtti.hxx>
 #include <string.h>
 #include <tools/contnr.hxx>
  *
  ************************************************************************/
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #define HID_SD_PRINT_OPTIONS       (HID_SD_START + 0)

sd/inc/pch/precompiled_sd.hxx

 #include "svl/slstitm.hxx"
 #include "svl/smplhint.hxx"
 #include "svtools/soerr.hxx"
-#include "vcl/solar.hrc"
+#include "svl/solar.hrc"
 #include "svtools/sores.hxx"
 #include "svtools/stdctrl.hxx"
 #include "svl/stritem.hxx"

sfx2/inc/pch/precompiled_sfx2.hxx

 #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"

sfx2/inc/sfx2/cntids.hrc

 #endif
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 // Slot-ID's -----------------------------------------------------------------

sfx2/inc/sfx2/sfx.hrc

 // include ---------------------------------------------------------------
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #ifndef _MEMBERID_HRC

sfx2/inc/sfx2/sfxsids.hrc

 // include ---------------------------------------------------------------
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #define SID_SFX_START                5000

sfx2/source/inc/helpid.hrc

 
 // include ------------------------------------------------------------------
 
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 
 // Help-Ids -----------------------------------------------------------------
 

soldep/source/depapp.hxx

 #define EVENT_RESIZE                0x00000001
 
 
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #include <tools/resmgr.hxx>
 #include <bootstrp/sstring.hxx>
 #include <vcl/event.hxx>

starmath/inc/starmath.hrc

 #define _STARMATH_HRC
 
 #ifndef _SVX_SVXIDS_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 #ifndef _SFXSIDS_HRC //autogen
 #include <sfx2/sfxsids.hrc>

starmath/source/math_pch.cxx

 #include <sfx2/sfxsids.hrc>
 #include <chaos/cntids.hrc>
 #include <svl/cntwids.hrc>
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #include <svl/lstner.hxx>
 #include <starmath.hrc>
 #include <basic/sbx.hxx>

svl/inc/svl/solar.hrc

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2009 by Sun Microsystems, Inc.
+ *
+ * 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 _SOLAR_HRC
+#define _SOLAR_HRC
+
+// defines ------------------------------------------------------------------
+
+#define CREATERESMGR_NAME( Name )   #Name 
+#define CREATERESMGR( Name )        ResMgr::CreateResMgr( CREATERESMGR_NAME( Name ) )
+
+#define RID_SFX_START               260
+#define RID_SFX_END                 9999
+
+#define RID_LIB_START               10000
+#define RID_LIB_END                 19999
+
+#define RID_SVX_START               (RID_LIB_START)
+#define RID_SVX_END                 (RID_LIB_START+499)
+
+#define RID_SBASIC_START            (RID_LIB_START+500)
+#define RID_SBASIC_END              (RID_LIB_START+2999)
+
+#define RID_BASIC_START             (RID_LIB_START+3000)
+#define RID_BASIC_END               (RID_LIB_START+4499)
+
+#define RID_UUI_START				(RID_LIB_START+4500)
+#define RID_UUI_END					(RID_LIB_START+4599)
+
+#define RID_HELP_START              (RID_LIB_START+4600)
+#define RID_HELP_END                (RID_LIB_START+4799)
+
+#define RID_MAIL_START              (RID_LIB_START+4800)
+#define RID_MAIL_END                (RID_LIB_START+4849)
+
+#define RID_BASICIDE_START          (RID_LIB_START+4850)
+#define RID_BASICIDE_END            (RID_LIB_START+4949)
+
+#define RID_SVXITEMS_START          (RID_LIB_START+4950)
+#define RID_SVXITEMS_END            (RID_LIB_START+5599)
+
+#define RID_SBA_START               (RID_LIB_START+5600)
+#define RID_SBA_END                 (RID_LIB_START+5649)
+
+#define RID_ISETBRW_START           (RID_LIB_START+5650)
+#define RID_ISETBRW_END             (RID_LIB_START+5699)
+
+#define RID_EXTENSIONS_START        (RID_LIB_START+5700)
+#define RID_EXTENSIONS_END          (RID_LIB_START+5799)
+
+#define RID_EDIT_START              (RID_LIB_START+5800)
+#define RID_EDIT_END                (RID_LIB_START+5899)
+
+#define RID_EDIT_START              (RID_LIB_START+5800)
+#define RID_EDIT_END                (RID_LIB_START+5899)
+
+#define RID_OUTL_START              (RID_LIB_START+5900)
+#define RID_OUTL_END                (RID_LIB_START+5919)
+
+#define RID_SVTOOLS_START           (RID_LIB_START+5920)
+#define RID_SVTOOLS_END             (RID_LIB_START+5999)
+
+#define RID_INET_START              (RID_LIB_START+6000)
+#define RID_INET_END                (RID_LIB_START+6059)
+
+#define RID_SO2_START               (RID_LIB_START+6060)
+#define RID_SO2_END                 (RID_LIB_START+6099)
+
+#define RID_GOODIES_START           (RID_LIB_START+6100)
+#define RID_GOODIES_END             (RID_LIB_START+6149)
+
+#define RID_SJ_START                (RID_LIB_START+6150)
+#define RID_SJ_END                  (RID_LIB_START+6199)
+
+#define RID_SI_START                (RID_LIB_START+6200)
+#define RID_SI_END                  (RID_LIB_START+6399)
+
+#define RID_DLG_START               (RID_LIB_START+6400)
+#define RID_DLG_END                 (RID_LIB_START+6499)
+
+#define RID_OFA_START               (RID_LIB_START+6500)
+#define RID_OFA_END                 (RID_LIB_START+6999)
+
+#define RID_CHANNEL_START           (RID_LIB_START+7000)
+#define RID_CHANNEL_END             (RID_LIB_START+7499)
+
+#define RID_CHAOS_START             (RID_LIB_START+7500)
+#define RID_CHAOS_END               (RID_LIB_START+7999)
+
+#define RID_FORMS_START             (RID_LIB_START+8000)
+#define RID_FORMS_END               (RID_LIB_START+8999)
+
+#define RID_FORMLAYER_START			(RID_LIB_START+9000)
+#define RID_FORMLAYER_END			(RID_LIB_START+9199)
+
+#define RID_DBACCESS_START			(RID_LIB_START+9200)
+#define RID_DBACCESS_END			(RID_LIB_START+9699)
+
+#define RID_MORE_EXTENSIONS_START	(RID_LIB_START+9700)
+#define RID_MORE_EXTENSIONS_END		(RID_LIB_START+9999)
+
+#define RID_DB_EXTENSIONS_START		(RID_LIB_START+10000)
+#define RID_DB_EXTENSIONS_END		(RID_LIB_START+10199)
+
+#define RID_FILTER_START			(RID_LIB_START+10200)
+#define RID_FILTER_END				(RID_LIB_START+10299)
+
+// do *NOT* add more ranges here, RID_LIB_END is (RID_LIB_START + 10000)
+
+#define RID_APP_START               20000
+#define RID_APP_END                 31999
+
+#define RID_SW_START                            (20000)
+#define RID_SW_END                              (25999)
+
+#define RID_SC_START                            (26000)
+#define RID_SC_END                              (26999)
+
+#define RID_SD_START                            (27000)
+#define RID_SD_END                              (27999)
+
+#define RID_OBJ_START               (30000)
+#define RID_OBJ_END                 (32767)
+
+#define RID_SIM_START                           (RID_OBJ_START+   0)
+#define RID_SIM_END                             (RID_OBJ_START+ 255)
+
+#define RID_SMA_START                           (RID_OBJ_START+ 256)
+#define RID_SMA_END                             (RID_OBJ_START+ 511)
+
+#define RID_SCH_START                           (RID_OBJ_START+ 512)
+#define RID_SCH_END                             (RID_OBJ_START+ 767)
+
+#define RID_RPT_START							(RID_OBJ_START+768)
+#define RID_RPT_END								(RID_OBJ_START+1000)
+
+#define RID_FORMULA_START						(RID_OBJ_START+1001)
+#define RID_FORMULA_END							(RID_OBJ_START+1200)
+// Help-Ids --------------------------------------------------------------
+
+#define HID_OK_BUTTON               0
+#define HID_CANCEL_BUTTON           0
+#define HID_HELP_BUTTON             0
+
+#define HID_START                   32768
+
+#define HID_VCL_START               (HID_START+100)
+#define HID_VCL_END                 (HID_START+150)
+
+#define HID_SVTOOLS_START			(HID_START+200)
+#define HID_SVTOOLS_END				(HID_START+299)
+
+#define HID_SFX_START               (HID_START+300)
+#define HID_SFX_END                 (HID_START+999)
+
+#define HID_LIB_START               (HID_START+1000)
+#define HID_LIB_END                 (HID_START+19999)
+
+#define HID_SVX_START               (HID_LIB_START)
+#define HID_SVX_END                 (HID_LIB_START+431)
+
+#define HID_WIZARD_START            (HID_LIB_START+432)
+#define HID_WIZARD_END              (HID_LIB_START+999)
+//please note: There is also HID_WIZARD2 below
+
+// FREE
+
+#define HID_CUI_START               (HID_LIB_START+1100)
+#define HID_CUI_END                 (HID_LIB_START+1699)
+
+#define HID_OFA_START               (HID_LIB_START+1760)
+#define HID_OFA_END                 (HID_LIB_START+1999)
+
+#define HID_HELP_START				(HID_LIB_START+2000)
+#define HID_HELP_END				(HID_LIB_START+2050)
+
+#define HID_CHAOS_START				(HID_LIB_START+2051)
+#define HID_CHAOS_END				(HID_LIB_START+2069)
+
+#define HID_UUI_START				(HID_LIB_START+2070)
+#define HID_UUI_END					(HID_LIB_START+2099)
+
+#define HID_GOODIES_START			(HID_LIB_START+2100)
+#define HID_GOODIES_END				(HID_LIB_START+2199)
+
+#if 0 // currently unused range
+#define HID_SCHEDULE_START          (HID_LIB_START+2200)
+#define HID_SCHEDULE_END            (HID_LIB_START+3399)
+#endif
+
+#define HID_CHANNEL_START           (HID_LIB_START+3400)
+#define HID_CHANNEL_END             (HID_LIB_START+3499)
+
+#define HID_SBA_START				(HID_LIB_START+ 3500)
+#define HID_SBA_END					(HID_LIB_START+ 3999)
+
+#define HID_FORMS_START				(HID_LIB_START+4000)
+#define HID_FORMS_END				(HID_LIB_START+4999)
+
+#define HID_DBACCESS_START			(HID_LIB_START+5000)
+#define HID_DBACCESS_END			(HID_LIB_START+5299)
+
+#define HID_PORTAL_START			(HID_LIB_START+5300)
+#define HID_PORTAL_END				(HID_LIB_START+5599)
+
+#define HID_PORTAL_ADMIN_START		(HID_LIB_START+5600)
+#define HID_PORTAL_ADMIN_END		(HID_LIB_START+5999)
+
+#define HID_SYNCACCESS_START        (HID_LIB_START+6000)
+#define HID_SYNCACCESS_END          (HID_LIB_START+6099)
+
+#define HID_SVX_EXT0_START			(HID_LIB_START+6100)
+#define HID_SVX_EXT0_END			(HID_LIB_START+6599)
+
+#define HID_FRAMEWORK_START         (HID_LIB_START+6600)
+#define HID_FRAMEWORK_END           (HID_LIB_START+6999)
+
+#define HID_WIZARD2_START           (HID_LIB_START+7000)
+#define HID_WIZARD2_END             (HID_LIB_START+8999)
+
+#define HID_DESKTOP_START           (HID_LIB_START+9000)
+#define HID_DESKTOP_END             (HID_LIB_START+9299)
+
+#define HID_XMLSECURITY_START       (HID_LIB_START+9300)
+#define HID_XMLSECURITY_END         (HID_LIB_START+9999)
+
+#define HID_APP_START               (HID_START+20000)
+#define HID_APP_END                 (HID_START+29999)
+
+#define HID_SW_START				(HID_START+20000)
+#define HID_SW_END					(HID_START+24999)
+
+#define HID_SC_START				(HID_START+25000)
+#define HID_SC_END					(HID_START+26999)
+
+#define HID_SD_START				(HID_START+27000)
+#define HID_SD_END					(HID_START+27999)
+
+#define HID_Sa_START				(HID_START+28000)
+#define HID_Sa_END					(HID_START+28999)
+
+#define HID_Sb_START				(HID_START+29000)
+#define HID_Sb_END					(HID_START+29999)
+
+#define HID_OBJ_START               (HID_START+30000)
+#define HID_OBJ_END                 (HID_START+32767)
+
+#define HID_CUI3_START				(HID_OBJ_START+   0)
+#define HID_CUI3_END				(HID_OBJ_START+ 239)
+
+#define HID_AVMEDIA_START			(HID_OBJ_START+ 240)
+#define HID_AVMEDIA_END				(HID_OBJ_START+ 255) 
+
+#define HID_SMA_START				(HID_OBJ_START+ 256)
+#define HID_SMA_END					(HID_OBJ_START+ 511)
+
+#define HID_SCH_START				(HID_OBJ_START+ 512)
+#define HID_SCH_END					(HID_OBJ_START+ 767)
+
+#define HID_BASICIDE_START			(HID_OBJ_START+ 768)
+#define HID_BASICIDE_END			(HID_OBJ_START+1023)
+
+#define HID_SMA2_START				(HID_OBJ_START+1024)
+#define HID_SMA2_END				(HID_OBJ_START+1280)
+
+#define HID_FILTER_START			(HID_OBJ_START+1281)
+#define HID_FILTER_END				(HID_OBJ_START+1580)
+
+#define HID_LICENSING_START			(HID_OBJ_START+1581)
+#define HID_LICENSING_END			(HID_OBJ_START+1680)
+
+#define HID_RPT_START               (HID_OBJ_START+1681)
+#define HID_RPT_END                 (HID_OBJ_START+2080)
+
+#define HID_FORMULA_START           (HID_OBJ_START+2081)
+#define HID_FORMULA_END             (HID_OBJ_START+2280)
+
+#define HID_EXTENSIONS_START	    (HID_OBJ_START+2281)
+#define HID_EXTENSIONS_END		    (HID_OBJ_START+2800)
+
+#endif
+

svl/inc/svl/svtools.hrc

 #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)

svtools/bmpmaker/bmp.cxx

 
 #include <vcl/svapp.hxx>
 
-#include "vcl/solar.hrc"
+#include "svl/solar.hrc"
 #include "filedlg.hxx"
 #include "bmpcore.hxx"
 #include "bmp.hrc"

svtools/bmpmaker/bmpsum.cxx

 #include <vcl/bmpacc.hxx>
 #include <vcl/pngread.hxx>
 
-#include "vcl/solar.hrc"
+#include "svl/solar.hrc"
 
 #define EXIT_NOERROR        0x00000000
 #define EXIT_INVALIDFILE    0x00000001

svtools/inc/svtools/helpid.hrc

 
 // include ---------------------------------------------------------------
 
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 
 // Help-Ids --------------------------------------------------------------
 

svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx

 #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"

svtools/source/filter.vcl/filter/filter.cxx

 #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"

svtools/source/plugapp/testtool.src

  *
  ************************************************************************/
 #include "testtool.hrc"
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 
 
 #define Control_Control	5

svtools/source/uno/unoifac2.hrc

 
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 //! Um den �berblick �ber alle benutzten HelpID's zu behalten sind diese

svtools/workben/unodialog/udlg_global.hrc

 #ifndef SVTOOLS_UDLG_GLOBAL_HRC
 #define SVTOOLS_UDLG_GLOBAL_HRC
 
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 
 //=====================================================================
 //= bases

svx/inc/fmhelp.hrc

 #define _SVX_FMHELP_HRC
 
 // include	   -----------------------------------------------------------
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 
 // in solar.hrc
 //#define HID_FORMS_START		 		(HID_LIB_START+4000)

svx/inc/helpid.hrc

 #define _SVX_HELPID_HRC
 // include ---------------------------------------------------------------
 
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 
 #include <svx/exthelpid.hrc>
 

svx/inc/svx/svdattr.hxx

 #define _SVDATTR_HXX
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 #include <tools/solar.h>
 #include <svx/sdangitm.hxx>

svx/inc/svx/svdhdl.hxx

 #include <tools/contnr.hxx>
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #include <svx/xpoly.hxx>

svx/inc/svx/svdundo.hxx

 #define _SVDUNDO_HXX
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 #include <svl/undo.hxx>
 #include <tools/contnr.hxx>

svx/inc/svx/svxids.hrc

 // include ------------------------------------------------------------------
 
 #include <svl/memberid.hrc>
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #include <sfx2/sfx.hrc>
 #include <sfx2/sfxsids.hrc>
 

svx/inc/svx/svxitems.hrc

 // include ------------------------------------------------------------------
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 // BOOL ---------------------------------------------------------------------

svx/source/dialog/dialmgr.cxx

 
 #include <svx/dialmgr.hxx>
 #include <tools/rc.hxx>
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #include <vcl/svapp.hxx>
 
 static ResMgr* pResMgr=0;

svx/source/editeng/editdbg.hxx

 #ifndef _EDITDBG_HXX
 #define _EDITDBG_HXX
 
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #include <tools/string.hxx>
 #include <stdio.h>
 

svx/source/editeng/editeng.hrc

 #define _EDITENG_HRC
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #define RID_EDITUNDO_DEL			( RID_EDIT_START + 0 )

svx/source/editeng/eerdll.cxx

 #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>

svx/source/gallery2/galmisc.cxx

 #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>

svx/source/inc/fmresids.hrc

 #define _SVX_FMRESIDS_HRC
 
 // include	   -----------------------------------------------------------
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 
 // unnamed ressources -------------------------------------------------------
 // sub ressources .....................

svx/source/outliner/outliner.hrc

 #define _OUTLINER_HRC
 
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #ifndef RID_OUTL_START

svx/source/src/app.hrc

 
 // include ---------------------------------------------------------------
 
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #include <sfx2/sfxsids.hrc>
 
 // Ranges ----------------------------------------------------------------

svx/source/svdraw/svdattr.cxx

 #include <svx/svdattrx.hxx>
 #include <svx/svdpool.hxx>
 
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #include "xmlcnitm.hxx"
 
 #include <svx/svxids.hrc>

svx/source/svdraw/svdedxv.cxx

 #include <svtools/accessibilityoptions.hxx>
 
 #include <svx/svdedxv.hxx>
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 
 //#include <tools/string.h>
 #include <svl/itemiter.hxx>

svx/source/svdraw/svdoole2.cxx

 #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>

svx/source/xoutdev/_xoutbmp.cxx

 #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"
  *
  ************************************************************************/
 #ifndef _SOLAR_HRC
-#include <vcl/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #define HID_BASE            		HID_APP_START