diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:04:08 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:04:08 +0200 |
commit | 258f905e8c6b1853884f730ab0e36a544bfd7b76 (patch) | |
tree | 812254806beb1a7af7271469e7148b667b2d96de /sc/source/core/tool/rangeutl.cxx | |
parent | bc212c565cdc252d2a01e5221a75868b3f01d230 (diff) |
recreated tag OOO_BUILD_3_2_98_1 which had these commits:
commit aa08e6374f2a8f11105d84c3d651696be34ef78b (tag: refs/tags/OOO_BUILD_3_2_98_1)
Author: Petr Mladek <pmladek@walk.suse.cz>
Date: Wed Sep 15 19:03:24 2010 +0200
Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1)
commit eb4914f043304ba7d164733509794104c7ea5b33
Merge: 5ada805 0815e6f
Author: Jan Holesovsky <kendy@suse.cz>
Date: Tue Sep 7 09:33:00 2010 +0200
Merge commit 'ooo/OOO330_m6'
commit 0815e6f3086d4513fb1dfed2a0ff8e83a3589afc (tag: refs/tags/ooo/OOO330_m7, tag: refs/tags/ooo/OOO330_m6)
Merge: 51cfacc 1d0dc69
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Thu Aug 26 13:52:56 2010 +0200
CWS-TOOLING: integrate CWS calc58
commit 51cfacc73ee6162c82dbb735448f5321a2a57269
Merge: 1f33e95 8676b47
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Aug 25 12:49:35 2010 +0200
CWS-TOOLING: integrate CWS mib18
commit 1d0dc690de7aa8ef1fd93d26578251248fd66d9a
Author: Thomas Benisch <tbe@openoffice.org>
Date: Fri Aug 20 13:23:46 2010 +0200
calc58: #i113948# office crashes after resizing chart
chart2/source/model/main/ChartModel.cxx | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit db48b114e54b6ceaebd4d77fbb0de1d41a0d69ca
Author: Thomas Benisch <tbe@openoffice.org>
Date: Fri Aug 20 13:03:55 2010 +0200
calc58: #i113946# undo does not work for deleting shapes
.../controller/main/ChartController_Tools.cxx | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
commit 3fa83707418cb221c94dcbe32864e5555b618159
Author: Eike Rathke [er] <eike.rathke@oracle.com>
Date: Thu Aug 19 17:12:37 2010 +0200
calc58: #i113879# add ScMatrix::CloneIfConst() and regard only temporary matrices created by the interpreter as mutable
sc/inc/scmatrix.hxx | 11 ++++++++++-
sc/source/core/tool/interpr4.cxx | 7 ++++++-
sc/source/core/tool/interpr5.cxx | 21 +++++++++++++--------
sc/source/core/tool/scmatrix.cxx | 5 +++++
4 files changed, 34 insertions(+), 10 deletions(-)
commit baac8ebc6989a5771b5d1903e5e8f4014ecafeac
Author: Eike Rathke [er] <eike.rathke@oracle.com>
Date: Wed Aug 18 18:56:10 2010 +0200
calc58: #i113739# make N return 0 for all strings again
sc/source/core/tool/interpr1.cxx | 23 +++++++----------------
sc/source/core/tool/interpr4.cxx | 6 ++++++
2 files changed, 13 insertions(+), 16 deletions(-)
commit ac9660fc7e47b2a7eecdb0c749ee46f592a70635
Author: Eike Rathke [er] <eike.rathke@oracle.com>
Date: Wed Aug 18 16:52:22 2010 +0200
calc58: #i113820# make TEXT treat string results and inline strings identical to referenced cell text
sc/source/core/tool/interpr1.cxx | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
commit 8676b47d16a1670a4d6ebbc610e8a00abd2367f7
Merge: 6423ab8 1f33e95
Author: Daniel Rentz <dr@openoffice.org>
Date: Fri Aug 13 11:29:46 2010 +0200
mib18: rebase to OOO330m4
commit 6423ab81e71f7090d61e81b8992878ce7de43f27
Merge: 6e0de89 772dd5e
Author: Andreas Bregas <ab@openoffice.org>
Date: Wed Aug 11 08:28:57 2010 +0200
mib18: Merge
commit 772dd5e59b0b28c3e24cac6ae52ea0141b39c240
Author: Daniel Rentz <dr@openoffice.org>
Date: Tue Aug 10 20:18:10 2010 +0200
mib18: adjusted service name to match VBA symbol
sc/source/ui/vba/vbaglobals.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 9725c306fd4502fc6de7d4acf5c302427310a20d
Author: Michael E. Bohn <mbn@openoffice.org>
Date: Tue Aug 10 18:14:58 2010 +0200
mib18: #163259# implementation of global symbol Excel
sc/source/ui/vba/vbaglobals.cxx | 9 +++++++++
sc/source/ui/vba/vbaglobals.hxx | 1 +
2 files changed, 10 insertions(+), 0 deletions(-)
commit ff7c55aff1293fb51c8ab268d0f478480b0c5685
Merge: 80722e0 6e0de89
Author: Michael E. Bohn <mbn@openoffice.org>
Date: Tue Aug 10 16:57:47 2010 +0200
heads merged
commit 80722e0f75ad7d3204f39a580df2f48412e001c3
Author: Michael E. Bohn <mbn@openoffice.org>
Date: Tue Aug 10 16:55:52 2010 +0200
mib18: #163120# adding the entrypoint for symbol Debug
sc/source/ui/vba/vbaglobals.cxx | 19 +++++++++++++++++++
sc/source/ui/vba/vbaglobals.hxx | 2 +-
2 files changed, 20 insertions(+), 1 deletions(-)
commit 6e0de8945fbfbee500e0fc9bfa26aaa67abeafa4
Author: Daniel Rentz <dr@openoffice.org>
Date: Tue Aug 10 11:52:54 2010 +0200
mib18: #163243# enable regular expressions in VBA symbol Range.Find
sc/source/ui/vba/vbarange.cxx | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
commit d0093c4e1b54648d1e09c16b389519fdf2564f6e
Author: Daniel Rentz <dr@openoffice.org>
Date: Tue Aug 10 10:27:30 2010 +0200
mib18: #163246# add VBA symbol Worksheet.ProtectScenarios
sc/source/ui/vba/vbaworksheet.cxx | 10 ++++++++--
sc/source/ui/vba/vbaworksheet.hxx | 1 +
2 files changed, 9 insertions(+), 2 deletions(-)
commit b9876f93ddc6eaa0e5cf4aaf62cd19d3a08776c4
Author: Michael E. Bohn <mbn@openoffice.org>
Date: Tue Aug 10 06:57:53 2010 +0200
mib18: #163148# creation og basic modules in library Standard during Workbooks.add
sc/source/ui/vba/vbaworkbooks.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 80e4fe02a80b90182180c409d2f4f803562e02b8
Merge: 36f7091 81cec49
Author: Andreas Bregas <ab@openoffice.org>
Date: Fri Aug 6 09:39:35 2010 +0200
mib18: Merge
commit 81cec496df67c85bb1b64ef7d15c9f73987882a0
Author: Daniel Rentz <dr@openoffice.org>
Date: Thu Aug 5 15:43:06 2010 +0200
mib18: #162503# do not create a new Worksheet object in Workbook.ActiveSheet but return existing object supporting VBA module access
sc/source/ui/vba/vbaworkbook.cxx | 19 +++++++++++--------
sc/source/ui/vba/vbaworksheets.cxx | 2 +-
2 files changed, 12 insertions(+), 9 deletions(-)
commit 36f709143ffc8056ece58e93e155a6dab9831cd9
Author: Daniel Rentz <dr@openoffice.org>
Date: Wed Aug 4 18:13:02 2010 +0200
mib18: #162938# add VBA symbol Worksheet.AutoFilterMode
sc/source/ui/vba/vbaworksheet.cxx | 37 ++++++++++++++++++++++++++++++++++++-
sc/source/ui/vba/vbaworksheet.hxx | 5 +++++
2 files changed, 41 insertions(+), 1 deletions(-)
commit c650f967f769e4da07f669f60e1f7a636d7e9614
Author: Daniel Rentz <dr@openoffice.org>
Date: Wed Aug 4 16:00:21 2010 +0200
mib18: #163200# full rework of VBA symbols Application.Intersect and Application.Union
sc/source/ui/vba/makefile.mk | 92 +++---
sc/source/ui/vba/vbaapplication.cxx | 599 ++++++++++++++---------------------
2 files changed, 281 insertions(+), 410 deletions(-)
commit 5fa3d6e55b2ab5aac185c10293f8c6a1b7264e63
Author: Daniel Rentz <dr@openoffice.org>
Date: Wed Aug 4 09:59:00 2010 +0200
mib18: #163198# VBA Names collection must return VBA Name objects
sc/source/ui/vba/vbanames.cxx | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
commit 783c57ec2174b11b06ec29ecb1ae6b9b87996bf6
Author: Daniel Rentz <dr@openoffice.org>
Date: Wed Aug 4 09:58:00 2010 +0200
mib18: #163195# set correct parent for range returned by VBA ActiveCell symbol
sc/source/ui/vba/vbaapplication.cxx | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit 32876274fc8fae906bdb52e76059ddedadfa8572
Author: Daniel Rentz <dr@openoffice.org>
Date: Wed Aug 4 09:56:54 2010 +0200
mib18: #162937# extract all integer and floating values from an 'Any' for Boolean parameters
sc/source/ui/vba/vbarange.cxx | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
commit faa445a0730322e8522999ffb30fdde97bb9b9b9
Author: Daniel Rentz <dr@openoffice.org>
Date: Wed Aug 4 09:54:13 2010 +0200
mib18: #162039# clear covered cells when merging via VBA MergeCells symbol
sc/source/ui/vba/vbarange.cxx | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
Notes
split repo tag: calc_OOO_BUILD_3_2_98_1
Diffstat (limited to 'sc/source/core/tool/rangeutl.cxx')
-rw-r--r-- | sc/source/core/tool/rangeutl.cxx | 218 |
1 files changed, 109 insertions, 109 deletions
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx index 9f6526a54cf6..97f55d40157a 100644 --- a/sc/source/core/tool/rangeutl.cxx +++ b/sc/source/core/tool/rangeutl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,10 +52,10 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------ -BOOL ScRangeUtil::MakeArea( const String& rAreaStr, - ScArea& rArea, - ScDocument* pDoc, - SCTAB nTab, +BOOL ScRangeUtil::MakeArea( const String& rAreaStr, + ScArea& rArea, + ScDocument* pDoc, + SCTAB nTab, ScAddress::Details const & rDetails ) const { // Eingabe in rAreaStr: "$Tabelle1.$A1:$D17" @@ -63,12 +63,12 @@ BOOL ScRangeUtil::MakeArea( const String& rAreaStr, // BROKEN BROKEN BROKEN // but it is only used in the consolidate dialog. Ignore for now. - BOOL nSuccess = FALSE; - USHORT nPointPos = rAreaStr.Search('.'); - USHORT nColonPos = rAreaStr.Search(':'); - String aStrArea( rAreaStr ); - ScRefAddress startPos; - ScRefAddress endPos; + BOOL nSuccess = FALSE; + USHORT nPointPos = rAreaStr.Search('.'); + USHORT nColonPos = rAreaStr.Search(':'); + String aStrArea( rAreaStr ); + ScRefAddress startPos; + ScRefAddress endPos; if ( nColonPos == STRING_NOTFOUND ) if ( nPointPos != STRING_NOTFOUND ) @@ -81,22 +81,22 @@ BOOL ScRangeUtil::MakeArea( const String& rAreaStr, if ( nSuccess ) rArea = ScArea( startPos.Tab(), - startPos.Col(), startPos.Row(), - endPos.Col(), endPos.Row() ); + startPos.Col(), startPos.Row(), + endPos.Col(), endPos.Row() ); return nSuccess; } //------------------------------------------------------------------------ -void ScRangeUtil::CutPosString( const String& theAreaStr, - String& thePosStr ) const +void ScRangeUtil::CutPosString( const String& theAreaStr, + String& thePosStr ) const { - String aPosStr; + String aPosStr; // BROKEN BROKEN BROKEN // but it is only used in the consolidate dialog. Ignore for now. - USHORT nColonPos = theAreaStr.Search(':'); + USHORT nColonPos = theAreaStr.Search(':'); if ( nColonPos != STRING_NOTFOUND ) aPosStr = theAreaStr.Copy( 0, nColonPos ); // ':' nicht mitkopieren @@ -108,10 +108,10 @@ void ScRangeUtil::CutPosString( const String& theAreaStr, //------------------------------------------------------------------------ -BOOL ScRangeUtil::IsAbsTabArea( const String& rAreaStr, - ScDocument* pDoc, - ScArea*** pppAreas, - USHORT* pAreaCount, +BOOL ScRangeUtil::IsAbsTabArea( const String& rAreaStr, + ScDocument* pDoc, + ScArea*** pppAreas, + USHORT* pAreaCount, BOOL /* bAcceptCellRef */, ScAddress::Details const & rDetails ) const { @@ -124,9 +124,9 @@ BOOL ScRangeUtil::IsAbsTabArea( const String& rAreaStr, /* * Erwartet wird ein String der Form - * "$Tabelle1.$A$1:$Tabelle3.$D$17" + * "$Tabelle1.$A$1:$Tabelle3.$D$17" * Wenn bAcceptCellRef == TRUE ist, wird auch ein String der Form - * "$Tabelle1.$A$1" + * "$Tabelle1.$A$1" * akzeptiert. * * als Ergebnis wird ein ScArea-Array angelegt, @@ -134,10 +134,10 @@ BOOL ScRangeUtil::IsAbsTabArea( const String& rAreaStr, * wieder geloescht werden muss! */ - BOOL bStrOk = FALSE; - String aTempAreaStr(rAreaStr); - String aStartPosStr; - String aEndPosStr; + BOOL bStrOk = FALSE; + String aTempAreaStr(rAreaStr); + String aStartPosStr; + String aEndPosStr; if ( STRING_NOTFOUND == aTempAreaStr.Search(':') ) { @@ -145,16 +145,16 @@ BOOL ScRangeUtil::IsAbsTabArea( const String& rAreaStr, aTempAreaStr.Append(rAreaStr); } - USHORT nColonPos = aTempAreaStr.Search(':'); + USHORT nColonPos = aTempAreaStr.Search(':'); if ( STRING_NOTFOUND != nColonPos && STRING_NOTFOUND != aTempAreaStr.Search('.') ) { - ScRefAddress aStartPos; - ScRefAddress aEndPos; + ScRefAddress aStartPos; + ScRefAddress aEndPos; - aStartPosStr = aTempAreaStr.Copy( 0, nColonPos ); - aEndPosStr = aTempAreaStr.Copy( nColonPos+1, STRING_LEN ); + aStartPosStr = aTempAreaStr.Copy( 0, nColonPos ); + aEndPosStr = aTempAreaStr.Copy( nColonPos+1, STRING_LEN ); if ( ConvertSingleRef( pDoc, aStartPosStr, 0, aStartPos, rDetails ) ) { @@ -171,13 +171,13 @@ BOOL ScRangeUtil::IsAbsTabArea( const String& rAreaStr, if ( pppAreas && pAreaCount ) // Array zurueckgegeben? { - SCTAB nStartTab = aStartPos.Tab(); - SCTAB nEndTab = aEndPos.Tab(); - USHORT nTabCount = static_cast<USHORT>(nEndTab-nStartTab+1); - ScArea** theAreas = new ScArea*[nTabCount]; - SCTAB nTab = 0; - USHORT i = 0; - ScArea theArea( 0, aStartPos.Col(), aStartPos.Row(), + SCTAB nStartTab = aStartPos.Tab(); + SCTAB nEndTab = aEndPos.Tab(); + USHORT nTabCount = static_cast<USHORT>(nEndTab-nStartTab+1); + ScArea** theAreas = new ScArea*[nTabCount]; + SCTAB nTab = 0; + USHORT i = 0; + ScArea theArea( 0, aStartPos.Col(), aStartPos.Row(), aEndPos.Col(), aEndPos.Row() ); nTab = nStartTab; @@ -199,17 +199,17 @@ BOOL ScRangeUtil::IsAbsTabArea( const String& rAreaStr, //------------------------------------------------------------------------ -BOOL ScRangeUtil::IsAbsArea( const String& rAreaStr, - ScDocument* pDoc, - SCTAB nTab, - String* pCompleteStr, - ScRefAddress* pStartPos, - ScRefAddress* pEndPos, +BOOL ScRangeUtil::IsAbsArea( const String& rAreaStr, + ScDocument* pDoc, + SCTAB nTab, + String* pCompleteStr, + ScRefAddress* pStartPos, + ScRefAddress* pEndPos, ScAddress::Details const & rDetails ) const { - BOOL bIsAbsArea = FALSE; - ScRefAddress startPos; - ScRefAddress endPos; + BOOL bIsAbsArea = FALSE; + ScRefAddress startPos; + ScRefAddress endPos; bIsAbsArea = ConvertDoubleRef( pDoc, rAreaStr, nTab, startPos, endPos, rDetails ); @@ -241,17 +241,17 @@ BOOL ScRangeUtil::IsAbsArea( const String& rAreaStr, //------------------------------------------------------------------------ -BOOL ScRangeUtil::IsAbsPos( const String& rPosStr, - ScDocument* pDoc, - SCTAB nTab, - String* pCompleteStr, - ScRefAddress* pPosTripel, +BOOL ScRangeUtil::IsAbsPos( const String& rPosStr, + ScDocument* pDoc, + SCTAB nTab, + String* pCompleteStr, + ScRefAddress* pPosTripel, ScAddress::Details const & rDetails ) const { - BOOL bIsAbsPos = FALSE; - ScRefAddress thePos; + BOOL bIsAbsPos = FALSE; + ScRefAddress thePos; - bIsAbsPos = ConvertSingleRef( pDoc, rPosStr, nTab, thePos, rDetails ); + bIsAbsPos = ConvertSingleRef( pDoc, rPosStr, nTab, thePos, rDetails ); thePos.SetRelCol( FALSE ); thePos.SetRelRow( FALSE ); thePos.SetRelTab( FALSE ); @@ -269,16 +269,16 @@ BOOL ScRangeUtil::IsAbsPos( const String& rPosStr, //------------------------------------------------------------------------ -BOOL ScRangeUtil::MakeRangeFromName ( - const String& rName, - ScDocument* pDoc, - SCTAB nCurTab, - ScRange& rRange, - RutlNameScope eScope, +BOOL ScRangeUtil::MakeRangeFromName ( + const String& rName, + ScDocument* pDoc, + SCTAB nCurTab, + ScRange& rRange, + RutlNameScope eScope, ScAddress::Details const & rDetails ) const { BOOL bResult=FALSE; - ScRangeUtil aRangeUtil; + ScRangeUtil aRangeUtil; SCTAB nTab = 0; SCCOL nColStart = 0; SCCOL nColEnd = 0; @@ -288,26 +288,26 @@ BOOL ScRangeUtil::MakeRangeFromName ( if( eScope==RUTL_NAMES ) { ScRangeName& rRangeNames = *(pDoc->GetRangeName()); - USHORT nAt = 0; + USHORT nAt = 0; if ( rRangeNames.SearchName( rName, nAt ) ) { ScRangeData* pData = rRangeNames[nAt]; - String aStrArea; - ScRefAddress aStartPos; - ScRefAddress aEndPos; + String aStrArea; + ScRefAddress aStartPos; + ScRefAddress aEndPos; pData->GetSymbol( aStrArea ); if ( IsAbsArea( aStrArea, pDoc, nCurTab, NULL, &aStartPos, &aEndPos, rDetails ) ) { - nTab = aStartPos.Tab(); + nTab = aStartPos.Tab(); nColStart = aStartPos.Col(); nRowStart = aStartPos.Row(); nColEnd = aEndPos.Col(); nRowEnd = aEndPos.Row(); - bResult = TRUE; + bResult = TRUE; } else { @@ -316,25 +316,25 @@ BOOL ScRangeUtil::MakeRangeFromName ( if ( IsAbsPos( aStrArea, pDoc, nCurTab, NULL, &aStartPos, rDetails ) ) { - nTab = aStartPos.Tab(); + nTab = aStartPos.Tab(); nColStart = nColEnd = aStartPos.Col(); nRowStart = nRowEnd = aStartPos.Row(); - bResult = TRUE; + bResult = TRUE; } } } } else if( eScope==RUTL_DBASE ) { - ScDBCollection& rDbNames = *(pDoc->GetDBCollection()); - USHORT nAt = 0; + ScDBCollection& rDbNames = *(pDoc->GetDBCollection()); + USHORT nAt = 0; if ( rDbNames.SearchName( rName, nAt ) ) { ScDBData* pData = rDbNames[nAt]; pData->GetArea( nTab, nColStart, nRowStart, - nColEnd, nRowEnd ); + nColEnd, nRowEnd ); bResult = TRUE; } } @@ -378,10 +378,10 @@ sal_Int32 ScRangeStringConverter::IndexOf( sal_Int32 nOffset, sal_Unicode cQuote ) { - sal_Int32 nLength = rString.getLength(); - sal_Int32 nIndex = nOffset; - sal_Bool bQuoted = sal_False; - sal_Bool bExitLoop = sal_False; + sal_Int32 nLength = rString.getLength(); + sal_Int32 nIndex = nOffset; + sal_Bool bQuoted = sal_False; + sal_Bool bExitLoop = sal_False; while( !bExitLoop && (nIndex < nLength) ) { @@ -399,9 +399,9 @@ sal_Int32 ScRangeStringConverter::IndexOfDifferent( sal_Unicode cSearchChar, sal_Int32 nOffset ) { - sal_Int32 nLength = rString.getLength(); - sal_Int32 nIndex = nOffset; - sal_Bool bExitLoop = sal_False; + sal_Int32 nLength = rString.getLength(); + sal_Int32 nIndex = nOffset; + sal_Bool bExitLoop = sal_False; while( !bExitLoop && (nIndex < nLength) ) { @@ -447,9 +447,9 @@ void ScRangeStringConverter::AppendTableName(OUStringBuffer& rBuf, const OUStrin sal_Int32 ScRangeStringConverter::GetTokenCount( const OUString& rString, sal_Unicode cSeperator, sal_Unicode cQuote ) { - OUString sToken; - sal_Int32 nCount = 0; - sal_Int32 nOffset = 0; + OUString sToken; + sal_Int32 nCount = 0; + sal_Int32 nOffset = 0; while( nOffset >= 0 ) { GetTokenByOffset( sToken, rString, nOffset, cQuote, cSeperator ); @@ -521,7 +521,7 @@ sal_Bool ScRangeStringConverter::GetRangeFromString( // #i77703# chart ranges in the file format contain both sheet names, even for an external reference sheet. // This isn't parsed by ScRange, so try to parse the two Addresses then. if (!bResult) - { + { bResult = ((rRange.aStart.Parse( aUIString.Copy(0, (xub_StrLen)nIndex), const_cast<ScDocument*>(pDocument), eConv) & SCA_VALID) == SCA_VALID) && ((rRange.aEnd.Parse( aUIString.Copy((xub_StrLen)nIndex+1), const_cast<ScDocument*>(pDocument), @@ -777,7 +777,7 @@ void ScRangeStringConverter::GetStringFromRangeList( } static void lcl_appendCellAddress( - rtl::OUStringBuffer& rBuf, ScDocument* pDoc, const ScAddress& rCell, + rtl::OUStringBuffer& rBuf, ScDocument* pDoc, const ScAddress& rCell, const ScAddress::ExternalInfo& rExtInfo) { if (rExtInfo.mbExternal) @@ -893,7 +893,7 @@ void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, con OUStringBuffer aBuf = aBeginCell.copy(0, nDotPos); if (nEndCellDotPos == 0) - { + { // workaround for old syntax (probably pre-chart2 age?) // e.g. Sheet1.A1:.B2 aBuf.append(aEndCell); @@ -906,7 +906,7 @@ void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, con } aEndCell = aBuf.makeStringAndClear(); } - + ScAddress::ExternalInfo aExtInfo1, aExtInfo2; ScAddress aCell1, aCell2; rtl::OUString aBuf; @@ -961,18 +961,18 @@ void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, con ScArea::ScArea( SCTAB tab, SCCOL colStart, SCROW rowStart, SCCOL colEnd, SCROW rowEnd ) : - nTab ( tab ), - nColStart( colStart ), nRowStart( rowStart ), - nColEnd ( colEnd ), nRowEnd ( rowEnd ) + nTab ( tab ), + nColStart( colStart ), nRowStart( rowStart ), + nColEnd ( colEnd ), nRowEnd ( rowEnd ) { } //------------------------------------------------------------------------ ScArea::ScArea( const ScArea& r ) : - nTab ( r.nTab ), - nColStart( r.nColStart ), nRowStart( r.nRowStart ), - nColEnd ( r.nColEnd ), nRowEnd ( r.nRowEnd ) + nTab ( r.nTab ), + nColStart( r.nColStart ), nRowStart( r.nRowStart ), + nColEnd ( r.nColEnd ), nRowEnd ( r.nRowEnd ) { } @@ -980,11 +980,11 @@ ScArea::ScArea( const ScArea& r ) : ScArea& ScArea::operator=( const ScArea& r ) { - nTab = r.nTab; - nColStart = r.nColStart; - nRowStart = r.nRowStart; - nColEnd = r.nColEnd; - nRowEnd = r.nRowEnd; + nTab = r.nTab; + nColStart = r.nColStart; + nRowStart = r.nRowStart; + nColEnd = r.nColEnd; + nRowEnd = r.nRowEnd; return *this; } @@ -992,11 +992,11 @@ ScArea& ScArea::operator=( const ScArea& r ) BOOL ScArea::operator==( const ScArea& r ) const { - return ( (nTab == r.nTab) - && (nColStart == r.nColStart) - && (nRowStart == r.nRowStart) - && (nColEnd == r.nColEnd) - && (nRowEnd == r.nRowEnd) ); + return ( (nTab == r.nTab) + && (nColStart == r.nColStart) + && (nRowStart == r.nRowStart) + && (nColEnd == r.nColEnd) + && (nRowEnd == r.nRowEnd) ); } //------------------------------------------------------------------------ @@ -1014,7 +1014,7 @@ BOOL ScAreaNameIterator::Next( String& rName, ScRange& rRange ) { for (;;) { - if ( bFirstPass ) // erst Bereichsnamen + if ( bFirstPass ) // erst Bereichsnamen { if ( pRangeName && nPos < pRangeName->GetCount() ) { @@ -1022,7 +1022,7 @@ BOOL ScAreaNameIterator::Next( String& rName, ScRange& rRange ) if ( pData && pData->IsValidReference(rRange) ) { rName = pData->GetName(); - return TRUE; // gefunden + return TRUE; // gefunden } } else @@ -1031,7 +1031,7 @@ BOOL ScAreaNameIterator::Next( String& rName, ScRange& rRange ) nPos = 0; } } - if ( !bFirstPass ) // dann DB-Bereiche + if ( !bFirstPass ) // dann DB-Bereiche { if ( pDBCollection && nPos < pDBCollection->GetCount() ) { @@ -1040,11 +1040,11 @@ BOOL ScAreaNameIterator::Next( String& rName, ScRange& rRange ) { pData->GetArea( rRange ); rName = pData->GetName(); - return TRUE; // gefunden + return TRUE; // gefunden } } else - return FALSE; // gibt nichts mehr + return FALSE; // gibt nichts mehr } } } |