From 94c78bed2887089fdfb0c36f5b68b9c98bfd5a72 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 10 Jul 2009 14:03:42 +0200 Subject: #i103452#: replace PRODUCT by !DBG_UTIL; replace assert by OSL_ASSERT where possible --- formula/inc/formula/opcode.hxx | 2 +- formula/inc/formula/token.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'formula') 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 -- cgit From 783f6bc38bef24395da863e2b714ba51b58eb995 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 8 Oct 2009 20:56:15 +0200 Subject: #i103496#: some symbols moved from svt to svl --- formula/util/makefile.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'formula') diff --git a/formula/util/makefile.mk b/formula/util/makefile.mk index d1d78c11bbc2..0aab51b4fd22 100644 --- a/formula/util/makefile.mk +++ b/formula/util/makefile.mk @@ -90,6 +90,7 @@ SHL2TARGET=$(TARGET2)$(DLLPOSTFIX) SHL2STDLIBS= \ $(SFXLIB) \ $(SVTOOLLIB) \ + $(SVLLIB) \ $(VCLLIB) \ $(UNOTOOLSLIB) \ $(TOOLSLIB) \ -- cgit From 074a6a2e1665983e5e9961c85a38b49c146a672c Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 9 Oct 2009 17:52:47 +0200 Subject: #i103496#: SysLocale moved to svl --- formula/util/makefile.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'formula') diff --git a/formula/util/makefile.mk b/formula/util/makefile.mk index 0aab51b4fd22..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) \ -- cgit From 9f2fde7ab5de20926bb25a6b298b4e5dffb66eb2 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Oct 2009 00:05:16 +0200 Subject: #i103496#: split svtools; improve ConfitItems --- formula/inc/helpids.hrc | 2 +- formula/source/core/api/FormulaCompiler.cxx | 2 +- formula/source/core/inc/core_resource.hrc | 2 +- formula/source/core/resource/core_resource.cxx | 2 +- formula/source/ui/dlg/FormulaHelper.cxx | 2 +- formula/source/ui/dlg/formula.cxx | 6 +++--- formula/source/ui/dlg/funcpage.cxx | 4 ++-- formula/source/ui/dlg/parawin.cxx | 4 ++-- formula/source/ui/dlg/structpg.cxx | 4 ++-- formula/source/ui/inc/ForResId.hrc | 2 +- formula/source/ui/resource/ModuleHelper.cxx | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) (limited to 'formula') 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 // HID_FORMULA_START +#include // 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 +#include #include #include #include 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 +#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 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 -#include +#include //......................................................................... 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 -#include +#include 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 #include #include -#include -#include -#include +#include +#include +#include #include #include 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 #include -#include -#include +#include +#include #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 -#include +#include +#include #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 -#include +#include +#include #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 +#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 b6ede64b0226..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:" -- cgit