Resolves: fdo#64584 revert convert Point::X/Y to Point::set/getX/Y

This reverts commit 69c52bc5b7973a2e414209470f5bf9b66dcc4f30

I found one place where Y should have been X, but didn't clear
the problem, so threw my hat at it and reverted the lot, its
cosmetic anyway so no functionality lost be reverting.

8 files changed, 68 insertions, 77 deletions

diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index 62a3deaf8ae0..574cc7cca21d 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -528,8 +528,8 @@ void SwAnchoredDrawObject::_SetDrawObjAnchor()
     if ( aNewAnchorPos != aCurrAnchorPos )
     {
         // determine movement to be applied after setting the new anchor position
-        Size aMove( aCurrAnchorPos.getX() - aNewAnchorPos.getX(),
-                    aCurrAnchorPos.getY() - aNewAnchorPos.getY() );
+        Size aMove( aCurrAnchorPos.X() - aNewAnchorPos.X(),
+                    aCurrAnchorPos.Y() - aNewAnchorPos.Y() );
         // set new anchor position
         DrawObj()->SetAnchorPos( aNewAnchorPos );
         // correct object position, caused by setting new anchor position
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index b0b927616bd5..884bfbad4226 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -547,23 +547,23 @@ void SwFrm::MakePos()
 
                 // cells may now leave their uppers
                 if( bVert && FRM_CELL & nMyType && !mbReverse )
-                    maFrm.Pos().setX(maFrm.Pos().getX() - maFrm.Width() -pPrv->Frm().Width());
+                    maFrm.Pos().X() -= maFrm.Width() -pPrv->Frm().Width();
             }
             else if( bVert && FRM_NOTE_VERT & nMyType )
             {
                 if( mbReverse )
-                    maFrm.Pos().setX(maFrm.Pos().getX() + pPrv->Frm().Width());
+                    maFrm.Pos().X() += pPrv->Frm().Width();
                 else
                     //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
                 {
                     if ( bVertL2R )
-                           maFrm.Pos().setX(maFrm.Pos().getX() + pPrv->Frm().Width());
+                           maFrm.Pos().X() += pPrv->Frm().Width();
                     else
-                           maFrm.Pos().setX(maFrm.Pos().getX() - maFrm.Width());
+                           maFrm.Pos().X() -= maFrm.Width();
                   }
             }
             else
-                maFrm.Pos().setY(maFrm.Pos().getY() + pPrv->Frm().Height());
+                maFrm.Pos().Y() += pPrv->Frm().Height();
         }
         else if ( GetUpper() )
         {
@@ -602,17 +602,17 @@ void SwFrm::MakePos()
 
                     // cells may now leave their uppers
                     if( bVert && FRM_CELL & nMyType && !mbReverse )
-                        maFrm.Pos().setX(maFrm.Pos().getX() - maFrm.Width() -pPrv->Frm().Width());
+                        maFrm.Pos().X() -= maFrm.Width() -pPrv->Frm().Width();
                 }
                 else if( bVert && FRM_NOTE_VERT & nMyType )
                 {
                     if( mbReverse )
-                        maFrm.Pos().setX(maFrm.Pos().getX() + pPrv->Frm().Width());
+                        maFrm.Pos().X() += pPrv->Frm().Width();
                     else
-                        maFrm.Pos().setX(maFrm.Pos().getX() - maFrm.Width());
+                        maFrm.Pos().X() -= maFrm.Width();
                 }
                 else
-                    maFrm.Pos().setY(maFrm.Pos().getY() + pPrv->Frm().Height());
+                    maFrm.Pos().Y() += pPrv->Frm().Height();
             }
             else
             {
@@ -621,25 +621,22 @@ void SwFrm::MakePos()
                 if( FRM_NEIGHBOUR & nMyType && IsRightToLeft() )
                 {
                     if( bVert )
-                        maFrm.Pos().setY(maFrm.Pos().getY() + GetUpper()->Prt().Height()
-                                          - maFrm.Height());
+                        maFrm.Pos().Y() += GetUpper()->Prt().Height()
+                                          - maFrm.Height();
                     else
-                        maFrm.Pos().setX(maFrm.Pos().getY() + GetUpper()->Prt().Width()
-                                          - maFrm.Width());
+                        maFrm.Pos().X() += GetUpper()->Prt().Width()
+                                          - maFrm.Width();
                 }
                 //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
                 else if( bVert && !bVertL2R && FRM_NOTE_VERT & nMyType && !mbReverse )
-                    maFrm.Pos().setX(maFrm.Pos().getX() - maFrm.Width() - GetUpper()->Prt().Width());
+                    maFrm.Pos().X() -= maFrm.Width() - GetUpper()->Prt().Width();
             }
         }
         else
-        {
-            maFrm.Pos().setX(0);
-            maFrm.Pos().setY(0);
-        }
+            maFrm.Pos().X() = maFrm.Pos().Y() = 0;
         //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
         if( IsBodyFrm() && bVert && !bVertL2R && !mbReverse && GetUpper() )
-            maFrm.Pos().setX(maFrm.Pos().getX() + GetUpper()->Prt().Width() - maFrm.Width());
+            maFrm.Pos().X() += GetUpper()->Prt().Width() - maFrm.Width();
         mbValidPos = sal_True;
     }
 }
@@ -969,8 +966,7 @@ sal_Bool SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
 
             if( (Prt().*fnRect->fnGetHeight)() )
                 ((SwTxtFrm*)this)->HideHidden();
-            Prt().Pos().setX(0);
-            Prt().Pos().setY(0);
+            Prt().Pos().X() = Prt().Pos().Y() = 0;
             (Prt().*fnRect->fnSetWidth)( (Frm().*fnRect->fnGetWidth)() );
             (Prt().*fnRect->fnSetHeight)( 0 );
             nUpper = -( (Frm().*fnRect->fnGetHeight)() );
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index d92184988db4..f72a1eeb4e4c 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -177,8 +177,7 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
 
     //Und erstmal in den Wald stellen die Kiste, damit bei neuen Dokument nicht
     //unnoetig viel formatiert wird.
-    Frm().Pos().setX(FAR_AWAY);
-    Frm().Pos().setY(FAR_AWAY);
+    Frm().Pos().X() = Frm().Pos().Y() = FAR_AWAY;
 }
 
 void SwFlyFrm::Chain( SwFrm* _pAnch )
@@ -1325,8 +1324,7 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs )
         if ( Frm().Top() == FAR_AWAY && Frm().Left() == FAR_AWAY )
         {
             //Sicherheitsschaltung wegnehmen (siehe SwFrm::CTor)
-            Frm().Pos().setX(0);
-            Frm().Pos().setY(0);
+            Frm().Pos().X() = Frm().Pos().Y() = 0;
             // #i68520#
             InvalidateObjRectWithSpaces();
         }
@@ -2680,7 +2678,7 @@ sal_Bool SwFlyFrm::GetContour( PolyPolygon&   rContour,
                             else
                                 aNewPoint = pOutDev->LogicToLogic( rPoly[ i ], aGrfMap, aDispMap  );
 
-                            rPoly[ i ] = Point( FRound( aNewPoint.getX() * fScaleX ), FRound( aNewPoint.getY() * fScaleY ) );
+                            rPoly[ i ] = Point( FRound( aNewPoint.X() * fScaleX ), FRound( aNewPoint.Y() * fScaleY ) );
                         }
                     }
                 }
@@ -2752,17 +2750,17 @@ const SwRect SwFlyFrm::GetObjBoundRect() const
 // #i68520#
 bool SwFlyFrm::_SetObjTop( const SwTwips _nTop )
 {
-    const bool bChanged( Frm().Pos().getY() != _nTop );
+    const bool bChanged( Frm().Pos().Y() != _nTop );
 
-    Frm().Pos().setY(_nTop);
+    Frm().Pos().Y() = _nTop;
 
     return bChanged;
 }
 bool SwFlyFrm::_SetObjLeft( const SwTwips _nLeft )
 {
-    const bool bChanged( Frm().Pos().getX() != _nLeft );
+    const bool bChanged( Frm().Pos().X() != _nLeft );
 
-    Frm().Pos().setX(_nLeft);
+    Frm().Pos().X() = _nLeft;
 
     return bChanged;
 }
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 32c6f89a9016..41057cdf31d2 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -1039,14 +1039,14 @@ static void lcl_PointToPrt( Point &rPoint, const SwFrm *pFrm )
 {
     SwRect aTmp( pFrm->Prt() );
     aTmp += pFrm->Frm().Pos();
-    if ( rPoint.getX() < aTmp.Left() )
-        rPoint.setX(aTmp.Left());
-    else if ( rPoint.getX() > aTmp.Right() )
-        rPoint.setX(aTmp.Right());
-    if ( rPoint.getY() < aTmp.Top() )
-        rPoint.setY(aTmp.Top());
-    else if ( rPoint.getY() > aTmp.Bottom() )
-        rPoint.setY(aTmp.Bottom());
+    if ( rPoint.X() < aTmp.Left() )
+        rPoint.X() = aTmp.Left();
+    else if ( rPoint.X() > aTmp.Right() )
+        rPoint.X() = aTmp.Right();
+    if ( rPoint.Y() < aTmp.Top() )
+        rPoint.Y() = aTmp.Top();
+    else if ( rPoint.Y() > aTmp.Bottom() )
+        rPoint.Y() = aTmp.Bottom();
 
 }
 
@@ -1214,7 +1214,7 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
     Point aNew( rNew );
     //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
       if( ( GetAnchorFrm()->IsVertical() && !GetAnchorFrm()->IsVertLR() ) || GetAnchorFrm()->IsRightToLeft() )
-        aNew.setX(aNew.getX() + Frm().Width());
+        aNew.X() += Frm().Width();
     SwCntntFrm *pCnt = (SwCntntFrm*)::FindAnchor( GetAnchorFrm(), aNew );
     if( pCnt->IsProtected() )
         pCnt = (SwCntntFrm*)GetAnchorFrm();
@@ -1229,9 +1229,9 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
         ( !bRTL !=  !GetAnchorFrm()->IsRightToLeft() ) )
     {
         if( bVert || bRTL )
-            aNew.setX(aNew.getX() + Frm().Width());
+            aNew.X() += Frm().Width();
         else
-            aNew.setX(aNew.getX() - Frm().Width());
+            aNew.X() -= Frm().Width();
     }
 
     if ( pCnt->IsInDocBody() )
@@ -1305,7 +1305,7 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
             //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
             {
                 if ( pUp->IsVertLR()  )
-                    nDiff += pUp->Prt().Width() - pFollow->GetRelPos().getX();
+                    nDiff += pUp->Prt().Width() - pFollow->GetRelPos().X();
                 else
                        nDiff += pFollow->Frm().Left() + pFollow->Frm().Width()
                              - pUp->Frm().Left() - pUp->Prt().Left();
diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx
index a0d9a3f71e39..671c249e1bf2 100644
--- a/sw/source/core/layout/flyincnt.cxx
+++ b/sw/source/core/layout/flyincnt.cxx
@@ -47,9 +47,9 @@ SwFlyInCntFrm::SwFlyInCntFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
     // OD 2004-05-27 #i26791# - member <aRelPos> moved to <SwAnchoredObject>
     Point aRelPos;
     if( pAnch && pAnch->IsVertical() )
-        aRelPos.setX(pAnch->IsReverse() ? nRel : -nRel);
+        aRelPos.X() = pAnch->IsReverse() ? nRel : -nRel;
     else
-        aRelPos.setY(nRel);
+        aRelPos.Y() = nRel;
     SetCurrRelPos( aRelPos );
 }
 
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index f9337b13e268..ca95552e3331 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -3435,8 +3435,8 @@ SwFrm* GetFrmOfModify( const SwRootFrm* pLayout, SwModify const& rMod, sal_uInt1
                     // nocht nicht "formatiert" sind
                     if( !bCalcFrm && nFrmType & FRM_FLY &&
                         ((SwFlyFrm*)pTmpFrm)->GetAnchorFrm() &&
-                        FAR_AWAY == pTmpFrm->Frm().Pos().getX() &&
-                        FAR_AWAY == pTmpFrm->Frm().Pos().getY() )
+                        FAR_AWAY == pTmpFrm->Frm().Pos().X() &&
+                        FAR_AWAY == pTmpFrm->Frm().Pos().Y() )
                         aCalcRect = ((SwFlyFrm*)pTmpFrm)->GetAnchorFrm()->Frm();
                     else
                         aCalcRect = pTmpFrm->Frm();
@@ -3450,7 +3450,7 @@ SwFrm* GetFrmOfModify( const SwRootFrm* pLayout, SwModify const& rMod, sal_uInt1
                     // Point not in rectangle. Compare distances:
                     const Point aCalcRectCenter = aCalcRect.Center();
                     const Point aDiff = aCalcRectCenter - *pPoint;
-                    const sal_uInt64 nCurrentDist = aDiff.getX() * aDiff.getX() + aDiff.getY() * aDiff.getY(); // opt: no sqrt
+                    const sal_uInt64 nCurrentDist = aDiff.X() * aDiff.X() + aDiff.Y() * aDiff.Y(); // opt: no sqrt
                     if ( !pMinFrm || nCurrentDist < nMinDist )
                     {
                         pMinFrm = pTmpFrm;
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 304bbcbece10..5421332650bb 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -120,7 +120,7 @@ void SwBodyFrm::Format( const SwBorderAttrs * )
         Frm().Height( nHeight );
         //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
         if( IsVertical() && !IsVertLR() && !IsReverse() && nWidth != Frm().Width() )
-            Frm().Pos().setX(Frm().Pos().getX() + Frm().Width() - nWidth);
+            Frm().Pos().X() += Frm().Width() - nWidth;
         Frm().Width( nWidth );
     }
 
@@ -169,8 +169,7 @@ void SwBodyFrm::Format( const SwBorderAttrs * )
     }
     if( bNoGrid )
     {
-        Prt().Pos().setX(0);
-        Prt().Pos().setY(0);
+        Prt().Pos().X() = Prt().Pos().Y() = 0;
         Prt().Height( Frm().Height() );
         Prt().Width( Frm().Width() );
     }
@@ -1692,13 +1691,11 @@ void SwRootFrm::MakeAll()
 {
     if ( !mbValidPos )
     {   mbValidPos = sal_True;
-        maFrm.Pos().setX(DOCUMENTBORDER);
-        maFrm.Pos().setY(DOCUMENTBORDER);
+        maFrm.Pos().X() = maFrm.Pos().Y() = DOCUMENTBORDER;
     }
     if ( !mbValidPrtArea )
     {   mbValidPrtArea = sal_True;
-        maPrt.Pos().setX(0);
-        maPrt.Pos().setY(0);
+        maPrt.Pos().X() = maPrt.Pos().Y() = 0;
         maPrt.SSize( maFrm.SSize() );
     }
     if ( !mbValidSize )
@@ -2121,7 +2118,7 @@ void SwRootFrm::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVi
 
     maPageRects.clear();
 
-    const long nBorder = Frm().Pos().getX();
+    const long nBorder = Frm().Pos().X();
     const long nVisWidth = mnViewWidth - 2 * nBorder;
     const long nGapBetweenPages = GAPBETWEENPAGES;
 
@@ -2291,10 +2288,10 @@ void SwRootFrm::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVi
                 // RTL view layout: Calculate mirrored page position
                 if ( bRTL )
                 {
-                    const long nXOffsetInRow = aNewPagePos.getX() - nRowStart;
-                    aNewPagePos.setX(nRowEnd - nXOffsetInRow - nCurrentPageWidth);
+                    const long nXOffsetInRow = aNewPagePos.X() - nRowStart;
+                    aNewPagePos.X() = nRowEnd - nXOffsetInRow - nCurrentPageWidth;
                     aNewPagePosWithLeftOffset = aNewPagePos;
-                    aNewPagePosWithLeftOffset.setX(aNewPagePosWithLeftOffset.getX() + nLeftPageAddOffset);
+                    aNewPagePosWithLeftOffset.X() += nLeftPageAddOffset;
                 }
 
                 if ( aNewPagePosWithLeftOffset != aOldPagePos )
@@ -2310,12 +2307,12 @@ void SwRootFrm::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVi
                 const bool bLastColumn = pPageToAdjust->GetNext() == pEndOfRow;
                 const bool bLastRow = !pEndOfRow;
 
-                nMinPageLeft  = std::min( nMinPageLeft, aNewPagePos.getX() );
-                nMaxPageRight = std::max( nMaxPageRight, aNewPagePos.getX() + nCurrentPageWidth);
+                nMinPageLeft  = std::min( nMinPageLeft, aNewPagePos.X() );
+                nMaxPageRight = std::max( nMaxPageRight, aNewPagePos.X() + nCurrentPageWidth);
 
                 // border of nGapBetweenPages around the current page:
-                SwRect aPageRectWithBorders( aNewPagePos.getX() - nGapBetweenPages,
-                                             aNewPagePos.getY(),
+                SwRect aPageRectWithBorders( aNewPagePos.X() - nGapBetweenPages,
+                                             aNewPagePos.Y(),
                                              pPageToAdjust->Frm().SSize().Width() + nGapBetweenPages + nSidebarWidth,
                                              nCurrentRowHeight );
 
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 2ca8e9b091c5..45b0fd41214d 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5416,11 +5416,11 @@ void SwPageFrm::PaintGrid( OutputDevice* pOut, SwRect &rRect ) const
                     bool bBorder = bLeft || bRight;
                     while( nY < aInter.Top() )
                     {
-                        aTmp.Pos().setY(nY);
+                        aTmp.Pos().Y() = nY;
                         if( bGrid )
                         {
                             nY += nGrid;
-                            SwTwips nPosY = std::max( aInter.Top(), aTmp.Pos().getY() );
+                            SwTwips nPosY = std::max( aInter.Top(), aTmp.Pos().Y() );
                             SwTwips nHeight = std::min(nBottom, nY ) - nPosY;
                             if( nHeight )
                             {
@@ -5453,7 +5453,7 @@ void SwPageFrm::PaintGrid( OutputDevice* pOut, SwRect &rRect ) const
                             nY += nRuby;
                             if( bBorder )
                             {
-                                SwTwips nPos = std::max(aInter.Top(),aTmp.Pos().getY());
+                                SwTwips nPos = std::max(aInter.Top(),aTmp.Pos().Y());
                                 SwTwips nH = std::min( nBottom, nY ) - nPos;
                                 SwRect aVert( Point( aGrid.Left(), nPos ),
                                             Size( 1, nH ) );
@@ -5463,7 +5463,7 @@ void SwPageFrm::PaintGrid( OutputDevice* pOut, SwRect &rRect ) const
                                         PaintBorderLine(rRect,aVert,this,pCol);
                                     if( bRight )
                                     {
-                                        aVert.Pos().setX(nGridRight);
+                                        aVert.Pos().X() = nGridRight;
                                         PaintBorderLine(rRect,aVert,this,pCol);
                                     }
                                 }
@@ -5473,33 +5473,33 @@ void SwPageFrm::PaintGrid( OutputDevice* pOut, SwRect &rRect ) const
                     }
                     while( nY <= nBottom )
                     {
-                        aTmp.Pos().setY(nY);
+                        aTmp.Pos().Y() = nY;
                         PaintBorderLine( rRect, aTmp, this, pCol);
                         if( bGrid )
                         {
                             nY += nGrid;
-                            SwTwips nHeight = std::min(nBottom, nY) - aTmp.Pos().getY();
+                            SwTwips nHeight = std::min(nBottom, nY) - aTmp.Pos().Y();
                             if( nHeight )
                             {
                                 if( bCell )
                                 {
-                                    SwRect aVert( Point( nX, aTmp.Pos().getY() ),
+                                    SwRect aVert( Point( nX, aTmp.Pos().Y() ),
                                                 Size( 1, nHeight ) );
                                     while( aVert.Left() <= nRight )
                                     {
                                         PaintBorderLine( rRect, aVert, this, pCol);
-                                        aVert.Pos().setX(aVert.Pos().getX() + nGridWidth);  //for textgrid refactor
+                                        aVert.Pos().X() += nGridWidth;  //for textgrid refactor
                                     }
                                 }
                                 else if( bBorder )
                                 {
                                     SwRect aVert( Point( aGrid.Left(),
-                                        aTmp.Pos().getY() ), Size( 1, nHeight ) );
+                                        aTmp.Pos().Y() ), Size( 1, nHeight ) );
                                     if( bLeft )
                                         PaintBorderLine(rRect,aVert,this,pCol);
                                     if( bRight )
                                     {
-                                        aVert.Pos().setX(nGridRight);
+                                        aVert.Pos().X() = nGridRight;
                                         PaintBorderLine(rRect,aVert,this,pCol);
                                     }
                                 }
@@ -5520,7 +5520,7 @@ void SwPageFrm::PaintGrid( OutputDevice* pOut, SwRect &rRect ) const
                                         PaintBorderLine(rRect,aVert,this,pCol);
                                     if( bRight )
                                     {
-                                        aVert.Pos().setX(nGridRight);
+                                        aVert.Pos().X() = nGridRight;
                                         PaintBorderLine(rRect,aVert,this,pCol);
                                     }
                                 }
@@ -6467,7 +6467,7 @@ static drawinglayer::primitive2d::Primitive2DSequence lcl_CreatePageAreaDelimite
         basegfx::B2DVector aHorizVector( aXOffDirs[i], 0.0 );
         basegfx::B2DVector aVertVector( 0.0, aYOffDirs[i] );
 
-        basegfx::B2DPoint aBPoint( aPoints[i].X(), aPoints[i].getY() );
+        basegfx::B2DPoint aBPoint( aPoints[i].X(), aPoints[i].Y() );
 
         basegfx::B2DPolygon aPolygon;
         aPolygon.append( aBPoint + aHorizVector * nLineLength );
@@ -6522,7 +6522,7 @@ static drawinglayer::primitive2d::Primitive2DSequence lcl_CreateColumnAreaDelimi
         basegfx::B2DVector aHorizVector( aXOffDirs[i], 0.0 );
         basegfx::B2DVector aVertVector( 0.0, aYOffDirs[i] );
 
-        basegfx::B2DPoint aBPoint( aPoints[i].getX(), aPoints[i].getY() );
+        basegfx::B2DPoint aBPoint( aPoints[i].X(), aPoints[i].Y() );
 
         basegfx::B2DPolygon aPolygon;
         aPolygon.append( aBPoint + aHorizVector * nLineLength );