rename some unnecessary contractions, Lft-Left, etc.

Change-Id: Idf4ab2d4d2550a02c0c50a981d94c67b111082a9
Reviewed-on: https://gerrit.libreoffice.org/41204
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

11 files changed, 97 insertions, 97 deletions

diff --git a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
index 679fcc552b3d..5486e7fac5a4 100644
--- a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
+++ b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
@@ -63,9 +63,9 @@ namespace sdr
                 // direct model data is the page size, get and use it
                 const SdrPage& rOwnerPage = GetMasterPageDescriptor().GetOwnerPage();
                 const basegfx::B2DRange aInnerRange(
-                    rOwnerPage.GetLftBorder(), rOwnerPage.GetUppBorder(),
-                    rOwnerPage.GetWdt() - rOwnerPage.GetRgtBorder(),
-                    rOwnerPage.GetHgt() - rOwnerPage.GetLwrBorder());
+                    rOwnerPage.GetLeftBorder(), rOwnerPage.GetUpperBorder(),
+                    rOwnerPage.GetWidth() - rOwnerPage.GetRightBorder(),
+                    rOwnerPage.GetHeight() - rOwnerPage.GetLowerBorder());
                 const basegfx::B2DPolygon aInnerPolgon(basegfx::tools::createPolygonFromRect(aInnerRange));
                 const drawinglayer::primitive2d::Primitive2DReference xReference(
                     drawinglayer::primitive2d::createPolyPolygonFillPrimitive(
diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
index d40a0f30e544..1b9d6c903b04 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
@@ -106,8 +106,8 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfPageShadow::createV
     static bool bUseOldPageShadow(false);
     const SdrPage& rPage = getPage();
     basegfx::B2DHomMatrix aPageMatrix;
-    aPageMatrix.set(0, 0, (double)rPage.GetWdt());
-    aPageMatrix.set(1, 1, (double)rPage.GetHgt());
+    aPageMatrix.set(0, 0, (double)rPage.GetWidth());
+    aPageMatrix.set(1, 1, (double)rPage.GetHeight());
 
     if(bUseOldPageShadow)
     {
@@ -209,8 +209,8 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfMasterPage::createV
             {
                 // direct model data is the page size, get and use it
                 const basegfx::B2DRange aInnerRange(
-                    rPage.GetLftBorder(), rPage.GetUppBorder(),
-                    rPage.GetWdt() - rPage.GetRgtBorder(), rPage.GetHgt() - rPage.GetLwrBorder());
+                    rPage.GetLeftBorder(), rPage.GetUpperBorder(),
+                    rPage.GetWidth() - rPage.GetRightBorder(), rPage.GetHeight() - rPage.GetLowerBorder());
                 const basegfx::B2DPolygon aInnerPolgon(basegfx::tools::createPolygonFromRect(aInnerRange));
                 const drawinglayer::primitive2d::Primitive2DReference xReference(
                     drawinglayer::primitive2d::createPolyPolygonFillPrimitive(
@@ -246,7 +246,7 @@ ViewObjectContact& ViewContactOfPageFill::CreateObjectSpecificViewObjectContact(
 drawinglayer::primitive2d::Primitive2DContainer ViewContactOfPageFill::createViewIndependentPrimitive2DSequence() const
 {
     const SdrPage& rPage = getPage();
-    const basegfx::B2DRange aPageFillRange(0.0, 0.0, (double)rPage.GetWdt(), (double)rPage.GetHgt());
+    const basegfx::B2DRange aPageFillRange(0.0, 0.0, (double)rPage.GetWidth(), (double)rPage.GetHeight());
     const basegfx::B2DPolygon aPageFillPolygon(basegfx::tools::createPolygonFromRect(aPageFillRange));
 
     // We have only the page information, not the view information. Use the
@@ -282,7 +282,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfOuterPageBorder::cr
 {
     drawinglayer::primitive2d::Primitive2DContainer xRetval;
     const SdrPage& rPage = getPage();
-    const basegfx::B2DRange aPageBorderRange(0.0, 0.0, (double)rPage.GetWdt(), (double)rPage.GetHgt());
+    const basegfx::B2DRange aPageBorderRange(0.0, 0.0, (double)rPage.GetWidth(), (double)rPage.GetHeight());
 
     // Changed to 0x949599 for renaissance, before svtools::FONTCOLOR was used.
     // Added old case as fallback for HighContrast.
@@ -343,8 +343,8 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfInnerPageBorder::cr
 {
     const SdrPage& rPage = getPage();
     const basegfx::B2DRange aPageBorderRange(
-        (double)rPage.GetLftBorder(), (double)rPage.GetUppBorder(),
-        (double)(rPage.GetWdt() - rPage.GetRgtBorder()), (double)(rPage.GetHgt() - rPage.GetLwrBorder()));
+        (double)rPage.GetLeftBorder(), (double)rPage.GetUpperBorder(),
+        (double)(rPage.GetWidth() - rPage.GetRightBorder()), (double)(rPage.GetHeight() - rPage.GetLowerBorder()));
     const basegfx::B2DPolygon aPageBorderPolygon(basegfx::tools::createPolygonFromRect(aPageBorderRange));
 
     // We have only the page information, not the view information. Use the
diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
index 78455f4038f8..5433095ad7a6 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
@@ -96,8 +96,8 @@ namespace sdr
                 //polygon chain to cover the length in applyLineDashing if this
                 //line is dashed
                 const SdrPage* pPage = GetPathObj().GetPage();
-                sal_Int32 nPageWidth = pPage ? pPage->GetWdt() : 0;
-                sal_Int32 nPageHeight = pPage ? pPage->GetHgt() : 0;
+                sal_Int32 nPageWidth = pPage ? pPage->GetWidth() : 0;
+                sal_Int32 nPageHeight = pPage ? pPage->GetHeight() : 0;
 
                 //But, see tdf#101187, only do this if our generous clip region
                 //would not over flow into a tiny clip region
diff --git a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx
index 3c9aca92946b..fd19a9d41f36 100644
--- a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx
@@ -68,8 +68,8 @@ namespace sdr
             // used range (retval) is fixed here, it's the MasterPage fill range
             const SdrPage& rOwnerPage = rDescriptor.GetOwnerPage();
             const basegfx::B2DRange aPageFillRange(
-                rOwnerPage.GetLftBorder(), rOwnerPage.GetUppBorder(),
-                rOwnerPage.GetWdt() - rOwnerPage.GetRgtBorder(), rOwnerPage.GetHgt() - rOwnerPage.GetLwrBorder());
+                rOwnerPage.GetLeftBorder(), rOwnerPage.GetUpperBorder(),
+                rOwnerPage.GetWidth() - rOwnerPage.GetRightBorder(), rOwnerPage.GetHeight() - rOwnerPage.GetLowerBorder());
 
             // Modify DisplayInfo for MasterPageContent collection; remember original layers and
             // set combined SdrLayerIDSet; set MasterPagePaint flag
diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
index b54e19145e8e..5bf633790323 100644
--- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
@@ -164,7 +164,7 @@ void PagePrimitiveExtractor::InvalidatePartOfView(const basegfx::B2DRange& rRang
 
     if(pStartPage && !rRange.isEmpty())
     {
-        const basegfx::B2DRange aPageRange(0.0, 0.0, (double)pStartPage->GetWdt(), (double)pStartPage->GetHgt());
+        const basegfx::B2DRange aPageRange(0.0, 0.0, (double)pStartPage->GetWidth(), (double)pStartPage->GetHeight());
 
         if(rRange.overlaps(aPageRange))
         {
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
index 351cffaf3700..83ae5011d5cc 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
@@ -215,7 +215,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfPageFill::cre
     {
         const SdrPage& rPage = getPage();
 
-        const basegfx::B2DRange aPageFillRange(0.0, 0.0, (double)rPage.GetWdt(), (double)rPage.GetHgt());
+        const basegfx::B2DRange aPageFillRange(0.0, 0.0, (double)rPage.GetWidth(), (double)rPage.GetHeight());
         const basegfx::B2DPolygon aPageFillPolygon(basegfx::tools::createPolygonFromRect(aPageFillRange));
         Color aPageFillColor;
 
@@ -344,7 +344,7 @@ bool ViewObjectContactOfInnerPageBorder::isPrimitiveVisible(const DisplayInfo& r
 
     const SdrPage& rPage = getPage();
 
-    if(!rPage.GetLftBorder() && !rPage.GetUppBorder() && !rPage.GetRgtBorder() && !rPage.GetLwrBorder())
+    if(!rPage.GetLeftBorder() && !rPage.GetUpperBorder() && !rPage.GetRightBorder() && !rPage.GetLowerBorder())
     {
         return false;
     }
@@ -454,10 +454,10 @@ drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfPageGrid::cre
         const basegfx::BColor aRGBGridColor(aGridColor.getBColor());
 
         basegfx::B2DHomMatrix aGridMatrix;
-        aGridMatrix.set(0, 0, (double)(rPage.GetWdt() - (rPage.GetRgtBorder() + rPage.GetLftBorder())));
-        aGridMatrix.set(1, 1, (double)(rPage.GetHgt() - (rPage.GetLwrBorder() + rPage.GetUppBorder())));
-        aGridMatrix.set(0, 2, (double)rPage.GetLftBorder());
-        aGridMatrix.set(1, 2, (double)rPage.GetUppBorder());
+        aGridMatrix.set(0, 0, (double)(rPage.GetWidth() - (rPage.GetRightBorder() + rPage.GetLeftBorder())));
+        aGridMatrix.set(1, 1, (double)(rPage.GetHeight() - (rPage.GetLowerBorder() + rPage.GetUpperBorder())));
+        aGridMatrix.set(0, 2, (double)rPage.GetLeftBorder());
+        aGridMatrix.set(1, 2, (double)rPage.GetUpperBorder());
 
         const Size aRaw(rView.GetGridCoarse());
         const Size aFine(rView.GetGridFine());
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index d988aad4fc64..e2aefc9b2104 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -1810,9 +1810,9 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert)
             }
             else
             {
-                aBound=tools::Rectangle(pPage->GetLftBorder(),pPage->GetUppBorder(),
-                                 pPage->GetWdt()-pPage->GetRgtBorder(),
-                                 pPage->GetHgt()-pPage->GetLwrBorder());
+                aBound=tools::Rectangle(pPage->GetLeftBorder(),pPage->GetUpperBorder(),
+                                 pPage->GetWidth()-pPage->GetRightBorder(),
+                                 pPage->GetHeight()-pPage->GetLowerBorder());
             }
         }
         else
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 9657bf62cf55..cb4fd10a91e3 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -1159,12 +1159,12 @@ void SdrPageProperties::SetStyleSheet(SfxStyleSheet* pStyleSheet)
 SdrPage::SdrPage(SdrModel& rNewModel, bool bMasterPage)
 :   SdrObjList(&rNewModel, this),
     mpViewContact(nullptr),
-    nWdt(10L),
-    nHgt(10L),
-    nBordLft(0L),
-    nBordUpp(0L),
-    nBordRgt(0L),
-    nBordLwr(0L),
+    mnWidth(10L),
+    mnHeight(10L),
+    mnBorderLeft(0L),
+    mnBorderUpper(0L),
+    mnBorderRight(0L),
+    mnBorderLower(0L),
     mpLayerAdmin(new SdrLayerAdmin(&rNewModel.GetLayerAdmin())),
     mpSdrPageProperties(nullptr),
     mpMasterPageDescriptor(nullptr),
@@ -1184,12 +1184,12 @@ SdrPage::SdrPage(const SdrPage& rSrcPage)
 :   SdrObjList(rSrcPage.pModel, this),
     tools::WeakBase< SdrPage >(),
     mpViewContact(nullptr),
-    nWdt(rSrcPage.nWdt),
-    nHgt(rSrcPage.nHgt),
-    nBordLft(rSrcPage.nBordLft),
-    nBordUpp(rSrcPage.nBordUpp),
-    nBordRgt(rSrcPage.nBordRgt),
-    nBordLwr(rSrcPage.nBordLwr),
+    mnWidth(rSrcPage.mnWidth),
+    mnHeight(rSrcPage.mnHeight),
+    mnBorderLeft(rSrcPage.mnBorderLeft),
+    mnBorderUpper(rSrcPage.mnBorderUpper),
+    mnBorderRight(rSrcPage.mnBorderRight),
+    mnBorderLower(rSrcPage.mnBorderLower),
     mpLayerAdmin(new SdrLayerAdmin(rSrcPage.pModel->GetLayerAdmin())),
     mpSdrPageProperties(nullptr),
     mpMasterPageDescriptor(nullptr),
@@ -1257,12 +1257,12 @@ void SdrPage::lateInit(const SdrPage& rSrcPage, SdrModel* const pNewModel)
     mbMaster = rSrcPage.mbMaster;
     mbPageBorderOnlyLeftRight = rSrcPage.mbPageBorderOnlyLeftRight;
     aPrefVisiLayers = rSrcPage.aPrefVisiLayers;
-    nWdt = rSrcPage.nWdt;
-    nHgt = rSrcPage.nHgt;
-    nBordLft = rSrcPage.nBordLft;
-    nBordUpp = rSrcPage.nBordUpp;
-    nBordRgt = rSrcPage.nBordRgt;
-    nBordLwr = rSrcPage.nBordLwr;
+    mnWidth = rSrcPage.mnWidth;
+    mnHeight = rSrcPage.mnHeight;
+    mnBorderLeft = rSrcPage.mnBorderLeft;
+    mnBorderUpper = rSrcPage.mnBorderUpper;
+    mnBorderRight = rSrcPage.mnBorderRight;
+    mnBorderLower = rSrcPage.mnBorderLower;
     nPageNum = rSrcPage.nPageNum;
 
     if(rSrcPage.TRG_HasMasterPage())
@@ -1313,15 +1313,15 @@ void SdrPage::SetSize(const Size& aSiz)
 {
     bool bChanged(false);
 
-    if(aSiz.Width() != nWdt)
+    if(aSiz.Width() != mnWidth)
     {
-        nWdt = aSiz.Width();
+        mnWidth = aSiz.Width();
         bChanged = true;
     }
 
-    if(aSiz.Height() != nHgt)
+    if(aSiz.Height() != mnHeight)
     {
-        nHgt = aSiz.Height();
+        mnHeight = aSiz.Height();
         bChanged = true;
     }
 
@@ -1333,12 +1333,12 @@ void SdrPage::SetSize(const Size& aSiz)
 
 Size SdrPage::GetSize() const
 {
-    return Size(nWdt,nHgt);
+    return Size(mnWidth,mnHeight);
 }
 
-sal_Int32 SdrPage::GetWdt() const
+sal_Int32 SdrPage::GetWidth() const
 {
-    return nWdt;
+    return mnWidth;
 }
 
 void SdrPage::SetOrientation(Orientation eOri)
@@ -1361,36 +1361,36 @@ Orientation SdrPage::GetOrientation() const
     return eRet;
 }
 
-sal_Int32 SdrPage::GetHgt() const
+sal_Int32 SdrPage::GetHeight() const
 {
-    return nHgt;
+    return mnHeight;
 }
 
 void  SdrPage::SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int32 nLwr)
 {
     bool bChanged(false);
 
-    if(nBordLft != nLft)
+    if(mnBorderLeft != nLft)
     {
-        nBordLft = nLft;
+        mnBorderLeft = nLft;
         bChanged = true;
     }
 
-    if(nBordUpp != nUpp)
+    if(mnBorderUpper != nUpp)
     {
-        nBordUpp = nUpp;
+        mnBorderUpper = nUpp;
         bChanged = true;
     }
 
-    if(nBordRgt != nRgt)
+    if(mnBorderRight != nRgt)
     {
-        nBordRgt = nRgt;
+        mnBorderRight = nRgt;
         bChanged = true;
     }
 
-    if(nBordLwr != nLwr)
+    if(mnBorderLower != nLwr)
     {
-        nBordLwr =  nLwr;
+        mnBorderLower =  nLwr;
         bChanged = true;
     }
 
@@ -1400,60 +1400,60 @@ void  SdrPage::SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int
     }
 }
 
-void  SdrPage::SetLftBorder(sal_Int32 nBorder)
+void  SdrPage::SetLeftBorder(sal_Int32 nBorder)
 {
-    if(nBordLft != nBorder)
+    if(mnBorderLeft != nBorder)
     {
-        nBordLft = nBorder;
+        mnBorderLeft = nBorder;
         SetChanged();
     }
 }
 
-void  SdrPage::SetUppBorder(sal_Int32 nBorder)
+void  SdrPage::SetUpperBorder(sal_Int32 nBorder)
 {
-    if(nBordUpp != nBorder)
+    if(mnBorderUpper != nBorder)
     {
-        nBordUpp = nBorder;
+        mnBorderUpper = nBorder;
         SetChanged();
     }
 }
 
-void  SdrPage::SetRgtBorder(sal_Int32 nBorder)
+void  SdrPage::SetRightBorder(sal_Int32 nBorder)
 {
-    if(nBordRgt != nBorder)
+    if(mnBorderRight != nBorder)
     {
-        nBordRgt=nBorder;
+        mnBorderRight=nBorder;
         SetChanged();
     }
 }
 
-void  SdrPage::SetLwrBorder(sal_Int32 nBorder)
+void  SdrPage::SetLowerBorder(sal_Int32 nBorder)
 {
-    if(nBordLwr != nBorder)
+    if(mnBorderLower != nBorder)
     {
-        nBordLwr=nBorder;
+        mnBorderLower=nBorder;
         SetChanged();
     }
 }
 
-sal_Int32 SdrPage::GetLftBorder() const
+sal_Int32 SdrPage::GetLeftBorder() const
 {
-    return nBordLft;
+    return mnBorderLeft;
 }
 
-sal_Int32 SdrPage::GetUppBorder() const
+sal_Int32 SdrPage::GetUpperBorder() const
 {
-    return nBordUpp;
+    return mnBorderUpper;
 }
 
-sal_Int32 SdrPage::GetRgtBorder() const
+sal_Int32 SdrPage::GetRightBorder() const
 {
-    return nBordRgt;
+    return mnBorderRight;
 }
 
-sal_Int32 SdrPage::GetLwrBorder() const
+sal_Int32 SdrPage::GetLowerBorder() const
 {
-    return nBordLwr;
+    return mnBorderLower;
 }
 
 void SdrPage::impl_setModelForLayerAdmin(SdrModel* const pNewModel)
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index d23f8f43f380..0291abada558 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -142,8 +142,8 @@ SdrPageView::SdrPageView(SdrPage* pPage1, SdrView& rNewView)
 
     if(mpPage)
     {
-        aPgOrg.X()=mpPage->GetLftBorder();
-        aPgOrg.Y()=mpPage->GetUppBorder();
+        aPgOrg.X()=mpPage->GetLeftBorder();
+        aPgOrg.Y()=mpPage->GetUpperBorder();
     }
     mbHasMarked = false;
     aLayerVisi.SetAll();
@@ -236,14 +236,14 @@ void SdrPageView::Hide()
 tools::Rectangle SdrPageView::GetPageRect() const
 {
     if (GetPage()==nullptr) return tools::Rectangle();
-    return tools::Rectangle(Point(),Size(GetPage()->GetWdt()+1,GetPage()->GetHgt()+1));
+    return tools::Rectangle(Point(),Size(GetPage()->GetWidth()+1,GetPage()->GetHeight()+1));
 }
 
 void SdrPageView::InvalidateAllWin()
 {
     if(IsVisible() && GetPage())
     {
-        tools::Rectangle aRect(Point(0,0),Size(GetPage()->GetWdt()+1,GetPage()->GetHgt()+1));
+        tools::Rectangle aRect(Point(0,0),Size(GetPage()->GetWidth()+1,GetPage()->GetHeight()+1));
         aRect.Union(GetPage()->GetAllObjBoundRect());
         GetView().InvalidateAllWin(aRect);
     }
@@ -493,10 +493,10 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const tools::Rectangle& r
         long nWrX=0;
         long nWrY=0;
         Point aOrg(aPgOrg);
-        long x1=GetPage()->GetLftBorder()+1+nWrX;
-        long x2=GetPage()->GetWdt()-GetPage()->GetRgtBorder()-1+nWrY;
-        long y1=GetPage()->GetUppBorder()+1+nWrX;
-        long y2=GetPage()->GetHgt()-GetPage()->GetLwrBorder()-1+nWrY;
+        long x1=GetPage()->GetLeftBorder()+1+nWrX;
+        long x2=GetPage()->GetWidth()-GetPage()->GetRightBorder()-1+nWrY;
+        long y1=GetPage()->GetUpperBorder()+1+nWrX;
+        long y2=GetPage()->GetHeight()-GetPage()->GetLowerBorder()-1+nWrY;
         const SdrPageGridFrameList* pFrames=GetPage()->GetGridFrameList(this,nullptr);
 
         sal_uInt16 nGridPaintCnt=1;
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index 4923e7de66d3..4fb3affa15bc 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -303,12 +303,12 @@ SdrSnap SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
     }
     if (mbBordVisible && bBordSnap) {
         SdrPage* pPage=pPV->GetPage();
-        long xs=pPage->GetWdt();
-        long ys=pPage->GetHgt();
-        long lft=pPage->GetLftBorder();
-        long rgt=pPage->GetRgtBorder();
-        long upp=pPage->GetUppBorder();
-        long lwr=pPage->GetLwrBorder();
+        long xs=pPage->GetWidth();
+        long ys=pPage->GetHeight();
+        long lft=pPage->GetLeftBorder();
+        long rgt=pPage->GetRightBorder();
+        long upp=pPage->GetUpperBorder();
+        long lwr=pPage->GetLowerBorder();
         long a;
         a=x- lft    ; if (std::abs(a)<=mx) { dx1=-a; if (std::abs(dx1)<std::abs(dx)) dx=dx1; } // left margin
         a=x-(xs-rgt); if (std::abs(a)<=mx) { dx1=-a; if (std::abs(dx1)<std::abs(dx)) dx=dx1; } // right margin
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index f395f256d704..be8cbf8a3ebf 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -732,9 +732,9 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
                 // PageBackground (formerly 'wiese').
                 pView->SetPagePaintingAllowed(false);
 
-                const Point aNewOrg( pPage->GetLftBorder(), pPage->GetUppBorder() );
-                aNewSize = Size( aSize.Width() - pPage->GetLftBorder() - pPage->GetRgtBorder(),
-                                 aSize.Height() - pPage->GetUppBorder() - pPage->GetLwrBorder() );
+                const Point aNewOrg( pPage->GetLeftBorder(), pPage->GetUpperBorder() );
+                aNewSize = Size( aSize.Width() - pPage->GetLeftBorder() - pPage->GetRightBorder(),
+                                 aSize.Height() - pPage->GetUpperBorder() - pPage->GetLowerBorder() );
                 const tools::Rectangle aClipRect( aNewOrg, aNewSize );
                 MapMode         aVMap( aMap );