diff options
Diffstat (limited to 'formula/inc')
| -rw-r--r-- | formula/inc/formula/FormulaCompiler.hxx | 1 | ||||
| -rwxr-xr-x | formula/inc/formula/compiler.hrc | 25 | ||||
| -rw-r--r-- | formula/inc/formula/opcode.hxx | 1 | ||||
| -rw-r--r-- | formula/inc/formula/tokenarray.hxx | 1 |
4 files changed, 15 insertions, 13 deletions
diff --git a/formula/inc/formula/FormulaCompiler.hxx b/formula/inc/formula/FormulaCompiler.hxx index 825a31e9863b..215115214fc5 100644 --- a/formula/inc/formula/FormulaCompiler.hxx +++ b/formula/inc/formula/FormulaCompiler.hxx @@ -273,7 +273,6 @@ protected: virtual void CreateStringFromMatrix(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP); virtual void CreateStringFromIndex(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP); virtual void LocalizeString( String& rName ); // modify rName - input: exact name - virtual bool IsImportingXML() const; sal_uInt16 GetErrorConstant( const String& rName ); void AppendErrorConstant( rtl::OUStringBuffer& rBuffer, sal_uInt16 nError ); diff --git a/formula/inc/formula/compiler.hrc b/formula/inc/formula/compiler.hrc index a7b5cd808f88..49252ce85d2b 100755 --- a/formula/inc/formula/compiler.hrc +++ b/formula/inc/formula/compiler.hrc @@ -44,18 +44,19 @@ #define SC_OPCODE_SEP 10 #define SC_OPCODE_MISSING 11 /* special OpCodes */ #define SC_OPCODE_BAD 12 -#define SC_OPCODE_SPACES 13 -#define SC_OPCODE_MAT_REF 14 -#define SC_OPCODE_DB_AREA 15 /* additional access operators */ -#define SC_OPCODE_MACRO 16 -#define SC_OPCODE_COL_ROW_NAME 17 -#define SC_OPCODE_COL_ROW_NAME_AUTO 18 -#define SC_OPCODE_PERCENT_SIGN 19 /* operator _follows_ value */ -#define SC_OPCODE_ARRAY_OPEN 20 -#define SC_OPCODE_ARRAY_CLOSE 21 -#define SC_OPCODE_ARRAY_ROW_SEP 22 -#define SC_OPCODE_ARRAY_COL_SEP 23 /* some convs use sep != col_sep */ -#define SC_OPCODE_STOP_DIV 24 +#define SC_OPCODE_STRINGXML 13 +#define SC_OPCODE_SPACES 14 +#define SC_OPCODE_MAT_REF 15 +#define SC_OPCODE_DB_AREA 16 /* additional access operators */ +#define SC_OPCODE_MACRO 17 +#define SC_OPCODE_COL_ROW_NAME 18 +#define SC_OPCODE_COL_ROW_NAME_AUTO 19 +#define SC_OPCODE_PERCENT_SIGN 20 /* operator _follows_ value */ +#define SC_OPCODE_ARRAY_OPEN 21 +#define SC_OPCODE_ARRAY_CLOSE 22 +#define SC_OPCODE_ARRAY_ROW_SEP 23 +#define SC_OPCODE_ARRAY_COL_SEP 24 /* some convs use sep != col_sep */ +#define SC_OPCODE_STOP_DIV 25 /*** error constants #... ***/ #define SC_OPCODE_START_ERRORS 30 diff --git a/formula/inc/formula/opcode.hxx b/formula/inc/formula/opcode.hxx index 571e1b00c247..e562c27639c8 100644 --- a/formula/inc/formula/opcode.hxx +++ b/formula/inc/formula/opcode.hxx @@ -55,6 +55,7 @@ enum OpCodeEnum // Special OpCodes ocMissing = SC_OPCODE_MISSING, ocBad = SC_OPCODE_BAD, + ocStringXML = SC_OPCODE_STRINGXML, ocSpaces = SC_OPCODE_SPACES, ocMatRef = SC_OPCODE_MAT_REF, // Access commands diff --git a/formula/inc/formula/tokenarray.hxx b/formula/inc/formula/tokenarray.hxx index 8ec6a56f9f0f..3947ed5987dd 100644 --- a/formula/inc/formula/tokenarray.hxx +++ b/formula/inc/formula/tokenarray.hxx @@ -214,6 +214,7 @@ public: FormulaToken* AddExternal( const String& rStr, OpCode eOp = ocExternal ); FormulaToken* AddBad( const sal_Unicode* pStr ); /// ocBad with String FormulaToken* AddBad( const String& rStr ); /// ocBad with String + FormulaToken* AddStringXML( const String& rStr ); /// ocStringXML with String, temporary during import virtual FormulaToken* MergeArray( ); |