summaryrefslogtreecommitdiff
path: root/sc/source/filter/inc/lotform.hxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:04:08 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:04:08 +0200
commit258f905e8c6b1853884f730ab0e36a544bfd7b76 (patch)
tree812254806beb1a7af7271469e7148b667b2d96de /sc/source/filter/inc/lotform.hxx
parentbc212c565cdc252d2a01e5221a75868b3f01d230 (diff)
recreated tag OOO_BUILD_3_2_98_1 which had these commits:
commit aa08e6374f2a8f11105d84c3d651696be34ef78b (tag: refs/tags/OOO_BUILD_3_2_98_1) Author: Petr Mladek <pmladek@walk.suse.cz> Date: Wed Sep 15 19:03:24 2010 +0200 Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1) commit eb4914f043304ba7d164733509794104c7ea5b33 Merge: 5ada805 0815e6f Author: Jan Holesovsky <kendy@suse.cz> Date: Tue Sep 7 09:33:00 2010 +0200 Merge commit 'ooo/OOO330_m6' commit 0815e6f3086d4513fb1dfed2a0ff8e83a3589afc (tag: refs/tags/ooo/OOO330_m7, tag: refs/tags/ooo/OOO330_m6) Merge: 51cfacc 1d0dc69 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Thu Aug 26 13:52:56 2010 +0200 CWS-TOOLING: integrate CWS calc58 commit 51cfacc73ee6162c82dbb735448f5321a2a57269 Merge: 1f33e95 8676b47 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Wed Aug 25 12:49:35 2010 +0200 CWS-TOOLING: integrate CWS mib18 commit 1d0dc690de7aa8ef1fd93d26578251248fd66d9a Author: Thomas Benisch <tbe@openoffice.org> Date: Fri Aug 20 13:23:46 2010 +0200 calc58: #i113948# office crashes after resizing chart chart2/source/model/main/ChartModel.cxx | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit db48b114e54b6ceaebd4d77fbb0de1d41a0d69ca Author: Thomas Benisch <tbe@openoffice.org> Date: Fri Aug 20 13:03:55 2010 +0200 calc58: #i113946# undo does not work for deleting shapes .../controller/main/ChartController_Tools.cxx | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) commit 3fa83707418cb221c94dcbe32864e5555b618159 Author: Eike Rathke [er] <eike.rathke@oracle.com> Date: Thu Aug 19 17:12:37 2010 +0200 calc58: #i113879# add ScMatrix::CloneIfConst() and regard only temporary matrices created by the interpreter as mutable sc/inc/scmatrix.hxx | 11 ++++++++++- sc/source/core/tool/interpr4.cxx | 7 ++++++- sc/source/core/tool/interpr5.cxx | 21 +++++++++++++-------- sc/source/core/tool/scmatrix.cxx | 5 +++++ 4 files changed, 34 insertions(+), 10 deletions(-) commit baac8ebc6989a5771b5d1903e5e8f4014ecafeac Author: Eike Rathke [er] <eike.rathke@oracle.com> Date: Wed Aug 18 18:56:10 2010 +0200 calc58: #i113739# make N return 0 for all strings again sc/source/core/tool/interpr1.cxx | 23 +++++++---------------- sc/source/core/tool/interpr4.cxx | 6 ++++++ 2 files changed, 13 insertions(+), 16 deletions(-) commit ac9660fc7e47b2a7eecdb0c749ee46f592a70635 Author: Eike Rathke [er] <eike.rathke@oracle.com> Date: Wed Aug 18 16:52:22 2010 +0200 calc58: #i113820# make TEXT treat string results and inline strings identical to referenced cell text sc/source/core/tool/interpr1.cxx | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) commit 8676b47d16a1670a4d6ebbc610e8a00abd2367f7 Merge: 6423ab8 1f33e95 Author: Daniel Rentz <dr@openoffice.org> Date: Fri Aug 13 11:29:46 2010 +0200 mib18: rebase to OOO330m4 commit 6423ab81e71f7090d61e81b8992878ce7de43f27 Merge: 6e0de89 772dd5e Author: Andreas Bregas <ab@openoffice.org> Date: Wed Aug 11 08:28:57 2010 +0200 mib18: Merge commit 772dd5e59b0b28c3e24cac6ae52ea0141b39c240 Author: Daniel Rentz <dr@openoffice.org> Date: Tue Aug 10 20:18:10 2010 +0200 mib18: adjusted service name to match VBA symbol sc/source/ui/vba/vbaglobals.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 9725c306fd4502fc6de7d4acf5c302427310a20d Author: Michael E. Bohn <mbn@openoffice.org> Date: Tue Aug 10 18:14:58 2010 +0200 mib18: #163259# implementation of global symbol Excel sc/source/ui/vba/vbaglobals.cxx | 9 +++++++++ sc/source/ui/vba/vbaglobals.hxx | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) commit ff7c55aff1293fb51c8ab268d0f478480b0c5685 Merge: 80722e0 6e0de89 Author: Michael E. Bohn <mbn@openoffice.org> Date: Tue Aug 10 16:57:47 2010 +0200 heads merged commit 80722e0f75ad7d3204f39a580df2f48412e001c3 Author: Michael E. Bohn <mbn@openoffice.org> Date: Tue Aug 10 16:55:52 2010 +0200 mib18: #163120# adding the entrypoint for symbol Debug sc/source/ui/vba/vbaglobals.cxx | 19 +++++++++++++++++++ sc/source/ui/vba/vbaglobals.hxx | 2 +- 2 files changed, 20 insertions(+), 1 deletions(-) commit 6e0de8945fbfbee500e0fc9bfa26aaa67abeafa4 Author: Daniel Rentz <dr@openoffice.org> Date: Tue Aug 10 11:52:54 2010 +0200 mib18: #163243# enable regular expressions in VBA symbol Range.Find sc/source/ui/vba/vbarange.cxx | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit d0093c4e1b54648d1e09c16b389519fdf2564f6e Author: Daniel Rentz <dr@openoffice.org> Date: Tue Aug 10 10:27:30 2010 +0200 mib18: #163246# add VBA symbol Worksheet.ProtectScenarios sc/source/ui/vba/vbaworksheet.cxx | 10 ++++++++-- sc/source/ui/vba/vbaworksheet.hxx | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) commit b9876f93ddc6eaa0e5cf4aaf62cd19d3a08776c4 Author: Michael E. Bohn <mbn@openoffice.org> Date: Tue Aug 10 06:57:53 2010 +0200 mib18: #163148# creation og basic modules in library Standard during Workbooks.add sc/source/ui/vba/vbaworkbooks.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 80e4fe02a80b90182180c409d2f4f803562e02b8 Merge: 36f7091 81cec49 Author: Andreas Bregas <ab@openoffice.org> Date: Fri Aug 6 09:39:35 2010 +0200 mib18: Merge commit 81cec496df67c85bb1b64ef7d15c9f73987882a0 Author: Daniel Rentz <dr@openoffice.org> Date: Thu Aug 5 15:43:06 2010 +0200 mib18: #162503# do not create a new Worksheet object in Workbook.ActiveSheet but return existing object supporting VBA module access sc/source/ui/vba/vbaworkbook.cxx | 19 +++++++++++-------- sc/source/ui/vba/vbaworksheets.cxx | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) commit 36f709143ffc8056ece58e93e155a6dab9831cd9 Author: Daniel Rentz <dr@openoffice.org> Date: Wed Aug 4 18:13:02 2010 +0200 mib18: #162938# add VBA symbol Worksheet.AutoFilterMode sc/source/ui/vba/vbaworksheet.cxx | 37 ++++++++++++++++++++++++++++++++++++- sc/source/ui/vba/vbaworksheet.hxx | 5 +++++ 2 files changed, 41 insertions(+), 1 deletions(-) commit c650f967f769e4da07f669f60e1f7a636d7e9614 Author: Daniel Rentz <dr@openoffice.org> Date: Wed Aug 4 16:00:21 2010 +0200 mib18: #163200# full rework of VBA symbols Application.Intersect and Application.Union sc/source/ui/vba/makefile.mk | 92 +++--- sc/source/ui/vba/vbaapplication.cxx | 599 ++++++++++++++--------------------- 2 files changed, 281 insertions(+), 410 deletions(-) commit 5fa3d6e55b2ab5aac185c10293f8c6a1b7264e63 Author: Daniel Rentz <dr@openoffice.org> Date: Wed Aug 4 09:59:00 2010 +0200 mib18: #163198# VBA Names collection must return VBA Name objects sc/source/ui/vba/vbanames.cxx | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) commit 783c57ec2174b11b06ec29ecb1ae6b9b87996bf6 Author: Daniel Rentz <dr@openoffice.org> Date: Wed Aug 4 09:58:00 2010 +0200 mib18: #163195# set correct parent for range returned by VBA ActiveCell symbol sc/source/ui/vba/vbaapplication.cxx | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 32876274fc8fae906bdb52e76059ddedadfa8572 Author: Daniel Rentz <dr@openoffice.org> Date: Wed Aug 4 09:56:54 2010 +0200 mib18: #162937# extract all integer and floating values from an 'Any' for Boolean parameters sc/source/ui/vba/vbarange.cxx | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) commit faa445a0730322e8522999ffb30fdde97bb9b9b9 Author: Daniel Rentz <dr@openoffice.org> Date: Wed Aug 4 09:54:13 2010 +0200 mib18: #162039# clear covered cells when merging via VBA MergeCells symbol sc/source/ui/vba/vbarange.cxx | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-)
Notes
split repo tag: calc_OOO_BUILD_3_2_98_1
Diffstat (limited to 'sc/source/filter/inc/lotform.hxx')
-rw-r--r--sc/source/filter/inc/lotform.hxx90
1 files changed, 45 insertions, 45 deletions
diff --git a/sc/source/filter/inc/lotform.hxx b/sc/source/filter/inc/lotform.hxx
index 0a341e29ae51..198fe0a3f7ac 100644
--- a/sc/source/filter/inc/lotform.hxx
+++ b/sc/source/filter/inc/lotform.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -36,34 +36,34 @@
enum FUNC_TYPE
{
- FT_Return = 0, // End Formula
- FT_FuncFix0, // Funktion, 0 Parameter
- FT_FuncFix1, // Funktion, 0 Parameter
- FT_FuncFix2, // Funktion, 0 Parameter
- FT_FuncFix3, // Funktion, 0 Parameter
- FT_FuncFix4, // Funktion, 0 Parameter
- FT_FuncVar, // ~, var. P.
- FT_Neg, // Negierung
- FT_Op, // Operator
- FT_NotImpl, // nicht implementiert
- FT_ConstFloat, // Double (8-Byte)
- FT_Variable, // Single Ref
- FT_Range, // Double Ref
- FT_Braces, // Klammmern
- FT_ConstInt, // Integer
- FT_ConstString, // String
- FT_NOP, // nichts
+ FT_Return = 0, // End Formula
+ FT_FuncFix0, // Funktion, 0 Parameter
+ FT_FuncFix1, // Funktion, 0 Parameter
+ FT_FuncFix2, // Funktion, 0 Parameter
+ FT_FuncFix3, // Funktion, 0 Parameter
+ FT_FuncFix4, // Funktion, 0 Parameter
+ FT_FuncVar, // ~, var. P.
+ FT_Neg, // Negierung
+ FT_Op, // Operator
+ FT_NotImpl, // nicht implementiert
+ FT_ConstFloat, // Double (8-Byte)
+ FT_Variable, // Single Ref
+ FT_Range, // Double Ref
+ FT_Braces, // Klammmern
+ FT_ConstInt, // Integer
+ FT_ConstString, // String
+ FT_NOP, // nichts
// zusaetzlich ab WK3
- FT_Cref, // Cell Reference
- FT_Rref, // Range Reference
- FT_Nrref, // Named range reference
- FT_Absnref, // Absolut named range
- FT_Erref, // Err range reference
- FT_Ecref, // Err cell reference
- FT_Econstant, // Err constant
- FT_Splfunc, // SPLfunction
+ FT_Cref, // Cell Reference
+ FT_Rref, // Range Reference
+ FT_Nrref, // Named range reference
+ FT_Absnref, // Absolut named range
+ FT_Erref, // Err range reference
+ FT_Ecref, // Err cell reference
+ FT_Econstant, // Err constant
+ FT_Splfunc, // SPLfunction
FT_Const10Float,// Float (10-Byte)
- FT_Snum // Const Short Num
+ FT_Snum // Const Short Num
// fuer 'Problemfaelle' beim Import
};
@@ -73,38 +73,38 @@ enum FUNC_TYPE
class LotusToSc : public LotusConverterBase
{
private:
- CharSet eSrcChar;
- TokenId nAddToken; // ')+1.0'
- TokenId nSubToken; // ~
- TokenId n0Token; // '0.0';
+ CharSet eSrcChar;
+ TokenId nAddToken; // ')+1.0'
+ TokenId nSubToken; // ~
+ TokenId n0Token; // '0.0';
// ---------------------------------------------------------------
- static FUNC_TYPE IndexToType( BYTE );
- static DefTokenId IndexToToken( BYTE );
- static FUNC_TYPE IndexToTypeWK123( BYTE );
- static DefTokenId IndexToTokenWK123( BYTE );
- void DoFunc( DefTokenId eOc, BYTE nAnz, const sal_Char* pExtName );
- void LotusRelToScRel( UINT16 nCol, UINT16 nRow,
+ static FUNC_TYPE IndexToType( BYTE );
+ static DefTokenId IndexToToken( BYTE );
+ static FUNC_TYPE IndexToTypeWK123( BYTE );
+ static DefTokenId IndexToTokenWK123( BYTE );
+ void DoFunc( DefTokenId eOc, BYTE nAnz, const sal_Char* pExtName );
+ void LotusRelToScRel( UINT16 nCol, UINT16 nRow,
ScSingleRefData& rSRD );
- BOOL bWK3; // alternative Codeumsetzung statt fuer < WK1
+ BOOL bWK3; // alternative Codeumsetzung statt fuer < WK1
BOOL bWK123; // alternative for 123
// -------------------------------------------------------------------
- void ReadSRD( ScSingleRefData& rSRD, BYTE nFlags );
- inline void ReadCRD( ScComplexRefData& rCRD, BYTE nFlags );
- void IncToken( TokenId &rParam );
+ void ReadSRD( ScSingleRefData& rSRD, BYTE nFlags );
+ inline void ReadCRD( ScComplexRefData& rCRD, BYTE nFlags );
+ void IncToken( TokenId &rParam );
// ACHTUNG: hier wird die aktuelle Token-Kette im Pool
// mit '(<rParam>)+1' fortgeschrieben und mit
// Store() abgeschlossen!
- void DecToken( TokenId& rParam );
+ void DecToken( TokenId& rParam );
// ACHTUNG: ~
- void NegToken( TokenId& rParam );
+ void NegToken( TokenId& rParam );
// ACHTUNG: wie ~, nur wird '-(<rParam>)' gebildet
public:
LotusToSc( SvStream& aStr, CharSet eSrc, BOOL b );
- virtual ConvErr Convert( const ScTokenArray*& rpErg, INT32& nRest,
+ virtual ConvErr Convert( const ScTokenArray*& rpErg, INT32& nRest,
const FORMULA_TYPE eFT = FT_CellFormula );
void Reset( const ScAddress& rEingPos );
- inline void SetWK3( void );
+ inline void SetWK3( void );
private:
using LotusConverterBase::Reset;