diff options
| author | Daniel Rentz <dr@openoffice.org> | 2010-01-15 12:41:46 +0100 |
|---|---|---|
| committer | Daniel Rentz <dr@openoffice.org> | 2010-01-15 12:41:46 +0100 |
| commit | b0e452f926bab7223aa2f7d46e6d563ec392d4c8 (patch) | |
| tree | 602cdad1e46ae28568872e75a496b36855e401c5 /formula/inc | |
| parent | 4cc8b5678950041b71b525c70be3f13d48a777cc (diff) | |
| parent | b0c799c7fbaa93f707bf18a87eb9aef5d86be52c (diff) | |
dr74: merge with DEV300_m69
Diffstat (limited to 'formula/inc')
| -rw-r--r-- | formula/inc/formula/opcode.hxx | 2 | ||||
| -rw-r--r-- | formula/inc/formula/token.hxx | 2 | ||||
| -rw-r--r-- | formula/inc/helpids.hrc | 2 |
3 files changed, 3 insertions, 3 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) |