diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-04-18 00:30:01 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-04-18 00:33:07 +0200 |
| commit | 7bff8c4b69a21a0b78b87c975f8e3aa772d6c2bd (patch) | |
| tree | e94958991acbf8fcf2bda43f1ac9a886859427bb /chart2/source | |
| parent | de4dd423b257d83ca32a9b1ccd007fbe7e7eb91e (diff) | |
don't pretend to have a bitmap url if we are not using bitmaps
Fix hack for #i78615#
Change-Id: I7571f3039e0af91560e24c6d00a7ae456f8ba300
Diffstat (limited to 'chart2/source')
| -rw-r--r-- | chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index 149d05546b37..94ba53659e34 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -50,6 +50,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart/ChartAxisAssign.hpp> #include <com/sun/star/chart/ChartErrorCategory.hpp> +#include <com/sun/star/chart/ChartSymbolType.hpp> #include <com/sun/star/chart/XChartDocument.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/LineJoint.hpp> @@ -639,6 +640,16 @@ beans::PropertyState SAL_CALL DataSeriesPointWrapper::getPropertyState( const OU throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE ); + if (rPropertyName == "SymbolBitmapURL") + { + uno::Any aAny = WrappedPropertySet::getPropertyValue("SymbolType"); + sal_Int32 nVal = com::sun::star::chart::ChartSymbolType::NONE; + if (aAny >>= nVal) + { + if (nVal != com::sun::star::chart::ChartSymbolType::BITMAPURL) + return beans::PropertyState::PropertyState_DEFAULT_VALUE; + } + } if( m_eType == DATA_SERIES ) aState = WrappedPropertySet::getPropertyState( rPropertyName ); |