[Libreoffice-commits] core.git: Branch 'feature/perfwork2' - chart2/source

[Kohei Yoshida]

 chart2/source/view/axes/VCartesianAxis.cxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 9894c8559d13ea70a5e62a52c478522b9485d1df
Author: Kohei Yoshida <kohei.yosh...@collabora.com>
Date:   Tue Oct 14 11:35:29 2014 -0400

    Take the current axis alignment state.
    
    Change-Id: I02c28f44af0a1510bdb780d1e6c70561b7ba24e5

diff --git a/chart2/source/view/axes/VCartesianAxis.cxx 
b/chart2/source/view/axes/VCartesianAxis.cxx
index d28c031..be13e64 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -1248,10 +1248,9 @@ TickFactory* VCartesianAxis::createTickFactory()
 
 TickFactory2D* VCartesianAxis::createTickFactory2D()
 {
-    AxisLabelAlignment aLabelAlign;
+    AxisLabelAlignment aLabelAlign = m_aAxisProperties.maLabelAlignment;
     B2DVector aStart, aEnd;
     get2DAxisMainLine(aStart, aEnd, aLabelAlign, getAxisIntersectionValue());
-    m_aAxisProperties.maLabelAlignment = aLabelAlign;
 
     B2DVector aLabelLineStart, aLabelLineEnd;
     get2DAxisMainLine(aLabelLineStart, aLabelLineEnd, aLabelAlign, 
getLabelLineIntersectionValue());
@@ -1301,7 +1300,7 @@ sal_Int32 
VCartesianAxis::estimateMaximumAutoMainIncrementCount()
         return nRet;
 
     B2DVector aStart, aEnd;
-    AxisLabelAlignment aLabelAlign;
+    AxisLabelAlignment aLabelAlign = m_aAxisProperties.maLabelAlignment;
     get2DAxisMainLine(aStart, aEnd, aLabelAlign, getAxisIntersectionValue());
     m_aAxisProperties.maLabelAlignment = aLabelAlign;
 
@@ -1647,7 +1646,7 @@ void VCartesianAxis::createShapes()
             if (!rtl::math::isNan(fExtraLineCrossesOtherAxis))
             {
                 B2DVector aStart, aEnd;
-                AxisLabelAlignment aLabelAlign;
+                AxisLabelAlignment aLabelAlign = 
m_aAxisProperties.maLabelAlignment;
                 get2DAxisMainLine(aStart, aEnd, aLabelAlign, 
fExtraLineCrossesOtherAxis);
                 m_aAxisProperties.maLabelAlignment = aLabelAlign;
                 drawing::PointSequenceSequence aPoints( 
lcl_makePointSequence(aStart,aEnd) );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits