diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-03-16 12:55:24 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-03-16 12:55:24 +0000 |
| commit | e33b2b6d4d4056cb8f057f53cfbf0a573cc7c909 (patch) | |
| tree | fbcda524cf0d35e4c68e688a647ac06e1d4f76d2 /chart2/source/tools | |
| parent | 3fa6016cfe4ceff50f08f6a6599c96b3b32f2e8d (diff) | |
CWS-TOOLING: integrate CWS calc31stopper2_DEV300
2009-03-10 15:35:05 +0100 dr r269277 : #i100096# allow multiselection of shapes again...
2009-03-10 10:44:13 +0100 nn r269253 : #i100070# write chart ranges correctly, temporarily also allow wrong syntax when loading
2009-03-09 17:36:48 +0100 iha r269207 : #i100062# charts loose data when copying from calc to impress or writer
2009-03-09 14:20:52 +0100 nn r269108 : #i100042# ScTabViewShell::Construct: still have to check for linked sheets
Diffstat (limited to 'chart2/source/tools')
| -rw-r--r-- | chart2/source/tools/XMLRangeHelper.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/chart2/source/tools/XMLRangeHelper.cxx b/chart2/source/tools/XMLRangeHelper.cxx index e098444893aa..8ad30579474b 100644 --- a/chart2/source/tools/XMLRangeHelper.cxx +++ b/chart2/source/tools/XMLRangeHelper.cxx @@ -198,12 +198,10 @@ bool lcl_getCellAddressFromXMLString( ++nDelimiterPos; } - if( nDelimiterPos == -1 || - nDelimiterPos >= nEndPos ) - { + if( nDelimiterPos == -1 ) return false; - } - if( nDelimiterPos > nStartPos ) + + if( nDelimiterPos > nStartPos && nDelimiterPos < nEndPos ) { // there is a table name before the address @@ -226,6 +224,8 @@ bool lcl_getCellAddressFromXMLString( else rOutTableName = aTableNameBuffer.makeStringAndClear(); } + else + nDelimiterPos = nStartPos; for( sal_Int32 i = 0; nNextDelimiterPos < nEndPos; @@ -277,6 +277,8 @@ bool lcl_getCellRangeAddressFromXMLString( bResult = lcl_getCellAddressFromXMLString( rXMLString, nStartPos, nEndPos, rOutRange.aUpperLeft, rOutRange.aTableName ); + if( !rOutRange.aTableName.getLength() ) + bResult = false; } else { @@ -284,6 +286,9 @@ bool lcl_getCellRangeAddressFromXMLString( bResult = lcl_getCellAddressFromXMLString( rXMLString, nStartPos, nDelimiterPos - 1, rOutRange.aUpperLeft, rOutRange.aTableName ); + if( !rOutRange.aTableName.getLength() ) + bResult = false; + ::rtl::OUString sTableSecondName; if( bResult ) { |