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

[Markus Mohrhard]

 oox/source/export/chartexport.cxx |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 81b9d431678bc270e7592e9bedb81d2d445e2122
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Apr 29 16:33:24 2013 +0200

    c:varyColor is true by default in Excel
    
    And another step closer to opening my test file correctly in Excel.
    
    Change-Id: Ib6aa8ddb2f2792513c7263d86865e08fe5f1483d

diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index d0895f3..98fff6f 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1330,6 +1330,10 @@ void ChartExport::exportScatterChart( Reference< chart2::XChartType > xChartType
             XML_val, scatterStyle,
             FSEND );
 
+    pFS->singleElement( FSNS( XML_c, XML_varyColors ),
+            XML_val, "0",
+            FSEND );
+
     // FIXME: should export xVal and yVal
     sal_Int32 nAttachedAxis = AXIS_PRIMARY_Y;
     exportSeries( xChartType, nAttachedAxis );
commit 5c19f86a077622141560bdba97e94136db9e9b40
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Apr 29 16:13:21 2013 +0200

    OSL_TRACE => SAL_WARN in chartexport.cxx
    
    Change-Id: I12ddd18c1b4476d42c097704c2af2d0af4e15a1e

diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index e616922..d0895f3 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2311,9 +2311,7 @@ void ChartExport::exportDataLabels(
             }
             catch( const uno::Exception & rEx )
             {
-                (void)rEx; // avoid warning for pro build
-                OSL_TRACE( "Exception caught during Export of data label: %s",
-                                OUStringToOString( rEx.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
+                SAL_WARN("oox", "Exception caught during Export of data label: " << rEx.Message );
             }
 
             if( xPropSet.is() )
commit 6ddd7fccdc8fc292200e581dbc4e456ec86cef47
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Apr 29 16:12:33 2013 +0200

    c:delete is true by default in Excel
    
    One step closer to opening my simple test file correctly in Excel.
    
    Change-Id: I1bfa76a46081ba478e44d8d90d8a91790a9a9ff3

diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index c3cf09f..e616922 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2085,13 +2085,9 @@ void ChartExport::_exportAxis(
             OUString ("Visible")) >>=  bVisible;
     }
 
-    if( !bVisible )
-    {
-        // other value?
-        pFS->singleElement( FSNS( XML_c, XML_delete ),
-            XML_val, "1",
+    pFS->singleElement( FSNS( XML_c, XML_delete ),
+            XML_val, bVisible ? "0" : "1",
             FSEND );
-    }
 
     // FIXME: axPos, need to check the property "ReverseDirection"
     pFS->singleElement( FSNS( XML_c, XML_axPos ),