diff options
| author | Release Engineers <releng@openoffice.org> | 2009-01-09 09:34:32 +0000 |
|---|---|---|
| committer | Release Engineers <releng@openoffice.org> | 2009-01-09 09:34:32 +0000 |
| commit | c2542cf91b4fa2ba22ab6e54096977da704757ae (patch) | |
| tree | 5e1c4a93c27533618da1258c600b28478072e4c5 /formula | |
| parent | 2397288b76a3e470a5cd8c65c0606e00b8be020f (diff) | |
#i10000# Minor syntax changes (semicolons, build.lst).
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/inc/formula/FormulaCompiler.hxx | 2 | ||||
| -rw-r--r-- | formula/inc/formula/token.hxx | 6 | ||||
| -rw-r--r-- | formula/prj/build.lst | 16 |
3 files changed, 13 insertions, 11 deletions
diff --git a/formula/inc/formula/FormulaCompiler.hxx b/formula/inc/formula/FormulaCompiler.hxx index d2ea1c520165..f0be8c10e52f 100644 --- a/formula/inc/formula/FormulaCompiler.hxx +++ b/formula/inc/formula/FormulaCompiler.hxx @@ -245,10 +245,12 @@ protected: virtual void SetError(USHORT nError); virtual FormulaTokenRef ExtendRangeReference( FormulaToken & rTok1, FormulaToken & rTok2, bool bReuseDoubleRef ); + virtual BOOL HandleExternalReference(const FormulaToken& _aToken); virtual BOOL HandleRange(); virtual BOOL HandleSingleRef(); virtual BOOL HandleDbData(); + virtual void CreateStringFromExternal(rtl::OUStringBuffer& rBuffer, FormulaToken* pTokenP); virtual void CreateStringFromSingleRef(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP); virtual void CreateStringFromDoubleRef(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP); virtual void CreateStringFromMatrix(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP); diff --git a/formula/inc/formula/token.hxx b/formula/inc/formula/token.hxx index f60a9da4e1a0..d2b4c9989a84 100644 --- a/formula/inc/formula/token.hxx +++ b/formula/inc/formula/token.hxx @@ -212,7 +212,7 @@ public: virtual void SetForceArray( bool b ); virtual BOOL operator==( const FormulaToken& rToken ) const; - DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaByteToken ); + DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaByteToken ) }; @@ -249,7 +249,7 @@ public: virtual double& GetDoubleAsReference(); virtual BOOL operator==( const FormulaToken& rToken ) const; - DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaDoubleToken ); + DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaDoubleToken ) }; @@ -267,7 +267,7 @@ public: virtual const String& GetString() const; virtual BOOL operator==( const FormulaToken& rToken ) const; - DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaStringToken ); + DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaStringToken ) }; diff --git a/formula/prj/build.lst b/formula/prj/build.lst index 89862b46e223..f26377c4578d 100644 --- a/formula/prj/build.lst +++ b/formula/prj/build.lst @@ -1,9 +1,9 @@ -rd formula : BOOST:boost comphelper svx NULL -rd formula usr1 - all rd_mkout NULL -rd formula\inc nmake - all rd_inc NULL -rd formula\source\core\api nmake - all rd_api rd_inc NULL -rd formula\source\core\resource nmake - all rd_core_res rd_inc NULL -rd formula\source\ui\resource nmake - all rd_ui_res rd_inc NULL -rd formula\source\ui\dlg nmake - all rd_uidlg rd_inc NULL -rd formula\util nmake - all rd_util rd_uidlg rd_core_res rd_ui_res rd_api NULL +fml formula : BOOST:boost comphelper svx NULL +fml formula usr1 - all fml_mkout NULL +fml formula\inc nmake - all fml_inc NULL +fml formula\source\core\api nmake - all fml_api fml_inc NULL +fml formula\source\core\resource nmake - all fml_core_res fml_inc NULL +fml formula\source\ui\resource nmake - all fml_ui_res fml_inc NULL +fml formula\source\ui\dlg nmake - all fml_uidlg fml_inc NULL +fml formula\util nmake - all fml_util fml_uidlg fml_core_res fml_ui_res fml_api NULL |