diff options
author | Mathias Bauer <mba@openoffice.org> | 2009-10-16 00:05:16 +0200 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2009-10-16 00:05:16 +0200 |
commit | 9f2fde7ab5de20926bb25a6b298b4e5dffb66eb2 (patch) | |
tree | ec41adfa92c0f9c839beb0ca704bfc03c6b303e9 /formula | |
parent | 074a6a2e1665983e5e9961c85a38b49c146a672c (diff) |
#i103496#: split svtools; improve ConfitItems
Diffstat (limited to 'formula')
-rw-r--r-- | formula/inc/helpids.hrc | 2 | ||||
-rw-r--r-- | formula/source/core/api/FormulaCompiler.cxx | 2 | ||||
-rw-r--r-- | formula/source/core/inc/core_resource.hrc | 2 | ||||
-rw-r--r-- | formula/source/core/resource/core_resource.cxx | 2 | ||||
-rw-r--r-- | formula/source/ui/dlg/FormulaHelper.cxx | 2 | ||||
-rw-r--r-- | formula/source/ui/dlg/formula.cxx | 6 | ||||
-rw-r--r-- | formula/source/ui/dlg/funcpage.cxx | 4 | ||||
-rw-r--r-- | formula/source/ui/dlg/parawin.cxx | 4 | ||||
-rw-r--r-- | formula/source/ui/dlg/structpg.cxx | 4 | ||||
-rw-r--r-- | formula/source/ui/inc/ForResId.hrc | 2 | ||||
-rw-r--r-- | formula/source/ui/resource/ModuleHelper.cxx | 2 |
11 files changed, 16 insertions, 16 deletions
diff --git a/formula/inc/helpids.hrc b/formula/inc/helpids.hrc index bcbe9b2db85d..9eebceec0482 100644 --- a/formula/inc/helpids.hrc +++ b/formula/inc/helpids.hrc @@ -31,7 +31,7 @@ #define FORMULA_HELPID_HRC #ifndef _SOLAR_HRC -#include <svtools/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/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 4cfa28d1806d..8bc974314120 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -35,7 +35,7 @@ #include "core_resource.hxx" #include "core_resource.hrc" -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <tools/rc.hxx> #include <tools/rcid.h> #include <com/sun/star/sheet/FormulaOpCodeMapEntry.hpp> diff --git a/formula/source/core/inc/core_resource.hrc b/formula/source/core/inc/core_resource.hrc index 769067d57839..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 <svtools/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 de36c962a83e..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 <vcl/svapp.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> //......................................................................... namespace formula diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx index 148336a5c3d4..d458a41d10a3 100644 --- a/formula/source/ui/dlg/FormulaHelper.cxx +++ b/formula/source/ui/dlg/FormulaHelper.cxx @@ -31,7 +31,7 @@ #include "formula/formulahelper.hxx" #include <unotools/charclass.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> namespace formula { diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 37db1d2eb3cb..a63299abad29 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -47,9 +47,9 @@ #include <svtools/stdctrl.hxx> #include <svtools/svmedit.hxx> #include <svtools/svtreebx.hxx> -#include <svtools/stritem.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/eitem.hxx> +#include <svl/stritem.hxx> +#include <svl/zforlist.hxx> +#include <svl/eitem.hxx> #include <unotools/charclass.hxx> #include <tools/urlobj.hxx> diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index f414cb41fb39..d50ea5a19ccb 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -37,8 +37,8 @@ #include <sfx2/dispatch.hxx> #include <sfx2/docfile.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/stritem.hxx> +#include <svl/zforlist.hxx> +#include <svl/stritem.hxx> #include "formula/IFunctionDescription.hxx" #include "funcpage.hxx" diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index 3437bc47302b..2b3f8767a270 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -35,8 +35,8 @@ //---------------------------------------------------------------------------- -#include <svtools/zforlist.hxx> -#include <svtools/stritem.hxx> +#include <svl/zforlist.hxx> +#include <svl/stritem.hxx> #include "parawin.hxx" #include "parawin.hrc" diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx index 3d9c467357ae..c846b15af93f 100644 --- a/formula/source/ui/dlg/structpg.cxx +++ b/formula/source/ui/dlg/structpg.cxx @@ -35,8 +35,8 @@ //---------------------------------------------------------------------------- -#include <svtools/zforlist.hxx> -#include <svtools/stritem.hxx> +#include <svl/zforlist.hxx> +#include <svl/stritem.hxx> #include "structpg.hxx" #include "formdlgs.hrc" diff --git a/formula/source/ui/inc/ForResId.hrc b/formula/source/ui/inc/ForResId.hrc index 43444bb9a112..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 <svtools/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 b6ede64b0226..d1bc06c36ace 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 <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #define EXPAND_PROTOCOL "vnd.sun.star.expand:" |