ooo-build r13352 - in trunk: . patches/test
- From: kyoshida svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r13352 - in trunk: . patches/test
- Date: Tue, 22 Jul 2008 16:08:11 +0000 (UTC)
Author: kyoshida
Date: Tue Jul 22 16:08:10 2008
New Revision: 13352
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13352&view=rev
Log:
2008-07-22 Kohei Yoshida <kyoshida novell com>
* patches/test/calc-external-defined-names.diff: fixed it so that it
would apply for m25.
Modified:
trunk/ChangeLog
trunk/patches/test/calc-external-defined-names.diff
Modified: trunk/patches/test/calc-external-defined-names.diff
==============================================================================
--- trunk/patches/test/calc-external-defined-names.diff (original)
+++ trunk/patches/test/calc-external-defined-names.diff Tue Jul 22 16:08:10 2008
@@ -49,7 +49,7 @@
/*** error constants #... ***/
#define SC_OPCODE_START_ERRORS 30
diff --git sc/inc/compiler.hxx sc/inc/compiler.hxx
-index 8036115..047ff2c 100644
+index 2d816d1..332dd31 100644
--- sc/inc/compiler.hxx
+++ sc/inc/compiler.hxx
@@ -45,6 +45,7 @@
@@ -60,7 +60,7 @@
namespace com { namespace sun { namespace star {
namespace sheet {
-@@ -150,6 +151,10 @@ public:
+@@ -151,6 +152,10 @@ public:
bool bHasForceArray;
} sbyte;
ComplRefData aRef;
@@ -71,7 +71,7 @@
ScMatrix* pMat;
USHORT nIndex; // index into name collection
sal_Unicode cStr[ MAXSTRLEN+1 ]; // string (up to 255 characters + 0)
-@@ -179,6 +184,7 @@ public:
+@@ -180,6 +185,7 @@ public:
void SetDouble( double fVal );
void SetInt( int nVal );
void SetName( USHORT n );
@@ -79,7 +79,7 @@
void SetMatrix( ScMatrix* p );
void SetExternal(const sal_Unicode* pStr);
// These methods are ok to use, reference count not cleared.
-@@ -227,6 +233,16 @@ public:
+@@ -228,6 +234,16 @@ public:
xub_StrLen nSrcPos,
const CharClass* pCharClass) const = 0;
@@ -96,7 +96,7 @@
enum SpecialSymbolType
{
/**
-@@ -443,6 +459,7 @@ private:
+@@ -447,6 +463,7 @@ private:
BOOL IsDoubleReference( const String& );
BOOL IsMacro( const String& );
BOOL IsNamedRange( const String& );
@@ -105,10 +105,10 @@
BOOL IsColRowName( const String& );
BOOL IsBoolean( const String& );
diff --git sc/inc/document.hxx sc/inc/document.hxx
-index 8a648d3..9b373cc 100644
+index c78dfce..7d8cb1e 100644
--- sc/inc/document.hxx
+++ sc/inc/document.hxx
-@@ -92,6 +92,7 @@ class ScDocOptions;
+@@ -93,6 +93,7 @@ class ScDocOptions;
class ScDocumentPool;
class ScDrawLayer;
class ScExtDocOptions;
@@ -116,7 +116,7 @@
class ScFormulaCell;
class ScMarkData;
class ScOutlineTable;
-@@ -281,6 +282,7 @@ private:
+@@ -282,6 +283,7 @@ private:
ScFieldEditEngine* pCacheFieldEditEngine;
::std::auto_ptr<ScDocProtection> pDocProtection;
@@ -124,7 +124,7 @@
String aDocName; // opt: Dokumentname
String aDocCodeName; // opt: Dokumentname
ScRangePairListRef xColNameRanges;
-@@ -624,6 +626,8 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const;
+@@ -630,6 +632,8 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const;
const String& aFileName,
const String& aTabName );
@@ -369,7 +369,7 @@
ocIf = SC_OPCODE_IF,
ocChose = SC_OPCODE_CHOSE,
diff --git sc/inc/token.hxx sc/inc/token.hxx
-index 23decd6..1181360 100644
+index ded3a94..a28da1c 100644
--- sc/inc/token.hxx
+++ sc/inc/token.hxx
@@ -64,7 +64,7 @@ enum StackVarEnum
@@ -380,8 +380,8 @@
+ svExternalName,
svError, // error token
svMissing = 0x70, // 0 or ""
- svUnknown // unknown StackType
-@@ -447,6 +447,61 @@ public:
+ svSep, // separator, ocSep, ocOpen, ocClose
+@@ -448,6 +448,61 @@ public:
};
@@ -456,7 +456,7 @@
/** Xcl import may play dirty tricks with OpCode!=ocExternal.
Others don't use! */
diff --git sc/source/core/data/documen2.cxx sc/source/core/data/documen2.cxx
-index 6dd6697..60a3a4a 100644
+index cbf19d4..d35011c 100644
--- sc/source/core/data/documen2.cxx
+++ sc/source/core/data/documen2.cxx
@@ -93,6 +93,7 @@
@@ -467,7 +467,7 @@
#include <com/sun/star/document/XVbaEventsHelper.hpp>
// pImpl because including lookupcache.hxx in document.hxx isn't wanted, and
-@@ -140,6 +141,7 @@ ScDocument::ScDocument( ScDocumentMode eMode,
+@@ -152,6 +153,7 @@ ScDocument::ScDocument( ScDocumentMode eMode,
pScriptTypeData( NULL ),
pCacheFieldEditEngine( NULL ),
pDocProtection( NULL ),
@@ -475,7 +475,7 @@
pViewOptions( NULL ),
pDocOptions( NULL ),
pExtDocOptions( NULL ),
-@@ -369,6 +371,11 @@ ScDocument::~ScDocument()
+@@ -381,6 +383,11 @@ ScDocument::~ScDocument()
pLinkManager->Remove( 0, pLinkManager->GetLinks().Count() );
}
@@ -526,10 +526,10 @@
const String& rFilterName, const String& rFilterOpt, const String& rTabName )
{
diff --git sc/source/core/tool/compiler.cxx sc/source/core/tool/compiler.cxx
-index 7caea76..c2d36c4 100644
+index 00c93e0..eba7995 100644
--- sc/source/core/tool/compiler.cxx
+++ sc/source/core/tool/compiler.cxx
-@@ -73,9 +73,13 @@
+@@ -74,9 +74,13 @@
#include "errorcodes.hxx"
#include "parclass.hxx"
#include "autonamecache.hxx"
@@ -543,7 +543,7 @@
#if OSL_DEBUG_LEVEL > 1
// For some unknown reason the identical dbg_dump utilities in
-@@ -1361,6 +1365,64 @@ struct ConventionOOO_A1 : public Convention_A1
+@@ -1368,6 +1372,64 @@ struct ConventionOOO_A1 : public Convention_A1
return sal_Unicode(0);
}
@@ -608,7 +608,7 @@
};
-@@ -1480,6 +1542,16 @@ struct ConventionXL
+@@ -1489,6 +1551,16 @@ struct ConventionXL
}
return sal_Unicode(0);
}
@@ -625,7 +625,7 @@
};
struct ConventionXL_A1 : public Convention_A1, public ConventionXL
-@@ -1561,6 +1633,16 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL
+@@ -1570,6 +1642,16 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL
{
return ConventionXL::getSpecialSymbol(eSymType);
}
@@ -642,7 +642,7 @@
};
static const ConventionXL_A1 ConvXL_A1;
-@@ -1688,6 +1770,16 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL
+@@ -1697,6 +1779,16 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL
{
return ConventionXL::getSpecialSymbol(eSymType);
}
@@ -659,7 +659,7 @@
};
static const ConventionXL_R1C1 ConvXL_R1C1;
-@@ -2597,6 +2689,28 @@ BOOL ScCompiler::IsNamedRange( const String& rUpperName )
+@@ -2652,6 +2744,28 @@ BOOL ScCompiler::IsNamedRange( const String& rUpperName )
return FALSE;
}
@@ -688,21 +688,15 @@
BOOL ScCompiler::IsDBRange( const String& rName )
{
USHORT n;
-@@ -3190,10 +3304,11 @@ BOOL ScCompiler::NextNewToken( bool bAllowBooleans )
- // IsBoolean before isValue to catch inline bools without the kludge
- // for inline arrays.
- if ( !(bMayBeFuncName && IsOpCode( aUpper ))
-- && !IsReference( aOrg )
-+ && !IsReference(aOrg)
+@@ -3250,6 +3364,7 @@ BOOL ScCompiler::NextNewToken( bool bInArray )
&& !(bAllowBooleans && IsBoolean( aUpper ))
&& !IsValue( aUpper )
-- && !IsNamedRange( aUpper )
-+ && !IsNamedRange(aUpper)
+ && !IsNamedRange( aUpper )
+ && !IsExternalNamedRange(aOrg)
&& !IsDBRange( aUpper )
&& !IsColRowName( aUpper )
&& !(bMayBeFuncName && IsMacro( aUpper ))
-@@ -3452,6 +3567,69 @@ BOOL ScCompiler::GetToken()
+@@ -3576,6 +3691,69 @@ BOOL ScCompiler::GetToken()
}
if( pToken->GetOpCode() == ocSubTotal )
glSubTotal = TRUE;
@@ -772,7 +766,7 @@
else if( pToken->GetOpCode() == ocName )
{
ScRangeData* pRangeData = pDoc->GetRangeName()->FindIndex( pToken->GetIndex() );
-@@ -5402,6 +5580,15 @@ ScToken* ScCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuffer, ScToke
+@@ -5526,6 +5704,15 @@ ScToken* ScCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuffer, ScToke
BOOL bSpaces = FALSE;
ScToken* t = pTokenP;
OpCode eOp = t->GetOpCode();
@@ -789,10 +783,10 @@
{
// AND, OR infix?
diff --git sc/source/core/tool/token.cxx sc/source/core/tool/token.cxx
-index 7312257..5d1f006 100644
+index a20cbd5..5486519 100644
--- sc/source/core/tool/token.cxx
+++ sc/source/core/tool/token.cxx
-@@ -52,6 +52,8 @@
+@@ -54,6 +54,8 @@
#include "parclass.hxx"
#include "jumpmatrix.hxx"
@@ -801,7 +795,7 @@
// ImpTokenIterator wird je Interpreter angelegt, mehrfache auch durch
// SubCode via ScTokenIterator Push/Pop moeglich
IMPL_FIXEDMEMPOOL_NEWDEL( ImpTokenIterator, 32, 16 )
-@@ -196,6 +198,19 @@ void ScRawToken::SetName( USHORT n )
+@@ -209,6 +211,19 @@ void ScRawToken::SetName( USHORT n )
nRefCnt = 0;
}
@@ -821,7 +815,7 @@
ComplRefData& ScRawToken::GetReference()
{
DBG_ASSERT( lcl_IsReference( eOp, GetType() ), "GetReference: no Ref" );
-@@ -255,6 +270,7 @@ ScRawToken* ScRawToken::Clone() const
+@@ -269,6 +284,7 @@ ScRawToken* ScRawToken::Clone() const
case svSingleRef:
case svDoubleRef: n += sizeof(aRef); break;
case svMatrix: n += sizeof(ScMatrix*); break;
@@ -829,7 +823,7 @@
case svIndex: n += sizeof(USHORT); break;
case svJump: n += nJump[ 0 ] * 2 + 2; break;
case svExternal: n = sal::static_int_cast<USHORT>( n + GetStrLenBytes( cStr+1 ) + GetStrLenBytes( 2 ) ); break;
-@@ -311,8 +327,14 @@ ScToken* ScRawToken::CreateToken() const
+@@ -325,8 +341,14 @@ ScToken* ScRawToken::CreateToken() const
return new ScMatrixToken( pMat );
//break;
case svIndex :
@@ -844,7 +838,7 @@
case svJump :
return new ScJumpToken( eOp, (short*) nJump );
//break;
-@@ -461,6 +483,7 @@ BOOL ScToken::IsMatrixFunction() const
+@@ -478,6 +500,7 @@ BOOL ScToken::IsMatrixFunction() const
ScToken* ScToken::Clone() const
{
@@ -852,7 +846,7 @@
switch ( GetType() )
{
case svByte :
-@@ -470,20 +493,24 @@ ScToken* ScToken::Clone() const
+@@ -487,20 +510,24 @@ ScToken* ScToken::Clone() const
return new ScDoubleToken( *static_cast<const ScDoubleToken*>(this) );
//break;
case svString :
@@ -880,7 +874,7 @@
else
return new ScDoubleRefOpToken( *static_cast<const ScDoubleRefOpToken*>(this) );
//break;
-@@ -505,6 +532,9 @@ ScToken* ScToken::Clone() const
+@@ -522,6 +549,9 @@ ScToken* ScToken::Clone() const
case svExternal :
return new ScExternalToken( *static_cast<const ScExternalToken*>(this) );
//break;
@@ -890,7 +884,7 @@
case svFAP :
return new ScFAPToken( *static_cast<const ScFAPToken*>(this) );
//break;
-@@ -1015,6 +1045,150 @@ BOOL ScIndexToken::operator==( const ScToken& r ) const
+@@ -1035,6 +1065,150 @@ BOOL ScIndexToken::operator==( const ScToken& r ) const
return ScToken::operator==( r ) && nIndex == r.GetIndex();
}
@@ -1041,7 +1035,7 @@
short* ScJumpToken::GetJump() const { return pJump; }
BOOL ScJumpToken::operator==( const ScToken& r ) const
-@@ -1873,6 +2047,11 @@ ScToken* ScTokenArray::AddMatrix( ScMatrix* p )
+@@ -1893,6 +2067,11 @@ ScToken* ScTokenArray::AddMatrix( ScMatrix* p )
return Add( new ScMatrixToken( p ) );
}
@@ -1158,7 +1152,7 @@
diff --git sc/source/filter/excel/xeformula.cxx sc/source/filter/excel/xeformula.cxx
-index c85aad1..0315b6b 100644
+index 3db8da7..97692bc 100644
--- sc/source/filter/excel/xeformula.cxx
+++ sc/source/filter/excel/xeformula.cxx
@@ -42,6 +42,12 @@
@@ -1174,7 +1168,7 @@
// External reference log =====================================================
XclExpRefLogEntry::XclExpRefLogEntry() :
-@@ -300,6 +306,7 @@ private:
+@@ -299,6 +305,7 @@ private:
void ProcessBoolean( const XclExpTokenData& rTokData );
void ProcessDdeLink( const XclExpTokenData& rTokData, sal_uInt8 nExpClass );
void ProcessExternal( const XclExpTokenData& rTokData, sal_uInt8 nExpClass );
@@ -1182,7 +1176,7 @@
void ProcessFunction( const XclExpTokenData& rTokData, sal_uInt8 nExpClass );
void PrepareFunction( XclExpFuncData& rFuncData );
-@@ -1115,6 +1122,12 @@ XclExpTokenData XclExpFmlaCompImpl::Factor( XclExpTokenData aTokData, sal_uInt8
+@@ -1114,6 +1121,12 @@ XclExpTokenData XclExpFmlaCompImpl::Factor( XclExpTokenData aTokData, sal_uInt8
StackVar eTokType = aTokData.GetType();
OpCode eOpCode = aTokData.GetOpCode();
@@ -1195,7 +1189,7 @@
switch( eTokType )
{
case svUnknown: mbOk = false; break;
-@@ -1249,6 +1262,66 @@ void XclExpFmlaCompImpl::ProcessExternal( const XclExpTokenData& rTokData, sal_u
+@@ -1248,6 +1261,66 @@ void XclExpFmlaCompImpl::ProcessExternal( const XclExpTokenData& rTokData, sal_u
ProcessFunction( rTokData, nExpClass );
}
@@ -1956,7 +1950,7 @@
{
mxImpl->Save( rStrm );
diff --git sc/source/filter/excel/xilink.cxx sc/source/filter/excel/xilink.cxx
-index e351863..b58f6ec 100644
+index 01932a5..b20849e 100644
--- sc/source/filter/excel/xilink.cxx
+++ sc/source/filter/excel/xilink.cxx
@@ -191,6 +191,11 @@ public:
@@ -1999,10 +1993,10 @@
{
return mxImpl->GetLinkData( rApplic, rTopic, nXtiIndex );
diff --git sc/source/filter/inc/tokstack.hxx sc/source/filter/inc/tokstack.hxx
-index fef6b03..c319704 100644
+index 89e955a..02429d3 100644
--- sc/source/filter/inc/tokstack.hxx
+++ sc/source/filter/inc/tokstack.hxx
-@@ -37,6 +37,8 @@
+@@ -35,6 +35,8 @@
#include <tools/debug.hxx>
#include "compiler.hxx"
@@ -2011,7 +2005,7 @@
typedef OpCode DefTokenId;
// in PRODUCT version: ambiguity between OpCode (being USHORT) and UINT16
-@@ -80,6 +82,7 @@ enum E_TYPE
+@@ -78,6 +80,7 @@ enum E_TYPE
T_Ext, // irgendwas Unbekanntes mit Funktionsnamen
T_Nlf, // token for natural language formula
T_Matrix, // token for inline arrays
@@ -2019,7 +2013,7 @@
T_Error // fuer Abfrage im Fehlerfall
};
-@@ -136,6 +139,14 @@ class TokenPool
+@@ -134,6 +137,14 @@ class TokenPool
UINT16 nP_Matrix;
UINT16 nP_MatrixAkt;
@@ -2034,7 +2028,7 @@
UINT16* pElement; // Array mit Indizes fuer Elemente
E_TYPE* pType; // ...mit Typ-Info
UINT16* pSize; // ...mit Laengenangabe (Anz. UINT16)
-@@ -182,6 +193,7 @@ class TokenPool
+@@ -180,6 +191,7 @@ class TokenPool
// 4 externals (e.g. AddIns, Makros...)
const TokenId StoreNlf( const SingleRefData& rTr );
const TokenId StoreMatrix( SCSIZE nC, SCSIZE nR );
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]