[Libreoffice-commits] core.git: Branch 'feature/perfwork4' - 2 commits - chart2/qa oox/source svx/source

[Kohei Yoshida]

 chart2/qa/extras/chart2import.cxx                  |    2 +-
 oox/source/drawingml/chart/axismodel.cxx           |    2 +-
 svx/source/sdr/contact/objectcontactofpageview.cxx |   11 +++++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit 5a6379ab11d9daf8e516c34daea738b5cb96fcd1
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Fri Oct 31 23:59:27 2014 -0400

    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

diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx
index 3b1f1e7..b28559b 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -91,7 +91,7 @@ public:
     CPPUNIT_TEST(testFdo78080);
     CPPUNIT_TEST(testFdo54361);
     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 cbd66b7..d4163bc 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 ),
commit d7f2cc4d9e4b81a788f178a180e026de365cb43c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Oct 24 17:58:27 2014 +0200

    fdo#83664: svx: don't try to paint on empty OutputDevice
    
    ObjectContactOfPageView::DoProcessDisplay() initalizes an empty
    aViewRange, which later code assumes to mean "paint everything", but
    actually the OutputDevice has 0 size so nothing can be painted.
    
    Change-Id: I1e47e8d38c1fad5e08027bb76fce4b54c5b3358b

diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index f778df1..27ae1bb 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -141,6 +141,15 @@ namespace sdr
         // OutputDevices then the given ones.
         void ObjectContactOfPageView::DoProcessDisplay(DisplayInfo& rDisplayInfo)
         {
+            OutputDevice& rTargetOutDev = GetPageWindow().GetPaintWindow().GetTargetOutputDevice();
+            const Size aOutputSizePixel(rTargetOutDev.GetOutputSizePixel());
+            if (!isOutputToRecordingMetaFile() // do those have outdev too?
+                && (0 == aOutputSizePixel.getWidth() ||
+                    0 == aOutputSizePixel.getHeight()))
+            {
+                return;
+            }
+
             // visualize entered group when that feature is switched on and it's not
             // a print output. #i29129# No ghosted display for printing.
             bool bVisualizeEnteredGroup(DoVisualizeEnteredGroup() && !isOutputToPrinter());
@@ -170,7 +179,6 @@ namespace sdr
 
             // update current ViewInformation2D at the ObjectContact
             const double fCurrentTime(getPrimitiveAnimator().GetTime());
-            OutputDevice& rTargetOutDev = GetPageWindow().GetPaintWindow().GetTargetOutputDevice();
             basegfx::B2DRange aViewRange;
 
             // create ViewRange
@@ -194,7 +202,6 @@ namespace sdr
             else
             {
                 // use visible pixels, but transform to world coordinates
-                const Size aOutputSizePixel(rTargetOutDev.GetOutputSizePixel());
                 aViewRange = basegfx::B2DRange(0.0, 0.0, aOutputSizePixel.getWidth(), aOutputSizePixel.getHeight());
 
                 // if a clip region is set, use it