diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 08:51:32 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 08:51:32 +0000 |
| commit | 0727deb7d453b2f5a956398e3dc8db9edef660d3 (patch) | |
| tree | 22ffe12a46a6ea10fcaca254a5d20d200236628b /sc | |
| parent | 7893003b7455e3c9ead2ee5121daf9969f781a5d (diff) | |
INTEGRATION: CWS koheiformula01 (1.31.124); FILE MERGED
2008/04/23 15:10:55 kohei 1.31.124.2: RESYNC: (1.31-1.32); FILE MERGED
2008/03/20 23:19:42 kohei 1.31.124.1: Use the current address convention everywhere instead of always using the OOo convention.
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/documen5.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx index a2760fb4d86b..15e4285f166c 100644 --- a/sc/source/core/data/documen5.cxx +++ b/sc/source/core/data/documen5.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: documen5.cxx,v $ - * $Revision: 1.32 $ + * $Revision: 1.33 $ * * This file is part of OpenOffice.org. * @@ -168,7 +168,7 @@ void ScDocument::UpdateAllCharts() { ScRangeListRef aRanges = pChartObj->GetRangeList(); String sRangeStr; - aRanges->Format( sRangeStr, SCR_ABS_3D, this ); + aRanges->Format( sRangeStr, SCR_ABS_3D, this, GetAddressConvention() ); chart::ChartDataRowSource eDataRowSource = chart::ChartDataRowSource_COLUMNS; bool bHasCategories = pChartObj->HasRowHeaders(); @@ -384,7 +384,7 @@ void ScDocument::UpdateChartArea( const String& rChartName, } String sRangeStr; - aNewRanges->Format( sRangeStr, SCR_ABS_3D, this ); + aNewRanges->Format( sRangeStr, SCR_ABS_3D, this, GetAddressConvention() ); lcl_SetChartParameters( xReceiver, sRangeStr, eDataRowSource, bHasCategories, bFirstCellAsLabel ); @@ -545,7 +545,8 @@ void ScDocument::RestoreChartListener( const String& rName ) for ( sal_Int32 i=0; i<nRangeCount; i++ ) { ScRange aRange; - if ( aRange.ParseAny( aRepresentations[i], this ) & SCA_VALID ) + ScAddress::Details aDetails(GetAddressConvention(), 0, 0); + if ( aRange.ParseAny( aRepresentations[i], this, aDetails ) & SCA_VALID ) aRanges->Append( aRange ); } @@ -677,7 +678,7 @@ void ScDocument::SetChartRangeList( const String& rChartName, lcl_GetChartParameters( xChartDoc, aRangesStr, eDataRowSource, bHasCategories, bFirstCellAsLabel ); String sRangeStr; - rNewRangeListRef->Format( sRangeStr, SCR_ABS_3D, this ); + rNewRangeListRef->Format( sRangeStr, SCR_ABS_3D, this, GetAddressConvention() ); lcl_SetChartParameters( xReceiver, sRangeStr, eDataRowSource, bHasCategories, bFirstCellAsLabel ); |