diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 08:53:33 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 08:53:33 +0000 |
| commit | 257f8e3834455c8ac0183c207568cb6b78296075 (patch) | |
| tree | ed317fa7a991d0a094fd8b38f2108bd2afe7a528 /sc | |
| parent | 94ab1135669bf3f4b4b746c2d650233ad248fbfb (diff) | |
INTEGRATION: CWS koheiformula01 (1.10.276); FILE MERGED
2008/04/23 15:10:59 kohei 1.10.276.3: RESYNC: (1.11-1.12); FILE MERGED
2008/03/31 20:24:13 kohei 1.10.276.2: RESYNC: (1.10-1.11); FILE MERGED
2008/03/20 23:19:50 kohei 1.10.276.1: Use the current address convention everywhere instead of always using the OOo convention.
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/tool/rangeutl.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx index 1e289e8985eb..aa46c89a8804 100644 --- a/sc/source/core/tool/rangeutl.cxx +++ b/sc/source/core/tool/rangeutl.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: rangeutl.cxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.13 $ * * This file is part of OpenOffice.org. * @@ -468,7 +468,7 @@ sal_Bool ScRangeStringConverter::GetAddressFromString( OUString sToken; GetTokenByOffset( sToken, rAddressStr, nOffset, cSeperator, cQuote ); if( nOffset >= 0 ) - return ((rAddress.Parse( sToken, (ScDocument*) pDocument ) & SCA_VALID) == SCA_VALID); + return ((rAddress.Parse( sToken, const_cast<ScDocument*>(pDocument), pDocument->GetAddressConvention() ) & SCA_VALID) == SCA_VALID); return sal_False; } @@ -492,7 +492,7 @@ sal_Bool ScRangeStringConverter::GetRangeFromString( { if ( aUIString.GetChar(0) == (sal_Unicode) '.' ) aUIString.Erase( 0, 1 ); - bResult = ((rRange.aStart.Parse( aUIString, const_cast<ScDocument*> (pDocument)) & SCA_VALID) == SCA_VALID); + bResult = ((rRange.aStart.Parse( aUIString, const_cast<ScDocument*> (pDocument), pDocument->GetAddressConvention()) & SCA_VALID) == SCA_VALID); rRange.aEnd = rRange.aStart; } else @@ -633,7 +633,7 @@ void ScRangeStringConverter::GetStringFromAddress( if (pDocument && pDocument->HasTable(rAddress.Tab())) { String sAddress; - rAddress.Format( sAddress, nFormatFlags, (ScDocument*) pDocument ); + rAddress.Format( sAddress, nFormatFlags, (ScDocument*) pDocument, pDocument->GetAddressConvention() ); AssignString( rString, sAddress, bAppendStr, cSeperator ); } } @@ -652,10 +652,9 @@ void ScRangeStringConverter::GetStringFromRange( ScAddress aEndAddress( rRange.aEnd ); String sStartAddress; String sEndAddress; - aStartAddress.Format( sStartAddress, nFormatFlags, (ScDocument*) pDocument, - ScAddress::CONV_OOO ); - aEndAddress.Format( sEndAddress, nFormatFlags, (ScDocument*) pDocument, - ScAddress::CONV_OOO ); + ScAddress::Convention eConv = pDocument->GetAddressConvention(); + aStartAddress.Format( sStartAddress, nFormatFlags, (ScDocument*) pDocument, eConv ); + aEndAddress.Format( sEndAddress, nFormatFlags, (ScDocument*) pDocument, eConv ); OUString sOUStartAddress( sStartAddress ); sOUStartAddress += OUString(':'); sOUStartAddress += OUString( sEndAddress ); |