summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2014-10-14 11:35:29 -0400
committerKohei Yoshida <kohei.yoshida@collabora.com>2014-10-14 11:38:37 -0400
commit83210e28aeb0ba1faa809dbe705ce780cdd6fb4e (patch)
tree49300c426e032e74be6b43cc8e25f24253d0449e /chart2
parent578fd01ee9d1a3b550e115d5db64523c7f57efde (diff)
Take the current axis alignment state.
Change-Id: I02c28f44af0a1510bdb780d1e6c70561b7ba24e5
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/view/axes/VCartesianAxis.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index d28c0319b30d..be13e64f5f29 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) );