summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2014-10-31 23:59:27 -0400
committerKohei Yoshida <kohei.yoshida@collabora.com>2014-11-04 12:30:41 -0500
commitf281d2d24c2a368c58d32b1b50acf83e0f056d90 (patch)
tree6c7eab72bdea6185087c675344bbe60fc429548b
parente296b3d25e7d78544d3abd87780f9680e56efa26 (diff)
Actually we shouldn't always set Overlap flag on for all xlsx charts...
The correct fix unfortunately would require making the axis label layout smarter, to avoid overlapping of angled text label objects. Change-Id: I92198dbb90fd4a206ee226307992343d064f733a
-rw-r--r--chart2/qa/extras/chart2import.cxx2
-rw-r--r--oox/source/drawingml/chart/axismodel.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx
index 4d0eb237d1e3..719a599e9700 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -87,7 +87,7 @@ public:
CPPUNIT_TEST(testFdo54361);
CPPUNIT_TEST(testFdo54361_1);
CPPUNIT_TEST(testAutoBackgroundXLSX);
- CPPUNIT_TEST(testTextCanOverlapXLSX);
+ // CPPUNIT_TEST(testTextCanOverlapXLSX); // TODO : temporarily disabled.
CPPUNIT_TEST(testNumberFormatsXLSX);
CPPUNIT_TEST_SUITE_END();
diff --git a/oox/source/drawingml/chart/axismodel.cxx b/oox/source/drawingml/chart/axismodel.cxx
index cbd66b789a2a..d4163bca151f 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( 1 ),
+ mnTickLabelSkip( 0 ),
mnTickMarkSkip( 0 ),
mnTypeId( nTypeId ),
mbAuto( false ),