diff options
| author | Oliver Bolte <obo@openoffice.org> | 2010-01-15 11:51:12 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2010-01-15 11:51:12 +0000 |
| commit | 11e553c44163ef37bfdca2ec22a068690833b0f6 (patch) | |
| tree | 3b95fd15185ff99f9ce6ed1f33e5ada6365ddb88 | |
| parent | 317284efe0c33f963da39896ac73452bfd388fd8 (diff) | |
CWS-TOOLING: integrate CWS chart32stopper
2010-01-14 17:15:04 +0100 pl r277909 : #i108325# workaround a form control paint issue
2010-01-14 14:37:50 +0100 iha r277907 : #i108122# data label from categories crashes office when having no categories
2010-01-14 14:36:46 +0100 iha r277906 : #i108313# & #i108281# pie charts without series crashes office
| -rw-r--r-- | chart2/source/tools/ChartTypeHelper.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/view/charttypes/VSeriesPlotter.cxx | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx index 23aa14136..6ed8c6669 100644 --- a/chart2/source/tools/ChartTypeHelper.cxx +++ b/chart2/source/tools/ChartTypeHelper.cxx @@ -549,7 +549,7 @@ sal_Int32 ChartTypeHelper::getNumberOfDisplayedSeries( if( (xChartTypeProp->getPropertyValue( C2U("UseRings")) >>= bDonut) && !bDonut ) { - return 1; + return nNumberOfSeries>0 ? 1 : 0; } } } diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 67cac8bd5..f81494c79 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -537,6 +537,9 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re createText( xTarget_, aText.makeStringAndClear() , *pPropNames, *pPropValues, ShapeFactory::makeTransformation( aScreenPosition2D ) ); + if( !xTextShape.is() ) + return xTextShape; + const awt::Point aUnrotatedTextPos( xTextShape->getPosition() ); if( fRotationDegrees != 0.0 ) { @@ -547,7 +550,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re LabelPositionHelper::correctPositionForRotation( xTextShape, eAlignment, fRotationDegrees, true /*bRotateAroundCenter*/ ); } - if( xSymbol.is() && xTextShape.is() ) + if( xSymbol.is() ) { const awt::Point aOldTextPos( xTextShape->getPosition() ); awt::Point aNewTextPos( aOldTextPos ); |