1 files changed, 18 insertions, 11 deletions
diff --git a/chart2/source/view/axes/Tickmarks.hxx b/chart2/source/view/axes/Tickmarks.hxx
index 039b6a75ff9a..2266c03c91d2 100644
--- a/chart2/source/view/axes/Tickmarks.hxx
+++ b/chart2/source/view/axes/Tickmarks.hxx
@@ -21,7 +21,8 @@
 #include <chartview/ExplicitScaleValues.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <com/sun/star/drawing/PointSequenceSequence.hpp>
-
+#include <rtl/ref.hxx>
+#include <svx/unoshape.hxx>
 #include <vector>
 
 namespace chart { struct AxisProperties; }
@@ -35,18 +36,15 @@ struct TickInfo
 {
     double      fScaledTickValue;
     css::uno::Reference<css::chart2::XScaling> xInverseScaling;
-
-    ::basegfx::B2DVector  aTickScreenPosition;
-    bool        bPaintIt;
-
-    css::uno::Reference<css::drawing::XShape> xTextShape;
-
+    rtl::Reference<SvxShapeText> xTextShape;
     OUString aText;//used only for complex categories so far
+    ::basegfx::B2DVector  aTickScreenPosition;
     sal_Int32 nFactorForLimitedTextWidth;//categories in higher levels of complex categories can have more place than a single simple category
+    bool        bPaintIt;
 
 //methods:
     TickInfo() = delete;
-    explicit TickInfo( const css::uno::Reference<css::chart2::XScaling>& xInverse );
+    explicit TickInfo( css::uno::Reference<css::chart2::XScaling> xInverse );
 
     /**
      * Return a value associated with the tick mark. It's normally an original
@@ -85,8 +83,8 @@ class TickFactory
 {
 public:
     TickFactory(
-         const ExplicitScaleData& rScale
-        , const ExplicitIncrementData& rIncrement );
+         ExplicitScaleData aScale
+        , ExplicitIncrementData aIncrement );
     virtual ~TickFactory();
 
     void getAllTicks( TickInfoArraysType& rAllTickInfos ) const;
@@ -134,7 +132,16 @@ public:
 
     bool  isHorizontalAxis() const;
     bool  isVerticalAxis() const;
-    ::basegfx::B2DVector getXaxisStartPos() const;
+
+    const ::basegfx::B2DVector & getXaxisStartPos() const
+    {
+        return m_aAxisStartScreenPosition2D;
+    }
+
+    const ::basegfx::B2DVector & getXaxisEndPos() const
+    {
+        return m_aAxisEndScreenPosition2D;
+    }
 
 private:
     ::basegfx::B2DVector     getTickScreenPosition2D( double fScaledLogicTickValue ) const;