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>

18 files changed, 155 insertions, 155 deletions

diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx
index a6f73a44bb66..032d35188710 100644
--- a/sd/source/ui/func/fuexpand.cxx
+++ b/sd/source/ui/func/fuexpand.cxx
@@ -137,10 +137,10 @@ void FuExpandPage::DoExecute( SfxRequest& )
                     // page with title & structuring!
                     SdPage* pPage = mpDoc->AllocSdPage(false);
                     pPage->SetSize(pActualPage->GetSize() );
-                    pPage->SetBorder(pActualPage->GetLftBorder(),
-                                     pActualPage->GetUppBorder(),
-                                     pActualPage->GetRgtBorder(),
-                                     pActualPage->GetLwrBorder() );
+                    pPage->SetBorder(pActualPage->GetLeftBorder(),
+                                     pActualPage->GetUpperBorder(),
+                                     pActualPage->GetRightBorder(),
+                                     pActualPage->GetLowerBorder() );
                     pPage->SetName(OUString());
 
                     // insert page after current page
@@ -159,10 +159,10 @@ void FuExpandPage::DoExecute( SfxRequest& )
                     // notes-page
                     SdPage* pNotesPage = mpDoc->AllocSdPage(false);
                     pNotesPage->SetSize(pActualNotesPage->GetSize());
-                    pNotesPage->SetBorder(pActualNotesPage->GetLftBorder(),
-                                          pActualNotesPage->GetUppBorder(),
-                                          pActualNotesPage->GetRgtBorder(),
-                                          pActualNotesPage->GetLwrBorder() );
+                    pNotesPage->SetBorder(pActualNotesPage->GetLeftBorder(),
+                                          pActualNotesPage->GetUpperBorder(),
+                                          pActualNotesPage->GetRightBorder(),
+                                          pActualNotesPage->GetLowerBorder() );
                     pNotesPage->SetPageKind(PageKind::Notes);
                     pNotesPage->SetName(OUString());
 
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 019af2330fd0..e02551a325e4 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -253,10 +253,10 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent )
     SvxPaperBinItem aPaperBinItem( SID_ATTR_PAGE_PAPERBIN, (sal_uInt8)mpPage->GetPaperBin() );
     aNewAttr.Put( aPaperBinItem );
 
-    SvxLRSpaceItem aLRSpaceItem( (sal_uInt16)mpPage->GetLftBorder(), (sal_uInt16)mpPage->GetRgtBorder(), 0, 0, mpDoc->GetPool().GetWhich(SID_ATTR_LRSPACE));
+    SvxLRSpaceItem aLRSpaceItem( (sal_uInt16)mpPage->GetLeftBorder(), (sal_uInt16)mpPage->GetRightBorder(), 0, 0, mpDoc->GetPool().GetWhich(SID_ATTR_LRSPACE));
     aNewAttr.Put( aLRSpaceItem );
 
-    SvxULSpaceItem aULSpaceItem( (sal_uInt16)mpPage->GetUppBorder(), (sal_uInt16)mpPage->GetLwrBorder(), mpDoc->GetPool().GetWhich(SID_ATTR_ULSPACE));
+    SvxULSpaceItem aULSpaceItem( (sal_uInt16)mpPage->GetUpperBorder(), (sal_uInt16)mpPage->GetLowerBorder(), mpDoc->GetPool().GetWhich(SID_ATTR_ULSPACE));
     aNewAttr.Put( aULSpaceItem );
 
     // Applikation
@@ -543,7 +543,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs )
         nLeft = static_cast<const SvxLRSpaceItem*>(pPoolItem)->GetLeft();
         nRight = static_cast<const SvxLRSpaceItem*>(pPoolItem)->GetRight();
 
-        if( mpPage->GetLftBorder() != nLeft || mpPage->GetRgtBorder() != nRight )
+        if( mpPage->GetLeftBorder() != nLeft || mpPage->GetRightBorder() != nRight )
             bSetPageSizeAndBorder = true;
 
     }
@@ -554,7 +554,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs )
         nUpper = static_cast<const SvxULSpaceItem*>(pPoolItem)->GetUpper();
         nLower = static_cast<const SvxULSpaceItem*>(pPoolItem)->GetLower();
 
-        if( mpPage->GetUppBorder() != nUpper || mpPage->GetLwrBorder() != nLower )
+        if( mpPage->GetUpperBorder() != nUpper || mpPage->GetLowerBorder() != nLower )
             bSetPageSizeAndBorder = true;
     }
 
@@ -583,14 +583,14 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs )
     if (nLeft == -1 && nUpper != -1)
     {
         bSetPageSizeAndBorder = true;
-        nLeft  = mpPage->GetLftBorder();
-        nRight = mpPage->GetRgtBorder();
+        nLeft  = mpPage->GetLeftBorder();
+        nRight = mpPage->GetRightBorder();
     }
     else if (nLeft != -1 && nUpper == -1)
     {
         bSetPageSizeAndBorder = true;
-        nUpper = mpPage->GetUppBorder();
-        nLower = mpPage->GetLwrBorder();
+        nUpper = mpPage->GetUpperBorder();
+        nLower = mpPage->GetLowerBorder();
     }
 
     if( bSetPageSizeAndBorder || !mbMasterPage )
diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx
index bb199e0b5438..c7a3b730f427 100644
--- a/sd/source/ui/func/fusumry.cxx
+++ b/sd/source/ui/func/fusumry.cxx
@@ -121,10 +121,10 @@ void FuSummaryPage::DoExecute( SfxRequest& )
                     // page with title & structuring!
                     pSummaryPage = mpDoc->AllocSdPage(false);
                     pSummaryPage->SetSize(pActualPage->GetSize() );
-                    pSummaryPage->SetBorder(pActualPage->GetLftBorder(),
-                                     pActualPage->GetUppBorder(),
-                                     pActualPage->GetRgtBorder(),
-                                     pActualPage->GetLwrBorder() );
+                    pSummaryPage->SetBorder(pActualPage->GetLeftBorder(),
+                                     pActualPage->GetUpperBorder(),
+                                     pActualPage->GetRightBorder(),
+                                     pActualPage->GetLowerBorder() );
 
                     // insert page at the back
                     mpDoc->InsertPage(pSummaryPage, nCount * 2 + 1);
@@ -141,10 +141,10 @@ void FuSummaryPage::DoExecute( SfxRequest& )
                     // notes-page
                     SdPage* pNotesPage = mpDoc->AllocSdPage(false);
                     pNotesPage->SetSize(pActualNotesPage->GetSize());
-                    pNotesPage->SetBorder(pActualNotesPage->GetLftBorder(),
-                                          pActualNotesPage->GetUppBorder(),
-                                          pActualNotesPage->GetRgtBorder(),
-                                          pActualNotesPage->GetLwrBorder() );
+                    pNotesPage->SetBorder(pActualNotesPage->GetLeftBorder(),
+                                          pActualNotesPage->GetUpperBorder(),
+                                          pActualNotesPage->GetRightBorder(),
+                                          pActualNotesPage->GetLowerBorder() );
                     pNotesPage->SetPageKind(PageKind::Notes);
 
                     // insert page at the back
diff --git a/sd/source/ui/func/undopage.cxx b/sd/source/ui/func/undopage.cxx
index 81eb81f77ce7..f55f65777b2f 100644
--- a/sd/source/ui/func/undopage.cxx
+++ b/sd/source/ui/func/undopage.cxx
@@ -39,10 +39,10 @@ void SdPageFormatUndoAction::Undo()
     ::tools::Rectangle aOldBorderRect(mnOldLeft, mnOldUpper, mnOldRight, mnOldLower);
     mpPage->ScaleObjects(maOldSize, aOldBorderRect, mbNewScale);
     mpPage->SetSize(maOldSize);
-    mpPage->SetLftBorder(mnOldLeft);
-    mpPage->SetRgtBorder(mnOldRight);
-    mpPage->SetUppBorder(mnOldUpper);
-    mpPage->SetLwrBorder(mnOldLower);
+    mpPage->SetLeftBorder(mnOldLeft);
+    mpPage->SetRightBorder(mnOldRight);
+    mpPage->SetUpperBorder(mnOldUpper);
+    mpPage->SetLowerBorder(mnOldLower);
     mpPage->SetOrientation(meOldOrientation);
     mpPage->SetPaperBin( mnOldPaperBin );
 
@@ -57,10 +57,10 @@ void SdPageFormatUndoAction::Redo()
     ::tools::Rectangle aNewBorderRect(mnNewLeft, mnNewUpper, mnNewRight, mnNewLower);
     mpPage->ScaleObjects(maNewSize, aNewBorderRect, mbNewScale);
     mpPage->SetSize(maNewSize);
-    mpPage->SetLftBorder(mnNewLeft);
-    mpPage->SetRgtBorder(mnNewRight);
-    mpPage->SetUppBorder(mnNewUpper);
-    mpPage->SetLwrBorder(mnNewLower);
+    mpPage->SetLeftBorder(mnNewLeft);
+    mpPage->SetRightBorder(mnNewRight);
+    mpPage->SetUpperBorder(mnNewUpper);
+    mpPage->SetLowerBorder(mnNewLower);
     mpPage->SetOrientation(meNewOrientation);
     mpPage->SetPaperBin( mnNewPaperBin );
 
@@ -76,14 +76,14 @@ SdPageLRUndoAction::~SdPageLRUndoAction()
 
 void SdPageLRUndoAction::Undo()
 {
-    mpPage->SetLftBorder(mnOldLeft);
-    mpPage->SetRgtBorder(mnOldRight);
+    mpPage->SetLeftBorder(mnOldLeft);
+    mpPage->SetRightBorder(mnOldRight);
 }
 
 void SdPageLRUndoAction::Redo()
 {
-    mpPage->SetLftBorder(mnNewLeft);
-    mpPage->SetRgtBorder(mnNewRight);
+    mpPage->SetLeftBorder(mnNewLeft);
+    mpPage->SetRightBorder(mnNewRight);
 }
 
 SdPageULUndoAction::~SdPageULUndoAction()
@@ -92,8 +92,8 @@ SdPageULUndoAction::~SdPageULUndoAction()
 
 void SdPageULUndoAction::Undo()
 {
-    mpPage->SetUppBorder(mnOldUpper);
-    mpPage->SetLwrBorder(mnOldLower);
+    mpPage->SetUpperBorder(mnOldUpper);
+    mpPage->SetLowerBorder(mnOldLower);
 }
 
 /**
@@ -101,8 +101,8 @@ void SdPageULUndoAction::Undo()
  */
 void SdPageULUndoAction::Redo()
 {
-    mpPage->SetUppBorder(mnNewUpper);
-    mpPage->SetLwrBorder(mnNewLower);
+    mpPage->SetUpperBorder(mnNewUpper);
+    mpPage->SetLowerBorder(mnNewLower);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/unopage.hxx b/sd/source/ui/inc/unopage.hxx
index ff6c0a614022..3838b0f0de52 100644
--- a/sd/source/ui/inc/unopage.hxx
+++ b/sd/source/ui/inc/unopage.hxx
@@ -79,10 +79,10 @@ protected:
     OUString getBookmarkURL() const;
     void setBookmarkURL( OUString const & rURL );
 
-    void SetLftBorder( sal_Int32 nValue );
-    void SetRgtBorder( sal_Int32 nValue );
-    void SetUppBorder( sal_Int32 nValue );
-    void SetLwrBorder( sal_Int32 nValue );
+    void SetLeftBorder( sal_Int32 nValue );
+    void SetRightBorder( sal_Int32 nValue );
+    void SetUpperBorder( sal_Int32 nValue );
+    void SetLowerBorder( sal_Int32 nValue );
 
     void SetWidth( sal_Int32 nWidth );
     void SetHeight( sal_Int32 nHeight );
diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx
index 16b664a6754e..2247ecd86150 100644
--- a/sd/source/ui/sidebar/DocumentHelper.cxx
+++ b/sd/source/ui/sidebar/DocumentHelper.cxx
@@ -372,10 +372,10 @@ SdPage* DocumentHelper::AddMasterPage (
             // the document.
             Size aNewSize (rTargetDocument.GetSdPage(0, pMasterPage->GetPageKind())->GetSize());
             ::tools::Rectangle aBorders (
-                pClonedMasterPage->GetLftBorder(),
-                pClonedMasterPage->GetUppBorder(),
-                pClonedMasterPage->GetRgtBorder(),
-                pClonedMasterPage->GetLwrBorder());
+                pClonedMasterPage->GetLeftBorder(),
+                pClonedMasterPage->GetUpperBorder(),
+                pClonedMasterPage->GetRightBorder(),
+                pClonedMasterPage->GetLowerBorder());
             pClonedMasterPage->ScaleObjects(aNewSize, aBorders, true);
             pClonedMasterPage->SetSize(aNewSize);
             pClonedMasterPage->CreateTitleAndLayout(true);
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 4ec29d00a94f..26ae2ba7ac39 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -508,10 +508,10 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, bool bDuplicate )
             pStandardPage = mpDoc->AllocSdPage(false);
 
         pStandardPage->SetSize( pPreviousStandardPage->GetSize() );
-        pStandardPage->SetBorder( pPreviousStandardPage->GetLftBorder(),
-                                    pPreviousStandardPage->GetUppBorder(),
-                                    pPreviousStandardPage->GetRgtBorder(),
-                                    pPreviousStandardPage->GetLwrBorder() );
+        pStandardPage->SetBorder( pPreviousStandardPage->GetLeftBorder(),
+                                    pPreviousStandardPage->GetUpperBorder(),
+                                    pPreviousStandardPage->GetRightBorder(),
+                                    pPreviousStandardPage->GetLowerBorder() );
         pStandardPage->SetOrientation( pPreviousStandardPage->GetOrientation() );
         pStandardPage->SetName(OUString());
 
@@ -543,10 +543,10 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, bool bDuplicate )
             pNotesPage = mpDoc->AllocSdPage(false);
 
         pNotesPage->SetSize( pPreviousNotesPage->GetSize() );
-        pNotesPage->SetBorder( pPreviousNotesPage->GetLftBorder(),
-                                pPreviousNotesPage->GetUppBorder(),
-                                pPreviousNotesPage->GetRgtBorder(),
-                                pPreviousNotesPage->GetLwrBorder() );
+        pNotesPage->SetBorder( pPreviousNotesPage->GetLeftBorder(),
+                                pPreviousNotesPage->GetUpperBorder(),
+                                pPreviousNotesPage->GetRightBorder(),
+                                pPreviousNotesPage->GetLowerBorder() );
         pNotesPage->SetOrientation( pPreviousNotesPage->GetOrientation() );
         pNotesPage->SetName(OUString());
         pNotesPage->SetPageKind(PageKind::Notes);
@@ -3165,10 +3165,10 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn
         // create and insert new draw masterpage
         SdPage* pMPage = mpModel->mpDoc->AllocSdPage(true);
         pMPage->SetSize( pPage->GetSize() );
-        pMPage->SetBorder( pPage->GetLftBorder(),
-                           pPage->GetUppBorder(),
-                           pPage->GetRgtBorder(),
-                           pPage->GetLwrBorder() );
+        pMPage->SetBorder( pPage->GetLeftBorder(),
+                           pPage->GetUpperBorder(),
+                           pPage->GetRightBorder(),
+                           pPage->GetLowerBorder() );
         pMPage->SetLayoutName( aLayoutName );
         pDoc->InsertMasterPage(pMPage,  (sal_uInt16)nInsertPos);
 
@@ -3183,10 +3183,10 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn
         SdPage* pMNotesPage = mpModel->mpDoc->AllocSdPage(true);
         pMNotesPage->SetSize( pRefNotesPage->GetSize() );
         pMNotesPage->SetPageKind(PageKind::Notes);
-        pMNotesPage->SetBorder( pRefNotesPage->GetLftBorder(),
-                                pRefNotesPage->GetUppBorder(),
-                                pRefNotesPage->GetRgtBorder(),
-                                pRefNotesPage->GetLwrBorder() );
+        pMNotesPage->SetBorder( pRefNotesPage->GetLeftBorder(),
+                                pRefNotesPage->GetUpperBorder(),
+                                pRefNotesPage->GetRightBorder(),
+                                pRefNotesPage->GetLowerBorder() );
         pMNotesPage->SetLayoutName( aLayoutName );
         pDoc->InsertMasterPage(pMNotesPage,  (sal_uInt16)nInsertPos + 1);
         pMNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, true, true);
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index bcb9b06f4e0b..e1e2c3c00612 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -626,16 +626,16 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
             switch( pEntry->nWID )
             {
             case WID_PAGE_LEFT:
-                SetLftBorder(nValue);
+                SetLeftBorder(nValue);
                 break;
             case WID_PAGE_RIGHT:
-                SetRgtBorder( nValue );
+                SetRightBorder( nValue );
                 break;
             case WID_PAGE_TOP:
-                SetUppBorder( nValue );
+                SetUpperBorder( nValue );
                 break;
             case WID_PAGE_BOTTOM:
-                SetLwrBorder( nValue );
+                SetLowerBorder( nValue );
                 break;
             case WID_PAGE_CHANGE:
                 GetPage()->SetPresChange( (PresChange)nValue );
@@ -1022,16 +1022,16 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
         aAny = getNavigationOrder();
         break;
     case WID_PAGE_LEFT:
-        aAny <<= GetPage()->GetLftBorder();
+        aAny <<= GetPage()->GetLeftBorder();
         break;
     case WID_PAGE_RIGHT:
-        aAny <<= GetPage()->GetRgtBorder();
+        aAny <<= GetPage()->GetRightBorder();
         break;
     case WID_PAGE_TOP:
-        aAny <<= GetPage()->GetUppBorder();
+        aAny <<= GetPage()->GetUpperBorder();
         break;
     case WID_PAGE_BOTTOM:
-        aAny <<= GetPage()->GetLwrBorder();
+        aAny <<= GetPage()->GetLowerBorder();
         break;
     case WID_PAGE_WIDTH:
         aAny <<= (sal_Int32)( GetPage()->GetSize().getWidth() );
@@ -1677,9 +1677,9 @@ void SAL_CALL SdGenericDrawPage::unbind( const Reference< drawing::XShape >& xSh
     GetModel()->SetModified();
 }
 
-void SdGenericDrawPage::SetLftBorder( sal_Int32 nValue )
+void SdGenericDrawPage::SetLeftBorder( sal_Int32 nValue )
 {
-    if( nValue != GetPage()->GetLftBorder() )
+    if( nValue != GetPage()->GetLeftBorder() )
     {
         SdDrawDocument* pDoc = static_cast<SdDrawDocument*>(GetPage()->GetModel());
         const PageKind ePageKind = GetPage()->GetPageKind();
@@ -1688,7 +1688,7 @@ void SdGenericDrawPage::SetLftBorder( sal_Int32 nValue )
         for (i = 0; i < nPageCnt; i++)
         {
             SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind);
-            pPage->SetLftBorder( nValue );
+            pPage->SetLeftBorder( nValue );
         }
 
         nPageCnt = pDoc->GetSdPageCount(ePageKind);
@@ -1696,14 +1696,14 @@ void SdGenericDrawPage::SetLftBorder( sal_Int32 nValue )
         for (i = 0; i < nPageCnt; i++)
         {
             SdPage* pPage = pDoc->GetSdPage(i, ePageKind);
-            pPage->SetLftBorder( nValue );
+            pPage->SetLeftBorder( nValue );
         }
     }
 }
 
-void SdGenericDrawPage::SetRgtBorder( sal_Int32 nValue )
+void SdGenericDrawPage::SetRightBorder( sal_Int32 nValue )
 {
-    if( nValue != GetPage()->GetRgtBorder() )
+    if( nValue != GetPage()->GetRightBorder() )
     {
         SdDrawDocument* pDoc = static_cast<SdDrawDocument*>(GetPage()->GetModel());
         const PageKind ePageKind = GetPage()->GetPageKind();
@@ -1712,7 +1712,7 @@ void SdGenericDrawPage::SetRgtBorder( sal_Int32 nValue )
         for (i = 0; i < nPageCnt; i++)
         {
             SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind);
-            pPage->SetRgtBorder( nValue );
+            pPage->SetRightBorder( nValue );
         }
 
         nPageCnt = pDoc->GetSdPageCount(ePageKind);
@@ -1720,14 +1720,14 @@ void SdGenericDrawPage::SetRgtBorder( sal_Int32 nValue )
         for (i = 0; i < nPageCnt; i++)
         {
             SdPage* pPage = pDoc->GetSdPage(i, ePageKind);
-            pPage->SetRgtBorder( nValue );
+            pPage->SetRightBorder( nValue );
         }
     }
 }
 
-void SdGenericDrawPage::SetUppBorder( sal_Int32 nValue )
+void SdGenericDrawPage::SetUpperBorder( sal_Int32 nValue )
 {
-    if( nValue != GetPage()->GetUppBorder() )
+    if( nValue != GetPage()->GetUpperBorder() )
     {
         SdDrawDocument* pDoc = static_cast<SdDrawDocument*>(GetPage()->GetModel());
         const PageKind ePageKind = GetPage()->GetPageKind();
@@ -1736,7 +1736,7 @@ void SdGenericDrawPage::SetUppBorder( sal_Int32 nValue )
         for (i = 0; i < nPageCnt; i++)
         {
             SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind);
-            pPage->SetUppBorder( nValue );
+            pPage->SetUpperBorder( nValue );
         }
 
         nPageCnt = pDoc->GetSdPageCount(ePageKind);
@@ -1744,14 +1744,14 @@ void SdGenericDrawPage::SetUppBorder( sal_Int32 nValue )
         for (i = 0; i < nPageCnt; i++)
         {
             SdPage* pPage = pDoc->GetSdPage(i, ePageKind);
-            pPage->SetUppBorder( nValue );
+            pPage->SetUpperBorder( nValue );
         }
     }
 }
 
-void SdGenericDrawPage::SetLwrBorder( sal_Int32 nValue )
+void SdGenericDrawPage::SetLowerBorder( sal_Int32 nValue )
 {
-    if( nValue != GetPage()->GetLwrBorder() )
+    if( nValue != GetPage()->GetLowerBorder() )
     {
         SdDrawDocument* pDoc = static_cast<SdDrawDocument*>(GetPage()->GetModel());
         const PageKind ePageKind = GetPage()->GetPageKind();
@@ -1760,7 +1760,7 @@ void SdGenericDrawPage::SetLwrBorder( sal_Int32 nValue )
         for (i = 0; i < nPageCnt; i++)
         {
             SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind);
-            pPage->SetLwrBorder( nValue );
+            pPage->SetLowerBorder( nValue );
         }
 
         nPageCnt = pDoc->GetSdPageCount(ePageKind);
@@ -1768,7 +1768,7 @@ void SdGenericDrawPage::SetLwrBorder( sal_Int32 nValue )
         for (i = 0; i < nPageCnt; i++)
         {
             SdPage* pPage = pDoc->GetSdPage(i, ePageKind);
-            pPage->SetLwrBorder( nValue );
+            pPage->SetLowerBorder( nValue );
         }
     }
 }
@@ -2374,8 +2374,8 @@ void SAL_CALL SdDrawPage::setMasterPage( const Reference< drawing::XDrawPage >&
             SdPage* pSdPage = static_cast<SdPage*>(pMasterPage->GetSdrPage());
             SvxFmDrawPage::mpPage->TRG_SetMasterPage(*pSdPage);
 
-            SvxFmDrawPage::mpPage->SetBorder(pSdPage->GetLftBorder(),pSdPage->GetUppBorder(),
-                              pSdPage->GetRgtBorder(),pSdPage->GetLwrBorder() );
+            SvxFmDrawPage::mpPage->SetBorder(pSdPage->GetLeftBorder(),pSdPage->GetUpperBorder(),
+                              pSdPage->GetRightBorder(),pSdPage->GetLowerBorder() );
 
             SvxFmDrawPage::mpPage->SetSize( pSdPage->GetSize() );
             SvxFmDrawPage::mpPage->SetOrientation( pSdPage->GetOrientation() );
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 021ce8e7b689..a43474e6ba6d 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -801,9 +801,9 @@ namespace {
             const Size aPrintSize (rPrinter.GetOutputSize());
 
             const sal_Int32 nPageWidth (aPageSize.Width() + mnGap
-                - pPageToPrint->GetLftBorder() - pPageToPrint->GetRgtBorder());
+                - pPageToPrint->GetLeftBorder() - pPageToPrint->GetRightBorder());
             const sal_Int32 nPageHeight (aPageSize.Height() + mnGap
-                - pPageToPrint->GetUppBorder() - pPageToPrint->GetLwrBorder());
+                - pPageToPrint->GetUpperBorder() - pPageToPrint->GetLowerBorder());
             if (nPageWidth<=0 || nPageHeight<=0)
                 return;
 
@@ -1927,8 +1927,8 @@ private:
                 rInfo.msPageString.clear();
             rInfo.msPageString += rInfo.msTimeDate;
 
-            long aPageWidth   = aPageSize.Width() - pPage->GetLftBorder() - pPage->GetRgtBorder();
-            long aPageHeight  = aPageSize.Height() - pPage->GetUppBorder() - pPage->GetLwrBorder();
+            long aPageWidth   = aPageSize.Width() - pPage->GetLeftBorder() - pPage->GetRightBorder();
+            long aPageHeight  = aPageSize.Height() - pPage->GetUpperBorder() - pPage->GetLowerBorder();
             // Bugfix for 44530:
             // if it was implicitly changed (Landscape/Portrait),
             // this is considered for tiling, respectively for the splitting up
@@ -2164,9 +2164,9 @@ private:
             // keep the page content at its position if it fits, otherwise
             // move it to the printable area
             const long nPageWidth (
-                rInfo.maPageSize.Width() - rPage.GetLftBorder() - rPage.GetRgtBorder());
+                rInfo.maPageSize.Width() - rPage.GetLeftBorder() - rPage.GetRightBorder());
             const long nPageHeight (
-                rInfo.maPageSize.Height() - rPage.GetUppBorder() - rPage.GetLwrBorder());
+                rInfo.maPageSize.Height() - rPage.GetUpperBorder() - rPage.GetLowerBorder());
 
             Point aOrigin ( 0, 0 );
 
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 2a2278e2eda0..f4bd00c652bb 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -526,12 +526,12 @@ void  DrawViewShell::ExecRuler(SfxRequest& rReq)
                         SdPage* pPage = GetDoc()->GetSdPage(i, mePageKind);
                         SdUndoAction* pUndo = new SdPageLRUndoAction(GetDoc(),
                                                 pPage,
-                                                pPage->GetLftBorder(),
-                                                pPage->GetRgtBorder(),
+                                                pPage->GetLeftBorder(),
+                                                pPage->GetRightBorder(),
                                                 nLeft, nRight);
                         pUndoGroup->AddAction(pUndo);
-                        pPage->SetLftBorder(nLeft);
-                        pPage->SetRgtBorder(nRight);
+                        pPage->SetLeftBorder(nLeft);
+                        pPage->SetRightBorder(nRight);
                     }
                     nPageCnt = GetDoc()->GetMasterSdPageCount(mePageKind);
 
@@ -540,12 +540,12 @@ void  DrawViewShell::ExecRuler(SfxRequest& rReq)
                         SdPage* pPage = GetDoc()->GetMasterSdPage(i, mePageKind);
                         SdUndoAction* pUndo = new SdPageLRUndoAction(GetDoc(),
                                                 pPage,
-                                                pPage->GetLftBorder(),
-                                                pPage->GetRgtBorder(),
+                                                pPage->GetLeftBorder(),
+                                                pPage->GetRightBorder(),
                                                 nLeft, nRight);
                         pUndoGroup->AddAction(pUndo);
-                        pPage->SetLftBorder(nLeft);
-                        pPage->SetRgtBorder(nRight);
+                        pPage->SetLeftBorder(nLeft);
+                        pPage->SetRightBorder(nRight);
                     }
                     InvalidateWindows();
                 }
@@ -592,12 +592,12 @@ void  DrawViewShell::ExecRuler(SfxRequest& rReq)
                         SdPage* pPage = GetDoc()->GetSdPage(i, mePageKind);
                         SdUndoAction* pUndo = new SdPageULUndoAction(GetDoc(),
                                                 pPage,
-                                                pPage->GetUppBorder(),
-                                                pPage->GetLwrBorder(),
+                                                pPage->GetUpperBorder(),
+                                                pPage->GetLowerBorder(),
                                                 nUpper, nLower);
                         pUndoGroup->AddAction(pUndo);
-                        pPage->SetUppBorder(nUpper);
-                        pPage->SetLwrBorder(nLower);
+                        pPage->SetUpperBorder(nUpper);
+                        pPage->SetLowerBorder(nLower);
                     }
                     nPageCnt = GetDoc()->GetMasterSdPageCount(mePageKind);
 
@@ -606,12 +606,12 @@ void  DrawViewShell::ExecRuler(SfxRequest& rReq)
                         SdPage* pPage = GetDoc()->GetMasterSdPage(i, mePageKind);
                         SdUndoAction* pUndo = new SdPageULUndoAction(GetDoc(),
                                                 pPage,
-                                                pPage->GetUppBorder(),
-                                                pPage->GetLwrBorder(),
+                                                pPage->GetUpperBorder(),
+                                                pPage->GetLowerBorder(),
                                                 nUpper, nLower);
                         pUndoGroup->AddAction(pUndo);
-                        pPage->SetUppBorder(nUpper);
-                        pPage->SetLwrBorder(nLower);
+                        pPage->SetUpperBorder(nUpper);
+                        pPage->SetLowerBorder(nLower);
                     }
                     InvalidateWindows();
                 }
@@ -870,11 +870,11 @@ void  DrawViewShell::GetRulerState(SfxItemSet& rSet)
         rSet.Put( SfxRectangleItem(SID_RULER_LR_MIN_MAX, aRect) );
     }
 
-    SvxLongLRSpaceItem aLRSpace(aPagePos.X() + mpActualPage->GetLftBorder(),
-                                aRect.Right() + mpActualPage->GetRgtBorder(),
+    SvxLongLRSpaceItem aLRSpace(aPagePos.X() + mpActualPage->GetLeftBorder(),
+                                aRect.Right() + mpActualPage->GetRightBorder(),
                                 GetPool().GetWhich(SID_ATTR_LONG_LRSPACE));
-    SvxLongULSpaceItem aULSpace(aPagePos.Y() + mpActualPage->GetUppBorder(),
-                                aRect.Bottom() + mpActualPage->GetLwrBorder(),
+    SvxLongULSpaceItem aULSpace(aPagePos.Y() + mpActualPage->GetUpperBorder(),
+                                aRect.Bottom() + mpActualPage->GetLowerBorder(),
                                 GetPool().GetWhich(SID_ATTR_LONG_ULSPACE));
     rSet.Put(SvxPagePosSizeItem(Point(0,0) - aPagePos, aViewSize.Width(),
                                                        aViewSize.Height()));
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index ee2cd73d432d..a74c0e9ad0a9 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -425,7 +425,7 @@ void DrawViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin)
             {
                 mpDrawView->BrkAction();
                 SdPage* pPage = static_cast<SdPage*>( mpDrawView->GetSdrPageView()->GetPage() );
-                Point aOrg(pPage->GetLftBorder(), pPage->GetUppBorder());
+                Point aOrg(pPage->GetLeftBorder(), pPage->GetUpperBorder());
                 mpDrawView->GetSdrPageView()->SetPageOrigin(aOrg);
                 GetViewFrame()->GetBindings().Invalidate(SID_RULER_NULL_OFFSET);
             }
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index ab318a97f436..69e2cddc734a 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -269,8 +269,8 @@ void DrawViewShell::GetMarginProperties( SfxItemSet &rSet )
             {
                 // const SvxLRSpaceItem aTmpPageLRSpace ( rDesc.GetMaster().GetLRSpace() );
                 const SvxLongLRSpaceItem aLongLR(
-                    (long)pPage->GetLftBorder(),
-                    (long)pPage->GetRgtBorder(),
+                    (long)pPage->GetLeftBorder(),
+                    (long)pPage->GetRightBorder(),
                     SID_ATTR_PAGE_LRSPACE );
                 rSet.Put( aLongLR );
             }
@@ -280,8 +280,8 @@ void DrawViewShell::GetMarginProperties( SfxItemSet &rSet )
             {
                 // const SvxULSpaceItem aUL( rDesc.GetMaster().GetULSpace() );
                 SvxLongULSpaceItem aLongUL(
-                    (long)pPage->GetUppBorder(),
-                    (long)pPage->GetLwrBorder(),
+                    (long)pPage->GetUpperBorder(),
+                    (long)pPage->GetLowerBorder(),
                     SID_ATTR_PAGE_ULSPACE );
                 rSet.Put( aLongUL );
             }
@@ -1853,8 +1853,8 @@ void DrawViewShell::SetPageProperties (SfxRequest& rReq)
                     nRight = static_cast<const SvxLongLRSpaceItem*>(pPoolItem)->GetRight();
                     if (nLeft != -1 && nUpper == -1)
                     {
-                        nUpper  = pPage->GetUppBorder();
-                        nLower  = pPage->GetLwrBorder();
+                        nUpper  = pPage->GetUpperBorder();
+                        nLower  = pPage->GetLowerBorder();
                     }
                     SetPageSizeAndBorder(ePageKind, aNewSize, nLeft, nRight, nUpper, nLower, bScaleAll, eOrientation, nPaperBin, bFullSize );
                 }
@@ -1868,8 +1868,8 @@ void DrawViewShell::SetPageProperties (SfxRequest& rReq)
                     nLower = static_cast<const SvxLongULSpaceItem*>(pPoolItem)->GetLower();
                     if (nLeft == -1 && nUpper != -1)
                     {
-                        nLeft   = pPage->GetLftBorder();
-                        nRight  = pPage->GetRgtBorder();
+                        nLeft   = pPage->GetLeftBorder();
+                        nRight  = pPage->GetRightBorder();
                     }
                     SetPageSizeAndBorder(ePageKind, aNewSize, nLeft, nRight, nUpper, nLower, bScaleAll, eOrientation, nPaperBin, bFullSize );
                 }
diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx
index 44ab9f02ce5a..62688c92c949 100644
--- a/sd/source/ui/view/drviews8.cxx
+++ b/sd/source/ui/view/drviews8.cxx
@@ -74,8 +74,8 @@ void DrawViewShell::ScannerEvent()
                     else
                         aBmpSize = OutputDevice::LogicToLogic( aBmpSize, aScanBmp.GetPrefMapMode(), aMap100 );
 
-                    aPageSize.Width() -= pPage->GetLftBorder() + pPage->GetRgtBorder();
-                    aPageSize.Height() -= pPage->GetUppBorder() + pPage->GetLwrBorder();
+                    aPageSize.Width() -= pPage->GetLeftBorder() + pPage->GetRightBorder();
+                    aPageSize.Height() -= pPage->GetUpperBorder() + pPage->GetLowerBorder();
 
                     if( ( ( aBmpSize.Height() > aPageSize.Height() ) || ( aBmpSize.Width() > aPageSize.Width() ) ) && aBmpSize.Height() && aPageSize.Height() )
                     {
@@ -95,7 +95,7 @@ void DrawViewShell::ScannerEvent()
                     }
 
                     Point aPnt ( ( aPageSize.Width() - aBmpSize.Width() ) >> 1, ( aPageSize.Height() - aBmpSize.Height() ) >> 1 );
-                    aPnt += Point( pPage->GetLftBorder(), pPage->GetUppBorder() );
+                    aPnt += Point( pPage->GetLeftBorder(), pPage->GetUpperBorder() );
                     ::tools::Rectangle   aRect( aPnt, aBmpSize );
                     SdrGrafObj* pGrafObj = nullptr;
                     bool        bInsertNewObject = true;
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 8c0944a0d5ee..f1870d57d6b9 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -97,8 +97,8 @@ void DrawViewShell::ExecGallery(SfxRequest const & rReq)
         // constrain size to page size if necessary
         SdrPage* pPage = mpDrawView->GetSdrPageView()->GetPage();
         Size aPageSize = pPage->GetSize();
-        aPageSize.Width() -= pPage->GetLftBorder() + pPage->GetRgtBorder();
-        aPageSize.Height() -= pPage->GetUppBorder() + pPage->GetLwrBorder();
+        aPageSize.Width() -= pPage->GetLeftBorder() + pPage->GetRightBorder();
+        aPageSize.Height() -= pPage->GetUpperBorder() + pPage->GetLowerBorder();
 
         // If the image is too large we make it fit into the page
         if ( ( ( aSize.Height() > aPageSize.Height() ) || ( aSize.Width()   > aPageSize.Width() ) ) &&
@@ -125,7 +125,7 @@ void DrawViewShell::ExecGallery(SfxRequest const & rReq)
         // set output rectangle for graphic
         Point aPnt ((aPageSize.Width()  - aSize.Width())  / 2,
                     (aPageSize.Height() - aSize.Height()) / 2);
-        aPnt += Point(pPage->GetLftBorder(), pPage->GetUppBorder());
+        aPnt += Point(pPage->GetLeftBorder(), pPage->GetUpperBorder());
         ::tools::Rectangle aRect (aPnt, aSize);
 
         SdrGrafObj* pGrafObj = nullptr;
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 7104afae7928..6973b324ec45 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -438,10 +438,10 @@ void DrawViewShell::SetupPage (Size const &rSize,
             }
             if( bMargin )
             {
-                pPage->SetLftBorder(nLeft);
-                pPage->SetRgtBorder(nRight);
-                pPage->SetUppBorder(nUpper);
-                pPage->SetLwrBorder(nLower);
+                pPage->SetLeftBorder(nLeft);
+                pPage->SetRightBorder(nRight);
+                pPage->SetUpperBorder(nUpper);
+                pPage->SetLowerBorder(nLower);
             }
 
             if ( mePageKind == PageKind::Standard )
@@ -470,10 +470,10 @@ void DrawViewShell::SetupPage (Size const &rSize,
             }
             if( bMargin )
             {
-                pPage->SetLftBorder(nLeft);
-                pPage->SetRgtBorder(nRight);
-                pPage->SetUppBorder(nUpper);
-                pPage->SetLwrBorder(nLower);
+                pPage->SetLeftBorder(nLeft);
+                pPage->SetRightBorder(nRight);
+                pPage->SetUpperBorder(nUpper);
+                pPage->SetLowerBorder(nLower);
             }
 
             if ( mePageKind == PageKind::Standard )
@@ -511,7 +511,7 @@ void DrawViewShell::SetupPage (Size const &rSize,
 
     UpdateScrollBars();
 
-    Point aNewOrigin(mpActualPage->GetLftBorder(), mpActualPage->GetUppBorder());
+    Point aNewOrigin(mpActualPage->GetLeftBorder(), mpActualPage->GetUpperBorder());
     GetView()->GetSdrPageView()->SetPageOrigin(aNewOrigin);
 
     GetViewFrame()->GetBindings().Invalidate(SID_RULER_NULL_OFFSET);
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 1401cb24448f..931949bcd3e8 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -436,10 +436,10 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara )
 
     // set page size
     pPage->SetSize(pExample->GetSize());
-    pPage->SetBorder( pExample->GetLftBorder(),
-                      pExample->GetUppBorder(),
-                      pExample->GetRgtBorder(),
-                      pExample->GetLwrBorder() );
+    pPage->SetBorder( pExample->GetLeftBorder(),
+                      pExample->GetUpperBorder(),
+                      pExample->GetRightBorder(),
+                      pExample->GetLowerBorder() );
 
     // create new presentation objects (after <Title> or <Title with subtitle>
     // follows <Title with outline>, otherwise apply the layout of the previous
@@ -475,10 +475,10 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara )
 
     // set page size, there must be already one page available
     pNotesPage->SetSize(pExample->GetSize());
-    pNotesPage->SetBorder( pExample->GetLftBorder(),
-                           pExample->GetUppBorder(),
-                           pExample->GetRgtBorder(),
-                           pExample->GetLwrBorder() );
+    pNotesPage->SetBorder( pExample->GetLeftBorder(),
+                           pExample->GetUpperBorder(),
+                           pExample->GetRightBorder(),
+                           pExample->GetLowerBorder() );
 
     // create presentation objects
     pNotesPage->SetAutoLayout(pExample->GetAutoLayout(), true);
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index bf5307449eb5..f5fce44dd92c 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -194,8 +194,8 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction,
         pNewGrafObj = new SdrGrafObj( rGraphic, ::tools::Rectangle( rPos, aSize ) );
         SdrPage* pPage = pPV->GetPage();
         Size aPageSize( pPage->GetSize() );
-        aPageSize.Width()  -= pPage->GetLftBorder() + pPage->GetRgtBorder();
-        aPageSize.Height() -= pPage->GetUppBorder() + pPage->GetLwrBorder();
+        aPageSize.Width()  -= pPage->GetLeftBorder() + pPage->GetRightBorder();
+        aPageSize.Height() -= pPage->GetUpperBorder() + pPage->GetLowerBorder();
         pNewGrafObj->AdjustToMaxRect( ::tools::Rectangle( Point(), aPageSize ), true );
 
         SdrInsertFlags nOptions = SdrInsertFlags::SETDEFLAYER;
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 4e06cd625566..9ec8e5e1d77a 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -490,8 +490,8 @@ void ViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize,
 
         SdUndoAction* pUndo = new SdPageFormatUndoAction(GetDoc(), pPage,
                             pPage->GetSize(),
-                            pPage->GetLftBorder(), pPage->GetRgtBorder(),
-                            pPage->GetUppBorder(), pPage->GetLwrBorder(),
+                            pPage->GetLeftBorder(), pPage->GetRightBorder(),
+                            pPage->GetUpperBorder(), pPage->GetLowerBorder(),
                             pPage->GetOrientation(),
                             pPage->GetPaperBin(),
                             pPage->IsBackgroundFullSize(),
@@ -538,8 +538,8 @@ void ViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize,
 
         SdUndoAction* pUndo = new SdPageFormatUndoAction(GetDoc(), pPage,
                                 pPage->GetSize(),
-                                pPage->GetLftBorder(), pPage->GetRgtBorder(),
-                                pPage->GetUppBorder(), pPage->GetLwrBorder(),
+                                pPage->GetLeftBorder(), pPage->GetRightBorder(),
+                                pPage->GetUpperBorder(), pPage->GetLowerBorder(),
                                 pPage->GetOrientation(),
                                 pPage->GetPaperBin(),
                                 pPage->IsBackgroundFullSize(),
@@ -611,7 +611,7 @@ void ViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize,
 
     UpdateScrollBars();
 
-    Point aNewOrigin(pPage->GetLftBorder(), pPage->GetUppBorder());
+    Point aNewOrigin(pPage->GetLeftBorder(), pPage->GetUpperBorder());
 
     if (pView)
     {