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

[sushil_shinde]

 chart2/qa/extras/chart2import.cxx                      |   23 +++++++++++++++++
 chart2/qa/extras/data/xlsx/chart-text-can-overlap.xlsx |binary
 oox/source/drawingml/chart/axismodel.cxx               |    2 -
 3 files changed, 24 insertions(+), 1 deletion(-)

New commits:
commit 4027bc476a1df9df1924447795ddc2d8b7744e20
Author: sushil_shinde <sushilshinde at libreoffice.org>
Date:   Fri Oct 10 11:25:42 2014 +0530

    fdo#84647 : Fixed default value for TickLableSkip value.
    
       1. 'TextCanOverlap' property was stored as false if TickLableSkip
          is not equal to one.
       2. For OOXML charts TickLableSkip can be between 1 to 999999999.
       3. We can not apply zero or less than zero  value to TickLableSkip.
          ( As per specification)
       4. In axis model default value for TickLableSkip was zero which is
          incorrect.
       5. Added unit test to check 'TextCanOverlap' property for chart.
    
    Change-Id: Ib3104b1d932f6e9376c149eabb201c8e9ad23da9
    Reviewed-on: https://gerrit.libreoffice.org/11901
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
    Tested-by: Kohei Yoshida <libreoffice at kohei.us>

diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx
index b853466..3b1f1e7 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -18,9 +18,11 @@
 #include <com/sun/star/chart2/XInternalDataProvider.hpp>
 #include <com/sun/star/chart/XChartDataArray.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
+#include <com/sun/star/chart/XTwoAxisXSupplier.hpp>
 
 #include <com/sun/star/util/Color.hpp>
 
+
 class Chart2ImportTest : public ChartTest
 {
 public:
@@ -53,6 +55,7 @@ public:
     void testFdo78080();
     void testFdo54361();
     void testAutoBackgroundXLSX();
+    void testTextCanOverlapXLSX();
     void testNumberFormatsXLSX();
 
     void testTransparentBackground(OUString const & filename);
@@ -88,6 +91,7 @@ public:
     CPPUNIT_TEST(testFdo78080);
     CPPUNIT_TEST(testFdo54361);
     CPPUNIT_TEST(testAutoBackgroundXLSX);
+    CPPUNIT_TEST(testTextCanOverlapXLSX);
     CPPUNIT_TEST(testNumberFormatsXLSX);
     CPPUNIT_TEST_SUITE_END();
 
@@ -635,6 +639,25 @@ void Chart2ImportTest::testAutoBackgroundXLSX()
         (nColor & 0x00FFFFFF) == 0x00FFFFFF); // highest 2 bytes are transparency which we ignore here.
 }
 
+void Chart2ImportTest::testTextCanOverlapXLSX()
+{
+    // fdo#84647 : To check textoverlap value is imported correclty.
+    load("/chart2/qa/extras/data/xlsx/", "chart-text-can-overlap.xlsx");
+    uno::Reference< chart::XDiagram > mxDiagram;
+    uno::Reference< beans::XPropertySet > xAxisProp;
+    bool textCanOverlap = false;
+    uno::Reference< chart::XChartDocument > xChartDoc ( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW);
+    CPPUNIT_ASSERT(xChartDoc.is());
+    mxDiagram.set(xChartDoc->getDiagram());
+    CPPUNIT_ASSERT(mxDiagram.is());
+    uno::Reference< chart::XAxisXSupplier > xAxisXSupp( mxDiagram, uno::UNO_QUERY );
+    CPPUNIT_ASSERT(xAxisXSupp.is());
+    xAxisProp = xAxisXSupp->getXAxis();
+    xAxisProp->getPropertyValue("TextCanOverlap") >>= textCanOverlap;
+    // Expected value of 'TextCanOverlap' is true
+    CPPUNIT_ASSERT(textCanOverlap);
+}
+
 void Chart2ImportTest::testNumberFormatsXLSX()
 {
     load("/chart2/qa/extras/data/xlsx/", "number-formats.xlsx");
diff --git a/chart2/qa/extras/data/xlsx/chart-text-can-overlap.xlsx b/chart2/qa/extras/data/xlsx/chart-text-can-overlap.xlsx
new file mode 100644
index 0000000..59f907d
Binary files /dev/null and b/chart2/qa/extras/data/xlsx/chart-text-can-overlap.xlsx differ
diff --git a/oox/source/drawingml/chart/axismodel.cxx b/oox/source/drawingml/chart/axismodel.cxx
index d4163bc..cbd66b7 100644
--- a/oox/source/drawingml/chart/axismodel.cxx
+++ b/oox/source/drawingml/chart/axismodel.cxx
@@ -46,7 +46,7 @@ AxisModel::AxisModel( sal_Int32 nTypeId ) :
     mnMinorTimeUnit( XML_days ),
     mnOrientation( XML_minMax ),
     mnTickLabelPos( XML_nextTo ),
-    mnTickLabelSkip( 0 ),
+    mnTickLabelSkip( 1 ),
     mnTickMarkSkip( 0 ),
     mnTypeId( nTypeId ),
     mbAuto( false ),