[Libreoffice-commits] core.git: 4 commits - oox/source

[Markus Mohrhard]

 oox/source/export/chartexport.cxx |    2 +-
 oox/source/export/drawingml.cxx   |   21 ++++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

New commits:
commit 09d486b897c0e2ba407e833462ac5f9db6188463
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon May 6 01:32:32 2013 +0200

    data label export does not work with bar charts
    
    Excel just removes the chart during import. Additionally we should work
    on only exporting the data label information for points that really
    contain data labels.
    
    Change-Id: I80aef8effe27c729feb69c25c319ca129dc961a5

diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 2d1b930..32edd25 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1533,7 +1533,7 @@ void ChartExport::exportSeries( Reference< chart2::XChartType > xChartType, sal_
                     // export data labels
                     // Excel does not like our current data label export
                     // for scatter charts
-                    if( eChartType != chart::TYPEID_SCATTER )
+                    if( eChartType != chart::TYPEID_SCATTER && eChartType != chart::TYPEID_BAR )
                         exportDataLabels( uno::Reference< beans::XPropertySet >( aSeriesSeq[nSeriesIdx], uno::UNO_QUERY ), nSeriesLength );
 
                     // export data points
commit 062b9f0bdc6fc5328fb76a3b19e1036e1e017ce7
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon May 6 01:15:47 2013 +0200

    remove unnecessary explicit namespaces
    
    Change-Id: Idb6bf5704a3b569ae4ae19d35526f19528ab63a6

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index c6cb94a..3157eac 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1536,16 +1536,16 @@ void DrawingML::WriteFill( Reference< XPropertySet > xPropSet )
 
     switch( aFillStyle )
     {
-    case ::com::sun::star::drawing::FillStyle_SOLID :
+    case FillStyle_SOLID :
         WriteSolidFill( xPropSet );
         break;
-    case ::com::sun::star::drawing::FillStyle_GRADIENT :
+    case FillStyle_GRADIENT :
         WriteGradientFill( xPropSet );
         break;
-    case ::com::sun::star::drawing::FillStyle_BITMAP :
+    case FillStyle_BITMAP :
         WriteBlipFill( xPropSet, "FillBitmapURL" );
         break;
-    case ::com::sun::star::drawing::FillStyle_NONE:
+    case FillStyle_NONE:
         mpFS->singleElementNS( XML_a, XML_noFill, FSEND );
         break;
     default:
commit 6e2292b3cdd032edff21f0016b7f61e9bb420699
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon May 6 01:11:36 2013 +0200

    map full transparent solid fill to no fill, fdo#64224
    
    Change-Id: I9ec33b347647bfcd6c1411c4db7af51ca597dc8e

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index cbabf5b..c6cb94a 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1525,6 +1525,15 @@ void DrawingML::WriteFill( Reference< XPropertySet > xPropSet )
     if( aFillStyle == FillStyle_HATCH )
         return;
 
+    if ( aFillStyle == FillStyle_SOLID && GetProperty( xPropSet, "FillTransparence" ) )
+    {
+        // map full transparent background to no fill
+        sal_Int16 nVal;
+        xPropSet->getPropertyValue( "FillTransparence" ) >>= nVal;
+        if ( nVal == 100 )
+            aFillStyle = FillStyle_NONE;
+    }
+
     switch( aFillStyle )
     {
     case ::com::sun::star::drawing::FillStyle_SOLID :
commit 93abb2082ad3cae1432d69b65a89dace6646785a
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun May 5 21:35:07 2013 +0200

    let us be explicit about default values
    
    Different MSO versions behave differently in respect to the default
    values. 2007 is not compliant to OOXML and is what our export filter
    expects, 2010+ are compliant to OOXML and therefore our charts look
    awful.
    
    Change-Id: If301d878a1603ed9835884cfbb9ed9c902526ba0

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index cad8ea1..cbabf5b 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1522,8 +1522,7 @@ void DrawingML::WriteFill( Reference< XPropertySet > xPropSet )
     FillStyle aFillStyle( FillStyle_NONE );
     xPropSet->getPropertyValue( "FillStyle" ) >>= aFillStyle;
 
-    if( aFillStyle == FillStyle_NONE ||
-        aFillStyle == FillStyle_HATCH )
+    if( aFillStyle == FillStyle_HATCH )
         return;
 
     switch( aFillStyle )
@@ -1537,6 +1536,9 @@ void DrawingML::WriteFill( Reference< XPropertySet > xPropSet )
     case ::com::sun::star::drawing::FillStyle_BITMAP :
         WriteBlipFill( xPropSet, "FillBitmapURL" );
         break;
+    case ::com::sun::star::drawing::FillStyle_NONE:
+        mpFS->singleElementNS( XML_a, XML_noFill, FSEND );
+        break;
     default:
         ;
     }