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, 6 insertions, 6 deletions

diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 3b3c8a457ce6..1773f8d6b42a 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -902,9 +902,9 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode,
     if( pFlyFrameFormat )
     {
         eSurround = pFlyFrameFormat->GetSurround().GetSurround();
-        const SwFormatFrmSize& rFrmSize = pFlyFrameFormat->GetFrmSize();
-        nFlyPrcWidth = rFrmSize.GetWidthPercent();
-        nFlyWidth = rFrmSize.GetSize().Width();
+        const SwFormatFrameSize& rFrameSize = pFlyFrameFormat->GetFrameSize();
+        nFlyPrcWidth = rFrameSize.GetWidthPercent();
+        nFlyWidth = rFrameSize.GetSize().Width();
 
         eFlyHoriOri = pFlyFrameFormat->GetHoriOrient().GetHoriOrient();
         if( text::HoriOrientation::NONE == eFlyHoriOri )
@@ -928,9 +928,9 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode,
 
     SwFrameFormat *pFormat = rTable.GetFrameFormat();
 
-    const SwFormatFrmSize& rFrmSize = pFormat->GetFrmSize();
-    long nWidth = rFrmSize.GetSize().Width();
-    sal_uInt8 nPrcWidth = rFrmSize.GetWidthPercent();
+    const SwFormatFrameSize& rFrameSize = pFormat->GetFrameSize();
+    long nWidth = rFrameSize.GetSize().Width();
+    sal_uInt8 nPrcWidth = rFrameSize.GetWidthPercent();
     sal_uInt16 nBaseWidth = (sal_uInt16)nWidth;
 
     sal_Int16 eTabHoriOri = pFormat->GetHoriOrient().GetHoriOrient();