bin/rename-sw-abbreviations.sh libreoffice-5-1-branch-point

This commit renames the most annoying abbreviations in Writer (and
partially in the shared code too).

Change-Id: I77e5134f42f25e3786afa36b7a505c7e3237a9e8

1 files changed, 10 insertions, 10 deletions

diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx
index 5ce9b9bae458..60a7cda9bcc8 100644
--- a/sw/source/core/view/viewpg.cxx
+++ b/sw/source/core/view/viewpg.cxx
@@ -113,8 +113,8 @@ void SwViewShell::PrintProspect(
 
     SwTwips nMaxRowSz, nMaxColSz;
 
-    const SwPageFrm *pStPage    = nullptr;
-    const SwPageFrm *pNxtPage   = nullptr;
+    const SwPageFrame *pStPage    = nullptr;
+    const SwPageFrame *pNxtPage   = nullptr;
     if (rPagesToPrint.first > 0)
     {
         pStPage = sw_getPage(*aShell.GetLayout(), rPagesToPrint.first);
@@ -132,13 +132,13 @@ void SwViewShell::PrintProspect(
         if ( pStPage->IsEmptyPage() )
         {
             if ( pStPage->GetPhyPageNum() % 2 == 0 )
-                aSttPageSize = pStPage->GetPrev()->Frm().SSize();
+                aSttPageSize = pStPage->GetPrev()->Frame().SSize();
             else
-                aSttPageSize = pStPage->GetNext()->Frm().SSize();
+                aSttPageSize = pStPage->GetNext()->Frame().SSize();
         }
         else
         {
-            aSttPageSize = pStPage->Frm().SSize();
+            aSttPageSize = pStPage->Frame().SSize();
         }
     }
     Size aNxtPageSize;
@@ -147,13 +147,13 @@ void SwViewShell::PrintProspect(
         if ( pNxtPage->IsEmptyPage() )
         {
             if ( pNxtPage->GetPhyPageNum() % 2 == 0 )
-                aNxtPageSize = pNxtPage->GetPrev()->Frm().SSize();
+                aNxtPageSize = pNxtPage->GetPrev()->Frame().SSize();
             else
-                aNxtPageSize = pNxtPage->GetNext()->Frm().SSize();
+                aNxtPageSize = pNxtPage->GetNext()->Frame().SSize();
         }
         else
         {
-            aNxtPageSize = pNxtPage->Frm().SSize();
+            aNxtPageSize = pNxtPage->Frame().SSize();
         }
     }
 
@@ -206,13 +206,13 @@ void SwViewShell::PrintProspect(
         if( pStPage )
         {
             aShell.Imp()->SetFirstVisPageInvalid();
-            aShell.maVisArea = pStPage->Frm();
+            aShell.maVisArea = pStPage->Frame();
 
             Point aPos( aSttPt );
             aPos -= aShell.maVisArea.Pos();
             aMapMode.SetOrigin( aPos );
             pPrinter->SetMapMode( aMapMode );
-            pStPage->GetUpper()->Paint( *pOutDev, pStPage->Frm() );
+            pStPage->GetUpper()->Paint( *pOutDev, pStPage->Frame() );
         }
 
         pStPage = pNxtPage;