ooo-build r12343 - in trunk: . patches/dev300
- From: kyoshida svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r12343 - in trunk: . patches/dev300
- Date: Fri, 25 Apr 2008 21:37:24 +0100 (BST)
Author: kyoshida
Date: Fri Apr 25 20:37:24 2008
New Revision: 12343
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12343&view=rev
Log:
2008-04-25 Kohei Yoshida <kyoshida novell com>
* patches/dev300/sc-formula-syntax-core.diff: fixed a crash when a
formula is entered with the 'Calc A1' formula syntax.
Modified:
trunk/ChangeLog
trunk/patches/dev300/sc-formula-syntax-core.diff
Modified: trunk/patches/dev300/sc-formula-syntax-core.diff
==============================================================================
--- trunk/patches/dev300/sc-formula-syntax-core.diff (original)
+++ trunk/patches/dev300/sc-formula-syntax-core.diff Fri Apr 25 20:37:24 2008
@@ -1,12 +1,14 @@
+? sc/build.log
+? sc/sc.vpj
Index: sc/inc/compiler.hxx
===================================================================
RCS file: /cvs/sc/sc/inc/compiler.hxx,v
-retrieving revision 1.35
-retrieving revision 1.35.12.3
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.35 -r1.35.12.3
---- sc/inc/compiler.hxx 6 Mar 2008 15:15:10 -0000 1.35
-+++ sc/inc/compiler.hxx 19 Mar 2008 17:37:07 -0000 1.35.12.3
-@@ -478,11 +478,11 @@
+retrieving revision 1.36
+retrieving revision 1.35.12.5
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.36 -r1.35.12.5
+--- sc/inc/compiler.hxx 10 Apr 2008 18:21:04 -0000 1.36
++++ sc/inc/compiler.hxx 25 Apr 2008 16:55:28 -0000 1.35.12.5
+@@ -446,11 +446,11 @@
public:
ScCompiler( ScDocument* pDocument, const ScAddress&,
@@ -20,15 +22,25 @@
static bool IsInitialized()
{
+@@ -523,8 +523,7 @@
+ const String& GetCorrectedFormula() { return aCorrectedFormula; }
+
+ // Use convention from this->aPos by default
+- ScTokenArray* CompileString( const String& rFormula,
+- ScAddress::Convention eConv = ScAddress::CONV_UNSPECIFIED );
++ ScTokenArray* CompileString( const String& rFormula );
+ BOOL CompileTokenArray();
+ short GetNumFormatType() { return nNumFmt; }
+ const ScDocument* GetDoc() const { return pDoc; }
Index: sc/inc/document.hxx
===================================================================
RCS file: /cvs/sc/sc/inc/document.hxx,v
-retrieving revision 1.109
-retrieving revision 1.109.12.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.109 -r1.109.12.1
---- sc/inc/document.hxx 6 Mar 2008 15:16:12 -0000 1.109
-+++ sc/inc/document.hxx 19 Mar 2008 17:37:07 -0000 1.109.12.1
-@@ -431,7 +431,7 @@
+retrieving revision 1.111
+retrieving revision 1.109.12.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.111 -r1.109.12.2
+--- sc/inc/document.hxx 18 Apr 2008 11:30:18 -0000 1.111
++++ sc/inc/document.hxx 23 Apr 2008 15:07:15 -0000 1.109.12.2
+@@ -397,7 +397,7 @@
BOOL bInUnoBroadcast;
BOOL bInUnoListenerCall;
@@ -37,7 +49,7 @@
mutable BOOL bStyleSheetUsageInvalid;
-@@ -625,7 +625,8 @@
+@@ -591,7 +591,8 @@
BOOL IsActiveScenario( SCTAB nTab ) const;
void SetActiveScenario( SCTAB nTab, BOOL bActive ); // nur fuer Undo etc.
SC_DLLPUBLIC ScAddress::Convention GetAddressConvention() const;
@@ -50,18 +62,18 @@
Index: sc/inc/funcdesc.hxx
===================================================================
RCS file: /cvs/sc/sc/inc/funcdesc.hxx,v
-retrieving revision 1.2
-retrieving revision 1.2.12.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.2 -r1.2.12.2
+retrieving revision 1.3
+retrieving revision 1.2.12.3
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.3 -r1.2.12.3
Index: sc/source/core/data/cell.cxx
===================================================================
RCS file: /cvs/sc/sc/source/core/data/cell.cxx,v
-retrieving revision 1.41
-retrieving revision 1.41.12.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.41 -r1.41.12.2
---- sc/source/core/data/cell.cxx 6 Mar 2008 15:23:29 -0000 1.41
-+++ sc/source/core/data/cell.cxx 20 Mar 2008 23:19:42 -0000 1.41.12.2
-@@ -922,7 +922,7 @@
+retrieving revision 1.42
+retrieving revision 1.41.12.3
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.42 -r1.41.12.3
+--- sc/source/core/data/cell.cxx 10 Apr 2008 19:18:53 -0000 1.42
++++ sc/source/core/data/cell.cxx 23 Apr 2008 15:10:35 -0000 1.41.12.3
+@@ -907,7 +907,7 @@
if( !bNoListening && pCode->GetCodeLen() )
EndListeningTo( pDocument );
@@ -70,7 +82,7 @@
bSubTotal = aComp.CompileTokenArray();
if( !pCode->GetCodeError() )
{
-@@ -1009,7 +1009,7 @@
+@@ -994,7 +994,7 @@
// wurde, da die RangeNames erst jetzt existieren.
if( pCode->GetLen() && !pCode->GetCodeLen() && !pCode->GetCodeError() )
{
@@ -79,7 +91,7 @@
bSubTotal = aComp.CompileTokenArray();
nFormatType = aComp.GetNumFormatType();
nFormatIndex = 0;
-@@ -1100,7 +1100,8 @@
+@@ -1085,7 +1085,8 @@
aDebugVec.push_back( aR);
}
String aStr;
@@ -92,12 +104,12 @@
Index: sc/source/core/data/cell2.cxx
===================================================================
RCS file: /cvs/sc/sc/source/core/data/cell2.cxx,v
-retrieving revision 1.32
-retrieving revision 1.32.12.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.32 -r1.32.12.1
---- sc/source/core/data/cell2.cxx 6 Mar 2008 15:23:55 -0000 1.32
-+++ sc/source/core/data/cell2.cxx 19 Mar 2008 17:37:09 -0000 1.32.12.1
-@@ -633,7 +633,7 @@
+retrieving revision 1.33
+retrieving revision 1.32.12.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.33 -r1.32.12.2
+--- sc/source/core/data/cell2.cxx 10 Apr 2008 19:19:17 -0000 1.33
++++ sc/source/core/data/cell2.cxx 23 Apr 2008 15:10:27 -0000 1.32.12.2
+@@ -621,7 +621,7 @@
BOOL bRefSizeChanged;
if ( bHasRefs )
{
@@ -106,7 +118,7 @@
pRangeData = aComp.UpdateReference(eUpdateRefMode, aOldPos, r,
nDx, nDy, nDz,
bValChanged, bRefSizeChanged);
-@@ -785,7 +785,7 @@
+@@ -773,7 +773,7 @@
pDocument->RemoveFromFormulaTree( this ); // update formula count
delete pCode;
pCode = pRangeData->GetCode()->Clone();
@@ -115,7 +127,7 @@
aComp2.UpdateSharedFormulaReference( eUpdateRefMode, aOldPos, r,
nDx, nDy, nDz );
bValChanged = TRUE;
-@@ -837,7 +837,7 @@
+@@ -825,7 +825,7 @@
if ( bPosChanged )
aPos.IncTab();
ScRangeData* pRangeData;
@@ -124,7 +136,7 @@
pRangeData = aComp.UpdateInsertTab( nTable, FALSE );
if (pRangeData) // Shared Formula gegen echte Formel
{ // austauschen
-@@ -845,7 +845,7 @@
+@@ -833,7 +833,7 @@
pDocument->RemoveFromFormulaTree( this ); // update formula count
delete pCode;
pCode = new ScTokenArray( *pRangeData->GetCode() );
@@ -133,7 +145,7 @@
aComp2.MoveRelWrap();
aComp2.UpdateInsertTab( nTable, FALSE );
// If the shared formula contained a named range/formula containing
-@@ -871,14 +871,14 @@
+@@ -859,14 +859,14 @@
if ( bPosChanged )
aPos.IncTab(-1);
ScRangeData* pRangeData;
@@ -150,7 +162,7 @@
aComp2.CompileTokenArray();
aComp2.MoveRelWrap();
aComp2.UpdateDeleteTab( nTable, FALSE, FALSE, bRefChanged );
-@@ -906,14 +906,14 @@
+@@ -894,14 +894,14 @@
// SetTab _nach_ EndListeningTo und _vor_ Compiler UpdateMoveTab !
aPos.SetTab( nTabNo );
ScRangeData* pRangeData;
@@ -170,12 +182,12 @@
Index: sc/source/core/data/conditio.cxx
===================================================================
RCS file: /cvs/sc/sc/source/core/data/conditio.cxx,v
-retrieving revision 1.24
-retrieving revision 1.24.12.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.24 -r1.24.12.1
---- sc/source/core/data/conditio.cxx 6 Mar 2008 15:25:20 -0000 1.24
-+++ sc/source/core/data/conditio.cxx 19 Mar 2008 17:37:10 -0000 1.24.12.1
-@@ -636,7 +636,7 @@
+retrieving revision 1.25
+retrieving revision 1.24.12.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.25 -r1.24.12.2
+--- sc/source/core/data/conditio.cxx 10 Apr 2008 19:21:09 -0000 1.25
++++ sc/source/core/data/conditio.cxx 23 Apr 2008 15:10:43 -0000 1.24.12.2
+@@ -628,7 +628,7 @@
lcl_CondUpdateInsertTab( *pFormula1, rRange.aStart.Tab(), aSrcPos.Tab(), bChanged1 );
else
{
@@ -184,7 +196,7 @@
if ( bDeleteTab )
aComp.UpdateDeleteTab( rRange.aStart.Tab(), FALSE, TRUE, bChanged1 );
else
-@@ -652,7 +652,7 @@
+@@ -644,7 +644,7 @@
lcl_CondUpdateInsertTab( *pFormula2, rRange.aStart.Tab(), aSrcPos.Tab(), bChanged2 );
else
{
@@ -193,7 +205,7 @@
if ( bDeleteTab )
aComp.UpdateDeleteTab( rRange.aStart.Tab(), FALSE, TRUE, bChanged2 );
else
-@@ -668,13 +668,13 @@
+@@ -660,13 +660,13 @@
{
if (pFormula1)
{
@@ -212,12 +224,12 @@
Index: sc/source/core/data/documen2.cxx
===================================================================
RCS file: /cvs/sc/sc/source/core/data/documen2.cxx,v
-retrieving revision 1.71
-retrieving revision 1.71.12.5
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.71 -r1.71.12.5
---- sc/source/core/data/documen2.cxx 6 Mar 2008 15:25:51 -0000 1.71
-+++ sc/source/core/data/documen2.cxx 31 Mar 2008 20:11:20 -0000 1.71.12.5
-@@ -210,7 +210,7 @@
+retrieving revision 1.72
+retrieving revision 1.71.12.6
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.72 -r1.71.12.6
+--- sc/source/core/data/documen2.cxx 10 Apr 2008 19:22:32 -0000 1.72
++++ sc/source/core/data/documen2.cxx 23 Apr 2008 15:10:39 -0000 1.71.12.6
+@@ -197,7 +197,7 @@
nInDdeLinkUpdate( 0 ),
bInUnoBroadcast( FALSE ),
bInUnoListenerCall( FALSE ),
@@ -226,7 +238,7 @@
bStyleSheetUsageInvalid( TRUE ),
bUndoEnabled( TRUE ),
mbAdjustHeightEnabled( true ),
-@@ -262,20 +262,20 @@
+@@ -249,20 +249,20 @@
}
@@ -255,12 +267,12 @@
Index: sc/source/core/data/documen3.cxx
===================================================================
RCS file: /cvs/sc/sc/source/core/data/documen3.cxx,v
-retrieving revision 1.40
-retrieving revision 1.40.68.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.40 -r1.40.68.1
---- sc/source/core/data/documen3.cxx 29 Jan 2008 15:17:42 -0000 1.40
-+++ sc/source/core/data/documen3.cxx 19 Mar 2008 17:37:11 -0000 1.40.68.1
-@@ -352,12 +352,17 @@
+retrieving revision 1.41
+retrieving revision 1.40.68.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.41 -r1.40.68.2
+--- sc/source/core/data/documen3.cxx 10 Apr 2008 19:22:46 -0000 1.41
++++ sc/source/core/data/documen3.cxx 23 Apr 2008 15:10:48 -0000 1.40.68.2
+@@ -347,12 +347,17 @@
ScAddress::Convention ScDocument::GetAddressConvention() const
{
@@ -281,15 +293,53 @@
}
BOOL ScDocument::GetLinkMode( SCTAB nTab ) const
+Index: sc/source/core/data/documen4.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/core/data/documen4.cxx,v
+retrieving revision 1.22
+retrieving revision 1.22.18.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.22 -r1.22.18.1
+--- sc/source/core/data/documen4.cxx 10 Apr 2008 19:23:01 -0000 1.22
++++ sc/source/core/data/documen4.cxx 25 Apr 2008 16:53:36 -0000 1.22.18.1
+@@ -121,7 +121,7 @@
+ const ScMarkData& rMark,
+ const String& rFormula,
+ const ScTokenArray* pArr,
+- const ScGrammar::Grammar eGrammar )
++ const ScGrammar::Grammar eGram )
+ {
+ PutInOrder(nCol1, nCol2);
+ PutInOrder(nRow1, nRow2);
+@@ -148,9 +148,9 @@
+ ScFormulaCell* pCell;
+ ScAddress aPos( nCol1, nRow1, nTab1 );
+ if (pArr)
+- pCell = new ScFormulaCell( this, aPos, pArr, eGrammar, MM_FORMULA );
++ pCell = new ScFormulaCell( this, aPos, pArr, eGram, MM_FORMULA );
+ else
+- pCell = new ScFormulaCell( this, aPos, rFormula, eGrammar, MM_FORMULA );
++ pCell = new ScFormulaCell( this, aPos, rFormula, eGram, MM_FORMULA );
+ pCell->SetMatColsRows( nCol2 - nCol1 + 1, nRow2 - nRow1 + 1 );
+ for (i = 0; i <= MAXTAB; i++)
+ {
+@@ -197,7 +197,7 @@
+ // Zelle ein eigenes Array erhaelt!
+ aPos = ScAddress( j, k, i );
+ t->CalcRelFromAbs( aPos );
+- pCell = new ScFormulaCell( this, aPos, aArr.Clone(), eGrammar, MM_REFERENCE );
++ pCell = new ScFormulaCell( this, aPos, aArr.Clone(), eGram, MM_REFERENCE );
+ pTab[i]->PutCell(j, k, (ScBaseCell*) pCell);
+ }
+ }
Index: sc/source/core/data/documen5.cxx
===================================================================
RCS file: /cvs/sc/sc/source/core/data/documen5.cxx,v
-retrieving revision 1.31
-retrieving revision 1.31.124.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.31 -r1.31.124.1
---- sc/source/core/data/documen5.cxx 13 Nov 2007 15:26:14 -0000 1.31
-+++ sc/source/core/data/documen5.cxx 20 Mar 2008 23:19:42 -0000 1.31.124.1
-@@ -175,7 +175,7 @@
+retrieving revision 1.32
+retrieving revision 1.31.124.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.32 -r1.31.124.2
+--- sc/source/core/data/documen5.cxx 10 Apr 2008 19:23:21 -0000 1.32
++++ sc/source/core/data/documen5.cxx 23 Apr 2008 15:10:55 -0000 1.31.124.2
+@@ -168,7 +168,7 @@
{
ScRangeListRef aRanges = pChartObj->GetRangeList();
String sRangeStr;
@@ -298,7 +348,7 @@
chart::ChartDataRowSource eDataRowSource = chart::ChartDataRowSource_COLUMNS;
bool bHasCategories = pChartObj->HasRowHeaders();
-@@ -391,7 +391,7 @@
+@@ -384,7 +384,7 @@
}
String sRangeStr;
@@ -307,7 +357,7 @@
lcl_SetChartParameters( xReceiver, sRangeStr, eDataRowSource, bHasCategories, bFirstCellAsLabel );
-@@ -552,7 +552,8 @@
+@@ -545,7 +545,8 @@
for ( sal_Int32 i=0; i<nRangeCount; i++ )
{
ScRange aRange;
@@ -317,7 +367,7 @@
aRanges->Append( aRange );
}
-@@ -684,7 +685,7 @@
+@@ -677,7 +678,7 @@
lcl_GetChartParameters( xChartDoc, aRangesStr, eDataRowSource, bHasCategories, bFirstCellAsLabel );
String sRangeStr;
@@ -329,12 +379,12 @@
Index: sc/source/core/data/global.cxx
===================================================================
RCS file: /cvs/sc/sc/source/core/data/global.cxx,v
-retrieving revision 1.54
-retrieving revision 1.54.12.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.54 -r1.54.12.2
---- sc/source/core/data/global.cxx 7 Mar 2008 11:13:15 -0000 1.54
-+++ sc/source/core/data/global.cxx 18 Mar 2008 23:14:31 -0000 1.54.12.2
-@@ -1308,7 +1308,15 @@
+retrieving revision 1.55
+retrieving revision 1.54.12.3
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.55 -r1.54.12.3
+--- sc/source/core/data/global.cxx 10 Apr 2008 19:29:17 -0000 1.55
++++ sc/source/core/data/global.cxx 23 Apr 2008 15:10:52 -0000 1.54.12.3
+@@ -1285,7 +1285,15 @@
if ( nStrLen < nStart )
return nStart;
@@ -350,7 +400,7 @@
BOOL bFound = FALSE;
while ( !bFound && (nStart < nStrLen) )
-@@ -1321,9 +1329,9 @@
+@@ -1298,9 +1306,9 @@
while ( (nStart < nStrLen) && rStr.GetChar(nStart) != '"' )
nStart++;
}
@@ -362,7 +412,7 @@
{
nParCount--;
if ( nParCount == 0 )
-@@ -1334,9 +1342,17 @@
+@@ -1311,9 +1319,17 @@
nStart--; // einen zu weit gelesen
}
}
@@ -382,7 +432,7 @@
{
bFound = TRUE;
nStart--; // einen zu weit gelesen
-@@ -1357,7 +1373,15 @@
+@@ -1334,7 +1350,15 @@
if ( nStrLen < nStart )
return nStart;
@@ -398,7 +448,7 @@
BOOL bFound = FALSE;
while ( !bFound && (nStart < nStrLen) )
-@@ -1370,19 +1394,27 @@
+@@ -1347,19 +1371,27 @@
while ( (nStart < nStrLen) && rStr.GetChar(nStart) != '"' )
nStart++;
}
@@ -430,7 +480,7 @@
{
nArg--;
bFound = ( nArg == 0 );
-@@ -1788,6 +1820,8 @@
+@@ -1765,6 +1797,8 @@
String ScFuncDesc::GetParamList() const
{
@@ -439,7 +489,7 @@
String aSig;
if ( nArgCount > 0 )
-@@ -1805,7 +1839,10 @@
+@@ -1782,7 +1816,10 @@
nLastAdded = i;
aSig += *(ppDefArgNames[i]);
if ( i != nArgCount-1 )
@@ -451,7 +501,7 @@
}
}
// If only suppressed parameters follow the last added parameter,
-@@ -1822,7 +1859,8 @@
+@@ -1799,7 +1836,8 @@
if (!pDefArgFlags[nArg].bSuppress)
{
aSig += *(ppDefArgNames[nArg]);
@@ -461,7 +511,7 @@
}
}
/* NOTE: Currently there are no suppressed var args parameters. If
-@@ -1831,10 +1869,12 @@
+@@ -1808,10 +1846,12 @@
* treatment of a trailing "; " necessary. */
aSig += *(ppDefArgNames[nFix]);
aSig += '1';
@@ -476,7 +526,7 @@
}
}
-@@ -1869,6 +1909,8 @@
+@@ -1846,6 +1886,8 @@
String ScFuncDesc::GetFormulaString( String** aArgArr ) const
{
@@ -485,7 +535,7 @@
String aFormula;
if(pFuncName)
-@@ -1891,7 +1933,7 @@
+@@ -1868,7 +1910,7 @@
{
bLastArg = !( aArgArr[i+1]->Len() > 0 );
if ( !bLastArg )
@@ -497,12 +547,12 @@
Index: sc/source/core/data/validat.cxx
===================================================================
RCS file: /cvs/sc/sc/source/core/data/validat.cxx,v
-retrieving revision 1.22
-retrieving revision 1.22.12.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.22 -r1.22.12.1
---- sc/source/core/data/validat.cxx 6 Mar 2008 15:27:23 -0000 1.22
-+++ sc/source/core/data/validat.cxx 20 Mar 2008 23:19:42 -0000 1.22.12.1
-@@ -296,7 +296,7 @@
+retrieving revision 1.23
+retrieving revision 1.22.12.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.23 -r1.22.12.2
+--- sc/source/core/data/validat.cxx 10 Apr 2008 19:37:10 -0000 1.23
++++ sc/source/core/data/validat.cxx 23 Apr 2008 15:10:31 -0000 1.22.12.2
+@@ -288,7 +288,7 @@
// 2) Position der Zelle
String aPosStr;
@@ -511,7 +561,7 @@
aParams[1] = ::com::sun::star::uno::makeAny( ::rtl::OUString( aPosStr ) );
// use link-update flag to prevent closing the document
-@@ -430,7 +430,7 @@
+@@ -422,7 +422,7 @@
// 2) Position der Zelle
String aPosStr;
@@ -523,12 +573,12 @@
Index: sc/source/core/tool/address.cxx
===================================================================
RCS file: /cvs/sc/sc/source/core/tool/address.cxx,v
-retrieving revision 1.10
-retrieving revision 1.10.78.3
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.10 -r1.10.78.3
---- sc/source/core/tool/address.cxx 10 Jan 2008 13:12:58 -0000 1.10
-+++ sc/source/core/tool/address.cxx 25 Mar 2008 23:03:18 -0000 1.10.78.3
-@@ -428,7 +428,7 @@
+retrieving revision 1.11
+retrieving revision 1.10.78.4
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.11 -r1.10.78.4
+--- sc/source/core/tool/address.cxx 10 Apr 2008 19:45:36 -0000 1.11
++++ sc/source/core/tool/address.cxx 23 Apr 2008 15:11:10 -0000 1.10.78.4
+@@ -423,7 +423,7 @@
const ScAddress::Details& rDetails,
BOOL bOnlyAcceptSingle )
{
@@ -537,7 +587,7 @@
String aExternDocName, aStartTabName, aEndTabName;
USHORT nFlags = SCA_VALID | SCA_VALID_TAB, nFlags2 = SCA_VALID_TAB2;
-@@ -453,11 +453,25 @@
+@@ -448,11 +448,25 @@
{
if( p[0] != ':' || (p[1] != 'R' && p[1] != 'r' ) ||
NULL == (pTmp = lcl_r1c1_get_row( p+1, rDetails, &r.aEnd, &nFlags2 )))
@@ -565,7 +615,7 @@
nFlags |=
SCA_VALID_COL | SCA_VALID_COL2 |
-@@ -477,9 +491,29 @@
+@@ -472,9 +486,29 @@
(*pTmp != 'C' && *pTmp != 'c') ||
NULL == (pTmp = lcl_r1c1_get_col( pTmp, rDetails, &r.aEnd, &nFlags2 )))
{
@@ -595,7 +645,7 @@
nFlags |= (nFlags2 << 4);
return bOnlyAcceptSingle ? 0 : lcl_XL_LinkSheetRef( r, pDoc,
-@@ -497,7 +531,17 @@
+@@ -492,7 +526,17 @@
r.aEnd.SetCol( r.aStart.Col() );
}
else
@@ -613,7 +663,7 @@
nFlags |=
SCA_VALID_ROW | SCA_VALID_ROW2 |
-@@ -623,10 +667,24 @@
+@@ -618,10 +662,24 @@
// prepare as if it's a singleton, in case we want to fall back */
r.aEnd.SetCol( r.aStart.Col() );
r.aEnd.SetRow( r.aStart.Row() ); // don't overwrite sheet number as parsed in lcl_ScRange_Parse_XL_Header
@@ -640,7 +690,7 @@
return nFlags;
}
-@@ -640,6 +698,14 @@
+@@ -635,6 +693,14 @@
return lcl_XL_LinkSheetRef( r, pDoc,
aExternDocName, aStartTabName, aEndTabName, nFlags );
@@ -655,7 +705,7 @@
nFlags |= (nFlags2 << 4);
return lcl_XL_LinkSheetRef( r, pDoc,
aExternDocName, aStartTabName, aEndTabName, nFlags );
-@@ -1334,9 +1400,12 @@
+@@ -1329,9 +1395,12 @@
case CONV_XL_A1:
case CONV_XL_R1C1:
@@ -668,7 +718,7 @@
r += aTabName;
r += '!';
break;
-@@ -1434,6 +1503,7 @@
+@@ -1429,6 +1498,7 @@
void ScRange::Format( String& r, USHORT nFlags, ScDocument* pDoc,
const ScAddress::Details& rDetails ) const
{
@@ -679,12 +729,12 @@
Index: sc/source/core/tool/chgtrack.cxx
===================================================================
RCS file: /cvs/sc/sc/source/core/tool/chgtrack.cxx,v
-retrieving revision 1.29
-retrieving revision 1.29.12.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.29 -r1.29.12.1
---- sc/source/core/tool/chgtrack.cxx 7 Mar 2008 12:17:43 -0000 1.29
-+++ sc/source/core/tool/chgtrack.cxx 20 Mar 2008 23:19:50 -0000 1.29.12.1
-@@ -667,7 +667,7 @@
+retrieving revision 1.31
+retrieving revision 1.29.12.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.31 -r1.29.12.2
+--- sc/source/core/tool/chgtrack.cxx 15 Apr 2008 14:12:07 -0000 1.31
++++ sc/source/core/tool/chgtrack.cxx 23 Apr 2008 15:11:05 -0000 1.29.12.2
+@@ -664,7 +664,7 @@
default:
if ( bFlag3D || GetType() == SC_CAT_INSERT_TABS )
nFlags |= SCA_TAB_3D;
@@ -693,7 +743,7 @@
}
if ( (bFlag3D && IsDeleteType()) || IsDeletedIn() )
{
-@@ -2054,7 +2054,7 @@
+@@ -2191,7 +2191,7 @@
ScAddress aTmpAddress( GetBigRange().aStart.MakeAddress() );
if ( bFlag3D )
nFlags |= SCA_TAB_3D;
@@ -705,12 +755,12 @@
Index: sc/source/core/tool/compiler.cxx
===================================================================
RCS file: /cvs/sc/sc/source/core/tool/compiler.cxx,v
-retrieving revision 1.75
-retrieving revision 1.75.12.7
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.75 -r1.75.12.7
---- sc/source/core/tool/compiler.cxx 7 Mar 2008 11:17:09 -0000 1.75
-+++ sc/source/core/tool/compiler.cxx 31 Mar 2008 20:07:26 -0000 1.75.12.7
-@@ -47,6 +47,7 @@
+retrieving revision 1.76
+retrieving revision 1.75.12.10
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.76 -r1.75.12.10
+--- sc/source/core/tool/compiler.cxx 10 Apr 2008 19:49:59 -0000 1.76
++++ sc/source/core/tool/compiler.cxx 25 Apr 2008 19:28:12 -0000 1.75.12.10
+@@ -42,6 +42,7 @@
#include <tools/rc.hxx>
#include <tools/solar.h>
#include <unotools/charclass.hxx>
@@ -718,7 +768,7 @@
#include <com/sun/star/sheet/FormulaOpCodeMapEntry.hpp>
#include <com/sun/star/sheet/FormulaLanguage.hpp>
#include <com/sun/star/sheet/FormulaMapGroup.hpp>
-@@ -222,23 +223,116 @@
+@@ -209,23 +210,116 @@
class ScOpCodeList : public Resource // temp object for resource
{
public:
@@ -764,7 +814,7 @@
FreeResource();
}
-+void ScOpCodeList::init( ScGrammar::Grammar eGrammar )
++void ScOpCodeList::init( ScGrammar::Grammar /*eGrammar*/ )
+{
+ using namespace ::com::sun::star::sheet;
+
@@ -843,7 +893,7 @@
class ScCompilerRecursionGuard
{
-@@ -323,7 +417,7 @@
+@@ -310,7 +404,7 @@
// Core
mxSymbolsNative.reset( new OpCodeMap( SC_OPCODE_LAST_OPCODE_ID + 1,
true, ScGrammar::GRAM_NATIVE_UI));
@@ -852,7 +902,7 @@
// No AddInMap for native core mapping.
}
-@@ -1301,11 +1395,12 @@
+@@ -1288,11 +1382,12 @@
{
ComplRefData aRef( rRef );
@@ -867,15 +917,50 @@
if( aRef.Ref1.IsColDeleted() || aRef.Ref1.IsRowDeleted() )
{
rBuf.append(ScGlobal::GetRscString(STR_NO_REF_TABLE));
+@@ -1491,6 +1586,7 @@
+ bCorrected( FALSE ),
+ bCompileForFAP( FALSE ),
+ bIgnoreErrors( FALSE ),
++ pConv( pConvOOO_A1 ),
+ mbCloseBrackets( true ),
+ meGrammar( ScGrammar::GRAM_UNSPECIFIED )
+ {
+@@ -1514,6 +1610,7 @@
+ bCorrected( FALSE ),
+ bCompileForFAP( FALSE ),
+ bIgnoreErrors( FALSE ),
++ pConv( pConvOOO_A1 ),
+ mbCloseBrackets( true ),
+ meGrammar( ScGrammar::GRAM_UNSPECIFIED )
+ {
+@@ -3001,8 +3098,7 @@
+ return FALSE;
+ }
+
+-ScTokenArray* ScCompiler::CompileString( const String& rFormula,
+- ScAddress::Convention eConv )
++ScTokenArray* ScCompiler::CompileString( const String& rFormula )
+ {
+ #if 0
+ fprintf( stderr, "CompileString '%s'\n",
+@@ -3013,8 +3109,6 @@
+ pArr = &aArr;
+ aFormula = rFormula;
+
+- SetRefConvention( eConv );
+-
+ aFormula.EraseLeadingChars();
+ aFormula.EraseTrailingChars();
+ nSrcPos = 0;
Index: sc/source/core/tool/interpr1.cxx
===================================================================
RCS file: /cvs/sc/sc/source/core/tool/interpr1.cxx,v
-retrieving revision 1.56
-retrieving revision 1.56.12.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.56 -r1.56.12.1
---- sc/source/core/tool/interpr1.cxx 6 Mar 2008 15:32:04 -0000 1.56
-+++ sc/source/core/tool/interpr1.cxx 20 Mar 2008 23:19:50 -0000 1.56.12.1
-@@ -1690,7 +1690,7 @@
+retrieving revision 1.57
+retrieving revision 1.56.12.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.57 -r1.56.12.2
+--- sc/source/core/tool/interpr1.cxx 10 Apr 2008 19:54:01 -0000 1.57
++++ sc/source/core/tool/interpr1.cxx 23 Apr 2008 15:11:17 -0000 1.56.12.2
+@@ -1683,7 +1683,7 @@
else if( aInfoType.EqualsAscii( "ADDRESS" ) )
{ // address formatted as [['FILENAME'#]$TABLE.]$COL$ROW
USHORT nFlags = (aCellPos.Tab() == aPos.Tab()) ? (SCA_ABS) : (SCA_ABS_3D);
@@ -884,7 +969,7 @@
PushString( aFuncResult );
}
else if( aInfoType.EqualsAscii( "FILENAME" ) )
-@@ -1720,10 +1720,12 @@
+@@ -1713,10 +1713,12 @@
else if( aInfoType.EqualsAscii( "COORD" ) )
{ // address, lotus 1-2-3 formatted: $TABLE:$COL$ROW
// Yes, passing tab as col is intentional!
@@ -902,12 +987,12 @@
Index: sc/source/core/tool/rangenam.cxx
===================================================================
RCS file: /cvs/sc/sc/source/core/tool/rangenam.cxx,v
-retrieving revision 1.27
-retrieving revision 1.27.12.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.27 -r1.27.12.1
---- sc/source/core/tool/rangenam.cxx 6 Mar 2008 15:36:41 -0000 1.27
-+++ sc/source/core/tool/rangenam.cxx 19 Mar 2008 17:37:12 -0000 1.27.12.1
-@@ -166,7 +166,7 @@
+retrieving revision 1.28
+retrieving revision 1.27.12.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.28 -r1.27.12.2
+--- sc/source/core/tool/rangenam.cxx 10 Apr 2008 19:58:56 -0000 1.28
++++ sc/source/core/tool/rangenam.cxx 23 Apr 2008 15:11:31 -0000 1.27.12.2
+@@ -159,7 +159,7 @@
aRefData.InitAddress( rTarget );
aRefData.SetFlag3D( TRUE );
pCode->AddSingleReference( aRefData );
@@ -916,7 +1001,7 @@
aComp.CompileTokenArray();
if ( !pCode->GetCodeError() )
eType |= RT_ABSPOS;
-@@ -288,7 +288,7 @@
+@@ -281,7 +281,7 @@
if( pCode->GetNextReference() )
{
BOOL bSharedFormula = ((eType & RT_SHARED) == RT_SHARED);
@@ -925,7 +1010,7 @@
BOOL bRelRef = aComp.UpdateNameReference( eUpdateRefMode, r,
nDx, nDy, nDz,
bChanged, bSharedFormula);
-@@ -419,7 +419,7 @@
+@@ -412,7 +412,7 @@
if ( pCode )
{
::std::auto_ptr<ScTokenArray> pTemp( pCode->Clone() );
@@ -934,7 +1019,7 @@
aComp.MoveRelWrap();
return pTemp->IsReference( rRange );
}
-@@ -443,7 +443,7 @@
+@@ -436,7 +436,7 @@
{
ScRangeData* pRangeData = NULL; // must not be dereferenced
BOOL bChanged;
@@ -943,7 +1028,7 @@
switch (nFlag)
{
case 1: // einfache InsertTab (doc.cxx)
-@@ -606,7 +606,7 @@
+@@ -599,7 +599,7 @@
}
if ( bCompile )
{
@@ -955,12 +1040,12 @@
Index: sc/source/core/tool/rangeutl.cxx
===================================================================
RCS file: /cvs/sc/sc/source/core/tool/rangeutl.cxx,v
-retrieving revision 1.11
-retrieving revision 1.10.276.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.11 -r1.10.276.2
---- sc/source/core/tool/rangeutl.cxx 12 Mar 2008 13:14:16 -0000 1.11
-+++ sc/source/core/tool/rangeutl.cxx 31 Mar 2008 20:24:13 -0000 1.10.276.2
-@@ -475,7 +475,7 @@
+retrieving revision 1.12
+retrieving revision 1.10.276.3
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.12 -r1.10.276.3
+--- sc/source/core/tool/rangeutl.cxx 10 Apr 2008 19:59:29 -0000 1.12
++++ sc/source/core/tool/rangeutl.cxx 23 Apr 2008 15:10:59 -0000 1.10.276.3
+@@ -468,7 +468,7 @@
OUString sToken;
GetTokenByOffset( sToken, rAddressStr, nOffset, cSeperator, cQuote );
if( nOffset >= 0 )
@@ -969,7 +1054,7 @@
return sal_False;
}
-@@ -499,7 +499,7 @@
+@@ -492,7 +492,7 @@
{
if ( aUIString.GetChar(0) == (sal_Unicode) '.' )
aUIString.Erase( 0, 1 );
@@ -978,7 +1063,7 @@
rRange.aEnd = rRange.aStart;
}
else
-@@ -640,7 +640,7 @@
+@@ -633,7 +633,7 @@
if (pDocument && pDocument->HasTable(rAddress.Tab()))
{
String sAddress;
@@ -987,7 +1072,7 @@
AssignString( rString, sAddress, bAppendStr, cSeperator );
}
}
-@@ -659,10 +659,9 @@
+@@ -652,10 +652,9 @@
ScAddress aEndAddress( rRange.aEnd );
String sStartAddress;
String sEndAddress;
@@ -1004,12 +1089,12 @@
Index: sc/source/core/tool/reffind.cxx
===================================================================
RCS file: /cvs/sc/sc/source/core/tool/reffind.cxx,v
-retrieving revision 1.6
-retrieving revision 1.6.314.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.6 -r1.6.314.1
---- sc/source/core/tool/reffind.cxx 27 Feb 2007 12:18:37 -0000 1.6
-+++ sc/source/core/tool/reffind.cxx 20 Mar 2008 23:19:51 -0000 1.6.314.1
-@@ -45,7 +45,7 @@
+retrieving revision 1.7
+retrieving revision 1.6.314.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.7 -r1.6.314.2
+--- sc/source/core/tool/reffind.cxx 10 Apr 2008 20:00:19 -0000 1.7
++++ sc/source/core/tool/reffind.cxx 23 Apr 2008 15:11:20 -0000 1.6.314.2
+@@ -40,7 +40,7 @@
#include "reffind.hxx"
#include "global.hxx"
#include "compiler.hxx"
@@ -1018,7 +1103,7 @@
// STATIC DATA -----------------------------------------------------------
-@@ -142,11 +142,11 @@
+@@ -137,11 +137,11 @@
// Test, ob aExpr eine Referenz ist
@@ -1035,12 +1120,12 @@
Index: sc/source/filter/inc/fdumper.hxx
===================================================================
RCS file: /cvs/sc/sc/source/filter/inc/fdumper.hxx,v
-retrieving revision 1.7
-retrieving revision 1.7.310.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.7 -r1.7.310.1
---- sc/source/filter/inc/fdumper.hxx 27 Feb 2007 12:33:04 -0000 1.7
-+++ sc/source/filter/inc/fdumper.hxx 18 Mar 2008 23:14:33 -0000 1.7.310.1
-@@ -36,7 +36,7 @@
+retrieving revision 1.8
+retrieving revision 1.7.310.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.8 -r1.7.310.2
+--- sc/source/filter/inc/fdumper.hxx 10 Apr 2008 20:32:35 -0000 1.8
++++ sc/source/filter/inc/fdumper.hxx 23 Apr 2008 15:11:36 -0000 1.7.310.2
+@@ -31,7 +31,7 @@
#ifndef SC_FDUMPER_HXX
#define SC_FDUMPER_HXX
@@ -1052,12 +1137,12 @@
Index: sc/source/ui/app/inputwin.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/app/inputwin.cxx,v
-retrieving revision 1.55
-retrieving revision 1.55.12.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.55 -r1.55.12.1
---- sc/source/ui/app/inputwin.cxx 7 Mar 2008 11:19:00 -0000 1.55
-+++ sc/source/ui/app/inputwin.cxx 20 Mar 2008 23:19:57 -0000 1.55.12.1
-@@ -1562,6 +1562,7 @@
+retrieving revision 1.57
+retrieving revision 1.55.12.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.57 -r1.55.12.2
+--- sc/source/ui/app/inputwin.cxx 18 Apr 2008 11:33:17 -0000 1.57
++++ sc/source/ui/app/inputwin.cxx 23 Apr 2008 15:07:23 -0000 1.55.12.2
+@@ -1544,6 +1544,7 @@
ScViewData* pViewData = pViewSh->GetViewData();
ScDocument* pDoc = pViewData->GetDocument();
SCTAB nTab = pViewData->GetTabNo();
@@ -1065,7 +1150,7 @@
// test in same order as in SID_CURRENTCELL execute
-@@ -1571,13 +1572,13 @@
+@@ -1553,13 +1554,13 @@
SCTAB nNameTab;
sal_Int32 nNumeric;
@@ -1086,12 +1171,12 @@
Index: sc/source/ui/dbgui/consdlg.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/dbgui/consdlg.cxx,v
-retrieving revision 1.11
-retrieving revision 1.11.314.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.11 -r1.11.314.2
---- sc/source/ui/dbgui/consdlg.cxx 27 Feb 2007 13:00:57 -0000 1.11
-+++ sc/source/ui/dbgui/consdlg.cxx 21 Mar 2008 05:19:14 -0000 1.11.314.2
-@@ -200,6 +200,7 @@
+retrieving revision 1.12
+retrieving revision 1.11.314.3
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.12 -r1.11.314.3
+--- sc/source/ui/dbgui/consdlg.cxx 10 Apr 2008 21:53:49 -0000 1.12
++++ sc/source/ui/dbgui/consdlg.cxx 23 Apr 2008 15:08:26 -0000 1.11.314.3
+@@ -192,6 +192,7 @@
// Einlesen der Konsolidierungsbereiche
aLbConsAreas.Clear();
@@ -1099,7 +1184,7 @@
for ( i=0; i<theConsData.nDataAreaCount; i++ )
{
const ScArea& rArea = *(theConsData.ppDataAreas[i] );
-@@ -207,7 +208,7 @@
+@@ -199,7 +200,7 @@
{
ScRange( rArea.nColStart, rArea.nRowStart, rArea.nTab,
rArea.nColEnd, rArea.nRowEnd, rArea.nTab ).Format( aStr,
@@ -1108,7 +1193,7 @@
aLbConsAreas.InsertEntry( aStr );
}
}
-@@ -215,7 +216,7 @@
+@@ -207,7 +208,7 @@
if ( theConsData.nTab < pDoc->GetTableCount() )
{
ScAddress( theConsData.nCol, theConsData.nRow, theConsData.nTab
@@ -1117,7 +1202,7 @@
aEdDestArea.SetText( aStr );
}
else
-@@ -248,7 +249,7 @@
+@@ -240,7 +241,7 @@
ScAreaNameIterator aIter( pDoc );
while ( aIter.Next( aStrName, aRange ) )
{
@@ -1126,7 +1211,7 @@
pAreaData[nAt++].Set( aStrName, aStrArea, aIter.WasDBName() );
}
}
-@@ -305,14 +306,15 @@
+@@ -297,14 +298,15 @@
String aStr;
USHORT nFmt = SCR_ABS_3D; //!!! nCurTab fehlt noch
@@ -1144,7 +1229,7 @@
pRefInputEdit->SetRefString( aStr );
}
-@@ -369,11 +371,12 @@
+@@ -361,11 +363,12 @@
SCTAB nTab = pViewData->GetTabNo();
BOOL bEditOk = FALSE;
String theCompleteStr;
@@ -1158,7 +1243,7 @@
}
else if ( pEd == &aEdDestArea )
{
-@@ -381,7 +384,7 @@
+@@ -373,7 +376,7 @@
pRangeUtil->CutPosString( pEd->GetText(), aPosStr );
bEditOk = pRangeUtil->IsAbsPos( aPosStr, pDoc,
@@ -1167,7 +1252,7 @@
}
if ( bEditOk )
-@@ -425,8 +428,9 @@
+@@ -417,8 +420,9 @@
ScRefAddress aDestAddress;
SCTAB nTab = pViewData->GetTabNo();
String aDestPosStr( aEdDestArea.GetText() );
@@ -1178,7 +1263,7 @@
{
ScConsolidateParam theOutParam( theConsData );
ScArea** ppDataAreas = new ScArea*[nDataAreaCount];
-@@ -437,7 +441,7 @@
+@@ -429,7 +433,7 @@
{
pArea = new ScArea;
pRangeUtil->MakeArea( aLbConsAreas.GetEntry( i ),
@@ -1187,7 +1272,7 @@
ppDataAreas[i] = pArea;
}
-@@ -488,8 +492,9 @@
+@@ -480,8 +484,9 @@
String aNewEntry( aEdDataArea.GetText() );
ScArea** ppAreas = NULL;
USHORT nAreaCount = 0;
@@ -1198,7 +1283,7 @@
{
// IsAbsTabArea() legt ein Array von ScArea-Zeigern an,
// welche ebenfalls dynamisch erzeugt wurden.
-@@ -504,7 +509,7 @@
+@@ -496,7 +501,7 @@
const ScArea& rArea = *(ppAreas[i]);
ScRange( rArea.nColStart, rArea.nRowStart, rArea.nTab,
rArea.nColEnd, rArea.nRowEnd, rArea.nTab
@@ -1210,12 +1295,12 @@
Index: sc/source/ui/dbgui/dbnamdlg.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/dbgui/dbnamdlg.cxx,v
-retrieving revision 1.8
-retrieving revision 1.8.314.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.8 -r1.8.314.2
---- sc/source/ui/dbgui/dbnamdlg.cxx 27 Feb 2007 13:02:23 -0000 1.8
-+++ sc/source/ui/dbgui/dbnamdlg.cxx 20 Mar 2008 23:20:04 -0000 1.8.314.2
-@@ -189,6 +189,7 @@
+retrieving revision 1.9
+retrieving revision 1.8.314.3
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.9 -r1.8.314.3
+--- sc/source/ui/dbgui/dbnamdlg.cxx 10 Apr 2008 21:57:44 -0000 1.9
++++ sc/source/ui/dbgui/dbnamdlg.cxx 23 Apr 2008 15:08:33 -0000 1.8.314.3
+@@ -184,6 +184,7 @@
pViewData ( ptrViewData ),
pDoc ( ptrViewData->GetDocument() ),
bRefInputMode ( FALSE ),
@@ -1223,7 +1308,7 @@
aLocalDbCol ( *(pDoc->GetDBCollection()) )
{
// WB_NOLABEL can't be set in resource...
-@@ -263,7 +264,7 @@
+@@ -258,7 +259,7 @@
theCurArea = ScRange( ScAddress( nStartCol, nStartRow, nStartTab ),
ScAddress( nEndCol, nEndRow, nEndTab ) );
@@ -1232,7 +1317,7 @@
if ( pDBColl )
{
-@@ -342,7 +343,7 @@
+@@ -337,7 +338,7 @@
theCurArea = rRef;
String aRefStr;
@@ -1241,7 +1326,7 @@
aEdAssign.SetRefString( aRefStr );
aBtnHeader.Enable();
aBtnDoSize.Enable();
-@@ -437,7 +438,7 @@
+@@ -432,7 +433,7 @@
pData->GetArea( nTab, nColStart, nRowStart, nColEnd, nRowEnd );
theCurArea = ScRange( ScAddress( nColStart, nRowStart, nTab ),
ScAddress( nColEnd, nRowEnd, nTab ) );
@@ -1250,7 +1335,7 @@
aEdAssign.SetText( theArea );
aBtnAdd.SetText( aStrModify );
aBtnHeader.Check( pData->HasHeader() );
-@@ -511,7 +512,7 @@
+@@ -506,7 +507,7 @@
// weil jetzt editiert werden kann, muss erst geparst werden
ScRange aTmpRange;
String aText = aEdAssign.GetText();
@@ -1259,7 +1344,7 @@
{
theCurArea = aTmpRange;
ScAddress aStart = theCurArea.aStart;
-@@ -730,7 +731,7 @@
+@@ -725,7 +726,7 @@
ScRange aTmpRange;
String aText = aEdAssign.GetText();
@@ -1271,12 +1356,12 @@
Index: sc/source/ui/dbgui/filtdlg.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/dbgui/filtdlg.cxx,v
-retrieving revision 1.15
-retrieving revision 1.15.70.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.15 -r1.15.70.1
---- sc/source/ui/dbgui/filtdlg.cxx 29 Jan 2008 15:40:34 -0000 1.15
-+++ sc/source/ui/dbgui/filtdlg.cxx 20 Mar 2008 23:20:04 -0000 1.15.70.1
-@@ -316,7 +316,7 @@
+retrieving revision 1.16
+retrieving revision 1.15.70.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.16 -r1.15.70.2
+--- sc/source/ui/dbgui/filtdlg.cxx 10 Apr 2008 21:59:26 -0000 1.16
++++ sc/source/ui/dbgui/filtdlg.cxx 23 Apr 2008 15:08:30 -0000 1.15.70.2
+@@ -303,7 +303,7 @@
if ( rRef.aStart != rRef.aEnd )
RefInputStart( &aEdCopyArea );
String aRefStr;
@@ -1285,7 +1370,7 @@
aEdCopyArea.SetRefString( aRefStr );
}
}
-@@ -545,7 +545,7 @@
+@@ -532,7 +532,7 @@
if ( STRING_NOTFOUND != nColonPos )
theCopyStr.Erase( nColonPos );
@@ -1297,12 +1382,12 @@
Index: sc/source/ui/dbgui/foptmgr.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/dbgui/foptmgr.cxx,v
-retrieving revision 1.6
-retrieving revision 1.6.314.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.6 -r1.6.314.2
---- sc/source/ui/dbgui/foptmgr.cxx 27 Feb 2007 13:03:27 -0000 1.6
-+++ sc/source/ui/dbgui/foptmgr.cxx 21 Mar 2008 03:44:02 -0000 1.6.314.2
-@@ -153,8 +153,9 @@
+retrieving revision 1.7
+retrieving revision 1.6.314.3
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.7 -r1.6.314.3
+--- sc/source/ui/dbgui/foptmgr.cxx 10 Apr 2008 21:59:42 -0000 1.7
++++ sc/source/ui/dbgui/foptmgr.cxx 23 Apr 2008 15:08:44 -0000 1.6.314.3
+@@ -148,8 +148,9 @@
ScDBCollection* pDBColl = pDoc->GetDBCollection();
String theDbArea;
String theDbName = rStrNoName;
@@ -1313,7 +1398,7 @@
// Zielbereichsliste fuellen
-@@ -169,7 +170,7 @@
+@@ -164,7 +165,7 @@
{
USHORT nInsert = rLbCopyPos.InsertEntry( aName );
@@ -1322,7 +1407,7 @@
rLbCopyPos.SetEntryData( nInsert, new String( aRefStr ) );
}
-@@ -218,7 +219,7 @@
+@@ -213,7 +214,7 @@
ScAddress( rQueryData.nDestCol,
rQueryData.nDestRow,
rQueryData.nDestTab
@@ -1331,7 +1416,7 @@
rBtnCopyResult.Check( TRUE );
rEdCopyPos.SetText( aString );
-@@ -253,7 +254,7 @@
+@@ -248,7 +249,7 @@
if ( STRING_NOTFOUND != nColonPos )
aPosStr.Erase( nColonPos );
@@ -1340,7 +1425,7 @@
return ( SCA_VALID == (nResult & SCA_VALID) );
}
-@@ -288,7 +289,7 @@
+@@ -283,7 +284,7 @@
if ( pEd == &rEdCopyPos )
{
String theCurPosStr = pEd->GetText();
@@ -1352,12 +1437,12 @@
Index: sc/source/ui/dbgui/pfiltdlg.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/dbgui/pfiltdlg.cxx,v
-retrieving revision 1.9
-retrieving revision 1.9.314.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.9 -r1.9.314.1
---- sc/source/ui/dbgui/pfiltdlg.cxx 27 Feb 2007 13:03:51 -0000 1.9
-+++ sc/source/ui/dbgui/pfiltdlg.cxx 20 Mar 2008 23:20:04 -0000 1.9.314.1
-@@ -192,7 +192,7 @@
+retrieving revision 1.10
+retrieving revision 1.9.314.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.10 -r1.9.314.2
+--- sc/source/ui/dbgui/pfiltdlg.cxx 10 Apr 2008 22:03:52 -0000 1.10
++++ sc/source/ui/dbgui/pfiltdlg.cxx 23 Apr 2008 15:08:23 -0000 1.9.314.2
+@@ -184,7 +184,7 @@
* Bereich um einen Datenbankbereich handelt:
*/
@@ -1369,12 +1454,12 @@
Index: sc/source/ui/dbgui/sfiltdlg.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/dbgui/sfiltdlg.cxx,v
-retrieving revision 1.12
-retrieving revision 1.12.314.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.12 -r1.12.314.2
---- sc/source/ui/dbgui/sfiltdlg.cxx 27 Feb 2007 13:05:11 -0000 1.12
-+++ sc/source/ui/dbgui/sfiltdlg.cxx 21 Mar 2008 03:54:21 -0000 1.12.314.2
-@@ -197,7 +197,7 @@
+retrieving revision 1.13
+retrieving revision 1.12.314.3
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.13 -r1.12.314.3
+--- sc/source/ui/dbgui/sfiltdlg.cxx 10 Apr 2008 22:07:21 -0000 1.13
++++ sc/source/ui/dbgui/sfiltdlg.cxx 23 Apr 2008 15:08:37 -0000 1.12.314.3
+@@ -186,7 +186,7 @@
if (rQueryItem.GetAdvancedQuerySource(aAdvSource))
{
String aRefStr;
@@ -1383,7 +1468,7 @@
aEdFilterArea.SetRefString( aRefStr );
}
}
-@@ -260,11 +260,12 @@
+@@ -249,11 +249,12 @@
RefInputStart( pRefInputEdit );
String aRefStr;
@@ -1398,7 +1483,7 @@
pRefInputEdit->SetRefString( aRefStr );
}
-@@ -334,6 +335,7 @@
+@@ -323,6 +324,7 @@
BOOL bEditInputOk = TRUE;
BOOL bQueryOk = FALSE;
ScRange theFilterArea;
@@ -1406,7 +1491,7 @@
if ( aBtnCopyResult.IsChecked() )
{
-@@ -342,7 +344,7 @@
+@@ -331,7 +333,7 @@
if ( STRING_NOTFOUND != nColonPos )
theCopyStr.Erase( nColonPos );
@@ -1415,7 +1500,7 @@
if ( SCA_VALID != (nResult & SCA_VALID) )
{
-@@ -357,7 +359,7 @@
+@@ -346,7 +348,7 @@
if ( bEditInputOk )
{
@@ -1424,7 +1509,7 @@
if ( SCA_VALID != (nResult & SCA_VALID) )
{
-@@ -375,7 +377,7 @@
+@@ -364,7 +366,7 @@
* ein ScQueryParam zu erzeugen:
*/
@@ -1436,12 +1521,12 @@
Index: sc/source/ui/dbgui/tpsort.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/dbgui/tpsort.cxx,v
-retrieving revision 1.12
-retrieving revision 1.12.314.3
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.12 -r1.12.314.3
---- sc/source/ui/dbgui/tpsort.cxx 27 Feb 2007 13:05:23 -0000 1.12
-+++ sc/source/ui/dbgui/tpsort.cxx 21 Mar 2008 03:30:33 -0000 1.12.314.3
-@@ -633,6 +633,7 @@
+retrieving revision 1.13
+retrieving revision 1.12.314.4
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.13 -r1.12.314.4
+--- sc/source/ui/dbgui/tpsort.cxx 10 Apr 2008 22:08:12 -0000 1.13
++++ sc/source/ui/dbgui/tpsort.cxx 23 Apr 2008 15:08:47 -0000 1.12.314.4
+@@ -628,6 +628,7 @@
String theDbArea;
String theDbName = aStrNoName;
const SCTAB nCurTab = pViewData->GetTabNo();
@@ -1449,7 +1534,7 @@
aLbOutPos.Clear();
aLbOutPos.InsertEntry( aStrUndefined, 0 );
-@@ -646,7 +647,7 @@
+@@ -641,7 +642,7 @@
{
USHORT nInsert = aLbOutPos.InsertEntry( aName );
@@ -1458,7 +1543,7 @@
aLbOutPos.SetEntryData( nInsert, new String( aRefStr ) );
}
-@@ -661,7 +662,7 @@
+@@ -656,7 +657,7 @@
ScAddress aScAddress( rSortData.nCol1, rSortData.nRow1, nCurTab );
ScRange( aScAddress,
ScAddress( rSortData.nCol2, rSortData.nRow2, nCurTab )
@@ -1467,7 +1552,7 @@
if ( pDBColl )
{
-@@ -762,7 +763,7 @@
+@@ -757,7 +758,7 @@
rSortData.nDestRow,
rSortData.nDestTab );
@@ -1476,7 +1561,7 @@
aBtnCopyResult.Check();
aLbOutPos.Enable();
aEdOutPos.Enable();
-@@ -874,7 +875,7 @@
+@@ -869,7 +870,7 @@
thePos.SetTab( pViewData->GetTabNo() );
}
@@ -1485,7 +1570,7 @@
bPosInputOk = ( SCA_VALID == (nResult & SCA_VALID) );
-@@ -993,7 +994,7 @@
+@@ -988,7 +989,7 @@
if ( pEd == &aEdOutPos )
{
String theCurPosStr = aEdOutPos.GetText();
@@ -1497,12 +1582,12 @@
Index: sc/source/ui/docshell/arealink.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/docshell/arealink.cxx,v
-retrieving revision 1.26
-retrieving revision 1.26.224.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.26 -r1.26.224.1
---- sc/source/ui/docshell/arealink.cxx 6 Jul 2007 12:41:42 -0000 1.26
-+++ sc/source/ui/docshell/arealink.cxx 20 Mar 2008 23:20:14 -0000 1.26.224.1
-@@ -233,7 +233,8 @@
+retrieving revision 1.27
+retrieving revision 1.26.224.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.27 -r1.26.224.2
+--- sc/source/ui/docshell/arealink.cxx 10 Apr 2008 22:09:29 -0000 1.27
++++ sc/source/ui/docshell/arealink.cxx 23 Apr 2008 15:10:12 -0000 1.26.224.2
+@@ -228,7 +228,8 @@
}
if (!bFound) // direct reference (range or cell)
{
@@ -1515,12 +1600,12 @@
Index: sc/source/ui/docshell/docfunc.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/docshell/docfunc.cxx,v
-retrieving revision 1.68
-retrieving revision 1.68.12.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.68 -r1.68.12.1
---- sc/source/ui/docshell/docfunc.cxx 6 Mar 2008 16:11:13 -0000 1.68
-+++ sc/source/ui/docshell/docfunc.cxx 19 Mar 2008 17:37:12 -0000 1.68.12.1
-@@ -2229,21 +2229,21 @@
+retrieving revision 1.69
+retrieving revision 1.68.12.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.69 -r1.68.12.2
+--- sc/source/ui/docshell/docfunc.cxx 10 Apr 2008 22:11:00 -0000 1.69
++++ sc/source/ui/docshell/docfunc.cxx 23 Apr 2008 15:10:23 -0000 1.68.12.2
+@@ -2222,21 +2222,21 @@
return TRUE;
}
@@ -1549,12 +1634,12 @@
Index: sc/source/ui/docshell/docsh4.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/docshell/docsh4.cxx,v
-retrieving revision 1.59
-retrieving revision 1.59.12.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.59 -r1.59.12.1
---- sc/source/ui/docshell/docsh4.cxx 7 Mar 2008 12:20:01 -0000 1.59
-+++ sc/source/ui/docshell/docsh4.cxx 20 Mar 2008 23:20:14 -0000 1.59.12.1
-@@ -302,7 +302,7 @@
+retrieving revision 1.61
+retrieving revision 1.59.12.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.61 -r1.59.12.2
+--- sc/source/ui/docshell/docsh4.cxx 15 Apr 2008 14:33:07 -0000 1.61
++++ sc/source/ui/docshell/docsh4.cxx 23 Apr 2008 15:10:17 -0000 1.59.12.2
+@@ -286,7 +286,7 @@
if ( !pDBColl || !pDBColl->SearchName( sTarget, nDummy ) )
{
ScAddress aPos;
@@ -1563,7 +1648,7 @@
{
bMakeArea = TRUE;
if (bUndo)
-@@ -389,7 +389,8 @@
+@@ -373,7 +373,8 @@
bRowInit = TRUE;
}
@@ -1573,7 +1658,7 @@
if (!bValid)
{
aRangeListRef = new ScRangeList;
-@@ -2411,8 +2412,9 @@
+@@ -2475,8 +2476,9 @@
}
}
ScRange aRange;
@@ -1588,12 +1673,12 @@
Index: sc/source/ui/docshell/impex.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/docshell/impex.cxx,v
-retrieving revision 1.41
-retrieving revision 1.41.12.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.41 -r1.41.12.1
---- sc/source/ui/docshell/impex.cxx 6 Mar 2008 16:13:00 -0000 1.41
-+++ sc/source/ui/docshell/impex.cxx 20 Mar 2008 23:20:14 -0000 1.41.12.1
-@@ -190,11 +190,12 @@
+retrieving revision 1.42
+retrieving revision 1.41.12.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.42 -r1.41.12.2
+--- sc/source/ui/docshell/impex.cxx 10 Apr 2008 22:14:48 -0000 1.42
++++ sc/source/ui/docshell/impex.cxx 23 Apr 2008 15:10:09 -0000 1.41.12.2
+@@ -172,11 +172,12 @@
pData->GetSymbol( aPos ); // mit dem Inhalt weitertesten
}
}
@@ -1608,7 +1693,7 @@
aRange.aEnd = aRange.aStart;
else
bAll = TRUE;
-@@ -528,7 +529,7 @@
+@@ -510,7 +511,7 @@
String aRefName;
USHORT nFlags = SCA_VALID | SCA_TAB_3D;
if( bSingle )
@@ -1620,12 +1705,12 @@
Index: sc/source/ui/docshell/servobj.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/docshell/servobj.cxx,v
-retrieving revision 1.9
-retrieving revision 1.9.314.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.9 -r1.9.314.1
---- sc/source/ui/docshell/servobj.cxx 27 Feb 2007 13:09:43 -0000 1.9
-+++ sc/source/ui/docshell/servobj.cxx 20 Mar 2008 23:20:14 -0000 1.9.314.1
-@@ -109,7 +109,7 @@
+retrieving revision 1.10
+retrieving revision 1.9.314.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.10 -r1.9.314.2
+--- sc/source/ui/docshell/servobj.cxx 10 Apr 2008 22:16:34 -0000 1.10
++++ sc/source/ui/docshell/servobj.cxx 23 Apr 2008 15:10:05 -0000 1.9.314.2
+@@ -104,7 +104,7 @@
{
// area reference
}
@@ -1637,12 +1722,12 @@
Index: sc/source/ui/drawfunc/fuins2.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/drawfunc/fuins2.cxx,v
-retrieving revision 1.27
-retrieving revision 1.27.210.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.27 -r1.27.210.1
---- sc/source/ui/drawfunc/fuins2.cxx 25 Jul 2007 08:09:23 -0000 1.27
-+++ sc/source/ui/drawfunc/fuins2.cxx 20 Mar 2008 23:20:20 -0000 1.27.210.1
-@@ -182,7 +182,7 @@
+retrieving revision 1.29
+retrieving revision 1.27.210.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.29 -r1.27.210.2
+--- sc/source/ui/drawfunc/fuins2.cxx 18 Apr 2008 11:35:40 -0000 1.29
++++ sc/source/ui/drawfunc/fuins2.cxx 23 Apr 2008 15:08:51 -0000 1.27.210.2
+@@ -168,7 +168,7 @@
{
pScDoc->LimitChartIfAll( aRangeListRef ); // limit whole columns/rows to used area
String aTmpStr;
@@ -1654,12 +1739,12 @@
Index: sc/source/ui/formdlg/formula.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/formdlg/formula.cxx,v
-retrieving revision 1.17
-retrieving revision 1.17.12.4
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.17 -r1.17.12.4
---- sc/source/ui/formdlg/formula.cxx 7 Mar 2008 11:19:41 -0000 1.17
-+++ sc/source/ui/formdlg/formula.cxx 20 Mar 2008 23:20:27 -0000 1.17.12.4
-@@ -228,7 +228,7 @@
+retrieving revision 1.18
+retrieving revision 1.17.12.5
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.18 -r1.17.12.5
+--- sc/source/ui/formdlg/formula.cxx 10 Apr 2008 22:29:56 -0000 1.18
++++ sc/source/ui/formdlg/formula.cxx 23 Apr 2008 15:08:58 -0000 1.17.12.5
+@@ -223,7 +223,7 @@
aMEFormula.UpdateOldSel();
pCell = new ScFormulaCell( pDoc, aCursorPos, rStrExp );
@@ -1668,7 +1753,7 @@
pComp->SetCompileForFAP(TRUE);
UpdateTokenArray(pMEdit->GetText());
FormulaCursorHdl(&aMEFormula);
-@@ -351,7 +351,7 @@
+@@ -346,7 +346,7 @@
pData->SetMode( (USHORT) eMode );
rStrExp=pMEdit->GetText();
pCell = new ScFormulaCell( pDoc, aCursorPos, rStrExp );
@@ -1677,7 +1762,7 @@
pComp->SetCompileForFAP(TRUE);
CalcStruct(rStrExp);
FillDialog();
-@@ -1070,8 +1070,6 @@
+@@ -1065,8 +1065,6 @@
{
ScFormulaCell* pFCell = new ScFormulaCell( pDoc, aCursorPos, rStrExp );
@@ -1686,7 +1771,7 @@
// #35521# HACK! um bei ColRowNames kein #REF! zu bekommen,
// wenn ein Name eigentlich als Bereich in die Gesamt-Formel
// eingefuegt wird, bei der Einzeldarstellung aber als
-@@ -1131,7 +1129,6 @@
+@@ -1126,7 +1124,6 @@
}
delete pFCell;
@@ -1694,7 +1779,7 @@
}
else
bResult = FALSE;
-@@ -1528,7 +1525,7 @@
+@@ -1523,7 +1520,7 @@
USHORT nFmt = ( rRef.aStart.Tab() == aCursorPos.Tab() )
? SCA_VALID
: SCA_VALID | SCA_TAB_3D;
@@ -1703,7 +1788,7 @@
}
aEdRef.ReplaceSelected( aRefStr );
-@@ -1650,6 +1647,8 @@
+@@ -1645,6 +1642,8 @@
xub_StrLen ScFormulaDlg::GetFunctionPos(xub_StrLen nPos)
{
@@ -1712,7 +1797,7 @@
xub_StrLen nTokPos=1;
xub_StrLen nOldTokPos=1;
xub_StrLen nFuncPos=STRING_NOTFOUND; //@ Testweise
-@@ -1675,7 +1674,7 @@
+@@ -1670,7 +1669,7 @@
if(eOp==ocPush || eOp==ocSpaces)
{
@@ -1724,20 +1809,20 @@
Index: sc/source/ui/inc/crnrdlg.hxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/inc/crnrdlg.hxx,v
-retrieving revision 1.4
-retrieving revision 1.4.684.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.4 -r1.4.684.1
---- sc/source/ui/inc/crnrdlg.hxx 8 Sep 2005 21:17:31 -0000 1.4
-+++ sc/source/ui/inc/crnrdlg.hxx 21 Mar 2008 17:25:56 -0000 1.4.684.1
-@@ -52,6 +52,7 @@
+retrieving revision 1.5
+retrieving revision 1.4.684.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.5 -r1.4.684.2
+--- sc/source/ui/inc/crnrdlg.hxx 10 Apr 2008 22:46:35 -0000 1.5
++++ sc/source/ui/inc/crnrdlg.hxx 23 Apr 2008 15:07:28 -0000 1.4.684.2
+@@ -36,6 +36,7 @@
+ #include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
- #endif
+#include <hash_map>
class ScViewData;
class ScDocument;
-@@ -96,6 +97,8 @@
+@@ -80,6 +81,8 @@
ScRangePairListRef xColNameRanges;
ScRangePairListRef xRowNameRanges;
@@ -1746,7 +1831,7 @@
ScViewData* pViewData;
ScDocument* pDoc;
ScRefEdit* pEdActive;
-@@ -105,7 +108,7 @@
+@@ -89,7 +92,7 @@
private:
void Init ();
void UpdateNames ();
@@ -1758,12 +1843,12 @@
Index: sc/source/ui/inc/dbnamdlg.hxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/inc/dbnamdlg.hxx,v
-retrieving revision 1.3
-retrieving revision 1.3.684.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.3 -r1.3.684.1
---- sc/source/ui/inc/dbnamdlg.hxx 8 Sep 2005 21:20:20 -0000 1.3
-+++ sc/source/ui/inc/dbnamdlg.hxx 20 Mar 2008 04:38:05 -0000 1.3.684.1
-@@ -116,6 +116,7 @@
+retrieving revision 1.4
+retrieving revision 1.3.684.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.4 -r1.3.684.2
+--- sc/source/ui/inc/dbnamdlg.hxx 10 Apr 2008 22:49:30 -0000 1.4
++++ sc/source/ui/inc/dbnamdlg.hxx 23 Apr 2008 15:07:34 -0000 1.3.684.2
+@@ -102,6 +102,7 @@
ScViewData* pViewData;
ScDocument* pDoc;
BOOL bRefInputMode;
@@ -1774,12 +1859,12 @@
Index: sc/source/ui/inc/docfunc.hxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/inc/docfunc.hxx,v
-retrieving revision 1.17
-retrieving revision 1.17.12.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.17 -r1.17.12.1
---- sc/source/ui/inc/docfunc.hxx 6 Mar 2008 16:13:54 -0000 1.17
-+++ sc/source/ui/inc/docfunc.hxx 19 Mar 2008 17:37:13 -0000 1.17.12.1
-@@ -134,7 +134,7 @@
+retrieving revision 1.18
+retrieving revision 1.17.12.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.18 -r1.17.12.2
+--- sc/source/ui/inc/docfunc.hxx 10 Apr 2008 22:50:24 -0000 1.18
++++ sc/source/ui/inc/docfunc.hxx 23 Apr 2008 15:07:26 -0000 1.17.12.2
+@@ -118,7 +118,7 @@
BOOL SetLayoutRTL( SCTAB nTab, BOOL bRTL, BOOL bApi );
@@ -1823,7 +1908,7 @@
virtual void Undo();
virtual void Redo();
-@@ -494,9 +496,9 @@
+@@ -480,9 +482,9 @@
virtual String GetComment() const;
private:
@@ -1838,12 +1923,12 @@
Index: sc/source/ui/miscdlgs/anyrefdg.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/miscdlgs/anyrefdg.cxx,v
-retrieving revision 1.20
-retrieving revision 1.20.62.3
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.20 -r1.20.62.3
---- sc/source/ui/miscdlgs/anyrefdg.cxx 5 Feb 2008 15:46:57 -0000 1.20
-+++ sc/source/ui/miscdlgs/anyrefdg.cxx 20 Mar 2008 23:20:34 -0000 1.20.62.3
-@@ -420,7 +420,7 @@
+retrieving revision 1.21
+retrieving revision 1.20.62.4
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.21 -r1.20.62.4
+--- sc/source/ui/miscdlgs/anyrefdg.cxx 10 Apr 2008 23:38:40 -0000 1.21
++++ sc/source/ui/miscdlgs/anyrefdg.cxx 23 Apr 2008 15:09:26 -0000 1.20.62.4
+@@ -415,7 +415,7 @@
String rStrExp;
pRefCell = new ScFormulaCell( pDoc, aCursorPos, rStrExp );
@@ -1852,7 +1937,7 @@
pRefComp->SetCompileForFAP(TRUE);
nRefTab = nTab;
-@@ -637,6 +637,7 @@
+@@ -632,6 +632,7 @@
bool bError = false;
rRanges.RemoveAll();
@@ -1860,7 +1945,7 @@
ScRangeUtil aRangeUtil;
xub_StrLen nTokenCnt = rStr.GetTokenCount();
for( xub_StrLen nToken = 0; nToken < nTokenCnt; ++nToken )
-@@ -644,7 +645,7 @@
+@@ -639,7 +640,7 @@
ScRange aRange;
String aRangeStr( rStr.GetToken( nToken ) );
@@ -1869,7 +1954,7 @@
if ( nFlags & SCA_VALID )
{
if ( (nFlags & SCA_TAB_3D) == 0 )
-@@ -653,7 +654,7 @@
+@@ -648,7 +649,7 @@
aRange.aEnd.SetTab( aRange.aStart.Tab() );
rRanges.Append( aRange );
}
@@ -1881,12 +1966,12 @@
Index: sc/source/ui/miscdlgs/crnrdlg.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/miscdlgs/crnrdlg.cxx,v
-retrieving revision 1.9
-retrieving revision 1.9.314.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.9 -r1.9.314.2
---- sc/source/ui/miscdlgs/crnrdlg.cxx 27 Feb 2007 13:30:03 -0000 1.9
-+++ sc/source/ui/miscdlgs/crnrdlg.cxx 21 Mar 2008 17:26:03 -0000 1.9.314.2
-@@ -289,8 +289,9 @@
+retrieving revision 1.10
+retrieving revision 1.9.314.3
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.10 -r1.9.314.3
+--- sc/source/ui/miscdlgs/crnrdlg.cxx 10 Apr 2008 23:40:11 -0000 1.10
++++ sc/source/ui/miscdlgs/crnrdlg.cxx 23 Apr 2008 15:09:09 -0000 1.9.314.3
+@@ -279,8 +279,9 @@
}
if ( bValid )
{
@@ -1897,7 +1982,7 @@
if(bRef)
aEdAssign.SetRefString( aStr );
-@@ -298,7 +299,7 @@
+@@ -288,7 +289,7 @@
aEdAssign.SetText( aStr );
aEdAssign.SetSelection( Selection( SELECTION_MAX, SELECTION_MAX ) );
@@ -1906,7 +1991,7 @@
if(bRef)
aEdAssign2.SetRefString( aStr );
-@@ -393,7 +394,7 @@
+@@ -383,7 +384,7 @@
}
}
String aStr;
@@ -1915,7 +2000,7 @@
if(bRef)
aEdAssign2.SetRefString( aStr );
-@@ -514,6 +515,7 @@
+@@ -504,6 +505,7 @@
aLbRange.SetUpdateMode( FALSE );
//-----------------------------------------------------------
aLbRange.Clear();
@@ -1923,7 +2008,7 @@
aEdAssign.SetText( EMPTY_STRING );
ULONG nCount, j;
-@@ -527,6 +529,7 @@
+@@ -517,6 +519,7 @@
SCTAB nTab2;
String rString;
String strShow;
@@ -1931,7 +2016,7 @@
String aString;
String strDelim = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( " --- " ));
-@@ -541,7 +544,8 @@
+@@ -531,7 +534,8 @@
nCount, pDoc );
for ( j=0; j < nCount; j++ )
{
@@ -1941,7 +2026,7 @@
//@008 Hole Bereichsparameter aus Dok
ppSortArray[j]->GetRange(0).GetVars( nCol1, nRow1, nTab1,
-@@ -571,6 +575,7 @@
+@@ -561,6 +565,7 @@
String aInsStr = aString;
aInsStr += strShow;
nPos = aLbRange.InsertEntry( aInsStr );
@@ -1949,7 +2034,7 @@
aLbRange.SetEntryData( nPos, (void*)nEntryDataCol );
}
delete [] ppSortArray;
-@@ -586,7 +591,8 @@
+@@ -576,7 +581,8 @@
nCount, pDoc );
for ( j=0; j < nCount; j++ )
{
@@ -1959,7 +2044,7 @@
//@008 Ab hier baue String fuer Zeilen
ppSortArray[j]->GetRange(0).GetVars( nCol1, nRow1, nTab1,
-@@ -614,6 +620,7 @@
+@@ -604,6 +610,7 @@
String aInsStr = aString;
aInsStr += strShow;
nPos = aLbRange.InsertEntry( aInsStr );
@@ -1967,7 +2052,7 @@
aLbRange.SetEntryData( nPos, (void*)nEntryDataRow );
}
delete [] ppSortArray;
-@@ -639,40 +646,28 @@
+@@ -629,40 +636,28 @@
#*
#************************************************************************/
@@ -2015,7 +2100,7 @@
aEdAssign2.SetText( aStr );
}
else
-@@ -790,10 +785,11 @@
+@@ -780,10 +775,11 @@
if ( aNewArea.Len() > 0 && aNewData.Len() > 0 )
{
@@ -2029,7 +2114,7 @@
{
theCurArea = aRange1;
AdjustColRowData( aRange2 );
-@@ -860,26 +856,16 @@
+@@ -850,26 +846,16 @@
USHORT nSelectPos = aLbRange.GetSelectEntryPos();
BOOL bColName =
((ULONG)aLbRange.GetEntryData( nSelectPos ) == nEntryDataCol);
@@ -2062,7 +2147,7 @@
bFound = TRUE;
if ( bFound )
{
-@@ -971,11 +957,12 @@
+@@ -961,11 +947,12 @@
aRangeStr = aLbRange.GetSelectEntry();
}
}
@@ -2077,7 +2162,7 @@
aBtnAdd.Disable();
aBtnRemove.Enable();
}
-@@ -1035,7 +1022,7 @@
+@@ -1025,7 +1012,7 @@
if ( aNewArea.Len() > 0 )
{
ScRange aRange;
@@ -2086,7 +2171,7 @@
{
SetColRowData( aRange );
bValid = TRUE;
-@@ -1083,7 +1070,7 @@
+@@ -1073,7 +1060,7 @@
if ( aNewData.Len() > 0 )
{
ScRange aRange;
@@ -2095,7 +2180,7 @@
{
AdjustColRowData( aRange );
aBtnAdd.Enable();
-@@ -1125,7 +1112,7 @@
+@@ -1115,7 +1102,7 @@
{
theCurArea.aEnd.SetRow( MAXROW - 1 );
String aStr;
@@ -2104,7 +2189,7 @@
aEdAssign.SetText( aStr );
}
ScRange aRange( theCurData );
-@@ -1163,7 +1150,7 @@
+@@ -1153,7 +1140,7 @@
{
theCurArea.aEnd.SetCol( MAXCOL - 1 );
String aStr;
@@ -2116,12 +2201,12 @@
Index: sc/source/ui/miscdlgs/highred.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/miscdlgs/highred.cxx,v
-retrieving revision 1.12
-retrieving revision 1.12.284.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.12 -r1.12.284.1
---- sc/source/ui/miscdlgs/highred.cxx 26 Apr 2007 09:53:36 -0000 1.12
-+++ sc/source/ui/miscdlgs/highred.cxx 20 Mar 2008 23:20:34 -0000 1.12.284.1
-@@ -198,7 +198,7 @@
+retrieving revision 1.13
+retrieving revision 1.12.284.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.13 -r1.12.284.2
+--- sc/source/ui/miscdlgs/highred.cxx 10 Apr 2008 23:41:30 -0000 1.13
++++ sc/source/ui/miscdlgs/highred.cxx 23 Apr 2008 15:09:29 -0000 1.12.284.2
+@@ -190,7 +190,7 @@
if ( rRef.aStart != rRef.aEnd )
RefInputStart(&aEdAssign);
String aRefStr;
@@ -2133,12 +2218,12 @@
Index: sc/source/ui/miscdlgs/optsolver.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/miscdlgs/optsolver.cxx,v
-retrieving revision 1.2
-retrieving revision 1.2.62.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.2 -r1.2.62.1
---- sc/source/ui/miscdlgs/optsolver.cxx 5 Feb 2008 15:47:21 -0000 1.2
-+++ sc/source/ui/miscdlgs/optsolver.cxx 20 Mar 2008 23:20:34 -0000 1.2.62.1
-@@ -387,7 +387,7 @@
+retrieving revision 1.3
+retrieving revision 1.2.62.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.3 -r1.2.62.2
+--- sc/source/ui/miscdlgs/optsolver.cxx 10 Apr 2008 23:46:39 -0000 1.3
++++ sc/source/ui/miscdlgs/optsolver.cxx 23 Apr 2008 15:09:13 -0000 1.2.62.2
+@@ -382,7 +382,7 @@
maRbMax.Check();
String aCursorStr;
if ( !mpDoc->GetRangeAtBlock( ScRange(rCursorPos), &aCursorStr ) )
@@ -2147,7 +2232,7 @@
maEdObjectiveCell.SetRefString( aCursorStr );
if ( nImplCount > 0 )
maEngine = maImplNames[0]; // use first implementation
-@@ -504,10 +504,11 @@
+@@ -499,10 +499,11 @@
aStr = aName;
else // format cell/range reference
{
@@ -2161,7 +2246,7 @@
}
// variable cells can be several ranges, so only the selection is replaced
-@@ -777,7 +778,8 @@
+@@ -772,7 +773,8 @@
bool ScOptSolverDlg::ParseRef( ScRange& rRange, const String& rInput, bool bAllowRange )
{
ScRangeUtil aRangeUtil;
@@ -2171,7 +2256,7 @@
if ( nFlags & SCA_VALID )
{
if ( (nFlags & SCA_TAB_3D) == 0 )
-@@ -786,7 +788,7 @@
+@@ -781,7 +783,7 @@
rRange.aEnd.SetTab( rRange.aStart.Tab() );
return ( bAllowRange || rRange.aStart == rRange.aEnd );
}
@@ -2183,12 +2268,12 @@
Index: sc/source/ui/miscdlgs/simpref.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/miscdlgs/simpref.cxx,v
-retrieving revision 1.10
-retrieving revision 1.10.276.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.10 -r1.10.276.1
---- sc/source/ui/miscdlgs/simpref.cxx 22 May 2007 20:09:34 -0000 1.10
-+++ sc/source/ui/miscdlgs/simpref.cxx 20 Mar 2008 23:20:34 -0000 1.10.276.1
-@@ -148,10 +148,10 @@
+retrieving revision 1.11
+retrieving revision 1.10.276.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.11 -r1.10.276.2
+--- sc/source/ui/miscdlgs/simpref.cxx 10 Apr 2008 23:48:09 -0000 1.11
++++ sc/source/ui/miscdlgs/simpref.cxx 23 Apr 2008 15:09:19 -0000 1.10.276.2
+@@ -143,10 +143,10 @@
if ( bSingleCell )
{
ScAddress aAdr = rRef.aStart;
@@ -2204,12 +2289,12 @@
Index: sc/source/ui/miscdlgs/solvrdlg.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/miscdlgs/solvrdlg.cxx,v
-retrieving revision 1.11
-retrieving revision 1.11.314.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.11 -r1.11.314.2
---- sc/source/ui/miscdlgs/solvrdlg.cxx 27 Feb 2007 13:33:43 -0000 1.11
-+++ sc/source/ui/miscdlgs/solvrdlg.cxx 21 Mar 2008 17:23:57 -0000 1.11.314.2
-@@ -126,7 +126,7 @@
+retrieving revision 1.12
+retrieving revision 1.11.314.3
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.12 -r1.11.314.3
+--- sc/source/ui/miscdlgs/solvrdlg.cxx 10 Apr 2008 23:48:54 -0000 1.12
++++ sc/source/ui/miscdlgs/solvrdlg.cxx 23 Apr 2008 15:09:22 -0000 1.11.314.3
+@@ -121,7 +121,7 @@
aEdVariableCell.SetLoseFocusHdl ( aLink );
aRBVariableCell.SetLoseFocusHdl ( aLink );
@@ -2218,7 +2303,7 @@
aEdFormulaCell.SetText( aStr );
aEdFormulaCell.GrabFocus();
-@@ -172,7 +172,7 @@
+@@ -167,7 +167,7 @@
? SCA_ABS
: SCA_ABS_3D;
@@ -2227,7 +2312,7 @@
pEdActive->SetRefString( aStr );
if ( pEdActive == &aEdFormulaCell )
-@@ -241,8 +241,9 @@
+@@ -236,8 +236,9 @@
// 2. verweist die Formel-Koordinate wirklich auf eine Formelzelle?
// 3. wurde ein korrekter Zielwert eingegeben
@@ -2242,12 +2327,12 @@
Index: sc/source/ui/miscdlgs/tabopdlg.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/miscdlgs/tabopdlg.cxx,v
-retrieving revision 1.10
-retrieving revision 1.10.314.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.10 -r1.10.314.2
---- sc/source/ui/miscdlgs/tabopdlg.cxx 27 Feb 2007 13:34:05 -0000 1.10
-+++ sc/source/ui/miscdlgs/tabopdlg.cxx 21 Mar 2008 04:38:42 -0000 1.10.314.2
-@@ -162,6 +162,8 @@
+retrieving revision 1.11
+retrieving revision 1.10.314.3
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.11 -r1.10.314.3
+--- sc/source/ui/miscdlgs/tabopdlg.cxx 10 Apr 2008 23:49:26 -0000 1.11
++++ sc/source/ui/miscdlgs/tabopdlg.cxx 23 Apr 2008 15:09:16 -0000 1.10.314.3
+@@ -157,6 +157,8 @@
{
if ( pEdActive )
{
@@ -2256,7 +2341,7 @@
if ( rRef.aStart != rRef.aEnd )
RefInputStart(pEdActive);
-@@ -174,17 +176,17 @@
+@@ -169,17 +171,17 @@
{
theFormulaCell.Set( rRef.aStart, false, false, false);
theFormulaEnd.Set( rRef.aEnd, false, false, false);
@@ -2277,7 +2362,7 @@
}
pEdActive->SetRefString( aStr );
-@@ -246,11 +248,12 @@
+@@ -241,11 +243,12 @@
ScRefAddress& rStart, ScRefAddress& rEnd )
{
BOOL bRet = FALSE;
@@ -2292,7 +2377,7 @@
rEnd = rStart;
}
return bRet;
-@@ -282,9 +285,11 @@
+@@ -277,9 +280,11 @@
nError = TABOPERR_WRONGFORMULA;
else
{
@@ -2305,7 +2390,7 @@
nError = TABOPERR_WRONGROW;
else
{
-@@ -298,7 +303,7 @@
+@@ -293,7 +298,7 @@
if (aEdColCell.GetText().Len() > 0)
{
if (!ConvertSingleRef( pDoc, aEdColCell.GetText(), nCurTab,
@@ -2314,7 +2399,7 @@
nError = TABOPERR_WRONGCOL;
else
{
-@@ -306,7 +311,7 @@
+@@ -301,7 +306,7 @@
{
nMode = 2;
ConvertSingleRef( pDoc, aEdFormulaRange.GetText(), nCurTab,
@@ -2326,12 +2411,12 @@
Index: sc/source/ui/namedlg/namedlg.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/namedlg/namedlg.cxx,v
-retrieving revision 1.9
-retrieving revision 1.8.314.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.9 -r1.8.314.2
---- sc/source/ui/namedlg/namedlg.cxx 18 Mar 2008 14:52:04 -0000 1.9
-+++ sc/source/ui/namedlg/namedlg.cxx 31 Mar 2008 20:24:00 -0000 1.8.314.2
-@@ -208,7 +208,8 @@
+retrieving revision 1.10
+retrieving revision 1.8.314.3
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.10 -r1.8.314.3
+--- sc/source/ui/namedlg/namedlg.cxx 10 Apr 2008 23:50:51 -0000 1.10
++++ sc/source/ui/namedlg/namedlg.cxx 23 Apr 2008 15:08:54 -0000 1.8.314.3
+@@ -200,7 +200,8 @@
UpdateNames();
pViewData->GetSimpleArea( aRange );
@@ -2341,7 +2426,7 @@
theCurSel = Selection( 0, SELECTION_MAX );
aEdAssign.GrabFocus();
-@@ -253,7 +254,8 @@
+@@ -245,7 +246,8 @@
if ( rRef.aStart != rRef.aEnd )
RefInputStart(&aEdAssign);
String aRefStr;
@@ -2354,12 +2439,12 @@
Index: sc/source/ui/navipi/content.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/navipi/content.cxx,v
-retrieving revision 1.24
-retrieving revision 1.24.70.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.24 -r1.24.70.1
---- sc/source/ui/navipi/content.cxx 29 Jan 2008 15:43:51 -0000 1.24
-+++ sc/source/ui/navipi/content.cxx 20 Mar 2008 23:20:41 -0000 1.24.70.1
-@@ -353,7 +353,8 @@
+retrieving revision 1.25
+retrieving revision 1.24.70.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.25 -r1.24.70.2
+--- sc/source/ui/navipi/content.cxx 10 Apr 2008 23:51:06 -0000 1.25
++++ sc/source/ui/navipi/content.cxx 23 Apr 2008 15:09:02 -0000 1.24.70.2
+@@ -348,7 +348,8 @@
{
ScRange aRange = pLink->GetDestArea();
String aRangeStr;
@@ -2372,12 +2457,12 @@
Index: sc/source/ui/optdlg/tpusrlst.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/optdlg/tpusrlst.cxx,v
-retrieving revision 1.10
-retrieving revision 1.10.70.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.10 -r1.10.70.1
---- sc/source/ui/optdlg/tpusrlst.cxx 29 Jan 2008 15:44:03 -0000 1.10
-+++ sc/source/ui/optdlg/tpusrlst.cxx 20 Mar 2008 23:20:47 -0000 1.10.70.1
-@@ -765,14 +765,16 @@
+retrieving revision 1.11
+retrieving revision 1.10.70.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.11 -r1.10.70.2
+--- sc/source/ui/optdlg/tpusrlst.cxx 10 Apr 2008 23:55:06 -0000 1.11
++++ sc/source/ui/optdlg/tpusrlst.cxx 23 Apr 2008 15:09:05 -0000 1.10.70.2
+@@ -760,14 +760,16 @@
pViewData->GetTabNo(),
&theAreaStr,
&theStartPos,
@@ -2399,12 +2484,12 @@
Index: sc/source/ui/pagedlg/areasdlg.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/pagedlg/areasdlg.cxx,v
-retrieving revision 1.14
-retrieving revision 1.14.314.3
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.14 -r1.14.314.3
---- sc/source/ui/pagedlg/areasdlg.cxx 27 Feb 2007 13:36:45 -0000 1.14
-+++ sc/source/ui/pagedlg/areasdlg.cxx 25 Mar 2008 23:01:31 -0000 1.14.314.3
-@@ -61,6 +61,7 @@
+retrieving revision 1.16
+retrieving revision 1.14.314.4
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.16 -r1.14.314.4
+--- sc/source/ui/pagedlg/areasdlg.cxx 18 Apr 2008 11:37:48 -0000 1.16
++++ sc/source/ui/pagedlg/areasdlg.cxx 23 Apr 2008 15:10:02 -0000 1.14.314.4
+@@ -53,6 +53,7 @@
#include "docsh.hxx"
#include "globstr.hrc"
#include "pagedlg.hrc"
@@ -2412,7 +2497,7 @@
// STATIC DATA ---------------------------------------------------------------
-@@ -85,10 +86,32 @@
+@@ -77,10 +78,32 @@
// globale Funktionen (->am Ende der Datei):
@@ -2448,7 +2533,7 @@
//============================================================================
// class ScPrintAreasDlg
-@@ -190,11 +213,11 @@
+@@ -182,11 +205,11 @@
RefInputStart( pRefInputEdit );
String aStr;
@@ -2462,7 +2547,7 @@
// aEdPrintArea.ReplaceSelected( aStr );
-@@ -210,7 +233,7 @@
+@@ -202,7 +225,7 @@
else
{
BOOL bRow = ( &aEdRepeatRow == pRefInputEdit );
@@ -2471,7 +2556,7 @@
pRefInputEdit->SetRefString( aStr );
}
}
-@@ -225,8 +248,9 @@
+@@ -217,8 +240,9 @@
{
if ( pRefInputEdit == &aEdPrintArea )
{
@@ -2482,7 +2567,7 @@
aEdPrintArea.SetText(aVal);
xub_StrLen nLen = aVal.Len();
-@@ -296,6 +320,8 @@
+@@ -288,6 +312,8 @@
//-------------------------
aStrRange.Erase();
String aOne;
@@ -2491,7 +2576,7 @@
USHORT nRangeCount = pDoc->GetPrintRangeCount( nCurTab );
for (USHORT i=0; i<nRangeCount; i++)
{
-@@ -303,9 +329,8 @@
+@@ -295,9 +321,8 @@
if (pPrintRange)
{
if ( aStrRange.Len() )
@@ -2503,7 +2588,7 @@
aStrRange += aOne;
}
}
-@@ -314,13 +339,13 @@
+@@ -306,13 +331,13 @@
//-------------------------------
// Wiederholungszeile
//-------------------------------
@@ -2519,7 +2604,7 @@
aEdRepeatCol.SetText( aStrRange );
Impl_ModifyHdl( &aEdPrintArea );
-@@ -345,9 +370,9 @@
+@@ -337,9 +362,9 @@
if ( (aRangeStr.Len() > 0) && &aEdPrintArea != pEd )
{
ScRange aRange;
@@ -2532,7 +2617,7 @@
}
rItem.SetValue( aRangeStr );
-@@ -368,25 +393,35 @@
+@@ -360,25 +385,35 @@
BOOL bPrintAreaOk = TRUE;
if ( aStrPrintArea.Len() )
{
@@ -2576,9 +2661,9 @@
// Fehlermeldungen
-@@ -422,13 +457,15 @@
+@@ -414,13 +449,15 @@
if ( pViewData )
- bSimple = pViewData->GetSimpleArea( aRange );
+ bSimple = (pViewData->GetSimpleArea( aRange ) == SC_MARK_SIMPLE);
+ ScAddress::Convention eConv = pDoc->GetAddressConvention();
+
@@ -2594,7 +2679,7 @@
}
aLbPrintArea.SetEntryData( SC_AREASDLG_PR_SELECT, new String( aStrRange ) );
-@@ -457,7 +494,8 @@
+@@ -449,7 +486,8 @@
{
pData->GetName( aName );
pData->GetSymbol( aSymbol );
@@ -2604,7 +2689,7 @@
{
if ( pData->HasType( RT_PRINTAREA ) )
{
-@@ -469,7 +507,7 @@
+@@ -461,7 +499,7 @@
if ( pData->HasType( RT_ROWHEADER ) )
{
@@ -2613,7 +2698,7 @@
aLbRepeatRow.SetEntryData(
aLbRepeatRow.InsertEntry( aName ),
new String( aSymbol ) );
-@@ -477,7 +515,7 @@
+@@ -469,7 +507,7 @@
if ( pData->HasType( RT_COLHEADER ) )
{
@@ -2622,7 +2707,7 @@
aLbRepeatCol.SetEntryData(
aLbRepeatCol.InsertEntry( aName ),
new String( aSymbol ) );
-@@ -669,9 +707,11 @@
+@@ -661,9 +699,11 @@
//============================================================================
// globale Funktionen:
@@ -2636,7 +2721,7 @@
{
// Zulaessige Syntax fuer rStr:
// Row: [$]1-MAXTAB
-@@ -713,115 +753,160 @@
+@@ -705,115 +745,160 @@
return bStrOk;
}
@@ -2876,12 +2961,12 @@
Index: sc/source/ui/undo/undotab.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/undo/undotab.cxx,v
-retrieving revision 1.18
-retrieving revision 1.18.40.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.18 -r1.18.40.1
---- sc/source/ui/undo/undotab.cxx 19 Feb 2008 15:34:09 -0000 1.18
-+++ sc/source/ui/undo/undotab.cxx 19 Mar 2008 17:37:15 -0000 1.18.40.1
-@@ -95,7 +95,7 @@
+retrieving revision 1.19
+retrieving revision 1.18.40.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.19 -r1.18.40.2
+--- sc/source/ui/undo/undotab.cxx 11 Apr 2008 00:26:31 -0000 1.19
++++ sc/source/ui/undo/undotab.cxx 23 Apr 2008 15:07:45 -0000 1.18.40.2
+@@ -90,7 +90,7 @@
TYPEINIT1(ScUndoScenarioFlags, SfxUndoAction);
TYPEINIT1(ScUndoRenameObject, SfxUndoAction);
TYPEINIT1(ScUndoLayoutRTL, SfxUndoAction);
@@ -2890,7 +2975,7 @@
// -----------------------------------------------------------------------
-@@ -1534,41 +1534,41 @@
+@@ -1529,41 +1529,41 @@
// -----------------------------------------------------------------------
//
@@ -2945,7 +3030,7 @@
{
#if 0
// erAck: 2006-09-07T23:00+0200 commented out in CWS scr1c1
-@@ -1578,12 +1578,12 @@
+@@ -1573,12 +1573,12 @@
#endif
}
@@ -2963,42 +3048,42 @@
Index: sc/source/ui/unoobj/addruno.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/unoobj/addruno.cxx,v
-retrieving revision 1.8
-retrieving revision 1.8.304.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.8 -r1.8.304.2
+retrieving revision 1.9
+retrieving revision 1.8.304.3
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.9 -r1.8.304.3
Index: sc/source/ui/unoobj/cellsuno.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/unoobj/cellsuno.cxx,v
-retrieving revision 1.112
-retrieving revision 1.111.10.3
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.112 -r1.111.10.3
+retrieving revision 1.113
+retrieving revision 1.111.10.4
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.113 -r1.111.10.4
Index: sc/source/ui/unoobj/chart2uno.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/unoobj/chart2uno.cxx,v
-retrieving revision 1.8
-retrieving revision 1.8.210.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.8 -r1.8.210.2
+retrieving revision 1.9
+retrieving revision 1.8.210.3
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.9 -r1.8.210.3
Index: sc/source/ui/unoobj/chartuno.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/unoobj/chartuno.cxx,v
-retrieving revision 1.20
-retrieving revision 1.20.276.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.20 -r1.20.276.2
+retrieving revision 1.21
+retrieving revision 1.20.276.3
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.21 -r1.20.276.3
Index: sc/source/ui/unoobj/docuno.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/unoobj/docuno.cxx,v
-retrieving revision 1.66
-retrieving revision 1.66.12.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.66 -r1.66.12.2
+retrieving revision 1.67
+retrieving revision 1.66.12.3
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.67 -r1.66.12.3
Index: sc/source/ui/unoobj/tokenuno.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/unoobj/tokenuno.cxx,v
-retrieving revision 1.3
-retrieving revision 1.3.12.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.3 -r1.3.12.1
---- sc/source/ui/unoobj/tokenuno.cxx 6 Mar 2008 16:18:37 -0000 1.3
-+++ sc/source/ui/unoobj/tokenuno.cxx 19 Mar 2008 17:37:15 -0000 1.3.12.1
-@@ -139,7 +139,8 @@
+retrieving revision 1.5
+retrieving revision 1.3.12.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.5 -r1.3.12.2
+--- sc/source/ui/unoobj/tokenuno.cxx 18 Apr 2008 13:18:17 -0000 1.5
++++ sc/source/ui/unoobj/tokenuno.cxx 23 Apr 2008 15:09:59 -0000 1.3.12.2
+@@ -133,7 +133,8 @@
if (mpDocShell)
{
@@ -3008,7 +3093,7 @@
SetCompilerFlags( aCompiler );
ScTokenArray* pCode = aCompiler.CompileString( aFormula );
-@@ -158,9 +159,10 @@
+@@ -152,9 +153,10 @@
if (mpDocShell)
{
@@ -3023,13 +3108,33 @@
Index: sc/source/ui/vba/vbarange.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/vba/vbarange.cxx,v
-retrieving revision 1.7
-retrieving revision 1.7.12.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.7 -r1.7.12.2
---- sc/source/ui/vba/vbarange.cxx 6 Mar 2008 16:19:41 -0000 1.7
-+++ sc/source/ui/vba/vbarange.cxx 19 Mar 2008 17:37:15 -0000 1.7.12.2
-@@ -745,21 +745,21 @@
+retrieving revision 1.8
+retrieving revision 1.7.12.4
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.8 -r1.7.12.4
+--- sc/source/ui/vba/vbarange.cxx 11 Apr 2008 01:15:15 -0000 1.8
++++ sc/source/ui/vba/vbarange.cxx 25 Apr 2008 16:56:32 -0000 1.7.12.4
+@@ -145,6 +145,7 @@
+ #include "rangelst.hxx"
+ #include "convuno.hxx"
+ #include "compiler.hxx"
++#include "grammar.hxx"
+ #include "attrib.hxx"
+ #include "undodat.hxx"
+ #include "dbdocfun.hxx"
+@@ -731,31 +732,31 @@
+ {
+ private:
+ ScDocument* m_pDoc;
+- ScAddress::Convention m_eConv;
++ ScGrammar::Grammar m_eGrammar;
+ public:
+- CellFormulaValueSetter( const uno::Any& aValue, ScDocument* pDoc, ScAddress::Convention eConv ):CellValueSetter( aValue ), m_pDoc( pDoc ), m_eConv( eConv ){}
++ CellFormulaValueSetter( const uno::Any& aValue, ScDocument* pDoc, ScGrammar::Grammar eGram ):CellValueSetter( aValue ), m_pDoc( pDoc ), m_eGrammar( eGram ){}
+ protected:
+ bool processValue( const uno::Any& aValue, const uno::Reference< table::XCell >& xCell )
+ {
rtl::OUString sFormula;
+ double aDblValue;
if ( aValue >>= sFormula )
{
- // get current convention
@@ -3039,7 +3144,7 @@
+ // convert to CONV_OOO style formula string because XCell::setFormula
+ // always compile it in CONV_OOO style. Perhaps css.sheet.FormulaParser
+ // should be used in future to directly pass formula tokens.
-+ if ( m_eConv != ScAddress::CONV_OOO && ( sFormula.trim().indexOf('=') == 0 ) )
++ if ( m_eGrammar != ScGrammar::GRAM_PODF_A1 && ( sFormula.trim().indexOf('=') == 0 ) )
{
uno::Reference< uno::XInterface > xIf( xCell, uno::UNO_QUERY_THROW );
ScCellRangesBase* pUnoRangesBase = dynamic_cast< ScCellRangesBase* >( xIf.get() );
@@ -3047,44 +3152,134 @@
{
ScRangeList aCellRanges = pUnoRangesBase->GetRangeList();
- ScCompiler aCompiler( m_pDoc, aCellRanges.First()->aStart );
-+ ScCompiler aCompiler( m_pDoc, aCellRanges.First()->aStart, m_pDoc->GetGrammar() );
++ ScCompiler aCompiler( m_pDoc, aCellRanges.First()->aStart, m_eGrammar );
// compile the string in the format passed in
- aCompiler.CompileString( sFormula, m_eConv );
+- aCompiler.CompileString( sFormula, m_eConv );
++ aCompiler.CompileString( sFormula );
// set desired convention to that of the document
- aCompiler.SetRefConvention( eConv );
-+ aCompiler.SetRefConvention( ScAddress::CONV_OOO );
++ aCompiler.SetGrammar( ScGrammar::GRAM_PODF_A1 );
String sConverted;
aCompiler.CreateStringFromTokenArray(sConverted);
sFormula = EQUALS + sConverted;
-@@ -793,7 +793,7 @@
+@@ -773,9 +774,9 @@
+ {
+ private:
+ ScDocument* m_pDoc;
+- ScAddress::Convention m_eConv;
++ ScGrammar::Grammar m_eGrammar;
+ public:
+- CellFormulaValueGetter(ScDocument* pDoc, ScAddress::Convention eConv ) : CellValueGetter( ), m_pDoc( pDoc ), m_eConv( eConv ) {}
++ CellFormulaValueGetter(ScDocument* pDoc, ScGrammar::Grammar eGram ) : CellValueGetter( ), m_pDoc( pDoc ), m_eGrammar( eGram ) {}
+ virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell )
+ {
+ uno::Any aValue;
+@@ -788,10 +789,10 @@
pUnoRangesBase )
{
ScRangeList aCellRanges = pUnoRangesBase->GetRangeList();
- ScCompiler aCompiler( m_pDoc, aCellRanges.First()->aStart );
-+ ScCompiler aCompiler( m_pDoc, aCellRanges.First()->aStart, m_pDoc->GetGrammar() );
- aCompiler.CompileString( sVal, ScAddress::CONV_OOO );
+- aCompiler.CompileString( sVal, ScAddress::CONV_OOO );
++ ScCompiler aCompiler( m_pDoc, aCellRanges.First()->aStart, ScGrammar::GRAM_DEFAULT );
++ aCompiler.CompileString( sVal );
// set desired convention
- aCompiler.SetRefConvention( m_eConv );
-@@ -1399,8 +1399,8 @@
+- aCompiler.SetRefConvention( m_eConv );
++ aCompiler.SetGrammar( m_eGrammar );
+ String sConverted;
+ aCompiler.CreateStringFromTokenArray(sConverted);
+ sVal = EQUALS + sConverted;
+@@ -1359,7 +1360,7 @@
+ }
+
+ void
+-ScVbaRange::setFormulaValue( const uno::Any& rFormula, ScAddress::Convention eConv ) throw (uno::RuntimeException)
++ScVbaRange::setFormulaValue( const uno::Any& rFormula, ScGrammar::Grammar eGram ) throw (uno::RuntimeException)
+ {
+ // If this is a multiple selection apply setFormula over all areas
+ if ( m_Areas->getCount() > 1 )
+@@ -1369,12 +1370,12 @@
+ aVisitor.visit( valueProcessor );
+ return;
+ }
+- CellFormulaValueSetter formulaValueSetter( rFormula, getScDocument(), eConv );
++ CellFormulaValueSetter formulaValueSetter( rFormula, getScDocument(), eGram );
+ setValue( rFormula, formulaValueSetter );
+ }
+
+ uno::Any
+-ScVbaRange::getFormulaValue( ScAddress::Convention eConv) throw (uno::RuntimeException)
++ScVbaRange::getFormulaValue( ScGrammar::Grammar eGram ) throw (uno::RuntimeException)
+ {
+ // #TODO code within the test below "if ( m_Areas.... " can be removed
+ // Test is performed only because m_xRange is NOT set to be
+@@ -1385,7 +1386,7 @@
+ uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
+ return xRange->getFormula();
+ }
+- CellFormulaValueGetter valueGetter( getScDocument(), eConv );
++ CellFormulaValueGetter valueGetter( getScDocument(), eGram );
+ return getValue( valueGetter );
+
+ }
+@@ -1394,26 +1395,25 @@
ScVbaRange::setFormula(const uno::Any &rFormula ) throw (uno::RuntimeException)
{
// #FIXME converting "=$a$1" e.g. CONV_XL_A1 -> CONV_OOO // results in "=$a$1:a1", temporalily disable conversion
- //setFormulaValue( rFormula, ScAddress::CONV_XL_A1 );;
- setFormulaValue( rFormula, ScAddress::CONV_OOO );;
-+ setFormulaValue( rFormula, ScAddress::CONV_XL_A1 );;
-+ //setFormulaValue( rFormula, ScAddress::CONV_OOO );;
++ setFormulaValue( rFormula, ScGrammar::GRAM_NATIVE_XL_A1 );;
+ }
+
+ uno::Any
+ ScVbaRange::getFormulaR1C1() throw (::com::sun::star::uno::RuntimeException)
+ {
+- return getFormulaValue( ScAddress::CONV_XL_R1C1 );
++ return getFormulaValue( ScGrammar::GRAM_NATIVE_XL_R1C1 );
+ }
+
+ void
+ ScVbaRange::setFormulaR1C1(const uno::Any& rFormula ) throw (uno::RuntimeException)
+ {
+- setFormulaValue( rFormula, ScAddress::CONV_XL_R1C1 );
++ setFormulaValue( rFormula, ScGrammar::GRAM_NATIVE_XL_R1C1 );
}
uno::Any
+ ScVbaRange::getFormula() throw (::com::sun::star::uno::RuntimeException)
+ {
+- return getFormulaValue( ScAddress::CONV_XL_A1 );
++ return getFormulaValue( ScGrammar::GRAM_NATIVE_XL_A1 );
+ }
+
+ sal_Int32
+Index: sc/source/ui/vba/vbarange.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/vba/vbarange.hxx,v
+retrieving revision 1.5
+retrieving revision 1.5.18.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.5 -r1.5.18.1
+--- sc/source/ui/vba/vbarange.hxx 11 Apr 2008 01:15:35 -0000 1.5
++++ sc/source/ui/vba/vbarange.hxx 25 Apr 2008 16:56:32 -0000 1.5.18.1
+@@ -107,8 +107,8 @@
+ void ClearContents( sal_Int32 nFlags ) throw (css::uno::RuntimeException);
+ virtual void setValue( const css::uno::Any& aValue, ValueSetter& setter) throw ( css::uno::RuntimeException);
+ virtual css::uno::Any getValue( ValueGetter& rValueGetter ) throw (css::uno::RuntimeException);
+- virtual css::uno::Any getFormulaValue( ScAddress::Convention ) throw (css::uno::RuntimeException);
+- virtual void setFormulaValue( const css::uno::Any& aValue, ScAddress::Convention ) throw ( css::uno::RuntimeException);
++ virtual css::uno::Any getFormulaValue( ScGrammar::Grammar ) throw (css::uno::RuntimeException);
++ virtual void setFormulaValue( const css::uno::Any& aValue, ScGrammar::Grammar ) throw ( css::uno::RuntimeException);
+ css::uno::Reference< oo::excel::XRange > getArea( sal_Int32 nIndex ) throw( css::uno::RuntimeException );
+ ScCellRangesBase* getCellRangesBase() throw ( css::uno::RuntimeException );
+ SfxItemSet* getCurrentDataSet( ) throw ( css::uno::RuntimeException );
Index: sc/source/ui/view/cellsh1.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/view/cellsh1.cxx,v
-retrieving revision 1.49
-retrieving revision 1.49.68.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.49 -r1.49.68.1
---- sc/source/ui/view/cellsh1.cxx 29 Jan 2008 15:48:29 -0000 1.49
-+++ sc/source/ui/view/cellsh1.cxx 20 Mar 2008 23:21:11 -0000 1.49.68.1
-@@ -857,6 +857,7 @@
+retrieving revision 1.51
+retrieving revision 1.49.68.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.51 -r1.49.68.2
+--- sc/source/ui/view/cellsh1.cxx 18 Apr 2008 11:40:55 -0000 1.51
++++ sc/source/ui/view/cellsh1.cxx 23 Apr 2008 15:07:54 -0000 1.49.68.2
+@@ -847,6 +847,7 @@
GetViewData()->GetFillData( nStartCol, nStartRow, nEndCol, nEndRow );
SCCOL nFillCol = GetViewData()->GetRefEndX();
SCROW nFillRow = GetViewData()->GetRefEndY();
@@ -3092,7 +3287,7 @@
if( pReqArgs != NULL )
{
-@@ -867,7 +868,7 @@
+@@ -857,7 +858,7 @@
ScAddress aScAddress;
String aArg = ((const SfxStringItem*)pItem)->GetValue();
@@ -3101,7 +3296,7 @@
{
nFillRow = aScAddress.Row();
nFillCol = aScAddress.Col();
-@@ -939,7 +940,8 @@
+@@ -929,7 +930,8 @@
{
String aAdrStr;
ScAddress aAdr( nFillCol, nFillRow, 0 );
@@ -3114,12 +3309,12 @@
Index: sc/source/ui/view/output.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/view/output.cxx,v
-retrieving revision 1.33
-retrieving revision 1.33.68.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.33 -r1.33.68.1
---- sc/source/ui/view/output.cxx 29 Jan 2008 15:50:09 -0000 1.33
-+++ sc/source/ui/view/output.cxx 20 Mar 2008 23:21:11 -0000 1.33.68.1
-@@ -2385,7 +2385,7 @@
+retrieving revision 1.34
+retrieving revision 1.33.68.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.34 -r1.33.68.2
+--- sc/source/ui/view/output.cxx 11 Apr 2008 01:34:19 -0000 1.34
++++ sc/source/ui/view/output.cxx 23 Apr 2008 15:08:11 -0000 1.33.68.2
+@@ -2380,7 +2380,7 @@
// Note title is the cell address (as on printed note pages)
String aTitle;
ScAddress aAddress( nMergeX, nMergeY, nTab );
@@ -3131,12 +3326,12 @@
Index: sc/source/ui/view/printfun.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/view/printfun.cxx,v
-retrieving revision 1.55
-retrieving revision 1.55.58.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.55 -r1.55.58.1
---- sc/source/ui/view/printfun.cxx 12 Feb 2008 16:12:33 -0000 1.55
-+++ sc/source/ui/view/printfun.cxx 20 Mar 2008 23:21:11 -0000 1.55.58.1
-@@ -2015,7 +2015,7 @@
+retrieving revision 1.56
+retrieving revision 1.55.58.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.56 -r1.55.58.2
+--- sc/source/ui/view/printfun.cxx 11 Apr 2008 01:37:03 -0000 1.56
++++ sc/source/ui/view/printfun.cxx 23 Apr 2008 15:08:03 -0000 1.55.58.2
+@@ -2010,7 +2010,7 @@
pEditEngine->Draw( pDev, Point( nPosX, nPosY ), 0 );
String aMarkStr;
@@ -3148,12 +3343,12 @@
Index: sc/source/ui/view/tabvwsh3.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/view/tabvwsh3.cxx,v
-retrieving revision 1.38
-retrieving revision 1.38.68.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.38 -r1.38.68.1
---- sc/source/ui/view/tabvwsh3.cxx 30 Jan 2008 09:00:26 -0000 1.38
-+++ sc/source/ui/view/tabvwsh3.cxx 20 Mar 2008 23:21:11 -0000 1.38.68.1
-@@ -318,8 +318,9 @@
+retrieving revision 1.39
+retrieving revision 1.38.68.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.39 -r1.38.68.2
+--- sc/source/ui/view/tabvwsh3.cxx 11 Apr 2008 01:42:21 -0000 1.39
++++ sc/source/ui/view/tabvwsh3.cxx 23 Apr 2008 15:08:14 -0000 1.38.68.2
+@@ -313,8 +313,9 @@
else
{
ScRangeUtil aRangeUtil;
@@ -3168,12 +3363,12 @@
Index: sc/source/ui/view/tabvwsha.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/view/tabvwsha.cxx,v
-retrieving revision 1.23
-retrieving revision 1.23.12.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.23 -r1.23.12.2
---- sc/source/ui/view/tabvwsha.cxx 7 Mar 2008 12:24:16 -0000 1.23
-+++ sc/source/ui/view/tabvwsha.cxx 20 Mar 2008 23:21:11 -0000 1.23.12.2
-@@ -220,7 +220,7 @@
+retrieving revision 1.25
+retrieving revision 1.23.12.3
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.25 -r1.23.12.3
+--- sc/source/ui/view/tabvwsha.cxx 15 Apr 2008 14:15:22 -0000 1.25
++++ sc/source/ui/view/tabvwsha.cxx 23 Apr 2008 15:07:58 -0000 1.23.12.3
+@@ -231,7 +231,7 @@
{
ScAddress aScAddress( GetViewData()->GetCurX(), GetViewData()->GetCurY(), 0 );
String aAddr;
@@ -3182,7 +3377,7 @@
SfxStringItem aPosItem( SID_CURRENTCELL, aAddr );
rSet.Put( aPosItem );
-@@ -487,7 +487,7 @@
+@@ -516,7 +516,7 @@
ScViewData* pViewData = GetViewData();
ScDocument* pDoc = pViewData->GetDocument();
ScAddress aPos( pViewData->GetCurPos() );
@@ -3194,16 +3389,12 @@
Index: sc/source/ui/view/viewfun2.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/view/viewfun2.cxx,v
-retrieving revision 1.38
-retrieving revision 1.38.12.2
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.38 -r1.38.12.2
---- sc/source/ui/view/viewfun2.cxx 7 Mar 2008 11:22:45 -0000 1.38
-+++ sc/source/ui/view/viewfun2.cxx 22 Mar 2008 18:48:30 -0000 1.38.12.2
-@@ -963,9 +963,12 @@
- ScMarkData& rMark = GetViewData()->GetMarkData();
- SCTAB nTab;
- BOOL bUndo (pDoc->IsUndoEnabled());
-+ const ScAddress::Convention eConv = pDoc->GetAddressConvention();
+retrieving revision 1.40
+retrieving revision 1.38.12.4
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.40 -r1.38.12.4
+--- sc/source/ui/view/viewfun2.cxx 18 Apr 2008 11:50:10 -0000 1.40
++++ sc/source/ui/view/viewfun2.cxx 25 Apr 2008 16:57:19 -0000 1.38.12.4
+@@ -961,6 +961,8 @@
ScPrintRangeSaver* pOldRanges = pDoc->CreatePrintRangeSaver();
@@ -3212,7 +3403,7 @@
for (nTab=0; nTab<nTabCount; nTab++)
if (rMark.GetTableSelect(nTab))
{
-@@ -984,11 +987,12 @@
+@@ -979,11 +981,12 @@
{
if ( pPrint->Len() )
{
@@ -3228,7 +3419,7 @@
pDoc->AddPrintRange( nTab, aRange );
}
}
-@@ -1025,7 +1029,7 @@
+@@ -1020,7 +1023,7 @@
if ( !pRepCol->Len() )
pDoc->SetRepeatColRange( nTab, NULL );
else
@@ -3237,7 +3428,7 @@
pDoc->SetRepeatColRange( nTab, &aRange );
}
-@@ -1036,7 +1040,7 @@
+@@ -1031,7 +1034,7 @@
if ( !pRepRow->Len() )
pDoc->SetRepeatRowRange( nTab, NULL );
else
@@ -3249,12 +3440,12 @@
Index: sc/source/ui/view/viewfun5.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/view/viewfun5.cxx,v
-retrieving revision 1.52
-retrieving revision 1.52.12.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.52 -r1.52.12.1
---- sc/source/ui/view/viewfun5.cxx 6 Mar 2008 16:21:28 -0000 1.52
-+++ sc/source/ui/view/viewfun5.cxx 20 Mar 2008 23:21:12 -0000 1.52.12.1
-@@ -410,7 +410,7 @@
+retrieving revision 1.53
+retrieving revision 1.52.12.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.53 -r1.52.12.2
+--- sc/source/ui/view/viewfun5.cxx 11 Apr 2008 01:47:08 -0000 1.53
++++ sc/source/ui/view/viewfun5.cxx 23 Apr 2008 15:08:06 -0000 1.52.12.2
+@@ -387,7 +387,7 @@
else
{
ScAddress aCellPos( nPosX,nPosY,nTab );
@@ -3266,12 +3457,12 @@
Index: sc/source/ui/view/viewfunc.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/view/viewfunc.cxx,v
-retrieving revision 1.42
-retrieving revision 1.42.12.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.42 -r1.42.12.1
---- sc/source/ui/view/viewfunc.cxx 7 Mar 2008 11:23:12 -0000 1.42
-+++ sc/source/ui/view/viewfunc.cxx 19 Mar 2008 17:37:16 -0000 1.42.12.1
-@@ -467,7 +467,7 @@
+retrieving revision 1.44
+retrieving revision 1.42.12.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.44 -r1.42.12.2
+--- sc/source/ui/view/viewfunc.cxx 18 Apr 2008 11:50:48 -0000 1.44
++++ sc/source/ui/view/viewfunc.cxx 23 Apr 2008 15:08:19 -0000 1.42.12.2
+@@ -462,7 +462,7 @@
if (rMark.GetTableSelect(i))
break;
ScAddress aPos( nCol, nRow, i );
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
