diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-04 10:00:32 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-04 10:00:32 +0000 |
| commit | 064c3d3215577551e6748563f12e8138caf7e953 (patch) | |
| tree | 2d91e2faafbfb3b767a127d91b09f0b79fa66b2c /chart2/source/tools | |
| parent | e60ae9e09ab8f876a3ee49611d1d08868a11d248 (diff) | |
INTEGRATION: CWS chart23 (1.18.6); FILE MERGED
2008/03/12 09:32:26 iha 1.18.6.1: #i85803# save and load stacking mode correctly
Diffstat (limited to 'chart2/source/tools')
| -rw-r--r-- | chart2/source/tools/ChartTypeHelper.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx index d7941d871c24..bf5ae83d67c1 100644 --- a/chart2/source/tools/ChartTypeHelper.cxx +++ b/chart2/source/tools/ChartTypeHelper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ChartTypeHelper.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: rt $ $Date: 2008-02-18 16:01:18 $ + * last change: $Author: kz $ $Date: 2008-04-04 11:00:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -62,8 +62,10 @@ bool ChartTypeHelper::isSupportingAxisSideBySide( if( xChartType.is() && nDimensionCount < 3 ) { - StackMode eStackMode = DiagramHelper::getStackModeFromChartType( xChartType, 0 ); - if( eStackMode == StackMode_NONE ) + bool bFound=false; + bool bAmbiguous=false; + StackMode eStackMode = DiagramHelper::getStackModeFromChartType( xChartType, bFound, bAmbiguous, 0 ); + if( eStackMode == StackMode_NONE && !bAmbiguous ) { rtl::OUString aChartTypeName = xChartType->getChartType(); bResult = ( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) || @@ -232,8 +234,10 @@ sal_Bool ChartTypeHelper::isSupportingBarConnectors( if(nDimensionCount==3) return sal_False; - StackMode eStackMode = DiagramHelper::getStackModeFromChartType( xChartType, 0 ); - if( eStackMode != StackMode_Y_STACKED ) + bool bFound=false; + bool bAmbiguous=false; + StackMode eStackMode = DiagramHelper::getStackModeFromChartType( xChartType, bFound, bAmbiguous, 0 ); + if( eStackMode != StackMode_Y_STACKED || bAmbiguous ) return sal_False; rtl::OUString aChartTypeName = xChartType->getChartType(); |