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

11 files changed, 73 insertions, 73 deletions

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 9d9f7694fed7..91f08bf8ba60 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -8299,7 +8299,7 @@ SfxVoidItem OutlineUp SID_OUTLINE_UP
 ]
 
 
-SvxFmtBreakItem Pagebreak SID_ATTR_PARA_PAGEBREAK
+SvxFormatBreakItem Pagebreak SID_ATTR_PARA_PAGEBREAK
 
 [
     /* flags: */
@@ -8486,7 +8486,7 @@ SfxVoidItem ParagraphDialog SID_PARA_DLG
 ]
 
 
-SvxFmtKeepItem ParaKeepTogether SID_ATTR_PARA_KEEP
+SvxFormatKeepItem ParaKeepTogether SID_ATTR_PARA_KEEP
 
 [
     /* flags: */
@@ -8513,7 +8513,7 @@ SvxFmtKeepItem ParaKeepTogether SID_ATTR_PARA_KEEP
 ]
 
 
-SvxFmtSplitItem ParaSplit SID_ATTR_PARA_SPLIT
+SvxFormatSplitItem ParaSplit SID_ATTR_PARA_SPLIT
 
 [
     /* flags: */
diff --git a/svx/sdi/svxitems.sdi b/svx/sdi/svxitems.sdi
index 6ee210581d40..b8d771160d06 100644
--- a/svx/sdi/svxitems.sdi
+++ b/svx/sdi/svxitems.sdi
@@ -321,9 +321,9 @@ item BOOL                   SvxBlinkItem;
 item BOOL                   SvxAutoKernItem;
 item INT32                  SvxColorItem;
 item BOOL                   SvxContourItem;
-item INT16                  SvxFmtBreakItem;  // enum
-item BOOL                   SvxFmtKeepItem;
-item BOOL                   SvxFmtSplitItem;
+item INT16                  SvxFormatBreakItem;  // enum
+item BOOL                   SvxFormatKeepItem;
+item BOOL                   SvxFormatSplitItem;
 item INT16                  SvxKerningItem;
 item INT16                  SvxLanguageItem;
 item BOOL                   SvxNoHyphenItem;
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index a890925a0801..34768b21677f 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -322,7 +322,7 @@ Size FontPrevWin_Impl::CalcTextSize(vcl::RenderContext& rRenderContext, OutputDe
                                     ((nScript == css::i18n::ScriptType::COMPLEX) ?
                                         maCTLFont :
                                         rInFont);
-        sal_uIntPtr nWidth = rFont.GetTxtSize(_pPrinter, maText, nStart, nEnd - nStart).Width();
+        sal_uIntPtr nWidth = rFont.GetTextSize(_pPrinter, maText, nStart, nEnd - nStart).Width();
         if (nIdx >= maTextWidth.size())
             break;
 
@@ -771,12 +771,12 @@ void SvxFontPrevWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangl
             if (pImpl->mcStartBracket)
             {
                 OUString sBracket(pImpl->mcStartBracket);
-                nStartBracketWidth = rFont.GetTxtSize(pPrinter, sBracket).Width();
+                nStartBracketWidth = rFont.GetTextSize(pPrinter, sBracket).Width();
             }
             if (pImpl->mcEndBracket)
             {
                 OUString sBracket(pImpl->mcEndBracket);
-                nEndBracketWidth = rFont.GetTxtSize(pPrinter, sBracket).Width();
+                nEndBracketWidth = rFont.GetTextSize(pPrinter, sBracket).Width();
             }
             nTextWidth = pImpl->CalcTextSize(rRenderContext, pPrinter, aSmallFont).Width();
             long nResultWidth = nStartBracketWidth;
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 5f3f1b4b216b..421795807ceb 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -626,9 +626,9 @@ void SvxRuler::MouseMove( const MouseEvent& rMEvt )
 
             long nIndentValue = 0.0;
             if (nIndex == INDENT_LEFT_MARGIN)
-                nIndentValue = mxParaItem->GetTxtLeft();
+                nIndentValue = mxParaItem->GetTextLeft();
             else if (nIndex == INDENT_FIRST_LINE)
-                nIndentValue = mxParaItem->GetTxtFirstLineOfst();
+                nIndentValue = mxParaItem->GetTextFirstLineOfst();
             else if (nIndex == INDENT_RIGHT_MARGIN)
                 nIndentValue = mxParaItem->GetRight();
 
@@ -908,14 +908,14 @@ void SvxRuler::UpdatePara()
 
         if(bRTLText)
         {
-            leftMargin    = nRightFrameMargin - mxParaItem->GetTxtLeft() + lAppNullOffset;
-            leftFirstLine = leftMargin - mxParaItem->GetTxtFirstLineOfst();
+            leftMargin    = nRightFrameMargin - mxParaItem->GetTextLeft() + lAppNullOffset;
+            leftFirstLine = leftMargin - mxParaItem->GetTextFirstLineOfst();
             rightMargin   = nLeftFrameMargin + mxParaItem->GetRight() + lAppNullOffset;
         }
         else
         {
-            leftMargin    = nLeftFrameMargin + mxParaItem->GetTxtLeft() + lAppNullOffset;
-            leftFirstLine = leftMargin + mxParaItem->GetTxtFirstLineOfst();
+            leftMargin    = nLeftFrameMargin + mxParaItem->GetTextLeft() + lAppNullOffset;
+            leftFirstLine = leftMargin + mxParaItem->GetTextFirstLineOfst();
             rightMargin   = nRightFrameMargin - mxParaItem->GetRight() + lAppNullOffset;
         }
 
@@ -1089,7 +1089,7 @@ void SvxRuler::UpdateTabs()
         long nRightFrameMargin = GetRightFrameMargin();
 
         //#i24363# tab stops relative to indent
-        const long nParaItemTxtLeft = mxParaItem->GetTxtLeft();
+        const long nParaItemTxtLeft = mxParaItem->GetTextLeft();
 
         const long lParaIndent = nLeftFrameMargin + nParaItemTxtLeft;
 
@@ -2218,8 +2218,8 @@ void SvxRuler::ApplyIndents()
         nNewRight           = RoundToCurrentMapMode(nNewRight);
     }
 
-    mxParaItem->SetTxtFirstLineOfst(sal::static_int_cast<short>(nNewFirstLineOffset));
-    mxParaItem->SetTxtLeft(nNewTxtLeft);
+    mxParaItem->SetTextFirstLineOfst(sal::static_int_cast<short>(nNewFirstLineOffset));
+    mxParaItem->SetTextLeft(nNewTxtLeft);
     mxParaItem->SetRight(nNewRight);
 
     sal_uInt16 nParagraphId  = bHorz ? SID_ATTR_PARA_LRSPACE : SID_ATTR_PARA_LRSPACE_VERTICAL;
@@ -2608,7 +2608,7 @@ void SvxRuler::Click()
     if(mxTabStopItem.get() &&
        (nFlags & SvxRulerSupportFlags::TABS) == SvxRulerSupportFlags::TABS)
     {
-        bool bContentProtected = mxRulerImpl->aProtectItem.IsCntntProtected();
+        bool bContentProtected = mxRulerImpl->aProtectItem.IsContentProtected();
         if( bContentProtected ) return;
         const long lPos = GetClickPos();
         if((bRTL && lPos < std::min(GetFirstLineIndent(), GetLeftIndent()) && lPos > GetRightIndent()) ||
@@ -2686,7 +2686,7 @@ void SvxRuler::CalcMinMax()
                 //top border is not moveable when table rows are displayed
                 // protection of content means the margin is not moveable
                 // - it's just a page break inside of a cell
-                if(bHorz && !mxRulerImpl->aProtectItem.IsCntntProtected())
+                if(bHorz && !mxRulerImpl->aProtectItem.IsContentProtected())
                 {
                     nMaxLeft = mpBorders[0].nMinPos + lNullPix;
                     if(nDragType & SvxRulerDragFlags::OBJECT_SIZE_PROPORTIONAL)
@@ -2777,7 +2777,7 @@ void SvxRuler::CalcMinMax()
             {
                 // get the bottom move range from the last border position - only available for rows!
                 // protection of content means the margin is not moveable - it's just a page break inside of a cell
-                if(bHorz || mxRulerImpl->aProtectItem.IsCntntProtected())
+                if(bHorz || mxRulerImpl->aProtectItem.IsContentProtected())
                 {
                     nMaxLeft = nMaxRight = mpBorders[mxColumnItem->Count() - 1].nMaxPos + lNullPix;
                 }
@@ -3196,7 +3196,7 @@ bool SvxRuler::StartDrag()
        <SvxRuler::CalcMinMax()>
        <SvxRuler::EndDrag()>
     */
-    bool bContentProtected = mxRulerImpl->aProtectItem.IsCntntProtected();
+    bool bContentProtected = mxRulerImpl->aProtectItem.IsContentProtected();
 
     if(!bValid)
         return false;
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index eafce45383d1..c16ba6f24490 100644
--- a/svx/source/items/clipfmtitem.cxx
+++ b/svx/source/items/clipfmtitem.cxx
@@ -24,41 +24,41 @@
 #include <svx/clipfmtitem.hxx>
 #include <com/sun/star/frame/status/ClipboardFormats.hpp>
 
-struct SvxClipboardFmtItem_Impl
+struct SvxClipboardFormatItem_Impl
 {
     std::vector<OUString> aFmtNms;
     std::vector<SotClipboardFormatId> aFmtIds;
 
-    SvxClipboardFmtItem_Impl() {}
-    SvxClipboardFmtItem_Impl( const SvxClipboardFmtItem_Impl& );
+    SvxClipboardFormatItem_Impl() {}
+    SvxClipboardFormatItem_Impl( const SvxClipboardFormatItem_Impl& );
 };
 
-TYPEINIT1_FACTORY( SvxClipboardFmtItem, SfxPoolItem , new  SvxClipboardFmtItem(0));
+TYPEINIT1_FACTORY( SvxClipboardFormatItem, SfxPoolItem , new  SvxClipboardFormatItem(0));
 
-SvxClipboardFmtItem_Impl::SvxClipboardFmtItem_Impl(
-                            const SvxClipboardFmtItem_Impl& rCpy )
+SvxClipboardFormatItem_Impl::SvxClipboardFormatItem_Impl(
+                            const SvxClipboardFormatItem_Impl& rCpy )
     : aFmtNms(rCpy.aFmtNms)
     , aFmtIds(rCpy.aFmtIds)
 {
 }
 
-SvxClipboardFmtItem::SvxClipboardFmtItem( sal_uInt16 nId )
-    : SfxPoolItem( nId ), pImpl( new SvxClipboardFmtItem_Impl )
+SvxClipboardFormatItem::SvxClipboardFormatItem( sal_uInt16 nId )
+    : SfxPoolItem( nId ), pImpl( new SvxClipboardFormatItem_Impl )
 {
 }
 
-SvxClipboardFmtItem::SvxClipboardFmtItem( const SvxClipboardFmtItem& rCpy )
+SvxClipboardFormatItem::SvxClipboardFormatItem( const SvxClipboardFormatItem& rCpy )
     : SfxPoolItem( rCpy.Which() ),
-    pImpl( new SvxClipboardFmtItem_Impl( *rCpy.pImpl ) )
+    pImpl( new SvxClipboardFormatItem_Impl( *rCpy.pImpl ) )
 {
 }
 
-SvxClipboardFmtItem::~SvxClipboardFmtItem()
+SvxClipboardFormatItem::~SvxClipboardFormatItem()
 {
     delete pImpl;
 }
 
-bool SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
+bool SvxClipboardFormatItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     sal_uInt16 nCount = Count();
 
@@ -76,7 +76,7 @@ bool SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8
     return true;
 }
 
-bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
+bool SvxClipboardFormatItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     ::com::sun::star::frame::status::ClipboardFormats aClipFormats;
     if ( rVal >>= aClipFormats )
@@ -94,9 +94,9 @@ bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_
     return false;
 }
 
-bool SvxClipboardFmtItem::operator==( const SfxPoolItem& rComp ) const
+bool SvxClipboardFormatItem::operator==( const SfxPoolItem& rComp ) const
 {
-    const SvxClipboardFmtItem& rCmp = static_cast<const SvxClipboardFmtItem&>(rComp);
+    const SvxClipboardFormatItem& rCmp = static_cast<const SvxClipboardFormatItem&>(rComp);
     if(rCmp.pImpl->aFmtNms.size() != pImpl->aFmtNms.size())
         return false;
 
@@ -114,12 +114,12 @@ bool SvxClipboardFmtItem::operator==( const SfxPoolItem& rComp ) const
     return nRet;
 }
 
-SfxPoolItem* SvxClipboardFmtItem::Clone( SfxItemPool * /*pPool*/ ) const
+SfxPoolItem* SvxClipboardFormatItem::Clone( SfxItemPool * /*pPool*/ ) const
 {
-    return new SvxClipboardFmtItem( *this );
+    return new SvxClipboardFormatItem( *this );
 }
 
-void SvxClipboardFmtItem::AddClipbrdFormat( SotClipboardFormatId nId, sal_uInt16 nPos )
+void SvxClipboardFormatItem::AddClipbrdFormat( SotClipboardFormatId nId, sal_uInt16 nPos )
 {
     if( nPos > pImpl->aFmtNms.size() )
         nPos = pImpl->aFmtNms.size();
@@ -128,7 +128,7 @@ void SvxClipboardFmtItem::AddClipbrdFormat( SotClipboardFormatId nId, sal_uInt16
     pImpl->aFmtIds.insert( pImpl->aFmtIds.begin()+nPos, nId );
 }
 
-void SvxClipboardFmtItem::AddClipbrdFormat( SotClipboardFormatId nId, const OUString& rName,
+void SvxClipboardFormatItem::AddClipbrdFormat( SotClipboardFormatId nId, const OUString& rName,
                             sal_uInt16 nPos )
 {
     if( nPos > pImpl->aFmtNms.size() )
@@ -138,17 +138,17 @@ void SvxClipboardFmtItem::AddClipbrdFormat( SotClipboardFormatId nId, const OUSt
     pImpl->aFmtIds.insert( pImpl->aFmtIds.begin()+nPos, nId );
 }
 
-sal_uInt16 SvxClipboardFmtItem::Count() const
+sal_uInt16 SvxClipboardFormatItem::Count() const
 {
     return pImpl->aFmtIds.size();
 }
 
-SotClipboardFormatId SvxClipboardFmtItem::GetClipbrdFormatId( sal_uInt16 nPos ) const
+SotClipboardFormatId SvxClipboardFormatItem::GetClipbrdFormatId( sal_uInt16 nPos ) const
 {
     return pImpl->aFmtIds[ nPos ];
 }
 
-const OUString SvxClipboardFmtItem::GetClipbrdFormatName( sal_uInt16 nPos ) const
+const OUString SvxClipboardFormatItem::GetClipbrdFormatName( sal_uInt16 nPos ) const
 {
     return pImpl->aFmtNms[nPos];
 }
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
index 08d68167b8fb..b1b5b39b4195 100644
--- a/svx/source/items/hlnkitem.cxx
+++ b/svx/source/items/hlnkitem.cxx
@@ -198,8 +198,8 @@ SvxHyperlinkItem::SvxHyperlinkItem( const SvxHyperlinkItem& rHyperlinkItem ):
     sIntName = rHyperlinkItem.sIntName;
     nMacroEvents = rHyperlinkItem.nMacroEvents;
 
-    if( rHyperlinkItem.GetMacroTbl() )
-        pMacroTable = new SvxMacroTableDtor( *rHyperlinkItem.GetMacroTbl() );
+    if( rHyperlinkItem.GetMacroTable() )
+        pMacroTable = new SvxMacroTableDtor( *rHyperlinkItem.GetMacroTable() );
     else
         pMacroTable=NULL;
 
diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx
index 5b7255bff356..a0eb16f61b3c 100644
--- a/svx/source/mnuctrls/clipboardctl.cxx
+++ b/svx/source/mnuctrls/clipboardctl.cxx
@@ -63,7 +63,7 @@ SvxClipBoardControl::~SvxClipBoardControl()
 
 VclPtr<SfxPopupWindow> SvxClipBoardControl::CreatePopupWindow()
 {
-    const SvxClipboardFmtItem* pFmtItem = PTR_CAST( SvxClipboardFmtItem, pClipboardFmtItem );
+    const SvxClipboardFormatItem* pFmtItem = PTR_CAST( SvxClipboardFormatItem, pClipboardFmtItem );
     if ( pFmtItem )
     {
         if (pPopup)
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 838e1c749114..7c7e2c491f7a 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -421,7 +421,7 @@ bool BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
     vcl::Font rActBulletFont = pActualBullets[nIndex]->aFont;
 
     sal_uInt16 nMask = 1;
-    OUString sBulletCharFmtName = GetBulCharFmtName();
+    OUString sBulletCharFormatName = GetBulCharFmtName();
     for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++)
     {
         if(mLevel & nMask)
@@ -430,7 +430,7 @@ bool BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
             aFmt.SetNumberingType( SVX_NUM_CHAR_SPECIAL );
             aFmt.SetBulletFont(&rActBulletFont);
             aFmt.SetBulletChar(cChar );
-            aFmt.SetCharFmtName(sBulletCharFmtName);
+            aFmt.SetCharFormatName(sBulletCharFormatName);
             OUString aEmptyStr;
             aFmt.SetPrefix( aEmptyStr );
             aFmt.SetSuffix( aEmptyStr );
@@ -686,7 +686,7 @@ bool GraphyicBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, s
             aFmt.SetNumberingType(nSetNumberingType);
             aFmt.SetPrefix( aEmptyStr );
             aFmt.SetSuffix( aEmptyStr );
-            aFmt.SetCharFmtName( sNumCharFmtName );
+            aFmt.SetCharFormatName( sNumCharFmtName );
 
                     Graphic aGraphic;
                     if(GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, pEntry->nGallaryIndex, &aGraphic))
@@ -1149,7 +1149,7 @@ bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
         //vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
         vcl::Font rActBulletFont = static_cast<BulletsSettings_Impl*>(pCurrentBullets->pBullets)->aFont;
         sal_uInt16 nMask = 1;
-        OUString sBulletCharFmtName = GetBulCharFmtName();
+        OUString sBulletCharFormatName = GetBulCharFmtName();
         for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++)
         {
             if(mLevel & nMask)
@@ -1159,7 +1159,7 @@ bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
                 aFmt.SetNumberingType( SVX_NUM_CHAR_SPECIAL );
                 aFmt.SetBulletFont(&rActBulletFont);
                 aFmt.SetBulletChar(cChar );
-                aFmt.SetCharFmtName(sBulletCharFmtName);
+                aFmt.SetCharFormatName(sBulletCharFormatName);
                 OUString aEmptyStr;
                 aFmt.SetPrefix( aEmptyStr );
                 aFmt.SetSuffix( aEmptyStr );
@@ -1187,7 +1187,7 @@ bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
                 aFmt.SetNumberingType(nSetNumberingType);
                 aFmt.SetPrefix( aEmptyStr );
                 aFmt.SetSuffix( aEmptyStr );
-                aFmt.SetCharFmtName( sNumCharFmtName );
+                aFmt.SetCharFormatName( sNumCharFmtName );
                 if ( pCurrentBullets->nIndexDefault == (sal_uInt16)0xFFFF && pEntry->pGrfObj )
                 {
                     Size aSize = pEntry->aSize;
@@ -1428,7 +1428,7 @@ bool NumberingTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uIn
             aFmt.SetPrefix(_pSet->pNumSetting->sPrefix);
             aFmt.SetSuffix(_pSet->pNumSetting->sSuffix);
 
-            aFmt.SetCharFmtName(sNumCharFmtName);
+            aFmt.SetCharFormatName(sNumCharFmtName);
             if (isResetSize) aFmt.SetBulletRelSize(100);
             aNum.SetLevel(i, aFmt);
         }
@@ -1711,7 +1711,7 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
     NumSettingsArr_Impl *pNumSettingsArr=pItemArr->pNumSettingsArr;
 
     NumSettings_ImplPtr pLevelSettings = 0;
-    OUString sBulletCharFmtName = GetBulCharFmtName();
+    OUString sBulletCharFormatName = GetBulCharFmtName();
     for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++)
     {
         if(pNumSettingsArr->size() > i)
@@ -1774,7 +1774,7 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
             }
 
             aFmt.SetBulletChar(cChar);
-            aFmt.SetCharFmtName( sBulletCharFmtName );
+            aFmt.SetCharFormatName( sBulletCharFormatName );
             if (isResetSize) aFmt.SetBulletRelSize(45);
         }else if ((aFmt.GetNumberingType()&(~LINK_TOKEN)) == SVX_NUM_BITMAP ) {
             if (pLevelSettings->pBrushItem) {
@@ -1793,7 +1793,7 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
         } else
         {
             aFmt.SetIncludeUpperLevels(sal::static_int_cast< sal_uInt8 >(0 != nUpperLevelOrChar ? aNum.GetLevelCount() : 0));
-            aFmt.SetCharFmtName(sBulletCharFmtName);
+            aFmt.SetCharFormatName(sBulletCharFormatName);
                 if (isResetSize) aFmt.SetBulletRelSize(100);
         }
         if(pNumSettingsArr->size() > i) {
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 2604ea250a40..35a0305eb3b3 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -250,9 +250,9 @@ void ParaPropertyPanel::initial()
 IMPL_LINK_NOARG( ParaPropertyPanel, ModifyIndentHdl_Impl)
 {
     SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
-    aMargin.SetTxtLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) );
+    aMargin.SetTextLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) );
     aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
-    aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
+    aMargin.SetTextFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
 
     GetBindings()->GetDispatcher()->Execute(
         SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
@@ -283,9 +283,9 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pCont
                     maTxtLeft += INDENT_STEP;
                     sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
                     nVal = OutputDevice::LogicToLogic( (long)nVal, MAP_100TH_MM, (MapUnit)m_eLRSpaceUnit );
-                    aMargin.SetTxtLeft( (const long)nVal );
+                    aMargin.SetTextLeft( (const long)nVal );
                     aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
-                    aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
+                    aMargin.SetTextFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
 
                     GetBindings()->GetDispatcher()->Execute(
                         SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
@@ -317,9 +317,9 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pCont
                     sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
                     nVal = OutputDevice::LogicToLogic( (long)nVal, MAP_100TH_MM, (MapUnit)m_eLRSpaceUnit );
 
-                    aMargin.SetTxtLeft( (const long)nVal );
+                    aMargin.SetTextLeft( (const long)nVal );
                     aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
-                    aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
+                    aMargin.SetTextFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
 
                     GetBindings()->GetDispatcher()->Execute(
                         SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
@@ -329,9 +329,9 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pCont
         else if (aCommand == UNO_HANGINGINDENT)
         {
             SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
-            aMargin.SetTxtLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) + (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
+            aMargin.SetTextLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) + (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
             aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
-            aMargin.SetTxtFirstLineOfst( ((const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ))*(-1) );
+            aMargin.SetTextFirstLineOfst( ((const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ))*(-1) );
 
             GetBindings()->GetDispatcher()->Execute(
                 SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
@@ -353,9 +353,9 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickProDemote_Hdl_Impl, ToolBox *, pControl,
         else if (aCommand == UNO_HANGINGINDENT2)
         {
             SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
-            aMargin.SetTxtLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) + (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
+            aMargin.SetTextLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) + (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
             aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
-            aMargin.SetTxtFirstLineOfst( ((const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ))*(-1) );
+            aMargin.SetTextFirstLineOfst( ((const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ))*(-1) );
 
             GetBindings()->GetDispatcher()->Execute( SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
         }
@@ -466,7 +466,7 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
     if( pState && eState >= SfxItemState::DEFAULT )
     {
         const SvxLRSpaceItem* pSpace = static_cast<const SvxLRSpaceItem*>(pState);
-        maTxtLeft = pSpace->GetTxtLeft();
+        maTxtLeft = pSpace->GetTextLeft();
         maTxtLeft = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)m_eLRSpaceUnit, MAP_100TH_MM );
         maTxtLeft = OutputDevice::LogicToLogic( maTxtLeft, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) );
 
@@ -474,7 +474,7 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
         aTxtRight = OutputDevice::LogicToLogic( aTxtRight, (MapUnit)m_eLRSpaceUnit, MAP_100TH_MM );
         aTxtRight = OutputDevice::LogicToLogic( aTxtRight, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) );
 
-        long aTxtFirstLineOfst = pSpace->GetTxtFirstLineOfst();
+        long aTxtFirstLineOfst = pSpace->GetTextFirstLineOfst();
         aTxtFirstLineOfst = OutputDevice::LogicToLogic( aTxtFirstLineOfst, (MapUnit)m_eLRSpaceUnit, MAP_100TH_MM );
         aTxtFirstLineOfst = OutputDevice::LogicToLogic( aTxtFirstLineOfst, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) );
 
diff --git a/svx/source/styles/CommonStylePreviewRenderer.cxx b/svx/source/styles/CommonStylePreviewRenderer.cxx
index 9ef4ffdc64d2..ab1271ac8fe0 100644
--- a/svx/source/styles/CommonStylePreviewRenderer.cxx
+++ b/svx/source/styles/CommonStylePreviewRenderer.cxx
@@ -168,7 +168,7 @@ bool CommonStylePreviewRenderer::recalculate()
 
 Size CommonStylePreviewRenderer::getRenderSize()
 {
-    maPixelSize = maFont.GetTxtSize(&mrOutputDev, maStyleName);
+    maPixelSize = maFont.GetTextSize(&mrOutputDev, maStyleName);
     if (maPixelSize.Height() > mnMaxHeight)
         maPixelSize.Height() = mnMaxHeight;
     return maPixelSize;
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index b2712615e1f9..8e5b31dd72d6 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -493,14 +493,14 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
         bOk=pTextObj->CalcFieldValue(pFI->GetField(),pFI->GetPara(),pFI->GetPos(),true,pTxtCol,pFldCol,rStr);
         if (bOk) {
             if (pTxtCol!=NULL) {
-                pFI->SetTxtColor(*pTxtCol);
+                pFI->SetTextColor(*pTxtCol);
                 delete pTxtCol;
             }
             if (pFldCol!=NULL) {
-                pFI->SetFldColor(*pFldCol);
+                pFI->SetFieldColor(*pFldCol);
                 delete pFldCol;
             } else {
-                pFI->SetFldColor(Color(COL_LIGHTGRAY)); // TODO: remove this later on (357)
+                pFI->SetFieldColor(Color(COL_LIGHTGRAY)); // TODO: remove this later on (357)
             }
         }
     }