summaryrefslogtreecommitdiff
path: root/formula
diff options
context:
space:
mode:
Diffstat (limited to 'formula')
-rw-r--r--formula/inc/formula/opcode.hxx2
-rw-r--r--formula/inc/formula/token.hxx2
-rw-r--r--formula/inc/helpids.hrc2
-rw-r--r--formula/source/core/api/FormulaCompiler.cxx2
-rw-r--r--formula/source/core/inc/core_resource.hrc2
-rw-r--r--formula/source/core/resource/core_resource.cxx2
-rw-r--r--formula/source/ui/dlg/FormulaHelper.cxx2
-rw-r--r--formula/source/ui/dlg/formula.cxx6
-rw-r--r--formula/source/ui/dlg/funcpage.cxx4
-rw-r--r--formula/source/ui/dlg/parawin.cxx4
-rw-r--r--formula/source/ui/dlg/structpg.cxx4
-rw-r--r--formula/source/ui/inc/ForResId.hrc2
-rw-r--r--formula/source/ui/resource/ModuleHelper.cxx2
-rw-r--r--formula/util/makefile.mk2
14 files changed, 20 insertions, 18 deletions
diff --git a/formula/inc/formula/opcode.hxx b/formula/inc/formula/opcode.hxx
index 4346fc80112e..e93368e59f57 100644
--- a/formula/inc/formula/opcode.hxx
+++ b/formula/inc/formula/opcode.hxx
@@ -401,7 +401,7 @@ enum OpCodeEnum
ocNone = SC_OPCODE_NONE
};
-#ifdef PRODUCT
+#ifndef DBG_UTIL
// save memory since compilers tend to int an enum
typedef USHORT OpCode;
#else
diff --git a/formula/inc/formula/token.hxx b/formula/inc/formula/token.hxx
index d2b4c9989a84..a930442ee4f1 100644
--- a/formula/inc/formula/token.hxx
+++ b/formula/inc/formula/token.hxx
@@ -79,7 +79,7 @@ enum StackVarEnum
svUnknown // unknown StackType
};
-#ifdef PRODUCT
+#ifndef DBG_UTIL
// save memory since compilers tend to int an enum
typedef BYTE StackVar;
#else
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 2fd4e08deeb4..07d4a3c41b93 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:"
diff --git a/formula/util/makefile.mk b/formula/util/makefile.mk
index d1d78c11bbc2..130bf7f9bd2b 100644
--- a/formula/util/makefile.mk
+++ b/formula/util/makefile.mk
@@ -54,6 +54,7 @@ SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
SHL1STDLIBS= \
$(TOOLSLIB) \
$(SVTOOLLIB) \
+ $(SVLLIB) \
$(UNOTOOLSLIB) \
$(COMPHELPERLIB) \
$(CPPUHELPERLIB) \
@@ -90,6 +91,7 @@ SHL2TARGET=$(TARGET2)$(DLLPOSTFIX)
SHL2STDLIBS= \
$(SFXLIB) \
$(SVTOOLLIB) \
+ $(SVLLIB) \
$(VCLLIB) \
$(UNOTOOLSLIB) \
$(TOOLSLIB) \
generated by cgit (git 2.34.1) at 2024-06-19 19:28:29 +0000