INTEGRATION: CWS cac (1.10.48); FILE MERGED

2003/10/29 17:28:23 er 1.10.48.2: #4070# get rid of ScInterpreter's maddening GetNewMat/ResetNewMat handling (TLOT); introduce refcounting for ScMatrix
2003/07/01 15:48:55 er 1.10.48.1: #i4070# untangle compiler.hxx -> tokenarray.hxx, errorcodes.hxx
This commit is contained in:
Jens-Heiner Rechtien 2004-03-08 10:40:10 +00:00
parent 3a2815f18a
commit 43d73df39f

View file

@ -2,9 +2,9 @@
* *
* $RCSfile: cell.hxx,v $ * $RCSfile: cell.hxx,v $
* *
* $Revision: 1.10 $ * $Revision: 1.11 $
* *
* last change: $Author: hr $ $Date: 2003-04-28 15:30:24 $ * last change: $Author: hr $ $Date: 2004-03-08 11:40:10 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -73,8 +73,8 @@
#ifndef SC_SCGLOB_HXX #ifndef SC_SCGLOB_HXX
#include "global.hxx" #include "global.hxx"
#endif #endif
#ifndef SC_COMPILER_HXX #ifndef SC_TOKENARRAY_HXX
#include "compiler.hxx" #include "tokenarray.hxx"
#endif #endif
#ifndef _RTL_USTRBUF_HXX_ #ifndef _RTL_USTRBUF_HXX_
@ -100,7 +100,6 @@
class ScDocument; class ScDocument;
class EditTextObject; class EditTextObject;
class ScMatrix; class ScMatrix;
class ScCompiler;
class SfxBroadcaster; class SfxBroadcaster;
class ScBroadcasterList; class ScBroadcasterList;
class ScCodeArray; class ScCodeArray;
@ -380,7 +379,7 @@ public:
double GetValue(); double GetValue();
double GetValueAlways(); // ignore errors double GetValueAlways(); // ignore errors
void GetString( String& rString ); void GetString( String& rString );
void GetMatrix( ScMatrix** pMatrix ); const ScMatrix* GetMatrix();
BOOL GetMatrixOrigin( ScAddress& rPos ) const; BOOL GetMatrixOrigin( ScAddress& rPos ) const;
void GetResultDimensions( USHORT& rCols, USHORT& rRows ); void GetResultDimensions( USHORT& rCols, USHORT& rRows );
USHORT GetMatrixEdge( ScAddress& rOrgPos ); USHORT GetMatrixEdge( ScAddress& rOrgPos );