diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-05-20 13:05:49 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-05-20 13:05:49 +0200 |
| commit | ab465b90f6c6da5595393a0ba73f33a1e71a2b65 (patch) | |
| tree | 36b77192de2799a11b4bf0b269cb3f74d0a0bb1f | |
| parent | 0db96caf0fcce09b87621c11b584a6d81cc7df86 (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
1107 files changed, 50156 insertions, 50156 deletions
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index e0176be4eff4..77fff3fe3456 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -582,8 +582,8 @@ void ShapeController::executeDispatch_ParagraphDialog() 0 ); aNewAttr.Put( aAttr ); aNewAttr.Put( SvxHyphenZoneItem( false, SID_ATTR_PARA_HYPHENZONE ) ); - aNewAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, SID_ATTR_PARA_PAGEBREAK ) ); - aNewAttr.Put( SvxFmtSplitItem( true, SID_ATTR_PARA_SPLIT) ); + aNewAttr.Put( SvxFormatBreakItem( SVX_BREAK_NONE, SID_ATTR_PARA_PAGEBREAK ) ); + aNewAttr.Put( SvxFormatSplitItem( true, SID_ATTR_PARA_SPLIT) ); aNewAttr.Put( SvxWidowsItem( 0, SID_ATTR_PARA_WIDOWS) ); aNewAttr.Put( SvxOrphansItem( 0, SID_ATTR_PARA_ORPHANS) ); 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); diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx index c5f7a3b32f40..fb210c6813a3 100644 --- a/editeng/source/editeng/editattr.hxx +++ b/editeng/source/editeng/editattr.hxx @@ -375,8 +375,8 @@ public: { return !(operator == ( rAttr ) ); } virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE; - Color*& GetTxtColor() { return pTxtColor; } - Color*& GetFldColor() { return pFldColor; } + Color*& GetTextColor() { return pTxtColor; } + Color*& GetFieldColor() { return pFldColor; } const OUString& GetFieldValue() const { return aFieldValue;} void SetFieldValue(const OUString& rVal); diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx index fa1f99af1169..d59654f713e5 100644 --- a/editeng/source/editeng/editdbg.cxx +++ b/editeng/source/editeng/editdbg.cxx @@ -70,9 +70,9 @@ OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem) case EE_PARA_OUTLLRSPACE: case EE_PARA_LRSPACE: aDebStr.append("FI="); - aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetTxtFirstLineOfst())); + aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetTextFirstLineOfst())); aDebStr.append(", LI="); - aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetTxtLeft())); + aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetTextLeft())); aDebStr.append(", RI="); aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetRight())); break; diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index c9fe9755005f..6f447b90f291 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -878,8 +878,8 @@ void ConvertItem( SfxPoolItem& rPoolItem, MapUnit eSourceUnit, MapUnit eDestUnit { DBG_ASSERT( rPoolItem.IsA( TYPE( SvxLRSpaceItem ) ), "ConvertItem: invalid Item!" ); SvxLRSpaceItem& rItem = static_cast<SvxLRSpaceItem&>(rPoolItem); - rItem.SetTxtFirstLineOfst( sal::static_int_cast< short >( OutputDevice::LogicToLogic( rItem.GetTxtFirstLineOfst(), eSourceUnit, eDestUnit ) ) ); - rItem.SetTxtLeft( OutputDevice::LogicToLogic( rItem.GetTxtLeft(), eSourceUnit, eDestUnit ) ); + rItem.SetTextFirstLineOfst( sal::static_int_cast< short >( OutputDevice::LogicToLogic( rItem.GetTextFirstLineOfst(), eSourceUnit, eDestUnit ) ) ); + rItem.SetTextLeft( OutputDevice::LogicToLogic( rItem.GetTextLeft(), eSourceUnit, eDestUnit ) ); rItem.SetRight( OutputDevice::LogicToLogic( rItem.GetRight(), eSourceUnit, eDestUnit ) ); } break; diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 3a356ab28115..a119b58dc8dc 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -1922,11 +1922,11 @@ Point EditEngine::GetDocPosTopLeft( sal_Int32 nParagraph ) else { const SvxLRSpaceItem& rLRItem = pImpEditEngine->GetLRSpaceItem( pPPortion->GetNode() ); -// TL_NF_LR aPoint.X() = pImpEditEngine->GetXValue( (short)(rLRItem.GetTxtLeft() + rLRItem.GetTxtFirstLineOfst()) ); +// TL_NF_LR aPoint.X() = pImpEditEngine->GetXValue( (short)(rLRItem.GetTextLeft() + rLRItem.GetTextFirstLineOfst()) ); sal_Int32 nSpaceBefore = 0; pImpEditEngine->GetSpaceBeforeAndMinLabelWidth( pPPortion->GetNode(), &nSpaceBefore ); - short nX = (short)(rLRItem.GetTxtLeft() - + rLRItem.GetTxtFirstLineOfst() + short nX = (short)(rLRItem.GetTextLeft() + + rLRItem.GetTextFirstLineOfst() + nSpaceBefore); aPoint.X() = pImpEditEngine->GetXValue( nX ); diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index c4f3afca1338..ecee5b62ef22 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -1564,14 +1564,14 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream ) { ContentInfo& rC = aContents[i]; const SvxLRSpaceItem& rLRSpace = static_cast<const SvxLRSpaceItem&>(rC.GetParaAttribs().Get(EE_PARA_LRSPACE)); - if ( rLRSpace.GetTxtLeft() && ( rC.GetParaAttribs().GetItemState( EE_PARA_TABS ) == SfxItemState::SET ) ) + if ( rLRSpace.GetTextLeft() && ( rC.GetParaAttribs().GetItemState( EE_PARA_TABS ) == SfxItemState::SET ) ) { const SvxTabStopItem& rTabs = static_cast<const SvxTabStopItem&>(rC.GetParaAttribs().Get(EE_PARA_TABS)); SvxTabStopItem aNewTabs( 0, 0, SVX_TAB_ADJUST_LEFT, EE_PARA_TABS ); for ( sal_uInt16 t = 0; t < rTabs.Count(); t++ ) { const SvxTabStop& rT = rTabs[ t ]; - aNewTabs.Insert( SvxTabStop( rT.GetTabPos() - rLRSpace.GetTxtLeft(), + aNewTabs.Insert( SvxTabStop( rT.GetTabPos() - rLRSpace.GetTextLeft(), rT.GetAdjustment(), rT.GetDecimal(), rT.GetFill() ) ); } rC.GetParaAttribs().Put( aNewTabs ); diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index bfded820d6fa..87a1f947af28 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -2943,12 +2943,12 @@ bool ImpEditEngine::UpdateFields() rField.Reset(); if ( aStatus.MarkFields() ) - rField.GetFldColor() = new Color( GetColorConfig().GetColorValue( svtools::WRITERFIELDSHADINGS ).nColor ); + rField.GetFieldColor() = new Color( GetColorConfig().GetColorValue( svtools::WRITERFIELDSHADINGS ).nColor ); OUString aFldValue = GetEditEnginePtr()->CalcFieldValue( static_cast<const SvxFieldItem&>(*rField.GetItem()), - nPara, rField.GetStart(), rField.GetTxtColor(), rField.GetFldColor()); + nPara, rField.GetStart(), rField.GetTextColor(), rField.GetFieldColor()); rField.SetFieldValue(aFldValue); if (rField != *pCurrent) @@ -3089,10 +3089,10 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( bool bIgnoreExtraSpace ) // width, here not preferred. I general, it is best not leave it // to StartPosX, also the right indents have to be taken into // account! - nCurWidth = GetXValue( rLRItem.GetTxtLeft() + nSpaceBeforeAndMinLabelWidth ); + nCurWidth = GetXValue( rLRItem.GetTextLeft() + nSpaceBeforeAndMinLabelWidth ); if ( nLine == 0 ) { - long nFI = GetXValue( rLRItem.GetTxtFirstLineOfst() ); + long nFI = GetXValue( rLRItem.GetTextFirstLineOfst() ); nCurWidth -= nFI; if ( pPortion->GetBulletX() > nCurWidth ) { diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 1a8ac4d5918b..fb071e08799e 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -737,10 +737,10 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) sal_Int32 nPortionStart = 0; sal_Int32 nPortionEnd = 0; - long nStartX = GetXValue( rLRItem.GetTxtLeft() + nSpaceBeforeAndMinLabelWidth ); + long nStartX = GetXValue( rLRItem.GetTextLeft() + nSpaceBeforeAndMinLabelWidth ); if ( nIndex == 0 ) { - long nFI = GetXValue( rLRItem.GetTxtFirstLineOfst() ); + long nFI = GetXValue( rLRItem.GetTextFirstLineOfst() ); nStartX += nFI; if ( !nLine && ( pParaPortion->GetBulletX() > nStartX ) ) @@ -907,9 +907,9 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) if ( aStatus.DoStretch() && ( nStretchX != 100 ) ) nCurPos = nCurPos*100/std::max(static_cast<sal_Int32>(nStretchX), static_cast<sal_Int32>(1)); - short nAllSpaceBeforeText = static_cast< short >(rLRItem.GetTxtLeft()/* + rLRItem.GetTxtLeft()*/ + nSpaceBeforeAndMinLabelWidth); - aCurrentTab.aTabStop = pNode->GetContentAttribs().FindTabStop( nCurPos - nAllSpaceBeforeText /*rLRItem.GetTxtLeft()*/, aEditDoc.GetDefTab() ); - aCurrentTab.nTabPos = GetXValue( (long) ( aCurrentTab.aTabStop.GetTabPos() + nAllSpaceBeforeText /*rLRItem.GetTxtLeft()*/ ) ); + short nAllSpaceBeforeText = static_cast< short >(rLRItem.GetTextLeft()/* + rLRItem.GetTextLeft()*/ + nSpaceBeforeAndMinLabelWidth); + aCurrentTab.aTabStop = pNode->GetContentAttribs().FindTabStop( nCurPos - nAllSpaceBeforeText /*rLRItem.GetTextLeft()*/, aEditDoc.GetDefTab() ); + aCurrentTab.nTabPos = GetXValue( (long) ( aCurrentTab.aTabStop.GetTabPos() + nAllSpaceBeforeText /*rLRItem.GetTextLeft()*/ ) ); aCurrentTab.bValid = false; // Switch direction in R2L para... @@ -1577,12 +1577,12 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uIn sal_Int32 nSpaceBeforeAndMinLabelWidth = GetSpaceBeforeAndMinLabelWidth( pParaPortion->GetNode(), &nSpaceBefore ); const SvxLRSpaceItem& rLRItem = GetLRSpaceItem( pParaPortion->GetNode() ); const SvxLineSpacingItem& rLSItem = static_cast<const SvxLineSpacingItem&>(pParaPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL )); - short nStartX = GetXValue( (short)(rLRItem.GetTxtLeft() + rLRItem.GetTxtFirstLineOfst() + nSpaceBefore)); + short nStartX = GetXValue( (short)(rLRItem.GetTextLeft() + rLRItem.GetTextFirstLineOfst() + nSpaceBefore)); Rectangle aBulletArea = Rectangle( Point(), Point() ); if ( bLineBreak ) { - nStartX = (short)GetXValue( rLRItem.GetTxtLeft() + rLRItem.GetTxtFirstLineOfst() + nSpaceBeforeAndMinLabelWidth ); + nStartX = (short)GetXValue( rLRItem.GetTextLeft() + rLRItem.GetTextFirstLineOfst() + nSpaceBeforeAndMinLabelWidth ); } else { @@ -1593,7 +1593,7 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uIn pParaPortion->SetBulletX( 0 ); // If Bullet set incorrectly. if ( pParaPortion->GetBulletX() > nStartX ) { - nStartX = (short)GetXValue( rLRItem.GetTxtLeft() + rLRItem.GetTxtFirstLineOfst() + nSpaceBeforeAndMinLabelWidth ); + nStartX = (short)GetXValue( rLRItem.GetTextLeft() + rLRItem.GetTextFirstLineOfst() + nSpaceBeforeAndMinLabelWidth ); if ( pParaPortion->GetBulletX() > nStartX ) nStartX = pParaPortion->GetBulletX(); } diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 0fb7962a54da..8cd007a3de34 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -723,11 +723,11 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, case EE_PARA_LRSPACE: { rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FI ); - sal_Int32 nTxtFirst = static_cast<const SvxLRSpaceItem&>(rItem).GetTxtFirstLineOfst(); + sal_Int32 nTxtFirst = static_cast<const SvxLRSpaceItem&>(rItem).GetTextFirstLineOfst(); nTxtFirst = LogicToTwips( nTxtFirst ); rOutput.WriteInt32AsString( nTxtFirst ); rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LI ); - sal_uInt32 nTxtLeft = static_cast< sal_uInt32 >(static_cast<const SvxLRSpaceItem&>(rItem).GetTxtLeft()); + sal_uInt32 nTxtLeft = static_cast< sal_uInt32 >(static_cast<const SvxLRSpaceItem&>(rItem).GetTextLeft()); nTxtLeft = (sal_uInt32)LogicToTwips( nTxtLeft ); rOutput.WriteInt32AsString( nTxtLeft ); rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RI ); diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 50db5864bc23..d872838d7250 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -149,8 +149,8 @@ TYPEINIT1_FACTORY(SvxBrushItem, SfxPoolItem, new SvxBrushItem(0)); TYPEINIT1_FACTORY(SvxShadowItem, SfxPoolItem, new SvxShadowItem(0)); TYPEINIT1_FACTORY(SvxBoxItem, SfxPoolItem, new SvxBoxItem(0)); TYPEINIT1_FACTORY(SvxBoxInfoItem, SfxPoolItem, new SvxBoxInfoItem(0)); -TYPEINIT1_FACTORY(SvxFmtBreakItem, SfxEnumItem, new SvxFmtBreakItem(SVX_BREAK_NONE, 0)); -TYPEINIT1_FACTORY(SvxFmtKeepItem, SfxBoolItem, new SvxFmtKeepItem(false, 0)); +TYPEINIT1_FACTORY(SvxFormatBreakItem, SfxEnumItem, new SvxFormatBreakItem(SVX_BREAK_NONE, 0)); +TYPEINIT1_FACTORY(SvxFormatKeepItem, SfxBoolItem, new SvxFormatKeepItem(false, 0)); TYPEINIT1_FACTORY(SvxLineItem, SfxPoolItem, new SvxLineItem(0)); TYPEINIT1_FACTORY(SvxFrameDirectionItem, SfxUInt16Item, new SvxFrameDirectionItem(FRMDIR_HORI_LEFT_TOP, 0)); @@ -496,7 +496,7 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) break; case MID_TXT_LMARGIN : - SetTxtLeft( bConvert ? convertMm100ToTwip(nVal) : nVal ); + SetTextLeft( bConvert ? convertMm100ToTwip(nVal) : nVal ); break; case MID_R_MARGIN: @@ -518,11 +518,11 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } break; case MID_FIRST_LINE_INDENT : - SetTxtFirstLineOfst((short)(bConvert ? convertMm100ToTwip(nVal) : nVal)); + SetTextFirstLineOfst((short)(bConvert ? convertMm100ToTwip(nVal) : nVal)); break; case MID_FIRST_LINE_REL_INDENT: - SetPropTxtFirstLineOfst ( (sal_uInt16)nVal ); + SetPropTextFirstLineOfst ( (sal_uInt16)nVal ); break; case MID_FIRST_AUTO: @@ -557,11 +557,11 @@ bool SvxLRSpaceItem::operator==( const SfxPoolItem& rAttr ) const const SvxLRSpaceItem& rOther = static_cast<const SvxLRSpaceItem&>(rAttr); return ( - nFirstLineOfst == rOther.GetTxtFirstLineOfst() && - nTxtLeft == rOther.GetTxtLeft() && + nFirstLineOfst == rOther.GetTextFirstLineOfst() && + nTxtLeft == rOther.GetTextLeft() && nLeftMargin == rOther.GetLeft() && nRightMargin == rOther.GetRight() && - nPropFirstLineOfst == rOther.GetPropTxtFirstLineOfst() && + nPropFirstLineOfst == rOther.GetPropTextFirstLineOfst() && nPropLeftMargin == rOther.GetPropLeft() && nPropRightMargin == rOther.GetPropRight() && bAutoFirst == rOther.IsAutoFirst() && @@ -673,7 +673,7 @@ bool SvxLRSpaceItem::GetPresentation SvStream& SvxLRSpaceItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const { short nSaveFI = nFirstLineOfst; - const_cast<SvxLRSpaceItem*>(this)->SetTxtFirstLineOfst( 0 ); // nLeftMargin is manipulated together with this, see Create() + const_cast<SvxLRSpaceItem*>(this)->SetTextFirstLineOfst( 0 ); // nLeftMargin is manipulated together with this, see Create() sal_uInt16 nMargin = 0; if( nLeftMargin > 0 ) @@ -713,7 +713,7 @@ SvStream& SvxLRSpaceItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) con } } - const_cast<SvxLRSpaceItem*>(this)->SetTxtFirstLineOfst( nSaveFI ); + const_cast<SvxLRSpaceItem*>(this)->SetTextFirstLineOfst( nSaveFI ); return rStrm; } @@ -1268,7 +1268,7 @@ SvStream& SvxProtectItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) sal_Int8 cProt = 0; if( IsPosProtected() ) cProt |= 0x01; if( IsSizeProtected() ) cProt |= 0x02; - if( IsCntntProtected() ) cProt |= 0x04; + if( IsContentProtected() ) cProt |= 0x04; rStrm.WriteSChar( cProt ); return rStrm; } @@ -1282,7 +1282,7 @@ SfxPoolItem* SvxProtectItem::Create( SvStream& rStrm, sal_uInt16 ) const SvxProtectItem* pAttr = new SvxProtectItem( Which() ); pAttr->SetPosProtect( ( cFlags & 0x01 ) != 0 ); pAttr->SetSizeProtect( ( cFlags & 0x02 ) != 0 ); - pAttr->SetCntntProtect( ( cFlags & 0x04 ) != 0 ); + pAttr->SetContentProtect( ( cFlags & 0x04 ) != 0 ); return pAttr; } @@ -2937,18 +2937,18 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return true; } -// class SvxFmtBreakItem ------------------------------------------------- +// class SvxFormatBreakItem ------------------------------------------------- -bool SvxFmtBreakItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxFormatBreakItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==( rAttr ), "unequal types" ); - return GetValue() == static_cast<const SvxFmtBreakItem&>( rAttr ).GetValue(); + return GetValue() == static_cast<const SvxFormatBreakItem&>( rAttr ).GetValue(); } -bool SvxFmtBreakItem::GetPresentation +bool SvxFormatBreakItem::GetPresentation ( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, @@ -2962,14 +2962,14 @@ bool SvxFmtBreakItem::GetPresentation -OUString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SvxFormatBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < SVX_BREAK_END, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_BREAK_BEGIN + nPos); } -bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const +bool SvxFormatBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { style::BreakType eBreak = style::BreakType_NONE; switch ( (SvxBreak)GetValue() ) @@ -2986,7 +2986,7 @@ bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) cons return true; } -bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) +bool SvxFormatBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { style::BreakType nBreak; @@ -3017,14 +3017,14 @@ bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) -SfxPoolItem* SvxFmtBreakItem::Clone( SfxItemPool* ) const +SfxPoolItem* SvxFormatBreakItem::Clone( SfxItemPool* ) const { - return new SvxFmtBreakItem( *this ); + return new SvxFormatBreakItem( *this ); } -SvStream& SvxFmtBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const +SvStream& SvxFormatBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const { rStrm.WriteSChar( GetValue() ); if( FMTBREAK_NOAUTO > nItemVersion ) @@ -3034,44 +3034,44 @@ SvStream& SvxFmtBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) co -sal_uInt16 SvxFmtBreakItem::GetVersion( sal_uInt16 nFFVer ) const +sal_uInt16 SvxFormatBreakItem::GetVersion( sal_uInt16 nFFVer ) const { DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer || SOFFICE_FILEFORMAT_40==nFFVer || SOFFICE_FILEFORMAT_50==nFFVer, - "SvxFmtBreakItem: Is there a new file format? "); + "SvxFormatBreakItem: Is there a new file format? "); return SOFFICE_FILEFORMAT_31==nFFVer || SOFFICE_FILEFORMAT_40==nFFVer ? 0 : FMTBREAK_NOAUTO; } -SfxPoolItem* SvxFmtBreakItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const +SfxPoolItem* SvxFormatBreakItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const { sal_Int8 eBreak, bDummy; rStrm.ReadSChar( eBreak ); if( FMTBREAK_NOAUTO > nVersion ) rStrm.ReadSChar( bDummy ); - return new SvxFmtBreakItem( (const SvxBreak)eBreak, Which() ); + return new SvxFormatBreakItem( (const SvxBreak)eBreak, Which() ); } -sal_uInt16 SvxFmtBreakItem::GetValueCount() const +sal_uInt16 SvxFormatBreakItem::GetValueCount() const { return SVX_BREAK_END; // SVX_BREAK_PAGE_BOTH + 1 } -// class SvxFmtKeepItem ------------------------------------------------- +// class SvxFormatKeepItem ------------------------------------------------- -SfxPoolItem* SvxFmtKeepItem::Clone( SfxItemPool* ) const +SfxPoolItem* SvxFormatKeepItem::Clone( SfxItemPool* ) const { - return new SvxFmtKeepItem( *this ); + return new SvxFormatKeepItem( *this ); } -SvStream& SvxFmtKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const +SvStream& SvxFormatKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteSChar( (sal_Int8)GetValue() ); return rStrm; @@ -3079,16 +3079,16 @@ SvStream& SvxFmtKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) -SfxPoolItem* SvxFmtKeepItem::Create( SvStream& rStrm, sal_uInt16 ) const +SfxPoolItem* SvxFormatKeepItem::Create( SvStream& rStrm, sal_uInt16 ) const { sal_Int8 bIsKeep; rStrm.ReadSChar( bIsKeep ); - return new SvxFmtKeepItem( bIsKeep != 0, Which() ); + return new SvxFormatKeepItem( bIsKeep != 0, Which() ); } -bool SvxFmtKeepItem::GetPresentation +bool SvxFormatKeepItem::GetPresentation ( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index c78822484e39..6b846e74491f 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -565,7 +565,7 @@ OUString SvxNumberFormat::CreateRomanString( sal_uLong nNo, bool bUpper ) return sRet; } -OUString SvxNumberFormat::GetCharFmtName()const +OUString SvxNumberFormat::GetCharFormatName()const { return sCharStyleName; } diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 758e2480ccda..452704b0d9ff 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -59,7 +59,7 @@ TYPEINIT1_FACTORY(SvxWidowsItem, SfxByteItem, new SvxWidowsItem(0, 0)); TYPEINIT1_FACTORY(SvxOrphansItem, SfxByteItem, new SvxOrphansItem(0, 0)); TYPEINIT1_FACTORY(SvxHyphenZoneItem, SfxPoolItem, new SvxHyphenZoneItem(false, 0)); TYPEINIT1_FACTORY(SvxTabStopItem, SfxPoolItem, new SvxTabStopItem(0)); -TYPEINIT1_FACTORY(SvxFmtSplitItem, SfxBoolItem, new SvxFmtSplitItem(false, 0)); +TYPEINIT1_FACTORY(SvxFormatSplitItem, SfxBoolItem, new SvxFormatSplitItem(false, 0)); TYPEINIT1_FACTORY(SvxPageModelItem, SfxStringItem, new SvxPageModelItem(0)); TYPEINIT1_FACTORY(SvxScriptSpaceItem, SfxBoolItem, new SvxScriptSpaceItem(false, 0)); TYPEINIT1_FACTORY(SvxHangingPunctuationItem, SfxBoolItem, new SvxHangingPunctuationItem(false, 0)); @@ -1208,19 +1208,19 @@ void SvxTabStopItem::Insert( const SvxTabStopItem* pTabs, sal_uInt16 nStart, -// class SvxFmtSplitItem ------------------------------------------------- -SvxFmtSplitItem::~SvxFmtSplitItem() +// class SvxFormatSplitItem ------------------------------------------------- +SvxFormatSplitItem::~SvxFormatSplitItem() { } -SfxPoolItem* SvxFmtSplitItem::Clone( SfxItemPool * ) const +SfxPoolItem* SvxFormatSplitItem::Clone( SfxItemPool * ) const { - return new SvxFmtSplitItem( *this ); + return new SvxFormatSplitItem( *this ); } -SvStream& SvxFmtSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const +SvStream& SvxFormatSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteSChar( (sal_Int8)GetValue() ); return rStrm; @@ -1228,16 +1228,16 @@ SvStream& SvxFmtSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) -SfxPoolItem* SvxFmtSplitItem::Create( SvStream& rStrm, sal_uInt16 ) const +SfxPoolItem* SvxFormatSplitItem::Create( SvStream& rStrm, sal_uInt16 ) const { sal_Int8 bIsSplit; rStrm.ReadSChar( bIsSplit ); - return new SvxFmtSplitItem( bIsSplit != 0, Which() ); + return new SvxFormatSplitItem( bIsSplit != 0, Which() ); } -bool SvxFmtSplitItem::GetPresentation +bool SvxFormatSplitItem::GetPresentation ( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx index da7e9183e4ad..7de20d1eed9d 100644 --- a/editeng/source/items/svxfont.cxx +++ b/editeng/source/items/svxfont.cxx @@ -434,7 +434,7 @@ Size SvxFont::QuickGetTextSize( const OutputDevice *pOut, const OUString &rTxt, } -Size SvxFont::GetTxtSize( const OutputDevice *pOut, const OUString &rTxt, +Size SvxFont::GetTextSize( const OutputDevice *pOut, const OUString &rTxt, const sal_Int32 nIdx, const sal_Int32 nLen ) const { sal_Int32 nTmp = nLen; diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx index 3971ce8d8e74..325e787217dd 100644 --- a/editeng/source/misc/acorrcfg.cxx +++ b/editeng/source/misc/acorrcfg.cxx @@ -398,7 +398,7 @@ void SvxSwAutoCorrCfg::Load(bool bInit) DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aNames.getLength()) { - SvxSwAutoFmtFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags(); + SvxSwAutoFormatFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags(); for(int nProp = 0; nProp < aNames.getLength(); nProp++) { if(pValues[nProp].hasValue()) @@ -461,16 +461,16 @@ void SvxSwAutoCorrCfg::Load(bool bInit) sal::static_int_cast< sal_uInt8 >(nVal); } break; // "Format/Option/CombineValue", - case 23: rSwFlags.bAFmtDelSpacesAtSttEnd = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/DelSpacesAtStartEnd", - case 24: rSwFlags.bAFmtDelSpacesBetweenLines = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/DelSpacesBetween", + case 23: rSwFlags.bAFormatDelSpacesAtSttEnd = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/DelSpacesAtStartEnd", + case 24: rSwFlags.bAFormatDelSpacesBetweenLines = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/DelSpacesBetween", case 25: rParent.bAutoFmtByInput = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/Enable", case 26: rSwFlags.bChgToEnEmDash = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/ChangeDash", case 27: rSwFlags.bSetNumRule = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/ApplyNumbering/Enable", case 28: rSwFlags.bSetBorder = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/ChangeToBorders", case 29: rSwFlags.bCreateTable = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/ChangeToTable", case 30: rSwFlags.bReplaceStyles = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/ReplaceStyle", - case 31: rSwFlags.bAFmtByInpDelSpacesAtSttEnd = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/DelSpacesAtStartEnd", - case 32: rSwFlags.bAFmtByInpDelSpacesBetweenLines = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/DelSpacesBetween", + case 31: rSwFlags.bAFormatByInpDelSpacesAtSttEnd = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/DelSpacesAtStartEnd", + case 32: rSwFlags.bAFormatByInpDelSpacesBetweenLines = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/DelSpacesBetween", case 33: rSwFlags.bAutoCompleteWords = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Completion/Enable", case 34: { @@ -554,7 +554,7 @@ void SvxSwAutoCorrCfg::ImplCommit() const Type& rType = cppu::UnoType<bool>::get(); sal_Bool bVal; - SvxSwAutoFmtFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags(); + SvxSwAutoFormatFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags(); for(int nProp = 0; nProp < aNames.getLength(); nProp++) { switch(nProp) @@ -597,16 +597,16 @@ void SvxSwAutoCorrCfg::ImplCommit() case 22: pValues[nProp] <<= (sal_Int32)rSwFlags.nRightMargin; break; // "Format/Option/CombineValue", - case 23: bVal = rSwFlags.bAFmtDelSpacesAtSttEnd; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/DelSpacesAtStartEnd", - case 24: bVal = rSwFlags.bAFmtDelSpacesBetweenLines; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/DelSpacesBetween", + case 23: bVal = rSwFlags.bAFormatDelSpacesAtSttEnd; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/DelSpacesAtStartEnd", + case 24: bVal = rSwFlags.bAFormatDelSpacesBetweenLines; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/DelSpacesBetween", case 25: bVal = rParent.bAutoFmtByInput; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/Enable", case 26: bVal = rSwFlags.bChgToEnEmDash; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ChangeDash", case 27: bVal = rSwFlags.bSetNumRule; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ApplyNumbering/Enable", case 28: bVal = rSwFlags.bSetBorder; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ChangeToBorders", case 29: bVal = rSwFlags.bCreateTable; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ChangeToTable", case 30: bVal = rSwFlags.bReplaceStyles; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ReplaceStyle", - case 31: bVal = rSwFlags.bAFmtByInpDelSpacesAtSttEnd; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/DelSpacesAtStartEnd", - case 32: bVal = rSwFlags.bAFmtByInpDelSpacesBetweenLines; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/DelSpacesBetween", + case 31: bVal = rSwFlags.bAFormatByInpDelSpacesAtSttEnd; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/DelSpacesAtStartEnd", + case 32: bVal = rSwFlags.bAFormatByInpDelSpacesBetweenLines; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/DelSpacesBetween", case 33: bVal = rSwFlags.bAutoCompleteWords; pValues[nProp].setValue(&bVal, rType); break; // "Completion/Enable", case 34: pValues[nProp] <<= (sal_Int32)rSwFlags.nAutoCmpltWordLen; diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx index 74645ed982c2..31f085c805c1 100644 --- a/editeng/source/misc/swafopt.cxx +++ b/editeng/source/misc/swafopt.cxx @@ -21,7 +21,7 @@ #include <tools/gen.hxx> #include <vcl/keycodes.hxx> -SvxSwAutoFmtFlags::SvxSwAutoFmtFlags() +SvxSwAutoFormatFlags::SvxSwAutoFormatFlags() : aBulletFont( OUString("StarSymbol"), Size( 0, 14 ) ) { @@ -36,10 +36,10 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags() bChgToEnEmDash = bChgWeightUnderl = bSetINetAttr = - bAFmtDelSpacesAtSttEnd = - bAFmtDelSpacesBetweenLines = - bAFmtByInpDelSpacesAtSttEnd = - bAFmtByInpDelSpacesBetweenLines = + bAFormatDelSpacesAtSttEnd = + bAFormatDelSpacesBetweenLines = + bAFormatByInpDelSpacesAtSttEnd = + bAFormatByInpDelSpacesBetweenLines = bDummy = true; bReplaceStyles = @@ -52,7 +52,7 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags() bSetBorder = bCreateTable = bSetNumRule = - bAFmtByInput = + bAFormatByInput = bRightMargin = bAutoCompleteWords = bAutoCmpltCollectWords = @@ -81,7 +81,7 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags() } -SvxSwAutoFmtFlags& SvxSwAutoFmtFlags::operator=( const SvxSwAutoFmtFlags& rAFFlags ) +SvxSwAutoFormatFlags& SvxSwAutoFormatFlags::operator=( const SvxSwAutoFormatFlags& rAFFlags ) { bAutoCorrect = rAFFlags.bAutoCorrect; bCptlSttSntnc = rAFFlags.bCptlSttSntnc; @@ -92,7 +92,7 @@ SvxSwAutoFmtFlags& SvxSwAutoFmtFlags::operator=( const SvxSwAutoFmtFlags& rAFFla bChgEnumNum = rAFFlags.bChgEnumNum; bDelEmptyNode = rAFFlags.bDelEmptyNode; bSetNumRule = rAFFlags.bSetNumRule; - bAFmtByInput = rAFFlags.bAFmtByInput; + bAFormatByInput = rAFFlags.bAFormatByInput; bAddNonBrkSpace = rAFFlags.bAddNonBrkSpace; bChgOrdinalNumber = rAFFlags.bChgOrdinalNumber; @@ -102,10 +102,10 @@ SvxSwAutoFmtFlags& SvxSwAutoFmtFlags::operator=( const SvxSwAutoFmtFlags& rAFFla bSetBorder = rAFFlags.bSetBorder; bCreateTable = rAFFlags.bCreateTable; bReplaceStyles = rAFFlags.bReplaceStyles; - bAFmtDelSpacesAtSttEnd = rAFFlags.bAFmtDelSpacesAtSttEnd; - bAFmtDelSpacesBetweenLines = rAFFlags.bAFmtDelSpacesBetweenLines; - bAFmtByInpDelSpacesAtSttEnd = rAFFlags.bAFmtByInpDelSpacesAtSttEnd; - bAFmtByInpDelSpacesBetweenLines = rAFFlags.bAFmtByInpDelSpacesBetweenLines; + bAFormatDelSpacesAtSttEnd = rAFFlags.bAFormatDelSpacesAtSttEnd; + bAFormatDelSpacesBetweenLines = rAFFlags.bAFormatDelSpacesBetweenLines; + bAFormatByInpDelSpacesAtSttEnd = rAFFlags.bAFormatByInpDelSpacesAtSttEnd; + bAFormatByInpDelSpacesBetweenLines = rAFFlags.bAFormatByInpDelSpacesBetweenLines; bDummy = rAFFlags.bDummy; diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 8f704bb192bf..b573ea1ebd5e 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -679,17 +679,17 @@ OUString Outliner::CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, EditFieldInfo aFldInfo( this, rField, nPara, nPos ); // The FldColor is preset with COL_LIGHTGRAY. if ( rpFldColor ) - aFldInfo.SetFldColor( *rpFldColor ); + aFldInfo.SetFieldColor( *rpFldColor ); aCalcFieldValueHdl.Call( &aFldInfo ); - if ( aFldInfo.GetTxtColor() ) + if ( aFldInfo.GetTextColor() ) { delete rpTxtColor; - rpTxtColor = new Color( *aFldInfo.GetTxtColor() ); + rpTxtColor = new Color( *aFldInfo.GetTextColor() ); } delete rpFldColor; - rpFldColor = aFldInfo.GetFldColor() ? new Color( *aFldInfo.GetFldColor() ) : 0; + rpFldColor = aFldInfo.GetFieldColor() ? new Color( *aFldInfo.GetFieldColor() ) : 0; return aFldInfo.GetRepresentation(); } @@ -1578,9 +1578,9 @@ Rectangle Outliner::ImpCalcBulletArea( sal_Int32 nPara, bool bAdjust, bool bRetu const short nSpaceBefore = pFmt->GetAbsLSpace() + pFmt->GetFirstLineOffset(); const SvxLRSpaceItem& rLR = static_cast<const SvxLRSpaceItem&>( pEditEngine->GetParaAttrib( nPara, bOutlineMode ? EE_PARA_OUTLLRSPACE : EE_PARA_LRSPACE ) ); - aTopLeft.X() = rLR.GetTxtLeft() + rLR.GetTxtFirstLineOfst() + nSpaceBefore; + aTopLeft.X() = rLR.GetTextLeft() + rLR.GetTextFirstLineOfst() + nSpaceBefore; - long nBulletWidth = std::max( (long) -rLR.GetTxtFirstLineOfst(), (long) ((-pFmt->GetFirstLineOffset()) + pFmt->GetCharTextDistance()) ); + long nBulletWidth = std::max( (long) -rLR.GetTextFirstLineOfst(), (long) ((-pFmt->GetFirstLineOffset()) + pFmt->GetCharTextDistance()) ); if ( nBulletWidth < aBulletSize.Width() ) // The Bullet creates its space nBulletWidth = aBulletSize.Width(); diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index fdfda0726f7f..67a574bac6e2 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -303,14 +303,14 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet ) case RTF_KEEP: if( aPardMap.nSplit ) { - pSet->Put( SvxFmtSplitItem( false, aPardMap.nSplit )); + pSet->Put( SvxFormatSplitItem( false, aPardMap.nSplit )); } break; case RTF_KEEPN: if( aPardMap.nKeep ) { - pSet->Put( SvxFmtKeepItem( true, aPardMap.nKeep )); + pSet->Put( SvxFormatKeepItem( true, aPardMap.nKeep )); } break; @@ -358,7 +358,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet ) CalcValue(); nSz = sal_uInt16(nTokenValue); } - aLR.SetTxtFirstLineOfst( nSz ); + aLR.SetTextFirstLineOfst( nSz ); pSet->Put( aLR ); } break; @@ -375,7 +375,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet ) CalcValue(); nSz = sal_uInt16(nTokenValue); } - aLR.SetTxtLeft( nSz ); + aLR.SetTextLeft( nSz ); pSet->Put( aLR ); } break; diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index 552c52a77b27..56ef7368e8fc 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -129,7 +129,7 @@ SvParserState SvxRTFParser::CallParser() sBaseURL.clear(); // generate the correct WhichId table from the set WhichIds. - BuildWhichTbl(); + BuildWhichTable(); return SvRTFParser::CallParser(); } @@ -1089,7 +1089,7 @@ void SvxRTFParser::SetAttrInDoc( SvxRTFItemStackType & ) { } -void SvxRTFParser::BuildWhichTbl() +void SvxRTFParser::BuildWhichTable() { aWhichMap.clear(); aWhichMap.push_back( 0 ); @@ -1097,8 +1097,8 @@ void SvxRTFParser::BuildWhichTbl() // Building a Which-Map 'rWhichMap' from an array of // 'pWhichIds' from Which-Ids. It has the long 'nWhichIds'. // The Which-Map is not going to be deleted. - SvParser::BuildWhichTbl( aWhichMap, reinterpret_cast<sal_uInt16*>(&aPardMap), sizeof(aPardMap) / sizeof(sal_uInt16) ); - SvParser::BuildWhichTbl( aWhichMap, reinterpret_cast<sal_uInt16*>(&aPlainMap), sizeof(aPlainMap) / sizeof(sal_uInt16) ); + SvParser::BuildWhichTable( aWhichMap, reinterpret_cast<sal_uInt16*>(&aPardMap), sizeof(aPardMap) / sizeof(sal_uInt16) ); + SvParser::BuildWhichTable( aWhichMap, reinterpret_cast<sal_uInt16*>(&aPlainMap), sizeof(aPlainMap) / sizeof(sal_uInt16) ); } const SfxItemSet& SvxRTFParser::GetRTFDefaults() diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 506c449d9bed..9e88ceb4a361 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -5460,7 +5460,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt, void SvxMSDffManager::StoreShapeOrder(sal_uLong nId, sal_uLong nTxBx, SdrObject* pObject, - SwFlyFrmFmt* pFly, + SwFlyFrameFormat* pFly, short nHdFtSection) const { sal_uInt16 nShpCnt = pShapeOrders->size(); @@ -5481,7 +5481,7 @@ void SvxMSDffManager::StoreShapeOrder(sal_uLong nId, void SvxMSDffManager::ExchangeInShapeOrder( SdrObject* pOldObject, sal_uLong nTxBx, - SwFlyFrmFmt* pFly, + SwFlyFrameFormat* pFly, SdrObject* pObject) const { sal_uInt16 nShpCnt = pShapeOrders->size(); diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 42f3c2d0b531..4536cda3ad52 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -6094,14 +6094,14 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet, boost::optional< sal_Int16 >& sal_uInt16 nAbsLSpace = (sal_uInt16)( ( (sal_uInt32)_nTextOfs * 2540 ) / 576 ); sal_uInt16 nFirstLineOffset = nAbsLSpace - (sal_uInt16)( ( (sal_uInt32)_nBulletOfs * 2540 ) / 576 ); aLRSpaceItem.SetLeft( nAbsLSpace ); - aLRSpaceItem.SetTxtFirstLineOfstValue( -nFirstLineOffset ); + aLRSpaceItem.SetTextFirstLineOfstValue( -nFirstLineOffset ); rSet.Put( aLRSpaceItem ); } else { SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPACE ); aLRSpaceItem.SetLeft( 0 ); - aLRSpaceItem.SetTxtFirstLineOfstValue( 0 ); + aLRSpaceItem.SetTextFirstLineOfstValue( 0 ); rSet.Put( aLRSpaceItem ); } if ( GetAttrib( PPT_ParaAttr_Adjust, nVal, nDestinationInstance ) ) diff --git a/include/editeng/acorrcfg.hxx b/include/editeng/acorrcfg.hxx index 1a90fb301e7c..e2fd887ad02e 100644 --- a/include/editeng/acorrcfg.hxx +++ b/include/editeng/acorrcfg.hxx @@ -96,8 +96,8 @@ public: // the pointer is transferred to the possession of the ConfigItems! void SetAutoCorrect( SvxAutoCorrect* ); - bool IsAutoFmtByInput() const { return bAutoFmtByInput; } - void SetAutoFmtByInput( bool bSet ) { bAutoFmtByInput = bSet;aSwConfig.SetModified();} + bool IsAutoFormatByInput() const { return bAutoFmtByInput; } + void SetAutoFormatByInput( bool bSet ) { bAutoFmtByInput = bSet;aSwConfig.SetModified();} bool IsSaveRelFile() const { return bFileRel; } void SetSaveRelFile( bool bSet ) { bFileRel = bSet; aSwConfig.SetModified(); } diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx index 65a1bf12cc81..7dee5d66e039 100644 --- a/include/editeng/formatbreakitem.hxx +++ b/include/editeng/formatbreakitem.hxx @@ -24,7 +24,7 @@ #include <editeng/editengdllapi.h> -// class SvxFmtBreakItem ------------------------------------------------- +// class SvxFormatBreakItem ------------------------------------------------- /* [Description] @@ -33,15 +33,15 @@ */ #define FMTBREAK_NOAUTO ((sal_uInt16)0x0001) -class EDITENG_DLLPUBLIC SvxFmtBreakItem : public SfxEnumItem +class EDITENG_DLLPUBLIC SvxFormatBreakItem : public SfxEnumItem { public: TYPEINFO_OVERRIDE(); - inline SvxFmtBreakItem( const SvxBreak eBrk /*= SVX_BREAK_NONE*/, + inline SvxFormatBreakItem( const SvxBreak eBrk /*= SVX_BREAK_NONE*/, const sal_uInt16 nWhich ); - inline SvxFmtBreakItem( const SvxFmtBreakItem& rBreak ); - inline SvxFmtBreakItem& operator=( const SvxFmtBreakItem& rCpy ); + inline SvxFormatBreakItem( const SvxFormatBreakItem& rBreak ); + inline SvxFormatBreakItem& operator=( const SvxFormatBreakItem& rCpy ); // "pure virtual Methods" from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; @@ -69,17 +69,17 @@ public: }; -inline SvxFmtBreakItem::SvxFmtBreakItem( const SvxBreak eBreak, +inline SvxFormatBreakItem::SvxFormatBreakItem( const SvxBreak eBreak, const sal_uInt16 _nWhich ) : SfxEnumItem( _nWhich, (sal_uInt16)eBreak ) {} -inline SvxFmtBreakItem::SvxFmtBreakItem( const SvxFmtBreakItem& rBreak ) : +inline SvxFormatBreakItem::SvxFormatBreakItem( const SvxFormatBreakItem& rBreak ) : SfxEnumItem( rBreak ) {} -inline SvxFmtBreakItem& SvxFmtBreakItem::operator=( - const SvxFmtBreakItem& rBreak ) +inline SvxFormatBreakItem& SvxFormatBreakItem::operator=( + const SvxFormatBreakItem& rBreak ) { SetValue( rBreak.GetValue() ); return *this; diff --git a/include/editeng/keepitem.hxx b/include/editeng/keepitem.hxx index 1092311baeda..4646cf75b919 100644 --- a/include/editeng/keepitem.hxx +++ b/include/editeng/keepitem.hxx @@ -23,21 +23,21 @@ #include <editeng/editengdllapi.h> -// class SvxFmtKeepItem ------------------------------------------------ +// class SvxFormatKeepItem ------------------------------------------------ /* [Description] This item describes a logical variable "keep paragraphs together?". */ -class EDITENG_DLLPUBLIC SvxFmtKeepItem : public SfxBoolItem +class EDITENG_DLLPUBLIC SvxFormatKeepItem : public SfxBoolItem { public: TYPEINFO_OVERRIDE(); - inline SvxFmtKeepItem( const bool bKeep /*= false*/, + inline SvxFormatKeepItem( const bool bKeep /*= false*/, const sal_uInt16 _nWhich ); - inline SvxFmtKeepItem& operator=( const SvxFmtKeepItem& rSplit ); + inline SvxFormatKeepItem& operator=( const SvxFormatKeepItem& rSplit ); // "pure virtual Methods" from SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -50,11 +50,11 @@ public: OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; -inline SvxFmtKeepItem::SvxFmtKeepItem( const bool bKeep, const sal_uInt16 _nWhich ) : +inline SvxFormatKeepItem::SvxFormatKeepItem( const bool bKeep, const sal_uInt16 _nWhich ) : SfxBoolItem( _nWhich, bKeep ) {} -inline SvxFmtKeepItem& SvxFmtKeepItem::operator=( const SvxFmtKeepItem& rKeep ) +inline SvxFormatKeepItem& SvxFormatKeepItem::operator=( const SvxFormatKeepItem& rKeep ) { SetValue( rKeep.GetValue() ); return *this; diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx index 123264e9cd89..4e1b0796bbd6 100644 --- a/include/editeng/lrspitem.hxx +++ b/include/editeng/lrspitem.hxx @@ -36,7 +36,7 @@ 0 coordinate for the first line indent: UI UI LAYOUT UI/TEXT UI/TEXT (Where?) - SetTxtLeft SetTxtFirst GetLeft GetTxtLeft GetTxtFirst (What?) + SetTextLeft SetTxtFirst GetLeft GetTextLeft GetTxtFirst (What?) 500 -500 0 500 -500 (How much?) 500 0 500 500 0 500 +500 500 500 +500 @@ -115,16 +115,16 @@ public: inline sal_uInt16 GetPropRight() const { return nPropRightMargin;} // The UI/text interface: - inline void SetTxtLeft( const long nL, const sal_uInt16 nProp = 100 ); - inline long GetTxtLeft() const { return nTxtLeft; } + inline void SetTextLeft( const long nL, const sal_uInt16 nProp = 100 ); + inline long GetTextLeft() const { return nTxtLeft; } - inline void SetTxtFirstLineOfst( const short nF, const sal_uInt16 nProp = 100 ); - inline short GetTxtFirstLineOfst() const { return nFirstLineOfst; } - inline void SetPropTxtFirstLineOfst( const sal_uInt16 nProp = 100 ) + inline void SetTextFirstLineOfst( const short nF, const sal_uInt16 nProp = 100 ); + inline short GetTextFirstLineOfst() const { return nFirstLineOfst; } + inline void SetPropTextFirstLineOfst( const sal_uInt16 nProp = 100 ) { nPropFirstLineOfst = nProp; } - inline sal_uInt16 GetPropTxtFirstLineOfst() const + inline sal_uInt16 GetPropTextFirstLineOfst() const { return nPropFirstLineOfst; } - inline void SetTxtFirstLineOfstValue( const short nValue ) + inline void SetTextFirstLineOfstValue( const short nValue ) { nFirstLineOfst = nValue; } void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; @@ -159,7 +159,7 @@ inline void SvxLRSpaceItem::SetRight( const long nR, const sal_uInt16 nProp ) nRightMargin = (nR * nProp) / 100; nPropRightMargin = nProp; } -inline void SvxLRSpaceItem::SetTxtFirstLineOfst( const short nF, +inline void SvxLRSpaceItem::SetTextFirstLineOfst( const short nF, const sal_uInt16 nProp ) { nFirstLineOfst = short((long(nF) * nProp ) / 100); @@ -167,7 +167,7 @@ inline void SvxLRSpaceItem::SetTxtFirstLineOfst( const short nF, AdjustLeft(); } -inline void SvxLRSpaceItem::SetTxtLeft( const long nL, const sal_uInt16 nProp ) +inline void SvxLRSpaceItem::SetTextLeft( const long nL, const sal_uInt16 nProp ) { if (0 == nL) { diff --git a/include/editeng/memberids.hrc b/include/editeng/memberids.hrc index 1e9e623a8466..d3768a8237a1 100644 --- a/include/editeng/memberids.hrc +++ b/include/editeng/memberids.hrc @@ -172,7 +172,7 @@ #define MID_BACK_COLOR_TRANSPARENCY 10 #define MID_SHADING_VALUE 11 -//SvxFmtBreakItem +//SvxFormatBreakItem #define MID_BREAK_BEFORE 0 #define MID_BREAK_AFTER 1 diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx index ae7b3150d72c..bcf8b29b054a 100644 --- a/include/editeng/numitem.hxx +++ b/include/editeng/numitem.hxx @@ -71,7 +71,7 @@ public: void SetShowSymbol(bool bSet) {bShowSymbol = bSet;} bool IsShowSymbol()const{return bShowSymbol;} - bool IsTxtFmt() const + bool IsTextFormat() const { return com::sun::star::style::NumberingType::NUMBER_NONE != nNumType && com::sun::star::style::NumberingType::CHAR_SPECIAL != nNumType && @@ -163,8 +163,8 @@ public: void SetSuffix(const OUString& rSet) { sSuffix = rSet;} const OUString& GetSuffix() const { return sSuffix;} - void SetCharFmtName(const OUString& rSet){ sCharStyleName = rSet; } - virtual OUString GetCharFmtName()const; + void SetCharFormatName(const OUString& rSet){ sCharStyleName = rSet; } + virtual OUString GetCharFormatName()const; void SetBulletFont(const vcl::Font* pFont); const vcl::Font* GetBulletFont() const {return pBulletFont;} diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 4b47caeb97ec..5a2dbe9f8cf9 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -524,14 +524,14 @@ public: const SvxFieldItem& GetField() const { return rFldItem; } - Color* GetTxtColor() const { return pTxtColor; } - void SetTxtColor( const Color& rColor ) + Color* GetTextColor() const { return pTxtColor; } + void SetTextColor( const Color& rColor ) { delete pTxtColor; pTxtColor = new Color( rColor ); } - Color* GetFldColor() const { return pFldColor; } - void SetFldColor( const Color& rColor ) + Color* GetFieldColor() const { return pFldColor; } + void SetFieldColor( const Color& rColor ) { delete pFldColor; pFldColor = new Color( rColor ); } - void ClearFldColor() + void ClearFieldColor() { delete pFldColor; pFldColor = 0; } sal_Int32 GetPara() const { return nPara; } diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx index 66fa1a30d1ca..119a8dd3a4ba 100644 --- a/include/editeng/protitem.hxx +++ b/include/editeng/protitem.hxx @@ -57,10 +57,10 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - bool IsCntntProtected() const { return bCntnt; } + bool IsContentProtected() const { return bCntnt; } bool IsSizeProtected() const { return bSize; } bool IsPosProtected() const { return bPos; } - void SetCntntProtect( bool bNew ) { bCntnt = bNew; } + void SetContentProtect( bool bNew ) { bCntnt = bNew; } void SetSizeProtect ( bool bNew ) { bSize = bNew; } void SetPosProtect ( bool bNew ) { bPos = bNew; } @@ -77,7 +77,7 @@ inline SvxProtectItem::SvxProtectItem( const sal_uInt16 nId ) inline SvxProtectItem &SvxProtectItem::operator=( const SvxProtectItem &rCpy ) { - bCntnt = rCpy.IsCntntProtected(); + bCntnt = rCpy.IsContentProtected(); bSize = rCpy.IsSizeProtected(); bPos = rCpy.IsPosProtected(); return *this; diff --git a/include/editeng/spltitem.hxx b/include/editeng/spltitem.hxx index f84ce3b348bc..c5c8b769d8b5 100644 --- a/include/editeng/spltitem.hxx +++ b/include/editeng/spltitem.hxx @@ -24,22 +24,22 @@ class SvXMLUnitConverter; -// class SvxFmtSplitItem ------------------------------------------------- +// class SvxFormatSplitItem ------------------------------------------------- /* [Description] This item describes a logical variable "split paragraph yes or no". */ -class EDITENG_DLLPUBLIC SvxFmtSplitItem : public SfxBoolItem +class EDITENG_DLLPUBLIC SvxFormatSplitItem : public SfxBoolItem { public: TYPEINFO_OVERRIDE(); - virtual ~SvxFmtSplitItem(); + virtual ~SvxFormatSplitItem(); - inline SvxFmtSplitItem( const bool bSplit /*= true*/, + inline SvxFormatSplitItem( const bool bSplit /*= true*/, const sal_uInt16 nWh ); - inline SvxFmtSplitItem& operator=( const SvxFmtSplitItem& rSplit ); + inline SvxFormatSplitItem& operator=( const SvxFormatSplitItem& rSplit ); // "pure virtual Methods" from SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -52,12 +52,12 @@ public: OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; -inline SvxFmtSplitItem::SvxFmtSplitItem( const bool bSplit, const sal_uInt16 nWh ) : +inline SvxFormatSplitItem::SvxFormatSplitItem( const bool bSplit, const sal_uInt16 nWh ) : SfxBoolItem( nWh, bSplit ) {} -inline SvxFmtSplitItem& SvxFmtSplitItem::operator=( - const SvxFmtSplitItem& rSplit ) +inline SvxFormatSplitItem& SvxFormatSplitItem::operator=( + const SvxFormatSplitItem& rSplit ) { SetValue( rSplit.GetValue() ); return *this; diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx index d4438d42d835..18fb82a31315 100644 --- a/include/editeng/svxacorr.hxx +++ b/include/editeng/svxacorr.hxx @@ -232,7 +232,7 @@ class EDITENG_DLLPUBLIC SvxAutoCorrect OUString sShareAutoCorrFile, sUserAutoCorrFile; - SvxSwAutoFmtFlags aSwFlags; // StarWriter AutoFormat Flags + SvxSwAutoFormatFlags aSwFlags; // StarWriter AutoFormat Flags // all languages in a table boost::ptr_map<LanguageTag, SvxAutoCorrectLanguageLists>* pLangTable; @@ -328,7 +328,7 @@ public: // Query/Set the current settings of AutoCorrect long GetFlags() const { return nFlags; } - inline SvxSwAutoFmtFlags& GetSwFlags() { return aSwFlags;} + inline SvxSwAutoFormatFlags& GetSwFlags() { return aSwFlags;} bool IsAutoCorrFlag( long nFlag ) const { return (nFlags & nFlag) != 0; } void SetAutoCorrFlag( long nFlag, bool bOn = true ); diff --git a/include/editeng/svxfont.hxx b/include/editeng/svxfont.hxx index 51a0c0dcdde6..c84df967ac0d 100644 --- a/include/editeng/svxfont.hxx +++ b/include/editeng/svxfont.hxx @@ -89,7 +89,7 @@ public: Size GetPhysTxtSize( const OutputDevice *pOut, const OUString &rTxt ); - Size GetTxtSize( const OutputDevice *pOut, const OUString &rTxt, + Size GetTextSize( const OutputDevice *pOut, const OUString &rTxt, const sal_Int32 nIdx = 0, const sal_Int32 nLen = SAL_MAX_INT32 ) const; void QuickDrawText( OutputDevice *pOut, const Point &rPos, const OUString &rTxt, diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx index 39290ec9f376..42098f663220 100644 --- a/include/editeng/svxrtf.hxx +++ b/include/editeng/svxrtf.hxx @@ -225,7 +225,7 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser // Execute pard / plain void RTFPardPlain( bool bPard, SfxItemSet** ppSet ); - void BuildWhichTbl(); + void BuildWhichTable(); enum RTF_CharTypeDef { diff --git a/include/editeng/swafopt.hxx b/include/editeng/swafopt.hxx index 7bfcb353f3e5..5cf829d94ff8 100644 --- a/include/editeng/swafopt.hxx +++ b/include/editeng/swafopt.hxx @@ -59,7 +59,7 @@ public: } // namespace editeng // Class of options for AutoFormat -struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags +struct EDITENG_DLLPUBLIC SvxSwAutoFormatFlags { vcl::Font aBulletFont; vcl::Font aByInputBulletFont; @@ -83,7 +83,7 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags bool bChgUserColl : 1; bool bChgEnumNum : 1; - bool bAFmtByInput : 1; + bool bAFormatByInput : 1; bool bDelEmptyNode : 1; bool bSetNumRule : 1; @@ -109,10 +109,10 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags bool bAutoCmpltAppendBlanc : 1; bool bAutoCmpltShowAsTip : 1; - bool bAFmtDelSpacesAtSttEnd : 1; - bool bAFmtDelSpacesBetweenLines : 1; - bool bAFmtByInpDelSpacesAtSttEnd : 1; - bool bAFmtByInpDelSpacesBetweenLines : 1; + bool bAFormatDelSpacesAtSttEnd : 1; + bool bAFormatDelSpacesBetweenLines : 1; + bool bAFormatByInpDelSpacesAtSttEnd : 1; + bool bAFormatByInpDelSpacesBetweenLines : 1; bool bAutoCmpltKeepList : 1; @@ -122,9 +122,9 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags bDummy8 : 1 ; - SvxSwAutoFmtFlags(); - SvxSwAutoFmtFlags( const SvxSwAutoFmtFlags& rAFFlags ) { *this = rAFFlags; } - SvxSwAutoFmtFlags& operator=( const SvxSwAutoFmtFlags& ); + SvxSwAutoFormatFlags(); + SvxSwAutoFormatFlags( const SvxSwAutoFormatFlags& rAFFlags ) { *this = rAFFlags; } + SvxSwAutoFormatFlags& operator=( const SvxSwAutoFormatFlags& ); }; #endif diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index fc54adeaba6b..a3572ca48f7b 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -55,7 +55,7 @@ class Polygon; namespace tools { class PolyPolygon; } class FmFormModel; class SdrModel; -class SwFlyFrmFmt; +class SwFlyFrameFormat; struct SvxMSDffBLIPInfo; struct SvxMSDffShapeInfo; @@ -695,12 +695,12 @@ public: void StoreShapeOrder(sal_uLong nId, sal_uLong nTxBx, SdrObject* pObject, - SwFlyFrmFmt* pFly = 0, + SwFlyFrameFormat* pFly = 0, short nHdFtSection = 0) const; void ExchangeInShapeOrder(SdrObject* pOldObject, sal_uLong nTxBx, - SwFlyFrmFmt* pFly, + SwFlyFrameFormat* pFly, SdrObject* pObject) const; void RemoveFromShapeOrder( SdrObject* pObject ) const; @@ -778,7 +778,7 @@ struct SvxMSDffShapeOrder { sal_uLong nShapeId; ///< shape id used in PLCF SPA and in mso_fbtSp (FSP) sal_uLong nTxBxComp; ///< chain or box number in the Text-Box-Story (or NULL) - SwFlyFrmFmt* pFly; ///< format of frame that was inserted as a replacement + SwFlyFrameFormat* pFly; ///< format of frame that was inserted as a replacement ///< for a Sdr-Text object in Writer - needed for ///< chaining! short nHdFtSection; ///< used by Writer to find out if linked frames are in diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index bc553c013966..0127662ebcfb 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.hxx @@ -593,9 +593,9 @@ public: SvNumberFormatterIndexTable* MergeFormatter(SvNumberFormatter& rNewTable); /// Whether a merge table is present or not - bool HasMergeFmtTbl() const; + bool HasMergeFormatTable() const; /// Return the new format index for an old format index, if a merge table exists - sal_uInt32 GetMergeFmtIndex( sal_uInt32 nOldFmt ) const; + sal_uInt32 GetMergeFormatIndex( sal_uInt32 nOldFmt ) const; /** Convert the ugly old tools' Table type bloated with new'ed sal_uInt32 entries merge table to ::std::map with old index key and new index key. diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx index b8705dc16ffc..eabdf18c6807 100644 --- a/include/svtools/svparser.hxx +++ b/include/svtools/svparser.hxx @@ -169,7 +169,7 @@ public: // build a Which-Map 'rWhichMap' from an array of WhichIds // 'pWhichIds'. It has the length 'nWhichIds'. // The WhichMap is not deleted. - static void BuildWhichTbl( std::vector<sal_uInt16> &rWhichMap, + static void BuildWhichTable( std::vector<sal_uInt16> &rWhichMap, sal_uInt16 *pWhichIds, sal_uInt16 nWhichIds ); }; diff --git a/include/svx/clipboardctl.hxx b/include/svx/clipboardctl.hxx index 64ed0d94e832..6b00c35b14fd 100644 --- a/include/svx/clipboardctl.hxx +++ b/include/svx/clipboardctl.hxx @@ -28,7 +28,7 @@ #include <svx/svxdllapi.h> class PopupMenu; -class SvxClipboardFmtItem; +class SvxClipboardFormatItem; class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxClipBoardControl : public SfxToolBoxControl { diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx index e8a9453f2da8..052ed8ffc6e7 100644 --- a/include/svx/clipfmtitem.hxx +++ b/include/svx/clipfmtitem.hxx @@ -24,11 +24,11 @@ #include <svl/poolitem.hxx> #include <svx/svxdllapi.h> -struct SvxClipboardFmtItem_Impl; +struct SvxClipboardFormatItem_Impl; -class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxClipboardFmtItem : public SfxPoolItem +class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxClipboardFormatItem : public SfxPoolItem { - SvxClipboardFmtItem_Impl* pImpl; + SvxClipboardFormatItem_Impl* pImpl; protected: virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; @@ -36,9 +36,9 @@ protected: public: TYPEINFO_OVERRIDE(); - SvxClipboardFmtItem( sal_uInt16 nId = 0 ); - SvxClipboardFmtItem( const SvxClipboardFmtItem& ); - virtual ~SvxClipboardFmtItem(); + SvxClipboardFormatItem( sal_uInt16 nId = 0 ); + SvxClipboardFormatItem( const SvxClipboardFormatItem& ); + virtual ~SvxClipboardFormatItem(); virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx index a448aa120844..06c4af78bfbb 100644 --- a/include/svx/hlnkitem.hxx +++ b/include/svx/hlnkitem.hxx @@ -87,7 +87,7 @@ public: void SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro ); void SetMacroTable( const SvxMacroTableDtor& rTbl ); - const SvxMacroTableDtor* GetMacroTbl() const { return pMacroTable; } + const SvxMacroTableDtor* GetMacroTable() const { return pMacroTable; } void SetMacroEvents (const sal_uInt16 nEvents) { nMacroEvents = nEvents; } sal_uInt16 GetMacroEvents() const { return nMacroEvents; } diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index 9aeee8d1c8c1..68b8072ebfa0 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -48,23 +48,23 @@ public: SvxOptionsGrid(); ~SvxOptionsGrid(); - void SetFldDrawX( sal_uInt32 nSet){nFldDrawX = nSet;} - void SetFldDivisionX(sal_uInt32 nSet){nFldDivisionX = nSet;} - void SetFldDrawY ( sal_uInt32 nSet){nFldDrawY = nSet;} - void SetFldDivisionY(sal_uInt32 nSet){nFldDivisionY = nSet;} - void SetFldSnapX( sal_uInt32 nSet){nFldSnapX = nSet;} - void SetFldSnapY ( sal_uInt32 nSet){nFldSnapY = nSet;} + void SetFieldDrawX( sal_uInt32 nSet){nFldDrawX = nSet;} + void SetFieldDivisionX(sal_uInt32 nSet){nFldDivisionX = nSet;} + void SetFieldDrawY ( sal_uInt32 nSet){nFldDrawY = nSet;} + void SetFieldDivisionY(sal_uInt32 nSet){nFldDivisionY = nSet;} + void SetFieldSnapX( sal_uInt32 nSet){nFldSnapX = nSet;} + void SetFieldSnapY ( sal_uInt32 nSet){nFldSnapY = nSet;} void SetUseGridSnap( bool bSet ) {bUseGridsnap = bSet;} void SetSynchronize( bool bSet ) {bSynchronize = bSet;} void SetGridVisible( bool bSet ) {bGridVisible = bSet;} void SetEqualGrid( bool bSet ) {bEqualGrid = bSet;} - sal_uInt32 GetFldDrawX( ) const { return nFldDrawX; } - sal_uInt32 GetFldDivisionX() const { return nFldDivisionX;} - sal_uInt32 GetFldDrawY ( ) const { return nFldDrawY; } - sal_uInt32 GetFldDivisionY() const { return nFldDivisionY;} - sal_uInt32 GetFldSnapX( ) const { return nFldSnapX; } - sal_uInt32 GetFldSnapY ( ) const { return nFldSnapY; } + sal_uInt32 GetFieldDrawX( ) const { return nFldDrawX; } + sal_uInt32 GetFieldDivisionX() const { return nFldDivisionX;} + sal_uInt32 GetFieldDrawY ( ) const { return nFldDrawY; } + sal_uInt32 GetFieldDivisionY() const { return nFldDivisionY;} + sal_uInt32 GetFieldSnapX( ) const { return nFldSnapX; } + sal_uInt32 GetFieldSnapY ( ) const { return nFldSnapY; } bool GetUseGridSnap( ) const { return bUseGridsnap; } bool GetSynchronize( ) const { return bSynchronize; } bool GetGridVisible( ) const { return bGridVisible; } diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index 32f6223c8976..f1c529ad2064 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -178,12 +178,12 @@ SvxGridItem* ScViewOptions::CreateGridItem( sal_uInt16 nId /* = SID_ATTR_GRID_OP { SvxGridItem* pItem = new SvxGridItem( nId ); - pItem->SetFldDrawX ( aGridOpt.GetFldDrawX() ); - pItem->SetFldDivisionX ( aGridOpt.GetFldDivisionX() ); - pItem->SetFldDrawY ( aGridOpt.GetFldDrawY() ); - pItem->SetFldDivisionY ( aGridOpt.GetFldDivisionY() ); - pItem->SetFldSnapX ( aGridOpt.GetFldSnapX() ); - pItem->SetFldSnapY ( aGridOpt.GetFldSnapY() ); + pItem->SetFieldDrawX ( aGridOpt.GetFieldDrawX() ); + pItem->SetFieldDivisionX ( aGridOpt.GetFieldDivisionX() ); + pItem->SetFieldDrawY ( aGridOpt.GetFieldDrawY() ); + pItem->SetFieldDivisionY ( aGridOpt.GetFieldDivisionY() ); + pItem->SetFieldSnapX ( aGridOpt.GetFieldSnapX() ); + pItem->SetFieldSnapY ( aGridOpt.GetFieldSnapY() ); pItem->SetUseGridSnap ( aGridOpt.GetUseGridSnap() ); pItem->SetSynchronize ( aGridOpt.GetSynchronize() ); pItem->SetGridVisible ( aGridOpt.GetGridVisible() ); @@ -483,22 +483,22 @@ ScViewCfg::ScViewCfg() : switch(nProp) { case SCGRIDOPT_RESOLU_X: - if (pValues[nProp] >>= nIntVal) aGrid.SetFldDrawX( nIntVal ); + if (pValues[nProp] >>= nIntVal) aGrid.SetFieldDrawX( nIntVal ); break; case SCGRIDOPT_RESOLU_Y: - if (pValues[nProp] >>= nIntVal) aGrid.SetFldDrawY( nIntVal ); + if (pValues[nProp] >>= nIntVal) aGrid.SetFieldDrawY( nIntVal ); break; case SCGRIDOPT_SUBDIV_X: - if (pValues[nProp] >>= nIntVal) aGrid.SetFldDivisionX( nIntVal ); + if (pValues[nProp] >>= nIntVal) aGrid.SetFieldDivisionX( nIntVal ); break; case SCGRIDOPT_SUBDIV_Y: - if (pValues[nProp] >>= nIntVal) aGrid.SetFldDivisionY( nIntVal ); + if (pValues[nProp] >>= nIntVal) aGrid.SetFieldDivisionY( nIntVal ); break; case SCGRIDOPT_OPTION_X: - if (pValues[nProp] >>= nIntVal) aGrid.SetFldSnapX( nIntVal ); + if (pValues[nProp] >>= nIntVal) aGrid.SetFieldSnapX( nIntVal ); break; case SCGRIDOPT_OPTION_Y: - if (pValues[nProp] >>= nIntVal) aGrid.SetFldSnapY( nIntVal ); + if (pValues[nProp] >>= nIntVal) aGrid.SetFieldSnapY( nIntVal ); break; case SCGRIDOPT_SNAPTOGRID: aGrid.SetUseGridSnap( ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); @@ -624,22 +624,22 @@ IMPL_LINK_NOARG(ScViewCfg, GridCommitHdl) switch(nProp) { case SCGRIDOPT_RESOLU_X: - pValues[nProp] <<= (sal_Int32) rGrid.GetFldDrawX(); + pValues[nProp] <<= (sal_Int32) rGrid.GetFieldDrawX(); break; case SCGRIDOPT_RESOLU_Y: - pValues[nProp] <<= (sal_Int32) rGrid.GetFldDrawY(); + pValues[nProp] <<= (sal_Int32) rGrid.GetFieldDrawY(); break; case SCGRIDOPT_SUBDIV_X: - pValues[nProp] <<= (sal_Int32) rGrid.GetFldDivisionX(); + pValues[nProp] <<= (sal_Int32) rGrid.GetFieldDivisionX(); break; case SCGRIDOPT_SUBDIV_Y: - pValues[nProp] <<= (sal_Int32) rGrid.GetFldDivisionY(); + pValues[nProp] <<= (sal_Int32) rGrid.GetFieldDivisionY(); break; case SCGRIDOPT_OPTION_X: - pValues[nProp] <<= (sal_Int32) rGrid.GetFldSnapX(); + pValues[nProp] <<= (sal_Int32) rGrid.GetFieldSnapX(); break; case SCGRIDOPT_OPTION_Y: - pValues[nProp] <<= (sal_Int32) rGrid.GetFldSnapY(); + pValues[nProp] <<= (sal_Int32) rGrid.GetFieldSnapY(); break; case SCGRIDOPT_SNAPTOGRID: ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], rGrid.GetUseGridSnap() ); diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index f2b7b1bbffbb..c135b531975a 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -2172,7 +2172,7 @@ IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo ) svtools::ColorConfigEntry eEntry = INetURLHistory::GetOrCreate()->QueryUrl( aURL ) ? svtools::LINKSVISITED : svtools::LINKS; - pInfo->SetTxtColor( GetColorConfig().GetColorValue(eEntry).nColor ); + pInfo->SetTextColor( GetColorConfig().GetColorValue(eEntry).nColor ); } else { diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx index 973d63f1c907..171e4c3980ee 100644 --- a/sc/source/ui/app/typemap.cxx +++ b/sc/source/ui/app/typemap.cxx @@ -111,7 +111,7 @@ #define aSfxUInt32Item_Impl sc_source_ui_appl_typemap_aSfxUInt32Item_Impl #define aSfxVoidItem_Impl sc_source_ui_appl_typemap_aSfxVoidItem_Impl #define aSvxCharReliefItem_Impl sc_source_ui_appl_typemap_aSvxCharReliefItem_Impl -#define aSvxClipboardFmtItem_Impl sc_source_ui_appl_typemap_aSvxClipboardFmtItem_Impl +#define aSvxClipboardFormatItem_Impl sc_source_ui_appl_typemap_aSvxClipboardFormatItem_Impl #define aSvxColorItem_Impl sc_source_ui_appl_typemap_aSvxColorItem_Impl #define aSvxContourItem_Impl sc_source_ui_appl_typemap_aSvxContourItem_Impl #define aSvxCrossedOutItem_Impl sc_source_ui_appl_typemap_aSvxCrossedOutItem_Impl @@ -136,7 +136,7 @@ #undef aSfxUInt32Item_Impl #undef aSfxVoidItem_Impl #undef aSvxCharReliefItem_Impl -#undef aSvxClipboardFmtItem_Impl +#undef aSvxClipboardFormatItem_Impl #undef aSvxColorItem_Impl #undef aSvxContourItem_Impl #undef aSvxCrossedOutItem_Impl diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index ce261fb3aa8f..ae5bb94123e1 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -524,7 +524,7 @@ void ScDrawTextObjectBar::GetClipState( SfxItemSet& rSet ) case SID_CLIPBOARD_FORMAT_ITEMS: if ( bPastePossible ) { - SvxClipboardFmtItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS ); + SvxClipboardFormatItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS ); TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pViewData->GetActiveWin() ) ); @@ -913,8 +913,8 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq ) SfxItemSet aAttr( GetPool(), EE_PARA_LRSPACE, EE_PARA_LRSPACE ); nId = EE_PARA_LRSPACE; SvxLRSpaceItem aLRSpaceItem( rItem.GetLeft(), - rItem.GetRight(), rItem.GetTxtLeft(), - rItem.GetTxtFirstLineOfst(), nId ); + rItem.GetRight(), rItem.GetTextLeft(), + rItem.GetTextFirstLineOfst(), nId ); aAttr.Put( aLRSpaceItem ); pView->SetAttributes( aAttr ); } diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx index a2e6a82ebde9..1c03ba30758d 100644 --- a/sc/source/ui/drawfunc/drtxtob1.cxx +++ b/sc/source/ui/drawfunc/drtxtob1.cxx @@ -86,8 +86,8 @@ bool ScDrawTextObjectBar::ExecuteParaDlg( const SfxItemSet& rArgs, // aNewAttr.Put( SvxParaDlgLimitsItem( 567 * 50, 5670) ); aNewAttr.Put( SvxHyphenZoneItem( false, SID_ATTR_PARA_HYPHENZONE ) ); - aNewAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, SID_ATTR_PARA_PAGEBREAK ) ); - aNewAttr.Put( SvxFmtSplitItem( true, SID_ATTR_PARA_SPLIT) ); + aNewAttr.Put( SvxFormatBreakItem( SVX_BREAK_NONE, SID_ATTR_PARA_PAGEBREAK ) ); + aNewAttr.Put( SvxFormatSplitItem( true, SID_ATTR_PARA_SPLIT) ); aNewAttr.Put( SvxWidowsItem( 0, SID_ATTR_PARA_WIDOWS) ); aNewAttr.Put( SvxOrphansItem( 0, SID_ATTR_PARA_ORPHANS) ); diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx index 3beb0784296a..6e03ef1e5d0c 100644 --- a/sc/source/ui/inc/cellsh.hxx +++ b/sc/source/ui/inc/cellsh.hxx @@ -29,7 +29,7 @@ #include "formatsh.hxx" #include "address.hxx" -class SvxClipboardFmtItem; +class SvxClipboardFormatItem; class TransferableDataHelper; class TransferableClipboardListener; class AbstractScLinkedAreaDlg; @@ -52,7 +52,7 @@ private: CellShell_Impl* pImpl; bool bPastePossible; - void GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats ); + void GetPossibleClipboardFormats( SvxClipboardFormatItem& rFormats ); void ExecuteExternalSource( const OUString& _rFile, const OUString& _rFilter, const OUString& _rOptions, const OUString& _rSource, sal_uLong _nRefresh, SfxRequest& _rRequest ); diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index 728d17c5f8fd..a56c36f8293f 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -306,13 +306,13 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue( else if ( aPropertyName == SC_UNO_RASTERVIS ) aGridOpt.SetGridVisible( ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNO_RASTERRESX ) - aGridOpt.SetFldDrawX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) ); + aGridOpt.SetFieldDrawX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) ); else if ( aPropertyName == SC_UNO_RASTERRESY ) - aGridOpt.SetFldDrawY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) ); + aGridOpt.SetFieldDrawY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) ); else if ( aPropertyName == SC_UNO_RASTERSUBX ) - aGridOpt.SetFldDivisionX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) ); + aGridOpt.SetFieldDivisionX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) ); else if ( aPropertyName == SC_UNO_RASTERSUBY ) - aGridOpt.SetFldDivisionY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) ); + aGridOpt.SetFieldDivisionY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) ); else if ( aPropertyName == SC_UNO_RASTERSYNC ) aGridOpt.SetSynchronize( ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else @@ -442,13 +442,13 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPr else if ( aPropertyName == SC_UNO_RASTERVIS ) ScUnoHelpFunctions::SetBoolInAny( aRet, aGridOpt.GetGridVisible() ); else if ( aPropertyName == SC_UNO_RASTERRESX ) - aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFldDrawX() ); + aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDrawX() ); else if ( aPropertyName == SC_UNO_RASTERRESY ) - aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFldDrawY() ); + aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDrawY() ); else if ( aPropertyName == SC_UNO_RASTERSUBX ) - aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFldDivisionX() ); + aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDivisionX() ); else if ( aPropertyName == SC_UNO_RASTERSUBY ) - aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFldDivisionY() ); + aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDivisionY() ); else if ( aPropertyName == SC_UNO_RASTERSYNC ) ScUnoHelpFunctions::SetBoolInAny( aRet, aGridOpt.GetSynchronize() ); else diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index b8627ba945c1..aba13687fb3f 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -365,7 +365,7 @@ void ScCellShell::GetCellState( SfxItemSet& rSet ) } } -static bool lcl_TestFormat( SvxClipboardFmtItem& rFormats, const TransferableDataHelper& rDataHelper, +static bool lcl_TestFormat( SvxClipboardFormatItem& rFormats, const TransferableDataHelper& rDataHelper, SotClipboardFormatId nFormatId ) { if ( rDataHelper.HasFormat( nFormatId ) ) @@ -399,7 +399,7 @@ static bool lcl_TestFormat( SvxClipboardFmtItem& rFormats, const TransferableDat return false; } -void ScCellShell::GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats ) +void ScCellShell::GetPossibleClipboardFormats( SvxClipboardFormatItem& rFormats ) { vcl::Window* pWin = GetViewData()->GetActiveWin(); bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL ); @@ -569,7 +569,7 @@ void ScCellShell::GetClipState( SfxItemSet& rSet ) } else if ( rSet.GetItemState( SID_CLIPBOARD_FORMAT_ITEMS ) != SfxItemState::UNKNOWN ) { - SvxClipboardFmtItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS ); + SvxClipboardFormatItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS ); GetPossibleClipboardFormats( aFormats ); rSet.Put( aFormats ); } diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 1b81de7c4eb7..6fd0e5074493 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -1564,7 +1564,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL ); - SvxClipboardFmtItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS ); + SvxClipboardFormatItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS ); GetPossibleClipboardFormats( aFormats ); sal_uInt16 nFormatCount = aFormats.Count(); diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 94b89305b738..2c258c6e7662 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -612,13 +612,13 @@ void ScDrawView::UpdateUserViewOptions() SetSnapEnabled( rGrid.GetUseGridSnap() ); SetGridSnap( rGrid.GetUseGridSnap() ); - Fraction aFractX( rGrid.GetFldDrawX(), rGrid.GetFldDivisionX() + 1 ); - Fraction aFractY( rGrid.GetFldDrawY(), rGrid.GetFldDivisionY() + 1 ); + Fraction aFractX( rGrid.GetFieldDrawX(), rGrid.GetFieldDivisionX() + 1 ); + Fraction aFractY( rGrid.GetFieldDrawY(), rGrid.GetFieldDivisionY() + 1 ); SetSnapGridWidth( aFractX, aFractY ); - SetGridCoarse( Size( rGrid.GetFldDrawX(), rGrid.GetFldDrawY() ) ); - SetGridFine( Size( rGrid.GetFldDrawX() / (rGrid.GetFldDivisionX() + 1), - rGrid.GetFldDrawY() / (rGrid.GetFldDivisionY() + 1) ) ); + SetGridCoarse( Size( rGrid.GetFieldDrawX(), rGrid.GetFieldDrawY() ) ); + SetGridFine( Size( rGrid.GetFieldDrawX() / (rGrid.GetFieldDivisionX() + 1), + rGrid.GetFieldDrawY() / (rGrid.GetFieldDivisionY() + 1) ) ); } } diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 763157ff21bf..ea1a91265caa 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -801,7 +801,7 @@ void ScEditShell::GetClipState( SfxItemSet& rSet ) case SID_CLIPBOARD_FORMAT_ITEMS: if( bPastePossible ) { - SvxClipboardFmtItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS ); + SvxClipboardFormatItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS ); TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pViewData->GetActiveWin() ) ); diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index a2872ba3ca5a..22d46dcd7f05 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -2722,13 +2722,13 @@ void ScViewData::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSe pSettings[SC_RASTERVIS].Name = SC_UNO_RASTERVIS; ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_RASTERVIS].Value, aGridOpt.GetGridVisible() ); pSettings[SC_RASTERRESX].Name = SC_UNO_RASTERRESX; - pSettings[SC_RASTERRESX].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDrawX() ); + pSettings[SC_RASTERRESX].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDrawX() ); pSettings[SC_RASTERRESY].Name = SC_UNO_RASTERRESY; - pSettings[SC_RASTERRESY].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDrawY() ); + pSettings[SC_RASTERRESY].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDrawY() ); pSettings[SC_RASTERSUBX].Name = SC_UNO_RASTERSUBX; - pSettings[SC_RASTERSUBX].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDivisionX() ); + pSettings[SC_RASTERSUBX].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDivisionX() ); pSettings[SC_RASTERSUBY].Name = SC_UNO_RASTERSUBY; - pSettings[SC_RASTERSUBY].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDivisionY() ); + pSettings[SC_RASTERSUBY].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDivisionY() ); pSettings[SC_RASTERSYNC].Name = SC_UNO_RASTERSYNC; ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_RASTERSYNC].Value, aGridOpt.GetSynchronize() ); } @@ -2878,13 +2878,13 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue> else if ( sName == SC_UNO_RASTERVIS ) aGridOpt.SetGridVisible( ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) ); else if ( sName == SC_UNO_RASTERRESX ) - aGridOpt.SetFldDrawX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) ); + aGridOpt.SetFieldDrawX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) ); else if ( sName == SC_UNO_RASTERRESY ) - aGridOpt.SetFldDrawY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) ); + aGridOpt.SetFieldDrawY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) ); else if ( sName == SC_UNO_RASTERSUBX ) - aGridOpt.SetFldDivisionX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) ); + aGridOpt.SetFieldDivisionX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) ); else if ( sName == SC_UNO_RASTERSUBY ) - aGridOpt.SetFldDivisionY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) ); + aGridOpt.SetFieldDivisionY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) ); else if ( sName == SC_UNO_RASTERSYNC ) aGridOpt.SetSynchronize( ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) ); pOptions->SetGridOptions(aGridOpt); diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 2b26fda54c1e..b9b4558adf4f 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -356,7 +356,7 @@ void SdDrawDocument::CreateLayoutTemplates() pISet->Put(XFillStyleItem(drawing::FillStyle_NONE)); SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPACE ); - aLRSpaceItem.SetTxtFirstLineOfst(600); // Indentation of first line: 6mm; right: 0 + aLRSpaceItem.SetTextFirstLineOfst(600); // Indentation of first line: 6mm; right: 0 pISet->Put(aLRSpaceItem); // Title diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 3c8e33b0958a..5a8de34029fe 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -2164,7 +2164,7 @@ SdrObject* convertPresentationObjectImpl(SdPage& rPage, SdrObject* pSourceObj, P const SvxLRSpaceItem& rLRItem = static_cast<const SvxLRSpaceItem&>( aSet.Get(EE_PARA_LRSPACE) ); SvxLRSpaceItem aNewLRItem(rLRItem); - aNewLRItem.SetTxtLeft(0); + aNewLRItem.SetTextLeft(0); aSet.Put(aNewLRItem); pNewObj->SetMergedItemSet(aSet); diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 944c77ebb2d3..f4eee3948da8 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -417,7 +417,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool rSubtitleSet.Put( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) ); // #i16874# enable kerning by default but only for new documents rSubtitleSet.Put( SvxAutoKernItem( true, EE_CHAR_PAIRKERNING ) ); - aSvxLRSpaceItem.SetTxtLeft(0); + aSvxLRSpaceItem.SetTextLeft(0); rSubtitleSet.Put(aSvxLRSpaceItem); vcl::Font aTmpFont( GetBulletFont() ); diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 223f4c39e41d..a3b018cddec7 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -576,11 +576,11 @@ void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, bool bOnlyMissingItems) if (rSet.GetItemState(EE_PARA_LRSPACE) != SfxItemState::SET || !bOnlyMissingItems) { const SvxLRSpaceItem& rLRItem = static_cast<const SvxLRSpaceItem&>(pCurSet->Get(EE_PARA_LRSPACE)); - double fIndentFraction = double(rLRItem.GetTxtLeft()) / nOldHeight; + double fIndentFraction = double(rLRItem.GetTextLeft()) / nOldHeight; SvxLRSpaceItem aNewLRItem(rLRItem); - aNewLRItem.SetTxtLeft(fIndentFraction * nNewHeight); - double fFirstIndentFraction = double(rLRItem.GetTxtFirstLineOfst()) / nOldHeight; - aNewLRItem.SetTxtFirstLineOfst((short)(fFirstIndentFraction * nNewHeight)); + aNewLRItem.SetTextLeft(fIndentFraction * nNewHeight); + double fFirstIndentFraction = double(rLRItem.GetTextFirstLineOfst()) / nOldHeight; + aNewLRItem.SetTextFirstLineOfst((short)(fFirstIndentFraction * nNewHeight)); rSet.Put(aNewLRItem); } diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx index fa6dd6c3a4cb..46a986dee476 100644 --- a/sd/source/filter/xml/sdtransform.cxx +++ b/sd/source/filter/xml/sdtransform.cxx @@ -299,10 +299,10 @@ bool SdTransformOOo2xDocument::transformItemSet( SfxItemSet& rSet, bool bNumberi if( bNumbering ) { SvxLRSpaceItem aItem( *static_cast<const SvxLRSpaceItem*>(rSet.GetItem( EE_PARA_LRSPACE )) ); - if( (aItem.GetLeft() != 0) || (aItem.GetTxtFirstLineOfst() != 0) ) + if( (aItem.GetLeft() != 0) || (aItem.GetTextFirstLineOfst() != 0) ) { aItem.SetLeftValue( 0 ); - aItem.SetTxtFirstLineOfst( 0 ); + aItem.SetTextFirstLineOfst( 0 ); rSet.Put( aItem ); bRet = true; } diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index f16a6af69c9e..4e8ef7296313 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -992,12 +992,12 @@ void SdOptionsGrid::SetDefaults() { const sal_uInt32 nVal = 1000; - SetFldDivisionX( nVal ); - SetFldDivisionY( nVal ); - SetFldDrawX( nVal ); - SetFldDrawY( nVal ); - SetFldSnapX( nVal ); - SetFldSnapY( nVal ); + SetFieldDivisionX( nVal ); + SetFieldDivisionY( nVal ); + SetFieldDrawX( nVal ); + SetFieldDrawY( nVal ); + SetFieldSnapX( nVal ); + SetFieldSnapY( nVal ); SetUseGridSnap( false ); SetSynchronize( true ); SetGridVisible( false ); @@ -1006,12 +1006,12 @@ void SdOptionsGrid::SetDefaults() bool SdOptionsGrid::operator==( const SdOptionsGrid& rOpt ) const { - return( GetFldDrawX() == rOpt.GetFldDrawX() && - GetFldDivisionX() == rOpt.GetFldDivisionX() && - GetFldDrawY() == rOpt.GetFldDrawY() && - GetFldDivisionY() == rOpt.GetFldDivisionY() && - GetFldSnapX() == rOpt.GetFldSnapX() && - GetFldSnapY() == rOpt.GetFldSnapY() && + return( GetFieldDrawX() == rOpt.GetFieldDrawX() && + GetFieldDivisionX() == rOpt.GetFieldDivisionX() && + GetFieldDrawY() == rOpt.GetFieldDrawY() && + GetFieldDivisionY() == rOpt.GetFieldDivisionY() && + GetFieldSnapX() == rOpt.GetFieldSnapX() && + GetFieldSnapY() == rOpt.GetFieldSnapY() && IsUseGridSnap() == rOpt.IsUseGridSnap() && IsSynchronize() == rOpt.IsSynchronize() && IsGridVisible() == rOpt.IsGridVisible() && @@ -1060,23 +1060,23 @@ void SdOptionsGrid::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) bool SdOptionsGrid::ReadData( const Any* pValues ) { - if( pValues[0].hasValue() ) SetFldDrawX( *static_cast<sal_Int32 const *>(pValues[ 0 ].getValue()) ); - if( pValues[1].hasValue() ) SetFldDrawY( *static_cast<sal_Int32 const *>(pValues[ 1 ].getValue()) ); + if( pValues[0].hasValue() ) SetFieldDrawX( *static_cast<sal_Int32 const *>(pValues[ 0 ].getValue()) ); + if( pValues[1].hasValue() ) SetFieldDrawY( *static_cast<sal_Int32 const *>(pValues[ 1 ].getValue()) ); if( pValues[2].hasValue() ) { const sal_uInt32 nDivX = FRound( *static_cast<double const *>(pValues[ 2 ].getValue()) ); - SetFldDivisionX( SvxOptionsGrid::GetFldDrawX() / ( nDivX + 1 ) ); + SetFieldDivisionX( SvxOptionsGrid::GetFieldDrawX() / ( nDivX + 1 ) ); } if( pValues[3].hasValue() ) { const sal_uInt32 nDivY = FRound( *static_cast<double const *>(pValues[ 3 ].getValue()) ); - SetFldDivisionY( SvxOptionsGrid::GetFldDrawY() / ( nDivY + 1 ) ); + SetFieldDivisionY( SvxOptionsGrid::GetFieldDrawY() / ( nDivY + 1 ) ); } - if( pValues[4].hasValue() ) SetFldSnapX( *static_cast<sal_Int32 const *>(pValues[ 4 ].getValue()) ); - if( pValues[5].hasValue() ) SetFldSnapY( *static_cast<sal_Int32 const *>(pValues[ 5 ].getValue()) ); + if( pValues[4].hasValue() ) SetFieldSnapX( *static_cast<sal_Int32 const *>(pValues[ 4 ].getValue()) ); + if( pValues[5].hasValue() ) SetFieldSnapY( *static_cast<sal_Int32 const *>(pValues[ 5 ].getValue()) ); if( pValues[6].hasValue() ) SetUseGridSnap( *static_cast<sal_Bool const *>(pValues[ 6 ].getValue()) ); if( pValues[7].hasValue() ) SetSynchronize( *static_cast<sal_Bool const *>(pValues[ 7 ].getValue()) ); if( pValues[8].hasValue() ) SetGridVisible( *static_cast<sal_Bool const *>(pValues[ 8 ].getValue()) ); @@ -1087,12 +1087,12 @@ bool SdOptionsGrid::ReadData( const Any* pValues ) bool SdOptionsGrid::WriteData( Any* pValues ) const { - pValues[ 0 ] <<= (sal_Int32) GetFldDrawX(); - pValues[ 1 ] <<= (sal_Int32) GetFldDrawY(); - pValues[ 2 ] <<= ( GetFldDivisionX() ? ( (double) GetFldDrawX() / GetFldDivisionX() - 1.0 ) : (double) 0 ); - pValues[ 3 ] <<= ( GetFldDivisionY() ? ( (double) GetFldDrawY() / GetFldDivisionY() - 1.0 ) : (double) 0 ); - pValues[ 4 ] <<= (sal_Int32) GetFldSnapX(); - pValues[ 5 ] <<= (sal_Int32) GetFldSnapY(); + pValues[ 0 ] <<= (sal_Int32) GetFieldDrawX(); + pValues[ 1 ] <<= (sal_Int32) GetFieldDrawY(); + pValues[ 2 ] <<= ( GetFieldDivisionX() ? ( (double) GetFieldDrawX() / GetFieldDivisionX() - 1.0 ) : (double) 0 ); + pValues[ 3 ] <<= ( GetFieldDivisionY() ? ( (double) GetFieldDrawY() / GetFieldDivisionY() - 1.0 ) : (double) 0 ); + pValues[ 4 ] <<= (sal_Int32) GetFieldSnapX(); + pValues[ 5 ] <<= (sal_Int32) GetFieldSnapY(); pValues[ 6 ] <<= IsUseGridSnap(); pValues[ 7 ] <<= IsSynchronize(); pValues[ 8 ] <<= IsGridVisible(); @@ -1115,23 +1115,23 @@ SdOptionsGridItem::SdOptionsGridItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd if( pView ) { - SetFldDrawX( pView->GetGridCoarse().Width() ); - SetFldDrawY( pView->GetGridCoarse().Height() ); - SetFldDivisionX( pView->GetGridFine().Width() ? ( GetFldDrawX() / pView->GetGridFine().Width() - 1 ) : 0 ); - SetFldDivisionY( pView->GetGridFine().Height() ? ( GetFldDrawY() / pView->GetGridFine().Height() - 1 ) : 0 ); - SetFldSnapX( long(pView->GetSnapGridWidthX()) ); - SetFldSnapY( long(pView->GetSnapGridWidthY()) ); + SetFieldDrawX( pView->GetGridCoarse().Width() ); + SetFieldDrawY( pView->GetGridCoarse().Height() ); + SetFieldDivisionX( pView->GetGridFine().Width() ? ( GetFieldDrawX() / pView->GetGridFine().Width() - 1 ) : 0 ); + SetFieldDivisionY( pView->GetGridFine().Height() ? ( GetFieldDrawY() / pView->GetGridFine().Height() - 1 ) : 0 ); + SetFieldSnapX( long(pView->GetSnapGridWidthX()) ); + SetFieldSnapY( long(pView->GetSnapGridWidthY()) ); SetUseGridSnap( pView->IsGridSnap() ); SetGridVisible( pView->IsGridVisible() ); } else { - SetFldDrawX( pOpts->GetFldDrawX() ); - SetFldDrawY( pOpts->GetFldDrawY() ); - SetFldDivisionX( pOpts->GetFldDivisionX() ? ( pOpts->GetFldDrawX() / pOpts->GetFldDivisionX() - 1 ) : 0 ); - SetFldDivisionY( pOpts->GetFldDivisionY() ? ( pOpts->GetFldDrawY() / pOpts->GetFldDivisionY() - 1 ) : 0 ); - SetFldSnapX( pOpts->GetFldSnapX() ); - SetFldSnapY( pOpts->GetFldSnapY() ); + SetFieldDrawX( pOpts->GetFieldDrawX() ); + SetFieldDrawY( pOpts->GetFieldDrawY() ); + SetFieldDivisionX( pOpts->GetFieldDivisionX() ? ( pOpts->GetFieldDrawX() / pOpts->GetFieldDivisionX() - 1 ) : 0 ); + SetFieldDivisionY( pOpts->GetFieldDivisionY() ? ( pOpts->GetFieldDrawY() / pOpts->GetFieldDivisionY() - 1 ) : 0 ); + SetFieldSnapX( pOpts->GetFieldSnapX() ); + SetFieldSnapY( pOpts->GetFieldSnapY() ); SetUseGridSnap( pOpts->IsUseGridSnap() ); SetGridVisible( pOpts->IsGridVisible() ); } @@ -1139,12 +1139,12 @@ SdOptionsGridItem::SdOptionsGridItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd void SdOptionsGridItem::SetOptions( SdOptions* pOpts ) const { - pOpts->SetFldDrawX( GetFldDrawX() ); - pOpts->SetFldDivisionX( GetFldDrawX() / ( GetFldDivisionX() + 1 ) ); - pOpts->SetFldDrawY( GetFldDrawY() ); - pOpts->SetFldDivisionY( GetFldDrawY() / ( GetFldDivisionY() + 1 ) ); - pOpts->SetFldSnapX( GetFldSnapX() ); - pOpts->SetFldSnapY( GetFldSnapY() ); + pOpts->SetFieldDrawX( GetFieldDrawX() ); + pOpts->SetFieldDivisionX( GetFieldDrawX() / ( GetFieldDivisionX() + 1 ) ); + pOpts->SetFieldDrawY( GetFieldDrawY() ); + pOpts->SetFieldDivisionY( GetFieldDrawY() / ( GetFieldDivisionY() + 1 ) ); + pOpts->SetFieldSnapX( GetFieldSnapX() ); + pOpts->SetFieldSnapY( GetFieldSnapY() ); pOpts->SetUseGridSnap( GetUseGridSnap() ); pOpts->SetSynchronize( GetSynchronize() ); pOpts->SetGridVisible( GetGridVisible() ); diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index a817f5ed2767..da621f689b55 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -334,11 +334,11 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo) svtools::ColorConfig aConfig; svtools::ColorConfigEntry eEntry = INetURLHistory::GetOrCreate()->QueryUrl( aURL ) ? svtools::LINKSVISITED : svtools::LINKS; - pInfo->SetTxtColor( aConfig.GetColorValue(eEntry).nColor ); + pInfo->SetTextColor( aConfig.GetColorValue(eEntry).nColor ); } else if ( dynamic_cast< const SdrMeasureField* >(pField)) { - pInfo->ClearFldColor(); + pInfo->ClearFieldColor(); } else { diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx index 7d1393ac2108..fc4031d03d8b 100644 --- a/sd/source/ui/func/fuparagr.cxx +++ b/sd/source/ui/func/fuparagr.cxx @@ -78,7 +78,7 @@ void FuParagraph::DoExecute( SfxRequest& rReq ) aNewAttr.Put( aEditAttr ); // left border is offset - const long nOff = static_cast<const SvxLRSpaceItem&>(aNewAttr.Get( EE_PARA_LRSPACE ) ).GetTxtLeft(); + const long nOff = static_cast<const SvxLRSpaceItem&>(aNewAttr.Get( EE_PARA_LRSPACE ) ).GetTextLeft(); // conversion since TabulatorTabPage always uses Twips! SfxInt32Item aOff( SID_ATTR_TABSTOP_OFFSET, nOff ); aNewAttr.Put( aOff ); diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 73f17fb8577e..405e7af90876 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -42,7 +42,7 @@ class TransferableDataHelper; class TransferableClipboardListener; class AbstractSvxNameDialog; class SdrLayer; -class SvxClipboardFmtItem; +class SvxClipboardFormatItem; struct ESelection; namespace sd { @@ -431,7 +431,7 @@ private: content that are supported both by that content and by the DrawViewShell. */ - ::std::unique_ptr<SvxClipboardFmtItem> mpCurrentClipboardFormats; + ::std::unique_ptr<SvxClipboardFormatItem> mpCurrentClipboardFormats; /** On some occasions it is necessary to make SwitchPage calls asynchronously. diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index f2bb07312507..4e13f9725fe0 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -456,23 +456,23 @@ public: void SetDefaults(); bool operator==( const SdOptionsGrid& rOpt ) const; - sal_uInt32 GetFldDrawX() const { Init(); return SvxOptionsGrid::GetFldDrawX(); } - sal_uInt32 GetFldDivisionX() const { Init(); return SvxOptionsGrid::GetFldDivisionX(); } - sal_uInt32 GetFldDrawY() const { Init(); return SvxOptionsGrid::GetFldDrawY(); } - sal_uInt32 GetFldDivisionY() const { Init(); return SvxOptionsGrid::GetFldDivisionY(); } - sal_uInt32 GetFldSnapX() const { Init(); return SvxOptionsGrid::GetFldSnapX(); } - sal_uInt32 GetFldSnapY() const { Init(); return SvxOptionsGrid::GetFldSnapY(); } + sal_uInt32 GetFieldDrawX() const { Init(); return SvxOptionsGrid::GetFieldDrawX(); } + sal_uInt32 GetFieldDivisionX() const { Init(); return SvxOptionsGrid::GetFieldDivisionX(); } + sal_uInt32 GetFieldDrawY() const { Init(); return SvxOptionsGrid::GetFieldDrawY(); } + sal_uInt32 GetFieldDivisionY() const { Init(); return SvxOptionsGrid::GetFieldDivisionY(); } + sal_uInt32 GetFieldSnapX() const { Init(); return SvxOptionsGrid::GetFieldSnapX(); } + sal_uInt32 GetFieldSnapY() const { Init(); return SvxOptionsGrid::GetFieldSnapY(); } bool IsUseGridSnap() const { Init(); return SvxOptionsGrid::GetUseGridSnap(); } bool IsSynchronize() const { Init(); return SvxOptionsGrid::GetSynchronize(); } bool IsGridVisible() const { Init(); return SvxOptionsGrid::GetGridVisible(); } bool IsEqualGrid() const { Init(); return SvxOptionsGrid::GetEqualGrid(); } - void SetFldDrawX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawX( nSet ); } } - void SetFldDivisionX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionX( nSet ); } } - void SetFldDrawY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawY( nSet ); } } - void SetFldDivisionY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionY( nSet ); } } - void SetFldSnapX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapX() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapX( nSet ); } } - void SetFldSnapY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapY() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapY( nSet ); } } + void SetFieldDrawX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldDrawX() ) { OptionsChanged(); SvxOptionsGrid::SetFieldDrawX( nSet ); } } + void SetFieldDivisionX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldDivisionX() ) { OptionsChanged(); SvxOptionsGrid::SetFieldDivisionX( nSet ); } } + void SetFieldDrawY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldDrawY() ) { OptionsChanged(); SvxOptionsGrid::SetFieldDrawY( nSet ); } } + void SetFieldDivisionY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldDivisionY() ) { OptionsChanged(); SvxOptionsGrid::SetFieldDivisionY( nSet ); } } + void SetFieldSnapX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldSnapX() ) { OptionsChanged(); SvxOptionsGrid::SetFieldSnapX( nSet ); } } + void SetFieldSnapY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldSnapY() ) { OptionsChanged(); SvxOptionsGrid::SetFieldSnapY( nSet ); } } void SetUseGridSnap( bool bSet ) { if( bSet != SvxOptionsGrid::GetUseGridSnap() ) { OptionsChanged(); SvxOptionsGrid::SetUseGridSnap( bSet ); } } void SetSynchronize( bool bSet ) { if( bSet != SvxOptionsGrid::GetSynchronize() ) { OptionsChanged(); SvxOptionsGrid::SetSynchronize( bSet ); } } void SetGridVisible( bool bSet ) { if( bSet != SvxOptionsGrid::GetGridVisible() ) { OptionsChanged(); SvxOptionsGrid::SetGridVisible( bSet ); } } 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()); diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 1656a6f76425..13a2afa8fe89 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -4176,7 +4176,7 @@ SfxVoidItem ClipboardFormatItems SID_CLIPBOARD_FORMAT_ITEMS Synchron; /* status: */ - SlotType = SvxClipboardFmtItem + SlotType = SvxClipboardFormatItem /* config: */ AccelConfig = FALSE, diff --git a/sfx2/sdi/sfxitems.sdi b/sfx2/sdi/sfxitems.sdi index f0f1795b5293..1d7649e1d98d 100644 --- a/sfx2/sdi/sfxitems.sdi +++ b/sfx2/sdi/sfxitems.sdi @@ -104,7 +104,7 @@ String Language MID_SCRIPT_ORGANIZER_LANGUAGE; }; item SfxScriptOrganizer SfxScriptOrganizerItem; - item String SvxClipboardFmtItem; //! Dummy + item String SvxClipboardFormatItem; //! Dummy struct SvxZoom { diff --git a/starmath/sdi/smitems.sdi b/starmath/sdi/smitems.sdi index 017fc16a65f4..279f7eea421d 100644 --- a/starmath/sdi/smitems.sdi +++ b/starmath/sdi/smitems.sdi @@ -279,12 +279,12 @@ struct SvxFmtBreak BOOL Auto MID_AUTOBREAK; UINT16 Break MID_BREAKxxx; } -item SvxFmtBreak SvxFmtBreakItem; +item SvxFmtBreak SvxFormatBreakItem; -item BOOL SvxFmtKeepItem; -item BOOL SvxFmtSplitItem; +item BOOL SvxFormatKeepItem; +item BOOL SvxFormatSplitItem; struct SvxFontHeight { diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 8b8f03f3e15d..d17954ec99cf 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -2969,7 +2969,7 @@ SvNumberFormatterIndexTable* SvNumberFormatter::MergeFormatter(SvNumberFormatter SvNumberFormatterMergeMap SvNumberFormatter::ConvertMergeTableToMap() { - if (!HasMergeFmtTbl()) + if (!HasMergeFormatTable()) { return SvNumberFormatterMergeMap(); } @@ -3837,7 +3837,7 @@ sal_uInt16 SvNumberFormatter::GetCurrencyFormatStrings( NfWSStringsDtor& rStrArr return nDefault; } -sal_uInt32 SvNumberFormatter::GetMergeFmtIndex( sal_uInt32 nOldFmt ) const +sal_uInt32 SvNumberFormatter::GetMergeFormatIndex( sal_uInt32 nOldFmt ) const { if (pMergeTable) { @@ -3850,7 +3850,7 @@ sal_uInt32 SvNumberFormatter::GetMergeFmtIndex( sal_uInt32 nOldFmt ) const return nOldFmt; } -bool SvNumberFormatter::HasMergeFmtTbl() const +bool SvNumberFormatter::HasMergeFormatTable() const { return pMergeTable && !pMergeTable->empty(); } diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx index 5b5354081bd2..50c231390e0d 100644 --- a/svtools/source/svrtf/svparser.cxx +++ b/svtools/source/svrtf/svparser.cxx @@ -550,7 +550,7 @@ void SvParser::Continue( int ) { } -void SvParser::BuildWhichTbl( std::vector<sal_uInt16> &rWhichMap, +void SvParser::BuildWhichTable( std::vector<sal_uInt16> &rWhichMap, sal_uInt16 *pWhichIds, sal_uInt16 nWhichIds ) { 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) } } } diff --git a/sw/README b/sw/README index 0fcfd163050f..027e4eb6ffed 100644 --- a/sw/README +++ b/sw/README @@ -81,19 +81,19 @@ actions; these are created by the StartUndo/EndUndo wrapper methods. === Text Attributes === The sub-structure of paragraphs is stored in the SwpHintsArray member -SwTxtNode::m_pSwpHints. There is a base class SwTxtAttr with numerous -subclasses; the SwTxtAttr has a start and end index and a SfxPoolItem +SwTextNode::m_pSwpHints. There is a base class SwTextAttr with numerous +subclasses; the SwTextAttr has a start and end index and a SfxPoolItem to store the actual formatting attribute. -There are several sub-categories of SwTxtAttr: +There are several sub-categories of SwTextAttr: -- formatting attributes: Character Styles (SwTxtCharFmt, RES_TXTATR_CHARFMT) +- formatting attributes: Character Styles (SwTextCharFormat, RES_TXTATR_CHARFMT) and Automatic Styles (no special class, RES_TXTATR_AUTOFMT): these are handled by SwpHintsArray::BuildPortions and MergePortions, which create non-overlapping portions of formatting attributes. -- nesting attributes: Hyperlinks (SwTxtINetFmt, RES_TXTATR_INETFMT), - Ruby (SwTxtRuby, RES_TXTATR_CJK_RUBY) and Meta/MetaField (SwTxtMeta, +- nesting attributes: Hyperlinks (SwTextINetFormat, RES_TXTATR_INETFMT), + Ruby (SwTextRuby, RES_TXTATR_CJK_RUBY) and Meta/MetaField (SwTextMeta, RES_TXTATR_META/RES_TXTATR_METAFIELD): these maintain a properly nested tree structure. The Meta/Metafield are "special" because they have both start/end @@ -116,26 +116,26 @@ There are multiple model classes involved for fields: For most types of fields there is one shared instance of this per type, which is created in DocumentFieldsManager::_InitFieldTypes() but for some there are more than one, and they are dynamically created, see - DocumentFieldsManager::InsertFldType(). An example for the latter are - variable fields (RES_GETEXPFLD/RES_SETEXPFLD), with one SwFldType per + DocumentFieldsManager::InsertFieldType(). An example for the latter are + variable fields (RES_GETEXPFLD/RES_SETEXPFLD), with one SwFieldType per variable. - SwXFieldMaster is the UNO wrapper of a field type. It is a SwClient registered at the SwFieldType. Its life-cycle is determined by UNO clients outside of sw; it will get disposed when the SwFieldType dies. -- SwFmtFld is the SfxPoolItem of a field. - The SwFmtFld is a SwClient registered at its SwFldType. - The SwFmtFld owns the SwField of the field. +- SwFormatField is the SfxPoolItem of a field. + The SwFormatField is a SwClient registered at its SwFieldType. + The SwFormatField owns the SwField of the field. - SwField contains the core logic of a field. - The SwField is owned by the SwFmtFld of the field. + The SwField is owned by the SwFormatField of the field. There are many subclasses of SwField, one for each different type of field. Note that there are not many places that can Expand the field to its correct value, since for example page number fields require a View with an up to date layout; therefore the correct expansion is cached. -- SwTxtFld is the text attribute of a field. - It owns the SwFmtFld of the field (like all text attributes). +- SwTextField is the text attribute of a field. + It owns the SwFormatField of the field (like all text attributes). - SwXTextField is the UNO wrapper object of a field. - It is a SwClient registered at the SwFmtFld. + It is a SwClient registered at the SwFormatField. Its life-cycle is determined by UNO clients outside of sw; it will get - disposed when the SwFmtFld dies. + disposed when the SwFormatField dies. diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx index e18e91e99d94..f72468059736 100644 --- a/sw/inc/AnnotationWin.hxx +++ b/sw/inc/AnnotationWin.hxx @@ -35,7 +35,7 @@ class SwAnnotationWin : public sw::sidebarwindows::SwSidebarWin SwPostItMgr& aMgr, SwPostItBits aBits, SwSidebarItem& rSidebarItem, - SwFmtFld* aField ); + SwFormatField* aField ); virtual ~SwAnnotationWin(); virtual void dispose() SAL_OVERRIDE; @@ -62,8 +62,8 @@ class SwAnnotationWin : public sw::sidebarwindows::SwSidebarWin virtual SvxLanguageItem GetLanguage() SAL_OVERRIDE; sal_uInt32 CountFollowing(); - SwFmtFld* mpFmtFld; - SwPostItField* mpFld; + SwFormatField* mpFormatField; + SwPostItField* mpField; PopupMenu* mpButtonPopup; }; diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx index d2363177dadb..74da45127883 100644 --- a/sw/inc/EnhancedPDFExportHelper.hxx +++ b/sw/inc/EnhancedPDFExportHelper.hxx @@ -38,10 +38,10 @@ class SwFrm; class SwLinePortion; class SwPageFrm; class SwPrintData; -class SwTxtPainter; +class SwTextPainter; class SwEditShell; class StringRangeEnumerator; -class SwTxtNode; +class SwTextNode; class SwNumRule; class SwTable; class SwNumberTreeNode; @@ -59,19 +59,19 @@ class SvxLanguageItem; * Part * Art * SwSection Sect - * SwFtnContFrm and SwFlyFrm Div - * SwFmt "Quotations" BlockQuote - * SwFmt "Caption" Caption + * SwFootnoteContFrm and SwFlyFrm Div + * SwFormat "Quotations" BlockQuote + * SwFormat "Caption" Caption * SwSection (TOC) TOC - * SwTxtNode in TOC TOCI + * SwTextNode in TOC TOCI * SwSection (Index) Index * * Block-Level Structure Elements: * - * SwTxtNode P - * SwFmt "Heading" H - * SwTxtNode with Outline H1 - H6 - * SwTxtNode with NumRule L, LI, LBody + * SwTextNode P + * SwFormat "Heading" H + * SwTextNode with Outline H1 - H6 + * SwTextNode with NumRule L, LI, LBody * SwTable Table * SwRowFrm TR * SwCellFrm in Headline row or @@ -80,18 +80,18 @@ class SvxLanguageItem; * * Inline-Level Structure Elements: * - * SwTxtPortion Span - * SwFmt "Quotation" Quote - * SwFtnFrm Note + * SwTextPortion Span + * SwFormat "Quotation" Quote + * SwFootnoteFrm Note * Form * Reference - * SwFldPortion (AuthorityField) BibEntry - * SwFmt "Source Text" Code - * SwFtnPortion, SwFldPortion (RefField) Link + * SwFieldPortion (AuthorityField) BibEntry + * SwFormat "Source Text" Code + * SwFootnotePortion, SwFieldPortion (RefField) Link * * Illustration elements: * - * SwFlyFrm with SwNoTxtFrm Figure + * SwFlyFrm with SwNoTextFrm Figure * SwFlyFrm with Math OLE Object Formula * */ @@ -111,9 +111,9 @@ struct Frm_Info struct Por_Info { const SwLinePortion& mrPor; - const SwTxtPainter& mrTxtPainter; - Por_Info( const SwLinePortion& rPor, const SwTxtPainter& rTxtPainer ) - : mrPor( rPor ), mrTxtPainter( rTxtPainer ) {}; + const SwTextPainter& mrTextPainter; + Por_Info( const SwLinePortion& rPor, const SwTextPainter& rTextPainer ) + : mrPor( rPor ), mrTextPainter( rTextPainer ) {}; }; struct lt_TableColumn @@ -224,7 +224,7 @@ class SwEnhancedPDFExportHelper std::vector< sal_Int32 > CalcOutputPageNums( const SwRect& rRect ) const; void MakeHeaderFooterLinks( vcl::PDFExtOutDevData& rPDFExtOutDevData, - const SwTxtNode& rTNd, const SwRect& rLinkRect, + const SwTextNode& rTNd, const SwRect& rLinkRect, sal_Int32 nDestId, const OUString& rURL, bool bIntern ) const; public: diff --git a/sw/inc/HandleAnchorNodeChg.hxx b/sw/inc/HandleAnchorNodeChg.hxx index ac9d4b0f13a5..17eb50cb0142 100644 --- a/sw/inc/HandleAnchorNodeChg.hxx +++ b/sw/inc/HandleAnchorNodeChg.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_SW_INC_HANDLEANCHORNODECHG_HXX #define INCLUDED_SW_INC_HANDLEANCHORNODECHG_HXX -class SwFlyFrmFmt; -class SwFmtAnchor; +class SwFlyFrameFormat; +class SwFormatAnchor; class SwFlyFrm; // helper class to track change of anchor node of at-paragraph respectively @@ -37,21 +37,21 @@ public: @author OD - @param _rFlyFrmFmt + @param _rFlyFrameFormat reference to the fly frame format instance, which is handled. - @param _rNewAnchorFmt + @param _rNewAnchorFormat new anchor attribute, which will be applied at the given fly frame format @param _pKeepThisFlyFrm optional parameter - pointer to a fly frame of the given fly frame format, which isn't deleted, if re-creation of fly frames is necessary. */ - SwHandleAnchorNodeChg( SwFlyFrmFmt& _rFlyFrmFmt, - const SwFmtAnchor& _rNewAnchorFmt, + SwHandleAnchorNodeChg( SwFlyFrameFormat& _rFlyFrameFormat, + const SwFormatAnchor& _rNewAnchorFormat, SwFlyFrm* _pKeepThisFlyFrm = 0L ); - /** calls <SwFlyFrmFmt::MakeFrms>, if re-creation of fly frames is necessary. + /** calls <SwFlyFrameFormat::MakeFrms>, if re-creation of fly frames is necessary. @author OD */ @@ -59,7 +59,7 @@ public: private: // fly frame format, which is tracked for a anchor node change. - SwFlyFrmFmt& mrFlyFrmFmt; + SwFlyFrameFormat& mrFlyFrameFormat; // internal flag, which indicates that the certain anchor node change occurs // and that re-creation of fly frames is necessary. bool mbAnchorNodeChanged; diff --git a/sw/inc/IDocumentContentOperations.hxx b/sw/inc/IDocumentContentOperations.hxx index 9a866e600d4a..91ca8ce45d0d 100644 --- a/sw/inc/IDocumentContentOperations.hxx +++ b/sw/inc/IDocumentContentOperations.hxx @@ -33,11 +33,11 @@ class SfxItemSet; class SfxPoolItem; class GraphicObject; class SdrObject; -class SwFrmFmt; -class SwDrawFrmFmt; -class SwFlyFrmFmt; +class SwFrameFormat; +class SwDrawFrameFormat; +class SwFlyFrameFormat; class SwNodeIndex; -class SwFmtFld; +class SwFormatField; namespace utl { class TransliterationWrapper; } namespace svt { class EmbeddedObjectRef; } @@ -111,7 +111,7 @@ public: */ virtual void DeleteSection(SwNode* pNode) = 0; - /** Delete a range SwFlyFrmFmt. + /** Delete a range SwFlyFrameFormat. */ virtual bool DeleteRange(SwPaM&) = 0; @@ -151,11 +151,11 @@ public: /** Insert graphic or formula. The XXXX are copied. */ - virtual SwFlyFrmFmt* Insert(const SwPaM &rRg, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic, - const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrmFmt*) = 0; + virtual SwFlyFrameFormat* Insert(const SwPaM &rRg, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic, + const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrameFormat*) = 0; - virtual SwFlyFrmFmt* Insert(const SwPaM& rRg, const GraphicObject& rGrfObj, const SfxItemSet* pFlyAttrSet, - const SfxItemSet* pGrfAttrSet, SwFrmFmt*) = 0; + virtual SwFlyFrameFormat* Insert(const SwPaM& rRg, const GraphicObject& rGrfObj, const SfxItemSet* pFlyAttrSet, + const SfxItemSet* pGrfAttrSet, SwFrameFormat*) = 0; /** Transpose graphic (with undo) */ @@ -164,23 +164,23 @@ public: /** Insert a DrawObject. The object must be already registered in DrawModel. */ - virtual SwDrawFrmFmt* InsertDrawObj( const SwPaM &rRg, SdrObject& rDrawObj, const SfxItemSet& rFlyAttrSet ) = 0; + virtual SwDrawFrameFormat* InsertDrawObj( const SwPaM &rRg, SdrObject& rDrawObj, const SfxItemSet& rFlyAttrSet ) = 0; /** Insert OLE-objects. */ - virtual SwFlyFrmFmt* Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj, const SfxItemSet* pFlyAttrSet, - const SfxItemSet* pGrfAttrSet, SwFrmFmt*) = 0; + virtual SwFlyFrameFormat* Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj, const SfxItemSet* pFlyAttrSet, + const SfxItemSet* pGrfAttrSet, SwFrameFormat*) = 0; - virtual SwFlyFrmFmt* InsertOLE(const SwPaM &rRg, const OUString& rObjName, sal_Int64 nAspect, const SfxItemSet* pFlyAttrSet, - const SfxItemSet* pGrfAttrSet, SwFrmFmt*) = 0; + virtual SwFlyFrameFormat* InsertOLE(const SwPaM &rRg, const OUString& rObjName, sal_Int64 nAspect, const SfxItemSet* pFlyAttrSet, + const SfxItemSet* pGrfAttrSet, SwFrameFormat*) = 0; - /** Split a node at rPos (implemented only for TxtNode). + /** Split a node at rPos (implemented only for TextNode). */ virtual bool SplitNode(const SwPosition &rPos, bool bChkTableStart) = 0; - virtual bool AppendTxtNode(SwPosition& rPos) = 0; + virtual bool AppendTextNode(SwPosition& rPos) = 0; - /** Replace selected range in a TxtNode with string. + /** Replace selected range in a TextNode with string. Intended for search & replace. bRegExpRplc - replace tabs (\\t) and insert the found string ( not \& ). E.g.: Find: "zzz", Replace: "xx\t\\t..&..\&" diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx index 36c012924185..3d8f3e5db324 100644 --- a/sw/inc/IDocumentFieldsAccess.hxx +++ b/sw/inc/IDocumentFieldsAccess.hxx @@ -23,17 +23,17 @@ #include <sal/types.h> #include <tools/solar.h> -class SwFldTypes; +class SwFieldTypes; class SwFieldType; class SfxPoolItem; struct SwPosition; -class SwDocUpdtFld; +class SwDocUpdateField; class SwCalc; -class SwTxtFld; +class SwTextField; class SwField; class SwMsgPoolItem; class DateTime; -class _SetGetExpFld; +class _SetGetExpField; struct SwHash; class SwNode; @@ -46,19 +46,19 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } } class IDocumentFieldsAccess { public: - virtual const SwFldTypes *GetFldTypes() const = 0; + virtual const SwFieldTypes *GetFieldTypes() const = 0; - virtual SwFieldType *InsertFldType(const SwFieldType &) = 0; + virtual SwFieldType *InsertFieldType(const SwFieldType &) = 0; - virtual SwFieldType *GetSysFldType( const sal_uInt16 eWhich ) const = 0; + virtual SwFieldType *GetSysFieldType( const sal_uInt16 eWhich ) const = 0; - virtual SwFieldType* GetFldType(sal_uInt16 nResId, const OUString& rName, bool bDbFieldMatching) const = 0; + virtual SwFieldType* GetFieldType(sal_uInt16 nResId, const OUString& rName, bool bDbFieldMatching) const = 0; - virtual void RemoveFldType(size_t nFld) = 0; + virtual void RemoveFieldType(size_t nField) = 0; - virtual void UpdateFlds( SfxPoolItem* pNewHt, bool bCloseDB) = 0; + virtual void UpdateFields( SfxPoolItem* pNewHt, bool bCloseDB) = 0; - virtual void InsDeletedFldType(SwFieldType &) = 0; + virtual void InsDeletedFieldType(SwFieldType &) = 0; /** Puts a value into a field at a certain position. @@ -78,33 +78,33 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } } /** Updates a field. - @param rDstFmtFld field to update - @param rSrcFld field containing the new values - @param pMsgHnt - @param bUpdateTblFlds TRUE: update table fields, too. + @param rDstFormatField field to update + @param rSrcField field containing the new values + @param pMsgHint + @param bUpdateTableFields TRUE: update table fields, too. @retval true update was successful @retval false else */ - virtual bool UpdateFld(SwTxtFld * rDstFmtFld, SwField & rSrcFld, SwMsgPoolItem * pMsgHnt, bool bUpdateTblFlds) = 0; + virtual bool UpdateField(SwTextField * rDstFormatField, SwField & rSrcField, SwMsgPoolItem * pMsgHint, bool bUpdateTableFields) = 0; - virtual void UpdateRefFlds(SfxPoolItem* pHt) = 0; + virtual void UpdateRefFields(SfxPoolItem* pHt) = 0; - virtual void UpdateTblFlds(SfxPoolItem* pHt) = 0; + virtual void UpdateTableFields(SfxPoolItem* pHt) = 0; - virtual void UpdateExpFlds(SwTxtFld* pFld, bool bUpdateRefFlds) = 0; + virtual void UpdateExpFields(SwTextField* pField, bool bUpdateRefFields) = 0; - virtual void UpdateUsrFlds() = 0; + virtual void UpdateUsrFields() = 0; - virtual void UpdatePageFlds(SfxPoolItem*) = 0; + virtual void UpdatePageFields(SfxPoolItem*) = 0; - virtual void LockExpFlds() = 0; + virtual void LockExpFields() = 0; - virtual void UnlockExpFlds() = 0; + virtual void UnlockExpFields() = 0; - virtual bool IsExpFldsLocked() const = 0; + virtual bool IsExpFieldsLocked() const = 0; - virtual SwDocUpdtFld& GetUpdtFlds() const = 0; + virtual SwDocUpdateField& GetUpdateFields() const = 0; /* @@@MAINTAINABILITY-HORROR@@@ SwNode (see parameter pChk) is (?) part of the private @@ -118,17 +118,17 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } } // (Node [ + ::com::sun::star::ucb::Content]). // A generated list of all fields may be passed along too // (if the addreess != 0 and the pointer == 0 a new list will be returned). - virtual void FldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt) = 0; + virtual void FieldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt) = 0; - virtual void FldsToCalc(SwCalc& rCalc, const _SetGetExpFld& rToThisFld) = 0; + virtual void FieldsToCalc(SwCalc& rCalc, const _SetGetExpField& rToThisField) = 0; - virtual void FldsToExpand(SwHash**& ppTbl, sal_uInt16& rTblSize, const _SetGetExpFld& rToThisFld) = 0; + virtual void FieldsToExpand(SwHash**& ppTable, sal_uInt16& rTableSize, const _SetGetExpField& rToThisField) = 0; - virtual bool IsNewFldLst() const = 0; + virtual bool IsNewFieldLst() const = 0; - virtual void SetNewFldLst( bool bFlag) = 0; + virtual void SetNewFieldLst( bool bFlag) = 0; - virtual void InsDelFldInFldLst(bool bIns, const SwTxtFld& rFld) = 0; + virtual void InsDelFieldInFieldLst(bool bIns, const SwTextField& rField) = 0; protected: virtual ~IDocumentFieldsAccess() {}; diff --git a/sw/inc/IDocumentLayoutAccess.hxx b/sw/inc/IDocumentLayoutAccess.hxx index 37b51ef7c065..ab02daa108df 100644 --- a/sw/inc/IDocumentLayoutAccess.hxx +++ b/sw/inc/IDocumentLayoutAccess.hxx @@ -24,10 +24,10 @@ class SwViewShell; class SwRootFrm; -class SwFrmFmt; +class SwFrameFormat; class SfxItemSet; class SwLayouter; -class SwFmtAnchor; +class SwFormatAnchor; /** Provides access to the layout of a document. */ @@ -49,7 +49,7 @@ public: /** */ - virtual SwFrmFmt* MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet ) = 0; + virtual SwFrameFormat* MakeLayoutFormat( RndStdIds eRequest, const SfxItemSet* pSet ) = 0; /** */ @@ -59,12 +59,12 @@ public: /** */ - virtual void DelLayoutFmt( SwFrmFmt *pFmt ) = 0; + virtual void DelLayoutFormat( SwFrameFormat *pFormat ) = 0; /** */ - virtual SwFrmFmt* CopyLayoutFmt( const SwFrmFmt& rSrc, const SwFmtAnchor& rNewAnchor, - bool bSetTxtFlyAtt, bool bMakeFrms ) = 0; + virtual SwFrameFormat* CopyLayoutFormat( const SwFrameFormat& rSrc, const SwFormatAnchor& rNewAnchor, + bool bSetTextFlyAtt, bool bMakeFrms ) = 0; protected: diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx index 3e73066d7ec5..7de0f2ffd5ae 100644 --- a/sw/inc/IDocumentMarkAccess.hxx +++ b/sw/inc/IDocumentMarkAccess.hxx @@ -26,7 +26,7 @@ class SwPaM; struct SwPosition; -class SwTxtNode; +class SwTextNode; namespace sw { namespace mark { class SaveBookmark; // FIXME: Ugly: SaveBookmark is a core-internal class, and should not be used in the interface @@ -93,7 +93,7 @@ class IDocumentMarkAccess /** Returns a mark in the document for a paragraph. If there is none, a mark will be created. - @param rTxtNode + @param rTextNode [in] the paragraph being marked (a selection over the paragraph is marked) @param eMark @@ -102,7 +102,7 @@ class IDocumentMarkAccess @returns a pointer to the new mark (name might have changed). */ - virtual ::sw::mark::IMark* getMarkForTxtNode(const SwTxtNode& rTxtNode, + virtual ::sw::mark::IMark* getMarkForTextNode(const SwTextNode& rTextNode, MarkType eMark) =0; /** Moves an existing mark to a new selection and performs needed updates. diff --git a/sw/inc/IDocumentOutlineNodes.hxx b/sw/inc/IDocumentOutlineNodes.hxx index f5ec75fca5e6..5803f7077482 100644 --- a/sw/inc/IDocumentOutlineNodes.hxx +++ b/sw/inc/IDocumentOutlineNodes.hxx @@ -23,14 +23,14 @@ #include <rtl/ustring.hxx> #include <sal/types.h> #include <vector> -class SwTxtNode; +class SwTextNode; /** Provides outline nodes of a document. */ class IDocumentOutlineNodes { public: - typedef ::std::vector< const SwTxtNode* > tSortedOutlineNodeList; + typedef ::std::vector< const SwTextNode* > tSortedOutlineNodeList; virtual sal_Int32 getOutlineNodesCount() const = 0; @@ -38,8 +38,8 @@ public: virtual OUString getOutlineText( const sal_Int32 nIdx, const bool bWithNumber = true, const bool bWithSpacesForLevel = false, - const bool bWithFtn = true ) const = 0; - virtual SwTxtNode* getOutlineNode( const sal_Int32 nIdx ) const = 0; + const bool bWithFootnote = true ) const = 0; + virtual SwTextNode* getOutlineNode( const sal_Int32 nIdx ) const = 0; virtual void getOutlineNodes( IDocumentOutlineNodes::tSortedOutlineNodeList& orOutlineNodeList ) const = 0; diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx index 4ff9600139bd..eb37a3ac63d6 100644 --- a/sw/inc/IDocumentRedlineAccess.hxx +++ b/sw/inc/IDocumentRedlineAccess.hxx @@ -30,8 +30,8 @@ class SwRangeRedline; class SwTableRowRedline; class SwTableCellRedline; -class SwRedlineTbl; -class SwExtraRedlineTbl; +class SwRedlineTable; +class SwExtraRedlineTable; class SwPaM; struct SwPosition; class SwStartNode; @@ -126,11 +126,11 @@ public: virtual bool IsIgnoreRedline() const = 0; - virtual const SwRedlineTbl& GetRedlineTbl() const = 0; - virtual SwRedlineTbl& GetRedlineTbl() = 0; - virtual const SwExtraRedlineTbl& GetExtraRedlineTbl() const = 0; - virtual SwExtraRedlineTbl& GetExtraRedlineTbl() = 0; - virtual bool HasExtraRedlineTbl() const = 0; + virtual const SwRedlineTable& GetRedlineTable() const = 0; + virtual SwRedlineTable& GetRedlineTable() = 0; + virtual const SwExtraRedlineTable& GetExtraRedlineTable() const = 0; + virtual SwExtraRedlineTable& GetExtraRedlineTable() = 0; + virtual bool HasExtraRedlineTable() const = 0; virtual bool IsInRedlines(const SwNode& rNode) const = 0; diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx index ab907b2d30fa..73a5d547a993 100644 --- a/sw/inc/IDocumentSettingAccess.hxx +++ b/sw/inc/IDocumentSettingAccess.hxx @@ -186,14 +186,14 @@ enum class DocumentSettingId @returns the current field update mode. */ - virtual SwFldUpdateFlags getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const = 0; + virtual SwFieldUpdateFlags getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const = 0; /** Set the current field update mode. @param nMode [in] the new field update mode. */ - virtual void setFieldUpdateFlags( /*[in]*/ SwFldUpdateFlags nMode ) = 0; + virtual void setFieldUpdateFlags( /*[in]*/ SwFieldUpdateFlags nMode ) = 0; /** Get the character compression type for Asian characters. diff --git a/sw/inc/IDocumentState.hxx b/sw/inc/IDocumentState.hxx index bc4034cc46e0..a6fc748d16b9 100644 --- a/sw/inc/IDocumentState.hxx +++ b/sw/inc/IDocumentState.hxx @@ -44,7 +44,7 @@ public: */ virtual bool IsLoaded() const = 0; - virtual bool IsUpdateExpFld() const = 0; + virtual bool IsUpdateExpField() const = 0; virtual bool IsNewDoc() const = 0; @@ -54,7 +54,7 @@ public: virtual void SetNewDoc(bool b) = 0; - virtual void SetUpdateExpFldStat(bool b) = 0; + virtual void SetUpdateExpFieldStat(bool b) = 0; virtual void SetLoaded(bool b = true) = 0; diff --git a/sw/inc/IDocumentStylePoolAccess.hxx b/sw/inc/IDocumentStylePoolAccess.hxx index 81ec03587e27..c56104b32164 100644 --- a/sw/inc/IDocumentStylePoolAccess.hxx +++ b/sw/inc/IDocumentStylePoolAccess.hxx @@ -22,10 +22,10 @@ #include <sal/types.h> -class SwTxtFmtColl; -class SwCharFmt; -class SwFmt; -class SwFrmFmt; +class SwTextFormatColl; +class SwCharFormat; +class SwFormat; +class SwFrameFormat; class SwNumRule; class SwPageDesc; @@ -40,17 +40,17 @@ public: If string pointer is defined request only description of attributes, do not create style sheet! */ - virtual SwTxtFmtColl* GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) = 0; + virtual SwTextFormatColl* GetTextCollFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) = 0; /** Return required automatic format base class. */ - virtual SwFmt* GetFmtFromPool( sal_uInt16 nId ) = 0; + virtual SwFormat* GetFormatFromPool( sal_uInt16 nId ) = 0; /** Return required automatic format. */ - virtual SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId ) = 0; + virtual SwFrameFormat* GetFrameFormatFromPool( sal_uInt16 nId ) = 0; - virtual SwCharFmt* GetCharFmtFromPool( sal_uInt16 nId ) = 0; + virtual SwCharFormat* GetCharFormatFromPool( sal_uInt16 nId ) = 0; /** Return required automatic page style. */ @@ -60,8 +60,8 @@ public: /** Check whether this "auto-collection" is used in document. */ - virtual bool IsPoolTxtCollUsed( sal_uInt16 nId ) const = 0; - virtual bool IsPoolFmtUsed( sal_uInt16 nId ) const = 0; + virtual bool IsPoolTextCollUsed( sal_uInt16 nId ) const = 0; + virtual bool IsPoolFormatUsed( sal_uInt16 nId ) const = 0; virtual bool IsPoolPageDescUsed( sal_uInt16 nId ) const = 0; protected: diff --git a/sw/inc/IGrammarContact.hxx b/sw/inc/IGrammarContact.hxx index 62c053f90fcb..58dc2ebb1ef5 100644 --- a/sw/inc/IGrammarContact.hxx +++ b/sw/inc/IGrammarContact.hxx @@ -21,11 +21,11 @@ #define INCLUDED_SW_INC_IGRAMMARCONTACT_HXX struct SwPosition; -class SwTxtNode; +class SwTextNode; class SwGrammarMarkUp; class SwDoc; -/** Organizer of the contact between SwTxtNodes and grammar checker +/** Organizer of the contact between SwTextNodes and grammar checker */ class IGrammarContact { @@ -42,9 +42,9 @@ public: /** getGrammarCheck checks if the given text node is blocked by the current cursor if not, the normal markup list is returned if blocked, it will return a markup list "proxy" - @returns a markup list (grammar) for the given SwTxtNode + @returns a markup list (grammar) for the given SwTextNode */ - virtual SwGrammarMarkUp* getGrammarCheck( SwTxtNode& rTxtNode, bool bCreate ) = 0; + virtual SwGrammarMarkUp* getGrammarCheck( SwTextNode& rTextNode, bool bCreate ) = 0; /** finishGrammarCheck() has to be called if a grammar checking has been completed for a text node. If this text node has not been hided by the current proxy list @@ -52,7 +52,7 @@ public: repaint will be triggered by a timer @returns void */ - virtual void finishGrammarCheck( SwTxtNode& rTxtNode ) = 0; + virtual void finishGrammarCheck( SwTextNode& rTextNode ) = 0; public: virtual ~IGrammarContact() {} @@ -68,12 +68,12 @@ IGrammarContact* createGrammarContact(); /** getGrammarContact() delivers the grammar contact of the document (for a given textnode) @returns grammar contact */ -IGrammarContact* getGrammarContact( const SwTxtNode& ); +IGrammarContact* getGrammarContact( const SwTextNode& ); /** finishGrammarCheck() calls the same function of the grammar contact of the document (for a given textnode) @returns void */ -void finishGrammarCheck( SwTxtNode& ); +void finishGrammarCheck( SwTextNode& ); #endif // INCLUDED_SW_INC_IGRAMMARCONTACT_HXX diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index 859e07434a00..8d1ddd0d65f8 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -40,7 +40,7 @@ class SwWrtShell; class SwDoc; class SwView; class SwPostItField; -class SwFmtFld; +class SwFormatField; class SwField; class SfxBroadcaster; class SfxHint; @@ -89,10 +89,10 @@ struct SwPostItPageItem struct FieldShadowState { - const SwPostItField* mpShadowFld; + const SwPostItField* mpShadowField; bool bCursor; bool bMouse; - FieldShadowState(): mpShadowFld(0),bCursor(false),bMouse(false) + FieldShadowState(): mpShadowField(0),bCursor(false),bMouse(false) { } }; @@ -142,7 +142,7 @@ class SwPostItMgr: public SfxListener SwView* mpView; SwWrtShell* mpWrtShell; VclPtr<SwEditWin> mpEditWin; - std::list< SwSidebarItem*> mvPostItFlds; + std::list< SwSidebarItem*> mvPostItFields; std::vector<SwPostItPageItem*> mPages; ImplSVEvent * mnEventId; bool mbWaitingForCalcRects; @@ -194,8 +194,8 @@ class SwPostItMgr: public SfxListener virtual ~SwPostItMgr(); typedef std::list< SwSidebarItem* >::const_iterator const_iterator; - const_iterator begin() const { return mvPostItFlds.begin(); } - const_iterator end() const { return mvPostItFlds.end(); } + const_iterator begin() const { return mvPostItFields.begin(); } + const_iterator end() const { return mvPostItFields.end(); } void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; @@ -236,7 +236,7 @@ class SwPostItMgr: public SfxListener bool IsHit(const Point &aPointPixel); Color GetArrowColor(sal_uInt16 aDirection,unsigned long aPage) const; - sw::annotation::SwAnnotationWin* GetAnnotationWin(const SwPostItField* pFld) const; + sw::annotation::SwAnnotationWin* GetAnnotationWin(const SwPostItField* pField) const; sw::sidebarwindows::SwSidebarWin* GetNextPostIt( sal_uInt16 aDirection, sw::sidebarwindows::SwSidebarWin* aPostIt); @@ -255,7 +255,7 @@ class SwPostItMgr: public SfxListener sal_Int32 GetMinimumSizeWithMeta() const; sal_Int32 GetSidebarScrollerHeight() const; - void SetShadowState(const SwPostItField* pFld,bool bCursor = true); + void SetShadowState(const SwPostItField* pField,bool bCursor = true); void SetSpellChecking(); @@ -269,15 +269,15 @@ class SwPostItMgr: public SfxListener void StartSpelling(); sal_uInt16 Replace(SvxSearchItem* pItem); - sal_uInt16 SearchReplace(const SwFmtFld &pFld, const ::com::sun::star::util::SearchOptions& rSearchOptions,bool bSrchForward); + sal_uInt16 SearchReplace(const SwFormatField &pField, const ::com::sun::star::util::SearchOptions& rSearchOptions,bool bSrchForward); sal_uInt16 FinishSearchReplace(const ::com::sun::star::util::SearchOptions& rSearchOptions,bool bSrchForward); // get the PostIt window by index - sal_Int32 GetPostItCount() const {return mvPostItFlds.size();} + sal_Int32 GetPostItCount() const {return mvPostItFields.size();} void AssureStdModeAtShell(); void ConnectSidebarWinToFrm( const SwFrm& rFrm, - const SwFmtFld& rFmtFld, + const SwFormatField& rFormatField, sw::sidebarwindows::SwSidebarWin& rSidebarWin ); void DisconnectSidebarWinFromFrm( const SwFrm& rFrm, sw::sidebarwindows::SwSidebarWin& rSidebarWin ); diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index 92ec2d49c09a..9514ac0eca90 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -49,7 +49,7 @@ namespace sw { namespace overlay { namespace sw { namespace sidebarwindows { -class SidebarTxtControl; +class SidebarTextControl; class AnchorOverlayObject; class ShadowOverlayObject; @@ -211,7 +211,7 @@ class SwSidebarWin : public vcl::Window OutlinerView* mpOutlinerView; Outliner* mpOutliner; - VclPtr<sw::sidebarwindows::SidebarTxtControl> mpSidebarTxtControl; + VclPtr<sw::sidebarwindows::SidebarTextControl> mpSidebarTextControl; VclPtr<ScrollBar> mpVScrollbar; VclPtr<Edit> mpMetadataAuthor; VclPtr<Edit> mpMetadataDate; diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx index 81e96800613d..64cf8cea492e 100644 --- a/sw/inc/SwNodeNum.hxx +++ b/sw/inc/SwNodeNum.hxx @@ -22,22 +22,22 @@ #include <SwNumberTree.hxx> -class SwTxtNode; +class SwTextNode; struct SwPosition; class SwNumRule; -class SwNumFmt; +class SwNumFormat; class SW_DLLPUBLIC SwNodeNum : public SwNumberTreeNode { public: - explicit SwNodeNum( SwTxtNode* pTxtNode ); + explicit SwNodeNum( SwTextNode* pTextNode ); explicit SwNodeNum( SwNumRule* pNumRule ); virtual ~SwNodeNum(); SwNumRule* GetNumRule() const { return mpNumRule;} void ChangeNumRule( SwNumRule& rNumRule ); - SwTxtNode* GetTxtNode() const { return mpTxtNode;} + SwTextNode* GetTextNode() const { return mpTextNode;} virtual bool IsNotificationEnabled() const SAL_OVERRIDE; @@ -68,7 +68,7 @@ public: @author OD */ - const SwNodeNum* GetPrecedingNodeNumOf( const SwTxtNode& rTxtNode ) const; + const SwNodeNum* GetPrecedingNodeNumOf( const SwTextNode& rTextNode ) const; protected: virtual SwNumberTreeNode * Create() const SAL_OVERRIDE; @@ -82,7 +82,7 @@ protected: // method called at a child after this child has been removed from the list tree virtual void PostRemove() SAL_OVERRIDE; private: - SwTxtNode * mpTxtNode; + SwTextNode * mpTextNode; SwNumRule * mpNumRule; static void _UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum ); diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx index 3a27cbc28479..0f55905dbba2 100644 --- a/sw/inc/SwStyleNameMapper.hxx +++ b/sw/inc/SwStyleNameMapper.hxx @@ -49,9 +49,9 @@ * * 1. Paragraph contains the Text, Lists, Extra, Register, Doc and HTML * name arrays. - * 2. Character contains the ChrFmt and HTMLChrFmt name arrays. + * 2. Character contains the ChrFormat and HTMLChrFormat name arrays. * 3. Page contains the PageDesc name array. - * 4. Frame contains the FrmFmt name array. + * 4. Frame contains the FrameFormat name array. * 5. Numbering Rule contains the NumRule name array. */ @@ -88,9 +88,9 @@ protected: *pRegisterUINameArray, *pDocUINameArray, *pHTMLUINameArray, - *pFrmFmtUINameArray, - *pChrFmtUINameArray, - *pHTMLChrFmtUINameArray, + *pFrameFormatUINameArray, + *pChrFormatUINameArray, + *pHTMLChrFormatUINameArray, *pPageDescUINameArray, *pNumRuleUINameArray, // Programmatic Name tables @@ -100,9 +100,9 @@ protected: *pRegisterProgNameArray, *pDocProgNameArray, *pHTMLProgNameArray, - *pFrmFmtProgNameArray, - *pChrFmtProgNameArray, - *pHTMLChrFmtProgNameArray, + *pFrameFormatProgNameArray, + *pChrFormatProgNameArray, + *pHTMLChrFormatProgNameArray, *pPageDescProgNameArray, *pNumRuleProgNameArray; @@ -171,9 +171,9 @@ public: static const ::std::vector<OUString>& GetRegisterUINameArray(); static const ::std::vector<OUString>& GetDocUINameArray(); static const ::std::vector<OUString>& GetHTMLUINameArray(); - static const ::std::vector<OUString>& GetFrmFmtUINameArray(); - static const ::std::vector<OUString>& GetChrFmtUINameArray(); - static const ::std::vector<OUString>& GetHTMLChrFmtUINameArray(); + static const ::std::vector<OUString>& GetFrameFormatUINameArray(); + static const ::std::vector<OUString>& GetChrFormatUINameArray(); + static const ::std::vector<OUString>& GetHTMLChrFormatUINameArray(); static const ::std::vector<OUString>& GetPageDescUINameArray(); static const ::std::vector<OUString>& GetNumRuleUINameArray(); @@ -183,9 +183,9 @@ public: static const ::std::vector<OUString>& GetRegisterProgNameArray(); static const ::std::vector<OUString>& GetDocProgNameArray(); static const ::std::vector<OUString>& GetHTMLProgNameArray(); - static const ::std::vector<OUString>& GetFrmFmtProgNameArray(); - static const ::std::vector<OUString>& GetChrFmtProgNameArray(); - static const ::std::vector<OUString>& GetHTMLChrFmtProgNameArray(); + static const ::std::vector<OUString>& GetFrameFormatProgNameArray(); + static const ::std::vector<OUString>& GetChrFormatProgNameArray(); + static const ::std::vector<OUString>& GetHTMLChrFormatProgNameArray(); static const ::std::vector<OUString>& GetPageDescProgNameArray(); static const ::std::vector<OUString>& GetNumRuleProgNameArray(); }; diff --git a/sw/inc/SwUndoField.hxx b/sw/inc/SwUndoField.hxx index e34dd2c8cdba..2a8a6b4540d9 100644 --- a/sw/inc/SwUndoField.hxx +++ b/sw/inc/SwUndoField.hxx @@ -44,7 +44,7 @@ public: class SwUndoFieldFromDoc : public SwUndoField { SwField * pOldField, * pNewField; - SwMsgPoolItem * pHnt; + SwMsgPoolItem * pHint; bool bUpdate; void DoImpl(); @@ -52,7 +52,7 @@ class SwUndoFieldFromDoc : public SwUndoField public: SwUndoFieldFromDoc(const SwPosition & rPos, const SwField & aOldField, const SwField & aNewField, - SwMsgPoolItem * pHnt, bool bUpdate, + SwMsgPoolItem * pHint, bool bUpdate, SwUndoId nId = UNDO_FIELD ); virtual ~SwUndoFieldFromDoc(); diff --git a/sw/inc/ToxLinkProcessor.hxx b/sw/inc/ToxLinkProcessor.hxx index 2e439c05f2d8..a8b06d0bdf95 100644 --- a/sw/inc/ToxLinkProcessor.hxx +++ b/sw/inc/ToxLinkProcessor.hxx @@ -15,7 +15,7 @@ #include <boost/ptr_container/ptr_vector.hpp> -class SwTxtNode; +class SwTextNode; class ToxLinkProcessorTest; @@ -41,7 +41,7 @@ public: /** Insert the found links as attributes to a text node */ void - InsertLinkAttributes(SwTxtNode& node); + InsertLinkAttributes(SwTextNode& node); private: /** Obtain the pool id which belongs to a character style. @@ -66,9 +66,9 @@ private: */ struct ClosedLink { ClosedLink(const OUString& url, sal_Int32 startPosition, sal_Int32 endPosition) : - mINetFmt(url, OUString()), mStartTextPos(endPosition), mEndTextPos(startPosition) { + mINetFormat(url, OUString()), mStartTextPos(endPosition), mEndTextPos(startPosition) { } - SwFmtINetFmt mINetFmt; + SwFormatINetFormat mINetFormat; sal_Int32 mStartTextPos; sal_Int32 mEndTextPos; }; diff --git a/sw/inc/ToxTabStopTokenHandler.hxx b/sw/inc/ToxTabStopTokenHandler.hxx index a0d9e421c190..7e5be38eac81 100644 --- a/sw/inc/ToxTabStopTokenHandler.hxx +++ b/sw/inc/ToxTabStopTokenHandler.hxx @@ -19,7 +19,7 @@ struct SwFormToken; class SwPageDesc; class SwRootFrm; -class SwTxtNode; +class SwTextNode; namespace sw { @@ -45,7 +45,7 @@ public: * and to provide the returned SvxTabStop to the attributes of the node. */ virtual HandledTabStopToken - HandleTabStopToken(const SwFormToken& aToken, const SwTxtNode& targetNode, + HandleTabStopToken(const SwFormToken& aToken, const SwTextNode& targetNode, const SwRootFrm *currentLayout) const = 0; }; @@ -83,7 +83,7 @@ public: * method behaves differently when deriving the tab stop position. */ ToxTabStopTokenHandler::HandledTabStopToken - HandleTabStopToken(const SwFormToken& aToken, const SwTxtNode& targetNode, + HandleTabStopToken(const SwFormToken& aToken, const SwTextNode& targetNode, const SwRootFrm *currentLayout) const SAL_OVERRIDE; private: @@ -92,14 +92,14 @@ private: * Is used to determine how to find tab stop position. */ static bool - CanUseLayoutRectangle(const SwTxtNode& targetNode, const SwRootFrm *currentLayout); + CanUseLayoutRectangle(const SwTextNode& targetNode, const SwRootFrm *currentLayout); /** Calculate the page margin from the page description. * * This is the fallback method to determine the position of a tab stop. */ long - CalculatePageMarginFromPageDescription(const SwTxtNode& targetNode) const; + CalculatePageMarginFromPageDescription(const SwTextNode& targetNode) const; sal_uInt32 mIndexOfSectionNode; const SwPageDesc& mDefaultPageDescription; diff --git a/sw/inc/ToxTextGenerator.hxx b/sw/inc/ToxTextGenerator.hxx index 57f908963ed0..94f142c83ff3 100644 --- a/sw/inc/ToxTextGenerator.hxx +++ b/sw/inc/ToxTextGenerator.hxx @@ -29,18 +29,18 @@ class SfxItemSet; class SwAttrPool; -class SwFmtAutoFmt; +class SwFormatAutoFormat; class SwChapterField; class SwChapterFieldType; -class SwCntntFrm; -class SwCntntNode; +class SwContentFrm; +class SwContentNode; class SwDoc; class SwForm; struct SwFormToken; class SwPageDesc; class SwRootFrm; -class SwTxtAttr; -class SwTxtNode; +class SwTextAttr; +class SwTextNode; struct SwTOXSortTabBase; class SvxTabStop; class ToxTextGeneratorTest; @@ -80,7 +80,7 @@ private: */ struct HandledTextToken { OUString text; - std::vector<SwFmtAutoFmt*> autoFormats; + std::vector<SwFormatAutoFormat*> autoFormats; std::vector<sal_Int32> startPositions; std::vector<sal_Int32> endPositions; }; @@ -94,7 +94,7 @@ private: /** Applies the result of a handled text token to a target node. */ static void - ApplyHandledTextToken(const HandledTextToken& htt, SwTxtNode& targetNode); + ApplyHandledTextToken(const HandledTextToken& htt, SwTextNode& targetNode); /** Handle a page number token. * @@ -117,11 +117,11 @@ private: * @param pool The attribute pool for the new items */ static std::shared_ptr<SfxItemSet> - CollectAttributesForTox(const SwTxtAttr& hint, SwAttrPool& pool); + CollectAttributesForTox(const SwTextAttr& hint, SwAttrPool& pool); /** This method will call GetNumStringOfFirstNode() of the first node in the provided SwTOXSortTabBase. * - * The parameters @p bUsePrefix and @p nLevel are passed to SwTxtNode::GetNumString() + * The parameters @p bUsePrefix and @p nLevel are passed to SwTextNode::GetNumString() * * @internal * The method is only called if several preconditions for @p rBase are true. Check the implementation @@ -138,8 +138,8 @@ private: /** Generate the text for a chapter token. */ OUString - GenerateTextForChapterToken(const SwFormToken& chapterToken, const SwCntntFrm* contentFrame, - const SwCntntNode *contentNode) const; + GenerateTextForChapterToken(const SwFormToken& chapterToken, const SwContentFrm* contentFrame, + const SwContentNode *contentNode) const; /** Obtain a ChapterField to use for the text generation. * @internal @@ -147,7 +147,7 @@ private: */ virtual SwChapterField ObtainChapterField(SwChapterFieldType* chapterFieldType, const SwFormToken* chapterToken, - const SwCntntFrm* contentFrame, const SwCntntNode *contentNode) const; + const SwContentFrm* contentFrame, const SwContentNode *contentNode) const; friend class ::ToxTextGeneratorTest; }; diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index 2cb5a567319b..bf9dcd1c613a 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -38,7 +38,7 @@ class SwAccessibleParagraph; class SwViewShell; class Rectangle; class SwFrm; -class SwTxtFrm; +class SwTextFrm; class SwPageFrm; class SwAccessibleContext; class SwAccessibleContextMap_Impl; @@ -203,7 +203,7 @@ public: void InvalidateContent( const SwFrm *pFrm ); - void InvalidateAttr( const SwTxtFrm& rTxtFrm ); + void InvalidateAttr( const SwTextFrm& rTextFrm ); void InvalidateCursorPosition( const SwFrm *pFrm ); void InvalidateFocus(); @@ -221,7 +221,7 @@ public: @author OD - @param _rTxtFrm + @param _rTextFrm input parameter - reference to paragraph, whose CONTENT_FLOWS_FROM/_TO has to be invalidated. @@ -229,14 +229,14 @@ public: input parameter - boolean indicating, if relation CONTENT_FLOWS_FROM (value <true>) or CONTENT_FLOWS_TO (value <false>) has to be invalidated. */ - void InvalidateParaFlowRelation( const SwTxtFrm& _rTxtFrm, + void InvalidateParaFlowRelation( const SwTextFrm& _rTextFrm, const bool _bFrom ); /** invalidation of text selection of a paragraph @author OD */ - void InvalidateParaTextSelection( const SwTxtFrm& _rTxtFrm ); + void InvalidateParaTextSelection( const SwTextFrm& _rTextFrm ); /** invalidation of text selection of all paragraphs diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx index 55fdb78c0c93..1a869f1fd2bc 100644 --- a/sw/inc/anchoreddrawobject.hxx +++ b/sw/inc/anchoreddrawobject.hxx @@ -135,8 +135,8 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject } // accessors to the format - virtual SwFrmFmt& GetFrmFmt() SAL_OVERRIDE; - virtual const SwFrmFmt& GetFrmFmt() const SAL_OVERRIDE; + virtual SwFrameFormat& GetFrameFormat() SAL_OVERRIDE; + virtual const SwFrameFormat& GetFrameFormat() const SAL_OVERRIDE; // accessors to the object area and its position virtual const SwRect GetObjRect() const SAL_OVERRIDE; diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx index c31afee52daa..31b596a9ac72 100644 --- a/sw/inc/anchoredobject.hxx +++ b/sw/inc/anchoredobject.hxx @@ -27,13 +27,13 @@ class SdrObject; class SwFrm; class SwLayoutFrm; -class SwTxtFrm; +class SwTextFrm; class SwPageFrm; class SwObjPositioningInProgress; -class SwFrmFmt; -class SwFmtAnchor; +class SwFrameFormat; +class SwFormatAnchor; /** wrapper class for the positioning of Writer fly frames and drawing objects @@ -143,8 +143,8 @@ class SW_DLLPUBLIC SwAnchoredObject input parameter - reference to the text frame containing the anchor character. */ - void _CheckCharRect( const SwFmtAnchor& _rAnch, - const SwTxtFrm& _rAnchorCharFrm ); + void _CheckCharRect( const SwFormatAnchor& _rAnch, + const SwTextFrm& _rAnchorCharFrm ); /** check top of line @@ -162,12 +162,12 @@ class SW_DLLPUBLIC SwAnchoredObject input parameter - reference to the text frame containing the anchor character. */ - void _CheckTopOfLine( const SwFmtAnchor& _rAnch, - const SwTxtFrm& _rAnchorCharFrm ); + void _CheckTopOfLine( const SwFormatAnchor& _rAnch, + const SwTextFrm& _rAnchorCharFrm ); // method <sw_HideObj(..)> sets needed data structure values for the // object positioning - friend bool sw_HideObj( const SwTxtFrm& _rFrm, + friend bool sw_HideObj( const SwTextFrm& _rFrm, const RndStdIds _eAnchorType, const sal_Int32 _nObjAnchorPos, SwAnchoredObject* _pAnchoredObj ); @@ -260,11 +260,11 @@ class SW_DLLPUBLIC SwAnchoredObject @author OD - @return SwTxtFrm* + @return SwTextFrm* text frame containing the anchor character. It's NULL, if the object isn't anchored at-character resp. as-character. */ - SwTxtFrm* FindAnchorCharFrm(); + SwTextFrm* FindAnchorCharFrm(); // accessors to data of position calculation: // frame vertical position is orient at @@ -357,8 +357,8 @@ class SW_DLLPUBLIC SwAnchoredObject void SetCurrRelPos( Point _aRelPos ); // accessors to the format - virtual SwFrmFmt& GetFrmFmt() = 0; - virtual const SwFrmFmt& GetFrmFmt() const = 0; + virtual SwFrameFormat& GetFrameFormat() = 0; + virtual const SwFrameFormat& GetFrameFormat() const = 0; // accessors to the object area and its position virtual const SwRect GetObjRect() const = 0; diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx index 949d08d3c7f2..4dcba72214bd 100644 --- a/sw/inc/breakit.hxx +++ b/sw/inc/breakit.hxx @@ -110,8 +110,8 @@ public: return *m_pForbidden; } - sal_uInt16 GetRealScriptOfText( const OUString& rTxt, sal_Int32 nPos ) const; - SvtScriptType GetAllScriptsOfText( const OUString& rTxt ) const; + sal_uInt16 GetRealScriptOfText( const OUString& rText, sal_Int32 nPos ) const; + SvtScriptType GetAllScriptsOfText( const OUString& rText ) const; sal_Int32 getGraphemeCount(const OUString& rStr, sal_Int32 nStart, sal_Int32 nEnd) const; diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index 55cc98f0a54f..1fcbfa5c0517 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -134,16 +134,16 @@ struct SwHash struct SwCalcExp : public SwHash { SwSbxValue nValue; - const SwFieldType* pFldType; + const SwFieldType* pFieldType; SwCalcExp( const OUString& rStr, const SwSbxValue& rVal, - const SwFieldType* pFldType = 0 ); + const SwFieldType* pFieldType = 0 ); }; SwHash* Find( const OUString& rSrch, SwHash* const * ppTable, - sal_uInt16 nTblSize, sal_uInt16* pPos = 0 ); + sal_uInt16 nTableSize, sal_uInt16* pPos = 0 ); -void DeleteHashTable( SwHash** ppTable, sal_uInt16 nTblSize ); +void DeleteHashTable( SwHash** ppTable, sal_uInt16 nTableSize ); // if _CalcOp != 0, this is a valid operator struct _CalcOp; diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx index f11765e58c5e..ce677d9c746c 100644 --- a/sw/inc/cellatr.hxx +++ b/sw/inc/cellatr.hxx @@ -28,18 +28,18 @@ namespace rtl { class OUString; } -class SW_DLLPUBLIC SwTblBoxNumFormat : public SfxUInt32Item +class SW_DLLPUBLIC SwTableBoxNumFormat : public SfxUInt32Item { bool bAuto; ///< automatically given flag public: - SwTblBoxNumFormat( sal_uInt32 nFormat = css::util::NumberFormat::TEXT, + SwTableBoxNumFormat( sal_uInt32 nFormat = css::util::NumberFormat::TEXT, bool bAuto = false ); // "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; - inline SwTblBoxNumFormat& operator=( const SwTblBoxNumFormat& rAttr ) + inline SwTableBoxNumFormat& operator=( const SwTableBoxNumFormat& rAttr ) { SetValue( rAttr.GetValue() ); SetAutoFlag( rAttr.GetAutoFlag() ); @@ -50,14 +50,14 @@ public: void SetAutoFlag( bool bFlag = true ) { bAuto = bFlag; } }; -class SwTblBoxFormula : public SfxPoolItem, public SwTableFormula +class SwTableBoxFormula : public SfxPoolItem, public SwTableFormula { SwModify* pDefinedIn; // Modify object where the formula is located // can only be TableBoxFormat public: - SwTblBoxFormula( const OUString& rFormula ); - virtual ~SwTblBoxFormula() {}; + SwTableBoxFormula( const OUString& rFormula ); + virtual ~SwTableBoxFormula() {}; // "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; @@ -71,24 +71,24 @@ public: SwTableBox* GetTableBox(); const SwTableBox* GetTableBox() const - { return const_cast<SwTblBoxFormula*>(this)->GetTableBox(); } + { return const_cast<SwTableBoxFormula*>(this)->GetTableBox(); } void ChangeState( const SfxPoolItem* pItem ); - void Calc( SwTblCalcPara& rCalcPara, double& rValue ); + void Calc( SwTableCalcPara& rCalcPara, double& rValue ); }; -class SW_DLLPUBLIC SwTblBoxValue : public SfxPoolItem +class SW_DLLPUBLIC SwTableBoxValue : public SfxPoolItem { double nValue; public: - SwTblBoxValue(); - SwTblBoxValue( const double aVal ); + SwTableBoxValue(); + SwTableBoxValue( const double aVal ); // "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; - inline SwTblBoxValue& operator=( const SwTblBoxValue& rCmp ) + inline SwTableBoxValue& operator=( const SwTableBoxValue& rCmp ) { nValue = rCmp.nValue; return *this; @@ -97,19 +97,19 @@ public: double GetValue() const { return nValue; } }; -inline const SwTblBoxNumFormat &SwAttrSet::GetTblBoxNumFmt(bool bInP) const - { return static_cast<const SwTblBoxNumFormat&>(Get( RES_BOXATR_FORMAT,bInP)); } -inline const SwTblBoxFormula &SwAttrSet::GetTblBoxFormula(bool bInP) const - { return static_cast<const SwTblBoxFormula&>(Get( RES_BOXATR_FORMULA,bInP)); } -inline const SwTblBoxValue &SwAttrSet::GetTblBoxValue(bool bInP) const - { return static_cast<const SwTblBoxValue&>(Get( RES_BOXATR_VALUE, bInP)); } - -inline const SwTblBoxNumFormat &SwFmt::GetTblBoxNumFmt(bool bInP) const - { return m_aSet.GetTblBoxNumFmt(bInP); } -inline const SwTblBoxFormula &SwFmt::GetTblBoxFormula(bool bInP) const - { return m_aSet.GetTblBoxFormula(bInP); } -inline const SwTblBoxValue &SwFmt::GetTblBoxValue(bool bInP) const - { return m_aSet.GetTblBoxValue(bInP); } +inline const SwTableBoxNumFormat &SwAttrSet::GetTableBoxNumFormat(bool bInP) const + { return static_cast<const SwTableBoxNumFormat&>(Get( RES_BOXATR_FORMAT,bInP)); } +inline const SwTableBoxFormula &SwAttrSet::GetTableBoxFormula(bool bInP) const + { return static_cast<const SwTableBoxFormula&>(Get( RES_BOXATR_FORMULA,bInP)); } +inline const SwTableBoxValue &SwAttrSet::GetTableBoxValue(bool bInP) const + { return static_cast<const SwTableBoxValue&>(Get( RES_BOXATR_VALUE, bInP)); } + +inline const SwTableBoxNumFormat &SwFormat::GetTableBoxNumFormat(bool bInP) const + { return m_aSet.GetTableBoxNumFormat(bInP); } +inline const SwTableBoxFormula &SwFormat::GetTableBoxFormula(bool bInP) const + { return m_aSet.GetTableBoxFormula(bInP); } +inline const SwTableBoxValue &SwFormat::GetTableBoxValue(bool bInP) const + { return m_aSet.GetTableBoxValue(bInP); } #endif diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx index 880e2918b329..11386ef6d48e 100644 --- a/sw/inc/cellfml.hxx +++ b/sw/inc/cellfml.hxx @@ -28,27 +28,27 @@ class SwTableSortBoxes; class SwSelBoxes; class SwCalc; class SwTableBox; -class SwTableFmlUpdate; +class SwTableFormulaUpdate; class SwDoc; -class SwTblCalcPara +class SwTableCalcPara { - const SwTableBox* pLastTblBox; + const SwTableBox* pLastTableBox; sal_uInt16 nStackCnt, nMaxSize; public: SwTableSortBoxes *pBoxStk; ///< stack for recognizing recursion SwCalc& rCalc; ///< current Calculator - const SwTable* pTbl; ///< current table + const SwTable* pTable; ///< current table - SwTblCalcPara( SwCalc& rCalculator, const SwTable& rTable ); - ~SwTblCalcPara(); + SwTableCalcPara( SwCalc& rCalculator, const SwTable& rTable ); + ~SwTableCalcPara(); bool CalcWithStackOverflow(); bool IsStackOverflow() const { return nMaxSize == nStackCnt; } bool IncStackCnt() { return nMaxSize == ++nStackCnt; } void DecStackCnt() { if( nStackCnt ) --nStackCnt; } - void SetLastTblBox( const SwTableBox* pBox ) { pLastTblBox = pBox; } + void SetLastTableBox( const SwTableBox* pBox ) { pLastTableBox = pBox; } }; class SwTableFormula @@ -68,7 +68,7 @@ typedef void (SwTableFormula:: *FnScanFormula)( const SwTable&, OUString&, void* pPara = 0 ) const; void _MakeFormula( const SwTable&, OUString&, OUString&, OUString* = 0, void* pPara = 0 ) const; - void _GetFmlBoxes( const SwTable&, OUString&, OUString&, OUString* = 0, + void _GetFormulaBoxes( const SwTable&, OUString&, OUString&, OUString* = 0, void* pPara = 0 ) const; void _HasValidBoxes( const SwTable&, OUString&, OUString&, OUString* = 0, void* pPara = 0 ) const; @@ -77,7 +77,7 @@ typedef void (SwTableFormula:: *FnScanFormula)( const SwTable&, OUString&, static void GetBoxes( const SwTableBox& rStt, const SwTableBox& rEnd, SwSelBoxes& rBoxes ); - OUString ScanString( FnScanFormula fnFormula, const SwTable& rTbl, + OUString ScanString( FnScanFormula fnFormula, const SwTable& rTable, void* = 0 ) const; static const SwTable* FindTable( SwDoc& rDoc, const OUString& rNm ); @@ -97,13 +97,13 @@ protected: SwTableFormula( const OUString& rFormula ); - OUString MakeFormula( SwTblCalcPara& rCalcPara ) const + OUString MakeFormula( SwTableCalcPara& rCalcPara ) const { return ScanString( &SwTableFormula::_MakeFormula, - *rCalcPara.pTbl, &rCalcPara ); + *rCalcPara.pTable, &rCalcPara ); } - static sal_uInt16 GetLnPosInTbl( const SwTable& rTbl, const SwTableBox* pBox ); + static sal_uInt16 GetLnPosInTable( const SwTable& rTable, const SwTableBox* pBox ); public: @@ -118,13 +118,13 @@ public: } /// create from the internal formula (for CORE) the external formula (for UI) - void PtrToBoxNm( const SwTable* pTbl ); + void PtrToBoxNm( const SwTable* pTable ); /// create from the external formula the internal - void BoxNmToPtr( const SwTable* pTbl ); + void BoxNmToPtr( const SwTable* pTable ); /// create from the external/internal formula the relative formula - void ToRelBoxNm( const SwTable* pTbl ); + void ToRelBoxNm( const SwTable* pTable ); /// gets called before/after merging/splitting of tables - void ToSplitMergeBoxNm( SwTableFmlUpdate& rTblUpd ); + void ToSplitMergeBoxNm( SwTableFormulaUpdate& rTableUpd ); bool IsIntrnlName() const { return m_eNmType == INTRNL_NAME; } NameType GetNameType() const { return m_eNmType; } @@ -140,7 +140,7 @@ public: m_bValidValue = false; } - void GetBoxesOfFormula(const SwTable& rTbl, SwSelBoxes& rBoxes); + void GetBoxesOfFormula(const SwTable& rTable, SwSelBoxes& rBoxes); // are all boxes valid which this formula relies on? bool HasValidBoxes() const; }; diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx index 1fa539091d57..9634ce66f0c8 100644 --- a/sw/inc/charatr.hxx +++ b/sw/inc/charatr.hxx @@ -132,71 +132,71 @@ inline const SvxBoxItem &SwAttrSet::GetCharBorder( bool bInP ) const inline const SvxShadowItem &SwAttrSet::GetCharShadow( bool bInP ) const { return static_cast<const SvxShadowItem&>(Get( RES_CHRATR_SHADOW, bInP )); } -// implementation of the character attribute methods of SwFmt +// implementation of the character attribute methods of SwFormat -inline const SvxPostureItem &SwFmt::GetPosture(bool bInP) const +inline const SvxPostureItem &SwFormat::GetPosture(bool bInP) const { return m_aSet.GetPosture(bInP); } -inline const SvxWeightItem &SwFmt::GetWeight(bool bInP) const +inline const SvxWeightItem &SwFormat::GetWeight(bool bInP) const { return m_aSet.GetWeight(bInP); } -inline const SvxShadowedItem &SwFmt::GetShadowed(bool bInP) const +inline const SvxShadowedItem &SwFormat::GetShadowed(bool bInP) const { return m_aSet.GetShadowed(bInP); } -inline const SvxAutoKernItem &SwFmt::GetAutoKern(bool bInP) const +inline const SvxAutoKernItem &SwFormat::GetAutoKern(bool bInP) const { return m_aSet.GetAutoKern(bInP); } -inline const SvxWordLineModeItem &SwFmt::GetWordLineMode(bool bInP) const +inline const SvxWordLineModeItem &SwFormat::GetWordLineMode(bool bInP) const { return m_aSet.GetWordLineMode(bInP); } -inline const SvxContourItem &SwFmt::GetContour(bool bInP) const +inline const SvxContourItem &SwFormat::GetContour(bool bInP) const { return m_aSet.GetContour(bInP); } -inline const SvxKerningItem &SwFmt::GetKerning(bool bInP) const +inline const SvxKerningItem &SwFormat::GetKerning(bool bInP) const { return m_aSet.GetKerning(bInP); } -inline const SvxUnderlineItem &SwFmt::GetUnderline(bool bInP) const +inline const SvxUnderlineItem &SwFormat::GetUnderline(bool bInP) const { return m_aSet.GetUnderline(bInP); } -inline const SvxOverlineItem &SwFmt::GetOverline(bool bInP) const +inline const SvxOverlineItem &SwFormat::GetOverline(bool bInP) const { return m_aSet.GetOverline(bInP); } -inline const SvxCrossedOutItem &SwFmt::GetCrossedOut(bool bInP) const +inline const SvxCrossedOutItem &SwFormat::GetCrossedOut(bool bInP) const { return m_aSet.GetCrossedOut(bInP); } -inline const SvxFontHeightItem &SwFmt::GetSize(bool bInP) const +inline const SvxFontHeightItem &SwFormat::GetSize(bool bInP) const { return m_aSet.GetSize(bInP); } -inline const SvxPropSizeItem &SwFmt::GetPropSize(bool bInP) const +inline const SvxPropSizeItem &SwFormat::GetPropSize(bool bInP) const { return m_aSet.GetPropSize(bInP); } -inline const SvxFontItem &SwFmt::GetFont(bool bInP) const +inline const SvxFontItem &SwFormat::GetFont(bool bInP) const { return m_aSet.GetFont(bInP); } -inline const SvxFontItem &SwFmt::GetCJKFont(bool bInP) const +inline const SvxFontItem &SwFormat::GetCJKFont(bool bInP) const { return m_aSet.GetCJKFont(bInP); } -inline const SvxFontItem &SwFmt::GetCTLFont(bool bInP) const +inline const SvxFontItem &SwFormat::GetCTLFont(bool bInP) const { return m_aSet.GetCTLFont(bInP); } -inline const SvxColorItem &SwFmt::GetColor(bool bInP) const +inline const SvxColorItem &SwFormat::GetColor(bool bInP) const { return m_aSet.GetColor(bInP); } - inline const SvxCharSetColorItem &SwFmt::GetCharSetColor(bool bInP) const + inline const SvxCharSetColorItem &SwFormat::GetCharSetColor(bool bInP) const { return m_aSet.GetCharSetColor(bInP); } -inline const SvxLanguageItem &SwFmt::GetLanguage(bool bInP) const +inline const SvxLanguageItem &SwFormat::GetLanguage(bool bInP) const { return m_aSet.GetLanguage(bInP); } -inline const SvxEscapementItem &SwFmt::GetEscapement(bool bInP) const +inline const SvxEscapementItem &SwFormat::GetEscapement(bool bInP) const { return m_aSet.GetEscapement(bInP); } -inline const SvxCaseMapItem &SwFmt::GetCaseMap(bool bInP) const +inline const SvxCaseMapItem &SwFormat::GetCaseMap(bool bInP) const { return m_aSet.GetCaseMap(bInP); } -inline const SvxNoHyphenItem &SwFmt::GetNoHyphenHere(bool bInP) const +inline const SvxNoHyphenItem &SwFormat::GetNoHyphenHere(bool bInP) const { return m_aSet.GetNoHyphenHere(bInP); } -inline const SvxBlinkItem &SwFmt::GetBlink(bool bInP) const +inline const SvxBlinkItem &SwFormat::GetBlink(bool bInP) const { return m_aSet.GetBlink(bInP); } -inline const SvxBrushItem &SwFmt::GetChrBackground(bool bInP) const +inline const SvxBrushItem &SwFormat::GetChrBackground(bool bInP) const { return m_aSet.GetChrBackground(bInP); } -inline const SvxBrushItem &SwFmt::GetChrHighlight(bool bInP) const +inline const SvxBrushItem &SwFormat::GetChrHighlight(bool bInP) const { return m_aSet.GetChrHighlight(bInP); } -inline const SvxEmphasisMarkItem &SwFmt::GetEmphasisMark( bool bInP ) const +inline const SvxEmphasisMarkItem &SwFormat::GetEmphasisMark( bool bInP ) const { return m_aSet.GetEmphasisMark(bInP); } -inline const SvxTwoLinesItem &SwFmt::Get2Lines( bool bInP ) const +inline const SvxTwoLinesItem &SwFormat::Get2Lines( bool bInP ) const { return m_aSet.Get2Lines(bInP); } -inline const SvxCharScaleWidthItem &SwFmt::GetCharScaleW( bool bInP ) const +inline const SvxCharScaleWidthItem &SwFormat::GetCharScaleW( bool bInP ) const { return m_aSet.GetCharScaleW(bInP); } -inline const SvxCharRotateItem &SwFmt::GetCharRotate( bool bInP ) const +inline const SvxCharRotateItem &SwFormat::GetCharRotate( bool bInP ) const { return m_aSet.GetCharRotate(bInP); } -inline const SvxCharReliefItem &SwFmt::GetCharRelief( bool bInP ) const +inline const SvxCharReliefItem &SwFormat::GetCharRelief( bool bInP ) const { return m_aSet.GetCharRelief(bInP); } -inline const SvxCharHiddenItem &SwFmt::GetCharHidden( bool bInP ) const +inline const SvxCharHiddenItem &SwFormat::GetCharHidden( bool bInP ) const { return m_aSet.GetCharHidden(bInP); } -inline const SvxBoxItem &SwFmt::GetCharBorder( bool bInP ) const +inline const SvxBoxItem &SwFormat::GetCharBorder( bool bInP ) const { return m_aSet.GetCharBorder(bInP); } -inline const SvxShadowItem &SwFmt::GetCharShadow( bool bInP ) const +inline const SvxShadowItem &SwFormat::GetCharShadow( bool bInP ) const { return m_aSet.GetCharShadow(bInP); } #endif diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx index db67d1def83c..a9d029924a01 100644 --- a/sw/inc/charfmt.hxx +++ b/sw/inc/charfmt.hxx @@ -21,18 +21,18 @@ #include <format.hxx> -class SW_DLLPUBLIC SwCharFmt : public SwFmt +class SW_DLLPUBLIC SwCharFormat : public SwFormat { friend class SwDoc; - friend class SwTxtFmtColl; + friend class SwTextFormatColl; - SwCharFmt( SwAttrPool& rPool, const sal_Char* pFmtName, - SwCharFmt *pDerivedFrom ) - : SwFmt( rPool, pFmtName, aCharFmtSetRange, pDerivedFrom, RES_CHRFMT ) + SwCharFormat( SwAttrPool& rPool, const sal_Char* pFormatName, + SwCharFormat *pDerivedFrom ) + : SwFormat( rPool, pFormatName, aCharFormatSetRange, pDerivedFrom, RES_CHRFMT ) {} - SwCharFmt( SwAttrPool& rPool, const OUString &rFmtName, - SwCharFmt *pDerivedFrom ) - : SwFmt( rPool, rFmtName, aCharFmtSetRange, pDerivedFrom, RES_CHRFMT ) + SwCharFormat( SwAttrPool& rPool, const OUString &rFormatName, + SwCharFormat *pDerivedFrom ) + : SwFormat( rPool, rFormatName, aCharFormatSetRange, pDerivedFrom, RES_CHRFMT ) {} public: @@ -41,11 +41,11 @@ public: void dumpAsXml(struct _xmlTextWriter* pWriter) const; }; -namespace CharFmt +namespace CharFormat { SW_DLLPUBLIC extern const SfxItemSet* GetItemSet( const SfxPoolItem& rAttr ); - extern const SfxPoolItem* GetItem( const SwTxtAttr& rAttr, sal_uInt16 nWhich ); - extern bool IsItemIncluded( const sal_uInt16 nWhich, const SwTxtAttr *pAttr ); + extern const SfxPoolItem* GetItem( const SwTextAttr& rAttr, sal_uInt16 nWhich ); + extern bool IsItemIncluded( const sal_uInt16 nWhich, const SwTextAttr *pAttr ); } #endif diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx index dc59de1e1e61..5f22ceb36ec5 100644 --- a/sw/inc/chpfld.hxx +++ b/sw/inc/chpfld.hxx @@ -22,8 +22,8 @@ #include "fldbas.hxx" class SwFrm; -class SwCntntNode; -class SwTxtNode; +class SwContentNode; +class SwTextNode; class ToxTextGeneratorTest; enum SwChapterFormat @@ -60,13 +60,13 @@ class SW_DLLPUBLIC SwChapterField : public SwField virtual SwField* Copy() const SAL_OVERRIDE; public: - SwChapterField(SwChapterFieldType*, sal_uInt32 nFmt = 0); + SwChapterField(SwChapterFieldType*, sal_uInt32 nFormat = 0); // #i53420# void ChangeExpansion( const SwFrm*, - const SwCntntNode*, + const SwContentNode*, bool bSrchNum = false); - void ChangeExpansion(const SwTxtNode &rNd, bool bSrchNum); + void ChangeExpansion(const SwTextNode &rNd, bool bSrchNum); inline sal_uInt8 GetLevel() const; inline void SetLevel(sal_uInt8); diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index e07ca6fda4e0..7c15b3a88fbf 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -144,7 +144,7 @@ CalcLayout */ #define FN_REDLINE_ACCEPT (FN_EDIT2 + 29) /* Redlining Accept/Reject */ -#define FN_ATTR_COLUMNS (FN_EDIT2 + 31) /* SlotId for SwFmtCol */ +#define FN_ATTR_COLUMNS (FN_EDIT2 + 31) /* SlotId for SwFormatCol */ #define FN_EDIT_CURRENT_TOX (FN_EDIT2 + 32) /* edit current index */ #define FN_EDIT_AUTH_ENTRY_DLG (FN_EDIT2 + 33) /* edit authorities entry*/ #define FN_UPDATE_CHARTS (FN_EDIT2 + 34) /* update all charts */ diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 84fbb87245c3..2fdcac8ba2c5 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -41,30 +41,30 @@ class SfxItemSet; class SfxPoolItem; -class SwCntntFrm; +class SwContentFrm; class SwCrsrShell; class SwCursor; class SwField; class SwFieldType; -class SwFmt; -class SwFmtFld; +class SwFormat; +class SwFormatField; class SwNodeIndex; class SwPaM; class SwShellCrsr; class SwShellTableCrsr; class SwTableNode; -class SwTxtFmtColl; +class SwTextFormatColl; class SwVisCrsr; -class SwTxtINetFmt; -class SwFmtINetFmt; -class SwTxtAttr; +class SwTextINetFormat; +class SwFormatINetFormat; +class SwTextAttr; class SwTableBox; class SwTOXMark; class SwRangeRedline; class IBlockCursor; -class SwCntntNode; +class SwContentNode; class SwPostItField; -class SwTxtFld; +class SwTextField; struct SwPosition; namespace com { namespace sun { namespace star { namespace util { @@ -103,26 +103,26 @@ struct SwContentAtPos ,SW_CURR_ATTRS = 0x4000 ///< only for debugging ,SW_TABLEBOXVALUE = 0x8000 ///< only for debugging #endif - } eCntntAtPos; + } eContentAtPos; union { - const SwField* pFld; + const SwField* pField; const SfxPoolItem* pAttr; const SwRangeRedline* pRedl; - SwCntntNode * pNode; - const sw::mark::IFieldmark* pFldmark; + SwContentNode * pNode; + const sw::mark::IFieldmark* pFieldmark; } aFnd; int nDist; OUString sStr; - const SwTxtAttr* pFndTxtAttr; + const SwTextAttr* pFndTextAttr; SwContentAtPos( int eGetAtPos = 0xffff ) - : eCntntAtPos( (IsAttrAtPos)eGetAtPos ) + : eContentAtPos( (IsAttrAtPos)eGetAtPos ) { - aFnd.pFld = 0; - pFndTxtAttr = 0; + aFnd.pField = 0; + pFndTextAttr = 0; nDist = 0; // #i23726# } @@ -179,7 +179,7 @@ private: IBlockCursor *m_pBlockCrsr; ///< interface of cursor for block (=rectangular) selection - SwShellTableCrsr* m_pTblCrsr; /**< table Crsr; only in tables when the + SwShellTableCrsr* m_pTableCrsr; /**< table Crsr; only in tables when the selection lays over 2 columns */ SwNodeIndex* m_pBoxIdx; ///< for recognizing of the changed @@ -189,7 +189,7 @@ private: in the same column */ long m_nLeftFrmPos; sal_uLong m_nAktNode; // save CursorPos at Start-Action - sal_Int32 m_nAktCntnt; + sal_Int32 m_nAktContent; sal_uInt16 m_nAktNdTyp; bool m_bAktSelection; @@ -222,7 +222,7 @@ private: bool m_bGCAttr : 1; // true -> non expanded attributes exist. bool m_bIgnoreReadonly : 1; // true -> make the cursor visible on next // EndAction in spite of Readonly - bool m_bSelTblCells : 1; // true -> select cells over the InputWin + bool m_bSelTableCells : 1; // true -> select cells over the InputWin bool m_bAutoUpdateCells : 1; // true -> autoformat cells bool m_bBasicHideCrsr : 1; // true -> HideCrsr from Basic bool m_bSetCrsrInReadOnly : 1;// true -> Cursor is allowed in ReadOnly-Areas @@ -260,7 +260,7 @@ private: SAL_DLLPRIVATE short GetTextDirection( const Point* pPt = 0 ) const; - SAL_DLLPRIVATE bool isInHiddenTxtFrm(SwShellCrsr* pShellCrsr); + SAL_DLLPRIVATE bool isInHiddenTextFrm(SwShellCrsr* pShellCrsr); typedef bool (SwCursor:: *FNCrsr)(); SAL_DLLPRIVATE bool CallCrsrFN( FNCrsr ); @@ -290,7 +290,7 @@ protected: void PaMCorrAbs(const SwNodeIndex &rOldNode, const SwPosition &rNewPos, const sal_Int32 nOffset = 0 ); - bool _SelTblRowOrCol( bool bRow, bool bRowSimple = false ); + bool _SelTableRowOrCol( bool bRow, bool bRowSimple = false ); bool SetInFrontOfLabel( bool bNew ); @@ -318,7 +318,7 @@ public: ///< delete the current cursor and make the following into the current bool DestroyCrsr(); ///< transform TableCursor to normal cursor, nullify Tablemode - void TblCrsrToCursor(); + void TableCrsrToCursor(); ///< enter block mode, change normal cursor into block cursor void CrsrToBlockCrsr(); ///< leave block mode, change block cursor into normal cursor @@ -333,8 +333,8 @@ public: /// If document body starts with a table. bool StartsWithTable(); - SwPaM* GetCrsr( bool bMakeTblCrsr = true ) const; - inline SwCursor* GetSwCrsr( bool bMakeTblCrsr = true ) const; + SwPaM* GetCrsr( bool bMakeTableCrsr = true ) const; + inline SwCursor* GetSwCrsr( bool bMakeTableCrsr = true ) const; // return only the current cursor SwShellCrsr* _GetCrsr() { return m_pCurCrsr; } const SwShellCrsr* _GetCrsr() const { return m_pCurCrsr; } @@ -380,10 +380,10 @@ public: bool& bCancel, FindRanges eRng, bool bReplace = false ); - sal_uLong Find( const SwTxtFmtColl& rFmtColl, + sal_uLong Find( const SwTextFormatColl& rFormatColl, SwDocPositions eStart, SwDocPositions eEnd, bool& bCancel, - FindRanges eRng, const SwTxtFmtColl* pReplFmt = 0 ); + FindRanges eRng, const SwTextFormatColl* pReplFormat = 0 ); sal_uLong Find( const SfxItemSet& rSet, bool bNoCollections, SwDocPositions eStart, SwDocPositions eEnd, @@ -470,7 +470,7 @@ public: void SetOverwriteCrsr( bool bFlag ) { m_bOverwriteCrsr = bFlag; } // Return current frame in which the cursor is placed. - SwCntntFrm *GetCurrFrm( const bool bCalcFrm = true ) const; + SwContentFrm *GetCurrFrm( const bool bCalcFrm = true ) const; //true if cursor is hidden because of readonly. //false if it is working despite readonly. @@ -574,21 +574,21 @@ public: // get the selected text at the current cursor. it will be filled with // fields etc. - OUString GetSelTxt() const; + OUString GetSelText() const; // return only the text starting from the current cursor position (to the // end of the node) OUString GetText() const; // Check of SPoint or Mark of current cursor are placed within a table. - inline const SwTableNode* IsCrsrInTbl( bool bIsPtInTbl = true ) const; + inline const SwTableNode* IsCrsrInTable( bool bIsPtInTable = true ) const; inline Point& GetCrsrDocPos( bool bPoint = true ) const; inline bool IsCrsrPtAtEnd() const; - inline const SwPaM* GetTblCrs() const; - inline SwPaM* GetTblCrs(); + inline const SwPaM* GetTableCrs() const; + inline SwPaM* GetTableCrs(); - bool IsTblComplexForChart(); + bool IsTableComplexForChart(); // get current table selection as text OUString GetBoxNms() const; @@ -599,11 +599,11 @@ public: bool GotoTable( const OUString& rName ); // select a table row, column or box (based on the current cursor) - bool SelTblRow() { return _SelTblRowOrCol( true ); } - bool SelTblCol() { return _SelTblRowOrCol( false ); } - bool SelTblBox(); + bool SelTableRow() { return _SelTableRowOrCol( true ); } + bool SelTableCol() { return _SelTableRowOrCol( false ); } + bool SelTableBox(); - bool SelTbl(); + bool SelTable(); bool GotoNextNum(); bool GotoPrevNum(); @@ -624,14 +624,14 @@ public: /** Delivers the current shell cursor Some operations have to run on the current cursor ring, - some on the m_pTblCrsr (if exist) or the current cursor ring and - some on the m_pTblCrsr or m_pBlockCrsr or the current cursor ring. + some on the m_pTableCrsr (if exist) or the current cursor ring and + some on the m_pTableCrsr or m_pBlockCrsr or the current cursor ring. This small function checks the existence and delivers the wished cursor. @param bBlock [bool] if the block cursor is of interest or not - @return m_pTblCrsr if exist, + @return m_pTableCrsr if exist, m_pBlockCrsr if exist and of interest (param bBlock) otherwise m_pCurCrsr */ @@ -644,20 +644,20 @@ public: IBlockCursor* GetBlockCrsr() { return m_pBlockCrsr; } // is the Crsr in a table and is the selection over 2 columns - bool IsTableMode() const { return 0 != m_pTblCrsr; } + bool IsTableMode() const { return 0 != m_pTableCrsr; } - const SwShellTableCrsr* GetTableCrsr() const { return m_pTblCrsr; } - SwShellTableCrsr* GetTableCrsr() { return m_pTblCrsr; } - size_t UpdateTblSelBoxes(); + const SwShellTableCrsr* GetTableCrsr() const { return m_pTableCrsr; } + SwShellTableCrsr* GetTableCrsr() { return m_pTableCrsr; } + size_t UpdateTableSelBoxes(); - bool GotoFtnTxt(); ///< jump from content to footnote - bool GotoFtnAnchor(); ///< jump from footnote to anchor - bool GotoPrevFtnAnchor(); - bool GotoNextFtnAnchor(); + bool GotoFootnoteText(); ///< jump from content to footnote + bool GotoFootnoteAnchor(); ///< jump from footnote to anchor + bool GotoPrevFootnoteAnchor(); + bool GotoNextFootnoteAnchor(); bool GotoFlyAnchor(); ///< jump from the frame to the anchor - bool GotoHeaderTxt(); ///< jump from the content to the header - bool GotoFooterTxt(); ///< jump from the content to the footer + bool GotoHeaderText(); ///< jump from the content to the header + bool GotoFooterText(); ///< jump from the content to the footer // jump to the header/footer of the given or current PageDesc bool SetCrsrInHdFt( size_t nDescNo = SIZE_MAX, bool bInHeader = true ); @@ -675,7 +675,7 @@ public: // jump to the next or previous table formula // optionally only to broken formulas - bool GotoNxtPrvTblFormula( bool bNext = true, + bool GotoNxtPrvTableFormula( bool bNext = true, bool bOnlyErrors = false ); // jump to the next / previous hyperlink - inside text and also // on graphics @@ -695,26 +695,26 @@ public: inline void UnSetVisCrsr(); // jump to the next or previous field of the corresponding type - bool MoveFldType( - const SwFieldType* pFldType, + bool MoveFieldType( + const SwFieldType* pFieldType, const bool bNext, const sal_uInt16 nResType = USHRT_MAX, - const bool bAddSetExpressionFldsToInputFlds = true ); + const bool bAddSetExpressionFieldsToInputFields = true ); - bool GotoFld( const SwFmtFld& rFld ); + bool GotoFormatField( const SwFormatField& rField ); - static SwTxtFld* GetTxtFldAtPos( + static SwTextField* GetTextFieldAtPos( const SwPosition* pPos, - const bool bIncludeInputFldAtStart ); + const bool bIncludeInputFieldAtStart ); static SwField* GetFieldAtCrsr( const SwPaM* pCrsr, - const bool bIncludeInputFldAtStart ); - SwField* GetCurFld( const bool bIncludeInputFldAtStart = false ) const; - bool CrsrInsideInputFld() const; - static bool PosInsideInputFld( const SwPosition& rPos ); - bool DocPtInsideInputFld( const Point& rDocPt ) const; - static sal_Int32 StartOfInputFldAtPos( const SwPosition& rPos ); - static sal_Int32 EndOfInputFldAtPos( const SwPosition& rPos ); + const bool bIncludeInputFieldAtStart ); + SwField* GetCurField( const bool bIncludeInputFieldAtStart = false ) const; + bool CrsrInsideInputField() const; + static bool PosInsideInputField( const SwPosition& rPos ); + bool DocPtInsideInputField( const Point& rDocPt ) const; + static sal_Int32 StartOfInputFieldAtPos( const SwPosition& rPos ); + static sal_Int32 EndOfInputFieldAtPos( const SwPosition& rPos ); // Return number of cursors in ring (The flag indicates whether // only cursors containing selections are requested). @@ -750,7 +750,7 @@ public: // its TextNode (or StartNode?) // They all get created on the next ::GetCrsr again // Used for Drag&Drop/Clipboard-Paste in tables - bool ParkTblCrsr(); + bool ParkTableCrsr(); // Non expanded attributes? bool IsGCAttr() const { return m_bGCAttr; } @@ -768,12 +768,12 @@ public: virtual void MakeSelVisible(); // set the cursor to a NOT protected/hidden node - bool FindValidCntntNode( bool bOnlyText = false ); + bool FindValidContentNode( bool bOnlyText = false ); bool GetContentAtPos( const Point& rPt, - SwContentAtPos& rCntntAtPos, + SwContentAtPos& rContentAtPos, bool bSetCrsr = false, - SwRect* pFldRect = 0 ); + SwRect* pFieldRect = 0 ); const SwPostItField* GetPostItFieldAtCursor() const; @@ -791,20 +791,20 @@ public: bool IsPageAtPos( const Point &rPt ) const; - bool SelectTxtAttr( sal_uInt16 nWhich, bool bExpand, const SwTxtAttr* pAttr = 0 ); - bool GotoINetAttr( const SwTxtINetFmt& rAttr ); - const SwFmtINetFmt* FindINetAttr( const OUString& rName ) const; + bool SelectTextAttr( sal_uInt16 nWhich, bool bExpand, const SwTextAttr* pAttr = 0 ); + bool GotoINetAttr( const SwTextINetFormat& rAttr ); + const SwFormatINetFormat* FindINetAttr( const OUString& rName ) const; - bool SelectTxt( const sal_Int32 nStart, + bool SelectText( const sal_Int32 nStart, const sal_Int32 nEnd ); - bool CheckTblBoxCntnt( const SwPosition* pPos = 0 ); - void SaveTblBoxCntnt( const SwPosition* pPos = 0 ); - void ClearTblBoxCntnt(); - bool EndAllTblBoxEdit(); + bool CheckTableBoxContent( const SwPosition* pPos = 0 ); + void SaveTableBoxContent( const SwPosition* pPos = 0 ); + void ClearTableBoxContent(); + bool EndAllTableBoxEdit(); - void SetSelTblCells( bool bFlag ) { m_bSelTblCells = bFlag; } - bool IsSelTblCells() const { return m_bSelTblCells; } + void SetSelTableCells( bool bFlag ) { m_bSelTableCells = bFlag; } + bool IsSelTableCells() const { return m_bSelTableCells; } bool IsAutoUpdateCells() const { return m_bAutoUpdateCells; } void SetAutoUpdateCells( bool bFlag ) { m_bAutoUpdateCells = bFlag; } @@ -861,9 +861,9 @@ inline SwMoveFnCollection* SwCrsrShell::MakeFindRange( return m_pCurCrsr->MakeFindRange( (SwDocPositions)nStt, (SwDocPositions)nEnd, pPam ); } -inline SwCursor* SwCrsrShell::GetSwCrsr( bool bMakeTblCrsr ) const +inline SwCursor* SwCrsrShell::GetSwCrsr( bool bMakeTableCrsr ) const { - return static_cast<SwCursor*>(GetCrsr( bMakeTblCrsr )); + return static_cast<SwCursor*>(GetCrsr( bMakeTableCrsr )); } inline SwPaM* SwCrsrShell::GetStkCrsr() const { return m_pCrsrStk; } @@ -888,9 +888,9 @@ inline bool SwCrsrShell::IsSelOnePara() const m_pCurCrsr->GetPoint()->nNode == m_pCurCrsr->GetMark()->nNode; } -inline const SwTableNode* SwCrsrShell::IsCrsrInTbl( bool bIsPtInTbl ) const +inline const SwTableNode* SwCrsrShell::IsCrsrInTable( bool bIsPtInTable ) const { - return m_pCurCrsr->GetNode( bIsPtInTbl ).FindTableNode(); + return m_pCurCrsr->GetNode( bIsPtInTable ).FindTableNode(); } inline bool SwCrsrShell::IsCrsrPtAtEnd() const @@ -903,14 +903,14 @@ inline Point& SwCrsrShell::GetCrsrDocPos( bool bPoint ) const return bPoint ? m_pCurCrsr->GetPtPos() : m_pCurCrsr->GetMkPos(); } -inline const SwPaM* SwCrsrShell::GetTblCrs() const +inline const SwPaM* SwCrsrShell::GetTableCrs() const { - return m_pTblCrsr; + return m_pTableCrsr; } -inline SwPaM* SwCrsrShell::GetTblCrs() +inline SwPaM* SwCrsrShell::GetTableCrs() { - return m_pTblCrsr; + return m_pTableCrsr; } inline void SwCrsrShell::UnSetVisCrsr() diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx index 53e3db095bae..fdba24133fd3 100644 --- a/sw/inc/crstate.hxx +++ b/sw/inc/crstate.hxx @@ -65,7 +65,7 @@ struct Sw2LinesPos /** * SwSpecialPos. This structure is used to pass some additional information - * during the call of SwTxtFrm::GetCharRect(). An SwSpecialPos defines a position + * during the call of SwTextFrm::GetCharRect(). An SwSpecialPos defines a position * inside a portion which does not have a representation in the core string or * which is only represented by one position, e.g., field portions, * number portions, ergo sum and quo vadis portions. @@ -82,7 +82,7 @@ struct Sw2LinesPos * * Get the position of the second character inside a number portion: * nCharOfst = 2; nLineOfst = 0; nExtendRange = SP_EXTEND_RANGE_BEFORE; - * Call SwTxtFrm:::GetCharRect with core string position 0. + * Call SwTextFrm:::GetCharRect with core string position 0. * * Example 2) * @@ -91,7 +91,7 @@ struct Sw2LinesPos * Get the position of the third character in follow field B, core position * of field A is 33. * nCharOfst = 7; nLineOfst = 0; nExtendRange = SP_EXTEND_RANGE_NONE; - * Call SwTxtFrm:::GetCharRect with core string position 33. + * Call SwTextFrm:::GetCharRect with core string position 33. */ #define SP_EXTEND_RANGE_NONE 0 @@ -134,9 +134,9 @@ struct SwCrsrMoveState bool bRealHeight; ///< should the real height be calculated? bool bFieldInfo; ///< should be fields recognized? bool bPosCorr; ///< Point had to be corrected - bool bFtnNoInfo; ///< recognized footnote numbering + bool bFootnoteNoInfo; ///< recognized footnote numbering bool bExactOnly; /**< let GetCrsrOfst look for exact matches only, - i.e. never let it run into GetCntntPos */ + i.e. never let it run into GetContentPos */ bool bFillRet; ///< only used temporary in FillMode bool bSetInReadOnly; ///< ReadOnly areas may be entered bool bRealWidth; ///< Calculation of the width required @@ -146,7 +146,7 @@ struct SwCrsrMoveState position if screen position is inside second have of bound rect */ - bool bCntntCheck; // #i43742# Cursor position over content? + bool bContentCheck; // #i43742# Cursor position over content? // #i27615# /** @@ -166,7 +166,7 @@ struct SwCrsrMoveState bRealHeight( false ), bFieldInfo( false ), bPosCorr( false ), - bFtnNoInfo( false ), + bFootnoteNoInfo( false ), bExactOnly( false ), bFillRet( false ), bSetInReadOnly( false ), @@ -174,7 +174,7 @@ struct SwCrsrMoveState b2Lines( false ), bNoScroll( false ), bPosMatchesBounds( false ), - bCntntCheck( false ), // #i43742# + bContentCheck( false ), // #i43742# bInFrontOfLabel( false ), // #i27615# bInNumPortion(false), // #i26726# nInNumPostionOffset(0) // #i26726# @@ -189,7 +189,7 @@ struct SwCrsrMoveState bRealHeight( false ), bFieldInfo( false ), bPosCorr( false ), - bFtnNoInfo( false ), + bFootnoteNoInfo( false ), bExactOnly( false ), bFillRet( false ), bSetInReadOnly( false ), @@ -197,7 +197,7 @@ struct SwCrsrMoveState b2Lines( false ), bNoScroll( false ), bPosMatchesBounds( false ), - bCntntCheck( false ), // #i43742# + bContentCheck( false ), // #i43742# bInFrontOfLabel( false ), // #i27615# bInNumPortion(false), // #i23726# nInNumPostionOffset(0) // #i23726# diff --git a/sw/inc/cshtyp.hxx b/sw/inc/cshtyp.hxx index 0509b9116ee2..2ba43ffef947 100644 --- a/sw/inc/cshtyp.hxx +++ b/sw/inc/cshtyp.hxx @@ -23,7 +23,7 @@ #include "swdllapi.h" class SwPaM; -class SwCntntFrm; +class SwContentFrm; class SwLayoutFrm; // Structure for SwPaM. Contains the method-pointers for cursor movement. @@ -31,13 +31,13 @@ struct SwMoveFnCollection; typedef SwMoveFnCollection* SwMoveFn; // Type definition for CrsrShell. -// Direction-parameter for MovePage (initialized in SwCntntFrm). +// Direction-parameter for MovePage (initialized in SwContentFrm). typedef SwLayoutFrm * (*SwWhichPage)( const SwLayoutFrm * ); -typedef SwCntntFrm * (*SwPosPage)( const SwLayoutFrm * ); +typedef SwContentFrm * (*SwPosPage)( const SwLayoutFrm * ); extern SwWhichPage fnPagePrev, fnPageCurr, fnPageNext; extern SwPosPage fnPageStart, fnPageEnd; -// Direction-parameter for MovePara (initialized in SwCntntFrm). +// Direction-parameter for MovePara (initialized in SwContentFrm). typedef SwMoveFnCollection* SwPosPara; typedef bool (*SwWhichPara)( SwPaM&, SwPosPara ); extern SwWhichPara fnParaPrev, fnParaCurr, fnParaNext; @@ -57,7 +57,7 @@ extern SwPosTable fnTableStart, fnTableEnd; // Direction-parameter for MoveColumn typedef SwLayoutFrm * (*SwWhichColumn)( const SwLayoutFrm * ); -typedef SwCntntFrm * (*SwPosColumn)( const SwLayoutFrm * ); +typedef SwContentFrm * (*SwPosColumn)( const SwLayoutFrm * ); extern SwWhichColumn fnColumnPrev, fnColumnCurr, fnColumnNext; extern SwPosColumn fnColumnStart, fnColumnEnd; diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx index 7df97ef6d9b0..7f3d6533ad71 100644 --- a/sw/inc/dbfld.hxx +++ b/sw/inc/dbfld.hxx @@ -24,7 +24,7 @@ #include "swdbdata.hxx" class SwDoc; -class SwTxtFld; +class SwTextField; class SwFrm; // Database field. @@ -60,7 +60,7 @@ class SW_DLLPUBLIC SwDBField : public SwValueField OUString aContent; OUString sFieldCode; ///< contains Word's field code sal_uInt16 nSubType; - bool bIsInBodyTxt : 1; + bool bIsInBodyText : 1; bool bValidValue : 1; bool bInitialized : 1; @@ -68,7 +68,7 @@ class SW_DLLPUBLIC SwDBField : public SwValueField virtual SwField* Copy() const SAL_OVERRIDE; public: - SwDBField(SwDBFieldType*, sal_uLong nFmt = 0); + SwDBField(SwDBFieldType*, sal_uLong nFormat = 0); virtual ~SwDBField(); virtual SwFieldType* ChgTyp( SwFieldType* ) SAL_OVERRIDE; @@ -88,11 +88,11 @@ public: void Evaluate(); /// Evaluation for header and footer. - void ChangeExpansion( const SwFrm*, const SwTxtFld* ); + void ChangeExpansion( const SwFrm*, const SwTextField* ); void InitContent(); void InitContent(const OUString& rExpansion); - inline void ChgBodyTxtFlag( bool bIsInBody ); + inline void ChgBodyTextFlag( bool bIsInBody ); inline bool IsInitialized() const { return bInitialized; } inline void ClearInitialized() { bInitialized = false; } @@ -110,16 +110,16 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; - static bool FormatValue( SvNumberFormatter* pDocFormatter, OUString &aString, sal_uInt32 nFmt, + static bool FormatValue( SvNumberFormatter* pDocFormatter, OUString &aString, sal_uInt32 nFormat, double &aNumber, sal_Int32 nColumnType, SwDBField *pField = NULL ); }; inline void SwDBField::SetExpansion(const OUString& rStr) { aContent = rStr; } -/// set from UpdateExpFlds (the Node-Position is known there) -inline void SwDBField::ChgBodyTxtFlag( bool bIsInBody ) - { bIsInBodyTxt = bIsInBody; } +/// set from UpdateExpFields (the Node-Position is known there) +inline void SwDBField::ChgBodyTextFlag( bool bIsInBody ) + { bIsInBodyText = bIsInBody; } // Base class for all other database fields. class SW_DLLPUBLIC SwDBNameInfField : public SwField @@ -131,7 +131,7 @@ protected: const SwDBData& GetDBData() const {return aDBData;} SwDBData& GetDBData() {return aDBData;} - SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, sal_uLong nFmt = 0); + SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, sal_uLong nFormat = 0); public: /// DBName @@ -249,7 +249,7 @@ public: class SW_DLLPUBLIC SwDBNameField : public SwDBNameInfField { public: - SwDBNameField(SwDBNameFieldType*, const SwDBData& rDBData, sal_uLong nFmt = 0); + SwDBNameField(SwDBNameFieldType*, const SwDBData& rDBData, sal_uLong nFormat = 0); virtual OUString Expand() const SAL_OVERRIDE; virtual SwField* Copy() const SAL_OVERRIDE; @@ -271,7 +271,7 @@ class SW_DLLPUBLIC SwDBSetNumberField : public SwDBNameInfField { long nNumber; public: - SwDBSetNumberField(SwDBSetNumberFieldType*, const SwDBData& rDBData, sal_uLong nFmt = 0); + SwDBSetNumberField(SwDBSetNumberFieldType*, const SwDBData& rDBData, sal_uLong nFormat = 0); virtual OUString Expand() const SAL_OVERRIDE; virtual SwField* Copy() const SAL_OVERRIDE; diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx index 6b98c528b2a8..5fcf8af7460b 100644 --- a/sw/inc/dbgoutsw.hxx +++ b/sw/inc/dbgoutsw.hxx @@ -26,10 +26,10 @@ #include <cstdio> #include <unordered_map> -class SwCntntNode; +class SwContentNode; class SwNode; -class SwTxtAttr; -class SwTxtNode; +class SwTextAttr; +class SwTextNode; class SwpHints; class SfxPoolItem; class SfxItemSet; @@ -38,14 +38,14 @@ class SwPaM; class SwNodeNum; class SwUndo; class SwRect; -class SwFrmFmt; -class SwFrmFmts; +class SwFrameFormat; +class SwFrameFormats; class SwNodes; class SwRewriter; -class SwNumRuleTbl; +class SwNumRuleTable; class SwNumRule; class SwOutlineNodes; -class SwTxtFmtColl; +class SwTextFormatColl; class SwNodeRange; extern bool bDbgOutStdErr; @@ -54,12 +54,12 @@ extern bool bDbgOutPrintAttrSet; SW_DLLPUBLIC const char * dbg_out(const void * pVoid); SW_DLLPUBLIC const char * dbg_out(const OUString & aStr); SW_DLLPUBLIC const char * dbg_out(const SwRect & rRect); -SW_DLLPUBLIC const char * dbg_out(const SwFrmFmt & rFrmFmt); +SW_DLLPUBLIC const char * dbg_out(const SwFrameFormat & rFrameFormat); SW_DLLPUBLIC const char * dbg_out(const SwNode & rNode); SW_DLLPUBLIC const char * dbg_out(const SwNode * pNode); -SW_DLLPUBLIC const char * dbg_out(const SwCntntNode * pNode); -SW_DLLPUBLIC const char * dbg_out(const SwTxtNode * pNode); -SW_DLLPUBLIC const char * dbg_out(const SwTxtAttr & rAttr); +SW_DLLPUBLIC const char * dbg_out(const SwContentNode * pNode); +SW_DLLPUBLIC const char * dbg_out(const SwTextNode * pNode); +SW_DLLPUBLIC const char * dbg_out(const SwTextAttr & rAttr); SW_DLLPUBLIC const char * dbg_out(const SwpHints &rHints); SW_DLLPUBLIC const char * dbg_out(const SfxPoolItem & rItem); SW_DLLPUBLIC const char * dbg_out(const SfxPoolItem * pItem); @@ -72,9 +72,9 @@ SW_DLLPUBLIC const char * dbg_out(const SwUndo & rUndo); SW_DLLPUBLIC const char * dbg_out(SwOutlineNodes & rNodes); SW_DLLPUBLIC const char * dbg_out(const SwRewriter & rRewriter); SW_DLLPUBLIC const char * dbg_out(const SwNumRule & rRule); -SW_DLLPUBLIC const char * dbg_out(const SwTxtFmtColl & rFmt); -SW_DLLPUBLIC const char * dbg_out(const SwFrmFmts & rFrmFmts); -SW_DLLPUBLIC const char * dbg_out(const SwNumRuleTbl & rTbl); +SW_DLLPUBLIC const char * dbg_out(const SwTextFormatColl & rFormat); +SW_DLLPUBLIC const char * dbg_out(const SwFrameFormats & rFrameFormats); +SW_DLLPUBLIC const char * dbg_out(const SwNumRuleTable & rTable); SW_DLLPUBLIC const char * dbg_out(const SwNodeRange & rRange); template<typename tKey, typename tMember, typename fHashFunction> diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 47defa8e0c44..5bf5432fdc0e 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -186,7 +186,7 @@ class SW_DLLPUBLIC SwDBManager { friend class SwConnectionDisposedListener_Impl; - OUString sEMailAddrFld; ///< Mailing: Column name of email address. + OUString sEMailAddrField; ///< Mailing: Column name of email address. OUString sSubject; ///< Mailing: Subject OUString sAttached; ///< Mailing: Attached Files. bool bCancel; ///< Mail merge canceled. @@ -251,7 +251,7 @@ public: void SetSingleJobs(bool b) { bSingleJobs = b; } /// Mailing: Set email data. - inline void SetEMailColumn(const OUString& sColName) { sEMailAddrFld = sColName; } + inline void SetEMailColumn(const OUString& sColName) { sEMailAddrField = sColName; } inline void SetSubject(const OUString& sSbj) { sSubject = sSbj; } inline void SetAttachment(const OUString& sAtt) { sAttached = sAtt; } @@ -265,16 +265,16 @@ public: css::uno::Reference< css::sdbc::XConnection> xConnection, const OUString& rTableName, bool bAppend = false); - static sal_uLong GetColumnFmt( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> xSource, + static sal_uLong GetColumnFormat( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> xSource, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xColumn, - SvNumberFormatter* pNFmtr, + SvNumberFormatter* pNFormatr, long nLanguage ); - sal_uLong GetColumnFmt( const OUString& rDBName, + sal_uLong GetColumnFormat( const OUString& rDBName, const OUString& rTableName, const OUString& rColNm, - SvNumberFormatter* pNFmtr, + SvNumberFormatter* pNFormatr, long nLanguage ); sal_Int32 GetColumnType( const OUString& rDBName, const OUString& rTableName, @@ -301,7 +301,7 @@ public: const OUString& rColumnName, sal_uInt32 nAbsRecordId, long nLanguage, OUString& rResult, double* pNumber); /** create and store or find an already stored connection to a data source for use - in SwFldMgr and SwDBTreeList */ + in SwFieldMgr and SwDBTreeList */ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> RegisterConnection(OUString& rSource); diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index 01298ee7689a..07b5cca5e5ca 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -30,13 +30,13 @@ #include <anchoreddrawobject.hxx> class SfxPoolItem; -class SwFrmFmt; -class SwFlyFrmFmt; +class SwFrameFormat; +class SwFlyFrameFormat; class SwFlyFrm; class SwFrm; class SwPageFrm; class SwVirtFlyDrawObj; -class SwFmtAnchor; +class SwFormatAnchor; class SwFlyDrawObj; class SwRect; class SwDrawContact; @@ -49,9 +49,9 @@ class SdrTextObj; If not it is a simple DrawObject. It has a UserCall which is client of the format we are looking for. Implementation in dcontact.cxx. */ -SW_DLLPUBLIC SwFrmFmt *FindFrmFmt( SdrObject *pObj ); -inline const SwFrmFmt *FindFrmFmt( const SdrObject *pObj ) -{ return ::FindFrmFmt( const_cast<SdrObject*>(pObj) ); } +SW_DLLPUBLIC SwFrameFormat *FindFrameFormat( SdrObject *pObj ); +inline const SwFrameFormat *FindFrameFormat( const SdrObject *pObj ) +{ return ::FindFrameFormat( const_cast<SdrObject*>(pObj) ); } bool HasWrap( const SdrObject* pObj ); void setContextWritingMode( SdrObject* pObj, SwFrm* pAnchor ); @@ -105,7 +105,7 @@ public: TYPEINFO_OVERRIDE(); /// For reader. Only the connection is created. - SwContact( SwFrmFmt *pToRegisterIn ); + SwContact( SwFrameFormat *pToRegisterIn ); virtual ~SwContact(); virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const = 0; @@ -115,9 +115,9 @@ public: virtual SdrObject *GetMaster() = 0; virtual void SetMaster( SdrObject* _pNewMaster ) = 0; - SwFrmFmt *GetFmt() { return static_cast<SwFrmFmt*>(GetRegisteredIn()); } - const SwFrmFmt *GetFmt() const - { return static_cast<const SwFrmFmt*>(GetRegisteredIn()); } + SwFrameFormat *GetFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); } + const SwFrameFormat *GetFormat() const + { return static_cast<const SwFrameFormat*>(GetRegisteredIn()); } bool IsInDTOR() const { return mbInDTOR;} @@ -145,27 +145,27 @@ public: /** some virtual helper methods for information about the object (Writer fly frame resp. drawing object) */ - const SwFmtAnchor& GetAnchorFmt() const + const SwFormatAnchor& GetAnchorFormat() const { - assert( GetFmt() ); + assert( GetFormat() ); - return GetFmt()->GetAnchor(); + return GetFormat()->GetAnchor(); } - RndStdIds GetAnchorId() const { return GetAnchorFmt().GetAnchorId(); } + RndStdIds GetAnchorId() const { return GetAnchorFormat().GetAnchorId(); } bool ObjAnchoredAtPage() const { return GetAnchorId() == FLY_AT_PAGE; } bool ObjAnchoredAtFly() const { return GetAnchorId() == FLY_AT_FLY; } bool ObjAnchoredAtPara() const { return GetAnchorId() == FLY_AT_PARA; } bool ObjAnchoredAtChar() const { return GetAnchorId() == FLY_AT_CHAR; } bool ObjAnchoredAsChar() const { return GetAnchorId() == FLY_AS_CHAR; } - const SwPosition& GetCntntAnchor() const + const SwPosition& GetContentAnchor() const { - assert( GetAnchorFmt().GetCntntAnchor() ); - return *(GetAnchorFmt().GetCntntAnchor()); + assert( GetAnchorFormat().GetContentAnchor() ); + return *(GetAnchorFormat().GetContentAnchor()); } - const SwIndex& GetCntntAnchorIndex() const; + const SwIndex& GetContentAnchorIndex() const; /** get data collection of anchored objects, handled by with contact @@ -198,7 +198,7 @@ public: TYPEINFO_OVERRIDE(); /// Creates DrawObject and registers it with the Model. - SwFlyDrawContact( SwFlyFrmFmt* pToRegisterIn, SdrModel* pMod ); + SwFlyDrawContact( SwFlyFrameFormat* pToRegisterIn, SdrModel* pMod ); virtual ~SwFlyDrawContact(); virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const SAL_OVERRIDE; @@ -390,7 +390,7 @@ class SwDrawContact : public SwContact public: TYPEINFO_OVERRIDE(); - SwDrawContact( SwFrmFmt *pToRegisterIn, SdrObject *pObj ); + SwDrawContact( SwFrameFormat *pToRegisterIn, SdrObject *pObj ); virtual ~SwDrawContact(); virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const SAL_OVERRIDE; @@ -419,9 +419,9 @@ class SwDrawContact : public SwContact SwPageFrm* FindPage( const SwRect &rRect ); /** Inserts SdrObject in the arrays of the layout ((SwPageFrm and SwFrm). - The anchor is determined according to the attribute SwFmtAnchor. + The anchor is determined according to the attribute SwFormatAnchor. If required the object gets unregistered with the old anchor. */ - void ConnectToLayout( const SwFmtAnchor *pAnch = 0 ); + void ConnectToLayout( const SwFormatAnchor *pAnch = 0 ); /** method to insert 'master' drawing object into drawing page */ void InsertMasterIntoDrawPage(); @@ -459,7 +459,7 @@ class SwDrawContact : public SwContact /** get data collection of anchored objects, handled by with contact */ - static void GetTextObjectsFromFmt( std::list<SdrTextObj*>&, SwDoc* ); + static void GetTextObjectsFromFormat( std::list<SdrTextObj*>&, SwDoc* ); virtual void GetAnchoredObjs( std::list<SwAnchoredObject*>& _roAnchoredObjs ) const SAL_OVERRIDE; }; diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 5459308496a9..77a045880e3b 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -82,72 +82,72 @@ class SwAutoCompleteWord; class SwAutoCorrExceptWord; class SwCalc; class SwCellFrm; -class SwCharFmt; -class SwCharFmts; -class SwConditionTxtFmtColl; +class SwCharFormat; +class SwCharFormats; +class SwConditionTextFormatColl; class SwCrsrShell; class SwCursor; class SwDBNameInfField; class SwDocShell; -class SwDocUpdtFld; -class SwDrawFrmFmt; +class SwDocUpdateField; +class SwDrawFrameFormat; class SwDrawView; class SwEditShell; class SwFieldType; class SwField; -class SwTxtFld; -class SwFldTypes; -class SwFlyFrmFmt; -class SwFmtsBase; -class SwFmt; -class SwFmtINetFmt; -class SwFmtRefMark; -class SwFrmFmt; -class SwFrmFmts; -class SwFtnIdxs; -class SwFtnInfo; +class SwTextField; +class SwFieldTypes; +class SwFlyFrameFormat; +class SwFormatsBase; +class SwFormat; +class SwFormatINetFormat; +class SwFormatRefMark; +class SwFrameFormat; +class SwFrameFormats; +class SwFootnoteIdxs; +class SwFootnoteInfo; class SwEndNoteInfo; class GraphicObject; -class SwGrfFmtColl; -class SwGrfFmtColls; +class SwGrfFormatColl; +class SwGrfFormatColls; class SwLineNumberInfo; class SwDBManager; -class SwNoTxtNode; +class SwNoTextNode; class SwNodeIndex; class SwNodeRange; class SwNodes; class SwNumRule; -class SwNumRuleTbl; +class SwNumRuleTable; class SwPageDesc; class SwPagePreviewPrtData; class SwRangeRedline; -class SwRedlineTbl; -class SwExtraRedlineTbl; +class SwRedlineTable; +class SwExtraRedlineTable; class SwRootFrm; class SwRubyList; class SwRubyListEntry; -class SwSectionFmt; -class SwSectionFmts; +class SwSectionFormat; +class SwSectionFormats; class SwSectionData; class SwSelBoxes; class SwTOXBaseSection; class SwTOXTypes; class SwTabCols; class SwTable; -class SwTableAutoFmt; +class SwTableAutoFormat; class SwTableBox; -class SwTableBoxFmt; -class SwTableFmt; -class SwTableLineFmt; +class SwTableBoxFormat; +class SwTableFormat; +class SwTableLineFormat; class SwTableNode; class SwTextBlocks; -class SwTxtFmtColl; -class SwTxtFmtColls; +class SwTextFormatColl; +class SwTextFormatColls; class SwURLStateChanged; class SwUnoCrsr; -class SwUnoCrsrTbl; +class SwUnoCrsrTable; class SwViewShell; -class _SetGetExpFld; +class _SetGetExpField; class SwDrawContact; class SwLayouter; class SdrView; @@ -191,7 +191,7 @@ class IDocumentState; class IDocumentLayoutAccess; class IDocumentStylePoolAccess; class IDocumentExternalData; -class _SetGetExpFlds; +class _SetGetExpFields; namespace sw { namespace mark { class MarkManager; @@ -291,20 +291,20 @@ class SW_DLLPUBLIC SwDoc : const ::boost::scoped_ptr< ::sw::DocumentExternalDataManager > m_pDocumentExternalDataManager; // Pointer - SwFrmFmt *mpDfltFrmFmt; //< Default formats. - SwFrmFmt *mpEmptyPageFmt; //< Format for the default empty page - SwFrmFmt *mpColumnContFmt; //< Format for column container - SwCharFmt *mpDfltCharFmt; - SwTxtFmtColl *mpDfltTxtFmtColl; //< Defaultformatcollections - SwGrfFmtColl *mpDfltGrfFmtColl; - - SwFrmFmts *mpFrmFmtTbl; //< Format table - SwCharFmts *mpCharFmtTbl; - SwFrmFmts *mpSpzFrmFmtTbl; - SwSectionFmts *mpSectionFmtTbl; - SwFrmFmts *mpTblFrmFmtTbl; //< For tables - SwTxtFmtColls *mpTxtFmtCollTbl; //< FormatCollections - SwGrfFmtColls *mpGrfFmtCollTbl; + SwFrameFormat *mpDfltFrameFormat; //< Default formats. + SwFrameFormat *mpEmptyPageFormat; //< Format for the default empty page + SwFrameFormat *mpColumnContFormat; //< Format for column container + SwCharFormat *mpDfltCharFormat; + SwTextFormatColl *mpDfltTextFormatColl; //< Defaultformatcollections + SwGrfFormatColl *mpDfltGrfFormatColl; + + SwFrameFormats *mpFrameFormatTable; //< Format table + SwCharFormats *mpCharFormatTable; + SwFrameFormats *mpSpzFrameFormatTable; + SwSectionFormats *mpSectionFormatTable; + SwFrameFormats *mpTableFrameFormatTable; //< For tables + SwTextFormatColls *mpTextFormatCollTable; //< FormatCollections + SwGrfFormatColls *mpGrfFormatCollTable; SwTOXTypes *mpTOXTypes; //< Tables/indices SwDefTOXBase_Impl * mpDefTOXBases; //< defaults of SwTOXBase's @@ -315,10 +315,10 @@ class SW_DLLPUBLIC SwDoc : SwDoc *mpGlossaryDoc; //< Pointer to glossary-document. SwNumRule *mpOutlineRule; - SwFtnInfo *mpFtnInfo; + SwFootnoteInfo *mpFootnoteInfo; SwEndNoteInfo *mpEndNoteInfo; SwLineNumberInfo*mpLineNumberInfo; - SwFtnIdxs *mpFtnIdxs; + SwFootnoteIdxs *mpFootnoteIdxs; SwDocShell *mpDocShell; //< Ptr to SfxDocShell of Doc. SfxObjectShellLock mxTmpDocShell; //< A temporary shell that is used to copy OLE-Nodes @@ -328,12 +328,12 @@ class SW_DLLPUBLIC SwDoc : SwURLStateChanged *mpURLStateChgd; //< SfxClient for changes in INetHistory SvNumberFormatter *mpNumberFormatter;//< NumFormatter for tables / fields - mutable SwNumRuleTbl *mpNumRuleTbl; //< List of all named NumRules. + mutable SwNumRuleTable *mpNumRuleTable; //< List of all named NumRules. // Hash map to find numrules by name mutable std::unordered_map<OUString, SwNumRule *, OUStringHash> maNumRuleMap; - SwUnoCrsrTbl *mpUnoCrsrTbl; + SwUnoCrsrTable *mpUnoCrsrTable; SwPagePreviewPrtData *mpPgPViewPrtData; //< Indenting / spacing for printing of page view. SwPaM *mpExtInputRing; @@ -373,13 +373,13 @@ private: bool mbInXMLImport : 1; //< TRUE: During xml import, attribute portion building is not necessary. bool mbUpdateTOX : 1; //< TRUE: After loading document, update TOX. bool mbInLoadAsynchron : 1; //< TRUE: Document is in the process of being loaded asynchronously. - bool mbIsAutoFmtRedline : 1; //< TRUE: Redlines are recorded by Autoformat. + bool mbIsAutoFormatRedline : 1; //< TRUE: Redlines are recorded by Autoformat. bool mbOLEPrtNotifyPending : 1; /**< TRUE: Printer has changed. At creation of View notification of OLE-Objects PrtOLENotify() is required. */ bool mbAllOLENotify : 1; //< True: Notification of all objects is required. bool mbIsRedlineMove : 1; //< True: Redlines are moved into to / out of the section. - bool mbInsOnlyTxtGlssry : 1; //< True: insert 'only text' glossary into doc + bool mbInsOnlyTextGlssry : 1; //< True: insert 'only text' glossary into doc bool mbContains_MSVBasic : 1; //< True: MS-VBasic exist is in our storage bool mbClipBoard : 1; //< TRUE: this document represents the clipboard bool mbColumnSelection : 1; /**< TRUE: this content has bee created by a column selection @@ -397,20 +397,20 @@ private: static SwAutoCompleteWord *mpACmpltWords; //< List of all words for AutoComplete // private methods - SwFlyFrmFmt* _MakeFlySection( const SwPosition& rAnchPos, - const SwCntntNode& rNode, RndStdIds eRequestId, + SwFlyFrameFormat* _MakeFlySection( const SwPosition& rAnchPos, + const SwContentNode& rNode, RndStdIds eRequestId, const SfxItemSet* pFlyAttrSet, - SwFrmFmt* = 0 ); - sal_Int8 SetFlyFrmAnchor( SwFrmFmt& rFlyFmt, SfxItemSet& rSet, bool bNewFrms ); - - typedef SwFmt* (SwDoc:: *FNCopyFmt)( const OUString&, SwFmt*, bool, bool ); - SwFmt* CopyFmt( const SwFmt& rFmt, const SwFmtsBase& rFmtArr, - FNCopyFmt fnCopyFmt, const SwFmt& rDfltFmt ); - void CopyFmtArr( const SwFmtsBase& rSourceArr, SwFmtsBase& rDestArr, - FNCopyFmt fnCopyFmt, SwFmt& rDfltFmt ); + SwFrameFormat* = 0 ); + sal_Int8 SetFlyFrmAnchor( SwFrameFormat& rFlyFormat, SfxItemSet& rSet, bool bNewFrms ); + + typedef SwFormat* (SwDoc:: *FNCopyFormat)( const OUString&, SwFormat*, bool, bool ); + SwFormat* CopyFormat( const SwFormat& rFormat, const SwFormatsBase& rFormatArr, + FNCopyFormat fnCopyFormat, const SwFormat& rDfltFormat ); + void CopyFormatArr( const SwFormatsBase& rSourceArr, SwFormatsBase& rDestArr, + FNCopyFormat fnCopyFormat, SwFormat& rDfltFormat ); void CopyPageDescHeaderFooterImpl( bool bCpyHeader, - const SwFrmFmt& rSrcFmt, SwFrmFmt& rDestFmt ); - static SwFmt* FindFmtByName( const SwFmtsBase& rFmtArr, const OUString& rName ); + const SwFrameFormat& rSrcFormat, SwFrameFormat& rDestFormat ); + static SwFormat* FindFormatByName( const SwFormatsBase& rFormatArr, const OUString& rName ); SwDoc( const SwDoc &) SAL_DELETED_FUNCTION; @@ -428,15 +428,15 @@ private: void _CreateNumberFormatter(); - bool _UnProtectTblCells( SwTable& rTbl ); + bool _UnProtectTableCells( SwTable& rTable ); /** Create sub-documents according to the given collection. If no collection is given, take chapter style of the 1st level. */ bool SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline, - const SwTxtFmtColl* pSplitColl, int nOutlineLevel = 0 ); + const SwTextFormatColl* pSplitColl, int nOutlineLevel = 0 ); // Update charts of given table. - void _UpdateCharts( const SwTable& rTbl, SwViewShell const & rVSh ) const; + void _UpdateCharts( const SwTable& rTable, SwViewShell const & rVSh ) const; static bool _SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rRubyEntry, sal_uInt16 nMode ); @@ -446,11 +446,11 @@ private: DECL_LINK_TYPED( DoUpdateModifiedOLE, Idle *, void ); public: - SwFmt *_MakeCharFmt(const OUString &, SwFmt *, bool, bool ); - SwFmt *_MakeFrmFmt(const OUString &, SwFmt *, bool, bool ); + SwFormat *_MakeCharFormat(const OUString &, SwFormat *, bool, bool ); + SwFormat *_MakeFrameFormat(const OUString &, SwFormat *, bool, bool ); private: - SwFmt *_MakeTxtFmtColl(const OUString &, SwFmt *, bool, bool ); + SwFormat *_MakeTextFormatColl(const OUString &, SwFormat *, bool, bool ); private: bool mbReadOnly; @@ -532,7 +532,7 @@ public: ::sw::DocumentContentOperationsManager const & GetDocumentContentOperationsManager() const; ::sw::DocumentContentOperationsManager & GetDocumentContentOperationsManager(); - bool UpdateParRsid( SwTxtNode *pTxtNode, sal_uInt32 nVal = 0 ); + bool UpdateParRsid( SwTextNode *pTextNode, sal_uInt32 nVal = 0 ); bool UpdateRsid( const SwPaM &rRg, sal_Int32 nLen ); // IDocumentStylePoolAccess @@ -635,18 +635,18 @@ public: have to be surrounded completely by ::com::sun::star::awt::Selection. ( Start < Pos < End ) !!! (Required for Writers.) */ - SwPosFlyFrms GetAllFlyFmts( const SwPaM* = 0, + SwPosFlyFrms GetAllFlyFormats( const SwPaM* = 0, bool bDrawAlso = false, bool bAsCharAlso = false ) const; // Because swrtf.cxx and define private public here now. - SwFlyFrmFmt *MakeFlyFrmFmt (const OUString &rFmtName, SwFrmFmt *pDerivedFrom); - SwDrawFrmFmt *MakeDrawFrmFmt(const OUString &rFmtName, SwFrmFmt *pDerivedFrom); + SwFlyFrameFormat *MakeFlyFrameFormat (const OUString &rFormatName, SwFrameFormat *pDerivedFrom); + SwDrawFrameFormat *MakeDrawFrameFormat(const OUString &rFormatName, SwFrameFormat *pDerivedFrom); // From now on this interface has to be used for Flys. // pAnchorPos must be set, if they are not attached to pages AND - // Anchor is not already set at valid CntntPos - // in FlySet/FrmFmt. + // Anchor is not already set at valid ContentPos + // in FlySet/FrameFormat. /* new parameter bCalledFromShell true: An existing adjust item at pAnchorPos is propagated to @@ -656,14 +656,14 @@ public: false: no propagation */ - SwFlyFrmFmt* MakeFlySection( RndStdIds eAnchorType, + SwFlyFrameFormat* MakeFlySection( RndStdIds eAnchorType, const SwPosition* pAnchorPos, const SfxItemSet* pSet = 0, - SwFrmFmt *pParent = 0, + SwFrameFormat *pParent = 0, bool bCalledFromShell = false ); - SwFlyFrmFmt* MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet, + SwFlyFrameFormat* MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet, const SwSelBoxes* pSelBoxes = 0, - SwFrmFmt *pParent = 0 ); + SwFrameFormat *pParent = 0 ); //UUUU Helper that checks for unique items for DrawingLayer items of type NameOrIndex // and evtl. corrects that items to ensure unique names for that type. This call may @@ -672,25 +672,25 @@ public: // these items work for the UNO API and thus e.g. for ODF im/export) void CheckForUniqueItemForLineFillNameOrIndex(SfxItemSet& rSet); - bool SetFlyFrmAttr( SwFrmFmt& rFlyFmt, SfxItemSet& rSet ); + bool SetFlyFrmAttr( SwFrameFormat& rFlyFormat, SfxItemSet& rSet ); - bool SetFrmFmtToFly( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFmt, + bool SetFrameFormatToFly( SwFrameFormat& rFlyFormat, SwFrameFormat& rNewFormat, SfxItemSet* pSet = 0, bool bKeepOrient = false ); - void SetFlyFrmTitle( SwFlyFrmFmt& rFlyFrmFmt, + void SetFlyFrmTitle( SwFlyFrameFormat& rFlyFrameFormat, const OUString& sNewTitle ); - void SetFlyFrmDescription( SwFlyFrmFmt& rFlyFrmFmt, + void SetFlyFrmDescription( SwFlyFrameFormat& rFlyFrameFormat, const OUString& sNewDescription ); // Footnotes // Footnote information - const SwFtnInfo& GetFtnInfo() const { return *mpFtnInfo; } - void SetFtnInfo(const SwFtnInfo& rInfo); + const SwFootnoteInfo& GetFootnoteInfo() const { return *mpFootnoteInfo; } + void SetFootnoteInfo(const SwFootnoteInfo& rInfo); const SwEndNoteInfo& GetEndNoteInfo() const { return *mpEndNoteInfo; } void SetEndNoteInfo(const SwEndNoteInfo& rInfo); - SwFtnIdxs& GetFtnIdxs() { return *mpFtnIdxs; } - const SwFtnIdxs& GetFtnIdxs() const { return *mpFtnIdxs; } + SwFootnoteIdxs& GetFootnoteIdxs() { return *mpFootnoteIdxs; } + const SwFootnoteIdxs& GetFootnoteIdxs() const { return *mpFootnoteIdxs; } // change footnotes in area - bool SetCurFtn( const SwPaM& rPam, const OUString& rNumStr, + bool SetCurFootnote( const SwPaM& rPam, const OUString& rNumStr, sal_uInt16 nNumber, bool bIsEndNote ); /** Operations on the content of the document e.g. @@ -712,7 +712,7 @@ public: // Glossary Document void SetGlossDoc( bool bGlssDc = true ) { mbGlossDoc = bGlssDc; } - bool IsInsOnlyTextGlossary() const { return mbInsOnlyTxtGlssry; } + bool IsInsOnlyTextGlossary() const { return mbInsOnlyTextGlssry; } void Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, bool bImpress ); @@ -747,34 +747,34 @@ public: std::set<SwRootFrm*> GetAllLayouts(); - void SetFlyName( SwFlyFrmFmt& rFmt, const OUString& rName ); - const SwFlyFrmFmt* FindFlyByName( const OUString& rName, sal_Int8 nNdTyp = 0 ) const; + void SetFlyName( SwFlyFrameFormat& rFormat, const OUString& rName ); + const SwFlyFrameFormat* FindFlyByName( const OUString& rName, sal_Int8 nNdTyp = 0 ) const; - static void GetGrfNms( const SwFlyFrmFmt& rFmt, OUString* pGrfName, OUString* pFltName ); + static void GetGrfNms( const SwFlyFrameFormat& rFormat, OUString* pGrfName, OUString* pFltName ); // Set a valid name for all Flys that have none (Called by Readers after reading). void SetAllUniqueFlyNames(); - /** Reset attributes. All TxtHints and (if completely selected) all hard- + /** Reset attributes. All TextHints and (if completely selected) all hard- formatted stuff (auto-formats) are removed. Introduce new optional parameter <bSendDataChangedEvents> in order to control, if the side effect "send data changed events" is triggered or not. */ void ResetAttrs( const SwPaM &rRg, - bool bTxtAttr = true, + bool bTextAttr = true, const std::set<sal_uInt16> &rAttrs = std::set<sal_uInt16>(), const bool bSendDataChangedEvents = true ); - void RstTxtAttrs(const SwPaM &rRg, bool bInclRefToxMark = false, bool bExactRange = false ); + void RstTextAttrs(const SwPaM &rRg, bool bInclRefToxMark = false, bool bExactRange = false ); /** Set attribute in given format.1y * If Undo is enabled, the old values is added to the Undo history. */ - void SetAttr( const SfxPoolItem&, SwFmt& ); + void SetAttr( const SfxPoolItem&, SwFormat& ); /** Set attribute in given format.1y * If Undo is enabled, the old values is added to the Undo history. */ - void SetAttr( const SfxItemSet&, SwFmt& ); + void SetAttr( const SfxItemSet&, SwFormat& ); // method to reset a certain attribute at the given format void ResetAttrAtFormat( const sal_uInt16 nWhichId, - SwFmt& rChangedFormat ); + SwFormat& rChangedFormat ); /** Set attribute as new default attribute in current document. If Undo is activated, the old one is listed in Undo-History. */ @@ -782,107 +782,107 @@ public: void SetDefault( const SfxItemSet& ); // Query default attribute in this document. - const SfxPoolItem& GetDefault( sal_uInt16 nFmtHint ) const; + const SfxPoolItem& GetDefault( sal_uInt16 nFormatHint ) const; // Do not expand text attributes. - bool DontExpandFmt( const SwPosition& rPos, bool bFlag = true ); + bool DontExpandFormat( const SwPosition& rPos, bool bFlag = true ); // Formats - const SwFrmFmts* GetFrmFmts() const { return mpFrmFmtTbl; } - SwFrmFmts* GetFrmFmts() { return mpFrmFmtTbl; } - const SwCharFmts* GetCharFmts() const { return mpCharFmtTbl;} - SwCharFmts* GetCharFmts() { return mpCharFmtTbl;} + const SwFrameFormats* GetFrameFormats() const { return mpFrameFormatTable; } + SwFrameFormats* GetFrameFormats() { return mpFrameFormatTable; } + const SwCharFormats* GetCharFormats() const { return mpCharFormatTable;} + SwCharFormats* GetCharFormats() { return mpCharFormatTable;} // LayoutFormats (frames, DrawObjects), sometimes const sometimes not - const SwFrmFmts* GetSpzFrmFmts() const { return mpSpzFrmFmtTbl; } - SwFrmFmts* GetSpzFrmFmts() { return mpSpzFrmFmtTbl; } - - const SwFrmFmt *GetDfltFrmFmt() const { return mpDfltFrmFmt; } - SwFrmFmt *GetDfltFrmFmt() { return mpDfltFrmFmt; } - const SwFrmFmt *GetEmptyPageFmt() const { return mpEmptyPageFmt; } - SwFrmFmt *GetEmptyPageFmt() { return mpEmptyPageFmt; } - const SwFrmFmt *GetColumnContFmt() const{ return mpColumnContFmt; } - SwFrmFmt *GetColumnContFmt() { return mpColumnContFmt; } - const SwCharFmt *GetDfltCharFmt() const { return mpDfltCharFmt;} - SwCharFmt *GetDfltCharFmt() { return mpDfltCharFmt;} + const SwFrameFormats* GetSpzFrameFormats() const { return mpSpzFrameFormatTable; } + SwFrameFormats* GetSpzFrameFormats() { return mpSpzFrameFormatTable; } + + const SwFrameFormat *GetDfltFrameFormat() const { return mpDfltFrameFormat; } + SwFrameFormat *GetDfltFrameFormat() { return mpDfltFrameFormat; } + const SwFrameFormat *GetEmptyPageFormat() const { return mpEmptyPageFormat; } + SwFrameFormat *GetEmptyPageFormat() { return mpEmptyPageFormat; } + const SwFrameFormat *GetColumnContFormat() const{ return mpColumnContFormat; } + SwFrameFormat *GetColumnContFormat() { return mpColumnContFormat; } + const SwCharFormat *GetDfltCharFormat() const { return mpDfltCharFormat;} + SwCharFormat *GetDfltCharFormat() { return mpDfltCharFormat;} // @return the interface of the management of (auto)styles IStyleAccess& GetIStyleAccess() { return *mpStyleAccess; } // Remove all language dependencies from all existing formats - void RemoveAllFmtLanguageDependencies(); + void RemoveAllFormatLanguageDependencies(); - SwFrmFmt *MakeFrmFmt(const OUString &rFmtName, SwFrmFmt *pDerivedFrom, + SwFrameFormat *MakeFrameFormat(const OUString &rFormatName, SwFrameFormat *pDerivedFrom, bool bBroadcast = false, bool bAuto = true); - void DelFrmFmt( SwFrmFmt *pFmt, bool bBroadcast = false ); - SwFrmFmt* FindFrmFmtByName( const OUString& rName ) const - { return static_cast<SwFrmFmt*>(FindFmtByName( static_cast<SwFmtsBase&>(*mpFrmFmtTbl), rName )); } + void DelFrameFormat( SwFrameFormat *pFormat, bool bBroadcast = false ); + SwFrameFormat* FindFrameFormatByName( const OUString& rName ) const + { return static_cast<SwFrameFormat*>(FindFormatByName( static_cast<SwFormatsBase&>(*mpFrameFormatTable), rName )); } - SwCharFmt *MakeCharFmt(const OUString &rFmtName, SwCharFmt *pDerivedFrom, + SwCharFormat *MakeCharFormat(const OUString &rFormatName, SwCharFormat *pDerivedFrom, bool bBroadcast = false, bool bAuto = true ); - void DelCharFmt(size_t nFmt, bool bBroadcast = false); - void DelCharFmt(SwCharFmt* pFmt, bool bBroadcast = false); - SwCharFmt* FindCharFmtByName( const OUString& rName ) const - { return static_cast<SwCharFmt*>(FindFmtByName( (SwFmtsBase&)*mpCharFmtTbl, rName )); } + void DelCharFormat(size_t nFormat, bool bBroadcast = false); + void DelCharFormat(SwCharFormat* pFormat, bool bBroadcast = false); + SwCharFormat* FindCharFormatByName( const OUString& rName ) const + { return static_cast<SwCharFormat*>(FindFormatByName( (SwFormatsBase&)*mpCharFormatTable, rName )); } // Formatcollections (styles) // TXT - const SwTxtFmtColl* GetDfltTxtFmtColl() const { return mpDfltTxtFmtColl; } - SwTxtFmtColl* GetDfltTxtFmtColl() { return mpDfltTxtFmtColl; } - const SwTxtFmtColls *GetTxtFmtColls() const { return mpTxtFmtCollTbl; } - SwTxtFmtColls *GetTxtFmtColls() { return mpTxtFmtCollTbl; } - SwTxtFmtColl *MakeTxtFmtColl( const OUString &rFmtName, - SwTxtFmtColl *pDerivedFrom, + const SwTextFormatColl* GetDfltTextFormatColl() const { return mpDfltTextFormatColl; } + SwTextFormatColl* GetDfltTextFormatColl() { return mpDfltTextFormatColl; } + const SwTextFormatColls *GetTextFormatColls() const { return mpTextFormatCollTable; } + SwTextFormatColls *GetTextFormatColls() { return mpTextFormatCollTable; } + SwTextFormatColl *MakeTextFormatColl( const OUString &rFormatName, + SwTextFormatColl *pDerivedFrom, bool bBroadcast = false, bool bAuto = true ); - SwConditionTxtFmtColl* MakeCondTxtFmtColl( const OUString &rFmtName, - SwTxtFmtColl *pDerivedFrom, + SwConditionTextFormatColl* MakeCondTextFormatColl( const OUString &rFormatName, + SwTextFormatColl *pDerivedFrom, bool bBroadcast = false); - void DelTxtFmtColl(size_t nFmt, bool bBroadcast = false); - void DelTxtFmtColl( SwTxtFmtColl* pColl, bool bBroadcast = false ); + void DelTextFormatColl(size_t nFormat, bool bBroadcast = false); + void DelTextFormatColl( SwTextFormatColl* pColl, bool bBroadcast = false ); /** Add 4th optional parameter <bResetListAttrs>. - 'side effect' of <SetTxtFmtColl> with <bReset = true> is that the hard + 'side effect' of <SetTextFormatColl> with <bReset = true> is that the hard attributes of the affected text nodes are cleared, except the break attribute, the page description attribute and the list style attribute. The new parameter <bResetListAttrs> indicates, if the list attributes (list style, restart at and restart with) are cleared as well in case that <bReset = true> and the paragraph style has a list style attribute set. */ - bool SetTxtFmtColl(const SwPaM &rRg, SwTxtFmtColl *pFmt, + bool SetTextFormatColl(const SwPaM &rRg, SwTextFormatColl *pFormat, const bool bReset = true, const bool bResetListAttrs = false); - SwTxtFmtColl* FindTxtFmtCollByName( const OUString& rName ) const - { return static_cast<SwTxtFmtColl*>(FindFmtByName( (SwFmtsBase&)*mpTxtFmtCollTbl, rName )); } + SwTextFormatColl* FindTextFormatCollByName( const OUString& rName ) const + { return static_cast<SwTextFormatColl*>(FindFormatByName( (SwFormatsBase&)*mpTextFormatCollTable, rName )); } void ChkCondColls(); - const SwGrfFmtColl* GetDfltGrfFmtColl() const { return mpDfltGrfFmtColl; } - SwGrfFmtColl* GetDfltGrfFmtColl() { return mpDfltGrfFmtColl; } - const SwGrfFmtColls *GetGrfFmtColls() const { return mpGrfFmtCollTbl; } - SwGrfFmtColl *MakeGrfFmtColl(const OUString &rFmtName, - SwGrfFmtColl *pDerivedFrom); - SwGrfFmtColl* FindGrfFmtCollByName( const OUString& rName ) const - { return static_cast<SwGrfFmtColl*>(FindFmtByName( (SwFmtsBase&)*mpGrfFmtCollTbl, rName )); } + const SwGrfFormatColl* GetDfltGrfFormatColl() const { return mpDfltGrfFormatColl; } + SwGrfFormatColl* GetDfltGrfFormatColl() { return mpDfltGrfFormatColl; } + const SwGrfFormatColls *GetGrfFormatColls() const { return mpGrfFormatCollTable; } + SwGrfFormatColl *MakeGrfFormatColl(const OUString &rFormatName, + SwGrfFormatColl *pDerivedFrom); + SwGrfFormatColl* FindGrfFormatCollByName( const OUString& rName ) const + { return static_cast<SwGrfFormatColl*>(FindFormatByName( (SwFormatsBase&)*mpGrfFormatCollTable, rName )); } // Table formatting - const SwFrmFmts* GetTblFrmFmts() const { return mpTblFrmFmtTbl; } - SwFrmFmts* GetTblFrmFmts() { return mpTblFrmFmtTbl; } - size_t GetTblFrmFmtCount( bool bUsed ) const; - SwFrmFmt& GetTblFrmFmt(size_t nFmt, bool bUsed ) const; - SwTableFmt* MakeTblFrmFmt(const OUString &rFmtName, SwFrmFmt *pDerivedFrom); - void DelTblFrmFmt( SwTableFmt* pFmt ); - SwTableFmt* FindTblFmtByName( const OUString& rName, bool bAll = false ) const; + const SwFrameFormats* GetTableFrameFormats() const { return mpTableFrameFormatTable; } + SwFrameFormats* GetTableFrameFormats() { return mpTableFrameFormatTable; } + size_t GetTableFrameFormatCount( bool bUsed ) const; + SwFrameFormat& GetTableFrameFormat(size_t nFormat, bool bUsed ) const; + SwTableFormat* MakeTableFrameFormat(const OUString &rFormatName, SwFrameFormat *pDerivedFrom); + void DelTableFrameFormat( SwTableFormat* pFormat ); + SwTableFormat* FindTableFormatByName( const OUString& rName, bool bAll = false ) const; /** Access to frames. Iterate over Flys - forr Basic-Collections. */ size_t GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false ) const; - SwFrmFmt* GetFlyNum(size_t nIdx, FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false ); + SwFrameFormat* GetFlyNum(size_t nIdx, FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false ); // Copy formats in own arrays and return them. - SwFrmFmt *CopyFrmFmt ( const SwFrmFmt& ); - SwCharFmt *CopyCharFmt( const SwCharFmt& ); - SwTxtFmtColl* CopyTxtColl( const SwTxtFmtColl& rColl ); - SwGrfFmtColl* CopyGrfColl( const SwGrfFmtColl& rColl ); + SwFrameFormat *CopyFrameFormat ( const SwFrameFormat& ); + SwCharFormat *CopyCharFormat( const SwCharFormat& ); + SwTextFormatColl* CopyTextColl( const SwTextFormatColl& rColl ); + SwGrfFormatColl* CopyGrfColl( const SwGrfFormatColl& rColl ); // Replace all styles with those from rSource. void ReplaceStyles( const SwDoc& rSource, bool bIncludePageStyles = true ); @@ -948,19 +948,19 @@ public: bool ContainsPageDesc(const SwPageDesc *pDesc, size_t* pPos = NULL); /** Copy the complete PageDesc - beyond document and "deep"! - Optionally copying of PoolFmtId, -HlpId can be prevented. */ + Optionally copying of PoolFormatId, -HlpId can be prevented. */ void CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc, bool bCopyPoolIds = true ); - /** Copy header (with contents) from SrcFmt to DestFmt + /** Copy header (with contents) from SrcFormat to DestFormat (can also be copied into other document). */ - void CopyHeader( const SwFrmFmt& rSrcFmt, SwFrmFmt& rDestFmt ) - { CopyPageDescHeaderFooterImpl( true, rSrcFmt, rDestFmt ); } + void CopyHeader( const SwFrameFormat& rSrcFormat, SwFrameFormat& rDestFormat ) + { CopyPageDescHeaderFooterImpl( true, rSrcFormat, rDestFormat ); } - /** Copy footer (with contents) from SrcFmt to DestFmt. + /** Copy footer (with contents) from SrcFormat to DestFormat. (can also be copied into other document). */ - void CopyFooter( const SwFrmFmt& rSrcFmt, SwFrmFmt& rDestFmt ) - { CopyPageDescHeaderFooterImpl( false, rSrcFmt, rDestFmt ); } + void CopyFooter( const SwFrameFormat& rSrcFormat, SwFrameFormat& rDestFormat ) + { CopyPageDescHeaderFooterImpl( false, rSrcFormat, rDestFormat ); } // For Reader void ChgPageDesc( const OUString & rName, const SwPageDesc& ); @@ -977,7 +977,7 @@ public: /** The html import sometimes overwrites the page sizes set in the page descriptions. This function is used to correct this. */ - void CheckDefaultPageFmt(); + void CheckDefaultPageFormat(); // Methods for tables/indices static sal_uInt16 GetCurTOXMark( const SwPosition& rPos, SwTOXMarks& ); @@ -1041,7 +1041,7 @@ public: sal_uInt16 GetTOIKeys( SwTOIKeyType eTyp, std::vector<OUString>& rArr ) const; // Sort table text. - bool SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions&); + bool SortTable(const SwSelBoxes& rBoxes, const SwSortOptions&); bool SortText(const SwPaM&, const SwSortOptions&); // Correct the SwPosition-Objects that are registered with the document @@ -1118,7 +1118,7 @@ public: static SwNumRule* GetNumRuleAtPos( const SwPosition& rPos ); - const SwNumRuleTbl& GetNumRuleTbl() const { return *mpNumRuleTbl; } + const SwNumRuleTable& GetNumRuleTable() const { return *mpNumRuleTable; } /** Add numbering rule to document. @@ -1143,7 +1143,7 @@ public: OUString GetUniqueNumRuleName( const OUString* pChkStr = 0, bool bAutoNum = true ) const; void UpdateNumRule(); // Update all invalids. - void ChgNumRuleFmts( const SwNumRule& rRule ); + void ChgNumRuleFormats( const SwNumRule& rRule ); bool ReplaceNumRule( const SwPosition& rPos, const OUString& rOldRule, const OUString& rNewRule ); @@ -1213,28 +1213,28 @@ public: propagation. false: do not propagate */ - const SwTable* InsertTable( const SwInsertTableOptions& rInsTblOpts, // HEADLINE_NO_BORDER + const SwTable* InsertTable( const SwInsertTableOptions& rInsTableOpts, // HEADLINE_NO_BORDER const SwPosition& rPos, sal_uInt16 nRows, sal_uInt16 nCols, short eAdjust, - const SwTableAutoFmt* pTAFmt = 0, + const SwTableAutoFormat* pTAFormat = 0, const std::vector<sal_uInt16> *pColArr = 0, bool bCalledFromShell = false, bool bNewModel = true ); // If index is in a table, return TableNode, else 0. - SwTableNode* IsIdxInTbl( const SwNodeIndex& rIdx ); - inline const SwTableNode* IsIdxInTbl( const SwNodeIndex& rIdx ) const; + SwTableNode* IsIdxInTable( const SwNodeIndex& rIdx ); + inline const SwTableNode* IsIdxInTable( const SwNodeIndex& rIdx ) const; // Create a balanced table out of the selected range. - const SwTable* TextToTable( const SwInsertTableOptions& rInsTblOpts, // HEADLINE_NO_BORDER, + const SwTable* TextToTable( const SwInsertTableOptions& rInsTableOpts, // HEADLINE_NO_BORDER, const SwPaM& rRange, sal_Unicode cCh, short eAdjust, - const SwTableAutoFmt* = 0 ); + const SwTableAutoFormat* = 0 ); // text to table conversion - API support const SwTable* TextToTable( const std::vector< std::vector<SwNodeRange> >& rTableNodes ); - bool TableToText( const SwTableNode* pTblNd, sal_Unicode cCh ); + bool TableToText( const SwTableNode* pTableNd, sal_Unicode cCh ); // Create columns / rows in table. bool InsertCol( const SwCursor& rCursor, @@ -1252,15 +1252,15 @@ public: bool DeleteCol( const SwCursor& rCursor ); // Split / concatenate boxes in table. - bool SplitTbl( const SwSelBoxes& rBoxes, bool bVert = true, + bool SplitTable( const SwSelBoxes& rBoxes, bool bVert = true, sal_uInt16 nCnt = 1, bool bSameHeight = false ); // @return enum TableMergeErr. - sal_uInt16 MergeTbl( SwPaM& rPam ); - OUString GetUniqueTblName() const; - bool IsInsTblFormatNum() const; - bool IsInsTblChangeNumFormat() const; - bool IsInsTblAlignNum() const; + sal_uInt16 MergeTable( SwPaM& rPam ); + OUString GetUniqueTableName() const; + bool IsInsTableFormatNum() const; + bool IsInsTableChangeNumFormat() const; + bool IsInsTableAlignNum() const; // From FEShell (for Undo and BModified). static void GetTabCols( SwTabCols &rFill, const SwCursor* pCrsr, @@ -1279,34 +1279,34 @@ public: void SetRowsToRepeat( SwTable &rTable, sal_uInt16 nSet ); // AutoFormat for table/table selection. - bool SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNew ); + bool SetTableAutoFormat( const SwSelBoxes& rBoxes, const SwTableAutoFormat& rNew ); // Query attributes. - bool GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet ); + bool GetTableAutoFormat( const SwSelBoxes& rBoxes, SwTableAutoFormat& rGet ); void AppendUndoForInsertFromDB( const SwPaM& rPam, bool bIsTable ); bool SetColRowWidthHeight( SwTableBox& rAktBox, sal_uInt16 eType, SwTwips nAbsDiff, SwTwips nRelDiff ); - SwTableBoxFmt* MakeTableBoxFmt(); - SwTableLineFmt* MakeTableLineFmt(); + SwTableBoxFormat* MakeTableBoxFormat(); + SwTableLineFormat* MakeTableLineFormat(); // Check if box has numerical valule. Change format of box if required. - void ChkBoxNumFmt( SwTableBox& rAktBox, bool bCallUpdate ); - void SetTblBoxFormulaAttrs( SwTableBox& rBox, const SfxItemSet& rSet ); + void ChkBoxNumFormat( SwTableBox& rAktBox, bool bCallUpdate ); + void SetTableBoxFormulaAttrs( SwTableBox& rBox, const SfxItemSet& rSet ); void ClearBoxNumAttrs( const SwNodeIndex& rNode ); void ClearLineNumAttrs( SwPosition & rPos ); - bool InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes, - const SwTable* pCpyTbl = 0, bool bCpyN |