[Libreoffice-commits] core.git: 2 commits - chart2/source xmloff/source

[Markus Mohrhard]

 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx |   11 ++++++++++
 xmloff/source/chart/PropertyMaps.cxx                                |    4 ---
 2 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit 7bff8c4b69a21a0b78b87c975f8e3aa772d6c2bd
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Apr 18 00:30:01 2015 +0200

    don't pretend to have a bitmap url if we are not using bitmaps
    
    Fix hack for #i78615#
    
    Change-Id: I7571f3039e0af91560e24c6d00a7ae456f8ba300

diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index 149d055..94ba536 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 );
commit de4dd423b257d83ca32a9b1ccd007fbe7e7eb91e
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Apr 17 20:53:49 2015 +0200

    these two attributes are not part of ODF and unnecessary
    
    Change-Id: I8eda0998f0bb9503cf7d6e89ace2fb1872273880

diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx
index 9b330d4..41577bb 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -309,10 +309,6 @@ void XMLChartExportPropertyMapper::handleElementItem(
                 if( !sTempURL.isEmpty() )
                 {
                     mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sTempURL );
-                    mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE,
-                                              XML_SIMPLE );
-                    mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE,
-                                              XML_ONLOAD );
                 }
 
                 {