bin/rename-sw-abbreviations.shlibreoffice-5-0-branch-point

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

Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9

3 files changed, 24 insertions, 24 deletions

diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index ac9ecbca1f6a..22ca54640576 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -782,8 +782,8 @@ void  DrawViewShell::ExecRuler(SfxRequest& rReq)
 
                 nId = EE_PARA_LRSPACE;
                 SvxLRSpaceItem aLRSpaceItem( rItem.GetLeft(),
-                        rItem.GetRight(), rItem.GetTxtLeft(),
-                        rItem.GetTxtFirstLineOfst(), nId );
+                        rItem.GetRight(), rItem.GetTextLeft(),
+                        rItem.GetTextFirstLineOfst(), nId );
 
                 const sal_Int16 nOutlineLevel = static_cast<const SfxInt16Item&>(aEditAttr.Get( EE_PARA_OUTLLEVEL )).GetValue();
                 const SvxLRSpaceItem& rOrigLRSpaceItem = static_cast<const SvxLRSpaceItem&>( aEditAttr.Get( EE_PARA_LRSPACE ));
@@ -801,28 +801,28 @@ void  DrawViewShell::ExecRuler(SfxRequest& rReq)
                     // become negative - EditEngine really does not
                     // like that.
                     const short nAbsLSpace=aFormat.GetAbsLSpace();
-                    const long  nTxtLeft=rItem.GetTxtLeft();
+                    const long  nTxtLeft=rItem.GetTextLeft();
                     const long  nLeftIndent=std::max(0L,nTxtLeft - nAbsLSpace);
-                    aLRSpaceItem.SetTxtLeft(nLeftIndent);
+                    aLRSpaceItem.SetTextLeft(nLeftIndent);
                     // control for clipped left indent - remainder
                     // reduces number format first line indent
                     aFormat.SetAbsLSpace(nTxtLeft - nLeftIndent);
 
                     // negative first line indent goes to the number
                     // format, positive to the lrSpace item
-                    if( rItem.GetTxtFirstLineOfst() < 0 )
+                    if( rItem.GetTextFirstLineOfst() < 0 )
                     {
                         aFormat.SetFirstLineOffset(
-                            rItem.GetTxtFirstLineOfst()
-                            - rOrigLRSpaceItem.GetTxtFirstLineOfst()
+                            rItem.GetTextFirstLineOfst()
+                            - rOrigLRSpaceItem.GetTextFirstLineOfst()
                             + aFormat.GetCharTextDistance());
-                        aLRSpaceItem.SetTxtFirstLineOfst(0);
+                        aLRSpaceItem.SetTextFirstLineOfst(0);
                     }
                     else
                     {
                         aFormat.SetFirstLineOffset(0);
-                        aLRSpaceItem.SetTxtFirstLineOfst(
-                            rItem.GetTxtFirstLineOfst()
+                        aLRSpaceItem.SetTextFirstLineOfst(
+                            rItem.GetTextFirstLineOfst()
                             - aFormat.GetFirstLineOffset()
                             + aFormat.GetCharTextDistance());
                     }
@@ -916,8 +916,8 @@ void  DrawViewShell::GetRulerState(SfxItemSet& rSet)
                     const SvxLRSpaceItem& rLRSpaceItem = static_cast<const SvxLRSpaceItem&>( aEditAttr.Get( EE_PARA_LRSPACE ) );
                     sal_uInt16 nId = SID_ATTR_PARA_LRSPACE;
                     SvxLRSpaceItem aLRSpaceItem( rLRSpaceItem.GetLeft(),
-                            rLRSpaceItem.GetRight(), rLRSpaceItem.GetTxtLeft(),
-                            rLRSpaceItem.GetTxtFirstLineOfst(), nId );
+                            rLRSpaceItem.GetRight(), rLRSpaceItem.GetTextLeft(),
+                            rLRSpaceItem.GetTextFirstLineOfst(), nId );
 
                     const sal_Int16 nOutlineLevel = static_cast<const SfxInt16Item&>( aEditAttr.Get( EE_PARA_OUTLLEVEL )).GetValue();
                     const SvxNumBulletItem& rNumBulletItem = static_cast<const SvxNumBulletItem&>( aEditAttr.Get( EE_PARA_NUMBULLET ) );
@@ -926,9 +926,9 @@ void  DrawViewShell::GetRulerState(SfxItemSet& rSet)
                         rNumBulletItem.GetNumRule()->GetLevelCount() > nOutlineLevel )
                     {
                         const SvxNumberFormat& rFormat = rNumBulletItem.GetNumRule()->GetLevel(nOutlineLevel);
-                        aLRSpaceItem.SetTxtLeft(rFormat.GetAbsLSpace() + rLRSpaceItem.GetTxtLeft());
-                        aLRSpaceItem.SetTxtFirstLineOfst(
-                            rLRSpaceItem.GetTxtFirstLineOfst() + rFormat.GetFirstLineOffset()
+                        aLRSpaceItem.SetTextLeft(rFormat.GetAbsLSpace() + rLRSpaceItem.GetTextLeft());
+                        aLRSpaceItem.SetTextFirstLineOfst(
+                            rLRSpaceItem.GetTextFirstLineOfst() + rFormat.GetFirstLineOffset()
                             - rFormat.GetCharTextDistance());
                     }
 
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 183b09808415..8b6d968a3bcb 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -93,13 +93,13 @@ using namespace ::com::sun::star::linguistic2;
 
 /** Create a list of clipboard formats that are supported both from the
     current clipboard content and the DrawViewShell.
-    The list is stored in a new instance of SvxClipboardFmtItem.
+    The list is stored in a new instance of SvxClipboardFormatItem.
 */
-::std::unique_ptr<SvxClipboardFmtItem> GetSupportedClipboardFormats (
+::std::unique_ptr<SvxClipboardFormatItem> GetSupportedClipboardFormats (
     TransferableDataHelper& rDataHelper)
 {
-    ::std::unique_ptr<SvxClipboardFmtItem> pResult (
-        new SvxClipboardFmtItem(SID_CLIPBOARD_FORMAT_ITEMS));
+    ::std::unique_ptr<SvxClipboardFormatItem> pResult (
+        new SvxClipboardFormatItem(SID_CLIPBOARD_FORMAT_ITEMS));
 
     sal_uInt32 nFormatCount (rDataHelper.GetFormatCount());
     for (sal_uInt32 i=0; i<nFormatCount; i++)
@@ -193,7 +193,7 @@ IMPL_LINK( DrawViewShell, ClipboardChanged, TransferableDataHelper*, pDataHelper
         // exit immediately.
         TransferableDataHelper aDataHelper (
             TransferableDataHelper::CreateFromSystemClipboard(GetActiveWindow()));
-        ::std::unique_ptr<SvxClipboardFmtItem> pFormats (GetSupportedClipboardFormats(aDataHelper));
+        ::std::unique_ptr<SvxClipboardFormatItem> pFormats (GetSupportedClipboardFormats(aDataHelper));
         if (mpDrawView == NULL)
             return 0;
         mpCurrentClipboardFormats = std::move(pFormats);
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 44338eb2763d..329fa9cff449 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -298,10 +298,10 @@ void FrameView::Update(SdOptions* pOptions)
 
         SetSolidDragging( pOptions->IsSolidDragging() );
 
-        SetGridCoarse( Size( pOptions->GetFldDrawX(), pOptions->GetFldDrawY() ) );
-        SetGridFine( Size( pOptions->GetFldDivisionX(), pOptions->GetFldDivisionY() ) );
-        Fraction aFractX(pOptions->GetFldDrawX(), pOptions->GetFldDrawX() / ( pOptions->GetFldDivisionX() ? pOptions->GetFldDivisionX() : 1 ));
-        Fraction aFractY(pOptions->GetFldDrawY(), pOptions->GetFldDrawY() / ( pOptions->GetFldDivisionY() ? pOptions->GetFldDivisionY() : 1 ));
+        SetGridCoarse( Size( pOptions->GetFieldDrawX(), pOptions->GetFieldDrawY() ) );
+        SetGridFine( Size( pOptions->GetFieldDivisionX(), pOptions->GetFieldDivisionY() ) );
+        Fraction aFractX(pOptions->GetFieldDrawX(), pOptions->GetFieldDrawX() / ( pOptions->GetFieldDivisionX() ? pOptions->GetFieldDivisionX() : 1 ));
+        Fraction aFractY(pOptions->GetFieldDrawY(), pOptions->GetFieldDrawY() / ( pOptions->GetFieldDivisionY() ? pOptions->GetFieldDivisionY() : 1 ));
         SetSnapGridWidth(aFractX, aFractY);
         SetQuickEdit(pOptions->IsQuickEdit());