summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-05-20 13:05:49 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-05-20 13:05:49 +0200
commitab465b90f6c6da5595393a0ba73f33a1e71a2b65 (patch)
tree36b77192de2799a11b4bf0b269cb3f74d0a0bb1f /cui
parent0db96caf0fcce09b87621c11b584a6d81cc7df86 (diff)
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
Diffstat (limited to 'cui')
-rw-r--r--cui/source/dialogs/hltpbase.cxx4
-rw-r--r--cui/source/inc/macroass.hxx8
-rw-r--r--cui/source/inc/numpages.hxx14
-rw-r--r--cui/source/inc/paragrph.hxx4
-rw-r--r--cui/source/tabpages/autocdlg.cxx42
-rw-r--r--cui/source/tabpages/numpages.cxx26
-rw-r--r--cui/source/tabpages/paragrph.cxx54
-rw-r--r--cui/source/tabpages/tabstpge.cxx2
8 files changed, 77 insertions, 77 deletions
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 3be79e68b9be..44724042527d 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -313,7 +313,7 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl)
if ( pHyperlinkItem->GetMacroEvents() )
{
// get macros from itemset
- const SvxMacroTableDtor* pMacroTbl = pHyperlinkItem->GetMacroTbl();
+ const SvxMacroTableDtor* pMacroTbl = pHyperlinkItem->GetMacroTable();
SvxMacroItem aItem ( GetWhich(SID_ATTR_MACROITEM) );
if( pMacroTbl )
aItem.SetMacroTable( *pMacroTbl );
@@ -381,7 +381,7 @@ SvxMacroTableDtor* SvxHyperlinkTabPageBase::GetMacroTable()
const SvxHyperlinkItem *pHyperlinkItem = static_cast<const SvxHyperlinkItem *>(
GetItemSet().GetItem (SID_HYPERLINK_GETLINK));
- return const_cast<SvxMacroTableDtor*>(pHyperlinkItem->GetMacroTbl());
+ return const_cast<SvxMacroTableDtor*>(pHyperlinkItem->GetMacroTable());
}
// try to detect the current protocol that is used in rStrURL
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index a5a5b4f6b0ae..9cb85a13414a 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -61,8 +61,8 @@ public:
void AddEvent( const OUString & rEventName, sal_uInt16 nEventId );
- const SvxMacroTableDtor& GetMacroTbl() const;
- void SetMacroTbl( const SvxMacroTableDtor& rTbl );
+ const SvxMacroTableDtor& GetMacroTable() const;
+ void SetMacroTable( const SvxMacroTableDtor& rTbl );
void ScriptChanged();
virtual void PageCreated (const SfxAllItemSet& aSet) SAL_OVERRIDE;
@@ -77,12 +77,12 @@ public:
bool IsReadOnly() const SAL_OVERRIDE;
};
-inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTbl() const
+inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTable() const
{
return aTbl;
}
-inline void _SfxMacroTabPage::SetMacroTbl( const SvxMacroTableDtor& rTbl )
+inline void _SfxMacroTabPage::SetMacroTable( const SvxMacroTableDtor& rTbl )
{
aTbl = rTbl;
}
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 032ad4596818..21c975343d76 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -138,7 +138,7 @@ class SvxBulletPickTabPage : public SfxTabPage
bool bPreset : 1;
sal_uInt16 nNumItemId;
- OUString sBulletCharFmtName;
+ OUString sBulletCharFormatName;
protected:
DECL_LINK(NumSelectHdl_Impl, void *);
DECL_LINK(DoubleClickHdl_Impl, void *);
@@ -156,7 +156,7 @@ public:
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
- void SetCharFmtName(const OUString& rName){sBulletCharFmtName = rName;}
+ void SetCharFormatName(const OUString& rName){sBulletCharFormatName = rName;}
virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
};
@@ -170,7 +170,7 @@ class SvxNumPickTabPage : public SfxTabPage
VclPtr<SvxNumValueSet> m_pExamplesVS;
OUString sNumCharFmtName;
- OUString sBulletCharFmtName;
+ OUString sBulletCharFormatName;
SvxNumSettingsArr_Impl aNumSettingsArrays[NUM_VALUSET_COUNT]; // is initialized with the five formats
@@ -200,9 +200,9 @@ public:
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
- void SetCharFmtNames(const OUString& rCharName, const OUString& rBulName)
+ void SetCharFormatNames(const OUString& rCharName, const OUString& rBulName)
{ sNumCharFmtName = rCharName;
- sBulletCharFmtName = rBulName;}
+ sBulletCharFormatName = rBulName;}
virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
};
@@ -298,7 +298,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
VclPtr<SvxNumberingPreview> m_pPreviewWIN;
OUString m_sNumCharFmtName;
- OUString m_sBulletCharFmtName;
+ OUString m_sBulletCharFormatName;
Timer aInvalidateTimer;
@@ -365,7 +365,7 @@ public:
void SetCharFmts(const OUString& rNumName, const OUString& rBulletName)
{
m_sNumCharFmtName = rNumName;
- m_sBulletCharFmtName = rBulletName;
+ m_sBulletCharFormatName = rBulletName;
}
void SetMetric(FieldUnit eSet);
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 7662a9d2ea9f..0c55af1988e2 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -183,8 +183,8 @@ public:
[Items]
<SvxHyphenZoneItem><SID_ATTR_PARA_HYPHENZONE>
- <SvxFmtBreakItem><SID_ATTR_PARA_PAGEBREAK>
- <SvxFmtSplitItem><SID_ATTR_PARA_SPLIT>
+ <SvxFormatBreakItem><SID_ATTR_PARA_PAGEBREAK>
+ <SvxFormatSplitItem><SID_ATTR_PARA_SPLIT>
<SvxWidowsItem><SID_ATTR_PARA_WIDOWS>
<SvxOrphansItem><SID_ATTR_PARA_ORPHANS>
*/
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 09f62262fc76..c4a91772b2fe 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -97,7 +97,7 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet* _pSet )
{
// remove smart tag tab page if no extensions are installed
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
if ( !pOpt || !pOpt->pSmartTagMgr || 0 == pOpt->pSmartTagMgr->NumberOfRecognizers() )
RemoveTabPage("smarttags");
@@ -521,7 +521,7 @@ bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet* )
{
bool bModified = false;
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
long nFlags = pAutoCorrect->GetFlags();
bool bCheck = m_pCheckLB->IsChecked(USE_REPLACE_TABLE, CBCOL_FIRST);
@@ -610,18 +610,18 @@ bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet* )
m_pCheckLB->IsChecked(REPLACE_DASHES, CBCOL_SECOND));
bCheck = m_pCheckLB->IsChecked(DEL_SPACES_AT_STT_END, CBCOL_FIRST);
- bModified |= pOpt->bAFmtDelSpacesAtSttEnd != bCheck;
- pOpt->bAFmtDelSpacesAtSttEnd = bCheck;
+ bModified |= pOpt->bAFormatDelSpacesAtSttEnd != bCheck;
+ pOpt->bAFormatDelSpacesAtSttEnd = bCheck;
bCheck = m_pCheckLB->IsChecked(DEL_SPACES_AT_STT_END, CBCOL_SECOND);
- bModified |= pOpt->bAFmtByInpDelSpacesAtSttEnd != bCheck;
- pOpt->bAFmtByInpDelSpacesAtSttEnd = bCheck;
+ bModified |= pOpt->bAFormatByInpDelSpacesAtSttEnd != bCheck;
+ pOpt->bAFormatByInpDelSpacesAtSttEnd = bCheck;
bCheck = m_pCheckLB->IsChecked(DEL_SPACES_BETWEEN_LINES, CBCOL_FIRST);
- bModified |= pOpt->bAFmtDelSpacesBetweenLines != bCheck;
- pOpt->bAFmtDelSpacesBetweenLines = bCheck;
+ bModified |= pOpt->bAFormatDelSpacesBetweenLines != bCheck;
+ pOpt->bAFormatDelSpacesBetweenLines = bCheck;
bCheck = m_pCheckLB->IsChecked(DEL_SPACES_BETWEEN_LINES, CBCOL_SECOND);
- bModified |= pOpt->bAFmtByInpDelSpacesBetweenLines != bCheck;
- pOpt->bAFmtByInpDelSpacesBetweenLines = bCheck;
+ bModified |= pOpt->bAFormatByInpDelSpacesBetweenLines != bCheck;
+ pOpt->bAFormatByInpDelSpacesBetweenLines = bCheck;
if(bModified || nFlags != pAutoCorrect->GetFlags())
{
@@ -641,7 +641,7 @@ void OfaSwAutoFmtOptionsPage::ActivatePage( const SfxItemSet& )
void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* )
{
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
const long nFlags = pAutoCorrect->GetFlags();
m_pCheckLB->SetUpdateMode(false);
@@ -683,10 +683,10 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* )
m_pCheckLB->CheckEntryPos( DETECT_URL, CBCOL_SECOND, 0 != (nFlags & SetINetAttr) );
m_pCheckLB->CheckEntryPos( REPLACE_DASHES, CBCOL_FIRST, pOpt->bChgToEnEmDash );
m_pCheckLB->CheckEntryPos( REPLACE_DASHES, CBCOL_SECOND, 0 != (nFlags & ChgToEnEmDash) );
- m_pCheckLB->CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_FIRST, pOpt->bAFmtDelSpacesAtSttEnd );
- m_pCheckLB->CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_SECOND, pOpt->bAFmtByInpDelSpacesAtSttEnd );
- m_pCheckLB->CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_FIRST, pOpt->bAFmtDelSpacesBetweenLines );
- m_pCheckLB->CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_SECOND, pOpt->bAFmtByInpDelSpacesBetweenLines );
+ m_pCheckLB->CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_FIRST, pOpt->bAFormatDelSpacesAtSttEnd );
+ m_pCheckLB->CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_SECOND, pOpt->bAFormatByInpDelSpacesAtSttEnd );
+ m_pCheckLB->CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_FIRST, pOpt->bAFormatDelSpacesBetweenLines );
+ m_pCheckLB->CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_SECOND, pOpt->bAFormatByInpDelSpacesBetweenLines );
m_pCheckLB->CheckEntryPos( DEL_EMPTY_NODE, CBCOL_FIRST, pOpt->bDelEmptyNode );
m_pCheckLB->CheckEntryPos( REPLACE_USER_COLL, CBCOL_FIRST, pOpt->bChgUserColl );
m_pCheckLB->CheckEntryPos( REPLACE_BULLETS, CBCOL_FIRST, pOpt->bChgEnumNum );
@@ -1926,7 +1926,7 @@ bool OfaQuoteTabPage::FillItemSet( SfxItemSet* )
bool bModified = false;
if (m_pSwCheckLB->IsVisible())
{
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
bool bCheck = m_pSwCheckLB->IsChecked(ADD_NONBRK_SPACE, CBCOL_FIRST);
bModified |= pOpt->bAddNonBrkSpace != bCheck;
@@ -1991,7 +1991,7 @@ void OfaQuoteTabPage::Reset( const SfxItemSet* )
// Initialize the Sw options
if (m_pSwCheckLB->IsVisible())
{
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
m_pSwCheckLB->SetUpdateMode( false );
m_pSwCheckLB->Clear();
@@ -2254,7 +2254,7 @@ bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* )
{
bool bModified = false, bCheck;
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
sal_uInt16 nVal;
bCheck = m_pCBActiv->IsChecked();
@@ -2306,7 +2306,7 @@ bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* )
void OfaAutoCompleteTabPage::Reset( const SfxItemSet* )
{
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
m_pCBActiv->Check( pOpt->bAutoCompleteWords );
m_pCBCollect->Check( pOpt->bAutoCmpltCollectWords );
@@ -2640,7 +2640,7 @@ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, SelectHdl)
bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet* )
{
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
SmartTagMgr* pSmartTagMgr = pOpt->pSmartTagMgr;
// robust!
@@ -2683,7 +2683,7 @@ bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet* )
void OfaSmartTagOptionsTabPage::Reset( const SfxItemSet* )
{
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
const SmartTagMgr* pSmartTagMgr = pOpt->pSmartTagMgr;
// robust, should not happen!
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 86930e231508..4d721afaffa0 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -362,7 +362,7 @@ IMPL_LINK_NOARG(SvxSingleNumPickTabPage, NumSelectHdl_Impl)
aFmt.SetSuffix( aEmptyStr );
else
aFmt.SetSuffix(_pSet->sSuffix);
- aFmt.SetCharFmtName(sNumCharFmtName);
+ aFmt.SetCharFormatName(sNumCharFmtName);
// #62069# // #92724#
aFmt.SetBulletRelSize(100);
pActNum->SetLevel(i, aFmt);
@@ -520,7 +520,7 @@ IMPL_LINK_NOARG(SvxBulletPickTabPage, NumSelectHdl_Impl)
aFmt.SetSuffix( OUString() );
aFmt.SetBulletFont(&rActBulletFont);
aFmt.SetBulletChar(cChar );
- aFmt.SetCharFmtName(sBulletCharFmtName);
+ aFmt.SetCharFormatName(sBulletCharFormatName);
// #62069# // #92724#
aFmt.SetBulletRelSize(45);
pActNum->SetLevel(i, aFmt);
@@ -548,7 +548,7 @@ void SvxBulletPickTabPage::PageCreated(const SfxAllItemSet& aSet)
SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,false);
if (pBulletCharFmt)
- SetCharFmtName( pBulletCharFmt->GetValue());
+ SetCharFormatName( pBulletCharFmt->GetValue());
}
@@ -773,14 +773,14 @@ IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl)
aFmt.SetBulletChar( !pLevelSettings->sBulletChar.isEmpty()
? pLevelSettings->sBulletChar[0]
: 0 );
- aFmt.SetCharFmtName( sBulletCharFmtName );
+ aFmt.SetCharFormatName( sBulletCharFormatName );
// #62069# // #92724#
aFmt.SetBulletRelSize(45);
}
else
{
aFmt.SetIncludeUpperLevels(sal::static_int_cast< sal_uInt8 >(0 != nUpperLevelOrChar ? pActNum->GetLevelCount() : 0));
- aFmt.SetCharFmtName(sNumCharFmtName);
+ aFmt.SetCharFormatName(sNumCharFmtName);
// #62069# // #92724#
aFmt.SetBulletRelSize(100);
// #i93908#
@@ -808,7 +808,7 @@ void SvxNumPickTabPage::PageCreated(const SfxAllItemSet& aSet)
if (pNumCharFmt &&pBulletCharFmt)
- SetCharFmtNames( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue());
+ SetCharFormatNames( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue());
}
SvxBitmapPickTabPage::SvxBitmapPickTabPage(vcl::Window* pParent,
@@ -986,7 +986,7 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, NumSelectHdl_Impl)
aFmt.SetNumberingType(nSetNumberingType);
aFmt.SetPrefix( aEmptyStr );
aFmt.SetSuffix( aEmptyStr );
- aFmt.SetCharFmtName( sNumCharFmtName );
+ aFmt.SetCharFormatName( sNumCharFmtName );
Graphic aGraphic;
if(GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, nIdx, &aGraphic))
@@ -1611,7 +1611,7 @@ void SvxNumOptionsTabPage::InitControls()
if(SAL_MAX_UINT16 == nLvl)
{
nLvl = i;
- sFirstCharFmt = aNumFmtArr[i]->GetCharFmtName();
+ sFirstCharFmt = aNumFmtArr[i]->GetCharFormatName();
eFirstOrient = aNumFmtArr[i]->GetVertOrient();
if(bShowBitmap)
aFirstSize = aNumFmtArr[i]->GetGraphicSize();
@@ -1624,7 +1624,7 @@ void SvxNumOptionsTabPage::InitControls()
bSamePrefix = aNumFmtArr[i]->GetPrefix() == aNumFmtArr[nLvl]->GetPrefix();
bSameSuffix = aNumFmtArr[i]->GetSuffix() == aNumFmtArr[nLvl]->GetSuffix();
bAllLevel &= aNumFmtArr[i]->GetIncludeUpperLevels() == aNumFmtArr[nLvl]->GetIncludeUpperLevels();
- bSameCharFmt &= sFirstCharFmt == aNumFmtArr[i]->GetCharFmtName();
+ bSameCharFmt &= sFirstCharFmt == aNumFmtArr[i]->GetCharFormatName();
bSameVOrient &= eFirstOrient == aNumFmtArr[i]->GetVertOrient();
if(bShowBitmap && bSameSize)
bSameSize &= aNumFmtArr[i]->GetGraphicSize() == aFirstSize;
@@ -1933,7 +1933,7 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
// allocation of the drawing pattern is automatic
if(bAutomaticCharStyles)
{
- sSelectStyle = m_sBulletCharFmtName;
+ sSelectStyle = m_sBulletCharFormatName;
}
}
else
@@ -2118,7 +2118,7 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton, v
if(nActNumLvl & nMask)
{
SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
- aNumFmt.SetCharFmtName(m_sNumCharFmtName);
+ aNumFmt.SetCharFormatName(m_sNumCharFmtName);
aNumFmt.SetGraphic(aGrfName);
// set size for a later comparison
@@ -2355,11 +2355,11 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, CharFmtHdl_Impl)
{
SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
if( 0 == nEntryPos )
- aNumFmt.SetCharFmtName(aEmptyStr);
+ aNumFmt.SetCharFormatName(aEmptyStr);
else
{
if(SVX_NUM_BITMAP != (aNumFmt.GetNumberingType()&(~LINK_TOKEN)))
- aNumFmt.SetCharFmtName(sEntry);
+ aNumFmt.SetCharFormatName(sEntry);
}
pActNum->SetLevel(i, aNumFmt);
}
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 94c007053d8c..d128a30060b4 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -319,10 +319,10 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
static_cast<const SvxLRSpaceItem&>(GetItemSet().GetParent()->Get( nWhich ));
if ( m_pLeftIndent->IsRelative() )
- aMargin.SetTxtLeft( rOldItem.GetTxtLeft(),
+ aMargin.SetTextLeft( rOldItem.GetTextLeft(),
(sal_uInt16)m_pLeftIndent->GetValue() );
else
- aMargin.SetTxtLeft( GetCoreValue( *m_pLeftIndent, eUnit ) );
+ aMargin.SetTextLeft( GetCoreValue( *m_pLeftIndent, eUnit ) );
if ( m_pRightIndent->IsRelative() )
aMargin.SetRight( rOldItem.GetRight(),
@@ -331,21 +331,21 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
aMargin.SetRight( GetCoreValue( *m_pRightIndent, eUnit ) );
if ( m_pFLineIndent->IsRelative() )
- aMargin.SetTxtFirstLineOfst( rOldItem.GetTxtFirstLineOfst(),
+ aMargin.SetTextFirstLineOfst( rOldItem.GetTextFirstLineOfst(),
(sal_uInt16)m_pFLineIndent->GetValue() );
else
- aMargin.SetTxtFirstLineOfst(
+ aMargin.SetTextFirstLineOfst(
(sal_uInt16)GetCoreValue( *m_pFLineIndent, eUnit ) );
}
else
{
- aMargin.SetTxtLeft( GetCoreValue( *m_pLeftIndent, eUnit ) );
+ aMargin.SetTextLeft( GetCoreValue( *m_pLeftIndent, eUnit ) );
aMargin.SetRight( GetCoreValue( *m_pRightIndent, eUnit ) );
- aMargin.SetTxtFirstLineOfst(
+ aMargin.SetTextFirstLineOfst(
(sal_uInt16)GetCoreValue( *m_pFLineIndent, eUnit ) );
}
aMargin.SetAutoFirst(m_pAutoCB->IsChecked());
- if ( aMargin.GetTxtFirstLineOfst() < 0 )
+ if ( aMargin.GetTextFirstLineOfst() < 0 )
bNullTab = true;
eState = GetItemSet().GetItemState( nWhich );
@@ -452,7 +452,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet )
{
m_pLeftIndent->SetRelative();
SetFieldUnit( *m_pLeftIndent, eFUnit );
- SetMetricValue( *m_pLeftIndent, rOldItem.GetTxtLeft(), eUnit );
+ SetMetricValue( *m_pLeftIndent, rOldItem.GetTextLeft(), eUnit );
}
if ( rOldItem.GetPropRight() != 100 )
@@ -467,17 +467,17 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet )
SetMetricValue( *m_pRightIndent, rOldItem.GetRight(), eUnit );
}
- if ( rOldItem.GetPropTxtFirstLineOfst() != 100 )
+ if ( rOldItem.GetPropTextFirstLineOfst() != 100 )
{
m_pFLineIndent->SetRelative( true );
- m_pFLineIndent->SetValue( rOldItem.GetPropTxtFirstLineOfst() );
+ m_pFLineIndent->SetValue( rOldItem.GetPropTextFirstLineOfst() );
}
else
{
m_pFLineIndent->SetRelative();
m_pFLineIndent->SetMin(-9999);
SetFieldUnit( *m_pFLineIndent, eFUnit );
- SetMetricValue( *m_pFLineIndent, rOldItem.GetTxtFirstLineOfst(),
+ SetMetricValue( *m_pFLineIndent, rOldItem.GetTextFirstLineOfst(),
eUnit );
}
m_pAutoCB->Check(rOldItem.IsAutoFirst());
@@ -487,9 +487,9 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet )
const SvxLRSpaceItem& rSpace =
static_cast<const SvxLRSpaceItem&>(rSet->Get( _nWhich ));
- SetMetricValue( *m_pLeftIndent, rSpace.GetTxtLeft(), eUnit );
+ SetMetricValue( *m_pLeftIndent, rSpace.GetTextLeft(), eUnit );
SetMetricValue( *m_pRightIndent, rSpace.GetRight(), eUnit );
- SetMetricValue( *m_pFLineIndent, rSpace.GetTxtFirstLineOfst(), eUnit );
+ SetMetricValue( *m_pFLineIndent, rSpace.GetTextFirstLineOfst(), eUnit );
m_pAutoCB->Check(rSpace.IsAutoFirst());
}
AutoHdl_Impl(m_pAutoCB);
@@ -1430,7 +1430,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
if ( bIsPageModel )
// if PageModel is turned on, always turn off PageBreak
- rOutSet->Put( SvxFmtBreakItem( SVX_BREAK_NONE, _nWhich ) );
+ rOutSet->Put( SvxFormatBreakItem( SVX_BREAK_NONE, _nWhich ) );
else
{
eState = m_pPageBreakBox->GetState();
@@ -1441,9 +1441,9 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
m_pBreakTypeLB->IsValueChangedFromSaved() ||
m_pBreakPositionLB->IsValueChangedFromSaved() )
{
- const SvxFmtBreakItem rOldBreak(
- static_cast<const SvxFmtBreakItem&>(GetItemSet().Get( _nWhich )));
- SvxFmtBreakItem aBreak(rOldBreak.GetBreak(), rOldBreak.Which());
+ const SvxFormatBreakItem rOldBreak(
+ static_cast<const SvxFormatBreakItem&>(GetItemSet().Get( _nWhich )));
+ SvxFormatBreakItem aBreak(rOldBreak.GetBreak(), rOldBreak.Which());
switch ( eState )
{
@@ -1476,7 +1476,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_PAGEBREAK );
if ( eState != m_pPageBreakBox->GetSavedValue() ||
- !pOld || !( *static_cast<const SvxFmtBreakItem*>(pOld) == aBreak ) )
+ !pOld || !( *static_cast<const SvxFormatBreakItem*>(pOld) == aBreak ) )
{
bModified = true;
rOutSet->Put( aBreak );
@@ -1492,10 +1492,10 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
{
pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_SPLIT );
- if ( !pOld || static_cast<const SvxFmtSplitItem*>(pOld)->GetValue() !=
+ if ( !pOld || static_cast<const SvxFormatSplitItem*>(pOld)->GetValue() !=
( eState == TRISTATE_FALSE ) )
{
- rOutSet->Put( SvxFmtSplitItem( eState == TRISTATE_FALSE, _nWhich ) );
+ rOutSet->Put( SvxFormatSplitItem( eState == TRISTATE_FALSE, _nWhich ) );
bModified = true;
}
}
@@ -1507,7 +1507,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
if ( m_pKeepParaBox->IsValueChangedFromSaved() )
{
// if the status has changed, putting is necessary
- rOutSet->Put( SvxFmtKeepItem( eState == TRISTATE_TRUE, _nWhich ) );
+ rOutSet->Put( SvxFormatKeepItem( eState == TRISTATE_TRUE, _nWhich ) );
bModified = true;
}
@@ -1655,8 +1655,8 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet )
if ( eItemState >= SfxItemState::DEFAULT )
{
- const SvxFmtBreakItem& rPageBreak =
- static_cast<const SvxFmtBreakItem&>(rSet->Get( _nWhich ));
+ const SvxFormatBreakItem& rPageBreak =
+ static_cast<const SvxFormatBreakItem&>(rSet->Get( _nWhich ));
SvxBreak eBreak = (SvxBreak)rPageBreak.GetValue();
@@ -1727,8 +1727,8 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet )
if ( eItemState >= SfxItemState::DEFAULT )
{
m_pKeepParaBox->EnableTriState( false );
- const SvxFmtKeepItem& rKeep =
- static_cast<const SvxFmtKeepItem&>(rSet->Get( _nWhich ));
+ const SvxFormatKeepItem& rKeep =
+ static_cast<const SvxFormatKeepItem&>(rSet->Get( _nWhich ));
if ( rKeep.GetValue() )
m_pKeepParaBox->SetState( TRISTATE_TRUE );
@@ -1745,8 +1745,8 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet )
if ( eItemState >= SfxItemState::DEFAULT )
{
- const SvxFmtSplitItem& rSplit =
- static_cast<const SvxFmtSplitItem&>(rSet->Get( _nWhich ));
+ const SvxFormatSplitItem& rSplit =
+ static_cast<const SvxFormatSplitItem&>(rSet->Get( _nWhich ));
m_pKeepTogetherBox->EnableTriState( false );
if ( !rSplit.GetValue() )
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 9dd3c078639f..6bef88304734 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -233,7 +233,7 @@ bool SvxTabulatorTabPage::FillItemSet(SfxItemSet* rSet)
if (SfxItemState::SET != rSet->GetItemState(GetWhich(SID_ATTR_LRSPACE), true, &pLRSpace))
pLRSpace = GetOldItem(*rSet, SID_ATTR_LRSPACE);
- if (pLRSpace && static_cast<const SvxLRSpaceItem*>(pLRSpace)->GetTxtFirstLineOfst() < 0)
+ if (pLRSpace && static_cast<const SvxLRSpaceItem*>(pLRSpace)->GetTextFirstLineOfst() < 0)
{
SvxTabStop aNull(0, SVX_TAB_ADJUST_DEFAULT);
aNewTabs.Insert(aNull);