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 /sw/inc | |
| parent | 0db96caf0fcce09b87621c11b584a6d81cc7df86 (diff) | |
bin/rename-sw-abbreviations.sh
libreoffice-5-0-branch-point
renames the most annoying abbreviations in Writer (and partially
in the shared code too).
Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9
Diffstat (limited to 'sw/inc')
169 files changed, 2920 insertions, 2920 deletions
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 bCpyName = false, + bool InsCopyOfTable( SwPosition& rInsPos, const SwSelBoxes& rBoxes, + const SwTable* pCpyTable = 0, bool bCpyName = false, bool bCorrPos = false ); - bool UnProtectCells( const OUString& rTblName ); + bool UnProtectCells( const OUString& rTableName ); bool UnProtectCells( const SwSelBoxes& rBoxes ); - bool UnProtectTbls( const SwPaM& rPam ); - bool HasTblAnyProtection( const SwPosition* pPos, - const OUString* pTblName = 0, - bool* pFullTblProtection = 0 ); + bool UnProtectTables( const SwPaM& rPam ); + bool HasTableAnyProtection( const SwPosition* pPos, + const OUString* pTableName = 0, + bool* pFullTableProtection = 0 ); // Split table at baseline position, i.e. create a new table. bool SplitTable( const SwPosition& rPos, sal_uInt16 eMode = 0, @@ -1324,26 +1324,26 @@ public: void UpdateAllCharts() { DoUpdateAllCharts(); } // Table is renamed and refreshes charts. - void SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName ); + void SetTableName( SwFrameFormat& rTableFormat, const OUString &rNewName ); // @return the reference in document that is set for name. - const SwFmtRefMark* GetRefMark( const OUString& rName ) const; + const SwFormatRefMark* GetRefMark( const OUString& rName ) const; // @return RefMark via index - for UNO. - const SwFmtRefMark* GetRefMark( sal_uInt16 nIndex ) const; + const SwFormatRefMark* GetRefMark( sal_uInt16 nIndex ) const; /** @return names of all references that are set in document. If array pointer is 0 return only whether a RefMark is set in document. */ sal_uInt16 GetRefMarks( std::vector<OUString>* = 0 ) const; // Insert label. If a FlyFormat is created, return it. - SwFlyFrmFmt* InsertLabel( const SwLabelType eType, const OUString &rTxt, const OUString& rSeparator, + SwFlyFrameFormat* InsertLabel( const SwLabelType eType, const OUString &rText, const OUString& rSeparator, const OUString& rNumberingSeparator, const bool bBefore, const sal_uInt16 nId, const sal_uLong nIdx, const OUString& rCharacterStyle, const bool bCpyBrd = true ); - SwFlyFrmFmt* InsertDrawLabel( - const OUString &rTxt, const OUString& rSeparator, const OUString& rNumberSeparator, + SwFlyFrameFormat* InsertDrawLabel( + const OUString &rText, const OUString& rSeparator, const OUString& rNumberSeparator, const sal_uInt16 nId, const OUString& rCharacterStyle, SdrObject& rObj ); // Query attribute pool. @@ -1366,10 +1366,10 @@ public: static sal_uInt16 IsInsRegionAvailable( const SwPaM& rRange, const SwNode** ppSttNd = 0 ); static SwSection* GetCurrSection( const SwPosition& rPos ); - SwSectionFmts& GetSections() { return *mpSectionFmtTbl; } - const SwSectionFmts& GetSections() const { return *mpSectionFmtTbl; } - SwSectionFmt *MakeSectionFmt( SwSectionFmt *pDerivedFrom ); - void DelSectionFmt( SwSectionFmt *pFmt, bool bDelNodes = false ); + SwSectionFormats& GetSections() { return *mpSectionFormatTable; } + const SwSectionFormats& GetSections() const { return *mpSectionFormatTable; } + SwSectionFormat *MakeSectionFormat( SwSectionFormat *pDerivedFrom ); + void DelSectionFormat( SwSectionFormat *pFormat, bool bDelNodes = false ); void UpdateSection(size_t const nSect, SwSectionData &, SfxItemSet const*const = 0, bool const bPreventLinkUpdate = false); OUString GetUniqueSectionName( const OUString* pChkStr = 0 ) const; @@ -1426,7 +1426,7 @@ public: SwAutoCorrExceptWord* GetAutoCorrExceptWord() { return mpACEWord; } void DeleteAutoCorrExceptWord(); - const SwFmtINetFmt* FindINetAttr( const OUString& rName ) const; + const SwFormatINetFormat* FindINetAttr( const OUString& rName ) const; // Call into intransparent Basic; expect possible Return String. bool ExecMacro( const SvxMacro& rMacro, OUString* pRet = 0, SbxArray* pArgs = 0 ); @@ -1457,10 +1457,10 @@ public: // Create sub-documents according to given collection. // If no collection is given, use chapter styles for 1st level. bool GenerateGlobalDoc( const OUString& rPath, - const SwTxtFmtColl* pSplitColl = 0 ); + const SwTextFormatColl* pSplitColl = 0 ); bool GenerateGlobalDoc( const OUString& rPath, int nOutlineLevel = 0 ); bool GenerateHTMLDoc( const OUString& rPath, - const SwTxtFmtColl* pSplitColl = 0 ); + const SwTextFormatColl* pSplitColl = 0 ); bool GenerateHTMLDoc( const OUString& rPath, int nOutlineLevel = 0 ); // Compare two documents. @@ -1469,13 +1469,13 @@ public: // Merge two documents. long MergeDoc( const SwDoc& rDoc ); - bool IsAutoFmtRedline() const { return mbIsAutoFmtRedline; } - void SetAutoFmtRedline( bool bFlag ) { mbIsAutoFmtRedline = bFlag; } + bool IsAutoFormatRedline() const { return mbIsAutoFormatRedline; } + void SetAutoFormatRedline( bool bFlag ) { mbIsAutoFormatRedline = bFlag; } // For AutoFormat: with Undo/Redlining. - void SetTxtFmtCollByAutoFmt( const SwPosition& rPos, sal_uInt16 nPoolId, + void SetTextFormatCollByAutoFormat( const SwPosition& rPos, sal_uInt16 nPoolId, const SfxItemSet* pSet = 0 ); - void SetFmtItemByAutoFmt( const SwPaM& rPam, const SfxItemSet& ); + void SetFormatItemByAutoFormat( const SwPaM& rPam, const SfxItemSet& ); // Only for SW-textbloxks! Does not pay any attention to layout! void ClearDoc(); // Deletes all content! @@ -1493,8 +1493,8 @@ public: void SetOLEObjModified(); // Uno - Interfaces - const SwUnoCrsrTbl& GetUnoCrsrTbl() const { return *mpUnoCrsrTbl; } - SwUnoCrsr* CreateUnoCrsr( const SwPosition& rPos, bool bTblCrsr = false ); + const SwUnoCrsrTable& GetUnoCrsrTable() const { return *mpUnoCrsrTable; } + SwUnoCrsr* CreateUnoCrsr( const SwPosition& rPos, bool bTableCrsr = false ); // FeShell - Interfaces // !!! These assume always an existing layout !!! @@ -1503,10 +1503,10 @@ public: const bool _bSameOnly, const bool _bPosCorr ); - void SetRowHeight( const SwCursor& rCursor, const SwFmtFrmSize &rNew ); - static void GetRowHeight( const SwCursor& rCursor, SwFmtFrmSize *& rpSz ); - void SetRowSplit( const SwCursor& rCursor, const SwFmtRowSplit &rNew ); - static void GetRowSplit( const SwCursor& rCursor, SwFmtRowSplit *& rpSz ); + void SetRowHeight( const SwCursor& rCursor, const SwFormatFrmSize &rNew ); + static void GetRowHeight( const SwCursor& rCursor, SwFormatFrmSize *& rpSz ); + void SetRowSplit( const SwCursor& rCursor, const SwFormatRowSplit &rNew ); + static void GetRowSplit( const SwCursor& rCursor, SwFormatRowSplit *& rpSz ); bool BalanceRowHeight( const SwCursor& rCursor, bool bTstOnly = true ); void SetRowBackground( const SwCursor& rCursor, const SvxBrushItem &rNew ); static bool GetRowBackground( const SwCursor& rCursor, SvxBrushItem &rToFill ); @@ -1531,9 +1531,9 @@ public: static sal_uInt16 GetBoxAlign( const SwCursor& rCursor ); void AdjustCellWidth( const SwCursor& rCursor, bool bBalance = false ); - SwChainRet Chainable( const SwFrmFmt &rSource, const SwFrmFmt &rDest ); - SwChainRet Chain( SwFrmFmt &rSource, const SwFrmFmt &rDest ); - void Unchain( SwFrmFmt &rFmt ); + SwChainRet Chainable( const SwFrameFormat &rSource, const SwFrameFormat &rDest ); + SwChainRet Chain( SwFrameFormat &rSource, const SwFrameFormat &rDest ); + void Unchain( SwFrameFormat &rFormat ); // For Copy/Move from FrmShell. SdrObject* CloneSdrObj( const SdrObject&, bool bMoveWithinDoc = false, @@ -1545,7 +1545,7 @@ public: SwExtTextInput* CreateExtTextInput( const SwPaM& rPam ); void DeleteExtTextInput( SwExtTextInput* pDel ); SwExtTextInput* GetExtTextInput( const SwNode& rNd, - sal_Int32 nCntntPos = -1) const; + sal_Int32 nContentPos = -1) const; SwExtTextInput* GetExtTextInput() const; // Interface for access to AutoComplete-List. @@ -1599,9 +1599,9 @@ public: const bool bValue ); // Change a format undoable. - void ChgFmt(SwFmt & rFmt, const SfxItemSet & rSet); + void ChgFormat(SwFormat & rFormat, const SfxItemSet & rSet); - void RenameFmt(SwFmt & rFmt, const OUString & sNewName, + void RenameFormat(SwFormat & rFormat, const OUString & sNewName, bool bBroadcast = false); // Change a TOX undoable. @@ -1671,18 +1671,18 @@ public: private: // Copies master header to left / first one, if necessary - used by ChgPageDesc(). - void CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader &rHead, SwPageDesc &pDesc, bool bLeft, bool bFirst); + void CopyMasterHeader(const SwPageDesc &rChged, const SwFormatHeader &rHead, SwPageDesc &pDesc, bool bLeft, bool bFirst); // Copies master footer to left / first one, if necessary - used by ChgPageDesc(). - void CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot, SwPageDesc &pDesc, bool bLeft, bool bFirst); + void CopyMasterFooter(const SwPageDesc &rChged, const SwFormatFooter &rFoot, SwPageDesc &pDesc, bool bLeft, bool bFirst); }; // This method is called in Dtor of SwDoc and deletes cache of ContourObjects. void ClrContourCache(); -inline const SwTableNode* SwDoc::IsIdxInTbl( const SwNodeIndex& rIdx ) const +inline const SwTableNode* SwDoc::IsIdxInTable( const SwNodeIndex& rIdx ) const { - return const_cast<SwDoc*>(this)->IsIdxInTbl( rIdx ); + return const_cast<SwDoc*>(this)->IsIdxInTable( rIdx ); } inline SvNumberFormatter* SwDoc::GetNumberFormatter( bool bCreate ) @@ -1704,7 +1704,7 @@ inline void SwDoc::SetOLEPrtNotifyPending( bool bSet ) mbAllOLENotify = false; } -bool sw_GetPostIts( IDocumentFieldsAccess* pIDFA, _SetGetExpFlds * pSrtLst ); +bool sw_GetPostIts( IDocumentFieldsAccess* pIDFA, _SetGetExpFields * pSrtLst ); #endif //_DOC_HXX diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index c671a695b921..2d2871f37df5 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -48,13 +48,13 @@ namespace com { namespace sun { namespace star { namespace i18n { #include <numrule.hxx> /** provides some methods for generic operations on lists that contain -SwFmt* subclasses. */ -class SwFmtsBase +SwFormat* subclasses. */ +class SwFormatsBase { public: - virtual size_t GetFmtCount() const = 0; - virtual SwFmt* GetFmt(size_t idx) const = 0; - virtual ~SwFmtsBase() {}; + virtual size_t GetFormatCount() const = 0; + virtual SwFormat* GetFormat(size_t idx) const = 0; + virtual ~SwFormatsBase() {}; }; template<typename Value> @@ -112,86 +112,86 @@ public: }; template<typename Value> -class SwFmtsModifyBase : public SwVectorModifyBase<Value>, public SwFmtsBase +class SwFormatsModifyBase : public SwVectorModifyBase<Value>, public SwFormatsBase { protected: - SwFmtsModifyBase(typename SwVectorModifyBase<Value>::DestructorPolicy + SwFormatsModifyBase(typename SwVectorModifyBase<Value>::DestructorPolicy policy = SwVectorModifyBase<Value>::DestructorPolicy::FreeElements) : SwVectorModifyBase<Value>(policy) {} public: - virtual size_t GetFmtCount() const SAL_OVERRIDE + virtual size_t GetFormatCount() const SAL_OVERRIDE { return std::vector<Value>::size(); } - virtual Value GetFmt(size_t idx) const SAL_OVERRIDE + virtual Value GetFormat(size_t idx) const SAL_OVERRIDE { return std::vector<Value>::operator[](idx); } - inline size_t GetPos(const SwFmt *p) const - { return SwVectorModifyBase<Value>::GetPos( static_cast<Value>( const_cast<SwFmt*>( p ) ) ); } - inline bool Contains(const SwFmt *p) const { - Value p2 = dynamic_cast<Value>(const_cast<SwFmt*>(p)); + inline size_t GetPos(const SwFormat *p) const + { return SwVectorModifyBase<Value>::GetPos( static_cast<Value>( const_cast<SwFormat*>( p ) ) ); } + inline bool Contains(const SwFormat *p) const { + Value p2 = dynamic_cast<Value>(const_cast<SwFormat*>(p)); return p2 != nullptr && SwVectorModifyBase<Value>::Contains(p2); } }; -class SwGrfFmtColls : public SwFmtsModifyBase<SwGrfFmtColl*> +class SwGrfFormatColls : public SwFormatsModifyBase<SwGrfFormatColl*> { public: - SwGrfFmtColls() : SwFmtsModifyBase( DestructorPolicy::KeepElements ) {} + SwGrfFormatColls() : SwFormatsModifyBase( DestructorPolicy::KeepElements ) {} }; /// Specific frame formats (frames, DrawObjects). -class SW_DLLPUBLIC SwFrmFmts : public SwFmtsModifyBase<SwFrmFmt*> +class SW_DLLPUBLIC SwFrameFormats : public SwFormatsModifyBase<SwFrameFormat*> { public: void dumpAsXml(struct _xmlTextWriter* pWriter, const char* pName) const; }; -class SwCharFmts : public SwFmtsModifyBase<SwCharFmt*> +class SwCharFormats : public SwFormatsModifyBase<SwCharFormat*> { public: void dumpAsXml(struct _xmlTextWriter* pWriter) const; }; -class SwTxtFmtColls : public SwFmtsModifyBase<SwTxtFmtColl*> +class SwTextFormatColls : public SwFormatsModifyBase<SwTextFormatColl*> { public: - SwTxtFmtColls() : SwFmtsModifyBase( DestructorPolicy::KeepElements ) {} + SwTextFormatColls() : SwFormatsModifyBase( DestructorPolicy::KeepElements ) {} void dumpAsXml(struct _xmlTextWriter* pWriter) const; }; /// Array of Undo-history. -class SW_DLLPUBLIC SwSectionFmts : public SwFmtsModifyBase<SwSectionFmt*> +class SW_DLLPUBLIC SwSectionFormats : public SwFormatsModifyBase<SwSectionFormat*> { public: void dumpAsXml(struct _xmlTextWriter* pWriter) const; }; -class SwFldTypes : public SwVectorModifyBase<SwFieldType*> { +class SwFieldTypes : public SwVectorModifyBase<SwFieldType*> { public: void dumpAsXml(struct _xmlTextWriter* pWriter) const; }; class SwTOXTypes : public SwVectorModifyBase<SwTOXType*> {}; -class SW_DLLPUBLIC SwNumRuleTbl : public SwVectorModifyBase<SwNumRule*> { +class SW_DLLPUBLIC SwNumRuleTable : public SwVectorModifyBase<SwNumRule*> { public: void dumpAsXml(struct _xmlTextWriter* pWriter) const; }; -struct CompareSwRedlineTbl +struct CompareSwRedlineTable { bool operator()(SwRangeRedline* const &lhs, SwRangeRedline* const &rhs) const; }; -class _SwRedlineTbl - : public o3tl::sorted_vector<SwRangeRedline*, CompareSwRedlineTbl, +class _SwRedlineTable + : public o3tl::sorted_vector<SwRangeRedline*, CompareSwRedlineTable, o3tl::find_partialorder_ptrequals> { public: - ~_SwRedlineTbl(); + ~_SwRedlineTable(); }; -class SwRedlineTbl : private _SwRedlineTbl +class SwRedlineTable : private _SwRedlineTable { public: bool Contains(const SwRangeRedline* p) const { return find(const_cast<SwRangeRedline* const>(p)) != end(); } @@ -221,30 +221,30 @@ public: /** Find the redline at the given position. - @param tableIndex position in SwRedlineTbl to start searching at, will be updated with the index of the returned + @param tableIndex position in SwRedlineTable to start searching at, will be updated with the index of the returned redline (or the next redline after the given position if not found) @param next true: redline starts at position and ends after, false: redline starts before position and ends at or after */ const SwRangeRedline* FindAtPosition( const SwPosition& startPosition, sal_uInt16& tableIndex, bool next = true ) const; - using _SwRedlineTbl::const_iterator; - using _SwRedlineTbl::begin; - using _SwRedlineTbl::end; - using _SwRedlineTbl::size; - using _SwRedlineTbl::size_type; - using _SwRedlineTbl::operator[]; - using _SwRedlineTbl::empty; - using _SwRedlineTbl::Resort; + using _SwRedlineTable::const_iterator; + using _SwRedlineTable::begin; + using _SwRedlineTable::end; + using _SwRedlineTable::size; + using _SwRedlineTable::size_type; + using _SwRedlineTable::operator[]; + using _SwRedlineTable::empty; + using _SwRedlineTable::Resort; }; /// Table that holds 'extra' redlines, such as 'table row insert\delete', 'paragraph moves' etc... -class SwExtraRedlineTbl +class SwExtraRedlineTable { private: std::vector<SwExtraRedline*> m_aExtraRedlines; public: - ~SwExtraRedlineTbl(); + ~SwExtraRedlineTable(); bool Insert( SwExtraRedline* p ); @@ -262,10 +262,10 @@ public: bool DeleteTableCellRedline( SwDoc* pDoc, const SwTableBox& rTableBox, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete ); }; -class SwUnoCrsrTbl : public std::set<SwUnoCrsr*> { +class SwUnoCrsrTable : public std::set<SwUnoCrsr*> { public: /// the destructor will free all objects still in the set - ~SwUnoCrsrTbl(); + ~SwUnoCrsrTable(); }; typedef std::vector<SwOLENode*> SwOLENodes; diff --git a/sw/inc/docstat.hxx b/sw/inc/docstat.hxx index 4a7a88364ca1..fd53d80bfcbf 100644 --- a/sw/inc/docstat.hxx +++ b/sw/inc/docstat.hxx @@ -24,7 +24,7 @@ struct SW_DLLPUBLIC SwDocStat { - sal_uInt16 nTbl; + sal_uInt16 nTable; sal_uInt16 nGrf; sal_uInt16 nOLE; sal_uLong nPage; diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index acf16d94aac3..1298cc618467 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -32,9 +32,9 @@ class SwDoc; class SwDocStyleSheetPool; class SwPageDesc; -class SwCharFmt; -class SwTxtFmtColl; -class SwFrmFmt; +class SwCharFormat; +class SwTextFormatColl; +class SwFrameFormat; class SwNumRule; // Temporary StyleSheet. @@ -43,9 +43,9 @@ class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase friend class SwDocStyleSheetPool; friend class SwStyleSheetIterator; - SwCharFmt* pCharFmt; - SwTxtFmtColl* pColl; - SwFrmFmt* pFrmFmt; + SwCharFormat* pCharFormat; + SwTextFormatColl* pColl; + SwFrameFormat* pFrameFormat; const SwPageDesc* pDesc; const SwNumRule* pNumRule; @@ -125,9 +125,9 @@ public: virtual OUString GetDescription() SAL_OVERRIDE; virtual OUString GetDescription(SfxMapUnit eUnit) SAL_OVERRIDE; - SwCharFmt* GetCharFmt(); - SwTxtFmtColl* GetCollection(); - SwFrmFmt* GetFrmFmt(); + SwCharFormat* GetCharFormat(); + SwTextFormatColl* GetCollection(); + SwFrameFormat* GetFrameFormat(); const SwPageDesc* GetPageDesc(); const SwNumRule* GetNumRule(); void SetNumRule(const SwNumRule& rRule); @@ -139,14 +139,14 @@ public: class SwStyleSheetIterator : public SfxStyleSheetIterator, public SfxListener { // Local helper class. - class SwPoolFmtList + class SwPoolFormatList { std::vector<OUString> maImpl; typedef std::unordered_map<OUString, sal_uInt32, OUStringHash> UniqueHash; UniqueHash maUnique; void rehash(); public: - SwPoolFmtList() {} + SwPoolFormatList() {} void Append( char cChar, const OUString& rStr ); void clear() { maImpl.clear(); maUnique.clear(); } size_t size() { return maImpl.size(); } @@ -158,7 +158,7 @@ class SwStyleSheetIterator : public SfxStyleSheetIterator, public SfxListener rtl::Reference< SwDocStyleSheet > mxIterSheet; rtl::Reference< SwDocStyleSheet > mxStyleSheet; - SwPoolFmtList aLst; + SwPoolFormatList aLst; sal_uInt32 nLastPos; bool bFirstCalled; diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 5bb92646b171..f7d8cf46dd94 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -27,12 +27,12 @@ #include "fldbas.hxx" #include "numrule.hxx" -class _SetGetExpFlds; -class SwTxtFld; +class _SetGetExpFields; +class SwTextField; class SwFrm; class OutlinerParaObject; class SwTextAPIObject; -class SwFmtFld; +class SwFormatField; enum SwAuthorFormat { @@ -137,10 +137,10 @@ class SwPageNumberFieldType : public SwFieldType public: SwPageNumberFieldType(); - OUString Expand( sal_uInt32 nFmt, short nOff, sal_uInt16 const nPageNumber, + OUString Expand( sal_uInt32 nFormat, short nOff, sal_uInt16 const nPageNumber, sal_uInt16 const nMaxPage, const OUString& ) const; void ChangeExpansion( SwDoc* pDoc, - bool bVirtPageNum, const sal_Int16* pNumFmt = 0 ); + bool bVirtPageNum, const sal_Int16* pNumFormat = 0 ); virtual SwFieldType* Copy() const SAL_OVERRIDE; }; @@ -156,7 +156,7 @@ class SW_DLLPUBLIC SwPageNumberField : public SwField public: SwPageNumberField(SwPageNumberFieldType*, sal_uInt16 nSub = PG_RANDOM, - sal_uInt32 nFmt = 0, short nOff = 0, + sal_uInt32 nFormat = 0, short nOff = 0, sal_uInt16 const nPageNumber = 0, sal_uInt16 const nMaxPage = 0); @@ -191,7 +191,7 @@ class SwAuthorField : public SwField OUString aContent; public: - SwAuthorField(SwAuthorFieldType*, sal_uInt32 nFmt = 0); + SwAuthorField(SwAuthorFieldType*, sal_uInt32 nFormat = 0); virtual OUString Expand() const SAL_OVERRIDE; virtual SwField* Copy() const SAL_OVERRIDE; @@ -218,7 +218,7 @@ class SW_DLLPUBLIC SwFileNameField : public SwField OUString aContent; public: - SwFileNameField(SwFileNameFieldType*, sal_uInt32 nFmt = 0); + SwFileNameField(SwFileNameFieldType*, sal_uInt32 nFormat = 0); virtual OUString Expand() const SAL_OVERRIDE; virtual SwField* Copy() const SAL_OVERRIDE; @@ -243,7 +243,7 @@ public: class SW_DLLPUBLIC SwTemplNameField : public SwField { public: - SwTemplNameField(SwTemplNameFieldType*, sal_uInt32 nFmt = 0); + SwTemplNameField(SwTemplNameFieldType*, sal_uInt32 nFormat = 0); virtual OUString Expand() const SAL_OVERRIDE; virtual SwField* Copy() const SAL_OVERRIDE; @@ -259,10 +259,10 @@ class SwDocStatFieldType : public SwFieldType public: SwDocStatFieldType(SwDoc*); - OUString Expand(sal_uInt16 nSubType, sal_uInt32 nFmt) const; + OUString Expand(sal_uInt16 nSubType, sal_uInt32 nFormat) const; virtual SwFieldType* Copy() const SAL_OVERRIDE; - inline void SetNumFormat( sal_Int16 eFmt ) { nNumberingType = eFmt; } + inline void SetNumFormat( sal_Int16 eFormat ) { nNumberingType = eFormat; } }; class SW_DLLPUBLIC SwDocStatField : public SwField @@ -271,7 +271,7 @@ class SW_DLLPUBLIC SwDocStatField : public SwField public: SwDocStatField( SwDocStatFieldType*, - sal_uInt16 nSubType = 0, sal_uInt32 nFmt = 0); + sal_uInt16 nSubType = 0, sal_uInt32 nFormat = 0); void ChangeExpansion( const SwFrm* pFrm ); @@ -284,11 +284,11 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; -class SwHiddenTxtFieldType : public SwFieldType +class SwHiddenTextFieldType : public SwFieldType { bool bHidden; public: - SwHiddenTxtFieldType(bool bSetHidden = true); + SwHiddenTextFieldType(bool bSetHidden = true); virtual SwFieldType* Copy() const SAL_OVERRIDE; @@ -296,10 +296,10 @@ public: inline bool GetHiddenFlag() const { return bHidden; } }; -class SwHiddenTxtField : public SwField +class SwHiddenTextField : public SwField { - OUString aTRUETxt; ///< Text if condition true. - OUString aFALSETxt; ///< If condition false. + OUString aTRUEText; ///< Text if condition true. + OUString aFALSEText; ///< If condition false. OUString aContent; ///< Evaluated DB-text. OUString aCond; ///< Condition. @@ -313,14 +313,14 @@ class SwHiddenTxtField : public SwField virtual SwField* Copy() const SAL_OVERRIDE; public: - SwHiddenTxtField( SwHiddenTxtFieldType*, + SwHiddenTextField( SwHiddenTextFieldType*, bool bConditional, const OUString& rCond, - const OUString& rTxt, + const OUString& rText, bool bHidden = false, sal_uInt16 nSubType = TYP_HIDDENTXTFLD); - SwHiddenTxtField( SwHiddenTxtFieldType*, + SwHiddenTextField( SwHiddenTextFieldType*, const OUString& rCond, const OUString& rTrue, const OUString& rFalse, @@ -400,7 +400,7 @@ class SW_DLLPUBLIC SwMacroField : public SwField public: /// Direct input, delete old value. SwMacroField( SwMacroFieldType*, const OUString& rLibAndName, - const OUString& rTxt); + const OUString& rText); inline OUString GetMacro() const { return aMacro; } OUString GetLibName() const; @@ -443,7 +443,7 @@ public: class SW_DLLPUBLIC SwPostItField : public SwField { - OUString sTxt; + OUString sText; OUString sAuthor; OUString sInitials; ///< Initials of the author. OUString sName; ///< Name of the comment. @@ -454,7 +454,7 @@ class SW_DLLPUBLIC SwPostItField : public SwField public: SwPostItField( SwPostItFieldType*, const OUString& rAuthor, - const OUString& rTxt, + const OUString& rText, const OUString& rInitials, const OUString& rName, const DateTime& rDate); @@ -474,7 +474,7 @@ public: /// Text virtual OUString GetPar2() const SAL_OVERRIDE; virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; - const OUString& GetTxt() const { return sTxt; } + const OUString& GetText() const { return sText; } const OUString& GetInitials() const { return sInitials;} void SetName(const OUString& rStr); const OUString& GetName() const { return sName;} @@ -508,8 +508,8 @@ class SW_DLLPUBLIC SwDocInfoField : public SwValueField virtual SwField* Copy() const SAL_OVERRIDE; public: - SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const OUString& rName, sal_uInt32 nFmt=0); - SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const OUString& rName, const OUString& rValue, sal_uInt32 nFmt=0); + SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const OUString& rName, sal_uInt32 nFormat=0); + SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const OUString& rName, const OUString& rValue, sal_uInt32 nFormat=0); virtual void SetSubType(sal_uInt16) SAL_OVERRIDE; virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; @@ -541,7 +541,7 @@ class SwExtUserField : public SwField sal_uInt16 nType; public: - SwExtUserField(SwExtUserFieldType*, sal_uInt16 nSub, sal_uInt32 nFmt=0); + SwExtUserField(SwExtUserFieldType*, sal_uInt16 nSub, sal_uInt32 nFormat=0); virtual OUString Expand() const SAL_OVERRIDE; virtual SwField* Copy() const SAL_OVERRIDE; @@ -598,30 +598,30 @@ class SwRefPageGetFieldType : public SwFieldType SwDoc* pDoc; sal_Int16 nNumberingType; - void UpdateField( SwTxtFld* pTxtFld, _SetGetExpFlds& rSetList ); + void UpdateField( SwTextField* pTextField, _SetGetExpFields& rSetList ); protected: /// overwritten to update all RefPageGet fields virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ) SAL_OVERRIDE; public: SwRefPageGetFieldType( SwDoc* pDoc ); virtual SwFieldType* Copy() const SAL_OVERRIDE; - bool MakeSetList( _SetGetExpFlds& rTmpLst ); + bool MakeSetList( _SetGetExpFields& rTmpLst ); SwDoc* GetDoc() const { return pDoc; } }; // Query relative page numbering. class SwRefPageGetField : public SwField { - OUString sTxt; + OUString sText; public: - SwRefPageGetField( SwRefPageGetFieldType*, sal_uInt32 nFmt ); + SwRefPageGetField( SwRefPageGetFieldType*, sal_uInt32 nFormat ); virtual OUString Expand() const SAL_OVERRIDE; virtual SwField* Copy() const SAL_OVERRIDE; - void SetText( const OUString& rTxt ) { sTxt = rTxt; } + void SetText( const OUString& rText ) { sText = rText; } - void ChangeExpansion( const SwFrm* pFrm, const SwTxtFld* pFld ); + void ChangeExpansion( const SwFrm* pFrm, const SwTextField* pField ); 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; }; @@ -636,12 +636,12 @@ public: SwJumpEditFieldType( SwDoc* pDoc ); virtual SwFieldType* Copy() const SAL_OVERRIDE; - SwCharFmt* GetCharFmt(); + SwCharFormat* GetCharFormat(); }; class SwJumpEditField : public SwField { - OUString sTxt, sHelp; + OUString sText, sHelp; public: SwJumpEditField( SwJumpEditFieldType*, sal_uInt32 nFormat, const OUString& sText, const OUString& sHelp ); @@ -657,8 +657,8 @@ public: virtual OUString GetPar2() const SAL_OVERRIDE; virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; - SwCharFmt* GetCharFmt() const - { return static_cast<SwJumpEditFieldType*>(GetTyp())->GetCharFmt(); } + SwCharFormat* GetCharFormat() const + { return static_cast<SwJumpEditFieldType*>(GetTyp())->GetCharFormat(); } 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; }; diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index c95e682dd85f..c80d81d32642 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -60,35 +60,35 @@ class SwDBManager; struct SwDocStat; class SwAutoCompleteWord; -class SwFmtRefMark; +class SwFormatRefMark; class SwNumRule; -class SwTxtFmtColl; +class SwTextFormatColl; class SwGrfNode; -class SwFlyFrmFmt; +class SwFlyFrameFormat; -class SwFrmFmt; -class SwCharFmt; +class SwFrameFormat; +class SwCharFormat; class SwExtTextInput; class Graphic; class GraphicObject; -class SwFmtINetFmt; +class SwFormatINetFormat; class SwTable; class SwTextBlocks; -class SwFmtFtn; +class SwFormatFootnote; class SwSection; class SwSectionData; -class SwSectionFmt; -class SwTableAutoFmt; +class SwSectionFormat; +class SwTableAutoFormat; class SwPageDesc; -class SwTxtINetFmt; -class SwSeqFldList; +class SwTextINetFormat; +class SwSeqFieldList; class SwGlblDocContent; class SwGlblDocContents; class SwRangeRedline; class SwRedlineData; -class SwFtnInfo; +class SwFootnoteInfo; class SwEndNoteInfo; class SwLineNumberInfo; class SwAuthEntry; @@ -119,10 +119,10 @@ namespace sw { struct SwGetINetAttr { OUString sText; - const SwTxtINetFmt& rINetAttr; + const SwTextINetFormat& rINetAttr; - SwGetINetAttr( const OUString& rTxt, const SwTxtINetFmt& rAttr ) - : sText( rTxt ), rINetAttr( rAttr ) + SwGetINetAttr( const OUString& rText, const SwTextINetFormat& rAttr ) + : sText( rText ), rINetAttr( rAttr ) {} }; typedef boost::ptr_vector<SwGetINetAttr> SwGetINetAttrs; @@ -133,13 +133,13 @@ typedef boost::ptr_vector<SwGetINetAttr> SwGetINetAttrs; #define CNT_OLE 0x0010 // Test USHORT for a defined form of content. -#define CNT_HasTxt(USH) ((USH)&CNT_TXT) +#define CNT_HasText(USH) ((USH)&CNT_TXT) #define CNT_HasGrf(USH) ((USH)&CNT_GRF) #define CNT_HasOLE(USH) ((USH)&CNT_OLE) class SW_DLLPUBLIC SwEditShell : public SwCrsrShell { - static SvxSwAutoFmtFlags* s_pAutoFmtFlags; + static SvxSwAutoFormatFlags* s_pAutoFormatFlags; /// For the private methods DelRange and those of AutoCorrect. friend class SwAutoFormat; @@ -148,7 +148,7 @@ class SW_DLLPUBLIC SwEditShell : public SwCrsrShell /// For the PamCorrAbs/-Rel methods. friend class SwUndo; - SAL_DLLPRIVATE SfxPoolItem& _GetChrFmt( SfxPoolItem& ) const; + SAL_DLLPRIVATE SfxPoolItem& _GetChrFormat( SfxPoolItem& ) const; /** Returns pointer to a SwGrfNode that will be used by GetGraphic() and GetGraphicSize(). */ @@ -156,9 +156,9 @@ class SW_DLLPUBLIC SwEditShell : public SwCrsrShell SAL_DLLPRIVATE void DeleteSel( SwPaM& rPam, bool* pUndo = 0 ); - SAL_DLLPRIVATE void _SetSectionAttr( SwSectionFmt& rSectFmt, const SfxItemSet& rSet ); + SAL_DLLPRIVATE void _SetSectionAttr( SwSectionFormat& rSectFormat, const SfxItemSet& rSet ); - using SwViewShell::UpdateFlds; + using SwViewShell::UpdateFields; using SwModify::GetInfo; public: @@ -207,8 +207,8 @@ public: bool _CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pNdInsPos = 0 ); long SplitNode( bool bAutoFormat = false, bool bCheckTableStart = true ); - bool AppendTxtNode(); - void AutoFmtBySplitNode(); + bool AppendTextNode(); + void AutoFormatBySplitNode(); /** If cursor is in a INetAttribute it will be deleted completely including the descriptive text (needed at drag & drop). */ @@ -216,7 +216,7 @@ public: /** If Cursor is at the end of a character style in which the DontExpand-flag is not yet set, the latter will be set (==> return TRUE). */ - bool DontExpandFmt(); + bool DontExpandFormat(); /** Apply / remove attributes. @return attributes in required AttributeSet. @@ -272,7 +272,7 @@ public: void SetDefault( const SfxPoolItem& ); /// Query default attribute of document. - const SfxPoolItem& GetDefault( sal_uInt16 nFmtHint ) const; + const SfxPoolItem& GetDefault( sal_uInt16 nFormatHint ) const; void ResetAttr( const std::set<sal_uInt16> &attrs = std::set<sal_uInt16>(), SwPaM* pCrsr = NULL ); void GCAttr(); @@ -284,17 +284,17 @@ public: sal_uInt16 GetCurLang() const; /// TABLE - size_t GetTblFrmFmtCount( bool bUsed = false ) const; - SwFrmFmt& GetTblFrmFmt(size_t nFmt, bool bUsed = false ) const; - OUString GetUniqueTblName() const; + size_t GetTableFrameFormatCount( bool bUsed = false ) const; + SwFrameFormat& GetTableFrameFormat(size_t nFormat, bool bUsed = false ) const; + OUString GetUniqueTableName() const; /// CHAR - sal_uInt16 GetCharFmtCount() const; - SwCharFmt& GetCharFmt(sal_uInt16 nFmt) const; - SwCharFmt* GetCurCharFmt() const; - void FillByEx(SwCharFmt*, bool bReset = false); - SwCharFmt* MakeCharFmt( const OUString& rName, SwCharFmt* pDerivedFrom = 0 ); - SwCharFmt* FindCharFmtByName( const OUString& rName ) const; + sal_uInt16 GetCharFormatCount() const; + SwCharFormat& GetCharFormat(sal_uInt16 nFormat) const; + SwCharFormat* GetCurCharFormat() const; + void FillByEx(SwCharFormat*, bool bReset = false); + SwCharFormat* MakeCharFormat( const OUString& rName, SwCharFormat* pDerivedFrom = 0 ); + SwCharFormat* FindCharFormatByName( const OUString& rName ) const; /* FormatCollections (new) - Explaining the general naming pattern: * GetXXXCount() returns the count of xxx in the document. @@ -307,20 +307,20 @@ public: */ // TXT - SwTxtFmtColl& GetDfltTxtFmtColl() const; - sal_uInt16 GetTxtFmtCollCount() const; - SwTxtFmtColl& GetTxtFmtColl( sal_uInt16 nTxtFmtColl) const; + SwTextFormatColl& GetDfltTextFormatColl() const; + sal_uInt16 GetTextFormatCollCount() const; + SwTextFormatColl& GetTextFormatColl( sal_uInt16 nTextFormatColl) const; /** * Get the named paragraph format of the current selection. * - * @see GetPaMTxtFmtColl() + * @see GetPaMTextFormatColl() * * @return the named paragraph format of the first node that contains one. * Nodes are sort by order of appearance in the selections ; * selections are sort by their order of creation * (last created selection first, oldest selection at last). */ - SwTxtFmtColl* GetCurTxtFmtColl() const; + SwTextFormatColl* GetCurTextFormatColl() const; /** * Get the named paragraph format of the selection(s) described by a SwPaM. * @@ -329,21 +329,21 @@ public: * * @return the named paragraph format of the first node that contains one. */ - SwTxtFmtColl* GetPaMTxtFmtColl( SwPaM* pPaM ) const; + SwTextFormatColl* GetPaMTextFormatColl( SwPaM* pPaM ) const; // #i62675# - /// Add 2nd optional parameter <bResetListAttrs> - see also <SwDoc::SetTxtFmtColl(..)> - void SetTxtFmtColl(SwTxtFmtColl*, const bool bResetListAttrs = false); - SwTxtFmtColl *MakeTxtFmtColl(const OUString &rFmtCollName, - SwTxtFmtColl *pDerivedFrom = 0); - void FillByEx(SwTxtFmtColl*, bool bReset = false); - SwTxtFmtColl* FindTxtFmtCollByName( const OUString& rName ) const; + /// Add 2nd optional parameter <bResetListAttrs> - see also <SwDoc::SetTextFormatColl(..)> + void SetTextFormatColl(SwTextFormatColl*, const bool bResetListAttrs = false); + SwTextFormatColl *MakeTextFormatColl(const OUString &rFormatCollName, + SwTextFormatColl *pDerivedFrom = 0); + void FillByEx(SwTextFormatColl*, bool bReset = false); + SwTextFormatColl* FindTextFormatCollByName( const OUString& rName ) const; /// @return "Auto-Collection" with given Id. If it does not exist create it. - SwTxtFmtColl* GetTxtCollFromPool( sal_uInt16 nId ); + SwTextFormatColl* GetTextCollFromPool( sal_uInt16 nId ); /// @return required automatic format base class. - SwFmt* GetFmtFromPool( sal_uInt16 nId ); + SwFormat* GetFormatFromPool( sal_uInt16 nId ); /// @return required automatic page style. SwPageDesc* GetPageDescFromPool( sal_uInt16 nId ); @@ -352,21 +352,21 @@ public: bool IsUsed( const SwModify& ) const; /// @return required automatic format. - SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId ) - { return static_cast<SwFrmFmt*>(SwEditShell::GetFmtFromPool( nId )); } - SwCharFmt* GetCharFmtFromPool( sal_uInt16 nId ) - { return static_cast<SwCharFmt*>(SwEditShell::GetFmtFromPool( nId )); } + SwFrameFormat* GetFrameFormatFromPool( sal_uInt16 nId ) + { return static_cast<SwFrameFormat*>(SwEditShell::GetFormatFromPool( nId )); } + SwCharFormat* GetCharFormatFromPool( sal_uInt16 nId ) + { return static_cast<SwCharFormat*>(SwEditShell::GetFormatFromPool( nId )); } void Insert2(SwField&, const bool bForceExpandHints = false); - void UpdateFlds( SwField & ); ///< One single field. + void UpdateFields( SwField & ); ///< One single field. - sal_uInt16 GetFldTypeCount(sal_uInt16 nResId = USHRT_MAX, bool bUsed = false) const; - SwFieldType* GetFldType(sal_uInt16 nId, sal_uInt16 nResId = USHRT_MAX, bool bUsed = false) const; - SwFieldType* GetFldType(sal_uInt16 nResId, const OUString& rName) const; + sal_uInt16 GetFieldTypeCount(sal_uInt16 nResId = USHRT_MAX, bool bUsed = false) const; + SwFieldType* GetFieldType(sal_uInt16 nId, sal_uInt16 nResId = USHRT_MAX, bool bUsed = false) const; + SwFieldType* GetFieldType(sal_uInt16 nResId, const OUString& rName) const; - void RemoveFldType(sal_uInt16 nId, sal_uInt16 nResId = USHRT_MAX); - void RemoveFldType(sal_uInt16 nResId, const OUString& rName); + void RemoveFieldType(sal_uInt16 nId, sal_uInt16 nResId = USHRT_MAX); + void RemoveFieldType(sal_uInt16 nResId, const OUString& rName); void FieldToText( SwFieldType* pType ); @@ -385,17 +385,17 @@ public: /// Check whether DB fields point to an available data source and returns it. bool IsFieldDataSourceAvailable(OUString& rUsedDataSource) const; - void UpdateExpFlds(bool bCloseDB = false);///< only every expression fields update - void LockExpFlds(); - void UnlockExpFlds(); + void UpdateExpFields(bool bCloseDB = false);///< only every expression fields update + void LockExpFields(); + void UnlockExpFields(); - SwFldUpdateFlags GetFldUpdateFlags(bool bDocSettings = false) const; - void SetFldUpdateFlags( SwFldUpdateFlags eFlags ); + SwFieldUpdateFlags GetFieldUpdateFlags(bool bDocSettings = false) const; + void SetFieldUpdateFlags( SwFieldUpdateFlags eFlags ); /// For evaluation of DB fields (new DB-manager). SwDBManager* GetDBManager() const; - SwFieldType* InsertFldType(const SwFieldType &); + SwFieldType* InsertFieldType(const SwFieldType &); /// Changes in document? bool IsModified() const; @@ -519,7 +519,7 @@ public: bool SelectionHasBullet() const; OUString GetUniqueNumRuleName( const OUString* pChkStr = 0, bool bAutoNum = true ) const; - void ChgNumRuleFmts( const SwNumRule& rRule ); + void ChgNumRuleFormats( const SwNumRule& rRule ); /// Set (and query if) a numbering with StartFlag starts at current PointPos. void SetNumRuleStart( bool bFlag = true, SwPaM* pCrsr = NULL ); @@ -614,7 +614,7 @@ public: else give a rap on the knuckles! If a string-ptr != 0 return the respective name. */ void GetGrfNms( OUString* pGrfName, OUString* pFltName, - const SwFlyFrmFmt* = 0 ) const; + const SwFlyFrameFormat* = 0 ) const; /// Re-read if graphic is not ok. Current graphic is replaced by the new one. void ReRead( const OUString& rGrfName, const OUString& rFltName, @@ -627,14 +627,14 @@ public: // #i73788# /// Remove default parameter, because method always called this default value. Graphic GetIMapGraphic() const; ///< @return a graphic for all Flys! - const SwFlyFrmFmt* FindFlyByName( const OUString& rName, sal_uInt8 nNdTyp = 0 ) const; + const SwFlyFrameFormat* FindFlyByName( const OUString& rName, sal_uInt8 nNdTyp = 0 ) const; /** @return a ClientObject, if CurCrsr->Point() points to a SwOLENode (and mark is neither set not pointint to same ClientObject) else give rap on the knuckles. */ svt::EmbeddedObjectRef& GetOLEObject() const; - /// Is there an OLEObject with this name (SwFmt)? + /// Is there an OLEObject with this name (SwFormat)? bool HasOLEObj( const OUString &rName ) const; /// @return pointer to the data of the chart in which Cursr is. @@ -653,13 +653,13 @@ public: including styles. */ sal_uInt16 MakeGlossary( SwTextBlocks& rToFill, const OUString& rName, const OUString& rShortName, bool bSaveRelFile = false, - const OUString* pOnlyTxt=0 ); + const OUString* pOnlyText=0 ); /// Save complete content of doc as glossary. sal_uInt16 SaveGlossaryDoc( SwTextBlocks& rGlossary, const OUString& rName, const OUString& rShortName, bool bSaveRelFile = false, - bool bOnlyTxt = false ); + bool bOnlyText = false ); // Linguistics... /// Save selections. @@ -675,35 +675,35 @@ public: /// For Inserting SoftHyphen. Position is offset within the syllabificated word. static void InsertSoftHyph( const sal_Int32 nHyphPos ); - const SwTable& InsertTable( const SwInsertTableOptions& rInsTblOpts, ///< ALL_TBL_INS_ATTR + const SwTable& InsertTable( const SwInsertTableOptions& rInsTableOpts, ///< ALL_TBL_INS_ATTR sal_uInt16 nRows, sal_uInt16 nCols, sal_Int16 eAdj = com::sun::star::text::HoriOrientation::FULL, - const SwTableAutoFmt* pTAFmt = 0 ); + const SwTableAutoFormat* pTAFormat = 0 ); - void InsertDDETable( const SwInsertTableOptions& rInsTblOpts, ///< HEADLINE_NO_BORDER + void InsertDDETable( const SwInsertTableOptions& rInsTableOpts, ///< HEADLINE_NO_BORDER SwDDEFieldType* pDDEType, sal_uInt16 nRows, sal_uInt16 nCols, sal_Int16 eAdj = com::sun::star::text::HoriOrientation::FULL ); void UpdateTable(); - void SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName ); + void SetTableName( SwFrameFormat& rTableFormat, const OUString &rNewName ); - SwFrmFmt *GetTableFmt(); - bool TextToTable( const SwInsertTableOptions& rInsTblOpts, ///< ALL_TBL_INS_ATTR + SwFrameFormat *GetTableFormat(); + bool TextToTable( const SwInsertTableOptions& rInsTableOpts, ///< ALL_TBL_INS_ATTR sal_Unicode cCh, sal_Int16 eAdj = com::sun::star::text::HoriOrientation::FULL, - const SwTableAutoFmt* pTAFmt = 0 ); + const SwTableAutoFormat* pTAFormat = 0 ); bool TableToText( sal_Unicode cCh ); bool IsTextToTableAvailable() const; - bool GetTblBoxFormulaAttrs( SfxItemSet& rSet ) const; - void SetTblBoxFormulaAttrs( const SfxItemSet& rSet ); + bool GetTableBoxFormulaAttrs( SfxItemSet& rSet ) const; + void SetTableBoxFormulaAttrs( const SfxItemSet& rSet ); bool IsTableBoxTextFormat() const; OUString GetTableBoxText() const; - TblChgMode GetTblChgMode() const; - void SetTblChgMode( TblChgMode eMode ); + TableChgMode GetTableChgMode() const; + void SetTableChgMode( TableChgMode eMode ); /// Split table at cursor position. bool SplitTable( sal_uInt16 eMode ); @@ -766,7 +766,7 @@ public: void SetLinguRange( SwDocPositions eStart, SwDocPositions eEnd ); /// @return reference set in document according to given name. - const SwFmtRefMark* GetRefMark( const OUString& rName ) const; + const SwFormatRefMark* GetRefMark( const OUString& rName ) const; /** @return names of all references set in document. If ArrayPointer == 0 then return only whether a RefMark is set in document. */ @@ -778,20 +778,20 @@ public: bool GetPrevAutoCorrWord( SvxAutoCorrect& rACorr, OUString& rWord ); /// Set our styles according to the respective rules. - void AutoFormat( const SvxSwAutoFmtFlags* pAFlags = 0 ); + void AutoFormat( const SvxSwAutoFormatFlags* pAFlags = 0 ); - static SvxSwAutoFmtFlags* GetAutoFmtFlags(); - static void SetAutoFmtFlags(SvxSwAutoFmtFlags *); + static SvxSwAutoFormatFlags* GetAutoFormatFlags(); + static void SetAutoFormatFlags(SvxSwAutoFormatFlags *); /// Calculates selection. OUString Calculate(); - bool InsertURL( const SwFmtINetFmt& rFmt, const OUString& rStr, + bool InsertURL( const SwFormatINetFormat& rFormat, const OUString& rStr, bool bKeepSelection = false ); void GetINetAttrs( SwGetINetAttrs& rArr ); - OUString GetDropTxt( const sal_Int32 nChars ) const; - void ReplaceDropTxt( const OUString &rStr, SwPaM* pPaM = NULL ); + OUString GetDropText( const sal_Int32 nChars ) const; + void ReplaceDropText( const OUString &rStr, SwPaM* pPaM = NULL ); /** May an outline be moved or copied? Check whether it's in text body, not in table, and not read-only (move). */ @@ -801,11 +801,11 @@ public: sal_uInt16 GetLineCount( bool bActPos = true ); /// Query and set footnote-text/number. Set.. to current SSelection! - bool GetCurFtn( SwFmtFtn* pToFillFtn = 0 ); - bool SetCurFtn( const SwFmtFtn& rFillFtn ); - bool HasFtns( bool bEndNotes = false ) const; + bool GetCurFootnote( SwFormatFootnote* pToFillFootnote = 0 ); + bool SetCurFootnote( const SwFormatFootnote& rFillFootnote ); + bool HasFootnotes( bool bEndNotes = false ) const; - size_t GetSeqFtnList( SwSeqFldList& rList, bool bEndNotes = false ); + size_t GetSeqFootnoteList( SwSeqFieldList& rList, bool bEndNotes = false ); /// @return list of all footnotes and their first portions of text. SwSection const* InsertSection( @@ -820,10 +820,10 @@ public: and not an inner one. */ SwSection* GetAnySection( bool bOutOfTab = false, const Point* pPt = 0 ); - size_t GetSectionFmtCount() const; - size_t GetSectionFmtPos(const SwSectionFmt&) const; - const SwSectionFmt& GetSectionFmt(size_t nFmt) const; - void DelSectionFmt( size_t nFmt); + size_t GetSectionFormatCount() const; + size_t GetSectionFormatPos(const SwSectionFormat&) const; + const SwSectionFormat& GetSectionFormat(size_t nFormat) const; + void DelSectionFormat( size_t nFormat); void UpdateSection( size_t const nSect, SwSectionData &, SfxItemSet const*const = 0); bool IsAnySectionInDoc( bool bChkReadOnly = false, @@ -833,7 +833,7 @@ public: OUString GetUniqueSectionName( const OUString* pChkStr = 0 ) const; /// Set attributes. - void SetSectionAttr(const SfxItemSet& rSet, SwSectionFmt* pSectFmt = 0); + void SetSectionAttr(const SfxItemSet& rSet, SwSectionFormat* pSectFormat = 0); /** Search inside the cursor selection for full selected sections. if any part of section in the selection @return 0. @@ -911,8 +911,8 @@ public: long MergeDoc( const SwDoc& rDoc ); /// Footnote attributes global to document. - const SwFtnInfo& GetFtnInfo() const; - void SetFtnInfo(const SwFtnInfo& rInfo); + const SwFootnoteInfo& GetFootnoteInfo() const; + void SetFootnoteInfo(const SwFootnoteInfo& rInfo); const SwEndNoteInfo& GetEndNoteInfo() const; void SetEndNoteInfo(const SwEndNoteInfo& rInfo); diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index e58953cc7380..149ba2b94dba 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -26,47 +26,47 @@ #include <vector> class SfxPoolItem; -class SwTxtNode; +class SwTextNode; class SwFrm; struct SwPosition; -class SwTxtFld; +class SwTextField; class SwDoc; -class SwFmtFld; -class _SetGetExpFlds; +class SwFormatField; +class _SetGetExpFields; class SwEditShell; -/// Forward declaration: get "BodyTxtNode" for exp.fld in Fly's headers/footers/footnotes. -const SwTxtNode* GetBodyTxtNode( const SwDoc& pDoc, SwPosition& rPos, +/// Forward declaration: get "BodyTextNode" for exp.fld in Fly's headers/footers/footnotes. +const SwTextNode* GetBodyTextNode( const SwDoc& pDoc, SwPosition& rPos, const SwFrm& rFrm ); OUString ReplacePoint(const OUString& sTmpName, bool bWithCommandType = false); -struct _SeqFldLstElem +struct _SeqFieldLstElem { OUString sDlgEntry; sal_uInt16 nSeqNo; - _SeqFldLstElem( const OUString& rStr, sal_uInt16 nNo ) + _SeqFieldLstElem( const OUString& rStr, sal_uInt16 nNo ) : sDlgEntry( rStr ), nSeqNo( nNo ) {} }; -class SW_DLLPUBLIC SwSeqFldList +class SW_DLLPUBLIC SwSeqFieldList { - std::vector<_SeqFldLstElem*> maData; + std::vector<_SeqFieldLstElem*> maData; public: - ~SwSeqFldList() + ~SwSeqFieldList() { - for( std::vector<_SeqFldLstElem*>::const_iterator it = maData.begin(); it != maData.end(); ++it ) + for( std::vector<_SeqFieldLstElem*>::const_iterator it = maData.begin(); it != maData.end(); ++it ) delete *it; } - bool InsertSort(_SeqFldLstElem* pNew); - bool SeekEntry(const _SeqFldLstElem& rNew, size_t* pPos) const; + bool InsertSort(_SeqFieldLstElem* pNew); + bool SeekEntry(const _SeqFieldLstElem& rNew, size_t* pPos) const; size_t Count() { return maData.size(); } - _SeqFldLstElem* operator[](size_t nIndex) { return maData[nIndex]; } - const _SeqFldLstElem* operator[](size_t nIndex) const { return maData[nIndex]; } + _SeqFieldLstElem* operator[](size_t nIndex) { return maData[nIndex]; } + const _SeqFieldLstElem* operator[](size_t nIndex) const { return maData[nIndex]; } void Clear() { maData.clear(); } }; @@ -85,7 +85,7 @@ protected: class SW_DLLPUBLIC SwGetExpField : public SwFormulaField { OUString sExpand; - bool bIsInBodyTxt; + bool bIsInBodyText; sal_uInt16 nSubType; bool bLateInitialization; // #i82544# @@ -95,7 +95,7 @@ class SW_DLLPUBLIC SwGetExpField : public SwFormulaField public: SwGetExpField( SwGetExpFieldType*, const OUString& rFormel, - sal_uInt16 nSubType = nsSwGetSetExpType::GSE_EXPR, sal_uLong nFmt = 0); + sal_uInt16 nSubType = nsSwGetSetExpType::GSE_EXPR, sal_uLong nFormat = 0); virtual void SetValue( const double& rVal ) SAL_OVERRIDE; virtual void SetLanguage(sal_uInt16 nLng) SAL_OVERRIDE; @@ -104,14 +104,14 @@ public: inline void ChgExpStr(const OUString& rExpand); /// Called by formatting. - inline bool IsInBodyTxt() const; + inline bool IsInBodyText() const; - /// Set by UpdateExpFlds where node position is known. - inline void ChgBodyTxtFlag( bool bIsInBody ); + /// Set by UpdateExpFields where node position is known. + inline void ChgBodyTextFlag( bool bIsInBody ); /** For fields in header/footer/footnotes/flys: Only called by formatting!! */ - void ChangeExpansion( const SwFrm&, const SwTxtFld& ); + void ChangeExpansion( const SwFrm&, const SwTextField& ); virtual OUString GetFieldName() const SAL_OVERRIDE; @@ -124,7 +124,7 @@ 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 sal_Int32 GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc, sal_Int32 nHint = 0); + static sal_Int32 GetReferenceTextPos( const SwFormatField& rFormat, SwDoc& rDoc, sal_Int32 nHint = 0); // #i82544# void SetLateInitialization() { bLateInitialization = true;} }; @@ -136,12 +136,12 @@ inline OUString SwGetExpField::GetExpStr() const { return sExpand; } /// Called by formatting. -inline bool SwGetExpField::IsInBodyTxt() const - { return bIsInBodyTxt; } +inline bool SwGetExpField::IsInBodyText() const + { return bIsInBodyText; } - /// Set by UpdateExpFlds where node position is known. -inline void SwGetExpField::ChgBodyTxtFlag( bool bIsInBody ) - { bIsInBodyTxt = bIsInBody; } + /// Set by UpdateExpFields where node position is known. +inline void SwGetExpField::ChgBodyTextFlag( bool bIsInBody ) + { bIsInBodyText = bIsInBody; } class SwSetExpField; @@ -175,9 +175,9 @@ public: /// Overlay, because set-field takes care for its being updated by itself. inline OUString GetSetRefName() const; - sal_uInt16 SetSeqRefNo( SwSetExpField& rFld ); + sal_uInt16 SetSeqRefNo( SwSetExpField& rField ); - size_t GetSeqFldList( SwSeqFldList& rList ); + size_t GetSeqFieldList( SwSeqFieldList& rList ); OUString MakeSeqName( sal_uInt16 nSeqNo ); /// Number sequence fields chapterwise if required. @@ -185,9 +185,9 @@ public: void SetDelimiter( const OUString& s ) { sDelim = s; } sal_uInt8 GetOutlineLvl() const { return nLevel; } void SetOutlineLvl( sal_uInt8 n ) { nLevel = n; } - void SetChapter( SwSetExpField& rFld, const SwNode& rNd ); + void SetChapter( SwSetExpField& rField, const SwNode& rNd ); - /** Member only for SwDoc::UpdateExpFld. + /** Member only for SwDoc::UpdateExpField. It is needed only at runtime of sequence field types! */ const SwNode* GetOutlineChgNd() const { return pOutlChgNd; } void SetOutlineChgNd( const SwNode* p ) { pOutlChgNd = p; } @@ -215,16 +215,16 @@ class SW_DLLPUBLIC SwSetExpField : public SwFormulaField bool bInput; sal_uInt16 nSeqNo; sal_uInt16 nSubType; - SwFmtFld * mpFmtFld; /// pool item to which the SwSetExpField belongs + SwFormatField * mpFormatField; /// pool item to which the SwSetExpField belongs virtual OUString Expand() const SAL_OVERRIDE; virtual SwField* Copy() const SAL_OVERRIDE; public: - SwSetExpField(SwSetExpFieldType*, const OUString& rFormel, sal_uLong nFmt = 0); + SwSetExpField(SwSetExpFieldType*, const OUString& rFormel, sal_uLong nFormat = 0); - void SetFmtFld(SwFmtFld & rFmtFld); - SwFmtFld* GetFmtFld() { return mpFmtFld;} + void SetFormatField(SwFormatField & rFormatField); + SwFormatField* GetFormatField() { return mpFormatField;} virtual void SetValue( const double& rVal ) SAL_OVERRIDE; @@ -243,7 +243,7 @@ public: virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; virtual void SetSubType(sal_uInt16 nType) SAL_OVERRIDE; - inline bool IsSequenceFld() const; + inline bool IsSequenceField() const; /// Logical number, sequence fields. inline void SetSeqNumber( sal_uInt16 n ) { nSeqNo = n; } @@ -277,7 +277,7 @@ inline void SwSetExpField::SetInputFlag(bool bInp) inline bool SwSetExpField::GetInputFlag() const { return bInput; } -inline bool SwSetExpField::IsSequenceFld() const +inline bool SwSetExpField::IsSequenceField() const { return 0 != (nsSwGetSetExpType::GSE_SEQ & static_cast<SwSetExpFieldType*>(GetTyp())->GetType()); } class SwInputFieldType : public SwFieldType @@ -300,7 +300,7 @@ class SW_DLLPUBLIC SwInputField : public SwField sal_uInt16 nSubType; bool mbIsFormField; - SwFmtFld* mpFmtFld; // attribute to which the <SwInputField> belongs to + SwFormatField* mpFormatField; // attribute to which the <SwInputField> belongs to virtual OUString Expand() const SAL_OVERRIDE; virtual SwField* Copy() const SAL_OVERRIDE; @@ -318,12 +318,12 @@ public: const OUString& rContent, const OUString& rPrompt, sal_uInt16 nSubType = 0, - sal_uLong nFmt = 0, + sal_uLong nFormat = 0, bool bIsFormField = true ); virtual ~SwInputField(); - void SetFmtFld( SwFmtFld& rFmtFld ); - SwFmtFld* GetFmtFld() { return mpFmtFld;} + void SetFormatField( SwFormatField& rFormatField ); + SwFormatField* GetFormatField() { return mpFormatField;} // Providing new Input Field's content: // Fill Input Field's content depending on <nSupType>. @@ -374,19 +374,19 @@ public: private: SwEditShell* pSh; - _SetGetExpFlds* pSrtLst; - std::set<const SwTxtFld*> aTmpLst; + _SetGetExpFields* pSrtLst; + std::set<const SwTextField*> aTmpLst; }; /// Implementation in tblcalc.cxx. -class SwTblFieldType : public SwValueFieldType +class SwTableFieldType : public SwValueFieldType { public: - SwTblFieldType(SwDoc* pDocPtr); + SwTableFieldType(SwDoc* pDocPtr); virtual SwFieldType* Copy() const SAL_OVERRIDE; }; -class SwTblField : public SwValueField, public SwTableFormula +class SwTableField : public SwValueField, public SwTableFormula { OUString sExpand; sal_uInt16 nSubType; @@ -400,8 +400,8 @@ class SwTblField : public SwValueField, public SwTableFormula OUString GetCommand(); public: - SwTblField( SwTblFieldType*, const OUString& rFormel, - sal_uInt16 nSubType = 0, sal_uLong nFmt = 0); + SwTableField( SwTableFieldType*, const OUString& rFormel, + sal_uInt16 nSubType = 0, sal_uLong nFormat = 0); virtual void SetValue( const double& rVal ) SAL_OVERRIDE; virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; @@ -410,7 +410,7 @@ public: OUString GetExpStr() const { return sExpand; } void ChgExpStr(const OUString& rStr) { sExpand = rStr; } - void CalcField( SwTblCalcPara& rCalcPara ); + void CalcField( SwTableCalcPara& rCalcPara ); virtual OUString GetFieldName() const SAL_OVERRIDE; diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index d70f43a18a82..0e044b0b9dbb 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -24,29 +24,29 @@ #include <format.hxx> #include <charfmt.hxx> -class SwTxtCharFmt; +class SwTextCharFormat; class IntlWrapper; -class SW_DLLPUBLIC SwFmtCharFmt: public SfxPoolItem, public SwClient +class SW_DLLPUBLIC SwFormatCharFormat: public SfxPoolItem, public SwClient { - friend class SwTxtCharFmt; - SwTxtCharFmt* pTxtAttr; ///< My text attribute. + friend class SwTextCharFormat; + SwTextCharFormat* pTextAttr; ///< My text attribute. public: - SwFmtCharFmt() : pTxtAttr(0) {} + SwFormatCharFormat() : pTextAttr(0) {} /// single argument ctors shall be explicit. - explicit SwFmtCharFmt( SwCharFmt *pFmt ); - virtual ~SwFmtCharFmt(); + explicit SwFormatCharFormat( SwCharFormat *pFormat ); + virtual ~SwFormatCharFormat(); /// @@@ public copy ctor, but no copy assignment? - SwFmtCharFmt( const SwFmtCharFmt& rAttr ); + SwFormatCharFormat( const SwFormatCharFormat& rAttr ); protected: virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; private: /// @@@ public copy ctor, but no copy assignment? - SwFmtCharFmt & operator= (const SwFmtCharFmt &) SAL_DELETED_FUNCTION; + SwFormatCharFormat & operator= (const SwFormatCharFormat &) SAL_DELETED_FUNCTION; public: TYPEINFO_OVERRIDE(); @@ -65,8 +65,8 @@ public: virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE; - void SetCharFmt( SwFmt* pFmt ) { pFmt->Add(this); } - SwCharFmt* GetCharFmt() const { return const_cast<SwCharFmt*>(static_cast<const SwCharFmt*>(GetRegisteredIn())); } + void SetCharFormat( SwFormat* pFormat ) { pFormat->Add(this); } + SwCharFormat* GetCharFormat() const { return const_cast<SwCharFormat*>(static_cast<const SwCharFormat*>(GetRegisteredIn())); } }; #endif diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 6925032b79ae..b3bbfcda8aa9 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -43,15 +43,15 @@ class SwFlyFrm; class SwTabCols; class SvxBrushItem; class SvxFrameDirectionItem; -class SwTableAutoFmt; +class SwTableAutoFormat; class SwFrm; -class SwFmtFrmSize; -class SwFmtRowSplit; +class SwFormatFrmSize; +class SwFormatRowSplit; class SdrObject; class Color; class Outliner; class SotDataObject; -class SwFrmFmt; +class SwFrameFormat; struct SwSortOptions; class SdrMarkList; @@ -139,9 +139,9 @@ enum CurRectType struct SwGetCurColNumPara { - const SwFrmFmt* pFrmFmt; + const SwFrameFormat* pFrameFormat; const SwRect* pPrtRect, *pFrmRect; - SwGetCurColNumPara() : pFrmFmt( 0 ), pPrtRect( 0 ), pFrmRect( 0 ) {} + SwGetCurColNumPara() : pFrameFormat( 0 ), pPrtRect( 0 ), pFrmRect( 0 ) {} }; #define SW_PASTESDR_INSERT 1 @@ -235,7 +235,7 @@ public: virtual ~SwFEShell(); /// Copy and Paste methods for internal clipboard. - bool Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt = 0 ); + bool Copy( SwDoc* pClpDoc, const OUString* pNewClpText = 0 ); bool Paste( SwDoc* pClpDoc, bool bIncludingPageFrames = false); /// Paste some pages into another doc - used in mailmerge. @@ -248,7 +248,7 @@ public: void SelectFlyFrm( SwFlyFrm& rFrm, bool bNew = false ); /// Is selected frame within another frame? - const SwFrmFmt* IsFlyInFly(); + const SwFrameFormat* IsFlyInFly(); /** If an object as been given, exactly this object is selected (instead of searching over position). */ @@ -311,12 +311,12 @@ public: const RndStdIds _nAnchorId, const sal_Int16 _eHoriRelOrient = com::sun::star::text::RelOrientation::FRAME, const sal_Int16 _eVertRelOrient = com::sun::star::text::RelOrientation::FRAME, - const SwPosition* _pToCharCntntPos = NULL, + const SwPosition* _pToCharContentPos = NULL, const bool _bFollowTextFlow = false, bool _bMirror = false, Point* _opRef = NULL, Size* _opPercent = NULL, - const SwFmtFrmSize* pFmtFrmSize = 0 ) const; + const SwFormatFrmSize* pFormatFrmSize = 0 ) const; /// Set size of draw objects. void SetObjRect( const SwRect& rRect ); @@ -332,18 +332,18 @@ public: Size GetObjSize() const; /// SS for envelopes: get all page-bound objects and set them to new page. - void GetPageObjs( std::vector<SwFrmFmt*>& rFillArr ); - void SetPageObjsNewPage( std::vector<SwFrmFmt*>& rFillArr, int nOffset = 1 ); + void GetPageObjs( std::vector<SwFrameFormat*>& rFillArr ); + void SetPageObjsNewPage( std::vector<SwFrameFormat*>& rFillArr, int nOffset = 1 ); /// Show current selection (frame / draw object as required). virtual void MakeSelVisible() SAL_OVERRIDE; - /** @return FrmFmt of object that may be under Point. + /** @return FrameFormat of object that may be under Point. Object does not become selected! */ - const SwFrmFmt* GetFmtFromObj( const Point& rPt, SwRect** pRectToFill = 0 ) const; + const SwFrameFormat* GetFormatFromObj( const Point& rPt, SwRect** pRectToFill = 0 ) const; /// @return a format too, if the point is over the text of any fly. - const SwFrmFmt* GetFmtFromAnyObj( const Point& rPt ) const; + const SwFrameFormat* GetFormatFromAnyObj( const Point& rPt ) const; /** Which Protection is set at selected object? returns several flags in sal_uInt8 */ @@ -363,8 +363,8 @@ public: bool GetFlyFrmAttr( SfxItemSet &rSet ) const; bool SetFlyFrmAttr( SfxItemSet &rSet ); bool ResetFlyFrmAttr( sal_uInt16 nWhich, const SfxItemSet* pSet = 0 ); - const SwFrmFmt *NewFlyFrm( const SfxItemSet &rSet, bool bAnchValid = false, - SwFrmFmt *pParent = 0 ); + const SwFrameFormat *NewFlyFrm( const SfxItemSet &rSet, bool bAnchValid = false, + SwFrameFormat *pParent = 0 ); void SetFlyPos( const Point &rAbsPos); Point FindAnchorPos( const Point &rAbsPos, bool bMoveIt = false ); @@ -373,12 +373,12 @@ public: - add output parameter <bVertL2R> */ bool IsFrmVertical(const bool bEnvironment, bool& bRightToLeft, bool& bVertL2R) const; - SwFrmFmt* GetCurFrmFmt() const; ///< If frame then frame style, else 0. - void SetFrmFmt( SwFrmFmt *pFmt, bool bKeepOrient = false, Point* pDocPos = 0 ); ///< If frame then set frame style. + SwFrameFormat* GetCurFrameFormat() const; ///< If frame then frame style, else 0. + void SetFrameFormat( SwFrameFormat *pFormat, bool bKeepOrient = false, Point* pDocPos = 0 ); ///< If frame then set frame style. const SwFlyFrm *GetCurrFlyFrm() const { return FindFlyFrm(); } /// Find/delete fly containing the cursor. - SwFrmFmt* WizzardGetFly(); + SwFrameFormat* WizzardGetFly(); /// Independent selecting of flys. bool GotoNextFly( sal_uInt16 /*GOTOOBJ_...*/ eType = GOTOOBJ_FLY_ANY ) @@ -388,14 +388,14 @@ public: /// Iterate over flys - for Basic-collections. size_t GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false ) const; - const SwFrmFmt* GetFlyNum(size_t nIdx, FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false) const; + const SwFrameFormat* GetFlyNum(size_t nIdx, FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false) const; - /// If a fly is selected, it draws cursor into the first CntntFrm. - const SwFrmFmt* SelFlyGrabCrsr(); + /// If a fly is selected, it draws cursor into the first ContentFrm. + const SwFrameFormat* SelFlyGrabCrsr(); /// Get FlyFrameFormat; fuer UI Macro Anbindung an Flys - const SwFrmFmt* GetFlyFrmFmt() const; - SwFrmFmt* GetFlyFrmFmt(); + const SwFrameFormat* GetFlyFrameFormat() const; + SwFrameFormat* GetFlyFrameFormat(); /** OLE. Server requires new size. Desired values are adjusted as frame attributes. If the values are not allowed, the formatting clips and determines scaling. @@ -413,7 +413,7 @@ public: virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj, const SwRect *pFlyPrtRect = 0, const SwRect *pFlyFrmRect = 0, - const bool bNoTxtFrmPrtAreaChanged = false ) = 0; + const bool bNoTextFrmPrtAreaChanged = false ) = 0; /** Connect objects with ActivateWhenVisible at Paint. Called by notxtfrm::Paint, implemented in wrtsh. */ @@ -445,16 +445,16 @@ public: bool bSelFrame = true ); /// Position is a graphic with URL? - const SwFrmFmt* IsURLGrfAtPos( const Point& rPt, OUString* pURL = 0, + const SwFrameFormat* IsURLGrfAtPos( const Point& rPt, OUString* pURL = 0, OUString *pTargetFrameName = 0, OUString *pURLDescription = 0 ) const; /** For Chain always connect Fly specified by format with that hit by point. rRect contains rect of Fly (for its highlight). */ - SwChainRet Chainable( SwRect &rRect, const SwFrmFmt &rSource, const Point &rPt ) const; - SwChainRet Chain( SwFrmFmt &rSource, const Point &rPt ); - SwChainRet Chain( SwFrmFmt &rSource, const SwFrmFmt &rDest ); - void Unchain( SwFrmFmt &rFmt ); + SwChainRet Chainable( SwRect &rRect, const SwFrameFormat &rSource, const Point &rPt ) const; + SwChainRet Chain( SwFrameFormat &rSource, const Point &rPt ); + SwChainRet Chain( SwFrameFormat &rSource, const SwFrameFormat &rDest ); + void Unchain( SwFrameFormat &rFormat ); void HideChainMarker(); void SetChainMarker(); @@ -530,7 +530,7 @@ public: /** Get selected DrawObj as graphics (MetaFile/Bitmap). Return value indicates if it was converted. */ - bool GetDrawObjGraphic( SotClipboardFormatId nFmt, Graphic& rGrf ) const; + bool GetDrawObjGraphic( SotClipboardFormatId nFormat, Graphic& rGrf ) const; void Paste( SvStream& rStm, sal_uInt16 nAction, const Point* pPt = 0 ); bool Paste( const Graphic &rGrf, const OUString& rURL ); @@ -544,7 +544,7 @@ public: const Graphic* pGraphic = 0, const SfxItemSet* pFlyAttrSet = 0, const SfxItemSet* pGrfAttrSet = 0, - SwFrmFmt* = 0 ); + SwFrameFormat* = 0 ); /// Insertion of a drawing object which have to be already inserted in the DrawModel. void InsertDrawObj( SdrObject& rDrawObj, @@ -562,7 +562,7 @@ public: void AlignAllFormulasToBaseline(); /// Provide information about content situated closes to given Point. - Point GetCntntPos( const Point& rPoint, bool bNext ) const; + Point GetContentPos( const Point& rPoint, bool bNext ) const; /// Convert document position into position relative to the current page. Point GetRelativePagePosition(const Point& rDocPos); @@ -595,14 +595,14 @@ public: sal_uInt16 GetPageNumber( const Point &rPoint ) const; bool GetPageNumber( long nYPos, bool bAtCrsrPos, sal_uInt16& rPhyNum, sal_uInt16& rVirtNum, OUString &rDisplay ) const; - SwFlyFrmFmt* InsertObject( const svt::EmbeddedObjectRef&, + SwFlyFrameFormat* InsertObject( const svt::EmbeddedObjectRef&, const SfxItemSet* pFlyAttrSet = 0, const SfxItemSet* pGrfAttrSet = 0, - SwFrmFmt* = 0 ); + SwFrameFormat* = 0 ); bool FinishOLEObj(); ///< Shutdown server. - void GetTblAttr( SfxItemSet & ) const; - void SetTblAttr( const SfxItemSet & ); + void GetTableAttr( SfxItemSet & ) const; + void SetTableAttr( const SfxItemSet & ); bool HasWholeTabSelection() const; @@ -615,7 +615,7 @@ public: bool DeleteTable(); bool DeleteRow(bool bCompleteTable = false); - bool DeleteTblSel(); ///< Current selection, may be whole table. + bool DeleteTableSel(); ///< Current selection, may be whole table. sal_uInt16 MergeTab(); /**< Merge selected parts of table. @return error via enum. */ @@ -624,13 +624,13 @@ public: bool SplitTab( bool nVert = true, sal_uInt16 nCnt = 1, bool bSameHeight = false ); bool Sort(const SwSortOptions&); //Sortieren. - void SetRowHeight( const SwFmtFrmSize &rSz ); + void SetRowHeight( const SwFormatFrmSize &rSz ); /// Pointer must be detroyed by caller != 0. - void GetRowHeight( SwFmtFrmSize *&rpSz ) const; + void GetRowHeight( SwFormatFrmSize *&rpSz ) const; - void SetRowSplit( const SwFmtRowSplit &rSz ); - void GetRowSplit( SwFmtRowSplit *&rpSz ) const; + void SetRowSplit( const SwFormatRowSplit &rSz ); + void GetRowSplit( SwFormatRowSplit *&rpSz ) const; void SetBoxAlign( sal_uInt16 nOrient ); sal_uInt16 GetBoxAlign() const; ///< USHRT_MAX if ambiguous. @@ -662,7 +662,7 @@ public: const Point &rPt ); /// pEnd will be used during MouseMove - bool SelTblRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false ); + bool SelTableRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false ); void GetTabRows( SwTabCols &rToFill ) const; void SetTabRows( const SwTabCols &rNew, bool bCurColOnly ); @@ -672,9 +672,9 @@ public: void ProtectCells(); /**< If a table selection exists it is destroyed in case cursor is not allowed in readonly. */ void UnProtectCells(); ///< Refers to table selection. - void UnProtectTbls(); ///< Unprotect all tables in selection. - bool HasTblAnyProtection( const OUString* pTblName = 0, - bool* pFullTblProtection = 0 ); + void UnProtectTables(); ///< Unprotect all tables in selection. + bool HasTableAnyProtection( const OUString* pTableName = 0, + bool* pFullTableProtection = 0 ); bool CanUnProtectCells() const; sal_uInt16 GetRowsToRepeat() const; @@ -700,13 +700,13 @@ public: bool BalanceCellWidth( bool bTstOnly ); /// AutoFormat for table/ table selection. - bool SetTableAutoFmt( const SwTableAutoFmt& rNew ); + bool SetTableAutoFormat( const SwTableAutoFormat& rNew ); - bool GetTableAutoFmt( SwTableAutoFmt& rGet ); + bool GetTableAutoFormat( SwTableAutoFormat& rGet ); bool SetColRowWidthHeight( sal_uInt16 eType, sal_uInt16 nDiff = 283 ); - bool GetAutoSum( OUString& rFml ) const; + bool GetAutoSum( OUString& rFormula ) const; /** Phy: real page count. Virt: consider offset that may have been set by user. */ @@ -716,7 +716,7 @@ public: void SetPageOffset( sal_uInt16 nOffset ); ///< Changes last page offset. sal_uInt16 GetPageOffset() const; ///< @return last page offset. - void InsertLabel( const SwLabelType eType, const OUString &rTxt, const OUString& rSeparator, + void InsertLabel( const SwLabelType eType, const OUString &rText, const OUString& rSeparator, const OUString& rNumberSeparator, const bool bBefore, const sal_uInt16 nId, const OUString& rCharacterStyle, @@ -737,10 +737,10 @@ public: bool IsLastCellInRow() const; /// Width of current range for column-dialog. - long GetSectionWidth( SwFmt const & rFmt ) const; + long GetSectionWidth( SwFormat const & rFormat ) const; - void GetConnectableFrmFmts - (SwFrmFmt & rFmt, const OUString & rReference, bool bSuccessors, + void GetConnectableFrameFormats + (SwFrameFormat & rFormat, const OUString & rReference, bool bSuccessors, ::std::vector< OUString > & aPrevPageVec, ::std::vector< OUString > & aThisPageVec, ::std::vector< OUString > & aNextPageVec, @@ -775,10 +775,10 @@ public: void ParkCursorInTab(); - SwTxtNode * GetNumRuleNodeAtPos(const Point &rPot); + SwTextNode * GetNumRuleNodeAtPos(const Point &rPot); bool IsNumLabel( const Point &rPt, int nMaxOffset = -1 ); - static bool IsVerticalModeAtNdAndPos( const SwTxtNode& _rTxtNode, + static bool IsVerticalModeAtNdAndPos( const SwTextNode& _rTextNode, const Point& _rDocPos ); void ToggleHeaderFooterEdit( ); diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index cc365ed6b2ec..7447fdb86096 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -78,7 +78,7 @@ enum RES_FIELDS }; /// List of FieldTypes at UI. -enum SwFldTypesEnum +enum SwFieldTypesEnum { TYP_BEGIN, TYP_DATEFLD = TYP_BEGIN, // 0 @@ -224,7 +224,7 @@ enum SwDateTimeSubType }; /// General tools. -OUString GetResult(double nVal, sal_uInt32 nNumFmt, sal_uInt16 nLang = LANGUAGE_SYSTEM); +OUString GetResult(double nVal, sal_uInt32 nNumFormat, sal_uInt16 nLang = LANGUAGE_SYSTEM); void SetErrorStr(const OUString& rStr); OUString FormatNumber(sal_uInt32 nNum, sal_uInt32 nFormat); @@ -240,9 +240,9 @@ class SW_DLLPUBLIC SwFieldType : public SwModify sal_uInt16 m_nWhich; friend void _FinitUI(); ///< In order to delete pointer! - static std::vector<OUString>* s_pFldNames; + static std::vector<OUString>* s_pFieldNames; - static void _GetFldName(); ///< Sets up FldNames; fldmgr.cxx! + static void _GetFieldName(); ///< Sets up FieldNames; fldmgr.cxx! protected: /// Single argument ctors shall be explicit. @@ -267,10 +267,10 @@ public: sal_uInt16 Which() const { return m_nWhich; } - inline void UpdateFlds() const; + inline void UpdateFields() const; }; -inline void SwFieldType::UpdateFlds() const +inline void SwFieldType::UpdateFields() const { const_cast<SwFieldType*>(this)->ModifyNotification( 0, 0 ); } @@ -297,7 +297,7 @@ protected: void SetFormat(sal_uInt32 const nSet) { m_nFormat = nSet; } SwField( SwFieldType* pTyp, - sal_uInt32 nFmt = 0, + sal_uInt32 nFormat = 0, sal_uInt16 nLang = LANGUAGE_SYSTEM, bool m_bUseFieldValueCache = true ); @@ -314,7 +314,7 @@ public: @remark most callers should use the cached field value. this is because various fields need special handing (ChangeExpansion()) to return correct values, and only - SwTxtFormatter::NewFldPortion() sets things up properly. + SwTextFormatter::NewFieldPortion() sets things up properly. @return the generated text (suitable for display) */ OUString ExpandField(bool const bCached, ToxAuthorityField eField = AUTH_FIELD_IDENTIFIER) const; @@ -396,9 +396,9 @@ public: inline bool UseFormat() const { return m_bUseFormat; } inline void EnableFormat(bool bFormat = true) { m_bUseFormat = bFormat; } - OUString ExpandValue(const double& rVal, sal_uInt32 nFmt, sal_uInt16 nLng=0) const; + OUString ExpandValue(const double& rVal, sal_uInt32 nFormat, sal_uInt16 nLng=0) const; OUString DoubleToString(const double &rVal, LanguageType eLng) const; - OUString DoubleToString(const double &rVal, sal_uInt32 nFmt) const; + OUString DoubleToString(const double &rVal, sal_uInt32 nFormat) const; }; class SW_DLLPUBLIC SwValueField : public SwField @@ -407,8 +407,8 @@ private: double m_fValue; protected: - SwValueField( SwValueFieldType* pFldType, sal_uInt32 nFmt = 0, sal_uInt16 nLang = LANGUAGE_SYSTEM, const double fVal = 0.0 ); - SwValueField( const SwValueField& rFld ); + SwValueField( SwValueFieldType* pFieldType, sal_uInt32 nFormat = 0, sal_uInt16 nLang = LANGUAGE_SYSTEM, const double fVal = 0.0 ); + SwValueField( const SwValueField& rField ); public: virtual ~SwValueField(); @@ -421,10 +421,10 @@ public: virtual double GetValue() const; virtual void SetValue( const double& rVal ); - inline OUString ExpandValue(const double& rVal, sal_uInt32 nFmt, sal_uInt16 nLng=0) const - { return static_cast<SwValueFieldType*>(GetTyp())->ExpandValue(rVal, nFmt, nLng); } + inline OUString ExpandValue(const double& rVal, sal_uInt32 nFormat, sal_uInt16 nLng=0) const + { return static_cast<SwValueFieldType*>(GetTyp())->ExpandValue(rVal, nFormat, nLng); } - static sal_uInt32 GetSystemFormat(SvNumberFormatter* pFormatter, sal_uInt32 nFmt); + static sal_uInt32 GetSystemFormat(SvNumberFormatter* pFormatter, sal_uInt32 nFormat); }; class SW_DLLPUBLIC SwFormulaField : public SwValueField @@ -433,8 +433,8 @@ private: OUString m_sFormula; protected: - SwFormulaField( SwValueFieldType* pFldType, sal_uInt32 nFmt = 0, const double fVal = 0.0 ); - SwFormulaField( const SwFormulaField& rFld ); + SwFormulaField( SwValueFieldType* pFieldType, sal_uInt32 nFormat = 0, const double fVal = 0.0 ); + SwFormulaField( const SwFormulaField& rField ); public: virtual OUString GetFormula() const SAL_OVERRIDE; diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx index 2bfbec12cc6f..f99eb558d7ab 100644 --- a/sw/inc/flddat.hxx +++ b/sw/inc/flddat.hxx @@ -98,7 +98,7 @@ class SW_DLLPUBLIC SwDateTimeField : public SwValueField public: SwDateTimeField(SwDateTimeFieldType* pType, sal_uInt16 nSubType = DATEFLD, - sal_uLong nFmt = 0, sal_uInt16 nLng = 0); + sal_uLong nFormat = 0, sal_uInt16 nLng = 0); virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; virtual void SetSubType(sal_uInt16 nSub) SAL_OVERRIDE; diff --git a/sw/inc/fldui.hrc b/sw/inc/fldui.hrc index 99d77062483d..ab53fea827da 100644 --- a/sw/inc/fldui.hrc +++ b/sw/inc/fldui.hrc @@ -22,7 +22,7 @@ #include "rcid.hrc" /*-------------------------------------------------------------------- - TypeId, see SwFldTypesEnum + TypeId, see SwFieldTypesEnum --------------------------------------------------------------------*/ #define STR_TYPE_BEGIN RC_FLDDLG_BEGIN diff --git a/sw/inc/fldupde.hxx b/sw/inc/fldupde.hxx index 788ec5966282..6995b403dbb1 100644 --- a/sw/inc/fldupde.hxx +++ b/sw/inc/fldupde.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SW_INC_FLDUPDE_HXX #define INCLUDED_SW_INC_FLDUPDE_HXX -enum SwFldUpdateFlags +enum SwFieldUpdateFlags { AUTOUPD_OFF, AUTOUPD_FIELD_ONLY, diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx index f3434bdb2ed9..0a912d06ce2f 100644 --- a/sw/inc/flypos.hxx +++ b/sw/inc/flypos.hxx @@ -23,20 +23,20 @@ #include <boost/shared_ptr.hpp> #include <set> -class SwFrmFmt; +class SwFrameFormat; class SwNodeIndex; /// For querying current flys in document. class SW_DLLPUBLIC SwPosFlyFrm { - const SwFrmFmt* pFrmFmt; ///< FlyFrmFmt + const SwFrameFormat* pFrameFormat; ///< FlyFrameFormat SwNodeIndex* pNdIdx; ///< Index for node is sufficient. sal_uInt32 nOrdNum; public: - SwPosFlyFrm( const SwNodeIndex& , const SwFrmFmt*, sal_uInt16 nArrPos ); + SwPosFlyFrm( const SwNodeIndex& , const SwFrameFormat*, sal_uInt16 nArrPos ); virtual ~SwPosFlyFrm(); ///< Virtual for Writer (DLL !!) - const SwFrmFmt& GetFmt() const { return *pFrmFmt; } + const SwFrameFormat& GetFormat() const { return *pFrameFormat; } const SwNodeIndex& GetNdIndex() const { return *pNdIdx; } sal_uInt32 GetOrdNum() const { return nOrdNum; } }; diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx index 38bedd19415f..54468ab91cb5 100644 --- a/sw/inc/fmtanchr.hxx +++ b/sw/inc/fmtanchr.hxx @@ -31,9 +31,9 @@ struct SwPosition; class IntlWrapper; /// FlyAnchors -class SW_DLLPUBLIC SwFmtAnchor: public SfxPoolItem +class SW_DLLPUBLIC SwFormatAnchor: public SfxPoolItem { - ::boost::scoped_ptr<SwPosition> m_pCntntAnchor; /**< 0 for page-bound frames. + ::boost::scoped_ptr<SwPosition> m_pContentAnchor; /**< 0 for page-bound frames. Index for paragraph-bound frames. Position for character-bound frames. */ RndStdIds nAnchorId; @@ -44,11 +44,11 @@ class SW_DLLPUBLIC SwFmtAnchor: public SfxPoolItem static sal_uInt32 mnOrderCounter; public: - SwFmtAnchor( RndStdIds eRnd = FLY_AT_PAGE, sal_uInt16 nPageNum = 0 ); - SwFmtAnchor( const SwFmtAnchor &rCpy ); - virtual ~SwFmtAnchor(); + SwFormatAnchor( RndStdIds eRnd = FLY_AT_PAGE, sal_uInt16 nPageNum = 0 ); + SwFormatAnchor( const SwFormatAnchor &rCpy ); + virtual ~SwFormatAnchor(); - SwFmtAnchor &operator=( const SwFmtAnchor& ); + SwFormatAnchor &operator=( const SwFormatAnchor& ); /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; @@ -64,7 +64,7 @@ public: RndStdIds GetAnchorId() const { return nAnchorId; } sal_uInt16 GetPageNum() const { return nPageNum; } - const SwPosition *GetCntntAnchor() const { return m_pCntntAnchor.get(); } + const SwPosition *GetContentAnchor() const { return m_pContentAnchor.get(); } // #i28701# sal_uInt32 GetOrder() const { return mnOrder;} @@ -75,10 +75,10 @@ public: void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; -inline const SwFmtAnchor &SwAttrSet::GetAnchor(bool bInP) const - { return static_cast<const SwFmtAnchor&>(Get(RES_ANCHOR, bInP)); } +inline const SwFormatAnchor &SwAttrSet::GetAnchor(bool bInP) const + { return static_cast<const SwFormatAnchor&>(Get(RES_ANCHOR, bInP)); } - inline const SwFmtAnchor &SwFmt::GetAnchor(bool bInP) const + inline const SwFormatAnchor &SwFormat::GetAnchor(bool bInP) const { return m_aSet.GetAnchor(bInP); } #endif diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx index e7816237226c..048307c15c2b 100644 --- a/sw/inc/fmtautofmt.hxx +++ b/sw/inc/fmtautofmt.hxx @@ -23,21 +23,21 @@ #include <format.hxx> #include <memory> -class SwFmtAutoFmt: public SfxPoolItem +class SwFormatAutoFormat: public SfxPoolItem { std::shared_ptr<SfxItemSet> mpHandle; public: - SwFmtAutoFmt( sal_uInt16 nWhich = RES_TXTATR_AUTOFMT ); + SwFormatAutoFormat( sal_uInt16 nWhich = RES_TXTATR_AUTOFMT ); /// single argument ctors shall be explicit. - virtual ~SwFmtAutoFmt(); + virtual ~SwFormatAutoFormat(); /// @@@ public copy ctor, but no copy assignment? - SwFmtAutoFmt( const SwFmtAutoFmt& rAttr ); + SwFormatAutoFormat( const SwFormatAutoFormat& rAttr ); private: /// @@@ public copy ctor, but no copy assignment? - SwFmtAutoFmt & operator= (const SwFmtAutoFmt &) SAL_DELETED_FUNCTION; + SwFormatAutoFormat & operator= (const SwFormatAutoFormat &) SAL_DELETED_FUNCTION; public: TYPEINFO_OVERRIDE(); diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx index e7371a468fe4..cd4a34ab2768 100644 --- a/sw/inc/fmtclbl.hxx +++ b/sw/inc/fmtclbl.hxx @@ -25,10 +25,10 @@ #include "swdllapi.h" /// If text in multi-column sections should be evenly distributed. -class SW_DLLPUBLIC SwFmtNoBalancedColumns : public SfxBoolItem +class SW_DLLPUBLIC SwFormatNoBalancedColumns : public SfxBoolItem { public: - SwFmtNoBalancedColumns( bool bFlag = false ) + SwFormatNoBalancedColumns( bool bFlag = false ) : SfxBoolItem( RES_COLUMNBALANCE, bFlag ) {} /// "pure virtual methods" of SfxPoolItem @@ -36,10 +36,10 @@ public: void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; -inline const SwFmtNoBalancedColumns &SwAttrSet::GetBalancedColumns(bool bInP) const - { return static_cast<const SwFmtNoBalancedColumns&>(Get( RES_COLUMNBALANCE, bInP )); } +inline const SwFormatNoBalancedColumns &SwAttrSet::GetBalancedColumns(bool bInP) const + { return static_cast<const SwFormatNoBalancedColumns&>(Get( RES_COLUMNBALANCE, bInP )); } -inline const SwFmtNoBalancedColumns &SwFmt::GetBalancedColumns(bool bInP) const +inline const SwFormatNoBalancedColumns &SwFormat::GetBalancedColumns(bool bInP) const { return m_aSet.GetBalancedColumns( bInP ); } #endif diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx index 267d54190e63..18f25baa75ee 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -68,7 +68,7 @@ enum SwColLineAdj COLADJ_BOTTOM }; -class SW_DLLPUBLIC SwFmtCol : public SfxPoolItem +class SW_DLLPUBLIC SwFormatCol : public SfxPoolItem { editeng::SvxBorderStyle m_eLineStyle; ///< style of the separator line sal_uLong m_nLineWidth; ///< Width of the separator line. @@ -92,14 +92,14 @@ class SW_DLLPUBLIC SwFmtCol : public SfxPoolItem SAL_DLLPRIVATE void Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct ); public: - SwFmtCol(); - SwFmtCol( const SwFmtCol& ); - virtual ~SwFmtCol(); + SwFormatCol(); + SwFormatCol( const SwFormatCol& ); + virtual ~SwFormatCol(); //#i120133# sal_Int16 GetAdjustValue() const { return m_aWidthAdjustValue; } void SetAdjustValue( const sal_Int16& n ) { m_aWidthAdjustValue = n; } - SwFmtCol& operator=( const SwFmtCol& ); + SwFormatCol& operator=( const SwFormatCol& ); /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; @@ -166,10 +166,10 @@ public: void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; -inline const SwFmtCol &SwAttrSet::GetCol(bool bInP) const - { return static_cast<const SwFmtCol&>(Get( RES_COL,bInP)); } +inline const SwFormatCol &SwAttrSet::GetCol(bool bInP) const + { return static_cast<const SwFormatCol&>(Get( RES_COL,bInP)); } -inline const SwFmtCol &SwFmt::GetCol(bool bInP) const +inline const SwFormatCol &SwFormat::GetCol(bool bInP) const { return m_aSet.GetCol(bInP); } #endif diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx index 9c908b18893b..ce848e2ae4b9 100644 --- a/sw/inc/fmtcnct.hxx +++ b/sw/inc/fmtcnct.hxx @@ -28,16 +28,16 @@ class IntlWrapper; /// Connection (text flow) between two FlyFrms. -class SW_DLLPUBLIC SwFmtChain: public SfxPoolItem +class SW_DLLPUBLIC SwFormatChain: public SfxPoolItem { - SwClient aPrev, ///< Previous SwFlyFrmFmt (if existent). - aNext; ///< Next SwFlyFrmFmt (if existent). + SwClient aPrev, ///< Previous SwFlyFrameFormat (if existent). + aNext; ///< Next SwFlyFrameFormat (if existent). public: - SwFmtChain() : SfxPoolItem( RES_CHAIN ) {} - SwFmtChain( const SwFmtChain &rCpy ); + SwFormatChain() : SfxPoolItem( RES_CHAIN ) {} + SwFormatChain( const SwFormatChain &rCpy ); - inline SwFmtChain &operator=( const SwFmtChain& ); + inline SwFormatChain &operator=( const SwFormatChain& ); /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; @@ -50,24 +50,24 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; - SwFlyFrmFmt* GetPrev() const { return const_cast<SwFlyFrmFmt*>(static_cast<const SwFlyFrmFmt*>(aPrev.GetRegisteredIn())); } - SwFlyFrmFmt* GetNext() const { return const_cast<SwFlyFrmFmt*>(static_cast<const SwFlyFrmFmt*>(aNext.GetRegisteredIn())); } + SwFlyFrameFormat* GetPrev() const { return const_cast<SwFlyFrameFormat*>(static_cast<const SwFlyFrameFormat*>(aPrev.GetRegisteredIn())); } + SwFlyFrameFormat* GetNext() const { return const_cast<SwFlyFrameFormat*>(static_cast<const SwFlyFrameFormat*>(aNext.GetRegisteredIn())); } - void SetPrev( SwFlyFrmFmt *pFmt ); - void SetNext( SwFlyFrmFmt *pFmt ); + void SetPrev( SwFlyFrameFormat *pFormat ); + void SetNext( SwFlyFrameFormat *pFormat ); }; -SwFmtChain &SwFmtChain::operator=( const SwFmtChain &rCpy ) +SwFormatChain &SwFormatChain::operator=( const SwFormatChain &rCpy ) { SetPrev( rCpy.GetPrev() ); SetNext( rCpy.GetNext() ); return *this; } -inline const SwFmtChain &SwAttrSet::GetChain(bool bInP) const - { return static_cast<const SwFmtChain&>(Get( RES_CHAIN,bInP)); } +inline const SwFormatChain &SwAttrSet::GetChain(bool bInP) const + { return static_cast<const SwFormatChain&>(Get( RES_CHAIN,bInP)); } -inline const SwFmtChain &SwFmt::GetChain(bool bInP) const +inline const SwFormatChain &SwFormat::GetChain(bool bInP) const { return m_aSet.GetChain(bInP); } #endif diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx index b11c160a3f02..77c33f9eaeaa 100644 --- a/sw/inc/fmtcntnt.hxx +++ b/sw/inc/fmtcntnt.hxx @@ -26,33 +26,33 @@ class SwNodeIndex; class SwStartNode; -/// Cntnt, content of frame (header, footer, fly). -class SW_DLLPUBLIC SwFmtCntnt: public SfxPoolItem +/// Content, content of frame (header, footer, fly). +class SW_DLLPUBLIC SwFormatContent: public SfxPoolItem { SwNodeIndex *pStartNode; - SwFmtCntnt &operator=( const SwFmtCntnt & ) SAL_DELETED_FUNCTION; + SwFormatContent &operator=( const SwFormatContent & ) SAL_DELETED_FUNCTION; public: - SwFmtCntnt( const SwStartNode* pStartNode = 0 ); - SwFmtCntnt( const SwFmtCntnt &rCpy ); - virtual ~SwFmtCntnt(); + SwFormatContent( const SwStartNode* pStartNode = 0 ); + SwFormatContent( const SwFormatContent &rCpy ); + virtual ~SwFormatContent(); /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; - const SwNodeIndex *GetCntntIdx() const { return pStartNode; } - void SetNewCntntIdx( const SwNodeIndex *pIdx ); + const SwNodeIndex *GetContentIdx() const { return pStartNode; } + void SetNewContentIdx( const SwNodeIndex *pIdx ); void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; -inline const SwFmtCntnt &SwAttrSet::GetCntnt(bool bInP) const - { return static_cast<const SwFmtCntnt&>(Get( RES_CNTNT,bInP)); } +inline const SwFormatContent &SwAttrSet::GetContent(bool bInP) const + { return static_cast<const SwFormatContent&>(Get( RES_CNTNT,bInP)); } -inline const SwFmtCntnt &SwFmt::GetCntnt(bool bInP) const - { return m_aSet.GetCntnt(bInP); } +inline const SwFormatContent &SwFormat::GetContent(bool bInP) const + { return m_aSet.GetContent(bInP); } #endif diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index 4d4b047c9897..b3529802206c 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -28,33 +28,33 @@ class SwDoc; namespace sw{ class DocumentStylePoolManager; } -class SwFmtColl : public SwFmt +class SwFormatColl : public SwFormat { protected: - SwFmtColl( SwAttrPool& rPool, const sal_Char* pFmtName, - const sal_uInt16* pWhichRanges, SwFmtColl* pDerFrom, - sal_uInt16 nFmtWhich ) - : SwFmt( rPool, pFmtName, pWhichRanges, pDerFrom, nFmtWhich ) + SwFormatColl( SwAttrPool& rPool, const sal_Char* pFormatName, + const sal_uInt16* pWhichRanges, SwFormatColl* pDerFrom, + sal_uInt16 nFormatWhich ) + : SwFormat( rPool, pFormatName, pWhichRanges, pDerFrom, nFormatWhich ) { SetAuto( false ); } - SwFmtColl( SwAttrPool& rPool, const OUString &rFmtName, - const sal_uInt16* pWhichRanges, SwFmtColl* pDerFrom, - sal_uInt16 nFmtWhich ) - : SwFmt( rPool, rFmtName, pWhichRanges, pDerFrom, nFmtWhich ) + SwFormatColl( SwAttrPool& rPool, const OUString &rFormatName, + const sal_uInt16* pWhichRanges, SwFormatColl* pDerFrom, + sal_uInt16 nFormatWhich ) + : SwFormat( rPool, rFormatName, pWhichRanges, pDerFrom, nFormatWhich ) { SetAuto( false ); } private: - SwFmtColl(const SwFmtColl & ) SAL_DELETED_FUNCTION; - const SwFmtColl &operator=(const SwFmtColl &) SAL_DELETED_FUNCTION; + SwFormatColl(const SwFormatColl & ) SAL_DELETED_FUNCTION; + const SwFormatColl &operator=(const SwFormatColl &) SAL_DELETED_FUNCTION; }; /// Represents the style of a paragraph. -class SW_DLLPUBLIC SwTxtFmtColl: public SwFmtColl +class SW_DLLPUBLIC SwTextFormatColl: public SwFormatColl { friend class SwDoc; friend class ::sw::DocumentStylePoolManager; - SwTxtFmtColl(const SwTxtFmtColl & rRef) SAL_DELETED_FUNCTION; + SwTextFormatColl(const SwTextFormatColl & rRef) SAL_DELETED_FUNCTION; bool mbStayAssignedToListLevelOfOutlineStyle; @@ -62,26 +62,26 @@ protected: bool mbAssignedToOutlineStyle; - SwTxtFmtColl *pNextTxtFmtColl; + SwTextFormatColl *pNextTextFormatColl; - SwTxtFmtColl( SwAttrPool& rPool, const sal_Char* pFmtCollName, - SwTxtFmtColl* pDerFrom = 0, - sal_uInt16 nFmtWh = RES_TXTFMTCOLL ) - : SwFmtColl(rPool, pFmtCollName, aTxtFmtCollSetRange, pDerFrom, nFmtWh) + SwTextFormatColl( SwAttrPool& rPool, const sal_Char* pFormatCollName, + SwTextFormatColl* pDerFrom = 0, + sal_uInt16 nFormatWh = RES_TXTFMTCOLL ) + : SwFormatColl(rPool, pFormatCollName, aTextFormatCollSetRange, pDerFrom, nFormatWh) , mbStayAssignedToListLevelOfOutlineStyle(false) , mbAssignedToOutlineStyle(false) { - pNextTxtFmtColl = this; + pNextTextFormatColl = this; } - SwTxtFmtColl( SwAttrPool& rPool, const OUString &rFmtCollName, - SwTxtFmtColl* pDerFrom = 0, - sal_uInt16 nFmtWh = RES_TXTFMTCOLL ) - : SwFmtColl(rPool, rFmtCollName, aTxtFmtCollSetRange, pDerFrom, nFmtWh) + SwTextFormatColl( SwAttrPool& rPool, const OUString &rFormatCollName, + SwTextFormatColl* pDerFrom = 0, + sal_uInt16 nFormatWh = RES_TXTFMTCOLL ) + : SwFormatColl(rPool, rFormatCollName, aTextFormatCollSetRange, pDerFrom, nFormatWh) , mbStayAssignedToListLevelOfOutlineStyle(false) , mbAssignedToOutlineStyle(false) { - pNextTxtFmtColl = this; + pNextTextFormatColl = this; } /// To get UL- / LR- / FontHeight-changes. @@ -91,8 +91,8 @@ public: TYPEINFO_OVERRIDE(); ///< Already in base class Client. - inline void SetNextTxtFmtColl(SwTxtFmtColl& rNext); - SwTxtFmtColl& GetNextTxtFmtColl() const { return *pNextTxtFmtColl; } + inline void SetNextTextFormatColl(SwTextFormatColl& rNext); + SwTextFormatColl& GetNextTextFormatColl() const { return *pNextTextFormatColl; } bool IsAtDocNodeSet() const; @@ -117,12 +117,12 @@ public: /** Override to recognize changes on the <SwNumRuleItem> and register/unregister the paragragh style at the corresponding <SwNumRule> instance. */ - virtual bool SetFmtAttr( const SfxPoolItem& rAttr ) SAL_OVERRIDE; - virtual bool SetFmtAttr( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ) SAL_OVERRIDE; + virtual bool SetFormatAttr( const SfxPoolItem& rAttr ) SAL_OVERRIDE; + virtual bool SetFormatAttr( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool ResetFormatAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ) SAL_OVERRIDE; - /// Override <ResetAllFmtAttr()> to stay assigned to list level of outline style. - virtual sal_uInt16 ResetAllFmtAttr() SAL_OVERRIDE; + /// Override <ResetAllFormatAttr()> to stay assigned to list level of outline style. + virtual sal_uInt16 ResetAllFormatAttr() SAL_OVERRIDE; inline bool StayAssignedToListLevelOfOutlineStyle() const { @@ -134,19 +134,19 @@ public: void dumpAsXml(struct _xmlTextWriter* pWriter) const; }; -class SwGrfFmtColl: public SwFmtColl +class SwGrfFormatColl: public SwFormatColl { friend class SwDoc; protected: - SwGrfFmtColl( SwAttrPool& rPool, const sal_Char* pFmtCollName, - SwGrfFmtColl* pDerFrom = 0 ) - : SwFmtColl( rPool, pFmtCollName, aGrfFmtCollSetRange, + SwGrfFormatColl( SwAttrPool& rPool, const sal_Char* pFormatCollName, + SwGrfFormatColl* pDerFrom = 0 ) + : SwFormatColl( rPool, pFormatCollName, aGrfFormatCollSetRange, pDerFrom, RES_GRFFMTCOLL ) {} - SwGrfFmtColl( SwAttrPool& rPool, const OUString &rFmtCollName, - SwGrfFmtColl* pDerFrom = 0 ) - : SwFmtColl( rPool, rFmtCollName, aGrfFmtCollSetRange, + SwGrfFormatColl( SwAttrPool& rPool, const OUString &rFormatCollName, + SwGrfFormatColl* pDerFrom = 0 ) + : SwFormatColl( rPool, rFormatCollName, aGrfFormatCollSetRange, pDerFrom, RES_GRFFMTCOLL ) {} @@ -178,15 +178,15 @@ class SW_DLLPUBLIC SwCollCondition : public SwClient union { sal_uLong nSubCondition; - OUString* pFldExpression; + OUString* pFieldExpression; } aSubCondition; public: TYPEINFO_OVERRIDE(); ///< Already in base class Client. - SwCollCondition( SwTxtFmtColl* pColl, sal_uLong nMasterCond, + SwCollCondition( SwTextFormatColl* pColl, sal_uLong nMasterCond, sal_uLong nSubCond = 0 ); - SwCollCondition( SwTxtFmtColl* pColl, sal_uLong nMasterCond, + SwCollCondition( SwTextFormatColl* pColl, sal_uLong nMasterCond, const OUString& rSubExp ); virtual ~SwCollCondition(); @@ -203,50 +203,50 @@ public: sal_uLong GetCondition() const { return nCondition; } sal_uLong GetSubCondition() const { return aSubCondition.nSubCondition; } - const OUString* GetFldExpression() const - { return aSubCondition.pFldExpression; } + const OUString* GetFieldExpression() const + { return aSubCondition.pFieldExpression; } void SetCondition( sal_uLong nCond, sal_uLong nSubCond ); - SwTxtFmtColl* GetTxtFmtColl() const { return const_cast<SwTxtFmtColl*>(static_cast<const SwTxtFmtColl*>(GetRegisteredIn())); } - void RegisterToFormat( SwFmt& ); + SwTextFormatColl* GetTextFormatColl() const { return const_cast<SwTextFormatColl*>(static_cast<const SwTextFormatColl*>(GetRegisteredIn())); } + void RegisterToFormat( SwFormat& ); }; -class SwFmtCollConditions : public boost::ptr_vector<SwCollCondition> {}; +class SwFormatCollConditions : public boost::ptr_vector<SwCollCondition> {}; -class SW_DLLPUBLIC SwConditionTxtFmtColl : public SwTxtFmtColl +class SW_DLLPUBLIC SwConditionTextFormatColl : public SwTextFormatColl { friend class SwDoc; friend class ::sw::DocumentStylePoolManager; protected: - SwFmtCollConditions aCondColls; + SwFormatCollConditions aCondColls; - SwConditionTxtFmtColl( SwAttrPool& rPool, const sal_Char* pFmtCollName, - SwTxtFmtColl* pDerFrom = 0 ) - : SwTxtFmtColl( rPool, pFmtCollName, pDerFrom, RES_CONDTXTFMTCOLL ) + SwConditionTextFormatColl( SwAttrPool& rPool, const sal_Char* pFormatCollName, + SwTextFormatColl* pDerFrom = 0 ) + : SwTextFormatColl( rPool, pFormatCollName, pDerFrom, RES_CONDTXTFMTCOLL ) {} - SwConditionTxtFmtColl( SwAttrPool& rPool, const OUString &rFmtCollName, - SwTxtFmtColl* pDerFrom = 0 ) - : SwTxtFmtColl( rPool, rFmtCollName, pDerFrom, RES_CONDTXTFMTCOLL ) + SwConditionTextFormatColl( SwAttrPool& rPool, const OUString &rFormatCollName, + SwTextFormatColl* pDerFrom = 0 ) + : SwTextFormatColl( rPool, rFormatCollName, pDerFrom, RES_CONDTXTFMTCOLL ) {} public: TYPEINFO_OVERRIDE(); ///< Already in base class Client. - virtual ~SwConditionTxtFmtColl(); + virtual ~SwConditionTextFormatColl(); const SwCollCondition* HasCondition( const SwCollCondition& rCond ) const; - const SwFmtCollConditions& GetCondColls() const { return aCondColls; } + const SwFormatCollConditions& GetCondColls() const { return aCondColls; } void InsertCondition( const SwCollCondition& rCond ); bool RemoveCondition( const SwCollCondition& rCond ); - void SetConditions( const SwFmtCollConditions& ); + void SetConditions( const SwFormatCollConditions& ); }; // FEATURE::CONDCOLL /// Inline implementations. -inline void SwTxtFmtColl::SetNextTxtFmtColl( SwTxtFmtColl& rNext ) +inline void SwTextFormatColl::SetNextTextFormatColl( SwTextFormatColl& rNext ) { - pNextTxtFmtColl = &rNext; + pNextTextFormatColl = &rNext; } #endif diff --git a/sw/inc/fmtcolfunc.hxx b/sw/inc/fmtcolfunc.hxx index e8b4771908c9..e6b12d0ef61b 100644 --- a/sw/inc/fmtcolfunc.hxx +++ b/sw/inc/fmtcolfunc.hxx @@ -19,12 +19,12 @@ #ifndef INCLUDED_SW_INC_FMTCOLFUNC_HXX #define INCLUDED_SW_INC_FMTCOLFUNC_HXX -class SwFmt; +class SwFormat; class SwNumRuleItem; -// namespace <TxtFmtCollFunc> for functions and procedures working on -// paragraph styles (instances of <SwTxtFmtColl> -namespace TxtFmtCollFunc +// namespace <TextFormatCollFunc> for functions and procedures working on +// paragraph styles (instances of <SwTextFormatColl> +namespace TextFormatCollFunc { /** Checks, if assignment of paragraph style to list level of outline style has to be deleted, and deletes the assignment, if needed. @@ -36,43 +36,43 @@ namespace TxtFmtCollFunc @author OD */ - void CheckTxtFmtCollForDeletionOfAssignmentToOutlineStyle( - SwFmt* pFmt, + void CheckTextFormatCollForDeletionOfAssignmentToOutlineStyle( + SwFormat* pFormat, const SwNumRuleItem* pNewNumRuleItem = 0L ); /** determines the list style, which directly set at the given paragraph style @author OD - @param rTxtFmtColl + @param rTextFormatColl input parameter - paragraph style for which the list style should be retrieved @return pointer to <SwNumRule> instance, if the given paragraph style has directly set a list style, 0 otherwise */ - SwNumRule* GetNumRule( SwTxtFmtColl& rTxtFmtColl ); + SwNumRule* GetNumRule( SwTextFormatColl& rTextFormatColl ); /** adds the given paragraph style at the directly set list style Note: If the given paragraph style has no directly set list style, nothing happens - @param rTxtFmtColl + @param rTextFormatColl input parameter - paragraph style which is added to its directly set list style @author OD */ - void AddToNumRule( SwTxtFmtColl& rTxtFmtColl ); + void AddToNumRule( SwTextFormatColl& rTextFormatColl ); /** removes te given paragraph style from the directly set list style Note: If the given paragraph style has no directly set list style, nothing happens - @param rTxtFmtColl + @param rTextFormatColl input parameter - paragraph style which is removed from its directly set list style @author OD */ - void RemoveFromNumRule( SwTxtFmtColl& rTxtFmtColl ); + void RemoveFromNumRule( SwTextFormatColl& rTextFormatColl ); } #endif diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx index 6c4045ca1994..6d2625579bd5 100644 --- a/sw/inc/fmteiro.hxx +++ b/sw/inc/fmteiro.hxx @@ -26,10 +26,10 @@ class IntlWrapper; -class SW_DLLPUBLIC SwFmtEditInReadonly : public SfxBoolItem +class SW_DLLPUBLIC SwFormatEditInReadonly : public SfxBoolItem { public: - SwFmtEditInReadonly( sal_uInt16 nId = RES_EDIT_IN_READONLY, + SwFormatEditInReadonly( sal_uInt16 nId = RES_EDIT_IN_READONLY, bool bPrt = false ) : SfxBoolItem( nId, bPrt ) {} /// "pure virtual methos" of SfxPoolItem @@ -42,10 +42,10 @@ public: void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; -inline const SwFmtEditInReadonly &SwAttrSet::GetEditInReadonly(bool bInP) const - { return static_cast<const SwFmtEditInReadonly&>(Get( RES_EDIT_IN_READONLY,bInP)); } +inline const SwFormatEditInReadonly &SwAttrSet::GetEditInReadonly(bool bInP) const + { return static_cast<const SwFormatEditInReadonly&>(Get( RES_EDIT_IN_READONLY,bInP)); } -inline const SwFmtEditInReadonly &SwFmt::GetEditInReadonly(bool bInP) const +inline const SwFormatEditInReadonly &SwFormat::GetEditInReadonly(bool bInP) const { return m_aSet.GetEditInReadonly(bInP); } #endif diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx index 136038d69209..64115f61d5eb 100644 --- a/sw/inc/fmtflcnt.hxx +++ b/sw/inc/fmtflcnt.hxx @@ -21,33 +21,33 @@ #include <svl/poolitem.hxx> -class SwFrmFmt; -class SwTxtFlyCnt; +class SwFrameFormat; +class SwTextFlyCnt; /** * Format of a fly content. * * A pool item that is attached to the placeholder character of an as-character frame. (TextFrame, etc.) */ -class SwFmtFlyCnt : public SfxPoolItem +class SwFormatFlyCnt : public SfxPoolItem { - friend class SwTxtFlyCnt; - SwTxtFlyCnt* pTxtAttr; - SwFrmFmt* pFmt; ///< My Fly/DrawFrame-format. - SwFmtFlyCnt& operator=(const SwFmtFlyCnt& rFlyCnt) SAL_DELETED_FUNCTION; + friend class SwTextFlyCnt; + SwTextFlyCnt* pTextAttr; + SwFrameFormat* pFormat; ///< My Fly/DrawFrame-format. + SwFormatFlyCnt& operator=(const SwFormatFlyCnt& rFlyCnt) SAL_DELETED_FUNCTION; public: - SwFmtFlyCnt( SwFrmFmt *pFrmFmt ); + SwFormatFlyCnt( SwFrameFormat *pFrameFormat ); /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; - inline SwFrmFmt *GetFrmFmt() const { return pFmt; } + inline SwFrameFormat *GetFrameFormat() const { return pFormat; } /// For Undo: delete the FlyFrmFormat "logically"; it is kept in Undo-object. - inline void SetFlyFmt( SwFrmFmt* pNew = 0 ) { pFmt = pNew; } + inline void SetFlyFormat( SwFrameFormat* pNew = 0 ) { pFormat = pNew; } - const SwTxtFlyCnt *GetTxtFlyCnt() const { return pTxtAttr; } - SwTxtFlyCnt *GetTxtFlyCnt() { return pTxtAttr; } + const SwTextFlyCnt *GetTextFlyCnt() const { return pTextAttr; } + SwTextFlyCnt *GetTextFlyCnt() { return pTextAttr; } bool Sw3ioExportAllowed() const; }; diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx index c4f5e973a5d6..0d4f86bf58f1 100644 --- a/sw/inc/fmtfld.hxx +++ b/sw/inc/fmtfld.hxx @@ -31,27 +31,27 @@ #include <calbck.hxx> class SwField; -class SwTxtFld; +class SwTextField; class SwView; class SwFieldType; // ATT_FLD -class SW_DLLPUBLIC SwFmtFld +class SW_DLLPUBLIC SwFormatField : public SfxPoolItem , public SwModify , public SfxBroadcaster { friend void _InitCore(); - SwFmtFld( sal_uInt16 nWhich ); // for default-Attibute + SwFormatField( sal_uInt16 nWhich ); // for default-Attibute ::com::sun::star::uno::WeakReference< ::com::sun::star::text::XTextField> m_wXTextField; SwField* mpField; - SwTxtFld* mpTxtFld; // the TextAttribute + SwTextField* mpTextField; // the TextAttribute // @@@ copy construction allowed, but copy assignment is not? @@@ - SwFmtFld& operator=(const SwFmtFld& rFld) SAL_DELETED_FUNCTION; + SwFormatField& operator=(const SwFormatField& rField) SAL_DELETED_FUNCTION; protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; @@ -61,12 +61,12 @@ public: TYPEINFO_OVERRIDE(); /// Single argument constructors shall be explicit. - explicit SwFmtFld( const SwField &rFld ); + explicit SwFormatField( const SwField &rField ); /// @@@ copy construction allowed, but copy assignment is not? @@@ - SwFmtFld( const SwFmtFld& rAttr ); + SwFormatField( const SwFormatField& rAttr ); - virtual ~SwFmtFld(); + virtual ~SwFormatField(); /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; @@ -94,19 +94,19 @@ public: */ void SetField( SwField * pField ); - const SwTxtFld* GetTxtFld() const + const SwTextField* GetTextField() const { - return mpTxtFld; + return mpTextField; } - SwTxtFld* GetTxtFld() + SwTextField* GetTextField() { - return mpTxtFld; + return mpTextField; } - void SetTxtFld( SwTxtFld& rTxtFld ); - void ClearTxtFld(); + void SetTextField( SwTextField& rTextField ); + void ClearTextField(); void RegisterToFieldType( SwFieldType& ); - bool IsFldInDoc() const; + bool IsFieldInDoc() const; bool IsProtect() const; SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference< @@ -117,7 +117,7 @@ public: { m_wXTextField = xTextField; } }; -enum class SwFmtFldHintWhich +enum class SwFormatFieldHintWhich { INSERTED = 1, REMOVED = 2, @@ -126,21 +126,21 @@ enum class SwFmtFldHintWhich LANGUAGE = 5 }; -class SW_DLLPUBLIC SwFmtFldHint : public SfxHint +class SW_DLLPUBLIC SwFormatFieldHint : public SfxHint { - const SwFmtFld* pFld; - SwFmtFldHintWhich nWhich; + const SwFormatField* pField; + SwFormatFieldHintWhich nWhich; const SwView* pView; public: - SwFmtFldHint( const SwFmtFld* p, SwFmtFldHintWhich n, const SwView* pV = 0) - : pFld(p) + SwFormatFieldHint( const SwFormatField* p, SwFormatFieldHintWhich n, const SwView* pV = 0) + : pField(p) , nWhich(n) , pView(pV) {} - const SwFmtFld* GetField() const { return pFld; } - SwFmtFldHintWhich Which() const { return nWhich; } + const SwFormatField* GetField() const { return pField; } + SwFormatFieldHintWhich Which() const { return nWhich; } const SwView* GetView() const { return pView; } }; diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx index 7152b7f0f764..431eb4d3fddd 100644 --- a/sw/inc/fmtfollowtextflow.hxx +++ b/sw/inc/fmtfollowtextflow.hxx @@ -26,10 +26,10 @@ class IntlWrapper; -class SW_DLLPUBLIC SwFmtFollowTextFlow : public SfxBoolItem +class SW_DLLPUBLIC SwFormatFollowTextFlow : public SfxBoolItem { public: - SwFmtFollowTextFlow( bool bFlag = false ) + SwFormatFollowTextFlow( bool bFlag = false ) : SfxBoolItem( RES_FOLLOW_TEXT_FLOW, bFlag ) {} TYPEINFO_OVERRIDE(); @@ -45,10 +45,10 @@ public: void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; -inline const SwFmtFollowTextFlow &SwAttrSet::GetFollowTextFlow(bool bInP) const - { return static_cast<const SwFmtFollowTextFlow&>(Get( RES_FOLLOW_TEXT_FLOW, bInP )); } +inline const SwFormatFollowTextFlow &SwAttrSet::GetFollowTextFlow(bool bInP) const + { return static_cast<const SwFormatFollowTextFlow&>(Get( RES_FOLLOW_TEXT_FLOW, bInP )); } -inline const SwFmtFollowTextFlow &SwFmt::GetFollowTextFlow(bool bInP) const +inline const SwFormatFollowTextFlow &SwFormat::GetFollowTextFlow(bool bInP) const { return m_aSet.GetFollowTextFlow( bInP ); } #endif diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx index 4c9fd044afa0..259a5dc7c9da 100644 --- a/sw/inc/fmtfordr.hxx +++ b/sw/inc/fmtfordr.hxx @@ -33,11 +33,11 @@ enum SwFillOrder SW_FILL_ORDER_END }; -class SwFmtFillOrder: public SfxEnumItem +class SwFormatFillOrder: public SfxEnumItem { public: - SwFmtFillOrder( SwFillOrder = ATT_TOP_DOWN ); - inline SwFmtFillOrder &operator=( const SwFmtFillOrder &rCpy ); + SwFormatFillOrder( SwFillOrder = ATT_TOP_DOWN ); + inline SwFormatFillOrder &operator=( const SwFormatFillOrder &rCpy ); /// "Pure virtual methods" of SfxPoolItem. virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -46,16 +46,16 @@ public: SwFillOrder GetFillOrder() const { return SwFillOrder(GetValue()); } }; -inline SwFmtFillOrder &SwFmtFillOrder::operator=( const SwFmtFillOrder &rCpy ) +inline SwFormatFillOrder &SwFormatFillOrder::operator=( const SwFormatFillOrder &rCpy ) { SetValue( rCpy.GetValue() ); return *this; } -inline const SwFmtFillOrder &SwAttrSet::GetFillOrder(bool bInP) const - { return static_cast<const SwFmtFillOrder&>(Get( RES_FILL_ORDER,bInP)); } +inline const SwFormatFillOrder &SwAttrSet::GetFillOrder(bool bInP) const + { return static_cast<const SwFormatFillOrder&>(Get( RES_FILL_ORDER,bInP)); } -inline const SwFmtFillOrder &SwFmt::GetFillOrder(bool bInP) const +inline const SwFormatFillOrder &SwFormat::GetFillOrder(bool bInP) const { return m_aSet.GetFillOrder(bInP); } #endif diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx index c448feee7701..2a5cf5558c29 100644 --- a/sw/inc/fmtfsize.hxx +++ b/sw/inc/fmtfsize.hxx @@ -38,7 +38,7 @@ enum SwFrmSize (can be exceeded but not be less). */ }; -class SW_DLLPUBLIC SwFmtFrmSize: public SfxPoolItem +class SW_DLLPUBLIC SwFormatFrmSize: public SfxPoolItem { Size m_aSize; SwFrmSize m_eFrmHeightType; @@ -60,9 +60,9 @@ class SW_DLLPUBLIC SwFmtFrmSize: public SfxPoolItem // minus borders in BrowseView if the environment is the page. public: - SwFmtFrmSize( SwFrmSize eSize = ATT_VAR_SIZE, + SwFormatFrmSize( SwFrmSize eSize = ATT_VAR_SIZE, SwTwips nWidth = 0, SwTwips nHeight = 0 ); - SwFmtFrmSize& operator=( const SwFmtFrmSize& rCpy ); + SwFormatFrmSize& operator=( const SwFormatFrmSize& rCpy ); /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; @@ -101,10 +101,10 @@ public: void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; -inline const SwFmtFrmSize &SwAttrSet::GetFrmSize(bool bInP) const - { return static_cast<const SwFmtFrmSize&>(Get( RES_FRM_SIZE,bInP)); } +inline const SwFormatFrmSize &SwAttrSet::GetFrmSize(bool bInP) const + { return static_cast<const SwFormatFrmSize&>(Get( RES_FRM_SIZE,bInP)); } -inline const SwFmtFrmSize &SwFmt::GetFrmSize(bool bInP) const +inline const SwFormatFrmSize &SwFormat::GetFrmSize(bool bInP) const { return m_aSet.GetFrmSize(bInP); } #endif diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx index 51e6a215919c..2e6a78894ee1 100644 --- a/sw/inc/fmtftn.hxx +++ b/sw/inc/fmtftn.hxx @@ -31,28 +31,28 @@ namespace com { namespace sun { namespace star { } } } class SwDoc; -class SwTxtFtn; +class SwTextFootnote; // ATT_FTN -class SW_DLLPUBLIC SwFmtFtn +class SW_DLLPUBLIC SwFormatFootnote : public SfxPoolItem , public SwModify { - friend class SwTxtFtn; - SwTxtFtn* m_pTxtAttr; ///< My TextAttribute. + friend class SwTextFootnote; + SwTextFootnote* m_pTextAttr; ///< My TextAttribute. OUString m_aNumber; ///< User-defined 'Number'. sal_uInt16 m_nNumber; ///< Automatische Nummerierung bool m_bEndNote; ///< Is it an End note? css::uno::WeakReference<css::text::XFootnote> m_wXFootnote; - SwFmtFtn& operator=(const SwFmtFtn& rFtn) SAL_DELETED_FUNCTION; - SwFmtFtn( const SwFmtFtn& ) SAL_DELETED_FUNCTION; + SwFormatFootnote& operator=(const SwFormatFootnote& rFootnote) SAL_DELETED_FUNCTION; + SwFormatFootnote( const SwFormatFootnote& ) SAL_DELETED_FUNCTION; public: - SwFmtFtn( bool bEndNote = false ); - virtual ~SwFmtFtn(); + SwFormatFootnote( bool bEndNote = false ); + virtual ~SwFormatFootnote(); /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; @@ -72,16 +72,16 @@ public: void SetNumber( sal_uInt16 nNo ) { m_nNumber = nNo; } void SetEndNote( bool b ); - void SetNumber( const SwFmtFtn& rFtn ) + void SetNumber( const SwFormatFootnote& rFootnote ) { - m_nNumber = rFtn.m_nNumber; - m_aNumber = rFtn.m_aNumber; + m_nNumber = rFootnote.m_nNumber; + m_aNumber = rFootnote.m_aNumber; } - const SwTxtFtn *GetTxtFtn() const { return m_pTxtAttr; } - SwTxtFtn *GetTxtFtn() { return m_pTxtAttr; } + const SwTextFootnote *GetTextFootnote() const { return m_pTextAttr; } + SwTextFootnote *GetTextFootnote() { return m_pTextAttr; } - void GetFtnText( OUString& rStr ) const; + void GetFootnoteText( OUString& rStr ) const; /// Returns string to be displayed of footnote / endnote. OUString GetViewNumStr( const SwDoc& rDoc, bool bInclStrs = false ) const; diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx index 48ec7c6b286a..cfb7c7346d46 100644 --- a/sw/inc/fmtftntx.hxx +++ b/sw/inc/fmtftntx.hxx @@ -25,7 +25,7 @@ #include <numrule.hxx> #include "swdllapi.h" -enum SwFtnEndPosEnum +enum SwFootnoteEndPosEnum { FTNEND_ATPGORDOCEND, ///< at page or document end FTNEND_ATTXTEND, ///< at end of the current text end @@ -34,20 +34,20 @@ enum SwFtnEndPosEnum FTNEND_ATTXTEND_END }; -class SW_DLLPUBLIC SwFmtFtnEndAtTxtEnd : public SfxEnumItem +class SW_DLLPUBLIC SwFormatFootnoteEndAtTextEnd : public SfxEnumItem { OUString sPrefix; OUString sSuffix; - SvxNumberType aFmt; + SvxNumberType aFormat; sal_uInt16 nOffset; protected: - SwFmtFtnEndAtTxtEnd( sal_uInt16 nWhichL, SwFtnEndPosEnum ePos ) + SwFormatFootnoteEndAtTextEnd( sal_uInt16 nWhichL, SwFootnoteEndPosEnum ePos ) : SfxEnumItem( nWhichL, sal::static_int_cast< sal_uInt16 >(ePos) ), nOffset( 0 ) {} - SwFmtFtnEndAtTxtEnd( const SwFmtFtnEndAtTxtEnd& rAttr ) + SwFormatFootnoteEndAtTextEnd( const SwFormatFootnoteEndAtTextEnd& rAttr ) : SfxEnumItem( rAttr ), sPrefix( rAttr.sPrefix ), - sSuffix( rAttr.sSuffix ), aFmt( rAttr.aFmt ), + sSuffix( rAttr.sSuffix ), aFormat( rAttr.aFormat ), nOffset( rAttr.nOffset ) {} @@ -67,12 +67,12 @@ public: inline bool IsAtEnd() const { return FTNEND_ATPGORDOCEND != GetValue(); } - SwFmtFtnEndAtTxtEnd & operator=( const SwFmtFtnEndAtTxtEnd & rAttr ); + SwFormatFootnoteEndAtTextEnd & operator=( const SwFormatFootnoteEndAtTextEnd & rAttr ); - sal_Int16 GetNumType() const { return aFmt.GetNumberingType(); } - void SetNumType( sal_Int16 eType ) { aFmt.SetNumberingType(eType); } + sal_Int16 GetNumType() const { return aFormat.GetNumberingType(); } + void SetNumType( sal_Int16 eType ) { aFormat.SetNumberingType(eType); } - const SvxNumberType& GetSwNumType() const { return aFmt; } + const SvxNumberType& GetSwNumType() const { return aFormat; } sal_uInt16 GetOffset() const { return nOffset; } void SetOffset( sal_uInt16 nOff ) { nOffset = nOff; } @@ -84,21 +84,21 @@ public: void SetSuffix(const OUString& rSet) { sSuffix = rSet; } }; -class SW_DLLPUBLIC SwFmtFtnAtTxtEnd : public SwFmtFtnEndAtTxtEnd +class SW_DLLPUBLIC SwFormatFootnoteAtTextEnd : public SwFormatFootnoteEndAtTextEnd { public: - SwFmtFtnAtTxtEnd( SwFtnEndPosEnum ePos = FTNEND_ATPGORDOCEND ) - : SwFmtFtnEndAtTxtEnd( RES_FTN_AT_TXTEND, ePos ) + SwFormatFootnoteAtTextEnd( SwFootnoteEndPosEnum ePos = FTNEND_ATPGORDOCEND ) + : SwFormatFootnoteEndAtTextEnd( RES_FTN_AT_TXTEND, ePos ) {} virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; }; -class SW_DLLPUBLIC SwFmtEndAtTxtEnd : public SwFmtFtnEndAtTxtEnd +class SW_DLLPUBLIC SwFormatEndAtTextEnd : public SwFormatFootnoteEndAtTextEnd { public: - SwFmtEndAtTxtEnd( SwFtnEndPosEnum ePos = FTNEND_ATPGORDOCEND ) - : SwFmtFtnEndAtTxtEnd( RES_END_AT_TXTEND, ePos ) + SwFormatEndAtTextEnd( SwFootnoteEndPosEnum ePos = FTNEND_ATPGORDOCEND ) + : SwFormatFootnoteEndAtTextEnd( RES_END_AT_TXTEND, ePos ) { SetNumType( SVX_NUM_ROMAN_LOWER ); } @@ -106,15 +106,15 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; }; -inline const SwFmtFtnAtTxtEnd &SwAttrSet::GetFtnAtTxtEnd(bool bInP) const - { return static_cast<const SwFmtFtnAtTxtEnd&>(Get( RES_FTN_AT_TXTEND, bInP)); } -inline const SwFmtEndAtTxtEnd &SwAttrSet::GetEndAtTxtEnd(bool bInP) const - { return static_cast<const SwFmtEndAtTxtEnd&>(Get( RES_END_AT_TXTEND, bInP)); } +inline const SwFormatFootnoteAtTextEnd &SwAttrSet::GetFootnoteAtTextEnd(bool bInP) const + { return static_cast<const SwFormatFootnoteAtTextEnd&>(Get( RES_FTN_AT_TXTEND, bInP)); } +inline const SwFormatEndAtTextEnd &SwAttrSet::GetEndAtTextEnd(bool bInP) const + { return static_cast<const SwFormatEndAtTextEnd&>(Get( RES_END_AT_TXTEND, bInP)); } -inline const SwFmtFtnAtTxtEnd &SwFmt::GetFtnAtTxtEnd(bool bInP) const - { return m_aSet.GetFtnAtTxtEnd(bInP); } -inline const SwFmtEndAtTxtEnd &SwFmt::GetEndAtTxtEnd(bool bInP) const - { return m_aSet.GetEndAtTxtEnd(bInP); } +inline const SwFormatFootnoteAtTextEnd &SwFormat::GetFootnoteAtTextEnd(bool bInP) const + { return m_aSet.GetFootnoteAtTextEnd(bInP); } +inline const SwFormatEndAtTextEnd &SwFormat::GetEndAtTextEnd(bool bInP) const + { return m_aSet.GetEndAtTextEnd(bInP); } #endif diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx index 84caf2e15c27..2130ac1db86b 100644 --- a/sw/inc/fmthdft.hxx +++ b/sw/inc/fmthdft.hxx @@ -26,21 +26,21 @@ #include <frmfmt.hxx> class IntlWrapper; -class SwFmt; +class SwFormat; /** Header, for PageFormats - Client of FrmFmt describing the header. */ + Client of FrameFormat describing the header. */ -class SW_DLLPUBLIC SwFmtHeader: public SfxPoolItem, public SwClient +class SW_DLLPUBLIC SwFormatHeader: public SfxPoolItem, public SwClient { bool bActive; ///< Only for controlling (creation of content). public: - SwFmtHeader( bool bOn = false ); - SwFmtHeader( SwFrmFmt *pHeaderFmt ); - SwFmtHeader( const SwFmtHeader &rCpy ); - virtual ~SwFmtHeader(); - SwFmtHeader& operator=( const SwFmtHeader &rCpy ); + SwFormatHeader( bool bOn = false ); + SwFormatHeader( SwFrameFormat *pHeaderFormat ); + SwFormatHeader( const SwFormatHeader &rCpy ); + virtual ~SwFormatHeader(); + SwFormatHeader& operator=( const SwFormatHeader &rCpy ); TYPEINFO_OVERRIDE(); @@ -53,27 +53,27 @@ public: OUString &rText, const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; - const SwFrmFmt *GetHeaderFmt() const { return static_cast<const SwFrmFmt*>(GetRegisteredIn()); } - SwFrmFmt *GetHeaderFmt() { return static_cast<SwFrmFmt*>(GetRegisteredIn()); } + const SwFrameFormat *GetHeaderFormat() const { return static_cast<const SwFrameFormat*>(GetRegisteredIn()); } + SwFrameFormat *GetHeaderFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); } - void RegisterToFormat( SwFmt& rFmt ); + void RegisterToFormat( SwFormat& rFormat ); bool IsActive() const { return bActive; } void SetActive( bool bNew = true ) { bActive = bNew; } }; /**Footer, for pageformats - Client of FrmFmt describing the footer */ + Client of FrameFormat describing the footer */ -class SW_DLLPUBLIC SwFmtFooter: public SfxPoolItem, public SwClient +class SW_DLLPUBLIC SwFormatFooter: public SfxPoolItem, public SwClient { bool bActive; // Only for controlling (creation of content). public: - SwFmtFooter( bool bOn = false ); - SwFmtFooter( SwFrmFmt *pFooterFmt ); - SwFmtFooter( const SwFmtFooter &rCpy ); - virtual ~SwFmtFooter(); - SwFmtFooter& operator=( const SwFmtFooter &rCpy ); + SwFormatFooter( bool bOn = false ); + SwFormatFooter( SwFrameFormat *pFooterFormat ); + SwFormatFooter( const SwFormatFooter &rCpy ); + virtual ~SwFormatFooter(); + SwFormatFooter& operator=( const SwFormatFooter &rCpy ); TYPEINFO_OVERRIDE(); @@ -86,22 +86,22 @@ public: OUString &rText, const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; - const SwFrmFmt *GetFooterFmt() const { return static_cast<const SwFrmFmt*>(GetRegisteredIn()); } - SwFrmFmt *GetFooterFmt() { return static_cast<SwFrmFmt*>(GetRegisteredIn()); } + const SwFrameFormat *GetFooterFormat() const { return static_cast<const SwFrameFormat*>(GetRegisteredIn()); } + SwFrameFormat *GetFooterFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); } - void RegisterToFormat( SwFmt& rFmt ); + void RegisterToFormat( SwFormat& rFormat ); bool IsActive() const { return bActive; } void SetActive( bool bNew = true ) { bActive = bNew; } }; -inline const SwFmtHeader &SwAttrSet::GetHeader(bool bInP) const - { return static_cast<const SwFmtHeader&>(Get( RES_HEADER,bInP)); } -inline const SwFmtFooter &SwAttrSet::GetFooter(bool bInP) const - { return static_cast<const SwFmtFooter&>(Get( RES_FOOTER,bInP)); } +inline const SwFormatHeader &SwAttrSet::GetHeader(bool bInP) const + { return static_cast<const SwFormatHeader&>(Get( RES_HEADER,bInP)); } +inline const SwFormatFooter &SwAttrSet::GetFooter(bool bInP) const + { return static_cast<const SwFormatFooter&>(Get( RES_FOOTER,bInP)); } -inline const SwFmtHeader &SwFmt::GetHeader(bool bInP) const +inline const SwFormatHeader &SwFormat::GetHeader(bool bInP) const { return m_aSet.GetHeader(bInP); } -inline const SwFmtFooter &SwFmt::GetFooter(bool bInP) const +inline const SwFormatFooter &SwFormat::GetFooter(bool bInP) const { return m_aSet.GetFooter(bInP); } #endif diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx index d3c4d6b8b48f..35d7a7dc88ec 100644 --- a/sw/inc/fmtinfmt.hxx +++ b/sw/inc/fmtinfmt.hxx @@ -24,29 +24,29 @@ class SvxMacro; class SvxMacroTableDtor; -class SwTxtINetFmt; +class SwTextINetFormat; class IntlWrapper; // ATT_INETFMT -class SW_DLLPUBLIC SwFmtINetFmt: public SfxPoolItem +class SW_DLLPUBLIC SwFormatINetFormat: public SfxPoolItem { - friend class SwTxtINetFmt; + friend class SwTextINetFormat; OUString msURL; ///< URL. OUString msTargetFrame; ///< Target frame for URL. - OUString msINetFmtName; - OUString msVisitedFmtName; + OUString msINetFormatName; + OUString msVisitedFormatName; OUString msHyperlinkName; ///< Name of the link. - SvxMacroTableDtor* mpMacroTbl; - SwTxtINetFmt* mpTxtAttr; ///< My TextAttribute. - sal_uInt16 mnINetFmtId; - sal_uInt16 mnVisitedFmtId; + SvxMacroTableDtor* mpMacroTable; + SwTextINetFormat* mpTextAttr; ///< My TextAttribute. + sal_uInt16 mnINetFormatId; + sal_uInt16 mnVisitedFormatId; public: - SwFmtINetFmt( const OUString& rURL, const OUString& rTarget ); - SwFmtINetFmt( const SwFmtINetFmt& rAttr ); - SwFmtINetFmt(); ///< For TypeInfo. - virtual ~SwFmtINetFmt(); + SwFormatINetFormat( const OUString& rURL, const OUString& rTarget ); + SwFormatINetFormat( const SwFormatINetFormat& rAttr ); + SwFormatINetFormat(); ///< For TypeInfo. + virtual ~SwFormatINetFormat(); TYPEINFO_OVERRIDE(); @@ -64,13 +64,13 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - const SwTxtINetFmt* GetTxtINetFmt() const + const SwTextINetFormat* GetTextINetFormat() const { - return mpTxtAttr; + return mpTextAttr; } - SwTxtINetFmt* GetTxtINetFmt() + SwTextINetFormat* GetTextINetFormat() { - return mpTxtAttr; + return mpTextAttr; } const OUString& GetValue() const @@ -92,47 +92,47 @@ public: return msTargetFrame; } - void SetINetFmtAndId( + void SetINetFormatAndId( const OUString& rNm, const sal_uInt16 nId ) { - msINetFmtName = rNm; - mnINetFmtId = nId; + msINetFormatName = rNm; + mnINetFormatId = nId; } - const OUString& GetINetFmt() const + const OUString& GetINetFormat() const { - return msINetFmtName; + return msINetFormatName; } - sal_uInt16 GetINetFmtId() const + sal_uInt16 GetINetFormatId() const { - return mnINetFmtId; + return mnINetFormatId; } - void SetVisitedFmtAndId( + void SetVisitedFormatAndId( const OUString& rNm, const sal_uInt16 nId ) { - msVisitedFmtName = rNm; - mnVisitedFmtId = nId; + msVisitedFormatName = rNm; + mnVisitedFormatId = nId; } - const OUString& GetVisitedFmt() const + const OUString& GetVisitedFormat() const { - return msVisitedFmtName; + return msVisitedFormatName; } - sal_uInt16 GetVisitedFmtId() const + sal_uInt16 GetVisitedFormatId() const { - return mnVisitedFmtId; + return mnVisitedFormatId; } /// Set a new MacroTable or clear the current one. - void SetMacroTbl( const SvxMacroTableDtor* pTbl = 0 ); - const SvxMacroTableDtor* GetMacroTbl() const + void SetMacroTable( const SvxMacroTableDtor* pTable = 0 ); + const SvxMacroTableDtor* GetMacroTable() const { - return mpMacroTbl; + return mpMacroTable; } /// Macro getter and setter. diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx index cd5d85e3d605..e6373b137502 100644 --- a/sw/inc/fmtline.hxx +++ b/sw/inc/fmtline.hxx @@ -26,14 +26,14 @@ class IntlWrapper; -class SW_DLLPUBLIC SwFmtLineNumber: public SfxPoolItem +class SW_DLLPUBLIC SwFormatLineNumber: public SfxPoolItem { sal_uLong nStartValue :24; ///< Starting value for the paragraph. 0 == no starting value. bool bCountLines :1; ///< Also count lines of paragraph. public: - SwFmtLineNumber(); - virtual ~SwFmtLineNumber(); + SwFormatLineNumber(); + virtual ~SwFormatLineNumber(); TYPEINFO_OVERRIDE(); @@ -55,8 +55,8 @@ public: void SetCountLines( bool b ) { bCountLines = b; } }; -inline const SwFmtLineNumber &SwAttrSet::GetLineNumber(bool bInP) const - { return static_cast<const SwFmtLineNumber&>(Get( RES_LINENUMBER,bInP)); } +inline const SwFormatLineNumber &SwAttrSet::GetLineNumber(bool bInP) const + { return static_cast<const SwFormatLineNumber&>(Get( RES_LINENUMBER,bInP)); } #endif diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx index 1a1f94104795..d08dd84fe6d0 100644 --- a/sw/inc/fmtlsplt.hxx +++ b/sw/inc/fmtlsplt.hxx @@ -26,10 +26,10 @@ class IntlWrapper; -class SW_DLLPUBLIC SwFmtLayoutSplit : public SfxBoolItem +class SW_DLLPUBLIC SwFormatLayoutSplit : public SfxBoolItem { public: - SwFmtLayoutSplit( bool bSplit = true ) : SfxBoolItem( RES_LAYOUT_SPLIT, bSplit ) {} + SwFormatLayoutSplit( bool bSplit = true ) : SfxBoolItem( RES_LAYOUT_SPLIT, bSplit ) {} /// "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -40,10 +40,10 @@ public: const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; }; -inline const SwFmtLayoutSplit &SwAttrSet::GetLayoutSplit(bool bInP) const - { return static_cast<const SwFmtLayoutSplit&>(Get( RES_LAYOUT_SPLIT,bInP)); } +inline const SwFormatLayoutSplit &SwAttrSet::GetLayoutSplit(bool bInP) const + { return static_cast<const SwFormatLayoutSplit&>(Get( RES_LAYOUT_SPLIT,bInP)); } -inline const SwFmtLayoutSplit &SwFmt::GetLayoutSplit(bool bInP) const +inline const SwFormatLayoutSplit &SwFormat::GetLayoutSplit(bool bInP) const { return m_aSet.GetLayoutSplit(bInP); } #endif diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx index d79a5808b16e..f73ec36f3a53 100644 --- a/sw/inc/fmtmeta.hxx +++ b/sw/inc/fmtmeta.hxx @@ -39,8 +39,8 @@ namespace com { namespace sun { namespace star { /** * The classes that make up a meta entity are: * <dl> - * <dt>SwTxtMeta</dt><dd>the text hint</dd> - * <dt>SwFmtMeta</dt><dd>the pool item</dd> + * <dt>SwTextMeta</dt><dd>the text hint</dd> + * <dt>SwFormatMeta</dt><dd>the pool item</dd> * <dt>sw::Meta</dt><dd>the metadatable entity itself</dd> * <dt>SwXMeta</dt><dd>the UNO wrapper object</dd> * </dl> @@ -74,47 +74,47 @@ namespace com { namespace sun { namespace star { * </ol> */ -class SwTxtMeta; +class SwTextMeta; class SwXMeta; class SwXMetaField; -class SwTxtNode; +class SwTextNode; namespace sw { class Meta; class MetaFieldManager; } -class SwFmtMeta +class SwFormatMeta : public SfxPoolItem { private: - friend class SwTxtMeta; ///< needs SetTxtAttr, DoCopy - friend class ::sw::Meta; ///< needs m_pTxtAttr + friend class SwTextMeta; ///< needs SetTextAttr, DoCopy + friend class ::sw::Meta; ///< needs m_pTextAttr ::boost::shared_ptr< ::sw::Meta > m_pMeta; - SwTxtMeta * m_pTxtAttr; + SwTextMeta * m_pTextAttr; - SwTxtMeta * GetTxtAttr() { return m_pTxtAttr; } - void SetTxtAttr(SwTxtMeta * const i_pTxtAttr); + SwTextMeta * GetTextAttr() { return m_pTextAttr; } + void SetTextAttr(SwTextMeta * const i_pTextAttr); /// this method <em>must</em> be called when the hint is actually copied void DoCopy(::sw::MetaFieldManager & i_rTargetDocManager, - SwTxtNode & i_rTargetTxtNode); + SwTextNode & i_rTargetTextNode); - explicit SwFmtMeta( const sal_uInt16 i_nWhich ); + explicit SwFormatMeta( const sal_uInt16 i_nWhich ); public: /// takes ownership - explicit SwFmtMeta( ::boost::shared_ptr< ::sw::Meta > const & i_pMeta, + explicit SwFormatMeta( ::boost::shared_ptr< ::sw::Meta > const & i_pMeta, const sal_uInt16 i_nWhich ); - virtual ~SwFmtMeta(); + virtual ~SwFormatMeta(); /// SfxPoolItem virtual bool operator==( const SfxPoolItem & ) const SAL_OVERRIDE; virtual SfxPoolItem * Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; /// notify clients registered at m_pMeta that this meta is being (re-)moved - void NotifyChangeTxtNode(SwTxtNode *const pTxtNode); - static SwFmtMeta * CreatePoolDefault( const sal_uInt16 i_nWhich ); + void NotifyChangeTextNode(SwTextNode *const pTextNode); + static SwFormatMeta * CreatePoolDefault( const sal_uInt16 i_nWhich ); ::sw::Meta * GetMeta() { return m_pMeta.get(); } }; @@ -125,23 +125,23 @@ class Meta , public SwModify { protected: - friend class ::SwFmtMeta; ///< SetFmtMeta, NotifyChangeTxtNode - friend class ::SwXMeta; ///< GetTxtNode, GetTxtAttr, Get/SetXMeta + friend class ::SwFormatMeta; ///< SetFormatMeta, NotifyChangeTextNode + friend class ::SwXMeta; ///< GetTextNode, GetTextAttr, Get/SetXMeta ::com::sun::star::uno::WeakReference< ::com::sun::star::rdf::XMetadatable> m_wXMeta; - SwFmtMeta * m_pFmt; - SwTxtNode * m_pTxtNode; + SwFormatMeta * m_pFormat; + SwTextNode * m_pTextNode; - SwTxtMeta * GetTxtAttr() const; - SwTxtNode * GetTxtNode() const { return m_pTxtNode;} ///< @return 0 if not in document (undo) + SwTextMeta * GetTextAttr() const; + SwTextNode * GetTextNode() const { return m_pTextNode;} ///< @return 0 if not in document (undo) - SwFmtMeta * GetFmtMeta() const { return m_pFmt; } - void SetFmtMeta( SwFmtMeta * const i_pFmt ) { m_pFmt = i_pFmt; }; + SwFormatMeta * GetFormatMeta() const { return m_pFormat; } + void SetFormatMeta( SwFormatMeta * const i_pFormat ) { m_pFormat = i_pFormat; }; - void NotifyChangeTxtNodeImpl(); - void NotifyChangeTxtNode(SwTxtNode *const pTxtNode); + void NotifyChangeTextNodeImpl(); + void NotifyChangeTextNode(SwTextNode *const pTextNode); ::com::sun::star::uno::WeakReference< ::com::sun::star::rdf::XMetadatable> const& GetXMeta() const @@ -154,7 +154,7 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; public: - explicit Meta(SwFmtMeta * const i_pFmt = 0); + explicit Meta(SwFormatMeta * const i_pFormat = 0); virtual ~Meta(); /// sfx2::Metadatable @@ -170,7 +170,7 @@ class MetaField : public Meta { private: - friend class ::SwFmtMeta; + friend class ::SwFormatMeta; friend class ::SwXMetaField; friend class ::sw::MetaFieldManager; @@ -182,7 +182,7 @@ private: bool IsFixedLanguage() const { return m_bIsFixedLanguage; } void SetIsFixedLanguage(bool b) { m_bIsFixedLanguage = b; } - explicit MetaField(SwFmtMeta * const i_pFmt = 0, + explicit MetaField(SwFormatMeta * const i_pFormat = 0, const sal_uInt32 nNumberFormat = SAL_MAX_UINT32, const bool bIsFixedLanguage = false ); @@ -203,7 +203,7 @@ private: public: MetaFieldManager(); ::boost::shared_ptr<MetaField> makeMetaField( - SwFmtMeta * const i_pFmt = 0, + SwFormatMeta * const i_pFormat = 0, const sal_uInt32 nNumberFormat = SAL_MAX_UINT32, const bool bIsFixedLanguage = false ); /// get all meta fields diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx index cde5b958d595..87b9f8f4977c 100644 --- a/sw/inc/fmtornt.hxx +++ b/sw/inc/fmtornt.hxx @@ -30,16 +30,16 @@ class IntlWrapper; -class SW_DLLPUBLIC SwFmtVertOrient: public SfxPoolItem +class SW_DLLPUBLIC SwFormatVertOrient: public SfxPoolItem { SwTwips m_nYPos; ///< Contains *always* the current RelPos. sal_Int16 m_eOrient; sal_Int16 m_eRelation; public: TYPEINFO_OVERRIDE(); - SwFmtVertOrient( SwTwips nY = 0, sal_Int16 eVert = com::sun::star::text::VertOrientation::NONE, + SwFormatVertOrient( SwTwips nY = 0, sal_Int16 eVert = com::sun::star::text::VertOrientation::NONE, sal_Int16 eRel = com::sun::star::text::RelOrientation::PRINT_AREA ); - inline SwFmtVertOrient &operator=( const SwFmtVertOrient &rCpy ); + inline SwFormatVertOrient &operator=( const SwFormatVertOrient &rCpy ); /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; @@ -66,7 +66,7 @@ public: void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; -class SW_DLLPUBLIC SwFmtHoriOrient: public SfxPoolItem +class SW_DLLPUBLIC SwFormatHoriOrient: public SfxPoolItem { SwTwips m_nXPos; ///< Contains *always* the current RelPos. sal_Int16 m_eOrient; @@ -74,9 +74,9 @@ class SW_DLLPUBLIC SwFmtHoriOrient: public SfxPoolItem bool m_bPosToggle : 1; ///< Flip position on even pages. public: TYPEINFO_OVERRIDE(); - SwFmtHoriOrient( SwTwips nX = 0, sal_Int16 eHori = com::sun::star::text::HoriOrientation::NONE, + SwFormatHoriOrient( SwTwips nX = 0, sal_Int16 eHori = com::sun::star::text::HoriOrientation::NONE, sal_Int16 eRel = com::sun::star::text::RelOrientation::PRINT_AREA, bool bPos = false ); - inline SwFmtHoriOrient &operator=( const SwFmtHoriOrient &rCpy ); + inline SwFormatHoriOrient &operator=( const SwFormatHoriOrient &rCpy ); /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; @@ -103,14 +103,14 @@ public: void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; -inline SwFmtVertOrient &SwFmtVertOrient::operator=( const SwFmtVertOrient &rCpy ) +inline SwFormatVertOrient &SwFormatVertOrient::operator=( const SwFormatVertOrient &rCpy ) { m_nYPos = rCpy.GetPos(); m_eOrient = rCpy.GetVertOrient(); m_eRelation = rCpy.GetRelationOrient(); return *this; } -inline SwFmtHoriOrient &SwFmtHoriOrient::operator=( const SwFmtHoriOrient &rCpy ) +inline SwFormatHoriOrient &SwFormatHoriOrient::operator=( const SwFormatHoriOrient &rCpy ) { m_nXPos = rCpy.GetPos(); m_eOrient = rCpy.GetHoriOrient(); @@ -119,14 +119,14 @@ inline SwFmtHoriOrient &SwFmtHoriOrient::operator=( const SwFmtHoriOrient &rCpy return *this; } -inline const SwFmtVertOrient &SwAttrSet::GetVertOrient(bool bInP) const - { return static_cast<const SwFmtVertOrient&>(Get( RES_VERT_ORIENT,bInP)); } -inline const SwFmtHoriOrient &SwAttrSet::GetHoriOrient(bool bInP) const - { return static_cast<const SwFmtHoriOrient&>(Get( RES_HORI_ORIENT,bInP)); } +inline const SwFormatVertOrient &SwAttrSet::GetVertOrient(bool bInP) const + { return static_cast<const SwFormatVertOrient&>(Get( RES_VERT_ORIENT,bInP)); } +inline const SwFormatHoriOrient &SwAttrSet::GetHoriOrient(bool bInP) const + { return static_cast<const SwFormatHoriOrient&>(Get( RES_HORI_ORIENT,bInP)); } -inline const SwFmtVertOrient &SwFmt::GetVertOrient(bool bInP) const +inline const SwFormatVertOrient &SwFormat::GetVertOrient(bool bInP) const { return m_aSet.GetVertOrient(bInP); } -inline const SwFmtHoriOrient &SwFmt::GetHoriOrient(bool bInP) const +inline const SwFormatHoriOrient &SwFormat::GetHoriOrient(bool bInP) const { return m_aSet.GetHoriOrient(bInP); } #endif diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index f4d6de755c09..0195015709b8 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -36,7 +36,7 @@ class SwEndNoteInfo; /** Pagedescriptor Client of SwPageDesc that is "described" by the attribute. */ -class SW_DLLPUBLIC SwFmtPageDesc : public SfxPoolItem, public SwClient +class SW_DLLPUBLIC SwFormatPageDesc : public SfxPoolItem, public SwClient { /** This "Doc"-function is made friend in order to be able to set the auto-flag after copying!! */ @@ -45,16 +45,16 @@ class SW_DLLPUBLIC SwFmtPageDesc : public SfxPoolItem, public SwClient ::boost::optional<sal_uInt16> oNumOffset; ///< Offset page number. sal_uInt16 nDescNameIdx; ///< SW3-Reader: stringpool-index of style name. SwModify* pDefinedIn; /**< Points to the object in which the - attribute was set (CntntNode/Format). */ + attribute was set (ContentNode/Format). */ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; virtual void SwClientNotify( const SwModify&, const SfxHint& rHint ) SAL_OVERRIDE; public: - SwFmtPageDesc( const SwPageDesc *pDesc = 0 ); - SwFmtPageDesc( const SwFmtPageDesc &rCpy ); - SwFmtPageDesc &operator=( const SwFmtPageDesc &rCpy ); - virtual ~SwFmtPageDesc(); + SwFormatPageDesc( const SwPageDesc *pDesc = 0 ); + SwFormatPageDesc( const SwFormatPageDesc &rCpy ); + SwFormatPageDesc &operator=( const SwFormatPageDesc &rCpy ); + virtual ~SwFormatPageDesc(); TYPEINFO_OVERRIDE(); @@ -84,10 +84,10 @@ public: void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; -inline const SwFmtPageDesc &SwAttrSet::GetPageDesc(bool bInP) const - { return static_cast<const SwFmtPageDesc&>(Get( RES_PAGEDESC,bInP)); } +inline const SwFormatPageDesc &SwAttrSet::GetPageDesc(bool bInP) const + { return static_cast<const SwFormatPageDesc&>(Get( RES_PAGEDESC,bInP)); } -inline const SwFmtPageDesc &SwFmt::GetPageDesc(bool bInP) const +inline const SwFormatPageDesc &SwFormat::GetPageDesc(bool bInP) const { return m_aSet.GetPageDesc(bInP); } #endif diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx index cfa8efd67d8f..8e054f660859 100644 --- a/sw/inc/fmtrfmrk.hxx +++ b/sw/inc/fmtrfmrk.hxx @@ -29,26 +29,26 @@ namespace com { namespace sun { namespace star { namespace text { class XTextContent; } } } } -class SwTxtRefMark; +class SwTextRefMark; // ATT_REFMARK -class SwFmtRefMark +class SwFormatRefMark : public SfxPoolItem , public SwModify { - friend class SwTxtRefMark; - SwTxtRefMark* pTxtAttr; + friend class SwTextRefMark; + SwTextRefMark* pTextAttr; - SwFmtRefMark& operator=(const SwFmtRefMark& rRefMark) SAL_DELETED_FUNCTION; + SwFormatRefMark& operator=(const SwFormatRefMark& rRefMark) SAL_DELETED_FUNCTION; OUString aRefName; css::uno::WeakReference<css::text::XTextContent> m_wXReferenceMark; public: - SwFmtRefMark( const OUString& rTxt ); - SwFmtRefMark( const SwFmtRefMark& rRefMark ); - virtual ~SwFmtRefMark( ); + SwFormatRefMark( const OUString& rText ); + SwFormatRefMark( const SwFormatRefMark& rRefMark ); + virtual ~SwFormatRefMark( ); /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; @@ -60,8 +60,8 @@ public: void InvalidateRefMark(); - const SwTxtRefMark *GetTxtRefMark() const { return pTxtAttr; } - SwTxtRefMark *GetTxtRefMark() { return pTxtAttr; } + const SwTextRefMark *GetTextRefMark() const { return pTextAttr; } + SwTextRefMark *GetTextRefMark() { return pTextAttr; } inline OUString &GetRefName() { return aRefName; } inline const OUString &GetRefName() const { return aRefName; } diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx index 5ac88cca87e0..dd2dceebecd8 100644 --- a/sw/inc/fmtrowsplt.hxx +++ b/sw/inc/fmtrowsplt.hxx @@ -26,10 +26,10 @@ class IntlWrapper; -class SW_DLLPUBLIC SwFmtRowSplit : public SfxBoolItem +class SW_DLLPUBLIC SwFormatRowSplit : public SfxBoolItem { public: - SwFmtRowSplit( bool bSplit = true ) : SfxBoolItem( RES_ROW_SPLIT, bSplit ) {} + SwFormatRowSplit( bool bSplit = true ) : SfxBoolItem( RES_ROW_SPLIT, bSplit ) {} // "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -40,10 +40,10 @@ public: const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; }; -inline const SwFmtRowSplit &SwAttrSet::GetRowSplit(bool bInP) const - { return static_cast<const SwFmtRowSplit&>(Get( RES_ROW_SPLIT,bInP)); } +inline const SwFormatRowSplit &SwAttrSet::GetRowSplit(bool bInP) const + { return static_cast<const SwFormatRowSplit&>(Get( RES_ROW_SPLIT,bInP)); } -inline const SwFmtRowSplit &SwFmt::GetRowSplit(bool bInP) const +inline const SwFormatRowSplit &SwFormat::GetRowSplit(bool bInP) const { return m_aSet.GetRowSplit(bInP); } #endif diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx index f0945e6227d1..219f3ddab687 100644 --- a/sw/inc/fmtruby.hxx +++ b/sw/inc/fmtruby.hxx @@ -21,25 +21,25 @@ #include <svl/poolitem.hxx> -class SwTxtRuby; +class SwTextRuby; -class SW_DLLPUBLIC SwFmtRuby : public SfxPoolItem +class SW_DLLPUBLIC SwFormatRuby : public SfxPoolItem { - friend class SwTxtRuby; + friend class SwTextRuby; - OUString sRubyTxt; ///< The ruby txt. - OUString sCharFmtName; ///< Name of the charformat. - SwTxtRuby* pTxtAttr; ///< The TextAttribute. - sal_uInt16 nCharFmtId; ///< PoolId of the charformat. + OUString sRubyText; ///< The ruby txt. + OUString sCharFormatName; ///< Name of the charformat. + SwTextRuby* pTextAttr; ///< The TextAttribute. + sal_uInt16 nCharFormatId; ///< PoolId of the charformat. sal_uInt16 nPosition; ///< Position of the Ruby-character. sal_uInt16 nAdjustment; ///< Specific adjustment of the Ruby-ch. public: - SwFmtRuby( const OUString& rRubyTxt ); - SwFmtRuby( const SwFmtRuby& rAttr ); - virtual ~SwFmtRuby(); + SwFormatRuby( const OUString& rRubyText ); + SwFormatRuby( const SwFormatRuby& rAttr ); + virtual ~SwFormatRuby(); - SwFmtRuby& operator=( const SwFmtRuby& rAttr ); + SwFormatRuby& operator=( const SwFormatRuby& rAttr ); // "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; @@ -56,17 +56,17 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - const SwTxtRuby* GetTxtRuby() const { return pTxtAttr; } - SwTxtRuby* GetTxtRuby() { return pTxtAttr; } + const SwTextRuby* GetTextRuby() const { return pTextAttr; } + SwTextRuby* GetTextRuby() { return pTextAttr; } - OUString GetText() const { return sRubyTxt; } - void SetText( const OUString& rTxt ) { sRubyTxt = rTxt; } + OUString GetText() const { return sRubyText; } + void SetText( const OUString& rText ) { sRubyText = rText; } - OUString GetCharFmtName() const { return sCharFmtName; } - void SetCharFmtName( const OUString& rNm ) { sCharFmtName = rNm; } + OUString GetCharFormatName() const { return sCharFormatName; } + void SetCharFormatName( const OUString& rNm ) { sCharFormatName = rNm; } - sal_uInt16 GetCharFmtId() const { return nCharFmtId; } - void SetCharFmtId( sal_uInt16 nNew ) { nCharFmtId = nNew; } + sal_uInt16 GetCharFormatId() const { return nCharFormatId; } + void SetCharFormatId( sal_uInt16 nNew ) { nCharFormatId = nNew; } sal_uInt16 GetPosition() const { return nPosition; } void SetPosition( sal_uInt16 nNew ) { nPosition = nNew; } diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx index 23009806fb35..5b933e99b287 100644 --- a/sw/inc/fmtsrnd.hxx +++ b/sw/inc/fmtsrnd.hxx @@ -27,16 +27,16 @@ #include <fmtsrndenum.hxx> class IntlWrapper; -// SwFmtSurround: How document content under the frame shall behave. -class SW_DLLPUBLIC SwFmtSurround: public SfxEnumItem +// SwFormatSurround: How document content under the frame shall behave. +class SW_DLLPUBLIC SwFormatSurround: public SfxEnumItem { bool bAnchorOnly :1; bool bContour :1; bool bOutside :1; public: - SwFmtSurround( SwSurround eNew = SURROUND_PARALLEL ); - SwFmtSurround( const SwFmtSurround & ); - inline SwFmtSurround &operator=( const SwFmtSurround &rCpy ); + SwFormatSurround( SwSurround eNew = SURROUND_PARALLEL ); + SwFormatSurround( const SwFormatSurround & ); + inline SwFormatSurround &operator=( const SwFormatSurround &rCpy ); // "Pure virtual Methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; @@ -62,7 +62,7 @@ public: void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; -inline SwFmtSurround &SwFmtSurround::operator=( const SwFmtSurround &rCpy ) +inline SwFormatSurround &SwFormatSurround::operator=( const SwFormatSurround &rCpy ) { bAnchorOnly = rCpy.IsAnchorOnly(); bContour = rCpy.IsContour(); @@ -71,10 +71,10 @@ inline SwFmtSurround &SwFmtSurround::operator=( const SwFmtSurround &rCpy ) return *this; } -inline const SwFmtSurround &SwAttrSet::GetSurround(bool bInP) const - { return static_cast<const SwFmtSurround&>(Get( RES_SURROUND,bInP)); } +inline const SwFormatSurround &SwAttrSet::GetSurround(bool bInP) const + { return static_cast<const SwFormatSurround&>(Get( RES_SURROUND,bInP)); } -inline const SwFmtSurround &SwFmt::GetSurround(bool bInP) const +inline const SwFormatSurround &SwFormat::GetSurround(bool bInP) const { return m_aSet.GetSurround(bInP); } #endif diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx index 766b59d4f8f2..bdcf92f8283e 100644 --- a/sw/inc/fmturl.hxx +++ b/sw/inc/fmturl.hxx @@ -29,7 +29,7 @@ class IntlWrapper; // URL, ServerMap und ClientMap -class SW_DLLPUBLIC SwFmtURL: public SfxPoolItem +class SW_DLLPUBLIC SwFormatURL: public SfxPoolItem { OUString sTargetFrameName; ///< Target frame for URL. OUString sURL; ///< Simple URL. @@ -38,15 +38,15 @@ class SW_DLLPUBLIC SwFmtURL: public SfxPoolItem bool bIsServerMap; ///< A ServerSideImageMap with the URL. - SwFmtURL& operator=( const SwFmtURL& ) SAL_DELETED_FUNCTION; + SwFormatURL& operator=( const SwFormatURL& ) SAL_DELETED_FUNCTION; public: - SwFmtURL(); + SwFormatURL(); /// @@@ copy construction allowed, but assigment is not? @@@ - SwFmtURL( const SwFmtURL& ); + SwFormatURL( const SwFormatURL& ); - virtual ~SwFmtURL(); + virtual ~SwFormatURL(); /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; @@ -73,10 +73,10 @@ public: void SetName( const OUString& rNm ) { sName = rNm; } }; -inline const SwFmtURL &SwAttrSet::GetURL(bool bInP) const - { return static_cast<const SwFmtURL&>(Get( RES_URL,bInP)); } +inline const SwFormatURL &SwAttrSet::GetURL(bool bInP) const + { return static_cast<const SwFormatURL&>(Get( RES_URL,bInP)); } -inline const SwFmtURL &SwFmt::GetURL(bool bInP) const +inline const SwFormatURL &SwFormat::GetURL(bool bInP) const { return m_aSet.GetURL(bInP); } #endif diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx index ff6dc2315e20..88e86a2c46d4 100644 --- a/sw/inc/fmtwrapinfluenceonobjpos.hxx +++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx @@ -24,7 +24,7 @@ #include <svl/poolitem.hxx> #include <com/sun/star/text/WrapInfluenceOnPosition.hpp> -class SW_DLLPUBLIC SwFmtWrapInfluenceOnObjPos: public SfxPoolItem +class SW_DLLPUBLIC SwFormatWrapInfluenceOnObjPos: public SfxPoolItem { private: sal_Int16 mnWrapInfluenceOnPosition; @@ -33,15 +33,15 @@ public: TYPEINFO_OVERRIDE(); // #i35017# - constant name has changed - SwFmtWrapInfluenceOnObjPos( + SwFormatWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition = com::sun::star::text::WrapInfluenceOnPosition::ONCE_CONCURRENT ); - SwFmtWrapInfluenceOnObjPos( - const SwFmtWrapInfluenceOnObjPos& _rCpy ); - virtual ~SwFmtWrapInfluenceOnObjPos(); + SwFormatWrapInfluenceOnObjPos( + const SwFormatWrapInfluenceOnObjPos& _rCpy ); + virtual ~SwFormatWrapInfluenceOnObjPos(); - SwFmtWrapInfluenceOnObjPos& operator=( - const SwFmtWrapInfluenceOnObjPos& _rSource ); + SwFormatWrapInfluenceOnObjPos& operator=( + const SwFormatWrapInfluenceOnObjPos& _rSource ); /// pure virtual methods of class <SfxPoolItem> virtual bool operator==( const SfxPoolItem& _rAttr ) const SAL_OVERRIDE; @@ -60,10 +60,10 @@ public: void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; -inline const SwFmtWrapInfluenceOnObjPos& SwAttrSet::GetWrapInfluenceOnObjPos(bool bInP) const - { return static_cast<const SwFmtWrapInfluenceOnObjPos&>(Get( RES_WRAP_INFLUENCE_ON_OBJPOS,bInP)); } +inline const SwFormatWrapInfluenceOnObjPos& SwAttrSet::GetWrapInfluenceOnObjPos(bool bInP) const + { return static_cast<const SwFormatWrapInfluenceOnObjPos&>(Get( RES_WRAP_INFLUENCE_ON_OBJPOS,bInP)); } - inline const SwFmtWrapInfluenceOnObjPos& SwFmt::GetWrapInfluenceOnObjPos(bool bInP) const + inline const SwFormatWrapInfluenceOnObjPos& SwFormat::GetWrapInfluenceOnObjPos(bool bInP) const { return m_aSet.GetWrapInfluenceOnObjPos(bInP); } #endif diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 63bb3bb13472..11ed94319e81 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -41,39 +41,39 @@ namespace drawinglayer { namespace attribute { }} /// Base class for various Writer styles. -class SW_DLLPUBLIC SwFmt : public SwModify +class SW_DLLPUBLIC SwFormat : public SwModify { - OUString m_aFmtName; + OUString m_aFormatName; SwAttrSet m_aSet; sal_uInt16 m_nWhichId; - sal_uInt16 m_nPoolFmtId; /**< Id for "automatically" created formats. + sal_uInt16 m_nPoolFormatId; /**< Id for "automatically" created formats. (is not hard attribution!!!) */ sal_uInt16 m_nPoolHelpId; ///< HelpId for this Pool-style. sal_uInt8 m_nPoolHlpFileId; ///< FilePos to Doc to these style helps. bool m_bWritten : 1; ///< TRUE: already written. - bool m_bAutoFmt : 1; /**< FALSE: it is a template. + bool m_bAutoFormat : 1; /**< FALSE: it is a template. default is true! */ - bool m_bFmtInDTOR : 1; /**< TRUE: Format becomes deleted. In order to be able - to recognize this in FmtChg-message!! */ - bool m_bAutoUpdateFmt : 1;/**< TRUE: Set attributes of a whole paragraph + bool m_bFormatInDTOR : 1; /**< TRUE: Format becomes deleted. In order to be able + to recognize this in FormatChg-message!! */ + bool m_bAutoUpdateFormat : 1;/**< TRUE: Set attributes of a whole paragraph at format (UI-side!). */ bool m_bHidden : 1; std::shared_ptr<SfxGrabBagItem> m_pGrabBagItem; ///< Style InteropGrabBag. protected: - SwFmt( SwAttrPool& rPool, const sal_Char* pFmtNm, - const sal_uInt16* pWhichRanges, SwFmt *pDrvdFrm, sal_uInt16 nFmtWhich ); - SwFmt( SwAttrPool& rPool, const OUString &rFmtNm, const sal_uInt16* pWhichRanges, - SwFmt *pDrvdFrm, sal_uInt16 nFmtWhich ); - SwFmt( const SwFmt& rFmt ); + SwFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, + const sal_uInt16* pWhichRanges, SwFormat *pDrvdFrm, sal_uInt16 nFormatWhich ); + SwFormat( SwAttrPool& rPool, const OUString &rFormatNm, const sal_uInt16* pWhichRanges, + SwFormat *pDrvdFrm, sal_uInt16 nFormatWhich ); + SwFormat( const SwFormat& rFormat ); virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); ///< Already in base class Client. - virtual ~SwFmt(); - SwFmt &operator=(const SwFmt&); + virtual ~SwFormat(); + SwFormat &operator=(const SwFormat&); /// for Querying of Writer-functions. sal_uInt16 Which() const { return m_nWhichId; } @@ -82,36 +82,36 @@ public: virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE; /// Copy attributes even among documents. - void CopyAttrs( const SwFmt&, bool bReplace=true ); + void CopyAttrs( const SwFormat&, bool bReplace=true ); - /// Delete all attributes that are not in rFmt. + /// Delete all attributes that are not in rFormat. void DelDiffs( const SfxItemSet& rSet ); - void DelDiffs( const SwFmt& rFmt ) { DelDiffs( rFmt.GetAttrSet() ); } + void DelDiffs( const SwFormat& rFormat ) { DelDiffs( rFormat.GetAttrSet() ); } /// 0 is Default. - bool SetDerivedFrom(SwFmt *pDerivedFrom = 0); + bool SetDerivedFrom(SwFormat *pDerivedFrom = 0); /// If bInParents is FALSE, search only in this format for attribute. //UUUUinline - const SfxPoolItem& GetFmtAttr( sal_uInt16 nWhich, + const SfxPoolItem& GetFormatAttr( sal_uInt16 nWhich, bool bInParents = true ) const; //UUUUinline SfxItemState GetItemState( sal_uInt16 nWhich, bool bSrchInParent = true, const SfxPoolItem **ppItem = 0 ) const; SfxItemState GetBackgroundState(SvxBrushItem &rItem, bool bSrchInParent = true) const; - virtual bool SetFmtAttr( const SfxPoolItem& rAttr ); - virtual bool SetFmtAttr( const SfxItemSet& rSet ); - virtual bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ); + virtual bool SetFormatAttr( const SfxPoolItem& rAttr ); + virtual bool SetFormatAttr( const SfxItemSet& rSet ); + virtual bool ResetFormatAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ); /** Takes all hints from Delta-Array, @return count of deleted hints. */ - virtual sal_uInt16 ResetAllFmtAttr(); + virtual sal_uInt16 ResetAllFormatAttr(); - inline SwFmt* DerivedFrom() const { return const_cast<SwFmt*>(static_cast<const SwFmt*>(GetRegisteredIn())); } + inline SwFormat* DerivedFrom() const { return const_cast<SwFormat*>(static_cast<const SwFormat*>(GetRegisteredIn())); } inline bool IsDefault() const { return DerivedFrom() == 0; } - inline OUString GetName() const { return m_aFmtName; } + inline OUString GetName() const { return m_aFormatName; } void SetName( const OUString& rNewName, bool bBroadcast=false ); inline void SetName( const sal_Char* pNewName, bool bBroadcast=false); @@ -145,8 +145,8 @@ public: IDocumentChartDataProviderAccess* getIDocumentChartDataProviderAccess(); /// Get and set Pool style IDs. - sal_uInt16 GetPoolFmtId() const { return m_nPoolFmtId; } - void SetPoolFmtId( sal_uInt16 nId ) { m_nPoolFmtId = nId; } + sal_uInt16 GetPoolFormatId() const { return m_nPoolFormatId; } + void SetPoolFormatId( sal_uInt16 nId ) { m_nPoolFormatId = nId; } /// Get and set Help-IDs for document templates. sal_uInt16 GetPoolHelpId() const { return m_nPoolHelpId; } @@ -162,9 +162,9 @@ public: /// Format-ID for reading/writing: void ResetWritten() { m_bWritten = false; } - /// Query / set AutoFmt-flag. - bool IsAuto() const { return m_bAutoFmt; } - void SetAuto( bool bNew = false ) { m_bAutoFmt = bNew; } + /// Query / set AutoFormat-flag. + bool IsAuto() const { return m_bAutoFormat; } + void SetAuto( bool bNew = false ) { m_bAutoFormat = bNew; } bool IsHidden() const { return m_bHidden; } void SetHidden( bool bValue = false ) { m_bHidden = bValue; } @@ -172,11 +172,11 @@ public: void GetGrabBagItem(com::sun::star::uno::Any& rVal) const; void SetGrabBagItem(const com::sun::star::uno::Any& rVal); - /// Query / set bAutoUpdateFmt-flag. - bool IsAutoUpdateFmt() const { return m_bAutoUpdateFmt; } - void SetAutoUpdateFmt( bool bNew = true ) { m_bAutoUpdateFmt = bNew; } + /// Query / set bAutoUpdateFormat-flag. + bool IsAutoUpdateFormat() const { return m_bAutoUpdateFormat; } + void SetAutoUpdateFormat( bool bNew = true ) { m_bAutoUpdateFormat = bNew; } - bool IsFmtInDTOR() const { return m_bFmtInDTOR; } + bool IsFormatInDTOR() const { return m_bFormatInDTOR; } /** GetMethods: Bool indicates whether to search only in Set (FALSE) or also in Parents. @@ -227,48 +227,48 @@ public: inline const SvxShadowItem &GetCharShadow( bool = true ) const; /// Frame-attributes - implemented in frmatr.hxx. - inline const SwFmtFillOrder &GetFillOrder( bool = true ) const; - inline const SwFmtFrmSize &GetFrmSize( bool = true ) const; - inline const SwFmtHeader &GetHeader( bool = true ) const; - inline const SwFmtFooter &GetFooter( bool = true ) const; - inline const SwFmtSurround &GetSurround( bool = true ) const; - inline const SwFmtHoriOrient &GetHoriOrient( bool = true ) const; - inline const SwFmtAnchor &GetAnchor( bool = true ) const; - inline const SwFmtCol &GetCol( bool = true ) const; + inline const SwFormatFillOrder &GetFillOrder( bool = true ) const; + inline const SwFormatFrmSize &GetFrmSize( bool = true ) const; + inline const SwFormatHeader &GetHeader( bool = true ) const; + inline const SwFormatFooter &GetFooter( bool = true ) const; + inline const SwFormatSurround &GetSurround( bool = true ) const; + inline const SwFormatHoriOrient &GetHoriOrient( bool = true ) const; + inline const SwFormatAnchor &GetAnchor( bool = true ) const; + inline const SwFormatCol &GetCol( bool = true ) const; inline const SvxPaperBinItem &GetPaperBin( bool = true ) const; inline const SvxLRSpaceItem &GetLRSpace( bool = true ) const; inline const SvxULSpaceItem &GetULSpace( bool = true ) const; - inline const SwFmtCntnt &GetCntnt( bool = true ) const; + inline const SwFormatContent &GetContent( bool = true ) const; inline const SvxPrintItem &GetPrint( bool = true ) const; inline const SvxOpaqueItem &GetOpaque( bool = true ) const; inline const SvxProtectItem &GetProtect( bool = true ) const; - inline const SwFmtVertOrient &GetVertOrient( bool = true ) const; + inline const SwFormatVertOrient &GetVertOrient( bool = true ) const; inline const SvxBoxItem &GetBox( bool = true ) const; - inline const SvxFmtKeepItem &GetKeep( bool = true ) const; + inline const SvxFormatKeepItem &GetKeep( bool = true ) const; //UUUU Create SvxBrushItem for Background fill (partially for backwards compatibility) SvxBrushItem makeBackgroundBrushItem( bool = true ) const; inline const SvxShadowItem &GetShadow( bool = true ) const; - inline const SwFmtPageDesc &GetPageDesc( bool = true ) const; - inline const SvxFmtBreakItem &GetBreak( bool = true ) const; + inline const SwFormatPageDesc &GetPageDesc( bool = true ) const; + inline const SvxFormatBreakItem &GetBreak( bool = true ) const; inline const SvxMacroItem &GetMacro( bool = true ) const; - inline const SwFmtURL &GetURL( bool = true ) const; - inline const SwFmtEditInReadonly &GetEditInReadonly( bool = true ) const; - inline const SwFmtLayoutSplit &GetLayoutSplit( bool = true ) const; - inline const SwFmtRowSplit &GetRowSplit( bool = true ) const; - inline const SwFmtChain &GetChain( bool = true ) const; - inline const SwFmtLineNumber &GetLineNumber( bool = true ) const; - inline const SwFmtFtnAtTxtEnd &GetFtnAtTxtEnd( bool = true ) const; - inline const SwFmtEndAtTxtEnd &GetEndAtTxtEnd( bool = true ) const; - inline const SwFmtNoBalancedColumns &GetBalancedColumns( bool = true ) const; + inline const SwFormatURL &GetURL( bool = true ) const; + inline const SwFormatEditInReadonly &GetEditInReadonly( bool = true ) const; + inline const SwFormatLayoutSplit &GetLayoutSplit( bool = true ) const; + inline const SwFormatRowSplit &GetRowSplit( bool = true ) const; + inline const SwFormatChain &GetChain( bool = true ) const; + inline const SwFormatLineNumber &GetLineNumber( bool = true ) const; + inline const SwFormatFootnoteAtTextEnd &GetFootnoteAtTextEnd( bool = true ) const; + inline const SwFormatEndAtTextEnd &GetEndAtTextEnd( bool = true ) const; + inline const SwFormatNoBalancedColumns &GetBalancedColumns( bool = true ) const; inline const SvxFrameDirectionItem &GetFrmDir( bool = true ) const; inline const SwTextGridItem &GetTextGrid( bool = true ) const; inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( bool = true ) const; // #i18732# - inline const SwFmtFollowTextFlow &GetFollowTextFlow(bool = true) const; + inline const SwFormatFollowTextFlow &GetFollowTextFlow(bool = true) const; // #i28701# - inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(bool = true) const; + inline const SwFormatWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(bool = true) const; inline const SdrTextVertAdjustItem& GetTextVertAdjust(bool = true) const; /// Graphics-attributes - implemented in grfatr.hxx @@ -288,14 +288,14 @@ public: /// Paragraph-attributes - implemented in paratr.hxx. inline const SvxLineSpacingItem &GetLineSpacing( bool = true ) const; inline const SvxAdjustItem &GetAdjust( bool = true ) const; - inline const SvxFmtSplitItem &GetSplit( bool = true ) const; + inline const SvxFormatSplitItem &GetSplit( bool = true ) const; inline const SwRegisterItem &GetRegister( bool = true ) const; inline const SwNumRuleItem &GetNumRule( bool = true ) const; inline const SvxWidowsItem &GetWidows( bool = true ) const; inline const SvxOrphansItem &GetOrphans( bool = true ) const; inline const SvxTabStopItem &GetTabStops( bool = true ) const; inline const SvxHyphenZoneItem &GetHyphenZone( bool = true ) const; - inline const SwFmtDrop &GetDrop( bool = true ) const; + inline const SwFormatDrop &GetDrop( bool = true ) const; inline const SvxScriptSpaceItem &GetScriptSpace(bool = true) const; inline const SvxHangingPunctuationItem &GetHangingPunctuation(bool = true) const; inline const SvxForbiddenRuleItem &GetForbiddenRule(bool = true) const; @@ -304,11 +304,11 @@ public: inline const SwParaConnectBorderItem &GetParaConnectBorder(bool = true ) const; /// TableBox attributes - implemented in cellatr.hxx. - inline const SwTblBoxNumFormat &GetTblBoxNumFmt( bool = true ) const; - inline const SwTblBoxFormula &GetTblBoxFormula( bool = true ) const; - inline const SwTblBoxValue &GetTblBoxValue( bool = true ) const; + inline const SwTableBoxNumFormat &GetTableBoxNumFormat( bool = true ) const; + inline const SwTableBoxFormula &GetTableBoxFormula( bool = true ) const; + inline const SwTableBoxValue &GetTableBoxValue( bool = true ) const; - /** SwFmt::IsBackgroundTransparent + /** SwFormat::IsBackgroundTransparent Virtual method to determine, if background of format is transparent. Default implementation returns false. Thus, subclasses have to override @@ -325,7 +325,7 @@ public: virtual bool supportsFullDrawingLayerFillAttributeSet() const; }; -inline void SwFmt::SetName( const sal_Char* pNewName, +inline void SwFormat::SetName( const sal_Char* pNewName, bool bBroadcast ) { SetName(OUString::createFromAscii(pNewName), bBroadcast); diff --git a/sw/inc/frmatr.hxx b/sw/inc/frmatr.hxx index 4a68855a734b..4685e24ddbd1 100644 --- a/sw/inc/frmatr.hxx +++ b/sw/inc/frmatr.hxx @@ -53,14 +53,14 @@ inline const SvxProtectItem &SwAttrSet::GetProtect(bool bInP) const { return static_cast<const SvxProtectItem&>(Get( RES_PROTECT,bInP)); } inline const SvxBoxItem &SwAttrSet::GetBox(bool bInP) const { return static_cast<const SvxBoxItem&>(Get( RES_BOX,bInP)); } -inline const SvxFmtKeepItem &SwAttrSet::GetKeep(bool bInP) const - { return static_cast<const SvxFmtKeepItem&>(Get( RES_KEEP,bInP)); } +inline const SvxFormatKeepItem &SwAttrSet::GetKeep(bool bInP) const + { return static_cast<const SvxFormatKeepItem&>(Get( RES_KEEP,bInP)); } inline const SvxBrushItem &SwAttrSet::GetBackground(bool bInP) const { return static_cast<const SvxBrushItem&>(Get( RES_BACKGROUND,bInP)); } inline const SvxShadowItem &SwAttrSet::GetShadow(bool bInP) const { return static_cast<const SvxShadowItem&>(Get( RES_SHADOW,bInP)); } -inline const SvxFmtBreakItem &SwAttrSet::GetBreak(bool bInP) const - { return static_cast<const SvxFmtBreakItem&>(Get( RES_BREAK,bInP)); } +inline const SvxFormatBreakItem &SwAttrSet::GetBreak(bool bInP) const + { return static_cast<const SvxFormatBreakItem&>(Get( RES_BREAK,bInP)); } inline const SvxMacroItem &SwAttrSet::GetMacro(bool bInP) const { return static_cast<const SvxMacroItem&>(Get( RES_FRMMACRO,bInP)); } inline const SvxFrameDirectionItem &SwAttrSet::GetFrmDir(bool bInP) const @@ -68,32 +68,32 @@ inline const SvxFrameDirectionItem &SwAttrSet::GetFrmDir(bool bInP) const inline const SdrTextVertAdjustItem &SwAttrSet::GetTextVertAdjust(bool bInP) const { return static_cast<const SdrTextVertAdjustItem&>(Get( RES_TEXT_VERT_ADJUST,bInP)); } -// Implementation of FrameAttribute methods of SwFmt. -inline const SvxPaperBinItem &SwFmt::GetPaperBin(bool bInP) const +// Implementation of FrameAttribute methods of SwFormat. +inline const SvxPaperBinItem &SwFormat::GetPaperBin(bool bInP) const { return m_aSet.GetPaperBin(bInP); } -inline const SvxLRSpaceItem &SwFmt::GetLRSpace(bool bInP) const +inline const SvxLRSpaceItem &SwFormat::GetLRSpace(bool bInP) const { return m_aSet.GetLRSpace(bInP); } -inline const SvxULSpaceItem &SwFmt::GetULSpace(bool bInP) const +inline const SvxULSpaceItem &SwFormat::GetULSpace(bool bInP) const { return m_aSet.GetULSpace(bInP); } -inline const SvxPrintItem &SwFmt::GetPrint(bool bInP) const +inline const SvxPrintItem &SwFormat::GetPrint(bool bInP) const { return m_aSet.GetPrint(bInP); } -inline const SvxOpaqueItem &SwFmt::GetOpaque(bool bInP) const +inline const SvxOpaqueItem &SwFormat::GetOpaque(bool bInP) const { return m_aSet.GetOpaque(bInP); } -inline const SvxProtectItem &SwFmt::GetProtect(bool bInP) const +inline const SvxProtectItem &SwFormat::GetProtect(bool bInP) const { return m_aSet.GetProtect(bInP); } -inline const SvxBoxItem &SwFmt::GetBox(bool bInP) const +inline const SvxBoxItem &SwFormat::GetBox(bool bInP) const { return m_aSet.GetBox(bInP); } -inline const SvxFmtKeepItem &SwFmt::GetKeep(bool bInP) const +inline const SvxFormatKeepItem &SwFormat::GetKeep(bool bInP) const { return m_aSet.GetKeep(bInP); } -inline const SvxShadowItem &SwFmt::GetShadow(bool bInP) const +inline const SvxShadowItem &SwFormat::GetShadow(bool bInP) const { return m_aSet.GetShadow(bInP); } -inline const SvxFmtBreakItem &SwFmt::GetBreak(bool bInP) const +inline const SvxFormatBreakItem &SwFormat::GetBreak(bool bInP) const { return m_aSet.GetBreak(bInP); } -inline const SvxMacroItem &SwFmt::GetMacro(bool bInP) const +inline const SvxMacroItem &SwFormat::GetMacro(bool bInP) const { return m_aSet.GetMacro(bInP); } -inline const SvxFrameDirectionItem &SwFmt::GetFrmDir(bool bInP) const +inline const SvxFrameDirectionItem &SwFormat::GetFrmDir(bool bInP) const { return m_aSet.GetFrmDir(bInP); } -inline const SdrTextVertAdjustItem &SwFmt::GetTextVertAdjust(bool bInP) const +inline const SdrTextVertAdjustItem &SwFormat::GetTextVertAdjust(bool bInP) const { return m_aSet.GetTextVertAdjust(bInP); } #endif // INCLUDED_SW_INC_FRMATR_HXX diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 33a16b2019c8..2b88accce81f 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -36,7 +36,7 @@ class SdrObject; namespace sw { class DocumentLayoutManager; } /// Style of a layout element. -class SW_DLLPUBLIC SwFrmFmt: public SwFmt +class SW_DLLPUBLIC SwFrameFormat: public SwFormat { friend class SwDoc; friend class SwPageDesc; ///< Is allowed to call protected CTor. @@ -49,25 +49,25 @@ class SW_DLLPUBLIC SwFrmFmt: public SwFmt drawinglayer::attribute::SdrAllFillAttributesHelperPtr maFillAttributes; protected: - SwFrmFmt( + SwFrameFormat( SwAttrPool& rPool, - const sal_Char* pFmtNm, - SwFrmFmt *pDrvdFrm, - sal_uInt16 nFmtWhich = RES_FRMFMT, + const sal_Char* pFormatNm, + SwFrameFormat *pDrvdFrm, + sal_uInt16 nFormatWhich = RES_FRMFMT, const sal_uInt16* pWhichRange = 0); - SwFrmFmt( + SwFrameFormat( SwAttrPool& rPool, - const OUString &rFmtNm, - SwFrmFmt *pDrvdFrm, - sal_uInt16 nFmtWhich = RES_FRMFMT, + const OUString &rFormatNm, + SwFrameFormat *pDrvdFrm, + sal_uInt16 nFormatWhich = RES_FRMFMT, const sal_uInt16* pWhichRange = 0); virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); ///< Already in base class Client. - virtual ~SwFrmFmt(); + virtual ~SwFrameFormat(); /// Destroys all Frms in aDepend (Frms are identified via PTR_CAST). virtual void DelFrms(); @@ -95,21 +95,21 @@ public: The UserCall knows its SdrObject. */ SwContact *FindContactObj(); const SwContact *FindContactObj() const - { return const_cast<SwFrmFmt*>(this)->FindContactObj(); } + { return const_cast<SwFrameFormat*>(this)->FindContactObj(); } /** @return the SdrObject, that is connected to the ContactObject. - Only DrawFrmFmts are connected to the "real SdrObject". FlyFrmFmts + Only DrawFrameFormats are connected to the "real SdrObject". FlyFrameFormats are connected to a Master and all FlyFrms has the "real SdrObject". "Real SdrObject" has position and a Z-order. */ SdrObject *FindSdrObject(); const SdrObject *FindSdrObject() const - { return const_cast<SwFrmFmt*>(this)->FindSdrObject(); } + { return const_cast<SwFrameFormat*>(this)->FindSdrObject(); } SdrObject *FindRealSdrObject(); const SdrObject *FindRealSdrObject() const - { return const_cast<SwFrmFmt*>(this)->FindRealSdrObject(); } + { return const_cast<SwFrameFormat*>(this)->FindRealSdrObject(); } - bool IsLowerOf( const SwFrmFmt& rFmt ) const; + bool IsLowerOf( const SwFrameFormat& rFormat ) const; enum tLayoutDir { @@ -119,8 +119,8 @@ public: VERT_L2R ///< Not supported yet. }; - virtual SwFrmFmt::tLayoutDir GetLayoutDir() const; - virtual void SetLayoutDir( const SwFrmFmt::tLayoutDir _eLayoutDir ); + virtual SwFrameFormat::tLayoutDir GetLayoutDir() const; + virtual void SetLayoutDir( const SwFrameFormat::tLayoutDir _eLayoutDir ); virtual sal_Int16 GetPositionLayoutDir() const; virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir ); @@ -134,8 +134,8 @@ public: ::com::sun::star::uno::XInterface> const& xObject) { m_wXObject = xObject; } - DECL_FIXEDMEMPOOL_NEWDEL_DLL(SwFrmFmt) - void RegisterToFormat( SwFmt& rFmt ); + DECL_FIXEDMEMPOOL_NEWDEL_DLL(SwFrameFormat) + void RegisterToFormat( SwFormat& rFormat ); //UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const SAL_OVERRIDE; @@ -146,7 +146,7 @@ public: // The FlyFrame-Format -class SW_DLLPUBLIC SwFlyFrmFmt: public SwFrmFmt +class SW_DLLPUBLIC SwFlyFrameFormat: public SwFrameFormat { friend class SwDoc; OUString msTitle; @@ -158,22 +158,22 @@ class SW_DLLPUBLIC SwFlyFrmFmt: public SwFrmFmt when they get borders (this is done in SwWrtShell::CalcAndGetScale) */ Point m_aLastFlyFrmPrtRectPos; - SwFlyFrmFmt( const SwFlyFrmFmt &rCpy ) SAL_DELETED_FUNCTION; - SwFlyFrmFmt &operator=( const SwFlyFrmFmt &rCpy ) SAL_DELETED_FUNCTION; + SwFlyFrameFormat( const SwFlyFrameFormat &rCpy ) SAL_DELETED_FUNCTION; + SwFlyFrameFormat &operator=( const SwFlyFrameFormat &rCpy ) SAL_DELETED_FUNCTION; protected: - SwFlyFrmFmt( SwAttrPool& rPool, const sal_Char* pFmtNm, - SwFrmFmt *pDrvdFrm ) - : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FLYFRMFMT ) + SwFlyFrameFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, + SwFrameFormat *pDrvdFrm ) + : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_FLYFRMFMT ) {} - SwFlyFrmFmt( SwAttrPool& rPool, const OUString &rFmtNm, - SwFrmFmt *pDrvdFrm ) - : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FLYFRMFMT ) + SwFlyFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm, + SwFrameFormat *pDrvdFrm ) + : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_FLYFRMFMT ) {} public: TYPEINFO_OVERRIDE(); - virtual ~SwFlyFrmFmt(); + virtual ~SwFlyFrameFormat(); /// Creates the views. virtual void MakeFrms() SAL_OVERRIDE; @@ -193,7 +193,7 @@ public: OUString GetObjDescription() const; void SetObjDescription( const OUString& rDescription, bool bBroadcast = false ); - /** SwFlyFrmFmt::IsBackgroundTransparent + /** SwFlyFrameFormat::IsBackgroundTransparent Override virtual method and its default implementation, because format of fly frame provides transparent backgrounds. @@ -206,7 +206,7 @@ public: */ virtual bool IsBackgroundTransparent() const SAL_OVERRIDE; - /** SwFlyFrmFmt::IsBackgroundBrushInherited + /** SwFlyFrameFormat::IsBackgroundBrushInherited Method to determine, if the brush for drawing the background is "inherited" from its parent/grandparent. @@ -222,45 +222,45 @@ public: const Point & GetLastFlyFrmPrtRectPos() const { return m_aLastFlyFrmPrtRectPos; } void SetLastFlyFrmPrtRectPos( const Point &rPoint ) { m_aLastFlyFrmPrtRectPos = rPoint; } - DECL_FIXEDMEMPOOL_NEWDEL(SwFlyFrmFmt) + DECL_FIXEDMEMPOOL_NEWDEL(SwFlyFrameFormat) }; //The DrawFrame-Format -class SW_DLLPUBLIC SwDrawFrmFmt: public SwFrmFmt +class SW_DLLPUBLIC SwDrawFrameFormat: public SwFrameFormat { friend class SwDoc; mutable const SdrObject * pSdrObjCached; mutable OUString sSdrObjCachedComment; - SwDrawFrmFmt( const SwDrawFrmFmt &rCpy ) SAL_DELETED_FUNCTION; - SwDrawFrmFmt &operator=( const SwDrawFrmFmt &rCpy ) SAL_DELETED_FUNCTION; + SwDrawFrameFormat( const SwDrawFrameFormat &rCpy ) SAL_DELETED_FUNCTION; + SwDrawFrameFormat &operator=( const SwDrawFrameFormat &rCpy ) SAL_DELETED_FUNCTION; - SwFrmFmt::tLayoutDir meLayoutDir; + SwFrameFormat::tLayoutDir meLayoutDir; sal_Int16 mnPositionLayoutDir; bool mbPosAttrSet; protected: - SwDrawFrmFmt( SwAttrPool& rPool, const sal_Char* pFmtNm, - SwFrmFmt *pDrvdFrm ) - : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_DRAWFRMFMT ), + SwDrawFrameFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, + SwFrameFormat *pDrvdFrm ) + : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_DRAWFRMFMT ), pSdrObjCached(NULL), - meLayoutDir( SwFrmFmt::HORI_L2R ), + meLayoutDir( SwFrameFormat::HORI_L2R ), mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ), mbPosAttrSet( false ) {} - SwDrawFrmFmt( SwAttrPool& rPool, const OUString &rFmtNm, - SwFrmFmt *pDrvdFrm ) - : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_DRAWFRMFMT ), + SwDrawFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm, + SwFrameFormat *pDrvdFrm ) + : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_DRAWFRMFMT ), pSdrObjCached(NULL), - meLayoutDir( SwFrmFmt::HORI_L2R ), + meLayoutDir( SwFrameFormat::HORI_L2R ), mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ), @@ -269,7 +269,7 @@ protected: public: TYPEINFO_OVERRIDE(); - virtual ~SwDrawFrmFmt(); + virtual ~SwDrawFrameFormat(); /** DrawObjects are removed from the arrays at the layout. The DrawObjects are marked as deleted. */ @@ -281,8 +281,8 @@ public: virtual Graphic MakeGraphic( ImageMap* pMap = NULL ) SAL_OVERRIDE; - virtual SwFrmFmt::tLayoutDir GetLayoutDir() const SAL_OVERRIDE; - virtual void SetLayoutDir( const SwFrmFmt::tLayoutDir _eLayoutDir ) SAL_OVERRIDE; + virtual SwFrameFormat::tLayoutDir GetLayoutDir() const SAL_OVERRIDE; + virtual void SetLayoutDir( const SwFrameFormat::tLayoutDir _eLayoutDir ) SAL_OVERRIDE; virtual sal_Int16 GetPositionLayoutDir() const SAL_OVERRIDE; virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir ) SAL_OVERRIDE; @@ -297,10 +297,10 @@ public: virtual OUString GetDescription() const SAL_OVERRIDE; - DECL_FIXEDMEMPOOL_NEWDEL(SwDrawFrmFmt); + DECL_FIXEDMEMPOOL_NEWDEL(SwDrawFrameFormat); }; -SW_DLLPUBLIC bool IsFlyFrmFmtInHeader(const SwFrmFmt& rFmt); +SW_DLLPUBLIC bool IsFlyFrameFormatInHeader(const SwFrameFormat& rFormat); #endif diff --git a/sw/inc/ftnidx.hxx b/sw/inc/ftnidx.hxx index ee695e18ff06..b79a57e72980 100644 --- a/sw/inc/ftnidx.hxx +++ b/sw/inc/ftnidx.hxx @@ -23,44 +23,44 @@ #include <sal/types.h> #include <o3tl/sorted_vector.hxx> -class SwTxtFtn; +class SwTextFootnote; class SwNodeIndex; class SwSectionNode; // Everywhere where NodeIndex is used, the header files missing here // are already included. Therefore put here as defines only and // not as inline methods (saves compile time). -#define _SwTxtFtn_GetIndex( pFIdx ) (pFIdx->GetTxtNode().GetIndex()) +#define _SwTextFootnote_GetIndex( pFIdx ) (pFIdx->GetTextNode().GetIndex()) -struct CompareSwFtnIdxs +struct CompareSwFootnoteIdxs { - bool operator()(SwTxtFtn* const& lhs, SwTxtFtn* const& rhs) const; + bool operator()(SwTextFootnote* const& lhs, SwTextFootnote* const& rhs) const; }; -class SwFtnIdxs : public o3tl::sorted_vector<SwTxtFtn*, CompareSwFtnIdxs> +class SwFootnoteIdxs : public o3tl::sorted_vector<SwTextFootnote*, CompareSwFootnoteIdxs> { public: - SwFtnIdxs() {} + SwFootnoteIdxs() {} - void UpdateFtn( const SwNodeIndex& rStt ); // Update all from pos. - void UpdateAllFtn(); // Update all footnotes. + void UpdateFootnote( const SwNodeIndex& rStt ); // Update all from pos. + void UpdateAllFootnote(); // Update all footnotes. - SwTxtFtn* SeekEntry( const SwNodeIndex& rIdx, size_t* pPos = 0 ) const; + SwTextFootnote* SeekEntry( const SwNodeIndex& rIdx, size_t* pPos = 0 ) const; }; -class SwUpdFtnEndNtAtEnd +class SwUpdFootnoteEndNtAtEnd { - std::vector<const SwSectionNode*> aFtnSects, aEndSects; - std::vector<sal_uInt16> aFtnNums, aEndNums; + std::vector<const SwSectionNode*> aFootnoteSects, aEndSects; + std::vector<sal_uInt16> aFootnoteNums, aEndNums; public: - SwUpdFtnEndNtAtEnd() : aFtnSects(), aEndSects() {} + SwUpdFootnoteEndNtAtEnd() : aFootnoteSects(), aEndSects() {} static const SwSectionNode* FindSectNdWithEndAttr( - const SwTxtFtn& rTxtFtn ); + const SwTextFootnote& rTextFootnote ); - sal_uInt16 GetNumber( const SwTxtFtn& rTxtFtn, const SwSectionNode& rNd ); - sal_uInt16 ChkNumber( const SwTxtFtn& rTxtFtn ); + sal_uInt16 GetNumber( const SwTextFootnote& rTextFootnote, const SwSectionNode& rNd ); + sal_uInt16 ChkNumber( const SwTextFootnote& rTextFootnote ); }; #endif // INCLUDED_SW_INC_FTNIDX_HXX diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx index 2b250287892b..fc5a4e5f0bb7 100644 --- a/sw/inc/ftninfo.hxx +++ b/sw/inc/ftninfo.hxx @@ -25,15 +25,15 @@ #include <editeng/numitem.hxx> #include <fmtcol.hxx> -class SwTxtFmtColl; +class SwTextFormatColl; class SwPageDesc; -class SwCharFmt; +class SwCharFormat; class SwDoc; class SW_DLLPUBLIC SwEndNoteInfo : public SwClient { SwDepend aPageDescDep; - SwDepend aCharFmtDep, aAnchorCharFmtDep; + SwDepend aCharFormatDep, aAnchorCharFormatDep; OUString sPrefix; OUString sSuffix; protected: @@ -41,29 +41,29 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE; public: - SvxNumberType aFmt; - sal_uInt16 nFtnOffset; + SvxNumberType aFormat; + sal_uInt16 nFootnoteOffset; void ChgPageDesc( SwPageDesc *pDesc ); SwPageDesc* GetPageDesc( SwDoc &rDoc ) const; bool KnowsPageDesc() const; bool DependsOn( const SwPageDesc* ) const; - void SetFtnTxtColl(SwTxtFmtColl& rColl); - SwTxtFmtColl* GetFtnTxtColl() const { return const_cast<SwTxtFmtColl*>(static_cast<const SwTxtFmtColl*>(GetRegisteredIn())); } // can be 0. + void SetFootnoteTextColl(SwTextFormatColl& rColl); + SwTextFormatColl* GetFootnoteTextColl() const { return const_cast<SwTextFormatColl*>(static_cast<const SwTextFormatColl*>(GetRegisteredIn())); } // can be 0. - SwCharFmt* GetCharFmt(SwDoc &rDoc) const; - void SetCharFmt( SwCharFmt* ); - SwClient *GetCharFmtDep() const { return (SwClient*)&aCharFmtDep; } + SwCharFormat* GetCharFormat(SwDoc &rDoc) const; + void SetCharFormat( SwCharFormat* ); + SwClient *GetCharFormatDep() const { return (SwClient*)&aCharFormatDep; } - SwCharFmt* GetAnchorCharFmt(SwDoc &rDoc) const; - void SetAnchorCharFmt( SwCharFmt* ); - SwClient *GetAnchorCharFmtDep() const { return (SwClient*)&aAnchorCharFmtDep; } + SwCharFormat* GetAnchorCharFormat(SwDoc &rDoc) const; + void SetAnchorCharFormat( SwCharFormat* ); + SwClient *GetAnchorCharFormatDep() const { return (SwClient*)&aAnchorCharFormatDep; } SwEndNoteInfo & operator=(const SwEndNoteInfo&); bool operator==( const SwEndNoteInfo &rInf ) const; - SwEndNoteInfo( SwTxtFmtColl *pTxtColl = 0); + SwEndNoteInfo( SwTextFormatColl *pTextColl = 0); SwEndNoteInfo(const SwEndNoteInfo&); const OUString& GetPrefix() const { return sPrefix; } @@ -74,34 +74,34 @@ public: void ReleaseCollection() { if ( GetRegisteredInNonConst() ) GetRegisteredInNonConst()->Remove( this ); } }; -enum SwFtnPos +enum SwFootnotePos { // Momentarily only PAGE and CHAPTER. CHAPTER == document-endnotes. FTNPOS_PAGE = 1, FTNPOS_CHAPTER = 8 }; -enum SwFtnNum +enum SwFootnoteNum { FTNNUM_PAGE, FTNNUM_CHAPTER, FTNNUM_DOC }; -class SW_DLLPUBLIC SwFtnInfo: public SwEndNoteInfo +class SW_DLLPUBLIC SwFootnoteInfo: public SwEndNoteInfo { using SwEndNoteInfo::operator ==; public: OUString aQuoVadis; OUString aErgoSum; - SwFtnPos ePos; - SwFtnNum eNum; + SwFootnotePos ePos; + SwFootnoteNum eNum; - SwFtnInfo& operator=(const SwFtnInfo&); + SwFootnoteInfo& operator=(const SwFootnoteInfo&); - bool operator==( const SwFtnInfo &rInf ) const; + bool operator==( const SwFootnoteInfo &rInf ) const; - SwFtnInfo(SwTxtFmtColl* pTxtColl = 0); - SwFtnInfo(const SwFtnInfo&); + SwFootnoteInfo(SwTextFormatColl* pTextColl = 0); + SwFootnoteInfo(const SwFootnoteInfo&); }; #endif diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index 2f09cb190435..3b7fed9b6df6 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -314,30 +314,30 @@ inline const SwTransparencyGrf &SwAttrSet::GetTransparencyGrf(bool bInP) const inline const SwDrawModeGrf &SwAttrSet::GetDrawModeGrf(bool bInP) const { return static_cast<const SwDrawModeGrf&>(Get( RES_GRFATR_DRAWMODE,bInP)); } -// Implementation of graphics attributes methods of SwFmt -inline const SwMirrorGrf &SwFmt::GetMirrorGrf(bool bInP) const +// Implementation of graphics attributes methods of SwFormat +inline const SwMirrorGrf &SwFormat::GetMirrorGrf(bool bInP) const { return m_aSet.GetMirrorGrf(bInP); } -inline const SwCropGrf &SwFmt::GetCropGrf(bool bInP) const +inline const SwCropGrf &SwFormat::GetCropGrf(bool bInP) const { return m_aSet.GetCropGrf(bInP); } -inline const SwRotationGrf &SwFmt::GetRotationGrf(bool bInP) const +inline const SwRotationGrf &SwFormat::GetRotationGrf(bool bInP) const { return m_aSet.GetRotationGrf(bInP); } -inline const SwLuminanceGrf &SwFmt::GetLuminanceGrf(bool bInP) const +inline const SwLuminanceGrf &SwFormat::GetLuminanceGrf(bool bInP) const { return m_aSet.GetLuminanceGrf( bInP); } -inline const SwContrastGrf &SwFmt::GetContrastGrf(bool bInP) const +inline const SwContrastGrf &SwFormat::GetContrastGrf(bool bInP) const { return m_aSet.GetContrastGrf( bInP); } -inline const SwChannelRGrf &SwFmt::GetChannelRGrf(bool bInP) const +inline const SwChannelRGrf &SwFormat::GetChannelRGrf(bool bInP) const { return m_aSet.GetChannelRGrf( bInP); } -inline const SwChannelGGrf &SwFmt::GetChannelGGrf(bool bInP) const +inline const SwChannelGGrf &SwFormat::GetChannelGGrf(bool bInP) const { return m_aSet.GetChannelGGrf( bInP); } -inline const SwChannelBGrf &SwFmt::GetChannelBGrf(bool bInP) const +inline const SwChannelBGrf &SwFormat::GetChannelBGrf(bool bInP) const { return m_aSet.GetChannelBGrf( bInP); } -inline const SwGammaGrf &SwFmt::GetGammaGrf(bool bInP) const +inline const SwGammaGrf &SwFormat::GetGammaGrf(bool bInP) const { return m_aSet.GetGammaGrf( bInP); } -inline const SwInvertGrf &SwFmt::GetInvertGrf(bool bInP) const +inline const SwInvertGrf &SwFormat::GetInvertGrf(bool bInP) const { return m_aSet.GetInvertGrf( bInP); } -inline const SwTransparencyGrf &SwFmt::GetTransparencyGrf(bool bInP) const +inline const SwTransparencyGrf &SwFormat::GetTransparencyGrf(bool bInP) const { return m_aSet.GetTransparencyGrf( bInP); } -inline const SwDrawModeGrf &SwFmt::GetDrawModeGrf(bool bInP) const +inline const SwDrawModeGrf &SwFormat::GetDrawModeGrf(bool bInP) const { return m_aSet.GetDrawModeGrf(bInP); } #endif // INCLUDED_SW_INC_GRFATR_HXX diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx index fe1a417d6d95..f648b84083b9 100644 --- a/sw/inc/hfspacingitem.hxx +++ b/sw/inc/hfspacingitem.hxx @@ -43,7 +43,7 @@ public: inline const SwHeaderAndFooterEatSpacingItem &SwAttrSet::GetHeaderAndFooterEatSpacing(bool bInP) const { return static_cast<const SwHeaderAndFooterEatSpacingItem&>(Get( RES_HEADER_FOOTER_EAT_SPACING,bInP)); } -inline const SwHeaderAndFooterEatSpacingItem &SwFmt::GetHeaderAndFooterEatSpacing(bool bInP) const +inline const SwHeaderAndFooterEatSpacingItem &SwFormat::GetHeaderAndFooterEatSpacing(bool bInP) const { return m_aSet.GetHeaderAndFooterEatSpacing(bInP); } #endif diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx index 43c1e326f53c..61c8c437558f 100644 --- a/sw/inc/hhcwrp.hxx +++ b/sw/inc/hhcwrp.hxx @@ -45,7 +45,7 @@ class SW_DLLPUBLIC SwHHCWrapper : public editeng::HangulHanjaConversion sal_uInt16 m_nPageStart; ///< first checked page bool m_bIsDrawObj; - bool m_bIsOtherCntnt; + bool m_bIsOtherContent; bool m_bStartChk; bool m_bIsSelection; ///< true if only the selected text should be converted bool m_bStartDone; diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx index f98b10389497..93af3fba2a0e 100644 --- a/sw/inc/hintids.hxx +++ b/sw/inc/hintids.hxx @@ -24,7 +24,7 @@ #include <svx/xdef.hxx> #include "swdllapi.h" -// For SwTxtHints without end index the following char is added: +// For SwTextHints without end index the following char is added: #define CH_TXTATR_BREAKWORD ((sal_Unicode)0x01) #define CH_TXTATR_INWORD ((sal_Unicode)0xFFF9) @@ -109,7 +109,7 @@ RES_TXTATR_BEGIN = RES_CHRATR_END, /** text attributes with start and end. #i105453#: - Hints (SwTxtAttr) with the same start and end position are sorted by + Hints (SwTextAttr) with the same start and end position are sorted by WhichId, i.e., the TXTATR constants defined here. The text formatting (SwAttrIter) poses some requirements on TXTATR order: - AUTOFMT must precede CHARFMT, so that auto style can overwrite char style. @@ -118,7 +118,7 @@ RES_TXTATR_BEGIN = RES_CHRATR_END, hints on insertion, but on exporting to ODF. if CHARFMT would precede INETFMT, then exporting and importing will effectively change precedence) - Nesting hints (SwTxtAttrNesting) also have requirements on TXTATR order, + Nesting hints (SwTextAttrNesting) also have requirements on TXTATR order, to ensure proper nesting (because CJK_RUBY and INETFMT have no CH_TXTATR): - INETFMT should precede CJK_RUBY (for UNO API it does not matter...) - META and METAFIELD must precede CJK_RUBY and INETFMT @@ -438,35 +438,35 @@ SW_DLLPUBLIC sal_uInt16 GetWhichOfScript( sal_uInt16 nWhich, sal_uInt16 nScript // This function returns // CH_TXTATR_BREAKWORD for Textattribute which breaks a word (default) // CH_TXTATR_INWORD for Textattribute which dont breaks a word -class SwTxtAttr; -sal_Unicode GetCharOfTxtAttr( const SwTxtAttr& rAttr ); +class SwTextAttr; +sal_Unicode GetCharOfTextAttr( const SwTextAttr& rAttr ); // all Sets defined in init.cxx // AttrSet-Range for the 3 Break-Attribute extern sal_uInt16 aBreakSetRange[]; -// AttrSet-Range for TxtFmtColl -extern sal_uInt16 aTxtFmtCollSetRange[]; -// AttrSet-Range for GrfFmtColl -extern sal_uInt16 aGrfFmtCollSetRange[]; +// AttrSet-Range for TextFormatColl +extern sal_uInt16 aTextFormatCollSetRange[]; +// AttrSet-Range for GrfFormatColl +extern sal_uInt16 aGrfFormatCollSetRange[]; // AttrSet-Range for TextNode -SW_DLLPUBLIC extern sal_uInt16 aTxtNodeSetRange[]; -// AttrSet-Range for NoTxtNode -extern sal_uInt16 aNoTxtNodeSetRange[]; +SW_DLLPUBLIC extern sal_uInt16 aTextNodeSetRange[]; +// AttrSet-Range for NoTextNode +extern sal_uInt16 aNoTextNodeSetRange[]; // AttrSet-Range for SwTable extern sal_uInt16 aTableSetRange[]; // AttrSet-Range for SwTableLine extern sal_uInt16 aTableLineSetRange[]; // AttrSet-Range for SwTableBox extern sal_uInt16 aTableBoxSetRange[]; -// AttrSet-Range for SwFrmFmt -SW_DLLPUBLIC extern sal_uInt16 aFrmFmtSetRange[]; -// AttrSet-Range for SwCharFmt -extern sal_uInt16 aCharFmtSetRange[]; +// AttrSet-Range for SwFrameFormat +SW_DLLPUBLIC extern sal_uInt16 aFrameFormatSetRange[]; +// AttrSet-Range for SwCharFormat +extern sal_uInt16 aCharFormatSetRange[]; // AttrSet-Range for the autostyles -extern sal_uInt16 aCharAutoFmtSetRange[]; -// AttrSet-Range for SwPageDescFmt -extern sal_uInt16 aPgFrmFmtSetRange[]; +extern sal_uInt16 aCharAutoFormatSetRange[]; +// AttrSet-Range for SwPageDescFormat +extern sal_uInt16 aPgFrameFormatSetRange[]; // check if ID is InRange of AttrSet-Ids bool IsInRange( const sal_uInt16* pRange, const sal_uInt16 nId ); diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx index 92a5744bbb7f..5920b042f270 100644 --- a/sw/inc/hints.hxx +++ b/sw/inc/hints.hxx @@ -23,15 +23,15 @@ #include <vcl/vclptr.hxx> #include <vector> -class SwFmt; +class SwFormat; class OutputDevice; class SwTable; class SwNode; class SwNodes; -class SwCntntNode; +class SwContentNode; class SwPageFrm; class SwFrm; -class SwTxtNode; +class SwTextNode; class SwHistory; // Base class for all Message-Hints: @@ -59,23 +59,23 @@ public: }; /* - * SwFmtChg is sent when a format has changed to another format. 2 Hints are always sent + * SwFormatChg is sent when a format has changed to another format. 2 Hints are always sent * the old and the new format */ -class SwFmtChg: public SwMsgPoolItem +class SwFormatChg: public SwMsgPoolItem { public: - SwFmt *pChangedFmt; - SwFmtChg( SwFmt *pFmt ); + SwFormat *pChangedFormat; + SwFormatChg( SwFormat *pFormat ); }; -class SwInsTxt: public SwMsgPoolItem +class SwInsText: public SwMsgPoolItem { public: sal_Int32 nPos; sal_Int32 nLen; - SwInsTxt( sal_Int32 nP, sal_Int32 nL ); + SwInsText( sal_Int32 nP, sal_Int32 nL ); }; class SwDelChr: public SwMsgPoolItem @@ -86,13 +86,13 @@ public: SwDelChr( sal_Int32 nP ); }; -class SwDelTxt: public SwMsgPoolItem +class SwDelText: public SwMsgPoolItem { public: sal_Int32 nStart; sal_Int32 nLen; - SwDelTxt( sal_Int32 nS, sal_Int32 nL ); + SwDelText( sal_Int32 nS, sal_Int32 nL ); }; class SwUpdateAttr : public SwMsgPoolItem @@ -101,7 +101,7 @@ private: sal_Int32 nStart; sal_Int32 nEnd; sal_uInt16 nWhichAttr; - std::vector<sal_uInt16> aWhichFmtAttr; // attributes changed inside RES_TXTATR_AUTOFMT + std::vector<sal_uInt16> aWhichFormatAttr; // attributes changed inside RES_TXTATR_AUTOFMT public: SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, sal_uInt16 nW ); @@ -121,16 +121,16 @@ public: return nWhichAttr; } - const std::vector<sal_uInt16>& getFmtAttr() const + const std::vector<sal_uInt16>& getFormatAttr() const { - return aWhichFmtAttr; + return aWhichFormatAttr; } }; -/** SwRefMarkFldUpdate is sent when the referencemarks should be updated. +/** SwRefMarkFieldUpdate is sent when the referencemarks should be updated. To determine Page- / chapternumbers the current frame has to be asked. For this we need the current outputdevice */ -class SwRefMarkFldUpdate : public SwMsgPoolItem +class SwRefMarkFieldUpdate : public SwMsgPoolItem { public: VclPtr<OutputDevice> pOut; ///< pointer to the current output device @@ -139,7 +139,7 @@ public: To get the page/chapter number, the frame has to be asked. For that we need the current OutputDevice. */ - SwRefMarkFldUpdate( OutputDevice* ); + SwRefMarkFieldUpdate( OutputDevice* ); }; /** SwDocPosUpdate is sent to signal that only the frames from or to a specified document-global position @@ -151,39 +151,39 @@ public: SwDocPosUpdate( const long nDocPos ); }; -/// SwTableFmlUpdate is sent when the table has to be newly calculated or when a table itself is merged or splitted -enum TableFmlUpdtFlags { TBL_CALC = 0, +/// SwTableFormulaUpdate is sent when the table has to be newly calculated or when a table itself is merged or splitted +enum TableFormulaUpdateFlags { TBL_CALC = 0, TBL_BOXNAME, TBL_BOXPTR, TBL_RELBOXNAME, TBL_MERGETBL, TBL_SPLITTBL }; -class SwTableFmlUpdate : public SwMsgPoolItem +class SwTableFormulaUpdate : public SwMsgPoolItem { public: - const SwTable* pTbl; ///< Pointer to the current table + const SwTable* pTable; ///< Pointer to the current table union { - const SwTable* pDelTbl; ///< Merge: Pointer to the table to be removed - const OUString* pNewTblNm; ///< Split: the name of the new table + const SwTable* pDelTable; ///< Merge: Pointer to the table to be removed + const OUString* pNewTableNm; ///< Split: the name of the new table } DATA; SwHistory* pHistory; sal_uInt16 nSplitLine; ///< Split: from this BaseLine on will be splitted - TableFmlUpdtFlags eFlags; + TableFormulaUpdateFlags eFlags; bool bModified : 1; bool bBehindSplitLine : 1; /** Is sent if a table should be recalculated */ - SwTableFmlUpdate( const SwTable* ); + SwTableFormulaUpdate( const SwTable* ); }; -class SwAutoFmtGetDocNode: public SwMsgPoolItem +class SwAutoFormatGetDocNode: public SwMsgPoolItem { public: - const SwCntntNode* pCntntNode; + const SwContentNode* pContentNode; const SwNodes* pNodes; - SwAutoFmtGetDocNode( const SwNodes* pNds ); + SwAutoFormatGetDocNode( const SwNodes* pNds ); }; /* @@ -219,8 +219,8 @@ public: class SwCondCollCondChg: public SwMsgPoolItem { public: - SwFmt *pChangedFmt; - SwCondCollCondChg( SwFmt *pFmt ); + SwFormat *pChangedFormat; + SwCondCollCondChg( SwFormat *pFormat ); }; class SwVirtPageNumInfo: public SwMsgPoolItem diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx index 27cb7bc2e94e..928ae53023d6 100644 --- a/sw/inc/htmltbl.hxx +++ b/sw/inc/htmltbl.hxx @@ -30,7 +30,7 @@ class SwTableBox; class SwTable; class SwHTMLTableLayout; class SwDoc; -class SwFrmFmt; +class SwFrameFormat; #define HTMLTABLE_RESIZE_NOW (ULONG_MAX) @@ -239,7 +239,7 @@ class SwHTMLTableLayout void SetBoxWidth( SwTableBox *pBox, sal_uInt16 nCol, sal_uInt16 nColSpan ) const; const SwStartNode *GetAnyBoxStartNode() const; - SwFrmFmt *FindFlyFrmFmt() const; + SwFrameFormat *FindFlyFrameFormat() const; const SwDoc *GetDoc() const { return GetAnyBoxStartNode()->GetDoc(); } void ClearPass1Info() { nMin = nMax = 0; } @@ -251,7 +251,7 @@ class SwHTMLTableLayout static sal_uInt16 GetBrowseWidthByVisArea( const SwDoc& rDoc ); public: - SwHTMLTableLayout( const SwTable *pSwTbl, + SwHTMLTableLayout( const SwTable *pSwTable, sal_uInt16 nRows, sal_uInt16 nCols, bool bColsOpt, bool ColTgs, sal_uInt16 nWidth, bool bPrcWidth, sal_uInt16 nBorderOpt, sal_uInt16 nCellPad, sal_uInt16 nCellSp, SvxAdjust eAdjust, diff --git a/sw/inc/lineinfo.hxx b/sw/inc/lineinfo.hxx index f5a6f3c22a92..a1e2695dcf2f 100644 --- a/sw/inc/lineinfo.hxx +++ b/sw/inc/lineinfo.hxx @@ -23,7 +23,7 @@ #include <editeng/numitem.hxx> #include "swdllapi.h" -class SwCharFmt; +class SwCharFormat; class IDocumentStylePoolAccess; enum LineNumberPosition @@ -59,8 +59,8 @@ public: SwLineNumberInfo& operator=(const SwLineNumberInfo&); bool operator==( const SwLineNumberInfo& rInf ) const; - SwCharFmt *GetCharFmt( IDocumentStylePoolAccess& rIDSPA ) const; - void SetCharFmt( SwCharFmt* ); + SwCharFormat *GetCharFormat( IDocumentStylePoolAccess& rIDSPA ) const; + void SetCharFormat( SwCharFormat* ); const SvxNumberType &GetNumType() const { return aType; } void SetNumType( SvxNumberType aNew ){ aType = aNew; } diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx index ca4dcf4c7943..1e21326cdcd2 100644 --- a/sw/inc/mdiexp.hxx +++ b/sw/inc/mdiexp.hxx @@ -54,7 +54,7 @@ void EnableCmdInterface(bool bEnable = true); void RepaintPagePreview( SwViewShell* pVwSh, const SwRect& rRect ); // Read ChgMode for tables from configuration. -TblChgMode GetTblChgDefaultMode(); +TableChgMode GetTableChgDefaultMode(); bool JumpToSwMark( SwViewShell* pVwSh, const OUString& rMark ); diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index 7088f2784fe9..06fc3f1412f5 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -36,7 +36,7 @@ class SwModuleOptions; class InsCaptionOpt; // text format for the sending of messages ------------------------------ -enum class MailTxtFormats +enum class MailTextFormats { NONE = 0x00, ASCII = 0x01, @@ -46,7 +46,7 @@ enum class MailTxtFormats }; namespace o3tl { - template<> struct typed_flags<MailTxtFormats> : is_typed_flags<MailTxtFormats, 0x0f> {}; + template<> struct typed_flags<MailTextFormats> : is_typed_flags<MailTextFormats, 0x0f> {}; } @@ -122,7 +122,7 @@ class SwInsertConfig : public utl::ConfigItem bool bInsWithCaption; //Insert/Caption/Automatic bool bCaptionOrderNumberingFirst; //#i61007# caption order starting with numbering - SwInsertTableOptions aInsTblOpts; + SwInsertTableOptions aInsTableOpts; bool bIsWeb; const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); @@ -142,15 +142,15 @@ class SwTableConfig : public utl::ConfigItem { friend class SwModuleOptions; - sal_uInt16 nTblHMove; //int Table/Shift/Row - sal_uInt16 nTblVMove; //int Table/Shift/Column - sal_uInt16 nTblHInsert; //int Table/Insert/Row - sal_uInt16 nTblVInsert; //int Table/Insert/Column - TblChgMode eTblChgMode; //int Table/Change/Effect + sal_uInt16 nTableHMove; //int Table/Shift/Row + sal_uInt16 nTableVMove; //int Table/Shift/Column + sal_uInt16 nTableHInsert; //int Table/Insert/Row + sal_uInt16 nTableVInsert; //int Table/Insert/Column + TableChgMode eTableChgMode; //int Table/Change/Effect - bool bInsTblFormatNum; // Table/Input/NumberRecognition // Automatic recognition of numbers. - bool bInsTblChangeNumFormat; // Table/Input/NumberFormatRecognition // Automatic recognition of number formats. - bool bInsTblAlignNum; // Table/Input/Alignment // Align numbers. + bool bInsTableFormatNum; // Table/Input/NumberRecognition // Automatic recognition of numbers. + bool bInsTableChangeNumFormat; // Table/Input/NumberFormatRecognition // Automatic recognition of number formats. + bool bInsTableAlignNum; // Table/Input/Alignment // Align numbers. static const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); @@ -177,7 +177,7 @@ class SwMiscConfig : public utl::ConfigItem bool bSinglePrintJob; // FormLetter/PrintOutput/SinglePrintJobs bool bIsNameFromColumn; // FormLetter/FileOutput/FileName/Generation bool bAskForMailMergeInPrint; // Ask if documents containing fields should be 'mailmerged' - MailTxtFormats nMailingFormats; // FormLetter/MailingOutput/Formats + MailTextFormats nMailingFormats; // FormLetter/MailingOutput/Formats OUString sNameFromColumn; // FormLetter/FileOutput/FileName/FromDatabaseField (string!) OUString sMailingPath; // FormLetter/FileOutput/Path OUString sMailName; // FormLetter/FileOutput/FileName/FromManualSetting (string!) @@ -214,24 +214,24 @@ class SW_DLLPUBLIC SwModuleOptions public: SwModuleOptions(); - TblChgMode GetTblMode() const { return aTableConfig.eTblChgMode;} - void SetTblMode( TblChgMode eSet ) { aTableConfig.eTblChgMode = eSet; + TableChgMode GetTableMode() const { return aTableConfig.eTableChgMode;} + void SetTableMode( TableChgMode eSet ) { aTableConfig.eTableChgMode = eSet; aTableConfig.SetModified();} - sal_uInt16 GetTblHMove() const { return aTableConfig.nTblHMove;} - void SetTblHMove( sal_uInt16 nSet ) { aTableConfig.nTblHMove = nSet; + sal_uInt16 GetTableHMove() const { return aTableConfig.nTableHMove;} + void SetTableHMove( sal_uInt16 nSet ) { aTableConfig.nTableHMove = nSet; aTableConfig.SetModified();} - sal_uInt16 GetTblVMove() const { return aTableConfig.nTblVMove;} - void SetTblVMove( sal_uInt16 nSet ) { aTableConfig.nTblVMove = nSet; + sal_uInt16 GetTableVMove() const { return aTableConfig.nTableVMove;} + void SetTableVMove( sal_uInt16 nSet ) { aTableConfig.nTableVMove = nSet; aTableConfig.SetModified();} - sal_uInt16 GetTblHInsert() const {return aTableConfig.nTblHInsert;} - void SetTblHInsert( sal_uInt16 nSet ) { aTableConfig.nTblHInsert = nSet; + sal_uInt16 GetTableHInsert() const {return aTableConfig.nTableHInsert;} + void SetTableHInsert( sal_uInt16 nSet ) { aTableConfig.nTableHInsert = nSet; aTableConfig.SetModified();} - sal_uInt16 GetTblVInsert() const {return aTableConfig.nTblVInsert;} - void SetTblVInsert( sal_uInt16 nSet ) { aTableConfig.nTblVInsert = nSet; + sal_uInt16 GetTableVInsert() const {return aTableConfig.nTableVInsert;} + void SetTableVInsert( sal_uInt16 nSet ) { aTableConfig.nTableVInsert = nSet; aTableConfig.SetModified();} const AuthorCharAttr &GetInsertAuthorAttr() const { return aRevisionConfig.aInsertAttr; } @@ -271,28 +271,28 @@ public: } } - bool IsInsTblFormatNum(bool bHTML) const - { return bHTML ? aWebTableConfig.bInsTblFormatNum : aTableConfig.bInsTblFormatNum; } - void SetInsTblFormatNum( bool bHTML, bool b ) - { bHTML ? (aWebTableConfig.bInsTblFormatNum = b) : (aTableConfig.bInsTblFormatNum = b); + bool IsInsTableFormatNum(bool bHTML) const + { return bHTML ? aWebTableConfig.bInsTableFormatNum : aTableConfig.bInsTableFormatNum; } + void SetInsTableFormatNum( bool bHTML, bool b ) + { bHTML ? (aWebTableConfig.bInsTableFormatNum = b) : (aTableConfig.bInsTableFormatNum = b); bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();} - bool IsInsTblChangeNumFormat(bool bHTML) const - { return bHTML ? aWebTableConfig.bInsTblChangeNumFormat : aTableConfig.bInsTblChangeNumFormat; } - void SetInsTblChangeNumFormat( bool bHTML, bool b ) - { bHTML ? (aWebTableConfig.bInsTblChangeNumFormat = b) : (aTableConfig.bInsTblChangeNumFormat = b); + bool IsInsTableChangeNumFormat(bool bHTML) const + { return bHTML ? aWebTableConfig.bInsTableChangeNumFormat : aTableConfig.bInsTableChangeNumFormat; } + void SetInsTableChangeNumFormat( bool bHTML, bool b ) + { bHTML ? (aWebTableConfig.bInsTableChangeNumFormat = b) : (aTableConfig.bInsTableChangeNumFormat = b); bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();} - bool IsInsTblAlignNum(bool bHTML) const - { return bHTML ? aWebTableConfig.bInsTblAlignNum : aTableConfig.bInsTblAlignNum; } - void SetInsTblAlignNum( bool bHTML, bool b ) - { bHTML ? (aWebTableConfig.bInsTblAlignNum = b) : (aTableConfig.bInsTblAlignNum = b); + bool IsInsTableAlignNum(bool bHTML) const + { return bHTML ? aWebTableConfig.bInsTableAlignNum : aTableConfig.bInsTableAlignNum; } + void SetInsTableAlignNum( bool bHTML, bool b ) + { bHTML ? (aWebTableConfig.bInsTableAlignNum = b) : (aTableConfig.bInsTableAlignNum = b); bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();} - SwInsertTableOptions GetInsTblFlags(bool bHTML) const - { return bHTML ? aWebInsertConfig.aInsTblOpts : aInsertConfig.aInsTblOpts;} - void SetInsTblFlags( bool bHTML, const SwInsertTableOptions& rOpts ) { - bHTML ? (aWebInsertConfig.aInsTblOpts = rOpts) : (aInsertConfig.aInsTblOpts = rOpts); + SwInsertTableOptions GetInsTableFlags(bool bHTML) const + { return bHTML ? aWebInsertConfig.aInsTableOpts : aInsertConfig.aInsTableOpts;} + void SetInsTableFlags( bool bHTML, const SwInsertTableOptions& rOpts ) { + bHTML ? (aWebInsertConfig.aInsTableOpts = rOpts) : (aInsertConfig.aInsTableOpts = rOpts); bHTML ? aWebInsertConfig.SetModified() : aInsertConfig.SetModified();} const InsCaptionOpt* GetCapOption(bool bHTML, const SwCapObjType eType, const SvGlobalName *pOleId); @@ -302,8 +302,8 @@ public: void SetGrfToGalleryAsLnk( bool b ) { aMiscConfig.bGrfToGalleryAsLnk = b; aMiscConfig.SetModified();} - MailTxtFormats GetMailingFormats() const { return aMiscConfig.nMailingFormats;} - void SetMailingFormats( MailTxtFormats nSet ) { aMiscConfig.nMailingFormats = nSet; + MailTextFormats GetMailingFormats() const { return aMiscConfig.nMailingFormats;} + void SetMailingFormats( MailTextFormats nSet ) { aMiscConfig.nMailingFormats = nSet; aMiscConfig.SetModified();} bool IsSinglePrintJob() const { return aMiscConfig.bSinglePrintJob; } diff --git a/sw/inc/modeltoviewhelper.hxx b/sw/inc/modeltoviewhelper.hxx index 386b536b50dc..15bf06052554 100644 --- a/sw/inc/modeltoviewhelper.hxx +++ b/sw/inc/modeltoviewhelper.hxx @@ -25,7 +25,7 @@ #include <o3tl/typed_flags_set.hxx> #include <vector> -class SwTxtNode; +class SwTextNode; /** Some helpers for converting model strings to view strings. @@ -36,7 +36,7 @@ class SwTxtNode; helper functions are provided to convert model positions to view positions and vice versa. - CH_TXTATR_BREAKWORD -> SwTxtNode will have field attributes associated with these + CH_TXTATR_BREAKWORD -> SwTextNode will have field attributes associated with these . . . . . . @@ -125,7 +125,7 @@ public: ModelPosition() : mnPos(0), mnSubPos(0), mbIsField(false) {} }; - ModelToViewHelper(const SwTxtNode &rNode, + ModelToViewHelper(const SwTextNode &rNode, // defaults are appropriate for spell/grammar checking ExpandMode eMode = ExpandMode::ExpandFields | ExpandMode::ExpandFootnote | ExpandMode::ReplaceMode); ModelToViewHelper() //pass through filter, view == model diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx index 158b8dc2d0a8..4ff30a8749be 100644 --- a/sw/inc/ndarr.hxx +++ b/sw/inc/ndarr.hxx @@ -38,9 +38,9 @@ class Graphic; class GraphicObject; class SwAttrSet; class SfxItemSet; -class SwCntntNode; +class SwContentNode; class SwDoc; -class SwGrfFmtColl; +class SwGrfFormatColl; class SwGrfNode; class SwHistory; class SwNode; @@ -50,20 +50,20 @@ class SwOLENode; class SwOutlineNodes; class SwPaM; class SwSectionData; -class SwSectionFmt; +class SwSectionFormat; class SwTOXBase; class SwSectionNode; class SwStartNode; -class SwTableBoxFmt; -class SwTableFmt; +class SwTableBoxFormat; +class SwTableFormat; class SwTableLine; -class SwTableLineFmt; +class SwTableLineFormat; class SwTableNode; -class SwTblToTxtSaves; -class SwTxtFmtColl; -class SwTxtNode; -class SwUndoTblToTxt; -class SwUndoTxtToTbl; +class SwTableToTextSaves; +class SwTextFormatColl; +class SwTextNode; +class SwUndoTableToText; +class SwUndoTextToTable; struct SwPosition; namespace sw { class DocumentContentOperationsManager; } @@ -123,10 +123,10 @@ class SW_DLLPUBLIC SwNodes void ChgNode( SwNodeIndex& rDelPos, sal_uLong nSize, SwNodeIndex& rInsPos, bool bNewFrms ); - void UpdtOutlineIdx( const SwNode& ); ///< Update all OutlineNodes starting from Node. + void UpdateOutlineIdx( const SwNode& ); ///< Update all OutlineNodes starting from Node. void _CopyNodes( const SwNodeRange&, const SwNodeIndex&, - bool bNewFrms = true, bool bTblInsDummyNode = false ) const; + bool bNewFrms = true, bool bTableInsDummyNode = false ) const; void _DelDummyNodes( const SwNodeRange& rRg ); protected: @@ -186,19 +186,19 @@ public: static void GoStartOfSection(SwNodeIndex *); static void GoEndOfSection(SwNodeIndex *); - SwCntntNode* GoNext(SwNodeIndex *) const; - static SwCntntNode* GoPrevious(SwNodeIndex *); + SwContentNode* GoNext(SwNodeIndex *) const; + static SwContentNode* GoPrevious(SwNodeIndex *); - /** Go to next/previous Cntnt/Table-node for which LayoutFrames exist. + /** Go to next/previous Content/Table-node for which LayoutFrames exist. While doing this do not leave Header/Footer/Frame etc. */ SwNode* GoNextWithFrm(SwNodeIndex *) const; SwNode* GoPreviousWithFrm(SwNodeIndex *) const; /** Go to next content-node that is not protected or hidden (Both set FALSE ==> GoNext/GoPrevious!!!). */ - SwCntntNode* GoNextSection( SwNodeIndex *, bool bSkipHidden = true, + SwContentNode* GoNextSection( SwNodeIndex *, bool bSkipHidden = true, bool bSkipProtect = true ) const; - static SwCntntNode* GoPrevSection( SwNodeIndex *, bool bSkipHidden = true, + static SwContentNode* GoPrevSection( SwNodeIndex *, bool bSkipHidden = true, bool bSkipProtect = true ); /** Create an empty section of Start- and EndNote. It may be called @@ -208,35 +208,35 @@ public: SwStartNodeType = SwNormalStartNode ); /// Implementations of "Make...Node" are in the given .cxx-files. - SwTxtNode *MakeTxtNode( const SwNodeIndex & rWhere, - SwTxtFmtColl *pColl, + SwTextNode *MakeTextNode( const SwNodeIndex & rWhere, + SwTextFormatColl *pColl, SwAttrSet* pAutoAttr = 0 ); ///< in ndtxt.cxx SwStartNode* MakeTextSection( const SwNodeIndex & rWhere, SwStartNodeType eSttNdTyp, - SwTxtFmtColl *pColl, + SwTextFormatColl *pColl, SwAttrSet* pAutoAttr = 0 ); static SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic, - SwGrfFmtColl *pColl, + SwGrfFormatColl *pColl, SwAttrSet* pAutoAttr = 0, bool bDelayed = false ); ///< in ndgrf.cxx static SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere, const GraphicObject& rGrfObj, - SwGrfFmtColl *pColl, + SwGrfFormatColl *pColl, SwAttrSet* pAutoAttr = 0 ); ///< in ndgrf.cxx SwOLENode *MakeOLENode( const SwNodeIndex & rWhere, const svt::EmbeddedObjectRef&, - SwGrfFmtColl *pColl, + SwGrfFormatColl *pColl, SwAttrSet* pAutoAttr = 0 ); ///< in ndole.cxx SwOLENode *MakeOLENode( const SwNodeIndex & rWhere, const OUString &rName, sal_Int64 nAspect, - SwGrfFmtColl *pColl, + SwGrfFormatColl *pColl, SwAttrSet* pAutoAttr ); ///< in ndole.cxx /// Array of all OutlineNodes. @@ -250,46 +250,46 @@ public: New parameter pAttrSet: If pAttrSet is non-null and contains an adjust item it is propagated to the table cells. If there is an - adjust in pCntntTxtColl or pHeadlineTxtColl this adjust item + adjust in pContentTextColl or pHeadlineTextColl this adjust item overrides the item in pAttrSet. */ static SwTableNode* InsertTable( const SwNodeIndex& rNdIdx, - sal_uInt16 nBoxes, SwTxtFmtColl* pCntntTxtColl, + sal_uInt16 nBoxes, SwTextFormatColl* pContentTextColl, sal_uInt16 nLines = 0, sal_uInt16 nRepeat = 0, - SwTxtFmtColl* pHeadlineTxtColl = 0, + SwTextFormatColl* pHeadlineTextColl = 0, const SwAttrSet * pAttrSet = 0); /// Create balanced table from selected range. SwTableNode* TextToTable( const SwNodeRange& rRange, sal_Unicode cCh, - SwTableFmt* pTblFmt, - SwTableLineFmt* pLineFmt, - SwTableBoxFmt* pBoxFmt, - SwTxtFmtColl* pTxtColl, - SwUndoTxtToTbl* pUndo = 0 ); + SwTableFormat* pTableFormat, + SwTableLineFormat* pLineFormat, + SwTableBoxFormat* pBoxFormat, + SwTextFormatColl* pTextColl, + SwUndoTextToTable* pUndo = 0 ); static SwNodeRange * ExpandRangeForTableBox(const SwNodeRange & rRange); /// create a table from a vector of NodeRanges - API support SwTableNode* TextToTable( const TableRanges_t& rTableNodes, - SwTableFmt* pTblFmt, - SwTableLineFmt* pLineFmt, - SwTableBoxFmt* pBoxFmt, - SwTxtFmtColl* pTxtColl + SwTableFormat* pTableFormat, + SwTableLineFormat* pLineFormat, + SwTableBoxFormat* pBoxFormat, + SwTextFormatColl* pTextColl /*, SwUndo... pUndo*/ ); /// Create regular text from what was table. bool TableToText( const SwNodeRange& rRange, sal_Unicode cCh, - SwUndoTblToTxt* = 0 ); + SwUndoTableToText* = 0 ); /// Is in untbl.cxx and may called only by Undo-object. SwTableNode* UndoTableToText( sal_uLong nStt, sal_uLong nEnd, - const SwTblToTxtSaves& rSavedData ); + const SwTableToTextSaves& rSavedData ); /** Insert a new box in the line before InsPos. Its format is taken from the following one (or from the previous one if we are at the end). In the line there must be a box already. */ - bool InsBoxen( SwTableNode*, SwTableLine*, SwTableBoxFmt*, + bool InsBoxen( SwTableNode*, SwTableLine*, SwTableBoxFormat*, /// Formats for TextNode of box. - SwTxtFmtColl*, const SfxItemSet* pAutoAttr, + SwTextFormatColl*, const SfxItemSet* pAutoAttr, sal_uInt16 nInsPos, sal_uInt16 nCnt = 1 ); /** Splits a table at the base-line which contains the index. All base lines behind it are moved to a new table/ -node. @@ -305,7 +305,7 @@ public: /// Insert a new SwSection. SwSectionNode* InsertTextSection(SwNodeIndex const& rNdIdx, - SwSectionFmt& rSectionFmt, + SwSectionFormat& rSectionFormat, SwSectionData const&, SwTOXBase const*const pTOXBase, SwNodeIndex const*const pEnde, diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index bdf9e77961f3..668c5f5ecc61 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -27,13 +27,13 @@ #include <boost/weak_ptr.hpp> class SwAsyncRetrieveInputStreamThreadConsumer; -class SwGrfFmtColl; +class SwGrfFormatColl; class SwDoc; class GraphicAttr; class SotStorage; // SwGrfNode -class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode +class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode { friend class SwNodes; @@ -57,16 +57,16 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode SwGrfNode( const SwNodeIndex& rWhere, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic, - SwGrfFmtColl* pGrfColl, + SwGrfFormatColl* pGrfColl, SwAttrSet* pAutoAttr = 0 ); ///< Ctor for reading (SW/G) without graphics. SwGrfNode( const SwNodeIndex& rWhere, const OUString& rGrfName, const OUString& rFltName, - SwGrfFmtColl* pGrfColl, + SwGrfFormatColl* pGrfColl, SwAttrSet* pAutoAttr = 0 ); SwGrfNode( const SwNodeIndex& rWhere, const GraphicObject& rGrfObj, - SwGrfFmtColl* pGrfColl, + SwGrfFormatColl* pGrfColl, SwAttrSet* pAutoAttr = 0 ); void InsertLink( const OUString& rGrfName, const OUString& rFltName ); @@ -125,7 +125,7 @@ public: const Graphic& GetGrf(bool bWait = false) const; const GraphicObject& GetGrfObj(bool bWait = false) const; const GraphicObject* GetReplacementGrfObj() const; - virtual SwCntntNode *SplitCntntNode( const SwPosition & ) SAL_OVERRIDE; + virtual SwContentNode *SplitContentNode( const SwPosition & ) SAL_OVERRIDE; /// isolated only way to set GraphicObject to allow more actions when doing so void SetGraphic(const Graphic& rGraphic, const OUString& rLink); @@ -157,7 +157,7 @@ public: void SetScaleImageMap( bool b ) { bScaleImageMap = b; } /// in ndcopy.cxx - virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE; + virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE; /** Re-read in case graphic was not OK. The current one gets replaced by the new one. */ @@ -206,7 +206,7 @@ public: bool IsAsyncRetrieveInputStreamPossible() const; }; -// Inline methods from Node.hxx - it is only now that we know TxtNode!! +// Inline methods from Node.hxx - it is only now that we know TextNode!! inline SwGrfNode *SwNode::GetGrfNode() { return ND_GRFNODE == nNodeType ? static_cast<SwGrfNode*>(this) : 0; diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx index 86e7fd452ff8..44c853b98f1f 100644 --- a/sw/inc/ndhints.hxx +++ b/sw/inc/ndhints.hxx @@ -24,10 +24,10 @@ #include "swtypes.hxx" -class SwTxtNode; +class SwTextNode; class SwRegHistory; // Is in RolBck.hxx. -class SwTxtAttr; -class SwTxtAttrNesting; +class SwTextAttr; +class SwTextAttrNesting; class SfxPoolItem; class SfxItemSet; @@ -38,28 +38,28 @@ typedef enum { NEW = int(false), } CopyOrNew_t; -/// if COPY then pTxtNode must be given! -SwTxtAttr * MakeTxtAttr( +/// if COPY then pTextNode must be given! +SwTextAttr * MakeTextAttr( SwDoc & rDoc, SfxPoolItem & rNew, sal_Int32 const nStt, sal_Int32 const nEnd, CopyOrNew_t const bIsCopy = NEW, - SwTxtNode *const pTxtNode = 0 ); + SwTextNode *const pTextNode = 0 ); -SwTxtAttr * MakeTxtAttr( +SwTextAttr * MakeTextAttr( SwDoc & rDoc, const SfxItemSet & rSet, sal_Int32 nStt, sal_Int32 nEnd ); /// create redline dummy text hint that must not be inserted into hints array -SwTxtAttr* MakeRedlineTxtAttr( +SwTextAttr* MakeRedlineTextAttr( SwDoc & rDoc, SfxPoolItem& rAttr ); /** Class SwpHints is derived indirectly via SwpHts, because only the - class SwTxtNode should be allowed to insert and remove attributes. + class SwTextNode should be allowed to insert and remove attributes. Other classes like the Frames are given only reading access via the index-operator. Size when created is 1 because an array is created only if @@ -69,16 +69,16 @@ SwTxtAttr* MakeRedlineTxtAttr( struct CompareSwpHtStart { - bool operator()(SwTxtAttr* const lhs, SwTxtAttr* const rhs) const; + bool operator()(SwTextAttr* const lhs, SwTextAttr* const rhs) const; }; -class SwpHtStart : public o3tl::sorted_vector<SwTxtAttr*, CompareSwpHtStart, +class SwpHtStart : public o3tl::sorted_vector<SwTextAttr*, CompareSwpHtStart, o3tl::find_partialorder_ptrequals> {}; struct CompareSwpHtEnd { - bool operator()(SwTxtAttr* const lhs, SwTxtAttr* const rhs) const; + bool operator()(SwTextAttr* const lhs, SwTextAttr* const rhs) const; }; -class SwpHtEnd : public o3tl::sorted_vector<SwTxtAttr*, CompareSwpHtEnd, +class SwpHtEnd : public o3tl::sorted_vector<SwTextAttr*, CompareSwpHtEnd, o3tl::find_partialorder_ptrequals> {}; /// Class SwpHintsArr @@ -97,31 +97,31 @@ protected: //FIXME: why are the non-const methods public? public: - void Insert( const SwTxtAttr *pHt ); + void Insert( const SwTextAttr *pHt ); void DeleteAtPos( const size_t nPosInStart ); void Resort(); - SwTxtAttr * Cut( const size_t nPosInStart ) + SwTextAttr * Cut( const size_t nPosInStart ) { - SwTxtAttr *pHt = GetTextHint(nPosInStart); + SwTextAttr *pHt = GetTextHint(nPosInStart); DeleteAtPos( nPosInStart ); return pHt; } - const SwTxtAttr * GetStart( const size_t nPos ) const + const SwTextAttr * GetStart( const size_t nPos ) const { assert(nPos < m_HintStarts.size()); return m_HintStarts[nPos]; } - const SwTxtAttr * GetEnd( const size_t nPos ) const + const SwTextAttr * GetEnd( const size_t nPos ) const { assert(nPos < m_HintEnds.size()); return m_HintEnds[nPos]; } - SwTxtAttr * GetStart( const size_t nPos ) + SwTextAttr * GetStart( const size_t nPos ) { assert(nPos < m_HintStarts.size()); return m_HintStarts[nPos]; } - SwTxtAttr * GetEnd( const size_t nPos ) + SwTextAttr * GetEnd( const size_t nPos ) { assert(nPos < m_HintEnds.size()); return m_HintEnds[nPos]; @@ -130,10 +130,10 @@ public: size_t GetEndCount() const { return m_HintEnds.size(); } size_t GetStartCount() const { return m_HintStarts.size(); } - size_t GetStartOf( const SwTxtAttr *pHt ) const + size_t GetStartOf( const SwTextAttr *pHt ) const { SwpHtStart::const_iterator const it = - m_HintStarts.find(const_cast<SwTxtAttr*>(pHt)); + m_HintStarts.find(const_cast<SwTextAttr*>(pHt)); if ( it == m_HintStarts.end() ) { return SAL_MAX_SIZE; @@ -141,13 +141,13 @@ public: return it - m_HintStarts.begin(); } - bool Contains( const SwTxtAttr *pHt ) const; + bool Contains( const SwTextAttr *pHt ) const; - const SwTxtAttr * GetTextHint( const size_t nIdx ) const + const SwTextAttr * GetTextHint( const size_t nIdx ) const { return GetStart(nIdx); } - SwTxtAttr * GetTextHint( const size_t nIdx ) + SwTextAttr * GetTextHint( const size_t nIdx ) { return GetStart(nIdx); } - const SwTxtAttr * operator[]( const size_t nIdx ) const + const SwTextAttr * operator[]( const size_t nIdx ) const { return GetStart(nIdx); } size_t Count() const { return GetStartCount(); } @@ -169,22 +169,22 @@ private: bool m_bInSplitNode : 1; /// m_bHasHiddenParaField is invalid, call CalcHiddenParaField() bool m_bCalcHiddenParaField : 1; - bool m_bHasHiddenParaField : 1; ///< HiddenParaFld + bool m_bHasHiddenParaField : 1; ///< HiddenParaField bool m_bFootnote : 1; ///< footnotes bool m_bDDEFields : 1; ///< the TextNode has DDE fields /// records a new attibute in m_pHistory. - void NoteInHistory( SwTxtAttr *pAttr, const bool bNew = false ); + void NoteInHistory( SwTextAttr *pAttr, const bool bNew = false ); void CalcFlags( ); /** Delete methods may only be called by the TextNode! Because the TextNode also guarantees removal of the Character for attributes without an end. */ - friend class SwTxtNode; + friend class SwTextNode; void DeleteAtPos( const size_t nPos ); /// Delete the given Hint. The Hint must actually be in the array! - void Delete( SwTxtAttr* pTxtHt ); + void Delete( SwTextAttr* pTextHt ); void SetInSplitNode(bool bInSplit) { m_bInSplitNode = bInSplit; } void SetCalcHiddenParaField() { m_bCalcHiddenParaField = true; } @@ -198,11 +198,11 @@ private: return m_bHasHiddenParaField; } - void InsertNesting(SwTxtAttrNesting & rNewHint); - bool TryInsertNesting(SwTxtNode & rNode, SwTxtAttrNesting & rNewHint); - void BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint, + void InsertNesting(SwTextAttrNesting & rNewHint); + bool TryInsertNesting(SwTextNode & rNode, SwTextAttrNesting & rNewHint); + void BuildPortions( SwTextNode& rNode, SwTextAttr& rNewHint, const SetAttrMode nMode ); - bool MergePortions( SwTxtNode& rNode ); + bool MergePortions( SwTextNode& rNode ); public: SwpHints(); @@ -217,10 +217,10 @@ public: /// try to insert the hint /// @return true iff hint successfully inserted - bool TryInsertHint( SwTxtAttr * const pHint, SwTxtNode & rNode, + bool TryInsertHint( SwTextAttr * const pHint, SwTextNode & rNode, const SetAttrMode nMode = SetAttrMode::DEFAULT ); - bool HasFtn() const { return m_bFootnote; } + bool HasFootnote() const { return m_bFootnote; } bool IsInSplitNode() const { return m_bInSplitNode; } /// calc current value of m_bHasHiddenParaField, returns true iff changed diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx index 584fd5c24baa..ec0f494f6112 100644 --- a/sw/inc/ndnotxt.hxx +++ b/sw/inc/ndnotxt.hxx @@ -23,12 +23,12 @@ namespace tools { class PolyPolygon; } -// SwNoTxtNode +// SwNoTextNode -class SW_DLLPUBLIC SwNoTxtNode : public SwCntntNode +class SW_DLLPUBLIC SwNoTextNode : public SwContentNode { friend class SwNodes; - friend class SwNoTxtFrm; + friend class SwNoTextFrm; tools::PolyPolygon *pContour; bool bAutomaticContour : 1; // automatic contour polygon, not manipulated @@ -38,22 +38,22 @@ class SW_DLLPUBLIC SwNoTxtNode : public SwCntntNode bool bPixelContour : 1; // contour map mode is invalid and pixel. // Creates for all derivations an AttrSet with ranges for frame- and - // graphics-attributes (only called by SwCntntNode). + // graphics-attributes (only called by SwContentNode). virtual void NewAttrSet( SwAttrPool& ) SAL_OVERRIDE; - SwNoTxtNode( const SwNoTxtNode& ) SAL_DELETED_FUNCTION; - SwNoTxtNode &operator=( const SwNoTxtNode& ) SAL_DELETED_FUNCTION; + SwNoTextNode( const SwNoTextNode& ) SAL_DELETED_FUNCTION; + SwNoTextNode &operator=( const SwNoTextNode& ) SAL_DELETED_FUNCTION; protected: - SwNoTxtNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType, - SwGrfFmtColl *pGrColl, SwAttrSet* pAutoAttr = 0 ); + SwNoTextNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType, + SwGrfFormatColl *pGrColl, SwAttrSet* pAutoAttr = 0 ); public: - virtual ~SwNoTxtNode(); + virtual ~SwNoTextNode(); - virtual SwCntntFrm *MakeFrm( SwFrm* ) SAL_OVERRIDE; + virtual SwContentFrm *MakeFrm( SwFrm* ) SAL_OVERRIDE; - inline SwGrfFmtColl *GetGrfColl() const { return const_cast<SwGrfFmtColl*>(static_cast<const SwGrfFmtColl*>(GetRegisteredIn())); } + inline SwGrfFormatColl *GetGrfColl() const { return const_cast<SwGrfFormatColl*>(static_cast<const SwGrfFormatColl*>(GetRegisteredIn())); } virtual Size GetTwipSize() const = 0; @@ -90,14 +90,14 @@ public: Graphic GetGraphic() const; }; -// Inline methods from Node.hxx - we know TxtNode only here!! -inline SwNoTxtNode *SwNode::GetNoTxtNode() +// Inline methods from Node.hxx - we know TextNode only here!! +inline SwNoTextNode *SwNode::GetNoTextNode() { - return ND_NOTXTNODE & nNodeType ? static_cast<SwNoTxtNode*>(this) : 0; + return ND_NOTXTNODE & nNodeType ? static_cast<SwNoTextNode*>(this) : 0; } -inline const SwNoTxtNode *SwNode::GetNoTxtNode() const +inline const SwNoTextNode *SwNode::GetNoTextNode() const { - return ND_NOTXTNODE & nNodeType ? static_cast<const SwNoTxtNode*>(this) : 0; + return ND_NOTXTNODE & nNodeType ? static_cast<const SwNoTextNode*>(this) : 0; } #endif // INCLUDED_SW_INC_NDNOTXT_HXX diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx index 3091cc03abf9..b2787a393f78 100644 --- a/sw/inc/ndole.hxx +++ b/sw/inc/ndole.hxx @@ -23,7 +23,7 @@ #include <svtools/embedhlp.hxx> -class SwGrfFmtColl; +class SwGrfFormatColl; class SwDoc; class SwOLENode; @@ -66,11 +66,11 @@ public: // SwOLENode -class SW_DLLPUBLIC SwOLENode: public SwNoTxtNode +class SW_DLLPUBLIC SwOLENode: public SwNoTextNode { friend class SwNodes; mutable SwOLEObj aOLEObj; - OUString sChartTblName; ///< with chart objects: name of referenced table. + OUString sChartTableName; ///< with chart objects: name of referenced table. bool bOLESizeInvalid; /**< Should be considered at SwDoc::PrtOLENotify (e.g. copied). Is not persistent. */ @@ -79,28 +79,28 @@ class SW_DLLPUBLIC SwOLENode: public SwNoTxtNode SwOLENode( const SwNodeIndex &rWhere, const svt::EmbeddedObjectRef&, - SwGrfFmtColl *pGrfColl, + SwGrfFormatColl *pGrfColl, SwAttrSet* pAutoAttr = 0 ); SwOLENode( const SwNodeIndex &rWhere, const OUString &rName, sal_Int64 nAspect, - SwGrfFmtColl *pGrfColl, + SwGrfFormatColl *pGrfColl, SwAttrSet* pAutoAttr = 0 ); SwOLENode( const SwOLENode & ) SAL_DELETED_FUNCTION; - using SwNoTxtNode::GetGraphic; + using SwNoTextNode::GetGraphic; public: const SwOLEObj& GetOLEObj() const { return aOLEObj; } SwOLEObj& GetOLEObj() { return aOLEObj; } virtual ~SwOLENode(); - virtual SwCntntNode *SplitCntntNode( const SwPosition & ) SAL_OVERRIDE; + virtual SwContentNode *SplitContentNode( const SwPosition & ) SAL_OVERRIDE; /// Is in ndcopy.cxx. - virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE; + virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE; virtual Size GetTwipSize() const SAL_OVERRIDE; @@ -133,8 +133,8 @@ public: // #i99665# bool IsChart() const; - OUString GetChartTblName() const { return sChartTblName; } - void SetChartTblName( const OUString& rNm ) { sChartTblName = rNm; } + OUString GetChartTableName() const { return sChartTableName; } + void SetChartTableName( const OUString& rNm ) { sChartTableName = rNm; } }; /// Inline methods from Node.hxx diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index 87a29ec1bd7d..94ffd6a7401b 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -44,10 +44,10 @@ namespace utl { class TransliterationWrapper; } -class SwTxtFmtColl; -class SwCntntFrm; -class SwTxtFld; -class SwTxtInputFld; +class SwTextFormatColl; +class SwContentFrm; +class SwTextField; +class SwTextInputField; class SfxItemSet; class SwUndoTransliterate; struct SwSpellArgs; @@ -69,14 +69,14 @@ namespace com { namespace sun { namespace star { typedef std::set< sal_Int32 > SwSoftPageBreakList; -/// SwTxtNode is a paragraph in the document model. -class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable +/// SwTextNode is a paragraph in the document model. +class SW_DLLPUBLIC SwTextNode: public SwContentNode, public ::sfx2::Metadatable { - friend class SwCntntNode; + friend class SwContentNode; /// For creating the first TextNode. - friend class SwDoc; ///< CTOR and AppendTxtNode() + friend class SwDoc; ///< CTOR and AppendTextNode() friend class SwNodes; - friend class SwTxtFrm; + friend class SwTextFrm; friend class SwScriptInfo; /** May be 0. It is only then not 0 if it contains hard attributes. @@ -118,22 +118,22 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable //UUUU DrawingLayer FillAttributes in a preprocessed form for primitive usage drawinglayer::attribute::SdrAllFillAttributesHelperPtr maFillAttributes; - SAL_DLLPRIVATE SwTxtNode( const SwNodeIndex &rWhere, SwTxtFmtColl *pTxtColl, + SAL_DLLPRIVATE SwTextNode( const SwNodeIndex &rWhere, SwTextFormatColl *pTextColl, const SfxItemSet* pAutoAttr = 0 ); /// Copies the attributes at nStart to pDest. - SAL_DLLPRIVATE void CopyAttr( SwTxtNode *pDest, const sal_Int32 nStart, const sal_Int32 nOldPos); + SAL_DLLPRIVATE void CopyAttr( SwTextNode *pDest, const sal_Int32 nStart, const sal_Int32 nOldPos); - SAL_DLLPRIVATE SwTxtNode* _MakeNewTxtNode( const SwNodeIndex&, bool bNext = true, + SAL_DLLPRIVATE SwTextNode* _MakeNewTextNode( const SwNodeIndex&, bool bNext = true, bool bChgFollow = true ); SAL_DLLPRIVATE void CutImpl( - SwTxtNode * const pDest, const SwIndex & rDestStart, + SwTextNode * const pDest, const SwIndex & rDestStart, const SwIndex & rStart, /*const*/ sal_Int32 nLen, const bool bUpdate = true ); /// Move all comprising hard attributes to the AttrSet of the paragraph. - SAL_DLLPRIVATE void MoveTxtAttr_To_AttrSet(); // Called by SplitNode. + SAL_DLLPRIVATE void MoveTextAttr_To_AttrSet(); // Called by SplitNode. /// Create the specific AttrSet. SAL_DLLPRIVATE virtual void NewAttrSet( SwAttrPool& ) SAL_OVERRIDE; @@ -177,11 +177,11 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable inline void TryDeleteSwpHints(); - SAL_DLLPRIVATE void impl_FmtToTxtAttr(const SfxItemSet& i_rAttrSet); + SAL_DLLPRIVATE void impl_FormatToTextAttr(const SfxItemSet& i_rAttrSet); - const SwTxtInputFld* GetOverlappingInputFld( const SwTxtAttr& rTxtAttr ) const; + const SwTextInputField* GetOverlappingInputField( const SwTextAttr& rTextAttr ) const; - void DelFrms_TxtNodePart(); + void DelFrms_TextNodePart(); public: bool IsWordCountDirty() const; @@ -206,14 +206,14 @@ public: /// End: Data collected during idle time protected: - /// for hanging TxtFmtCollections somewhere else (Outline-Numbering!) + /// for hanging TextFormatCollections somewhere else (Outline-Numbering!) virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; virtual void SwClientNotify( const SwModify&, const SfxHint& ) SAL_OVERRIDE; public: - using SwCntntNode::GetAttr; + using SwContentNode::GetAttr; - const OUString& GetTxt() const { return m_Text; } + const OUString& GetText() const { return m_Text; } // returns the maximum number of characters that can still be added to the node inline sal_Int32 GetSpaceLeft() const; @@ -226,7 +226,7 @@ public: inline bool HasHints() const { return m_pSwpHints != nullptr; } inline SwpHints &GetOrCreateSwpHints(); - virtual ~SwTxtNode(); + virtual ~SwTextNode(); virtual sal_Int32 Len() const SAL_OVERRIDE; @@ -270,7 +270,7 @@ public: only the ones which have exactly same range. Don't delete the ones which are simply included in the range. */ - void RstTxtAttr( + void RstTextAttr( const SwIndex &rIdx, const sal_Int32 nLen, const sal_uInt16 nWhich = 0, @@ -280,7 +280,7 @@ public: void GCAttr(); // Delete text attribute (needs to be deregistered at Pool!) - void DestroyAttr( SwTxtAttr* pAttr ); + void DestroyAttr( SwTextAttr* pAttr ); // delete all attributes from SwpHintsArray. void ClearSwpHintsArr( bool bDelFields ); @@ -289,16 +289,16 @@ public: void FileLoadedInitHints(); /// Insert pAttr into hints array. @return true iff inserted successfully - bool InsertHint( SwTxtAttr * const pAttr, + bool InsertHint( SwTextAttr * const pAttr, const SetAttrMode nMode = SetAttrMode::DEFAULT ); /// create new text attribute from rAttr and insert it /// @return inserted hint; 0 if not sure the hint is inserted - SwTxtAttr* InsertItem( SfxPoolItem& rAttr, + SwTextAttr* InsertItem( SfxPoolItem& rAttr, const sal_Int32 nStart, const sal_Int32 nEnd, const SetAttrMode nMode = SetAttrMode::DEFAULT ); /** Set these attributes at TextNode. If the whole range is comprised - set them only in AutoAttrSet (SwCntntNode::SetAttr). */ + set them only in AutoAttrSet (SwContentNode::SetAttr). */ bool SetAttr( const SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd, const SetAttrMode nMode = SetAttrMode::DEFAULT ); @@ -306,38 +306,38 @@ public: Introduce 4th optional parameter <bMergeIndentValuesOfNumRule>. If <bMergeIndentValuesOfNumRule> == true, the indent attributes of the corresponding list level of an applied list style is merged into - the requested item set as a LR-SPACE item, if <bOnlyTxtAttr> == false, + the requested item set as a LR-SPACE item, if <bOnlyTextAttr> == false, corresponding node has not its own indent attributes and the position-and-space mode of the list level is SvxNumberFormat::LABEL_ALIGNMENT. */ bool GetAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd, - const bool bOnlyTxtAttr = false, - const bool bGetFromChrFmt = true, + const bool bOnlyTextAttr = false, + const bool bGetFromChrFormat = true, const bool bMergeIndentValuesOfNumRule = false ) const; - /// Convey attributes of an AttrSet (AutoFmt) to SwpHintsArray. - void FmtToTxtAttr( SwTxtNode* pNd ); + /// Convey attributes of an AttrSet (AutoFormat) to SwpHintsArray. + void FormatToTextAttr( SwTextNode* pNd ); /// delete all attributes of type nWhich at nStart (opt. end nEnd) void DeleteAttributes( const sal_uInt16 nWhich, const sal_Int32 nStart, const sal_Int32 nEnd = 0 ); - /// delete the attribute pTxtAttr - void DeleteAttribute ( SwTxtAttr * const pTxtAttr ); + /// delete the attribute pTextAttr + void DeleteAttribute ( SwTextAttr * const pTextAttr ); /** Actions on text and attributes. introduce optional parameter to control, if all attributes have to be copied. */ - void CopyText( SwTxtNode * const pDest, + void CopyText( SwTextNode * const pDest, const SwIndex &rStart, const sal_Int32 nLen, const bool bForceCopyOfAllAttrs = false ); - void CopyText( SwTxtNode * const pDest, + void CopyText( SwTextNode * const pDest, const SwIndex &rDestStart, const SwIndex &rStart, sal_Int32 nLen, const bool bForceCopyOfAllAttrs = false ); - void CutText(SwTxtNode * const pDest, + void CutText(SwTextNode * const pDest, const SwIndex & rStart, const sal_Int32 nLen); - inline void CutText(SwTxtNode * const pDest, const SwIndex &rDestStart, + inline void CutText(SwTextNode * const pDest, const SwIndex &rDestStart, const SwIndex & rStart, const sal_Int32 nLen); /// replace nDelLen characters at rStart with rText @@ -349,19 +349,19 @@ public: const OUString& rText, const ::com::sun::star::uno::Sequence<sal_Int32>& rOffsets ); - /// Virtual methods from CntntNode. - virtual SwCntntFrm *MakeFrm( SwFrm* ) SAL_OVERRIDE; - virtual SwCntntNode *SplitCntntNode( const SwPosition & ) SAL_OVERRIDE; - virtual SwCntntNode *JoinNext() SAL_OVERRIDE; - virtual SwCntntNode *JoinPrev() SAL_OVERRIDE; + /// Virtual methods from ContentNode. + virtual SwContentFrm *MakeFrm( SwFrm* ) SAL_OVERRIDE; + virtual SwContentNode *SplitContentNode( const SwPosition & ) SAL_OVERRIDE; + virtual SwContentNode *JoinNext() SAL_OVERRIDE; + virtual SwContentNode *JoinPrev() SAL_OVERRIDE; - SwCntntNode *AppendNode( const SwPosition & ); + SwContentNode *AppendNode( const SwPosition & ); /// When appropriate set DontExpand-flag at INet or character styles respectively. - bool DontExpandFmt( const SwIndex& rIdx, bool bFlag = true, - bool bFmtToTxtAttributes = true ); + bool DontExpandFormat( const SwIndex& rIdx, bool bFlag = true, + bool bFormatToTextAttributes = true ); - enum GetTxtAttrMode { + enum GetTextAttrMode { DEFAULT, /// DEFAULT: (Start <= nIndex < End) EXPAND, /// EXPAND : (Start < nIndex <= End) PARENT, /// PARENT : (Start < nIndex < End) @@ -369,25 +369,25 @@ public: /** get the innermost text attribute covering position nIndex. @param nWhich only attribute with this id is returned. - @param eMode the predicate for matching (@see GetTxtAttrMode). + @param eMode the predicate for matching (@see GetTextAttrMode). ATTENTION: this function is not well-defined for those hints of which several may cover a single position, like RES_TXTATR_CHARFMT, RES_TXTATR_REFMARK, RES_TXTATR_TOXMARK */ - SwTxtAttr *GetTxtAttrAt( + SwTextAttr *GetTextAttrAt( sal_Int32 const nIndex, RES_TXTATR const nWhich, - enum GetTxtAttrMode const eMode = DEFAULT ) const; + enum GetTextAttrMode const eMode = DEFAULT ) const; /** get the innermost text attributes covering position nIndex. @param nWhich only attributes with this id are returned. - @param eMode the predicate for matching (@see GetTxtAttrMode). + @param eMode the predicate for matching (@see GetTextAttrMode). */ - ::std::vector<SwTxtAttr *> GetTxtAttrsAt( + ::std::vector<SwTextAttr *> GetTextAttrsAt( sal_Int32 const nIndex, RES_TXTATR const nWhich, - enum GetTxtAttrMode const eMode = DEFAULT ) const; + enum GetTextAttrMode const eMode = DEFAULT ) const; /** get the text attribute at position nIndex which owns the dummy character CH_TXTATR_* at that position, if one exists. @@ -396,27 +396,27 @@ public: attribute with given which id @return the text attribute at nIndex of type nWhich, if it exists */ - SwTxtAttr *GetTxtAttrForCharAt( + SwTextAttr *GetTextAttrForCharAt( const sal_Int32 nIndex, const RES_TXTATR nWhich = RES_TXTATR_END ) const; - SwTxtFld* GetFldTxtAttrAt( + SwTextField* GetFieldTextAttrAt( const sal_Int32 nIndex, - const bool bIncludeInputFldAtStart = false ) const; + const bool bIncludeInputFieldAtStart = false ) const; OUString GetCurWord(sal_Int32) const; bool Spell(SwSpellArgs*); bool Convert( SwConversionArgs & ); - inline SwTxtFmtColl *GetTxtColl() const; - virtual SwFmtColl *ChgFmtColl( SwFmtColl* ) SAL_OVERRIDE; - void _ChgTxtCollUpdateNum( const SwTxtFmtColl* pOld, - const SwTxtFmtColl* pNew ); + inline SwTextFormatColl *GetTextColl() const; + virtual SwFormatColl *ChgFormatColl( SwFormatColl* ) SAL_OVERRIDE; + void _ChgTextCollUpdateNum( const SwTextFormatColl* pOld, + const SwTextFormatColl* pNew ); /** Copy collection with all auto formats to dest-node. The latter might be in an other document! (Method in ndcopy.cxx!!). */ - void CopyCollFmt( SwTxtNode& rDestNd ); + void CopyCollFormat( SwTextNode& rDestNd ); // BEGIN OF BULLET/NUMBERING/OUTLINE STUFF: @@ -473,11 +473,11 @@ public: /** Returns the additional indents of this text node and its numbering. - @param bTxtLeft ??? + @param bTextLeft ??? @return additional indents */ - long GetLeftMarginWithNum( bool bTxtLeft = false ) const; + long GetLeftMarginWithNum( bool bTextLeft = false ) const; /** Returns the combined first line indent of this text node and @@ -529,7 +529,7 @@ public: This node is numbered if it has a SwNodeNum and it has a numbering rule and has not a hidden SwNodeNum. - ATTENTION: Returns true even if the SwNumFmt has type + ATTENTION: Returns true even if the SwNumFormat has type SVX_NUM_NUMBER_NONE. @retval true This node is numbered. @@ -579,7 +579,7 @@ public: Otherwise the text node has no outline level (NO_NUMBERING). NOTE: The outline level of text nodes is subject to change. The - plan is to have an SwTxtNode::nOutlineLevel member that is + plan is to have an SwTextNode::nOutlineLevel member that is updated from a paragraph style upon appliance of that paragraph style. @@ -670,9 +670,9 @@ public: /// in ndcopy.cxx bool IsSymbol( const sal_Int32 nBegin ) const; // In itratr.cxx. - virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE; + virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE; - /// Interactive hyphenation: we find TxtFrm and call its CalcHyph. + /// Interactive hyphenation: we find TextFrm and call its CalcHyph. bool Hyphenate( SwInterHyphInfo &rHyphInf ); void DelSoftHyph( const sal_Int32 nStart, const sal_Int32 nEnd ); @@ -682,20 +682,20 @@ public: add 5th optional parameter <bWithSpacesForLevel> indicating, if additional spaces are inserted in front of the expanded text string depending on the list level. */ - OUString GetExpandTxt( const sal_Int32 nIdx = 0, + OUString GetExpandText( const sal_Int32 nIdx = 0, const sal_Int32 nLen = -1, const bool bWithNum = false, const bool bAddSpaceAfterListLabelStr = false, const bool bWithSpacesForLevel = false, - const bool bWithFtn = true ) const; - bool GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx = 0, + const bool bWithFootnote = true ) const; + bool GetExpandText( SwTextNode& rDestNd, const SwIndex* pDestIdx = 0, sal_Int32 nIdx = 0, sal_Int32 nLen = -1, - bool bWithNum = false, bool bWithFtn = true, + bool bWithNum = false, bool bWithFootnote = true, bool bReplaceTabsWithSpaces = false ) const; - OUString GetRedlineTxt( sal_Int32 nIdx = 0, + OUString GetRedlineText( sal_Int32 nIdx = 0, sal_Int32 nLen = SAL_MAX_INT32, - bool bExpandFlds = false, + bool bExpandFields = false, bool bWithNum = false ) const; /** @return actual count of initial chars for initial-function. @@ -800,31 +800,31 @@ public: sal_uInt32 GetRsid( sal_Int32 nStt, sal_Int32 nEnd ) const; sal_uInt32 GetParRsid() const; - bool CompareRsid( const SwTxtNode &rTxtNode, sal_Int32 nStt1, sal_Int32 nStt2, + bool CompareRsid( const SwTextNode &rTextNode, sal_Int32 nStt1, sal_Int32 nStt2, sal_Int32 nEnd1 = 0, sal_Int32 nEnd2 = 0 ) const; - bool CompareParRsid( const SwTxtNode &rTxtNode ) const; + bool CompareParRsid( const SwTextNode &rTextNode ) const; - DECL_FIXEDMEMPOOL_NEWDEL(SwTxtNode) + DECL_FIXEDMEMPOOL_NEWDEL(SwTextNode) //UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const SAL_OVERRIDE; /// In MS Word, the font underline setting of the paragraph end position wont affect the formatting of numbering, so we ignore it - static bool IsIgnoredCharFmtForNumbering(const sal_uInt16 nWhich); + static bool IsIgnoredCharFormatForNumbering(const sal_uInt16 nWhich); }; -inline SwpHints & SwTxtNode::GetSwpHints() +inline SwpHints & SwTextNode::GetSwpHints() { assert( m_pSwpHints ); return *m_pSwpHints; } -inline const SwpHints &SwTxtNode::GetSwpHints() const +inline const SwpHints &SwTextNode::GetSwpHints() const { assert( m_pSwpHints ); return *m_pSwpHints; } -inline SwpHints& SwTxtNode::GetOrCreateSwpHints() +inline SwpHints& SwTextNode::GetOrCreateSwpHints() { if ( !m_pSwpHints ) { @@ -833,7 +833,7 @@ inline SwpHints& SwTxtNode::GetOrCreateSwpHints() return *m_pSwpHints; } -inline void SwTxtNode::TryDeleteSwpHints() +inline void SwTextNode::TryDeleteSwpHints() { if ( m_pSwpHints && m_pSwpHints->CanBeDeleted() ) { @@ -841,30 +841,30 @@ inline void SwTxtNode::TryDeleteSwpHints() } } -inline SwTxtFmtColl* SwTxtNode::GetTxtColl() const +inline SwTextFormatColl* SwTextNode::GetTextColl() const { - return static_cast<SwTxtFmtColl*>(const_cast<SwModify*>(GetRegisteredIn())); + return static_cast<SwTextFormatColl*>(const_cast<SwModify*>(GetRegisteredIn())); } /// Inline methods from Node.hxx -inline SwTxtNode *SwNode::GetTxtNode() +inline SwTextNode *SwNode::GetTextNode() { - return ND_TEXTNODE == nNodeType ? static_cast<SwTxtNode*>(this) : 0; + return ND_TEXTNODE == nNodeType ? static_cast<SwTextNode*>(this) : 0; } -inline const SwTxtNode *SwNode::GetTxtNode() const +inline const SwTextNode *SwNode::GetTextNode() const { - return ND_TEXTNODE == nNodeType ? static_cast<const SwTxtNode*>(this) : 0; + return ND_TEXTNODE == nNodeType ? static_cast<const SwTextNode*>(this) : 0; } inline void -SwTxtNode::CutText(SwTxtNode * const pDest, const SwIndex & rDestStart, +SwTextNode::CutText(SwTextNode * const pDest, const SwIndex & rDestStart, const SwIndex & rStart, const sal_Int32 nLen) { CutImpl( pDest, rDestStart, rStart, nLen, true ); } -inline sal_Int32 SwTxtNode::GetSpaceLeft() const +inline sal_Int32 SwTextNode::GetSpaceLeft() const { // do not fill the String up to the max - need to be able to have a // SwPosition "behind" the last character, i.e., at index TXTNODE_MAX + 1 diff --git a/sw/inc/ndtyp.hxx b/sw/inc/ndtyp.hxx index cbf71abfe00e..081ccadf1637 100644 --- a/sw/inc/ndtyp.hxx +++ b/sw/inc/ndtyp.hxx @@ -33,7 +33,7 @@ const sal_uInt8 ND_OLENODE = 0x20; const sal_uInt8 ND_SECTIONNODE = 0x40 | ND_STARTNODE; ///< SwSectionNode is derived from SwStartNode. const sal_uInt8 ND_PLACEHOLDER = 0x80; -// NoTxtNode (if any of the 2 bits are set). +// NoTextNode (if any of the 2 bits are set). const sal_uInt8 ND_NOTXTNODE = ND_GRFNODE | ND_OLENODE; // ContentNode (if any of the 3 bits are set). const sal_uInt8 ND_CONTENTNODE = ND_TEXTNODE | ND_NOTXTNODE; diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index d27494db31ef..bc8f8d090a31 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -32,19 +32,19 @@ #include <memory> #include <vector> -class SwCntntFrm; -class SwCntntNode; +class SwContentFrm; +class SwContentNode; class SwDoc; class SwEndNode; class SwFrm; -class SwFrmFmt; +class SwFrameFormat; class SwGrfNode; -class SwNoTxtNode; +class SwNoTextNode; class SwNodeIndex; class SwOLENode; class SwRect; class SwSection; -class SwSectionFmt; +class SwSectionFormat; class SwTOXBase; class SwSectionNode; class SwStartNode; @@ -53,7 +53,7 @@ class SwRootFrm; class SwTable; class SwTableNode; class SwTableBox; -class SwTxtNode; +class SwTextNode; class SwPageDesc; class SwViewShell; struct SwPosition; @@ -85,7 +85,7 @@ class SW_DLLPUBLIC SwNode sal_uInt8 nNodeType; /// For text nodes: level of auto format. Was put here because we had still free bits. - sal_uInt8 nAFmtNumLvl : 3; + sal_uInt8 nAFormatNumLvl : 3; bool bSetNumLSpace : 1; ///< For numbering: TRUE: set indent. bool bIgnoreDontExpand : 1; ///< for Text Attributes - ignore the flag @@ -94,10 +94,10 @@ class SW_DLLPUBLIC SwNode long m_nSerial; #endif - /// all SwFrmFmt that are anchored at the node - /// invariant: SwFrmFmt is in the list iff - /// SwFrmFmt::GetAnchor().GetCntntAnchor() points to this node - std::unique_ptr<std::vector<SwFrmFmt*>> m_pAnchoredFlys; + /// all SwFrameFormat that are anchored at the node + /// invariant: SwFrameFormat is in the list iff + /// SwFrameFormat::GetAnchor().GetContentAnchor() points to this node + std::unique_ptr<std::vector<SwFrameFormat*>> m_pAnchoredFlys; protected: SwStartNode* pStartOfSection; @@ -126,8 +126,8 @@ public: inline const SwEndNode* EndOfSectionNode() const; inline SwEndNode* EndOfSectionNode(); - inline sal_uInt8 GetAutoFmtLvl() const { return nAFmtNumLvl; } - inline void SetAutoFmtLvl( sal_uInt8 nVal ) { nAFmtNumLvl = nVal; } + inline sal_uInt8 GetAutoFormatLvl() const { return nAFormatNumLvl; } + inline void SetAutoFormatLvl( sal_uInt8 nVal ) { nAFormatNumLvl = nVal; } inline bool IsSetNumLSpace() const { return bSetNumLSpace; } inline void SetNumLSpace( bool bFlag ) { bSetNumLSpace = bFlag; } @@ -139,16 +139,16 @@ public: inline SwStartNode *GetStartNode(); inline const SwStartNode *GetStartNode() const; - inline SwCntntNode *GetCntntNode(); - inline const SwCntntNode *GetCntntNode() const; + inline SwContentNode *GetContentNode(); + inline const SwContentNode *GetContentNode() const; inline SwEndNode *GetEndNode(); inline const SwEndNode *GetEndNode() const; - inline SwTxtNode *GetTxtNode(); - inline const SwTxtNode *GetTxtNode() const; + inline SwTextNode *GetTextNode(); + inline const SwTextNode *GetTextNode() const; inline SwOLENode *GetOLENode(); inline const SwOLENode *GetOLENode() const; - inline SwNoTxtNode *GetNoTxtNode(); - inline const SwNoTxtNode *GetNoTxtNode() const; + inline SwNoTextNode *GetNoTextNode(); + inline const SwNoTextNode *GetNoTextNode() const; inline SwGrfNode *GetGrfNode(); inline const SwGrfNode *GetGrfNode() const; inline SwTableNode *GetTableNode(); @@ -157,13 +157,13 @@ public: inline const SwSectionNode *GetSectionNode() const; inline bool IsStartNode() const; - inline bool IsCntntNode() const; + inline bool IsContentNode() const; inline bool IsEndNode() const; - inline bool IsTxtNode() const; + inline bool IsTextNode() const; inline bool IsTableNode() const; inline bool IsSectionNode() const; inline bool IsOLENode() const; - inline bool IsNoTxtNode() const; + inline bool IsNoTextNode() const; inline bool IsGrfNode() const; /** @@ -271,20 +271,20 @@ public: const SwPageDesc* FindPageDesc( bool bCalcLay, size_t* pPgDescNdIdx = 0 ) const; /// If node is in a fly return the respective format. - SwFrmFmt* GetFlyFmt() const; + SwFrameFormat* GetFlyFormat() const; /// If node is in a table return the respective table box. - SwTableBox* GetTblBox() const; + SwTableBox* GetTableBox() const; inline sal_uLong GetIndex() const { return GetPos(); } - const SwTxtNode* FindOutlineNodeOfLevel( sal_uInt8 nLvl ) const; + const SwTextNode* FindOutlineNodeOfLevel( sal_uInt8 nLvl ) const; sal_uInt8 HasPrevNextLayNode() const; - std::vector<SwFrmFmt *> const* GetAnchoredFlys() const { return m_pAnchoredFlys.get(); } - void AddAnchoredFly(SwFrmFmt *); - void RemoveAnchoredFly(SwFrmFmt *); + std::vector<SwFrameFormat *> const* GetAnchoredFlys() const { return m_pAnchoredFlys.get(); } + void AddAnchoredFly(SwFrameFormat *); + void RemoveAnchoredFly(SwFrameFormat *); /** * Dumps the node structure to the given destination (file nodes.xml in the current directory by default) @@ -349,9 +349,9 @@ private: SwEndNode & operator= ( const SwEndNode & rNode ) SAL_DELETED_FUNCTION; }; -// SwCntntNode +// SwContentNode -class SW_DLLPUBLIC SwCntntNode: public SwModify, public SwNode, public SwIndexReg +class SW_DLLPUBLIC SwContentNode: public SwModify, public SwNode, public SwIndexReg { //FEATURE::CONDCOLL @@ -360,14 +360,14 @@ class SW_DLLPUBLIC SwCntntNode: public SwModify, public SwNode, public SwIndexRe mutable bool mbSetModifyAtAttr; protected: - SwCntntNode( const SwNodeIndex &rWhere, const sal_uInt8 nNodeType, - SwFmtColl *pFmtColl ); + SwContentNode( const SwNodeIndex &rWhere, const sal_uInt8 nNodeType, + SwFormatColl *pFormatColl ); /** the = 0 forces the class to be an abstract base class, but the dtor can be still called from subclasses */ - virtual ~SwCntntNode() = 0; + virtual ~SwContentNode() = 0; - /** Attribute-set for all auto attributes of a CntntNode. - (e.g. TxtNode or NoTxtNode). */ + /** Attribute-set for all auto attributes of a ContentNode. + (e.g. TextNode or NoTextNode). */ std::shared_ptr<const SfxItemSet> mpAttrSet; /// Make respective nodes create the specific AttrSets. @@ -384,12 +384,12 @@ public: /** MakeFrm will be called for a certain layout pSib is another SwFrm of the same layout (e.g. the SwRootFrm itself, a sibling, the parent) */ - virtual SwCntntFrm *MakeFrm( SwFrm* pSib ) = 0; + virtual SwContentFrm *MakeFrm( SwFrm* pSib ) = 0; - virtual SwCntntNode *SplitCntntNode(const SwPosition & ) = 0; + virtual SwContentNode *SplitContentNode(const SwPosition & ) = 0; - virtual SwCntntNode *JoinNext(); - virtual SwCntntNode *JoinPrev(); + virtual SwContentNode *JoinNext(); + virtual SwContentNode *JoinPrev(); /** Is it possible to join two nodes? In pIdx the second position can be returned. */ bool CanJoinNext( SwNodeIndex* pIdx =0 ) const; @@ -402,7 +402,7 @@ public: bool GoPrevious(SwIndex *, sal_uInt16 nMode ) const; /// Replacement for good old GetFrm(..): - SwCntntFrm *getLayoutFrm( const SwRootFrm*, + SwContentFrm *getLayoutFrm( const SwRootFrm*, const Point* pDocPos = 0, const SwPosition *pPos = 0, const bool bCalcFrm = true ) const; @@ -417,7 +417,7 @@ public: /** Method creates all views of document for given node. The content frames that are created are put in the respective layout. */ - void MakeFrms( SwCntntNode& rNode ); + void MakeFrms( SwContentNode& rNode ); /** Method deletes all views of document for the node. The content- frames are removed from the respective layout. @@ -430,7 +430,7 @@ public: There are differences between text node and formula node. */ virtual sal_Int32 Len() const; - virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const = 0; + virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const = 0; /// Get information from Client. virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE; @@ -456,13 +456,13 @@ public: inline const SwAttrSet *GetpSwAttrSet() const { return static_cast<const SwAttrSet*>(mpAttrSet.get()); } inline bool HasSwAttrSet() const { return mpAttrSet != nullptr; } - virtual SwFmtColl* ChgFmtColl( SwFmtColl* ); - SwFmtColl* GetFmtColl() const { return const_cast<SwFmtColl*>(static_cast<const SwFmtColl*>(GetRegisteredIn())); } + virtual SwFormatColl* ChgFormatColl( SwFormatColl* ); + SwFormatColl* GetFormatColl() const { return const_cast<SwFormatColl*>(static_cast<const SwFormatColl*>(GetRegisteredIn())); } //FEATURE::CONDCOLL - inline SwFmtColl& GetAnyFmtColl() const; - void SetCondFmtColl( SwFmtColl* ); - inline SwFmtColl* GetCondFmtColl() const; + inline SwFormatColl& GetAnyFormatColl() const; + void SetCondFormatColl( SwFormatColl* ); + inline SwFormatColl* GetCondFormatColl() const; bool IsAnyCondition( SwCollCondition& rTmp ) const; void ChkCondColl(); @@ -480,14 +480,14 @@ public: inline void SetModifyAtAttr( bool bSetModifyAtAttr ) const { mbSetModifyAtAttr = bSetModifyAtAttr; } inline bool GetModifyAtAttr() const { return mbSetModifyAtAttr; } - static SwOLENodes* CreateOLENodesArray( const SwFmtColl& rColl, bool bOnlyWithInvalidSize ); + static SwOLENodes* CreateOLENodesArray( const SwFormatColl& rColl, bool bOnlyWithInvalidSize ); //UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const; private: - SwCntntNode( const SwCntntNode & rNode ) SAL_DELETED_FUNCTION; - SwCntntNode & operator= ( const SwCntntNode & rNode ) SAL_DELETED_FUNCTION; + SwContentNode( const SwContentNode & rNode ) SAL_DELETED_FUNCTION; + SwContentNode & operator= ( const SwContentNode & rNode ) SAL_DELETED_FUNCTION; }; // SwTableNode @@ -544,7 +544,7 @@ protected: public: SwSectionNode(SwNodeIndex const&, - SwSectionFmt & rFmt, SwTOXBase const*const pTOXBase); + SwSectionFormat & rFormat, SwTOXBase const*const pTOXBase); const SwSection& GetSection() const { return *m_pSection; } SwSection& GetSection() { return *m_pSection; } @@ -572,7 +572,7 @@ public: /** Check for not hidden areas whether there is content that is not in a hidden sub-area. */ - bool IsCntntHidden() const; + bool IsContentHidden() const; }; @@ -620,20 +620,20 @@ inline const SwSectionNode *SwNode::GetSectionNode() const { return ND_SECTIONNODE == nNodeType ? static_cast<const SwSectionNode*>(this) : 0; } -inline SwCntntNode *SwNode::GetCntntNode() +inline SwContentNode *SwNode::GetContentNode() { - return ND_CONTENTNODE & nNodeType ? static_cast<SwCntntNode*>(this) : 0; + return ND_CONTENTNODE & nNodeType ? static_cast<SwContentNode*>(this) : 0; } -inline const SwCntntNode *SwNode::GetCntntNode() const +inline const SwContentNode *SwNode::GetContentNode() const { - return ND_CONTENTNODE & nNodeType ? static_cast<const SwCntntNode*>(this) : 0; + return ND_CONTENTNODE & nNodeType ? static_cast<const SwContentNode*>(this) : 0; } inline bool SwNode::IsStartNode() const { return (ND_STARTNODE & nNodeType) != 0; } -inline bool SwNode::IsCntntNode() const +inline bool SwNode::IsContentNode() const { return (ND_CONTENTNODE & nNodeType) != 0; } @@ -641,7 +641,7 @@ inline bool SwNode::IsEndNode() const { return ND_ENDNODE == nNodeType; } -inline bool SwNode::IsTxtNode() const +inline bool SwNode::IsTextNode() const { return ND_TEXTNODE == nNodeType; } @@ -653,7 +653,7 @@ inline bool SwNode::IsSectionNode() const { return ND_SECTIONNODE == nNodeType; } -inline bool SwNode::IsNoTxtNode() const +inline bool SwNode::IsNoTextNode() const { return (ND_NOTXTNODE & nNodeType) != 0; } @@ -716,26 +716,26 @@ inline const SwDoc* SwNode::GetDoc() const return GetNodes().GetDoc(); } -inline SwFmtColl* SwCntntNode::GetCondFmtColl() const +inline SwFormatColl* SwContentNode::GetCondFormatColl() const { - return pCondColl ? static_cast<SwFmtColl*>(pCondColl->GetRegisteredIn()) : 0; + return pCondColl ? static_cast<SwFormatColl*>(pCondColl->GetRegisteredIn()) : 0; } -inline SwFmtColl& SwCntntNode::GetAnyFmtColl() const +inline SwFormatColl& SwContentNode::GetAnyFormatColl() const { return pCondColl && pCondColl->GetRegisteredIn() - ? *static_cast<SwFmtColl*>(pCondColl->GetRegisteredIn()) - : *const_cast<SwFmtColl*>(static_cast<const SwFmtColl*>(GetRegisteredIn())); + ? *static_cast<SwFormatColl*>(pCondColl->GetRegisteredIn()) + : *const_cast<SwFormatColl*>(static_cast<const SwFormatColl*>(GetRegisteredIn())); } -inline const SwAttrSet& SwCntntNode::GetSwAttrSet() const +inline const SwAttrSet& SwContentNode::GetSwAttrSet() const { - return mpAttrSet ? *GetpSwAttrSet() : GetAnyFmtColl().GetAttrSet(); + return mpAttrSet ? *GetpSwAttrSet() : GetAnyFormatColl().GetAttrSet(); } //FEATURE::CONDCOLL -inline const SfxPoolItem& SwCntntNode::GetAttr( sal_uInt16 nWhich, +inline const SfxPoolItem& SwContentNode::GetAttr( sal_uInt16 nWhich, bool bInParents ) const { return GetSwAttrSet().Get( nWhich, bInParents ); diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index c83d1de861f7..585937dfe188 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -33,7 +33,7 @@ #include <vector> #include <charfmt.hxx> -class SwTxtFmtColl; +class SwTextFormatColl; class IDocumentListsAccess; class SwNodeNum; namespace vcl { class Font; } @@ -41,15 +41,15 @@ class SvxBrushItem; class SfxGrabBagItem; class SvxNumRule; class SwDoc; -class SwFmtVertOrient; -class SwTxtNode; +class SwFormatVertOrient; +class SwTextNode; class Size; const sal_Unicode cBulletChar = 0x2022; ///< Character for lists. -class SW_DLLPUBLIC SwNumFmt : public SvxNumberFormat, public SwClient +class SW_DLLPUBLIC SwNumFormat : public SvxNumberFormat, public SwClient { - SwFmtVertOrient* pVertOrient; + SwFormatVertOrient* pVertOrient; //For i120928,record the cp info of graphic within bullet sal_Unicode cGrfBulletCP; SAL_DLLPRIVATE void UpdateNumNodes( SwDoc* pDoc ); @@ -62,22 +62,22 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE; public: - SwNumFmt(); - SwNumFmt( const SwNumFmt& ); - SwNumFmt( const SvxNumberFormat&, SwDoc* pDoc); + SwNumFormat(); + SwNumFormat( const SwNumFormat& ); + SwNumFormat( const SvxNumberFormat&, SwDoc* pDoc); - virtual ~SwNumFmt(); + virtual ~SwNumFormat(); - SwNumFmt& operator=( const SwNumFmt& ); + SwNumFormat& operator=( const SwNumFormat& ); - bool operator==( const SwNumFmt& ) const; - bool operator!=( const SwNumFmt& r ) const { return !(*this == r); } + bool operator==( const SwNumFormat& ) const; + bool operator!=( const SwNumFormat& r ) const { return !(*this == r); } - SwCharFmt* GetCharFmt() const { return const_cast<SwCharFmt*>(static_cast<const SwCharFmt*>(GetRegisteredIn())); } - void SetCharFmt( SwCharFmt* ); + SwCharFormat* GetCharFormat() const { return const_cast<SwCharFormat*>(static_cast<const SwCharFormat*>(GetRegisteredIn())); } + void SetCharFormat( SwCharFormat* ); - void SetCharFmtName(const OUString& rSet); - virtual OUString GetCharFmtName() const SAL_OVERRIDE; + void SetCharFormatName(const OUString& rSet); + virtual OUString GetCharFormatName() const SAL_OVERRIDE; //For i120928,access the cp info of graphic within bullet void SetGrfBulletCP(sal_Unicode cP){cGrfBulletCP = cP;} @@ -87,7 +87,7 @@ public: virtual void SetVertOrient(sal_Int16 eSet) SAL_OVERRIDE; virtual sal_Int16 GetVertOrient() const SAL_OVERRIDE; - const SwFmtVertOrient* GetGraphicOrientation() const; + const SwFormatVertOrient* GetGraphicOrientation() const; bool IsEnumeration() const; // #i22362# bool IsItemize() const; // #i29560# @@ -99,8 +99,8 @@ class SW_DLLPUBLIC SwNumRule { public: - typedef std::vector< SwTxtNode* > tTxtNodeList; - typedef std::vector< SwTxtFmtColl* > tParagraphStyleList; + typedef std::vector< SwTextNode* > tTextNodeList; + typedef std::vector< SwTextFormatColl* > tParagraphStyleList; struct Extremities { @@ -111,16 +111,16 @@ public: private: friend void _FinitCore(); - static SwNumFmt* maBaseFmts [ RULE_END ][ MAXLEVEL ]; + static SwNumFormat* maBaseFormats [ RULE_END ][ MAXLEVEL ]; static const sal_uInt16 maDefNumIndents[ MAXLEVEL ]; /// default list level properties for position-and-space mode LABEL_ALIGNMENT - static SwNumFmt* maLabelAlignmentBaseFmts [ RULE_END ][ MAXLEVEL ]; + static SwNumFormat* maLabelAlignmentBaseFormats [ RULE_END ][ MAXLEVEL ]; static sal_uInt16 mnRefCount; - SwNumFmt* maFmts[ MAXLEVEL ]; + SwNumFormat* maFormats[ MAXLEVEL ]; /** container for associated text nodes */ - tTxtNodeList maTxtNodeList; + tTextNodeList maTextNodeList; /** container for associated paragraph styles */ tParagraphStyleList maParagraphStyleList; @@ -130,7 +130,7 @@ private: OUString msName; SwNumRuleType meRuleType; - sal_uInt16 mnPoolFmtId; ///< Id-for NumRules created "automatically" + sal_uInt16 mnPoolFormatId; ///< Id-for NumRules created "automatically" sal_uInt16 mnPoolHelpId; ///< HelpId for this Pool-style. sal_uInt8 mnPoolHlpFileId; ///< FilePos at Doc on style helps. bool mbAutoRuleFlag : 1; @@ -158,14 +158,14 @@ public: bool operator==( const SwNumRule& ) const; bool operator!=( const SwNumRule& r ) const { return !(*this == r); } - const SwNumFmt* GetNumFmt( sal_uInt16 i ) const; - const SwNumFmt& Get( sal_uInt16 i ) const; + const SwNumFormat* GetNumFormat( sal_uInt16 i ) const; + const SwNumFormat& Get( sal_uInt16 i ) const; bool IsHidden( ) const { return mbHidden; } void SetHidden( bool bValue ) { mbHidden = bValue; } - void Set( sal_uInt16 i, const SwNumFmt* ); - void Set( sal_uInt16 i, const SwNumFmt& ); + void Set( sal_uInt16 i, const SwNumFormat* ); + void Set( sal_uInt16 i, const SwNumFormat& ); OUString MakeNumString( const SwNodeNum&, bool bInclStrings = true, bool bOnlyArabic = false ) const; /** - add optional parameter <_nRestrictToThisLevel> in order to @@ -183,15 +183,15 @@ public: @return list of associated text nodes */ - void GetTxtNodeList( SwNumRule::tTxtNodeList& rTxtNodeList ) const; - SwNumRule::tTxtNodeList::size_type GetTxtNodeListSize() const; + void GetTextNodeList( SwNumRule::tTextNodeList& rTextNodeList ) const; + SwNumRule::tTextNodeList::size_type GetTextNodeListSize() const; - void AddTxtNode( SwTxtNode& rTxtNode ); - void RemoveTxtNode( SwTxtNode& rTxtNode ); + void AddTextNode( SwTextNode& rTextNode ); + void RemoveTextNode( SwTextNode& rTextNode ); SwNumRule::tParagraphStyleList::size_type GetParagraphStyleListSize() const; - void AddParagraphStyle( SwTxtFmtColl& rTxtFmtColl ); - void RemoveParagraphStyle( SwTxtFmtColl& rTxtFmtColl ); + void AddParagraphStyle( SwTextFormatColl& rTextFormatColl ); + void RemoveParagraphStyle( SwTextFormatColl& rTextFormatColl ); inline void SetDefaultListId( const OUString& sDefaultListId ) { @@ -225,7 +225,7 @@ public: /** Tests whether the CharFormats are from the given doc and copies them if appropriate. */ - void CheckCharFmts( SwDoc* pDoc ); + void CheckCharFormats( SwDoc* pDoc ); OUString GetName() const { return msName; } @@ -250,8 +250,8 @@ public: void SetCountPhantoms(bool bCountPhantoms); /// Query and set PoolFormat IDs. - sal_uInt16 GetPoolFmtId() const { return mnPoolFmtId; } - void SetPoolFmtId( sal_uInt16 nId ) { mnPoolFmtId = nId; } + sal_uInt16 GetPoolFormatId() const { return mnPoolFormatId; } + void SetPoolFormatId( sal_uInt16 nId ) { mnPoolFormatId = nId; } /// Query and set Help-IDs for document styles. sal_uInt16 GetPoolHelpId() const { return mnPoolHelpId; } diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx index b25e9af8ca11..5bdb73884dbf 100644 --- a/sw/inc/pagedesc.hxx +++ b/sw/inc/pagedesc.hxx @@ -28,11 +28,11 @@ #include <editeng/borderline.hxx> class SfxPoolItem; -class SwTxtFmtColl; +class SwTextFormatColl; class SwNode; /// Separator line adjustment. -enum SwFtnAdj +enum SwFootnoteAdj { FTNADJ_LEFT, FTNADJ_CENTER, @@ -40,7 +40,7 @@ enum SwFtnAdj }; /// Footnote information. -class SW_DLLPUBLIC SwPageFtnInfo +class SW_DLLPUBLIC SwPageFootnoteInfo { private: SwTwips m_nMaxHeight; ///< maximum height of the footnote area. @@ -48,7 +48,7 @@ private: editeng::SvxBorderStyle m_eLineStyle; ///< Style of the separator line Color m_LineColor; ///< color of the separator line Fraction m_Width; ///< percentage width of the separator line. - SwFtnAdj m_eAdjust; ///< line adjustment. + SwFootnoteAdj m_eAdjust; ///< line adjustment. SwTwips m_nTopDist; ///< distance between body and separator. SwTwips m_nBottomDist; ///< distance between separator and first footnote @@ -58,7 +58,7 @@ public: const Color& GetLineColor() const { return m_LineColor;} editeng::SvxBorderStyle GetLineStyle() const { return m_eLineStyle; } const Fraction& GetWidth() const { return m_Width; } - SwFtnAdj GetAdj() const { return m_eAdjust; } + SwFootnoteAdj GetAdj() const { return m_eAdjust; } SwTwips GetTopDist() const { return m_nTopDist; } SwTwips GetBottomDist() const { return m_nBottomDist; } @@ -67,19 +67,19 @@ public: void SetLineStyle(editeng::SvxBorderStyle const eSet) {m_eLineStyle = eSet;} void SetLineColor(const Color& rCol) { m_LineColor = rCol;} void SetWidth(const Fraction & rNew) { m_Width = rNew; } - void SetAdj(SwFtnAdj const eNew) { m_eAdjust = eNew; } + void SetAdj(SwFootnoteAdj const eNew) { m_eAdjust = eNew; } void SetTopDist (SwTwips const nNew) { m_nTopDist = nNew; } void SetBottomDist(SwTwips const nNew) { m_nBottomDist = nNew; } - SwPageFtnInfo(); - SwPageFtnInfo( const SwPageFtnInfo& ); - SwPageFtnInfo& operator=( const SwPageFtnInfo& ); + SwPageFootnoteInfo(); + SwPageFootnoteInfo( const SwPageFootnoteInfo& ); + SwPageFootnoteInfo& operator=( const SwPageFootnoteInfo& ); - bool operator ==( const SwPageFtnInfo& ) const; + bool operator ==( const SwPageFootnoteInfo& ) const; }; /* - * Use of UseOnPage (m_eUse) and of FrmFmts + * Use of UseOnPage (m_eUse) and of FrameFormats * * RIGHT - m_Master only for right hand (odd) pages, left hand (even) pages * always empty. @@ -134,11 +134,11 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify OUString m_StyleName; SvxNumberType m_NumType; - SwFrmFmt m_Master; - SwFrmFmt m_Left; + SwFrameFormat m_Master; + SwFrameFormat m_Left; // FIXME epicycles growing here - page margins need to be stored differently - SwFrmFmt m_FirstMaster; - SwFrmFmt m_FirstLeft; + SwFrameFormat m_FirstMaster; + SwFrameFormat m_FirstLeft; SwDepend m_Depend; ///< Because of grid alignment (Registerhaltigkeit). SwPageDesc *m_pFollow; sal_uInt16 m_nRegHeight; ///< Sentence spacing and fontascent of style. @@ -148,7 +148,7 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify bool m_IsHidden; /// Footnote information. - SwPageFtnInfo m_IsFtnInfo; + SwPageFootnoteInfo m_IsFootnoteInfo; /** Called for mirroring of Chg (doc). No adjustment at any other place. */ @@ -156,7 +156,7 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify SAL_DLLPRIVATE void ResetAllAttr( bool bLeft ); - SAL_DLLPRIVATE SwPageDesc(const OUString&, SwFrmFmt*, SwDoc *pDc ); + SAL_DLLPRIVATE SwPageDesc(const OUString&, SwFrameFormat*, SwDoc *pDc ); protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNewValue ) SAL_OVERRIDE; @@ -172,9 +172,9 @@ public: const SvxNumberType &GetNumType() const { return m_NumType; } void SetNumType(const SvxNumberType& rNew) { m_NumType = rNew; } - const SwPageFtnInfo &GetFtnInfo() const { return m_IsFtnInfo; } - SwPageFtnInfo &GetFtnInfo() { return m_IsFtnInfo; } - void SetFtnInfo(const SwPageFtnInfo &rNew) { m_IsFtnInfo = rNew; } + const SwPageFootnoteInfo &GetFootnoteInfo() const { return m_IsFootnoteInfo; } + SwPageFootnoteInfo &GetFootnoteInfo() { return m_IsFootnoteInfo; } + void SetFootnoteInfo(const SwPageFootnoteInfo &rNew) { m_IsFootnoteInfo = rNew; } inline bool IsHeaderShared() const; inline bool IsFooterShared() const; @@ -192,14 +192,14 @@ public: void WriteUseOn(UseOnPage const eNew) { m_eUse = eNew; } UseOnPage ReadUseOn() const { return m_eUse; } - SwFrmFmt &GetMaster() { return m_Master; } - SwFrmFmt &GetLeft() { return m_Left; } - SwFrmFmt &GetFirstMaster() { return m_FirstMaster; } - SwFrmFmt &GetFirstLeft() { return m_FirstLeft; } - const SwFrmFmt &GetMaster() const { return m_Master; } - const SwFrmFmt &GetLeft() const { return m_Left; } - const SwFrmFmt &GetFirstMaster() const { return m_FirstMaster; } - const SwFrmFmt &GetFirstLeft() const { return m_FirstLeft; } + SwFrameFormat &GetMaster() { return m_Master; } + SwFrameFormat &GetLeft() { return m_Left; } + SwFrameFormat &GetFirstMaster() { return m_FirstMaster; } + SwFrameFormat &GetFirstLeft() { return m_FirstLeft; } + const SwFrameFormat &GetMaster() const { return m_Master; } + const SwFrameFormat &GetLeft() const { return m_Left; } + const SwFrameFormat &GetFirstMaster() const { return m_FirstMaster; } + const SwFrameFormat &GetFirstLeft() const { return m_FirstLeft; } /** Reset all attrs of the format but keep the ones a pagedesc cannot live without. */ @@ -208,10 +208,10 @@ public: /** Layout uses the following methods to obtain a format in order to be able to create a page. */ - SwFrmFmt *GetRightFmt(bool const bFirst = false); - inline const SwFrmFmt *GetRightFmt(bool const bFirst = false) const; - SwFrmFmt *GetLeftFmt(bool const bFirst = false); - inline const SwFrmFmt *GetLeftFmt(bool const bFirst = false) const; + SwFrameFormat *GetRightFormat(bool const bFirst = false); + inline const SwFrameFormat *GetRightFormat(bool const bFirst = false) const; + SwFrameFormat *GetLeftFormat(bool const bFirst = false); + inline const SwFrameFormat *GetLeftFormat(bool const bFirst = false) const; sal_uInt16 GetRegHeight() const { return m_nRegHeight; } sal_uInt16 GetRegAscent() const { return m_nRegAscent; } @@ -222,13 +222,13 @@ public: const SwPageDesc* GetFollow() const { return m_pFollow; } SwPageDesc* GetFollow() { return m_pFollow; } - void SetRegisterFmtColl( const SwTxtFmtColl* rFmt ); - const SwTxtFmtColl* GetRegisterFmtColl() const; + void SetRegisterFormatColl( const SwTextFormatColl* rFormat ); + const SwTextFormatColl* GetRegisterFormatColl() const; void RegisterChange(); /// Query and set PoolFormat-Id. - sal_uInt16 GetPoolFmtId() const { return m_Master.GetPoolFmtId(); } - void SetPoolFmtId(sal_uInt16 const nId) { m_Master.SetPoolFmtId(nId); } + sal_uInt16 GetPoolFormatId() const { return m_Master.GetPoolFormatId(); } + void SetPoolFormatId(sal_uInt16 const nId) { m_Master.SetPoolFormatId(nId); } sal_uInt16 GetPoolHelpId() const { return m_Master.GetPoolHelpId(); } void SetPoolHelpId(sal_uInt16 const nId){ m_Master.SetPoolHelpId(nId); } sal_uInt8 GetPoolHlpFileId() const { return m_Master.GetPoolHlpFileId(); } @@ -237,7 +237,7 @@ public: /// Query information from Client. virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE; - const SwFrmFmt* GetPageFmtOfNode( const SwNode& rNd, + const SwFrameFormat* GetPageFormatOfNode( const SwNode& rNd, bool bCheckForThisPgDc = true ) const; bool IsFollowNextPageOfNode( const SwNode& rNd ) const; @@ -310,13 +310,13 @@ inline void SwPageDesc::ResetAllLeftAttr() ResetAllAttr( true ); } -inline const SwFrmFmt *SwPageDesc::GetRightFmt(bool const bFirst) const +inline const SwFrameFormat *SwPageDesc::GetRightFormat(bool const bFirst) const { - return const_cast<SwPageDesc*>(this)->GetRightFmt(bFirst); + return const_cast<SwPageDesc*>(this)->GetRightFormat(bFirst); } -inline const SwFrmFmt *SwPageDesc::GetLeftFmt(bool const bFirst) const +inline const SwFrameFormat *SwPageDesc::GetLeftFormat(bool const bFirst) const { - return const_cast<SwPageDesc*>(this)->GetLeftFmt(bFirst); + return const_cast<SwPageDesc*>(this)->GetLeftFormat(bFirst); } class SwPageDescExt diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx index 916e4e0a585e..451895460a67 100644 --- a/sw/inc/pam.hxx +++ b/sw/inc/pam.hxx @@ -30,12 +30,12 @@ #include <iostream> -class SwFmt; +class SwFormat; class SfxPoolItem; class SfxItemSet; class SwDoc; class SwNode; -class SwCntntNode; +class SwContentNode; class SwPaM; class Point; @@ -53,10 +53,10 @@ struct SW_DLLPUBLIC SwPosition SwNodeIndex nNode; SwIndex nContent; - SwPosition( const SwNodeIndex &rNode, const SwIndex &rCntnt ); + SwPosition( const SwNodeIndex &rNode, const SwIndex &rContent ); explicit SwPosition( const SwNodeIndex &rNode ); explicit SwPosition( const SwNode& rNode ); - explicit SwPosition( SwCntntNode& rNode, const sal_Int32 nOffset = 0 ); + explicit SwPosition( SwContentNode& rNode, const sal_Int32 nOffset = 0 ); SwPosition( const SwPosition & ); SwPosition &operator=(const SwPosition &); @@ -147,10 +147,10 @@ typedef bool (*SwGoInDoc)( SwPaM& rPam, SwMoveFn fnMove ); SW_DLLPUBLIC extern SwGoInDoc fnGoDoc; extern SwGoInDoc fnGoSection; SW_DLLPUBLIC extern SwGoInDoc fnGoNode; -SW_DLLPUBLIC extern SwGoInDoc fnGoCntnt; ///< SwPam::Move() default argument. -extern SwGoInDoc fnGoCntntCells; -extern SwGoInDoc fnGoCntntSkipHidden; -extern SwGoInDoc fnGoCntntCellsSkipHidden; +SW_DLLPUBLIC extern SwGoInDoc fnGoContent; ///< SwPam::Move() default argument. +extern SwGoInDoc fnGoContentCells; +extern SwGoInDoc fnGoContentSkipHidden; +extern SwGoInDoc fnGoContentCellsSkipHidden; void _InitPam(); @@ -175,12 +175,12 @@ public: long nMkOffset = 0, long nPtOffset = 0, SwPaM* pRing = 0 ); SwPaM( const SwNode& rMk, const SwNode& rPt, long nMkOffset = 0, long nPtOffset = 0, SwPaM* pRing = 0 ); - SwPaM( const SwNodeIndex& rMk, sal_Int32 nMkCntnt, - const SwNodeIndex& rPt, sal_Int32 nPtCntnt, SwPaM* pRing = 0 ); - SwPaM( const SwNode& rMk, sal_Int32 nMkCntnt, - const SwNode& rPt, sal_Int32 nPtCntnt, SwPaM* pRing = 0 ); - SwPaM( const SwNode& rNd, sal_Int32 nCntnt = 0, SwPaM* pRing = 0 ); - SwPaM( const SwNodeIndex& rNd, sal_Int32 nCntnt = 0, SwPaM* pRing = 0 ); + SwPaM( const SwNodeIndex& rMk, sal_Int32 nMkContent, + const SwNodeIndex& rPt, sal_Int32 nPtContent, SwPaM* pRing = 0 ); + SwPaM( const SwNode& rMk, sal_Int32 nMkContent, + const SwNode& rPt, sal_Int32 nPtContent, SwPaM* pRing = 0 ); + SwPaM( const SwNode& rNd, sal_Int32 nContent = 0, SwPaM* pRing = 0 ); + SwPaM( const SwNodeIndex& rNd, sal_Int32 nContent = 0, SwPaM* pRing = 0 ); virtual ~SwPaM(); /// this takes a second parameter, which indicates the Ring that @@ -191,15 +191,15 @@ public: /// Movement of cursor. bool Move( SwMoveFn fnMove = fnMoveForward, - SwGoInDoc fnGo = fnGoCntnt ); + SwGoInDoc fnGo = fnGoContent ); /// Search. bool Find( const com::sun::star::util::SearchOptions& rSearchOpt, bool bSearchInNotes, - utl::TextSearch& rSTxt, + utl::TextSearch& rSText, SwMoveFn fnMove = fnMoveForward, const SwPaM *pPam =0, bool bInReadOnly = false); - bool Find( const SwFmt& rFmt, + bool Find( const SwFormat& rFormat, SwMoveFn fnMove = fnMoveForward, const SwPaM *pPam =0, bool bInReadOnly = false); bool Find( const SfxPoolItem& rAttr, bool bValue = true, @@ -209,9 +209,9 @@ public: SwMoveFn fnMove, const SwPaM *pPam, bool bInReadOnly, bool bMoveFirst ); - bool DoSearch( const com::sun::star::util::SearchOptions& rSearchOpt, utl::TextSearch& rSTxt, + bool DoSearch( const com::sun::star::util::SearchOptions& rSearchOpt, utl::TextSearch& rSText, SwMoveFn fnMove, bool bSrchForward, bool bRegSearch, bool bChkEmptyPara, bool bChkParaEnd, - sal_Int32 &nStart, sal_Int32 &nEnd, sal_Int32 nTxtLen, SwNode* pNode, SwPaM* pPam); + sal_Int32 &nStart, sal_Int32 &nEnd, sal_Int32 nTextLen, SwNode* pNode, SwPaM* pPam); inline bool IsInFrontOfLabel() const { return m_bIsInFrontOfLabel; } inline void _SetInFrontOfLabel( bool bNew ) { m_bIsInFrontOfLabel = bNew; } @@ -271,9 +271,9 @@ public: } /// @return current ContentNode at Point/Mark - SwCntntNode* GetCntntNode( bool bPoint = true ) const + SwContentNode* GetContentNode( bool bPoint = true ) const { - return GetNode(bPoint).GetCntntNode(); + return GetNode(bPoint).GetContentNode(); } /** @@ -306,7 +306,7 @@ public: DECL_FIXEDMEMPOOL_NEWDEL(SwPaM); - OUString GetTxt() const; + OUString GetText() const; void InvalidatePaM(); SwPaM* GetNext() { return GetNextInRing(); } diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index 6fbe6c99415d..d0a11094c25a 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -40,35 +40,35 @@ #include <editeng/paravertalignitem.hxx> #include <editeng/pgrditem.hxx> -class SwCharFmt; +class SwCharFormat; class IntlWrapper; #define DROP_WHOLEWORD ((sal_uInt16)0x0001) -/** If SwFmtDrop is a Client, it is the CharFmt that describes the font for the - DropCaps. If it is not a Client, formatting uses the CharFmt of the paragraph. - If the CharFmt is modified, this change is propagated to the paragraphs - via the Modify of SwFmtDrop. */ -class SW_DLLPUBLIC SwFmtDrop: public SfxPoolItem, public SwClient +/** If SwFormatDrop is a Client, it is the CharFormat that describes the font for the + DropCaps. If it is not a Client, formatting uses the CharFormat of the paragraph. + If the CharFormat is modified, this change is propagated to the paragraphs + via the Modify of SwFormatDrop. */ +class SW_DLLPUBLIC SwFormatDrop: public SfxPoolItem, public SwClient { SwModify* pDefinedIn; /**< Modify-Object, that contains DropCaps. - Can only be TxtFmtCollection/TxtNode. */ + Can only be TextFormatCollection/TextNode. */ sal_uInt16 nDistance; ///< Distance to beginning of text. - sal_uInt16 nReadFmt; ///< For Sw3-Reader: CharFormat-Id (load Pool!). + sal_uInt16 nReadFormat; ///< For Sw3-Reader: CharFormat-Id (load Pool!). sal_uInt8 nLines; ///< Line count. sal_uInt8 nChars; ///< Character count. bool bWholeWord; ///< First word with initials. public: TYPEINFO_OVERRIDE(); ///< Already in base class SwClient. - SwFmtDrop(); - virtual ~SwFmtDrop(); + SwFormatDrop(); + virtual ~SwFormatDrop(); // @@@ public copy ctor, but no copy assignment? - SwFmtDrop( const SwFmtDrop & ); + SwFormatDrop( const SwFormatDrop & ); private: // @@@ public copy ctor, but no copy assignment? - SwFmtDrop & operator= (const SwFmtDrop &) SAL_DELETED_FUNCTION; + SwFormatDrop & operator= (const SwFormatDrop &) SAL_DELETED_FUNCTION; protected: virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; @@ -98,9 +98,9 @@ public: inline sal_uInt16 GetDistance() const { return nDistance; } inline sal_uInt16 &GetDistance() { return nDistance; } - inline const SwCharFmt *GetCharFmt() const { return static_cast<const SwCharFmt*>(GetRegisteredIn()); } - inline SwCharFmt *GetCharFmt() { return static_cast<SwCharFmt*>(GetRegisteredIn()); } - void SetCharFmt( SwCharFmt *pNew ); + inline const SwCharFormat *GetCharFormat() const { return static_cast<const SwCharFormat*>(GetRegisteredIn()); } + inline SwCharFormat *GetCharFormat() { return static_cast<SwCharFormat*>(GetRegisteredIn()); } + void SetCharFormat( SwCharFormat *pNew ); /// Get information from Client. virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE; @@ -207,8 +207,8 @@ inline const SvxLineSpacingItem &SwAttrSet::GetLineSpacing(bool bInP) const { return static_cast<const SvxLineSpacingItem&>(Get( RES_PARATR_LINESPACING,bInP)); } inline const SvxAdjustItem &SwAttrSet::GetAdjust(bool bInP) const { return static_cast<const SvxAdjustItem&>(Get( RES_PARATR_ADJUST,bInP)); } -inline const SvxFmtSplitItem &SwAttrSet::GetSplit(bool bInP) const - { return static_cast<const SvxFmtSplitItem&>(Get( RES_PARATR_SPLIT,bInP)); } +inline const SvxFormatSplitItem &SwAttrSet::GetSplit(bool bInP) const + { return static_cast<const SvxFormatSplitItem&>(Get( RES_PARATR_SPLIT,bInP)); } inline const SwRegisterItem &SwAttrSet::GetRegister(bool bInP) const { return static_cast<const SwRegisterItem&>(Get( RES_PARATR_REGISTER,bInP)); } inline const SvxWidowsItem &SwAttrSet::GetWidows(bool bInP) const @@ -219,8 +219,8 @@ inline const SvxTabStopItem &SwAttrSet::GetTabStops(bool bInP) const { return static_cast<const SvxTabStopItem&>(Get( RES_PARATR_TABSTOP,bInP)); } inline const SvxHyphenZoneItem &SwAttrSet::GetHyphenZone(bool bInP) const { return static_cast<const SvxHyphenZoneItem&>(Get(RES_PARATR_HYPHENZONE,bInP)); } -inline const SwFmtDrop &SwAttrSet::GetDrop(bool bInP) const - { return static_cast<const SwFmtDrop&>(Get(RES_PARATR_DROP,bInP)); } +inline const SwFormatDrop &SwAttrSet::GetDrop(bool bInP) const + { return static_cast<const SwFormatDrop&>(Get(RES_PARATR_DROP,bInP)); } inline const SwNumRuleItem &SwAttrSet::GetNumRule(bool bInP) const { return static_cast<const SwNumRuleItem&>(Get(RES_PARATR_NUMRULE,bInP)); } inline const SvxScriptSpaceItem& SwAttrSet::GetScriptSpace(bool bInP) const @@ -236,38 +236,38 @@ inline const SvxParaGridItem &SwAttrSet::GetParaGrid(bool bInP) const inline const SwParaConnectBorderItem &SwAttrSet::GetParaConnectBorder(bool bInP) const { return static_cast<const SwParaConnectBorderItem&>(Get( RES_PARATR_CONNECT_BORDER, bInP )); } -// Implementation of paragraph-attributes methods of SwFmt -inline const SvxLineSpacingItem &SwFmt::GetLineSpacing(bool bInP) const +// Implementation of paragraph-attributes methods of SwFormat +inline const SvxLineSpacingItem &SwFormat::GetLineSpacing(bool bInP) const { return m_aSet.GetLineSpacing(bInP); } -inline const SvxAdjustItem &SwFmt::GetAdjust(bool bInP) const +inline const SvxAdjustItem &SwFormat::GetAdjust(bool bInP) const { return m_aSet.GetAdjust(bInP); } -inline const SvxFmtSplitItem &SwFmt::GetSplit(bool bInP) const +inline const SvxFormatSplitItem &SwFormat::GetSplit(bool bInP) const { return m_aSet.GetSplit(bInP); } -inline const SwRegisterItem &SwFmt::GetRegister(bool bInP) const +inline const SwRegisterItem &SwFormat::GetRegister(bool bInP) const { return m_aSet.GetRegister(bInP); } -inline const SvxWidowsItem &SwFmt::GetWidows(bool bInP) const +inline const SvxWidowsItem &SwFormat::GetWidows(bool bInP) const { return m_aSet.GetWidows(bInP); } -inline const SvxOrphansItem &SwFmt::GetOrphans(bool bInP) const +inline const SvxOrphansItem &SwFormat::GetOrphans(bool bInP) const { return m_aSet.GetOrphans(bInP); } -inline const SvxTabStopItem &SwFmt::GetTabStops(bool bInP) const +inline const SvxTabStopItem &SwFormat::GetTabStops(bool bInP) const { return m_aSet.GetTabStops(bInP); } -inline const SvxHyphenZoneItem &SwFmt::GetHyphenZone(bool bInP) const +inline const SvxHyphenZoneItem &SwFormat::GetHyphenZone(bool bInP) const { return m_aSet.GetHyphenZone(bInP); } -inline const SwFmtDrop &SwFmt::GetDrop(bool bInP) const +inline const SwFormatDrop &SwFormat::GetDrop(bool bInP) const { return m_aSet.GetDrop(bInP); } -inline const SwNumRuleItem &SwFmt::GetNumRule(bool bInP) const +inline const SwNumRuleItem &SwFormat::GetNumRule(bool bInP) const { return m_aSet.GetNumRule(bInP); } -inline const SvxScriptSpaceItem& SwFmt::GetScriptSpace(bool bInP) const +inline const SvxScriptSpaceItem& SwFormat::GetScriptSpace(bool bInP) const { return m_aSet.GetScriptSpace(bInP) ; } -inline const SvxHangingPunctuationItem &SwFmt::GetHangingPunctuation(bool bInP) const +inline const SvxHangingPunctuationItem &SwFormat::GetHangingPunctuation(bool bInP) const { return m_aSet.GetHangingPunctuation(bInP) ; } -inline const SvxForbiddenRuleItem &SwFmt::GetForbiddenRule(bool bInP) const +inline const SvxForbiddenRuleItem &SwFormat::GetForbiddenRule(bool bInP) const { return static_cast<const SvxForbiddenRuleItem&>(m_aSet.Get(RES_PARATR_FORBIDDEN_RULES, bInP)); } -inline const SvxParaVertAlignItem &SwFmt::GetParaVertAlign(bool bInP) const +inline const SvxParaVertAlignItem &SwFormat::GetParaVertAlign(bool bInP) const { return static_cast<const SvxParaVertAlignItem&>(m_aSet.Get( RES_PARATR_VERTALIGN, bInP )); } -inline const SvxParaGridItem &SwFmt::GetParaGrid(bool bInP) const +inline const SvxParaGridItem &SwFormat::GetParaGrid(bool bInP) const { return static_cast<const SvxParaGridItem&>(m_aSet.Get( RES_PARATR_SNAPTOGRID, bInP )); } -inline const SwParaConnectBorderItem &SwFmt::GetParaConnectBorder(bool bInP) const +inline const SwParaConnectBorderItem &SwFormat::GetParaConnectBorder(bool bInP) const { return static_cast<const SwParaConnectBorderItem&>(m_aSet.Get( RES_PARATR_CONNECT_BORDER, bInP )); } #endif diff --git a/sw/inc/poolfmt.awk b/sw/inc/poolfmt.awk index 3c196fc8fe2d..58f758c94640 100644 --- a/sw/inc/poolfmt.awk +++ b/sw/inc/poolfmt.awk @@ -40,7 +40,7 @@ function Main() { print print "void main( int , char *[] ) {" sStr = "#define" - print " int nSize = (sizeof(ppPoolIds) / sizeof(PoolFmtIds)) - 1;" + print " int nSize = (sizeof(ppPoolIds) / sizeof(PoolFormatIds)) - 1;" print " for( int n = 0; n < nSize; n++ )" print " printf( \"" sStr " %s\\t%8d\\n\", ppPoolIds[ n ].pStr, ppPoolIds[ n ].nId );" print "}" @@ -48,8 +48,8 @@ function Main() { function TableHead() { print - print "struct PoolFmtIds { int nId; const char* pStr; };" - print "static PoolFmtIds ppPoolIds[] = {" + print "struct PoolFormatIds { int nId; const char* pStr; };" + print "static PoolFormatIds ppPoolIds[] = {" } function TableTail() { diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx index df029593b836..b80e0ed8e6a2 100644 --- a/sw/inc/poolfmt.hxx +++ b/sw/inc/poolfmt.hxx @@ -82,7 +82,7 @@ const sal_uInt16 POOLGRP_NUMRULE = (3 << 11) + POOLGRP_NOCOLLID; const sal_uInt16 POOL_IDUSER_FMT = USHRT_MAX & ~(COLL_GET_RANGE_BITS + POOLGRP_NOCOLLID); -inline bool IsPoolUserFmt( sal_uInt16 nId ) +inline bool IsPoolUserFormat( sal_uInt16 nId ) { return POOL_IDUSER_FMT == (nId & ~(COLL_GET_RANGE_BITS + POOLGRP_NOCOLLID)); } diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx index e8fa575ae36c..47e8c3fb9721 100644 --- a/sw/inc/postithelper.hxx +++ b/sw/inc/postithelper.hxx @@ -27,7 +27,7 @@ #include <SidebarWindowsTypes.hxx> class SfxBroadcaster; -class SwTxtFld; +class SwTextField; class SwRootFrm; class SwPostItMgr; class SwEditWin; @@ -112,7 +112,7 @@ public: virtual SwPosition GetAnchorPosition() const = 0; virtual bool UseElement() = 0; - virtual const SwFmtFld& GetFmtFld() const = 0; + virtual const SwFormatField& GetFormatField() const = 0; virtual const SfxBroadcaster* GetBroadCaster() const = 0; virtual VclPtr<sw::sidebarwindows::SwSidebarWin> GetSidebarWindow( SwEditWin& rEditWin, WinBits nBits, @@ -124,11 +124,11 @@ class SwAnnotationItem: public SwSidebarItem { public: SwAnnotationItem( - SwFmtFld& rFmtFld, + SwFormatField& rFormatField, const bool aShow, const bool aFocus) : SwSidebarItem( aShow, aFocus ) - , mrFmtFld( rFmtFld ) + , mrFormatField( rFormatField ) { } @@ -138,13 +138,13 @@ public: virtual SwPosition GetAnchorPosition() const SAL_OVERRIDE; virtual bool UseElement() SAL_OVERRIDE; - virtual const SwFmtFld& GetFmtFld() const SAL_OVERRIDE + virtual const SwFormatField& GetFormatField() const SAL_OVERRIDE { - return mrFmtFld; + return mrFormatField; } virtual const SfxBroadcaster* GetBroadCaster() const SAL_OVERRIDE { - return dynamic_cast<const SfxBroadcaster *> (&mrFmtFld); + return dynamic_cast<const SfxBroadcaster *> (&mrFormatField); } virtual VclPtr<sw::sidebarwindows::SwSidebarWin> GetSidebarWindow( SwEditWin& rEditWin, @@ -153,7 +153,7 @@ public: SwPostItBits aBits ) SAL_OVERRIDE; private: - SwFmtFld& mrFmtFld; + SwFormatField& mrFormatField; }; #endif // INCLUDED_SW_INC_POSTITHELPER_HXX diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx index 6c5e6f3efae7..5f7b7cb0a9c0 100644 --- a/sw/inc/printdata.hxx +++ b/sw/inc/printdata.hxx @@ -33,7 +33,7 @@ class SwDoc; class SwDocShell; -class _SetGetExpFlds; +class _SetGetExpFields; class SwViewOption; class OutputDevice; class SwViewOptionAdjust_Impl; @@ -233,8 +233,8 @@ class SwRenderData public: // PostIt relevant data - /// an array of "_SetGetExpFld *" sorted by page and line numbers - ::boost::scoped_ptr<_SetGetExpFlds> m_pPostItFields; + /// an array of "_SetGetExpField *" sorted by page and line numbers + ::boost::scoped_ptr<_SetGetExpFields> m_pPostItFields; /// this contains a SwDoc with the post-it content ::boost::scoped_ptr<SwViewShell> m_pPostItShell; diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx index 533c027628a2..6fd7ad6f2ed9 100644 --- a/sw/inc/redline.hxx +++ b/sw/inc/redline.hxx @@ -49,15 +49,15 @@ public: virtual bool operator == ( const SwRedlineExtraData& ) const; }; -class SwRedlineExtraData_FmtColl : public SwRedlineExtraData +class SwRedlineExtraData_FormatColl : public SwRedlineExtraData { - OUString sFmtNm; + OUString sFormatNm; SfxItemSet* pSet; sal_uInt16 nPoolId; public: - SwRedlineExtraData_FmtColl( const OUString& rColl, sal_uInt16 nPoolFmtId, + SwRedlineExtraData_FormatColl( const OUString& rColl, sal_uInt16 nPoolFormatId, const SfxItemSet* pSet = 0 ); - virtual ~SwRedlineExtraData_FmtColl(); + virtual ~SwRedlineExtraData_FormatColl(); virtual SwRedlineExtraData* CreateNew() const SAL_OVERRIDE; virtual void Reject( SwPaM& rPam ) const SAL_OVERRIDE; virtual bool operator == ( const SwRedlineExtraData& ) const SAL_OVERRIDE; @@ -149,7 +149,7 @@ public: void SetComment( const OUString& rS ) { sComment = rS; } void SetTimeStamp( const DateTime& rDT ) { aStamp = rDT; } - void SetAutoFmtFlag() + void SetAutoFormatFlag() { eType = (RedlineType_t)(eType | nsRedlineType_t::REDLINE_FORM_AUTOFMT); } bool CanCombine( const SwRedlineData& rCmp ) const { @@ -182,7 +182,7 @@ public: class SW_DLLPUBLIC SwRangeRedline : public SwPaM { SwRedlineData* pRedlineData; - SwNodeIndex* pCntntSect; + SwNodeIndex* pContentSect; bool bDelLastPara : 1; bool bIsLastParaDelete : 1; bool bIsVisible : 1; @@ -199,13 +199,13 @@ public: // For sw3io: pData is taken over! SwRangeRedline(SwRedlineData* pData, const SwPosition& rPos, bool bVsbl, bool bDelLP, bool bIsPD) : - SwPaM( rPos ), pRedlineData( pData ), pCntntSect( 0 ), + SwPaM( rPos ), pRedlineData( pData ), pContentSect( 0 ), bDelLastPara( bDelLP ), bIsLastParaDelete( bIsPD ), bIsVisible( bVsbl ) {} SwRangeRedline( const SwRangeRedline& ); virtual ~SwRangeRedline(); - SwNodeIndex* GetContentIdx() const { return pCntntSect; } + SwNodeIndex* GetContentIdx() const { return pContentSect; } // For Undo. void SetContentIdx( const SwNodeIndex* ); @@ -230,7 +230,7 @@ public: { return *pRedlineData == rCmp; } bool operator!=( const SwRedlineData& rCmp ) const { return *pRedlineData != rCmp; } - void SetAutoFmtFlag() { pRedlineData->SetAutoFmtFlag(); } + void SetAutoFormatFlag() { pRedlineData->SetAutoFormatFlag(); } sal_uInt16 GetStackCount() const; sal_uInt16 GetAuthor( sal_uInt16 nPos = 0) const; diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx index 058d57d815ca..a6ececb2cd96 100644 --- a/sw/inc/reffld.hxx +++ b/sw/inc/reffld.hxx @@ -23,11 +23,11 @@ class SfxPoolItem; class SwDoc; -class SwTxtNode; -class SwTxtFld; +class SwTextNode; +class SwTextField; -bool IsFrameBehind( const SwTxtNode& rMyNd, sal_Int32 nMySttPos, - const SwTxtNode& rBehindNd, sal_Int32 nSttPos ); +bool IsFrameBehind( const SwTextNode& rMyNd, sal_Int32 nMySttPos, + const SwTextNode& rBehindNd, sal_Int32 nSttPos ); enum REFERENCESUBTYPE { @@ -74,7 +74,7 @@ public: void MergeWithOtherDoc( SwDoc& rDestDoc ); - static SwTxtNode* FindAnchor( SwDoc* pDoc, const OUString& rRefMark, + static SwTextNode* FindAnchor( SwDoc* pDoc, const OUString& rRefMark, sal_uInt16 nSubType, sal_uInt16 nSeqNo, sal_Int32* pStt, sal_Int32* pEnd = 0 ); }; @@ -83,7 +83,7 @@ class SW_DLLPUBLIC SwGetRefField : public SwField { private: OUString sSetRefName; - OUString sTxt; + OUString sText; sal_uInt16 nSubType; sal_uInt16 nSeqNo; @@ -91,13 +91,13 @@ private: virtual SwField* Copy() const SAL_OVERRIDE; // #i81002# - static OUString MakeRefNumStr( const SwTxtNode& rTxtNodeOfField, - const SwTxtNode& rTxtNodeOfReferencedItem, + static OUString MakeRefNumStr( const SwTextNode& rTextNodeOfField, + const SwTextNode& rTextNodeOfReferencedItem, const sal_uInt32 nRefNumFormat ); public: SwGetRefField( SwGetRefFieldType*, const OUString& rSetRef, - sal_uInt16 nSubType, sal_uInt16 nSeqNo, sal_uLong nFmt ); + sal_uInt16 nSubType, sal_uInt16 nSeqNo, sal_uLong nFormat ); virtual ~SwGetRefField(); @@ -106,15 +106,15 @@ public: OUString GetSetRefName() const { return sSetRefName; } // #i81002# - /** The <SwTxtFld> instance, which represents the text attribute for the + /** The <SwTextField> instance, which represents the text attribute for the <SwGetRefField> instance, has to be passed to the method. - This <SwTxtFld> instance is needed for the reference format type REF_UPDOWN + This <SwTextField> instance is needed for the reference format type REF_UPDOWN and REF_NUMBER. Note: This instance may be NULL (field in Undo/Redo). This will cause no update for these reference format types. */ - void UpdateField( const SwTxtFld* pFldTxtAttr ); + void UpdateField( const SwTextField* pFieldTextAttr ); - void SetExpand( const OUString& rStr ) { sTxt = rStr; } + void SetExpand( const OUString& rStr ) { sText = rStr; } /// Get/set sub type. virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; @@ -123,9 +123,9 @@ public: // --> #i81002# bool IsRefToHeadingCrossRefBookmark() const; bool IsRefToNumItemCrossRefBookmark() const; - const SwTxtNode* GetReferencedTxtNode() const; + const SwTextNode* GetReferencedTextNode() const; // #i85090# - OUString GetExpandedTxtOfReferencedTxtNode() const; + OUString GetExpandedTextOfReferencedTextNode() const; /// Get/set SequenceNo (of interest only for REF_SEQUENCEFLD). sal_uInt16 GetSeqNo() const { return nSeqNo; } diff --git a/sw/inc/rubylist.hxx b/sw/inc/rubylist.hxx index 5dfd0bd0a6f7..38572b2e71da 100644 --- a/sw/inc/rubylist.hxx +++ b/sw/inc/rubylist.hxx @@ -26,7 +26,7 @@ class SwRubyListEntry { OUString m_sText; - SwFmtRuby m_aRubyAttr; + SwFormatRuby m_aRubyAttr; public: SwRubyListEntry() : m_aRubyAttr( OUString() ) {} ~SwRubyListEntry(); @@ -34,9 +34,9 @@ public: OUString GetText() const { return m_sText; } void SetText( const OUString& rStr ) { m_sText = rStr; } - const SwFmtRuby& GetRubyAttr() const { return m_aRubyAttr; } - SwFmtRuby& GetRubyAttr() { return m_aRubyAttr; } - void SetRubyAttr( const SwFmtRuby& rAttr ) { m_aRubyAttr = rAttr; } + const SwFormatRuby& GetRubyAttr() const { return m_aRubyAttr; } + SwFormatRuby& GetRubyAttr() { return m_aRubyAttr; } + void SetRubyAttr( const SwFormatRuby& rAttr ) { m_aRubyAttr = rAttr; } }; class SwRubyList : public boost::ptr_vector<SwRubyListEntry> {}; diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index 6dc7d17a4d88..a3d34be61988 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star { namespace text { class XTextSection; } } } } -class SwSectionFmt; +class SwSectionFormat; class SwDoc; class SwSection; class SwSectionNode; @@ -162,7 +162,7 @@ public: TYPEINFO_OVERRIDE(); // rtti SwSection(SectionType const eType, OUString const& rName, - SwSectionFmt & rFormat); + SwSectionFormat & rFormat); virtual ~SwSection(); bool DataEquals(SwSectionData const& rCmp) const; @@ -174,8 +174,8 @@ public: SectionType GetType() const { return m_Data.GetType(); } void SetType(SectionType const eType) { return m_Data.SetType(eType); } - inline SwSectionFmt* GetFmt(); - inline SwSectionFmt const * GetFmt() const; + inline SwSectionFormat* GetFormat(); + inline SwSectionFormat const * GetFormat() const; // Set hidden/protected -> update the whole tree! // (Attributes/flags are set/get.) @@ -256,34 +256,34 @@ public: class SwSectionFrmMoveAndDeleteHint : public SfxSimpleHint { public: - SwSectionFrmMoveAndDeleteHint( const bool bSaveCntnt ) + SwSectionFrmMoveAndDeleteHint( const bool bSaveContent ) : SfxSimpleHint( SFX_HINT_DYING ) - , mbSaveCntnt( bSaveCntnt ) + , mbSaveContent( bSaveContent ) {} virtual ~SwSectionFrmMoveAndDeleteHint() {} - bool IsSaveCntnt() const + bool IsSaveContent() const { - return mbSaveCntnt; + return mbSaveContent; } private: - const bool mbSaveCntnt; + const bool mbSaveContent; }; enum SectionSort { SORTSECT_NOT, SORTSECT_NAME, SORTSECT_POS }; -class SW_DLLPUBLIC SwSectionFmt - : public SwFrmFmt +class SW_DLLPUBLIC SwSectionFormat + : public SwFrameFormat , public ::sfx2::Metadatable { friend class SwDoc; - /** Why does this exist in addition to the m_wXObject in SwFrmFmt? + /** Why does this exist in addition to the m_wXObject in SwFrameFormat? in case of an index, both a SwXDocumentIndex and a SwXTextSection - register at this SwSectionFmt, so we need to have two refs. + register at this SwSectionFormat, so we need to have two refs. */ ::com::sun::star::uno::WeakReference< ::com::sun::star::text::XTextSection> m_wXTextSection; @@ -291,12 +291,12 @@ class SW_DLLPUBLIC SwSectionFmt SAL_DLLPRIVATE void UpdateParent(); // Parent has been changed. protected: - SwSectionFmt( SwFrmFmt* pDrvdFrm, SwDoc *pDoc ); + SwSectionFormat( SwFrameFormat* pDrvdFrm, SwDoc *pDoc ); virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); // Already contained in base class client. - virtual ~SwSectionFmt(); + virtual ~SwSectionFormat(); // Deletes all Frms in aDepend (Frms are recognized via PTR_CAST). virtual void DelFrms() SAL_OVERRIDE; @@ -308,7 +308,7 @@ public: virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE; SwSection* GetSection() const; - inline SwSectionFmt* GetParent() const; + inline SwSectionFormat* GetParent() const; inline SwSection* GetParentSection() const; // All sections that are derived from this one: @@ -323,7 +323,7 @@ public: SwSectionNode* GetSectionNode(bool const bEvenIfInUndo = false); const SwSectionNode* GetSectionNode(bool const bEvenIfInUndo = false) const - { return const_cast<SwSectionFmt *>(this) + { return const_cast<SwSectionFormat *>(this) ->GetSectionNode(bEvenIfInUndo); } // Is section a valid one for global document? @@ -347,36 +347,36 @@ public: }; -SwSectionFmt* SwSection::GetFmt() +SwSectionFormat* SwSection::GetFormat() { - return static_cast<SwSectionFmt*>(GetRegisteredIn()); + return static_cast<SwSectionFormat*>(GetRegisteredIn()); } -SwSectionFmt const * SwSection::GetFmt() const +SwSectionFormat const * SwSection::GetFormat() const { - return static_cast<SwSectionFmt const *>(GetRegisteredIn()); + return static_cast<SwSectionFormat const *>(GetRegisteredIn()); } inline SwSection* SwSection::GetParent() const { - SwSectionFmt const * pFmt = GetFmt(); + SwSectionFormat const * pFormat = GetFormat(); SwSection* pRet = 0; - if( pFmt ) - pRet = pFmt->GetParentSection(); + if( pFormat ) + pRet = pFormat->GetParentSection(); return pRet; } -inline SwSectionFmt* SwSectionFmt::GetParent() const +inline SwSectionFormat* SwSectionFormat::GetParent() const { - SwSectionFmt* pRet = 0; + SwSectionFormat* pRet = 0; if( GetRegisteredIn() ) - pRet = const_cast<SwSectionFmt*>(PTR_CAST( SwSectionFmt, GetRegisteredIn() )); + pRet = const_cast<SwSectionFormat*>(PTR_CAST( SwSectionFormat, GetRegisteredIn() )); return pRet; } -inline SwSection* SwSectionFmt::GetParentSection() const +inline SwSection* SwSectionFormat::GetParentSection() const { - SwSectionFmt* pParent = GetParent(); + SwSectionFormat* pParent = GetParent(); SwSection* pRet = 0; if( pParent ) { diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index b7e36ddb70a1..da2622d60241 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -47,7 +47,7 @@ class SfxMedium; class SvStream; class SvxFontItem; class SvxMacroTableDtor; -class SwCntntNode; +class SwContentNode; class SwCrsrShell; class SwDoc; class SwPaM; @@ -106,42 +106,42 @@ class SwgReaderOption SwAsciiOptions aASCIIOpts; union { - bool bFmtsOnly; + bool bFormatsOnly; struct { - bool bFrmFmts: 1; + bool bFrameFormats: 1; bool bPageDescs: 1; - bool bTxtFmts: 1; + bool bTextFormats: 1; bool bNumRules: 1; bool bMerge:1; - } Fmts; + } Formats; } What; public: - void ResetAllFmtsOnly() { What.bFmtsOnly = false; } - bool IsFmtsOnly() const { return What.bFmtsOnly; } + void ResetAllFormatsOnly() { What.bFormatsOnly = false; } + bool IsFormatsOnly() const { return What.bFormatsOnly; } - bool IsFrmFmts() const { return What.Fmts.bFrmFmts; } - void SetFrmFmts( const bool bNew) { What.Fmts.bFrmFmts = bNew; } + bool IsFrameFormats() const { return What.Formats.bFrameFormats; } + void SetFrameFormats( const bool bNew) { What.Formats.bFrameFormats = bNew; } - bool IsPageDescs() const { return What.Fmts.bPageDescs; } - void SetPageDescs( const bool bNew) { What.Fmts.bPageDescs = bNew; } + bool IsPageDescs() const { return What.Formats.bPageDescs; } + void SetPageDescs( const bool bNew) { What.Formats.bPageDescs = bNew; } - bool IsTxtFmts() const { return What.Fmts.bTxtFmts; } - void SetTxtFmts( const bool bNew) { What.Fmts.bTxtFmts = bNew; } + bool IsTextFormats() const { return What.Formats.bTextFormats; } + void SetTextFormats( const bool bNew) { What.Formats.bTextFormats = bNew; } - bool IsNumRules() const { return What.Fmts.bNumRules; } - void SetNumRules( const bool bNew) { What.Fmts.bNumRules = bNew; } + bool IsNumRules() const { return What.Formats.bNumRules; } + void SetNumRules( const bool bNew) { What.Formats.bNumRules = bNew; } - bool IsMerge() const { return What.Fmts.bMerge; } - void SetMerge( const bool bNew ) { What.Fmts.bMerge = bNew; } + bool IsMerge() const { return What.Formats.bMerge; } + void SetMerge( const bool bNew ) { What.Formats.bMerge = bNew; } const SwAsciiOptions& GetASCIIOpts() const { return aASCIIOpts; } void SetASCIIOpts( const SwAsciiOptions& rOpts ) { aASCIIOpts = rOpts; } void ResetASCIIOpts() { aASCIIOpts.Reset(); } SwgReaderOption() - { ResetAllFmtsOnly(); aASCIIOpts.Reset(); } + { ResetAllFormatsOnly(); aASCIIOpts.Reset(); } }; class SW_DLLPUBLIC SwReader: public SwDocFac @@ -225,11 +225,11 @@ public: virtual void SetFltName( const OUString& rFltNm ); // Adapt item-set of a Frm-Format to the old format. - static void ResetFrmFmtAttrs( SfxItemSet &rFrmSet ); + static void ResetFrameFormatAttrs( SfxItemSet &rFrmSet ); // Adapt Frame-/Graphics-/OLE- styles to the old format // (without borders etc.). - static void ResetFrmFmts( SwDoc& rDoc ); + static void ResetFrameFormats( SwDoc& rDoc ); // Load filter template, set it and release it again. SwDoc* GetTemplateDoc(); @@ -339,8 +339,8 @@ public: OUString GetFileName() const; // Filename of pImp. bool IsReadOnly() const; // ReadOnly-flag of pImp. - bool GetMacroTable( sal_uInt16 nIdx, SvxMacroTableDtor& rMacroTbl ); - bool SetMacroTable( sal_uInt16 nIdx, const SvxMacroTableDtor& rMacroTbl ); + bool GetMacroTable( sal_uInt16 nIdx, SvxMacroTableDtor& rMacroTable ); + bool SetMacroTable( sal_uInt16 nIdx, const SvxMacroTableDtor& rMacroTable ); bool StartPutMuchBlockEntries(); void EndPutMuchBlockEntries(); @@ -381,7 +381,7 @@ protected: void ResetWriter(); bool CopyNextPam( SwPaM ** ); - void PutNumFmtFontsInAttrPool(); + void PutNumFormatFontsInAttrPool(); void PutEditEngFontsInAttrPool( bool bIncl_CJK_CTL = true ); virtual sal_uLong WriteStream() = 0; @@ -434,9 +434,9 @@ public: sal_Int32 FindPos_Bkmk( const SwPosition& rPos ) const; // Build a bookmark table, which is sort by the node position. The // OtherPos of the bookmarks also inserted. - void CreateBookmarkTbl(); + void CreateBookmarkTable(); // Search alle Bookmarks in the range and return it in the Array. - bool GetBookmarks( const SwCntntNode& rNd, + bool GetBookmarks( const SwContentNode& rNd, sal_Int32 nStt, sal_Int32 nEnd, std::vector< const ::sw::mark::IMark* >& rArr ); diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx index 60ab4a16cb3a..ca89be7dd7c6 100644 --- a/sw/inc/shellres.hxx +++ b/sw/inc/shellres.hxx @@ -42,10 +42,10 @@ struct SW_DLLPUBLIC ShellResource : public Resource OUString aCalc_Error; // For GetRefField - up/down. - OUString aGetRefFld_Up; - OUString aGetRefFld_Down; + OUString aGetRefField_Up; + OUString aGetRefField_Down; // For GetRefField - referenced item not found. - OUString aGetRefFld_RefItemNotFound; + OUString aGetRefField_RefItemNotFound; // For dynamic menu - string "all". OUString aStrAllPageHeadFoot; // For some list boxes - string "none" @@ -71,7 +71,7 @@ struct SW_DLLPUBLIC ShellResource : public Resource std::vector<OUString> aDocInfoLst; // The autoFormat-Redline comments. - inline const std::vector<OUString>& GetAutoFmtNameLst() const; + inline const std::vector<OUString>& GetAutoFormatNameLst() const; enum PageNameMode { @@ -88,18 +88,18 @@ struct SW_DLLPUBLIC ShellResource : public Resource ~ShellResource(); private: - void _GetAutoFmtNameLst() const; - mutable std::vector<OUString> *pAutoFmtNameLst; + void _GetAutoFormatNameLst() const; + mutable std::vector<OUString> *pAutoFormatNameLst; OUString sPageDescFirstName; OUString sPageDescFollowName; OUString sPageDescName; }; -inline const std::vector<OUString>& ShellResource::GetAutoFmtNameLst() const +inline const std::vector<OUString>& ShellResource::GetAutoFormatNameLst() const { - if( !pAutoFmtNameLst ) - _GetAutoFmtNameLst(); - return *pAutoFmtNameLst; + if( !pAutoFormatNameLst ) + _GetAutoFormatNameLst(); + return *pAutoFormatNameLst; } #endif // INCLUDED_SW_INC_SHELLRES_HXX diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx index 8a09c261b437..cce7388ff0e6 100644 --- a/sw/inc/splargs.hxx +++ b/sw/inc/splargs.hxx @@ -28,30 +28,30 @@ #include <com/sun/star/linguistic2/XSpellChecker1.hpp> #include <com/sun/star/linguistic2/XHyphenatedWord.hpp> -class SwTxtNode; +class SwTextNode; class SwIndex; namespace vcl { class Font; } struct SwArgsBase // used for text conversion (Hangul/Hanja, ...) { - SwTxtNode *pStartNode; + SwTextNode *pStartNode; SwIndex *pStartIdx; - SwTxtNode *pEndNode; + SwTextNode *pEndNode; SwIndex *pEndIdx; SwArgsBase( - SwTxtNode* pStart, SwIndex& rStart, - SwTxtNode* pEnd, SwIndex& rEnd ) + SwTextNode* pStart, SwIndex& rStart, + SwTextNode* pEnd, SwIndex& rEnd ) : pStartNode( pStart ), pStartIdx( &rStart ), pEndNode( pEnd ), pEndIdx( &rEnd ) {} - void SetStart(SwTxtNode* pStart, SwIndex& rStart ) + void SetStart(SwTextNode* pStart, SwIndex& rStart ) { pStartNode = pStart; pStartIdx = &rStart ; } - void SetEnd( SwTxtNode* pEnd, SwIndex& rEnd ) + void SetEnd( SwTextNode* pEnd, SwIndex& rEnd ) { pEndNode = pEnd; pEndIdx = &rEnd ; } @@ -71,8 +71,8 @@ struct SwConversionArgs : SwArgsBase bool bAllowImplicitChangesForNotConvertibleText; SwConversionArgs( LanguageType nLang, - SwTxtNode* pStart, SwIndex& rStart, - SwTxtNode* pEnd, SwIndex& rEnd ) + SwTextNode* pStart, SwIndex& rStart, + SwTextNode* pEnd, SwIndex& rEnd ) : SwArgsBase( pStart, rStart, pEnd, rEnd ), nConvSrcLang( nLang ), nConvTextLang( LANGUAGE_NONE ), @@ -94,8 +94,8 @@ struct SwSpellArgs : SwArgsBase SwSpellArgs(::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &rxSplChk, - SwTxtNode* pStart, SwIndex& rStart, - SwTxtNode* pEnd, SwIndex& rEnd, + SwTextNode* pStart, SwIndex& rStart, + SwTextNode* pEnd, SwIndex& rEnd, bool bGrammar ) : SwArgsBase( pStart, rStart, pEnd, rEnd ), xSpeller( rxSplChk ), @@ -105,8 +105,8 @@ struct SwSpellArgs : SwArgsBase // Parameter-class for Hyphenate. // docedt.cxx: SwDoc::Hyphenate() -// txtedt.cxx: SwTxtNode::Hyphenate() -// txthyph.cxx: SwTxtFrm::Hyphenate() +// txtedt.cxx: SwTextNode::Hyphenate() +// txthyph.cxx: SwTextFrm::Hyphenate() class SwInterHyphInfo { diff --git a/sw/inc/sw3convert.hxx b/sw/inc/sw3convert.hxx index d837db2aa776..1c500f06195b 100644 --- a/sw/inc/sw3convert.hxx +++ b/sw/inc/sw3convert.hxx @@ -25,7 +25,7 @@ class SwDoc; SW_DLLPUBLIC void sw3io_ConvertFromOldField( SwDoc& rDoc, sal_uInt16& rWhich, - sal_uInt16& rSubType, sal_uLong &rFmt, + sal_uInt16& rSubType, sal_uLong &rFormat, sal_uInt16 nVersion ); #endif diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index a4fa8d788185..cb5ec2feb3f5 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -47,7 +47,7 @@ class SfxStyleSheetBase; class SwGlossaryHdl; class SwField; -class SwLabFmtPage; +class SwLabFormatPage; class SwLabRec; class SwAsciiOptions; class SwDocShell; @@ -55,7 +55,7 @@ class SvStream; class SwWrtShell; class SfxRequest; class SwView; -class SwTableAutoFmt; +class SwTableAutoFormat; class SwTOXMgr; class SwForm; struct CurTOXType; @@ -101,7 +101,7 @@ public: virtual OUString GetCurrShortName() const = 0; }; -class AbstractFldInputDlg : public VclAbstractTerminatedDialog +class AbstractFieldInputDlg : public VclAbstractTerminatedDialog { public: //from class SalFrame @@ -125,8 +125,8 @@ class AbstractInsTableDlg : public VclAbstractDialog { public: virtual void GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rCol, - SwInsertTableOptions& rInsTblFlags, OUString& rTableAutoFmtName, - SwTableAutoFmt *& prTAFmt ) = 0; + SwInsertTableOptions& rInsTableFlags, OUString& rTableAutoFormatName, + SwTableAutoFormat *& prTAFormat ) = 0; }; class AbstractJavaEditDialog : public VclAbstractDialog @@ -225,8 +225,8 @@ class AbstractSwConvertTableDlg : public VclAbstractDialog { public: virtual void GetValues( sal_Unicode& rDelim, - SwInsertTableOptions& rInsTblFlags, - SwTableAutoFmt const*& prTAFmt ) = 0; + SwInsertTableOptions& rInsTableFlags, + SwTableAutoFormat const*& prTAFormat ) = 0; }; class AbstractSwInsertDBColAutoPilot : public VclAbstractDialog @@ -264,10 +264,10 @@ public: class AbstractSwAutoFormatDlg : public VclAbstractDialog { public: - virtual void FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const = 0; + virtual void FillAutoFormatOfIndex( SwTableAutoFormat*& rToFill ) const = 0; }; -class AbstractSwFldDlg : public SfxAbstractTabDialog +class AbstractSwFieldDlg : public SfxAbstractTabDialog { public: virtual void Start( bool bShow = true ) = 0; //this method from sfxtabdialog @@ -339,7 +339,7 @@ public: virtual AbstractSwBreakDlg * CreateSwBreakDlg(vcl::Window *pParent, SwWrtShell &rSh) = 0; virtual VclAbstractDialog * CreateSwChangeDBDlg(SwView& rVw) = 0; virtual SfxAbstractTabDialog * CreateSwCharDlg(vcl::Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, - sal_uInt8 nDialogMode, const OUString* pFmtStr = 0) = 0; + sal_uInt8 nDialogMode, const OUString* pFormatStr = 0) = 0; virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable) = 0; virtual VclAbstractDialog * CreateSwCaptionDialog ( vcl::Window *pParent, SwView &rV,int nResId) = 0; @@ -369,11 +369,11 @@ public: virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName) = 0; virtual VclAbstractDialog * CreateVclAbstractDialog ( vcl::Window * pParent, SwWrtShell &rSh, int nResId ) = 0; - virtual AbstractSplitTableDialog * CreateSplitTblDialog ( vcl::Window * pParent, SwWrtShell &rSh ) = 0; + virtual AbstractSplitTableDialog * CreateSplitTableDialog ( vcl::Window * pParent, SwWrtShell &rSh ) = 0; virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pShell, - bool bSetAutoFmt = true, - const SwTableAutoFmt* pSelFmt = 0 ) = 0; + bool bSetAutoFormat = true, + const SwTableAutoFormat* pSelFormat = 0 ) = 0; virtual SfxAbstractDialog * CreateSwBorderDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwBorderModes nType, int nResId ) = 0; virtual SfxAbstractDialog * CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) = 0; @@ -381,21 +381,21 @@ public: virtual SfxAbstractTabDialog* CreateSwTableTabDlg(vcl::Window* pParent, SfxItemPool& Pool, const SfxItemSet* pItemSet, SwWrtShell* pSh) = 0; - virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent) = 0; - virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ) = 0; + virtual AbstractSwFieldDlg * CreateSwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent) = 0; + virtual SfxAbstractDialog* CreateSwFieldEditDlg ( SwView& rVw, int nResId ) = 0; virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(vcl::Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess) = 0; virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(vcl::Window *pParent) = 0; - virtual VclAbstractDialog* CreateTblMergeDialog( vcl::Window* pParent, bool& rWithPrev ) = 0; + virtual VclAbstractDialog* CreateTableMergeDialog( vcl::Window* pParent, bool& rWithPrev ) = 0; virtual SfxAbstractTabDialog* CreateFrmTabDialog(const OUString &rDialogType, SfxViewFrame *pFrame, vcl::Window *pParent, const SfxItemSet& rCoreSet, bool bNewFrm = true, - bool bFmt = false, + bool bFormat = false, const OString& sDefPage = OString(), - const OUString* pFmtStr = 0) = 0; + const OUString* pFormatStr = 0) = 0; /// @param nSlot /// Identifies optional Slot by which the creation of the Template (Style) dialog is triggered. /// Currently used, if nRegion == SFX_STYLE_FAMILY_PAGE in order to activate certain dialog pane @@ -409,7 +409,7 @@ public: virtual AbstractGlossaryDlg* CreateGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell) = 0; - virtual AbstractFldInputDlg* CreateFldInputDlg(vcl::Window *pParent, + virtual AbstractFieldInputDlg* CreateFieldInputDlg(vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton = false) = 0; virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg(vcl::Window * pParent, SwWrtShell &rSh, bool bEd = false) = 0; @@ -421,7 +421,7 @@ public: virtual AbstractMailMergeDlg* CreateMailMergeDlg( int nResId, vcl::Window* pParent, SwWrtShell& rSh, const OUString& rSourceName, - const OUString& rTblName, + const OUString& rTableName, sal_Int32 nCommandType, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ) = 0; diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx index 867f269e2d7a..160f858fabc3 100644 --- a/sw/inc/swatrset.hxx +++ b/sw/inc/swatrset.hxx @@ -57,45 +57,45 @@ class SvxCharReliefItem; class SvxCharHiddenItem; // Frame attributes -class SwFmtFillOrder; -class SwFmtFrmSize; +class SwFormatFillOrder; +class SwFormatFrmSize; class SvxPaperBinItem; class SvxLRSpaceItem; class SvxULSpaceItem; -class SwFmtCntnt; -class SwFmtHeader; -class SwFmtFooter; +class SwFormatContent; +class SwFormatHeader; +class SwFormatFooter; class SvxPrintItem; class SvxOpaqueItem; class SvxProtectItem; -class SwFmtSurround; -class SwFmtVertOrient; -class SwFmtHoriOrient; -class SwFmtAnchor; +class SwFormatSurround; +class SwFormatVertOrient; +class SwFormatHoriOrient; +class SwFormatAnchor; class SvxBoxItem; class SvxBrushItem; class XFillStyleItem; class XFillGradientItem; class SvxShadowItem; -class SwFmtPageDesc; -class SvxFmtBreakItem; -class SwFmtCol; +class SwFormatPageDesc; +class SvxFormatBreakItem; +class SwFormatCol; class SvxMacroItem; -class SvxFmtKeepItem; -class SwFmtURL; -class SwFmtLineNumber; -class SwFmtEditInReadonly; -class SwFmtLayoutSplit; -class SwFmtRowSplit; -class SwFmtChain; -class SwFmtFtnAtTxtEnd; -class SwFmtEndAtTxtEnd; -class SwFmtNoBalancedColumns; +class SvxFormatKeepItem; +class SwFormatURL; +class SwFormatLineNumber; +class SwFormatEditInReadonly; +class SwFormatLayoutSplit; +class SwFormatRowSplit; +class SwFormatChain; +class SwFormatFootnoteAtTextEnd; +class SwFormatEndAtTextEnd; +class SwFormatNoBalancedColumns; class SvxFrameDirectionItem; class SwTextGridItem; class SwHeaderAndFooterEatSpacingItem; -class SwFmtFollowTextFlow; -class SwFmtWrapInfluenceOnObjPos; +class SwFormatFollowTextFlow; +class SwFormatWrapInfluenceOnObjPos; class SdrTextVertAdjustItem; // Graphic attributes @@ -115,14 +115,14 @@ class SwDrawModeGrf; // Paragraph attributes class SvxLineSpacingItem; class SvxAdjustItem; -class SvxFmtSplitItem; +class SvxFormatSplitItem; class SwRegisterItem; class SwNumRuleItem; class SvxWidowsItem; class SvxOrphansItem; class SvxTabStopItem; class SvxHyphenZoneItem; -class SwFmtDrop; +class SwFormatDrop; class SvxScriptSpaceItem; class SvxHangingPunctuationItem; class SvxForbiddenRuleItem; @@ -131,9 +131,9 @@ class SvxParaGridItem; class SwParaConnectBorderItem; // TableBox attributes -class SwTblBoxNumFormat; -class SwTblBoxFormula; -class SwTblBoxValue; +class SwTableBoxNumFormat; +class SwTableBoxFormula; +class SwTableBoxValue; class SwAttrPool : public SfxItemPool { @@ -206,10 +206,10 @@ public: // Special treatment for some attributes. // Set Modify-pointer (the old pDefinedIn) at the following attributes: - // - SwFmtDropCaps - // - SwFmtPageDesc + // - SwFormatDropCaps + // - SwFormatPageDesc // (Is called at insert in formats/nodes.) - // Second version is for the SwAttrSet handles of SwCntntNode. + // Second version is for the SwAttrSet handles of SwContentNode. bool SetModifyAtAttr( const SwModify* pModify ); // Document is set at SwAttrPool. Therefore it is always accessible. @@ -262,43 +262,43 @@ public: inline const SvxShadowItem &GetCharShadow( bool = true ) const; // Frame attributes. Implementation in frmatr.hxx. - inline const SwFmtFillOrder &GetFillOrder( bool = true ) const; - inline const SwFmtFrmSize &GetFrmSize( bool = true ) const; + inline const SwFormatFillOrder &GetFillOrder( bool = true ) const; + inline const SwFormatFrmSize &GetFrmSize( bool = true ) const; inline const SvxPaperBinItem &GetPaperBin( bool = true ) const; inline const SvxLRSpaceItem &GetLRSpace( bool = true ) const; inline const SvxULSpaceItem &GetULSpace( bool = true ) const; - inline const SwFmtCntnt &GetCntnt( bool = true ) const; - inline const SwFmtHeader &GetHeader( bool = true ) const; - inline const SwFmtFooter &GetFooter( bool = true ) const; + inline const SwFormatContent &GetContent( bool = true ) const; + inline const SwFormatHeader &GetHeader( bool = true ) const; + inline const SwFormatFooter &GetFooter( bool = true ) const; inline const SvxPrintItem &GetPrint( bool = true ) const; inline const SvxOpaqueItem &GetOpaque( bool = true ) const; inline const SvxProtectItem &GetProtect( bool = true ) const; - inline const SwFmtSurround &GetSurround( bool = true ) const; - inline const SwFmtVertOrient &GetVertOrient( bool = true ) const; - inline const SwFmtHoriOrient &GetHoriOrient( bool = true ) const; - inline const SwFmtAnchor &GetAnchor( bool = true ) const; + inline const SwFormatSurround &GetSurround( bool = true ) const; + inline const SwFormatVertOrient &GetVertOrient( bool = true ) const; + inline const SwFormatHoriOrient &GetHoriOrient( bool = true ) const; + inline const SwFormatAnchor &GetAnchor( bool = true ) const; inline const SvxBoxItem &GetBox( bool = true ) const; - inline const SvxFmtKeepItem &GetKeep( bool = true ) const; + inline const SvxFormatKeepItem &GetKeep( bool = true ) const; inline const SvxBrushItem &GetBackground( bool = true ) const; inline const SvxShadowItem &GetShadow( bool = true ) const; - inline const SwFmtPageDesc &GetPageDesc( bool = true ) const; - inline const SvxFmtBreakItem &GetBreak( bool = true ) const; - inline const SwFmtCol &GetCol( bool = true ) const; + inline const SwFormatPageDesc &GetPageDesc( bool = true ) const; + inline const SvxFormatBreakItem &GetBreak( bool = true ) const; + inline const SwFormatCol &GetCol( bool = true ) const; inline const SvxMacroItem &GetMacro( bool = true ) const; - inline const SwFmtURL &GetURL( bool = true ) const; - inline const SwFmtEditInReadonly &GetEditInReadonly( bool = true ) const; - inline const SwFmtLayoutSplit &GetLayoutSplit( bool = true ) const; - inline const SwFmtRowSplit &GetRowSplit( bool = true ) const; - inline const SwFmtChain &GetChain( bool = true ) const; - inline const SwFmtLineNumber &GetLineNumber( bool = true ) const; - inline const SwFmtFtnAtTxtEnd &GetFtnAtTxtEnd( bool = true ) const; - inline const SwFmtEndAtTxtEnd &GetEndAtTxtEnd( bool = true ) const; - inline const SwFmtNoBalancedColumns &GetBalancedColumns( bool = true ) const; + inline const SwFormatURL &GetURL( bool = true ) const; + inline const SwFormatEditInReadonly &GetEditInReadonly( bool = true ) const; + inline const SwFormatLayoutSplit &GetLayoutSplit( bool = true ) const; + inline const SwFormatRowSplit &GetRowSplit( bool = true ) const; + inline const SwFormatChain &GetChain( bool = true ) const; + inline const SwFormatLineNumber &GetLineNumber( bool = true ) const; + inline const SwFormatFootnoteAtTextEnd &GetFootnoteAtTextEnd( bool = true ) const; + inline const SwFormatEndAtTextEnd &GetEndAtTextEnd( bool = true ) const; + inline const SwFormatNoBalancedColumns &GetBalancedColumns( bool = true ) const; inline const SvxFrameDirectionItem &GetFrmDir( bool = true ) const; inline const SwTextGridItem &GetTextGrid( bool = true ) const; inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( bool = true ) const; - inline const SwFmtFollowTextFlow &GetFollowTextFlow(bool = true) const; - inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(bool = true) const; + inline const SwFormatFollowTextFlow &GetFollowTextFlow(bool = true) const; + inline const SwFormatWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(bool = true) const; inline const SdrTextVertAdjustItem& GetTextVertAdjust(bool = true) const; // Graphic attributes - implementation in grfatr.hxx @@ -318,14 +318,14 @@ public: // Paragraph attributes - implementation in paratr.hxx inline const SvxLineSpacingItem &GetLineSpacing( bool = true ) const; inline const SvxAdjustItem &GetAdjust( bool = true ) const; - inline const SvxFmtSplitItem &GetSplit( bool = true ) const; + inline const SvxFormatSplitItem &GetSplit( bool = true ) const; inline const SwRegisterItem &GetRegister( bool = true ) const; inline const SwNumRuleItem &GetNumRule( bool = true ) const; inline const SvxWidowsItem &GetWidows( bool = true ) const; inline const SvxOrphansItem &GetOrphans( bool = true ) const; inline const SvxTabStopItem &GetTabStops( bool = true ) const; inline const SvxHyphenZoneItem &GetHyphenZone( bool = true ) const; - inline const SwFmtDrop &GetDrop( bool = true ) const; + inline const SwFormatDrop &GetDrop( bool = true ) const; inline const SvxScriptSpaceItem &GetScriptSpace(bool = true) const; inline const SvxHangingPunctuationItem &GetHangingPunctuation(bool = true) const; inline const SvxForbiddenRuleItem &GetForbiddenRule(bool = true) const; @@ -334,9 +334,9 @@ public: inline const SwParaConnectBorderItem &GetParaConnectBorder(bool = true ) const; // Tablebox attributes - implementation in cellatr.hxx - inline const SwTblBoxNumFormat &GetTblBoxNumFmt( bool = true ) const; - inline const SwTblBoxFormula &GetTblBoxFormula( bool = true ) const; - inline const SwTblBoxValue &GetTblBoxValue( bool = true ) const; + inline const SwTableBoxNumFormat &GetTableBoxNumFormat( bool = true ) const; + inline const SwTableBoxFormula &GetTableBoxFormula( bool = true ) const; + inline const SwTableBoxValue &GetTableBoxValue( bool = true ) const; DECL_FIXEDMEMPOOL_NEWDEL(SwAttrSet) }; diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx index 8da7be7bd1bb..3a09b6c91b2b 100644 --- a/sw/inc/swbaslnk.hxx +++ b/sw/inc/swbaslnk.hxx @@ -22,7 +22,7 @@ #include <sfx2/lnkbase.hxx> class SwNode; -class SwCntntNode; +class SwContentNode; class ReReadThread; long GrfNodeChanged( void* pLink, void* pCaller ); @@ -30,7 +30,7 @@ class SwBaseLink : public ::sfx2::SvBaseLink { friend long GrfNodeChanged( void* pLink, void* pCaller ); - SwCntntNode* pCntntNode; + SwContentNode* pContentNode; bool bSwapIn : 1; bool bNoDataFlag : 1; bool bIgnoreDataChanged : 1; @@ -42,8 +42,8 @@ protected: public: TYPEINFO_OVERRIDE(); - SwBaseLink( SfxLinkUpdateMode nMode, SotClipboardFormatId nFormat, SwCntntNode* pNode = 0 ) - : ::sfx2::SvBaseLink( nMode, nFormat ), pCntntNode( pNode ), + SwBaseLink( SfxLinkUpdateMode nMode, SotClipboardFormatId nFormat, SwContentNode* pNode = 0 ) + : ::sfx2::SvBaseLink( nMode, nFormat ), pContentNode( pNode ), bSwapIn( false ), bNoDataFlag( false ), bIgnoreDataChanged( false ), m_pReReadThread(0) {} @@ -56,7 +56,7 @@ public: virtual const SwNode* GetAnchor() const; - SwCntntNode *GetCntntNode() { return pCntntNode; } + SwContentNode *GetContentNode() { return pContentNode; } // For graphics only. bool SwapIn( bool bWaitForData = false, bool bNativFormat = false ); diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx index 5e3ea0a228b0..7e55f59a8cae 100644 --- a/sw/inc/swcrsr.hxx +++ b/sw/inc/swcrsr.hxx @@ -78,7 +78,7 @@ protected: const _SwCursor_SavePos* GetSavePos() const { return m_pSavePos; } - virtual const SwCntntFrm* DoSetBidiLevelLeftRight( + virtual const SwContentFrm* DoSetBidiLevelLeftRight( bool & io_rbLeft, bool bVisualAllowed, bool bInsertCrsr); virtual void DoSetBidiLevelUpDown(); virtual bool IsSelOvrCheck(int eFlags); @@ -97,7 +97,7 @@ public: virtual SwCursor* Create( SwPaM* pRing = 0 ) const; virtual short MaxReplaceArived(); //returns RET_YES/RET_CANCEL/RET_NO - virtual void SaveTblBoxCntnt( const SwPosition* pPos = 0 ); + virtual void SaveTableBoxContent( const SwPosition* pPos = 0 ); void FillFindPos( SwDocPositions ePos, SwPosition& rPos ) const; SwMoveFnCollection* MakeFindRange( SwDocPositions, SwDocPositions, @@ -109,11 +109,11 @@ public: bool& bCancel, FindRanges = FND_IN_BODY, bool bReplace = false ); - sal_uLong Find( const SwTxtFmtColl& rFmtColl, + sal_uLong Find( const SwTextFormatColl& rFormatColl, SwDocPositions nStart, SwDocPositions nEnde, bool& bCancel, FindRanges = FND_IN_BODY, - const SwTxtFmtColl* pReplFmt = 0 ); + const SwTextFormatColl* pReplFormat = 0 ); sal_uLong Find( const SfxItemSet& rSet, bool bNoCollections, SwDocPositions nStart, SwDocPositions nEnde, bool& bCancel, @@ -172,14 +172,14 @@ public: bool GoNextCell( sal_uInt16 nCnt = 1 ) { return GoPrevNextCell( true, nCnt ); } bool GoPrevCell( sal_uInt16 nCnt = 1 ) { return GoPrevNextCell( false, nCnt ); } virtual bool GotoTable( const OUString& rName ); - bool GotoTblBox( const OUString& rName ); + bool GotoTableBox( const OUString& rName ); bool GotoRegion( const OUString& rName ); - bool GotoFtnAnchor(); - bool GotoFtnTxt(); - bool GotoNextFtnAnchor(); - bool GotoPrevFtnAnchor(); - bool GotoNextFtnCntnt(); - bool GotoPrevFtnCntnt(); + bool GotoFootnoteAnchor(); + bool GotoFootnoteText(); + bool GotoNextFootnoteAnchor(); + bool GotoPrevFootnoteAnchor(); + bool GotoNextFootnoteContent(); + bool GotoPrevFootnoteContent(); bool MovePara( SwWhichPara, SwPosPara ); bool MoveSection( SwWhichSection, SwPosSection ); @@ -194,7 +194,7 @@ public: nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )); bool IsInProtectTable( bool bMove = false, bool bChgCrsr = true ); - bool IsNoCntnt() const; + bool IsNoContent() const; /** Restore cursor state to the one saved by SwCrsrSaveState **/ void RestoreSavePos(); @@ -240,12 +240,12 @@ public: struct _SwCursor_SavePos { sal_uLong nNode; - sal_Int32 nCntnt; + sal_Int32 nContent; _SwCursor_SavePos* pNext; _SwCursor_SavePos( const SwCursor& rCrsr ) : nNode( rCrsr.GetPoint()->nNode.GetIndex() ), - nCntnt( rCrsr.GetPoint()->nContent.GetIndex() ), + nContent( rCrsr.GetPoint()->nContent.GetIndex() ), pNext( 0 ) {} virtual ~_SwCursor_SavePos() {} @@ -257,10 +257,10 @@ class SwTableCursor : public virtual SwCursor { protected: - sal_uLong m_nTblPtNd; - sal_uLong m_nTblMkNd; - sal_Int32 m_nTblPtCnt; - sal_Int32 m_nTblMkCnt; + sal_uLong m_nTablePtNd; + sal_uLong m_nTableMkNd; + sal_Int32 m_nTablePtCnt; + sal_Int32 m_nTableMkCnt; SwSelBoxes m_SelectedBoxes; bool m_bChanged : 1; bool m_bParked : 1; // Table-cursor was parked. @@ -276,7 +276,7 @@ public: bool bAllowVisual, bool bSkipHidden, bool bInsertCrsr ) SAL_OVERRIDE; virtual bool GotoTable( const OUString& rName ) SAL_OVERRIDE; - void InsertBox( const SwTableBox& rTblBox ); + void InsertBox( const SwTableBox& rTableBox ); void DeleteBox(size_t nPos); size_t GetSelectedBoxesCount() const { return m_SelectedBoxes.size(); } const SwSelBoxes& GetSelectedBoxes() const { return m_SelectedBoxes; } @@ -287,14 +287,14 @@ public: bool HasReadOnlyBoxSel() const; // Has table cursor been changed? If so, save new values immediately. - bool IsCrsrMovedUpdt(); + bool IsCrsrMovedUpdate(); // Has table cursor been changed? bool IsCrsrMoved() const { - return m_nTblMkNd != GetMark()->nNode.GetIndex() || - m_nTblPtNd != GetPoint()->nNode.GetIndex() || - m_nTblMkCnt != GetMark()->nContent.GetIndex() || - m_nTblPtCnt != GetPoint()->nContent.GetIndex(); + return m_nTableMkNd != GetMark()->nNode.GetIndex() || + m_nTablePtNd != GetPoint()->nNode.GetIndex() || + m_nTableMkCnt != GetMark()->nContent.GetIndex() || + m_nTablePtCnt != GetPoint()->nContent.GetIndex(); } bool IsChgd() const { return m_bChanged; } diff --git a/sw/inc/swddetbl.hxx b/sw/inc/swddetbl.hxx index 025fe81ce21c..ec76169e7309 100644 --- a/sw/inc/swddetbl.hxx +++ b/sw/inc/swddetbl.hxx @@ -38,16 +38,16 @@ public: void ChangeContent(); bool NoDDETable(); - SwDDEFieldType* GetDDEFldType(); - inline const SwDDEFieldType* GetDDEFldType() const; + SwDDEFieldType* GetDDEFieldType(); + inline const SwDDEFieldType* GetDDEFieldType() const; protected: virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; virtual void SwClientNotify( const SwModify&, const SfxHint& ) SAL_OVERRIDE; }; -inline const SwDDEFieldType* SwDDETable::GetDDEFldType() const +inline const SwDDEFieldType* SwDDETable::GetDDEFieldType() const { - return const_cast<SwDDETable*>(this)->GetDDEFldType(); + return const_cast<SwDDETable*>(this)->GetDDEFieldType(); } #endif diff --git a/sw/inc/swevent.hxx b/sw/inc/swevent.hxx index 356c7bf56ba6..e2ca9302d2fd 100644 --- a/sw/inc/swevent.hxx +++ b/sw/inc/swevent.hxx @@ -51,8 +51,8 @@ #define STR_SW_EVENT_FRM_RESIZE 11 #define STR_SW_EVENT_FRM_MOVE 12 -class SwFrmFmt; -class SwFmtINetFmt; +class SwFrameFormat; +class SwFormatINetFormat; class IMapObject; // Enum for objects that call events into Basic or JavaScript. @@ -73,43 +73,43 @@ struct SwCallMouseEvent union { // EVENT_OBJECT_IMAGE/EVENT_OBJECT_URLITEM - const SwFrmFmt* pFmt; + const SwFrameFormat* pFormat; // EVENT_OBJECT_INETATTR - const SwFmtINetFmt* pINetAttr; + const SwFormatINetFormat* pINetAttr; // EVENT_OBJECT_IMAGEMAP struct { - const SwFrmFmt* pFmt; + const SwFrameFormat* pFormat; const IMapObject* pIMapObj; } IMAP; } PTR; SwCallMouseEvent() : eType( EVENT_OBJECT_NONE ) - { PTR.pFmt = 0; PTR.IMAP.pIMapObj = 0; } + { PTR.pFormat = 0; PTR.IMAP.pIMapObj = 0; } - void Set( SwCallEventObjectType eTyp, const SwFrmFmt* pFmt ) - { eType = eTyp; PTR.pFmt = pFmt; PTR.IMAP.pIMapObj = 0; } + void Set( SwCallEventObjectType eTyp, const SwFrameFormat* pFormat ) + { eType = eTyp; PTR.pFormat = pFormat; PTR.IMAP.pIMapObj = 0; } - void Set( const SwFrmFmt* pFmt, const IMapObject* pIMapObj ) - { eType = EVENT_OBJECT_IMAGEMAP; PTR.pFmt = pFmt; PTR.IMAP.pIMapObj = pIMapObj; } + void Set( const SwFrameFormat* pFormat, const IMapObject* pIMapObj ) + { eType = EVENT_OBJECT_IMAGEMAP; PTR.pFormat = pFormat; PTR.IMAP.pIMapObj = pIMapObj; } - void Set( const SwFmtINetFmt* pINetAttr ) + void Set( const SwFormatINetFormat* pINetAttr ) { eType = EVENT_OBJECT_INETATTR; PTR.pINetAttr = pINetAttr; PTR.IMAP.pIMapObj = 0; } bool operator==( const SwCallMouseEvent& rEvent ) const { return eType == rEvent.eType && - PTR.pFmt == rEvent.PTR.pFmt && + PTR.pFormat == rEvent.PTR.pFormat && PTR.IMAP.pIMapObj == rEvent.PTR.IMAP.pIMapObj; } bool operator!=( const SwCallMouseEvent& rEvent ) const { return !( *this == rEvent ); } void Clear() - { eType = EVENT_OBJECT_NONE; PTR.pFmt = 0; PTR.IMAP.pIMapObj = 0; } + { eType = EVENT_OBJECT_NONE; PTR.pFormat = 0; PTR.IMAP.pIMapObj = 0; } bool HasEvent() const { return EVENT_OBJECT_NONE != eType; } }; diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index 0b5504a57c3a..6c3dc36c738f 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -152,7 +152,7 @@ public: sal_uInt16 nDest = VIEWOPT_DEST_VIEW ); void ApplyUserMetric( FieldUnit eMetric, bool bWeb ); void ApplyRulerMetric( FieldUnit eMetric, bool bHorizontal, bool bWeb ); - void ApplyFldUpdateFlags(SwFldUpdateFlags eFldFlags); + void ApplyFieldUpdateFlags(SwFieldUpdateFlags eFieldFlags); void ApplyLinkMode(sal_Int32 nNewLinkMode); // Default page mode for text grid. @@ -184,9 +184,9 @@ public: static void ShowDBObj( SwView& rView, const SwDBData& rData, bool bOnlyIfAvailable = false); // Table modi. - bool IsInsTblFormatNum(bool bHTML) const; - bool IsInsTblChangeNumFormat(bool bHTML) const; - bool IsInsTblAlignNum(bool bHTML) const; + bool IsInsTableFormatNum(bool bHTML) const; + bool IsInsTableChangeNumFormat(bool bHTML) const; + bool IsInsTableAlignNum(bool bHTML) const; // Redlining. sal_uInt16 GetRedlineAuthor(); @@ -214,7 +214,7 @@ public: // Pass update-statuses. sal_uInt16 GetLinkUpdMode( bool bWeb ) const; - SwFldUpdateFlags GetFldUpdateFlags( bool bWeb ) const; + SwFieldUpdateFlags GetFieldUpdateFlags( bool bWeb ) const; // Virtual methods for options dialog. virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ) SAL_OVERRIDE; diff --git a/sw/inc/swscanner.hxx b/sw/inc/swscanner.hxx index 2e2749fe0496..40fcfcb9801a 100644 --- a/sw/inc/swscanner.hxx +++ b/sw/inc/swscanner.hxx @@ -23,14 +23,14 @@ #include <i18nlangtag/lang.h> #include <modeltoviewhelper.hxx> -class SwTxtNode; +class SwTextNode; // Helper class that provides consecutively the words of a selected area // during spell check class SwScanner { OUString aWord; - const SwTxtNode& rNode; + const SwTextNode& rNode; const OUString aPreDashReplacementText; OUString aText; const LanguageType* pLanguage; @@ -45,7 +45,7 @@ class SwScanner bool bClip; public: - SwScanner( const SwTxtNode& rNd, const OUString& rTxt, + SwScanner( const SwTextNode& rNd, const OUString& rText, const LanguageType* pLang, const ModelToViewHelper& rConvMap, sal_uInt16 nWordType, diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx index 3da7b1a28df4..053912718280 100644 --- a/sw/inc/swserv.hxx +++ b/sw/inc/swserv.hxx @@ -36,7 +36,7 @@ protected: enum ServerModes { BOOKMARK_SERVER, TABLE_SERVER, SECTION_SERVER, NONE_SERVER } eType; union { ::sw::mark::IMark* pBkmk; - SwTableNode* pTblNd; + SwTableNode* pTableNd; SwSectionNode* pSectNd; } CNTNT_TYPE; @@ -51,7 +51,7 @@ public: SwServerObject( SwTableNode& rTableNd ) : eType( TABLE_SERVER ) { - CNTNT_TYPE.pTblNd = &rTableNd; + CNTNT_TYPE.pTableNd = &rTableNd; } SwServerObject( SwSectionNode& rSectNd ) : eType( SECTION_SERVER ) diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 088c01b82703..f3197b567a9d 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -33,12 +33,12 @@ #include <o3tl/sorted_vector.hxx> class SwStartNode; -class SwFmt; +class SwFormat; class Color; -class SwFrmFmt; -class SwTableFmt; -class SwTableLineFmt; -class SwTableBoxFmt; +class SwFrameFormat; +class SwTableFormat; +class SwTableLineFormat; +class SwTableBoxFormat; class SwHTMLTableLayout; class SwTableLine; class SwTableBox; @@ -46,22 +46,22 @@ class SwTableNode; class SwTabCols; class SwDoc; class SwSelBoxes; -class SwTblCalcPara; +class SwTableCalcPara; struct SwPosition; class SwNodeIndex; class SwNode; class SfxPoolItem; -class SwUndoTblMerge; +class SwUndoTableMerge; class SwUndo; class SwPaM; class SwTableBox_Impl; -class SwUndoTblCpyTbl; +class SwUndoTableCpyTable; class SwBoxSelection; struct SwSaveRowSpan; struct Parm; class SwServerObject; -void sw_GetTblBoxColStr( sal_uInt16 nCol, OUString& rNm ); +void sw_GetTableBoxColStr( sal_uInt16 nCol, OUString& rNm ); class SwTableLines : public std::vector<SwTableLine*> { public: @@ -91,7 +91,7 @@ public: class SwTableSortBoxes : public o3tl::sorted_vector<SwTableBox*> {}; /// SwTable is one table in the document model, containing rows (which contain cells). -class SW_DLLPUBLIC SwTable: public SwClient //Client of FrmFmt. +class SW_DLLPUBLIC SwTable: public SwClient //Client of FrameFormat. { protected: @@ -108,7 +108,7 @@ protected: SwTableNode* pTableNode; // Should that be adjustable for every table? - TblChgMode eTblChgMode; + TableChgMode eTableChgMode; sal_uInt16 nGrfsThatResize; // Count of Grfs that initiate a resize of table // at HTML-import. @@ -136,7 +136,7 @@ public: TYPEINFO_OVERRIDE(); // single argument ctors shall be explicit. - explicit SwTable( SwTableFmt* ); + explicit SwTable( SwTableFormat* ); virtual ~SwTable(); // @@@ public copy ctor, but no copy assignment? @@ -146,10 +146,10 @@ private: SwTable & operator= (const SwTable &) SAL_DELETED_FUNCTION; // no default ctor. SwTable(); - bool OldMerge( SwDoc*, const SwSelBoxes&, SwTableBox*, SwUndoTblMerge* ); + bool OldMerge( SwDoc*, const SwSelBoxes&, SwTableBox*, SwUndoTableMerge* ); bool OldSplitRow( SwDoc*, const SwSelBoxes&, sal_uInt16, bool ); bool NewMerge( SwDoc*, const SwSelBoxes&, const SwSelBoxes& rMerged, - SwTableBox*, SwUndoTblMerge* ); + SwTableBox*, SwUndoTableMerge* ); bool NewSplitRow( SwDoc*, const SwSelBoxes&, sal_uInt16, bool ); SwBoxSelection* CollectBoxSelection( const SwPaM& rPam ) const; void InsertSpannedRow( SwDoc* pDoc, sal_uInt16 nIdx, sal_uInt16 nCnt ); @@ -184,8 +184,8 @@ public: SwTableLines &GetTabLines() { return aLines; } const SwTableLines &GetTabLines() const { return aLines; } - SwTableFmt* GetFrmFmt() { return static_cast<SwTableFmt*>(GetRegisteredIn()); } - SwTableFmt* GetFrmFmt() const { return const_cast<SwTableFmt*>(static_cast<const SwTableFmt*>(GetRegisteredIn())); } + SwTableFormat* GetFrameFormat() { return static_cast<SwTableFormat*>(GetRegisteredIn()); } + SwTableFormat* GetFrameFormat() const { return const_cast<SwTableFormat*>(static_cast<const SwTableFormat*>(GetRegisteredIn())); } void GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart, bool bHidden = false, bool bCurRowOnly = false ) const; @@ -213,7 +213,7 @@ public: // It's not allowed to change the table model after the first call of one of these functions. bool Merge( SwDoc* pDoc, const SwSelBoxes& rBoxes, const SwSelBoxes& rMerged, - SwTableBox* pMergeBox, SwUndoTblMerge* pUndo = 0 ) + SwTableBox* pMergeBox, SwUndoTableMerge* pUndo = 0 ) { #ifdef DBG_UTIL m_bDontChangeModel = true; @@ -231,7 +231,7 @@ public: OldSplitRow( pDoc, rBoxes, nCnt, bSameHeight ); } bool PrepareMerge( const SwPaM& rPam, SwSelBoxes& rBoxes, - SwSelBoxes& rMerged, SwTableBox** ppMergeBox, SwUndoTblMerge* pUndo ); + SwSelBoxes& rMerged, SwTableBox** ppMergeBox, SwUndoTableMerge* pUndo ); void ExpandColumnSelection( SwSelBoxes& rBoxes, long &rMin, long &rMax ) const; void PrepareDeleteCol( long nMin, long nMax ); @@ -244,7 +244,7 @@ public: SwUndo* pUndo, const bool bDelMakeFrms, const bool bCorrBorder ); bool SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt=1 ); bool Merge( const SwSelBoxes& rBoxes, - SwTableBox* pMergeBox, SwUndoTblMerge* = 0 ); + SwTableBox* pMergeBox, SwUndoTableMerge* = 0 ); void FindSuperfluousRows( SwSelBoxes& rBoxes ) { _FindSuperfluousRows( rBoxes, 0, 0 ); } @@ -253,7 +253,7 @@ public: SwTableSortBoxes& GetTabSortBoxes() { return m_TabSortContentBoxes; } const SwTableSortBoxes& GetTabSortBoxes() const { return m_TabSortContentBoxes; } - // Read 1st number and delete it from string (used by GetTblBox and SwTblFld). + // Read 1st number and delete it from string (used by GetTableBox and SwTableField). // #i80314# // add 3rd parameter in order to control validation check on <rStr> @@ -266,31 +266,31 @@ public: // #i80314# // add 2nd parameter in order to control validation check in called method // <_GetBoxNum(..)> - const SwTableBox* GetTblBox( const OUString& rName, + const SwTableBox* GetTableBox( const OUString& rName, const bool bPerformValidCheck = false ) const; // Copy selected boxes to another document. bool MakeCopy( SwDoc*, const SwPosition&, const SwSelBoxes&, bool bCpyNds = true, bool bCpyName = false ) const; // Copy table in this - bool InsTable( const SwTable& rCpyTbl, const SwNodeIndex&, - SwUndoTblCpyTbl* pUndo = 0 ); - bool InsTable( const SwTable& rCpyTbl, const SwSelBoxes&, - SwUndoTblCpyTbl* pUndo = 0 ); - bool InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes&, - SwUndoTblCpyTbl* pUndo ); + bool InsTable( const SwTable& rCpyTable, const SwNodeIndex&, + SwUndoTableCpyTable* pUndo = 0 ); + bool InsTable( const SwTable& rCpyTable, const SwSelBoxes&, + SwUndoTableCpyTable* pUndo = 0 ); + bool InsNewTable( const SwTable& rCpyTable, const SwSelBoxes&, + SwUndoTableCpyTable* pUndo ); // Copy headline of table (with content!) into an other one. - bool CopyHeadlineIntoTable( SwTableNode& rTblNd ); + bool CopyHeadlineIntoTable( SwTableNode& rTableNd ); // Get box, whose start index is set on nBoxStt. - SwTableBox* GetTblBox( sal_uLong nSttIdx ); - const SwTableBox* GetTblBox( sal_uLong nSttIdx ) const - { return const_cast<SwTable*>(this)->GetTblBox( nSttIdx ); } + SwTableBox* GetTableBox( sal_uLong nSttIdx ); + const SwTableBox* GetTableBox( sal_uLong nSttIdx ) const + { return const_cast<SwTable*>(this)->GetTableBox( nSttIdx ); } // Returns true if table contains nestings. - bool IsTblComplex() const; + bool IsTableComplex() const; // Returns true if table or selection is balanced. - bool IsTblComplexForChart( const OUString& rSel ) const; + bool IsTableComplexForChart( const OUString& rSel ) const; // Search all content-bearing boxes of the base line on which this box stands. // rBoxes as a return value for immediate use. @@ -303,7 +303,7 @@ public: virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE; // Search in format for registered table. - static SwTable * FindTable( SwFrmFmt const*const pFmt ); + static SwTable * FindTable( SwFrameFormat const*const pFormat ); // Clean up structure a bit. void GCLines(); @@ -320,14 +320,14 @@ public: // Fill data for chart. void UpdateCharts() const; - TblChgMode GetTblChgMode() const { return eTblChgMode; } - void SetTblChgMode( TblChgMode eMode ) { eTblChgMode = eMode; } + TableChgMode GetTableChgMode() const { return eTableChgMode; } + void SetTableChgMode( TableChgMode eMode ) { eTableChgMode = eMode; } bool SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType, SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo ); bool SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType, SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo ); - void RegisterToFormat( SwFmt& rFmt ); + void RegisterToFormat( SwFormat& rFormat ); #ifdef DBG_UTIL void CheckConsistency() const; #endif @@ -336,7 +336,7 @@ public: }; /// SwTableLine is one table row in the document model. -class SW_DLLPUBLIC SwTableLine: public SwClient // Client of FrmFmt. +class SW_DLLPUBLIC SwTableLine: public SwClient // Client of FrameFormat. { SwTableBoxes aBoxes; SwTableBox *pUpper; @@ -346,7 +346,7 @@ public: SwTableLine() : pUpper(0) {} - SwTableLine( SwTableLineFmt*, sal_uInt16 nBoxes, SwTableBox *pUp ); + SwTableLine( SwTableLineFormat*, sal_uInt16 nBoxes, SwTableBox *pUp ); virtual ~SwTableLine(); SwTableBoxes &GetTabBoxes() { return aBoxes; } @@ -356,27 +356,27 @@ public: const SwTableBox *GetUpper() const { return pUpper; } void SetUpper( SwTableBox *pNew ) { pUpper = pNew; } - SwFrmFmt* GetFrmFmt() { return static_cast<SwFrmFmt*>(GetRegisteredIn()); } - SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); } + SwFrameFormat* GetFrameFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); } + SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); } - // Creates a own FrmFmt if more lines depend on it. - SwFrmFmt* ClaimFrmFmt(); - void ChgFrmFmt( SwTableLineFmt* pNewFmt ); + // Creates a own FrameFormat if more lines depend on it. + SwFrameFormat* ClaimFrameFormat(); + void ChgFrameFormat( SwTableLineFormat* pNewFormat ); // Search next/previous box with content. SwTableBox* FindNextBox( const SwTable&, const SwTableBox* =0, - bool bOvrTblLns=true ) const; + bool bOvrTableLns=true ) const; SwTableBox* FindPreviousBox( const SwTable&, const SwTableBox* =0, - bool bOvrTblLns=true ) const; + bool bOvrTableLns=true ) const; SwTwips GetTableLineHeight( bool& bLayoutAvailable ) const; bool hasSoftPageBreak() const; - void RegisterToFormat( SwFmt& rFmt ); + void RegisterToFormat( SwFormat& rFormat ); }; /// SwTableBox is one table cell in the document model. -class SW_DLLPUBLIC SwTableBox: public SwClient //Client of FrmFmt. +class SW_DLLPUBLIC SwTableBox: public SwClient //Client of FrameFormat. { friend class SwNodes; // Transpose index. friend void DelBoxNode(SwTableSortBoxes&); // Delete StartNode* ! @@ -392,16 +392,16 @@ class SW_DLLPUBLIC SwTableBox: public SwClient //Client of FrmFmt. // In case Format contains formulas/values already, // a new one must be created for the new box. - static SwTableBoxFmt* CheckBoxFmt( SwTableBoxFmt* ); + static SwTableBoxFormat* CheckBoxFormat( SwTableBoxFormat* ); public: TYPEINFO_OVERRIDE(); SwTableBox() : pSttNd(0), pUpper(0), pImpl(0) {} - SwTableBox( SwTableBoxFmt*, sal_uInt16 nLines, SwTableLine *pUp = 0 ); - SwTableBox( SwTableBoxFmt*, const SwStartNode&, SwTableLine *pUp = 0 ); - SwTableBox( SwTableBoxFmt*, const SwNodeIndex&, SwTableLine *pUp = 0 ); + SwTableBox( SwTableBoxFormat*, sal_uInt16 nLines, SwTableLine *pUp = 0 ); + SwTableBox( SwTableBoxFormat*, const SwStartNode&, SwTableLine *pUp = 0 ); + SwTableBox( SwTableBoxFormat*, const SwNodeIndex&, SwTableLine *pUp = 0 ); virtual ~SwTableBox(); SwTableLines &GetTabLines() { return aLines; } @@ -411,12 +411,12 @@ public: const SwTableLine *GetUpper() const { return pUpper; } void SetUpper( SwTableLine *pNew ) { pUpper = pNew; } - SwFrmFmt* GetFrmFmt() { return static_cast<SwFrmFmt*>(GetRegisteredIn()); } - SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); } + SwFrameFormat* GetFrameFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); } + SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); } - // Creates its own FrmFmt if more boxes depend on it. - SwFrmFmt* ClaimFrmFmt(); - void ChgFrmFmt( SwTableBoxFmt *pNewFmt ); + // Creates its own FrameFormat if more boxes depend on it. + SwFrameFormat* ClaimFrameFormat(); + void ChgFrameFormat( SwTableBoxFormat *pNewFormat ); void RemoveFromTable(); const SwStartNode *GetSttNd() const { return pSttNd; } @@ -424,25 +424,25 @@ public: // Search next/previous box with content. SwTableBox* FindNextBox( const SwTable&, const SwTableBox* =0, - bool bOvrTblLns=true ) const; + bool bOvrTableLns=true ) const; SwTableBox* FindPreviousBox( const SwTable&, const SwTableBox* =0, - bool bOvrTblLns=true ) const; + bool bOvrTableLns=true ) const; // Return name of this box. It is determined dynamically and // is calculated from the position in the lines/boxes/table. OUString GetName() const; // Return "value" of box (for calculating in table). - double GetValue( SwTblCalcPara& rPara ) const; + double GetValue( SwTableCalcPara& rPara ) const; // Computes "coordinates" of a box, used to computed selection // width or height when inserting cols or rows Point GetCoordinates() const; - bool IsInHeadline( const SwTable* pTbl = 0 ) const; + bool IsInHeadline( const SwTable* pTable = 0 ) const; // Contains box contents, that can be formatted as a number? - bool HasNumCntnt( double& rNum, sal_uInt32& rFmtIndex, - bool& rIsEmptyTxtNd ) const; - sal_uLong IsValidNumTxtNd( bool bCheckAttr = true ) const; + bool HasNumContent( double& rNum, sal_uInt32& rFormatIndex, + bool& rIsEmptyTextNd ) const; + sal_uLong IsValidNumTextNd( bool bCheckAttr = true ) const; // If a table formula is set, test if box contents is congruent with number. // (For Redo of change of NumFormat!). bool IsNumberChanged() const; @@ -459,9 +459,9 @@ public: // Access on internal data - currently used for the NumFormatter. inline const Color* GetSaveUserColor() const; - inline const Color* GetSaveNumFmtColor() const; + inline const Color* GetSaveNumFormatColor() const; inline void SetSaveUserColor(const Color* p ); - inline void SetSaveNumFmtColor( const Color* p ); + inline void SetSaveNumFormatColor( const Color* p ); long getRowSpan() const; void setRowSpan( long nNewRowSpan ); @@ -477,7 +477,7 @@ public: const SwTableBox& FindEndOfRowSpan( const SwTable& rTable, sal_uInt16 nMaxStep = USHRT_MAX ) const { return const_cast<SwTableBox*>(this)->FindEndOfRowSpan( rTable, nMaxStep ); } - void RegisterToFormat( SwFmt& rFmt ) ; + void RegisterToFormat( SwFormat& rFormat ) ; }; class SwCellFrm; diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx index 181bf23b67b0..336bb39a0193 100644 --- a/sw/inc/swtblfmt.hxx +++ b/sw/inc/swtblfmt.hxx @@ -23,62 +23,62 @@ class SwDoc; -class SW_DLLPUBLIC SwTableFmt : public SwFrmFmt +class SW_DLLPUBLIC SwTableFormat : public SwFrameFormat { friend class SwDoc; protected: - SwTableFmt( SwAttrPool& rPool, const sal_Char* pFmtNm, - SwFrmFmt *pDrvdFrm ) - : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableSetRange ) + SwTableFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, + SwFrameFormat *pDrvdFrm ) + : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_FRMFMT, aTableSetRange ) {} - SwTableFmt( SwAttrPool& rPool, const OUString &rFmtNm, - SwFrmFmt *pDrvdFrm ) - : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableSetRange ) + SwTableFormat( SwAttrPool& rPool, const OUString &rFormatNm, + SwFrameFormat *pDrvdFrm ) + : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_FRMFMT, aTableSetRange ) {} public: TYPEINFO_OVERRIDE(); // Already in base class Content. - DECL_FIXEDMEMPOOL_NEWDEL(SwTableFmt) + DECL_FIXEDMEMPOOL_NEWDEL(SwTableFormat) virtual bool supportsFullDrawingLayerFillAttributeSet() const SAL_OVERRIDE; }; -class SwTableLineFmt : public SwFrmFmt +class SwTableLineFormat : public SwFrameFormat { friend class SwDoc; protected: - SwTableLineFmt( SwAttrPool& rPool, const sal_Char* pFmtNm, - SwFrmFmt *pDrvdFrm ) - : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange ) + SwTableLineFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, + SwFrameFormat *pDrvdFrm ) + : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange ) {} - SwTableLineFmt( SwAttrPool& rPool, const OUString &rFmtNm, - SwFrmFmt *pDrvdFrm ) - : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange ) + SwTableLineFormat( SwAttrPool& rPool, const OUString &rFormatNm, + SwFrameFormat *pDrvdFrm ) + : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange ) {} public: TYPEINFO_OVERRIDE(); // Already in base class Content. - DECL_FIXEDMEMPOOL_NEWDEL(SwTableLineFmt) + DECL_FIXEDMEMPOOL_NEWDEL(SwTableLineFormat) virtual bool supportsFullDrawingLayerFillAttributeSet() const SAL_OVERRIDE; }; -class SW_DLLPUBLIC SwTableBoxFmt : public SwFrmFmt +class SW_DLLPUBLIC SwTableBoxFormat : public SwFrameFormat { friend class SwDoc; protected: - SwTableBoxFmt( SwAttrPool& rPool, const sal_Char* pFmtNm, - SwFrmFmt *pDrvdFrm ) - : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange ) + SwTableBoxFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, + SwFrameFormat *pDrvdFrm ) + : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange ) {} - SwTableBoxFmt( SwAttrPool& rPool, const OUString &rFmtNm, - SwFrmFmt *pDrvdFrm ) - : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange ) + SwTableBoxFormat( SwAttrPool& rPool, const OUString &rFormatNm, + SwFrameFormat *pDrvdFrm ) + : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange ) {} // For recognition of changes (especially TableBoxAttribute). @@ -87,7 +87,7 @@ protected: public: TYPEINFO_OVERRIDE(); // Already in base class Content. - DECL_FIXEDMEMPOOL_NEWDEL(SwTableBoxFmt) + DECL_FIXEDMEMPOOL_NEWDEL(SwTableBoxFormat) virtual bool supportsFullDrawingLayerFillAttributeSet() const SAL_OVERRIDE; }; diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index b5107323d63f..b724fbdc3313 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -130,7 +130,7 @@ const short lOutlineMinTextDistance = 216; // 0.15 inch = 0.38 cm #define INIT_SEQ_FLDTYPES 4 // The former Rendevouz-IDs live on: -// There are IDs for the anchors (SwFmtAnchor) and some others +// There are IDs for the anchors (SwFormatAnchor) and some others // that are only of importance for interfaces (SwDoc). enum RndStdIds { @@ -257,7 +257,7 @@ enum PrepareHint // (Check for Fly-break). In void* of Prepare() // a sal_Bool& is passed. If this is sal_True, // it indicateds that a format has been executed. - PREP_UL_SPACE, // UL-Space has changed, TxtFrms have to + PREP_UL_SPACE, // UL-Space has changed, TextFrms have to // re-calculate line space. PREP_MUST_FIT, // Make frm fit (split) even if the attributes do // not allow that (e.g. "keep together"). @@ -269,7 +269,7 @@ enum PrepareHint // order to format the text into it. PREP_BOSS_CHGD, // If a Frm changes its column/page this additional // Prepare is sended to POS_CHGD in MoveFwd/Bwd - // (join Ftn-numbers etc.) + // (join Footnote-numbers etc.) // Direction is communicated via pVoid: // MoveFwd: pVoid == 0 // MoveBwd: pVoid == pOldPage @@ -279,7 +279,7 @@ enum PrepareHint PREP_MOVEFTN, // A footnote changes its page. Its contents receives at first a // height of zero in order to avoid too much noise. At formatting // it checks whether it fits and if necessary changes its page again. - PREP_ERGOSUM, // Needed because of movement in FtnFrms. Check QuoVadis/ErgoSum. + PREP_ERGOSUM, // Needed because of movement in FootnoteFrms. Check QuoVadis/ErgoSum. PREP_END // END. }; diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx index 8c96abafcc87..8f51b2287392 100644 --- a/sw/inc/tblafmt.hxx +++ b/sw/inc/tblafmt.hxx @@ -62,7 +62,7 @@ struct SwAfVersions; class SvNumberFormatter; -class SwBoxAutoFmt +class SwBoxAutoFormat { // common attributes of Calc and Writer // --- from 641 on: CJK and CTL font settings @@ -95,7 +95,7 @@ class SwBoxAutoFmt // Writer specific SvxAdjustItem aAdjust; SvxFrameDirectionItem m_aTextOrientation; - SwFmtVertOrient m_aVerticalAlignment; + SwFormatVertOrient m_aVerticalAlignment; // Calc specific SvxHorJustifyItem aHorJustify; @@ -107,16 +107,16 @@ class SwBoxAutoFmt SvxRotateModeItem aRotateMode; // number format - OUString sNumFmtString; - LanguageType eSysLanguage, eNumFmtLanguage; + OUString sNumFormatString; + LanguageType eSysLanguage, eNumFormatLanguage; public: - SwBoxAutoFmt(); - SwBoxAutoFmt( const SwBoxAutoFmt& rNew ); - ~SwBoxAutoFmt(); + SwBoxAutoFormat(); + SwBoxAutoFormat( const SwBoxAutoFormat& rNew ); + ~SwBoxAutoFormat(); - int operator==( const SwBoxAutoFmt& rCmp ) const; - SwBoxAutoFmt& operator=( const SwBoxAutoFmt& rNew ); + int operator==( const SwBoxAutoFormat& rCmp ) const; + SwBoxAutoFormat& operator=( const SwBoxAutoFormat& rNew ); // The get-methods. const SvxFontItem &GetFont() const { return aFont; } @@ -139,13 +139,13 @@ public: const SvxColorItem &GetColor() const { return aColor; } const SvxAdjustItem &GetAdjust() const { return aAdjust; } const SvxFrameDirectionItem& GetTextOrientation() const { return m_aTextOrientation; } - const SwFmtVertOrient& GetVerticalAlignment() const { return m_aVerticalAlignment; } + const SwFormatVertOrient& GetVerticalAlignment() const { return m_aVerticalAlignment; } const SvxBoxItem &GetBox() const { return aBox; } const SvxLineItem &GetTLBR() const { return aTLBR; } const SvxLineItem &GetBLTR() const { return aBLTR; } const SvxBrushItem &GetBackground() const { return aBackground; } - void GetValueFormat( OUString& rFmt, LanguageType& rLng, LanguageType& rSys ) const - { rFmt = sNumFmtString; rLng = eNumFmtLanguage; rSys = eSysLanguage; } + void GetValueFormat( OUString& rFormat, LanguageType& rLng, LanguageType& rSys ) const + { rFormat = sNumFormatString; rLng = eNumFormatLanguage; rSys = eSysLanguage; } // The set-methods. void SetFont( const SvxFontItem& rNew ) { aFont = rNew; } @@ -173,11 +173,11 @@ public: aAdjust.SetLastBlock( rNew.GetLastBlock() ); } void SetTextOrientation(const SvxFrameDirectionItem& rNew) { m_aTextOrientation = rNew; } - void SetVerticalAlignment(const SwFmtVertOrient& rNew) { m_aVerticalAlignment = rNew; } + void SetVerticalAlignment(const SwFormatVertOrient& rNew) { m_aVerticalAlignment = rNew; } void SetBox( const SvxBoxItem& rNew ) { aBox = rNew; } void SetBackground( const SvxBrushItem& rNew ) { aBackground = rNew; } - void SetValueFormat( const OUString& rFmt, LanguageType eLng, LanguageType eSys ) - { sNumFmtString = rFmt; eNumFmtLanguage = eLng; eSysLanguage = eSys; } + void SetValueFormat( const OUString& rFormat, LanguageType eLng, LanguageType eSys ) + { sNumFormatString = rFormat; eNumFormatLanguage = eLng; eSysLanguage = eSys; } bool Load( SvStream& rStream, const SwAfVersions& rVersions, sal_uInt16 nVer ); bool Save( SvStream& rStream, sal_uInt16 fileVersion ) const; @@ -228,10 +228,10 @@ The properties saved are divided into three categories: Character and box properties are stored per cell (and are lossy for tables larger than 4x4). Table properties are stored per-table, and are lossless. */ -class SW_DLLPUBLIC SwTableAutoFmt +class SW_DLLPUBLIC SwTableAutoFormat { friend void _FinitCore(); // To destroy default pointer. - static SwBoxAutoFmt* pDfltBoxAutoFmt; + static SwBoxAutoFormat* pDfltBoxAutoFormat; OUString m_aName; sal_uInt16 nStrResId; @@ -246,12 +246,12 @@ class SW_DLLPUBLIC SwTableAutoFmt // Calc specific flags. bool bInclWidthHeight : 1; - SwBoxAutoFmt* aBoxAutoFmt[ 16 ]; + SwBoxAutoFormat* aBoxAutoFormat[ 16 ]; // Writer-specific options - SvxFmtBreakItem m_aBreak; - SwFmtPageDesc m_aPageDesc; - SvxFmtKeepItem m_aKeepWithNextPara; + SvxFormatBreakItem m_aBreak; + SwFormatPageDesc m_aPageDesc; + SvxFormatKeepItem m_aKeepWithNextPara; sal_uInt16 m_aRepeatHeading; bool m_bLayoutSplit; bool m_bRowSplit; @@ -259,14 +259,14 @@ class SW_DLLPUBLIC SwTableAutoFmt SvxShadowItem m_aShadow; public: - SwTableAutoFmt( const OUString& rName ); - SwTableAutoFmt( const SwTableAutoFmt& rNew ); - ~SwTableAutoFmt(); + SwTableAutoFormat( const OUString& rName ); + SwTableAutoFormat( const SwTableAutoFormat& rNew ); + ~SwTableAutoFormat(); - SwTableAutoFmt& operator=( const SwTableAutoFmt& rNew ); + SwTableAutoFormat& operator=( const SwTableAutoFormat& rNew ); - void SetBoxFmt( const SwBoxAutoFmt& rNew, sal_uInt8 nPos ); - const SwBoxAutoFmt& GetBoxFmt( sal_uInt8 nPos ) const; + void SetBoxFormat( const SwBoxAutoFormat& rNew, sal_uInt8 nPos ); + const SwBoxAutoFormat& GetBoxFormat( sal_uInt8 nPos ) const; void SetName( const OUString& rNew ) { m_aName = rNew; nStrResId = USHRT_MAX; } OUString GetName() const { return m_aName; } @@ -297,7 +297,7 @@ public: bool Save( SvStream& rStream, sal_uInt16 fileVersion ) const; }; -class SW_DLLPUBLIC SwTableAutoFmtTbl +class SW_DLLPUBLIC SwTableAutoFormatTable { struct Impl; ::boost::scoped_ptr<Impl> m_pImpl; @@ -306,15 +306,15 @@ class SW_DLLPUBLIC SwTableAutoFmtTbl SAL_DLLPRIVATE bool Save( SvStream& rStream ) const; public: - explicit SwTableAutoFmtTbl(); - ~SwTableAutoFmtTbl(); + explicit SwTableAutoFormatTable(); + ~SwTableAutoFormatTable(); size_t size() const; - SwTableAutoFmt const& operator[](size_t i) const; - SwTableAutoFmt & operator[](size_t i); - void InsertAutoFmt(size_t i, SwTableAutoFmt * pFmt); - void EraseAutoFmt(size_t i); - SwTableAutoFmt* ReleaseAutoFmt(size_t i); + SwTableAutoFormat const& operator[](size_t i) const; + SwTableAutoFormat & operator[](size_t i); + void InsertAutoFormat(size_t i, SwTableAutoFormat * pFormat); + void EraseAutoFormat(size_t i); + SwTableAutoFormat* ReleaseAutoFormat(size_t i); bool Load(); bool Save() const; diff --git a/sw/inc/tblenum.hxx b/sw/inc/tblenum.hxx index e99713af88f4..0fef6bb66504 100644 --- a/sw/inc/tblenum.hxx +++ b/sw/inc/tblenum.hxx @@ -20,35 +20,35 @@ #define INCLUDED_SW_INC_TBLENUM_HXX // For changing table columns/rows widths/heights. -typedef sal_uInt16 TblChgWidthHeightType; +typedef sal_uInt16 TableChgWidthHeightType; -namespace nsTblChgWidthHeightType +namespace nsTableChgWidthHeightType { - const TblChgWidthHeightType WH_COL_LEFT = 0; - const TblChgWidthHeightType WH_COL_RIGHT = 1; - const TblChgWidthHeightType WH_ROW_TOP = 2; - const TblChgWidthHeightType WH_ROW_BOTTOM = 3; - const TblChgWidthHeightType WH_CELL_LEFT = 4; - const TblChgWidthHeightType WH_CELL_RIGHT = 5; - const TblChgWidthHeightType WH_CELL_TOP = 6; - const TblChgWidthHeightType WH_CELL_BOTTOM = 7; + const TableChgWidthHeightType WH_COL_LEFT = 0; + const TableChgWidthHeightType WH_COL_RIGHT = 1; + const TableChgWidthHeightType WH_ROW_TOP = 2; + const TableChgWidthHeightType WH_ROW_BOTTOM = 3; + const TableChgWidthHeightType WH_CELL_LEFT = 4; + const TableChgWidthHeightType WH_CELL_RIGHT = 5; + const TableChgWidthHeightType WH_CELL_TOP = 6; + const TableChgWidthHeightType WH_CELL_BOTTOM = 7; // The following can "or"ed into. - const TblChgWidthHeightType WH_FLAG_INSDEL = 0x4000; // Insert/Del-mode: the Bigger-Flag + const TableChgWidthHeightType WH_FLAG_INSDEL = 0x4000; // Insert/Del-mode: the Bigger-Flag // tells what happens: // bBigger -> box gets removed. // !bBigger-> box gets inserted. - const TblChgWidthHeightType WH_FLAG_BIGGER = 0x8000; // Box becomes larger -> else smaller. + const TableChgWidthHeightType WH_FLAG_BIGGER = 0x8000; // Box becomes larger -> else smaller. } -enum TblChgMode +enum TableChgMode { TBLFIX_CHGABS, // Table fixed width, change neighbour. TBLFIX_CHGPROP, // Table fixed width, change all neighbours. TBLVAR_CHGABS // Table variable, change all neighbours. }; -enum SplitTbl_HeadlineOption +enum SplitTable_HeadlineOption { HEADLINE_NONE = 0, // Leave everything in place. HEADLINE_BORDERCOPY, // Copy border of the previous line. diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx index 10d237ea62eb..aa1001607b8f 100644 --- a/sw/inc/tblsel.hxx +++ b/sw/inc/tblsel.hxx @@ -38,7 +38,7 @@ class SwLayoutFrm; class SwPaM; class SwNode; class SwTable; -class SwUndoTblMerge; +class SwUndoTableMerge; class SwCellFrm; typedef ::std::deque< SwCellFrm* > SwCellFrms; @@ -56,32 +56,32 @@ class SwSelBoxes : public o3tl::sorted_vector<SwTableBox*, CompareSwSelBoxes> {} // Selection gets extended in given direction according to enum-parameter. // Boxes are collected via the Layout; works correctly if tables are split. // (Cf. MakeSelUnions().) -typedef sal_uInt16 SwTblSearchType; -namespace nsSwTblSearchType +typedef sal_uInt16 SwTableSearchType; +namespace nsSwTableSearchType { - const SwTblSearchType TBLSEARCH_NONE = 0x1; // No extension. - const SwTblSearchType TBLSEARCH_ROW = 0x2; // Extend to rows. - const SwTblSearchType TBLSEARCH_COL = 0x3; // Extend to columns. + const SwTableSearchType TBLSEARCH_NONE = 0x1; // No extension. + const SwTableSearchType TBLSEARCH_ROW = 0x2; // Extend to rows. + const SwTableSearchType TBLSEARCH_COL = 0x3; // Extend to columns. // As flag to the other values! - const SwTblSearchType TBLSEARCH_PROTECT = 0x8; // Collect protected boxes too. - const SwTblSearchType TBLSEARCH_NO_UNION_CORRECT = 0x10; // Do not correct collected Union. + const SwTableSearchType TBLSEARCH_PROTECT = 0x8; // Collect protected boxes too. + const SwTableSearchType TBLSEARCH_NO_UNION_CORRECT = 0x10; // Do not correct collected Union. } -SW_DLLPUBLIC void GetTblSel( const SwCrsrShell& rShell, SwSelBoxes& rBoxes, - const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE ); +SW_DLLPUBLIC void GetTableSel( const SwCrsrShell& rShell, SwSelBoxes& rBoxes, + const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE ); -void GetTblSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes, - const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE ); +void GetTableSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes, + const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE ); // As before, but don't start from selection but from Start- EndFrms. -void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd, +void GetTableSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd, SwSelBoxes& rBoxes, SwCellFrms* pCells, - const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE ); + const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE ); // As before but directly via PaMs. -void GetTblSelCrs( const SwCrsrShell& rShell, SwSelBoxes& rBoxes ); -void GetTblSelCrs( const SwTableCursor& rTblCrsr, SwSelBoxes& rBoxes ); +void GetTableSelCrs( const SwCrsrShell& rShell, SwSelBoxes& rBoxes ); +void GetTableSelCrs( const SwTableCursor& rTableCrsr, SwSelBoxes& rBoxes ); // Collect boxes relevant for auto sum. bool GetAutoSumSel( const SwCrsrShell&, SwCellFrms& ); @@ -93,16 +93,16 @@ bool HasProtectedCells( const SwSelBoxes& rBoxes ); bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd); // Check if cell is part of SSelection. -// (Became a function, in order to make sure that GetTblSel() and MakeTblCrsr() +// (Became a function, in order to make sure that GetTableSel() and MakeTableCrsr() // have always the same concept of the selection. -bool IsFrmInTblSel( const SwRect& rUnion, const SwFrm* pCell ); +bool IsFrmInTableSel( const SwRect& rUnion, const SwFrm* pCell ); // Determine boxes to be merged. // In this process the rectangle gets "adapted" on the base of the layout, // i.e. boxes are added if some overlap at the sides. // Additionally a new box is created and filled with the relevant content. void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, - SwTableBox** ppMergeBox, SwUndoTblMerge* pUndo = 0 ); + SwTableBox** ppMergeBox, SwUndoTableMerge* pUndo = 0 ); // Check if selected boxes allow for a valid merge. sal_uInt16 CheckMergeSel( const SwPaM& rPam ); @@ -112,9 +112,9 @@ bool IsEmptyBox( const SwTableBox& rBox, SwPaM& rPam ); // Check if Split or InsertCol lead to a box becoming smaller than MINLAY. bool CheckSplitCells( const SwCrsrShell& rShell, sal_uInt16 nDiv, - const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE ); + const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE ); bool CheckSplitCells( const SwCursor& rCrsr, sal_uInt16 nDiv, - const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE ); + const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE ); // For working on tab selection also for split tables. class SwSelUnion @@ -138,11 +138,11 @@ typedef boost::ptr_vector<SwSelUnion> SwSelUnions; // Gets the tables involved in a table selection and the union-rectangles of the selections // - also for split tables. -// If a parameter is passed that != nsSwTblSearchType::TBLSEARCH_NONE +// If a parameter is passed that != nsSwTableSearchType::TBLSEARCH_NONE // the selection is extended in the given direction. void MakeSelUnions( SwSelUnions&, const SwLayoutFrm *pStart, const SwLayoutFrm *pEnd, - const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE ); + const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE ); // These classes copy the current table selections (rBoxes) into a // separate structure while keeping the table structure. diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx index 89802c3d41f2..f4fb97a3dc6d 100644 --- a/sw/inc/textboxhelper.hxx +++ b/sw/inc/textboxhelper.hxx @@ -24,9 +24,9 @@ class SdrPage; class SdrObject; class SfxItemSet; -class SwFrmFmt; -class SwFrmFmts; -class SwFmtCntnt; +class SwFrameFormat; +class SwFrameFormats; +class SwFormatContent; class SwDoc; class Rectangle; class _ZSortFly; @@ -42,58 +42,58 @@ class SW_DLLPUBLIC SwTextBoxHelper { public: /// Maps a draw format to a fly format. - typedef std::map<const SwFrmFmt*, const SwFrmFmt*> SavedLink; + typedef std::map<const SwFrameFormat*, const SwFrameFormat*> SavedLink; /// Maps a draw format to content. - typedef std::map<const SwFrmFmt*, SwFmtCntnt> SavedContent; + typedef std::map<const SwFrameFormat*, SwFormatContent> SavedContent; /// Create a TextBox for a shape. - static void create(SwFrmFmt* pShape); + static void create(SwFrameFormat* pShape); /// Destroy a TextBox for a shape. - static void destroy(SwFrmFmt* pShape); + static void destroy(SwFrameFormat* pShape); /// Get interface of a shape's TextBox, if there is any. - static css::uno::Any queryInterface(SwFrmFmt* pShape, const css::uno::Type& rType); + static css::uno::Any queryInterface(SwFrameFormat* pShape, const css::uno::Type& rType); /// Sync property of TextBox with the one of the shape. - static void syncProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, const css::uno::Any& rValue); + static void syncProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, const css::uno::Any& rValue); /// Does the same, but works on properties which lack an sw-specific WID / MemberID. - static void syncProperty(SwFrmFmt* pShape, const OUString& rPropertyName, const css::uno::Any& rValue); + static void syncProperty(SwFrameFormat* pShape, const OUString& rPropertyName, const css::uno::Any& rValue); /// Get a property of the underlying TextFrame. - static void getProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, css::uno::Any& rValue); + static void getProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, css::uno::Any& rValue); /// Similar to syncProperty(), but used by the internal API (e.g. for UI purposes). - static void syncFlyFrmAttr(SwFrmFmt& rShape, SfxItemSet& rSet); + static void syncFlyFrmAttr(SwFrameFormat& rShape, SfxItemSet& rSet); /// If we have an associated TextFrame, then return that. - static SwFrmFmt* findTextBox(const SwFrmFmt* pShape); - static SwFrmFmt* findTextBox(css::uno::Reference<css::drawing::XShape> xShape); + static SwFrameFormat* findTextBox(const SwFrameFormat* pShape); + static SwFrameFormat* findTextBox(css::uno::Reference<css::drawing::XShape> xShape); /// Return the textbox rectangle of a draw shape (in twips). - static Rectangle getTextRectangle(SwFrmFmt* pShape, bool bAbsolute = true); + static Rectangle getTextRectangle(SwFrameFormat* pShape, bool bAbsolute = true); /// Look up TextFrames in a document, which are in fact TextBoxes. - static std::set<const SwFrmFmt*> findTextBoxes(const SwDoc* pDoc); + static std::set<const SwFrameFormat*> findTextBoxes(const SwDoc* pDoc); /** * Look up TextFrames in a document, which are in fact TextBoxes. * - * If rNode has a matching SwCntntFrm, then only TextBoxes of rNode are + * If rNode has a matching SwContentFrm, then only TextBoxes of rNode are * returned. */ - static std::set<const SwFrmFmt*> findTextBoxes(const SwNode& rNode); + static std::set<const SwFrameFormat*> findTextBoxes(const SwNode& rNode); /// Is pObject a textbox of a drawinglayer shape? static bool isTextBox(const SdrObject* pObject); /// Build a textbox -> shape format map. - static std::map<SwFrmFmt*, SwFrmFmt*> findShapes(const SwDoc* pDoc); + static std::map<SwFrameFormat*, SwFrameFormat*> findShapes(const SwDoc* pDoc); /// Count number of shapes in the document, excluding TextBoxes. - static sal_Int32 getCount(SdrPage* pPage, std::set<const SwFrmFmt*>& rTextBoxes); + static sal_Int32 getCount(SdrPage* pPage, std::set<const SwFrameFormat*>& rTextBoxes); /// Get a shape by index, excluding TextBoxes. - static css::uno::Any getByIndex(SdrPage* pPage, sal_Int32 nIndex, std::set<const SwFrmFmt*>& rTextBoxes) throw(css::lang::IndexOutOfBoundsException); + static css::uno::Any getByIndex(SdrPage* pPage, sal_Int32 nIndex, std::set<const SwFrameFormat*>& rTextBoxes) throw(css::lang::IndexOutOfBoundsException); /// Get the order of the shape, excluding TextBoxes. - static sal_Int32 getOrdNum(const SdrObject* pObject, std::set<const SwFrmFmt*>& rTextBoxes); + static sal_Int32 getOrdNum(const SdrObject* pObject, std::set<const SwFrameFormat*>& rTextBoxes); /// Saves the current shape -> textbox links in a map, so they can be restored later. - static void saveLinks(const SwFrmFmts& rFormats, std::map<const SwFrmFmt*, const SwFrmFmt*>& rLinks); + static void saveLinks(const SwFrameFormats& rFormats, std::map<const SwFrameFormat*, const SwFrameFormat*>& rLinks); /// Reset the shape -> textbox link on the shape, and save it to the map, so it can be restored later. - static void resetLink(SwFrmFmt* pShape, std::map<const SwFrmFmt*, SwFmtCntnt>& rOldContent); + static void resetLink(SwFrameFormat* pShape, std::map<const SwFrameFormat*, SwFormatContent>& rOldContent); /// Undo the effect of saveLinks() + individual resetLink() calls. - static void restoreLinks(std::set<_ZSortFly>& rOld, std::vector<SwFrmFmt*>& rNew, SavedLink& rSavedLinks, SavedContent& rResetContent); + static void restoreLinks(std::set<_ZSortFly>& rOld, std::vector<SwFrameFormat*>& rNew, SavedLink& rSavedLinks, SavedContent& rResetContent); }; #endif // INCLUDED_SW_INC_TEXTBOXHELPER_HXX diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx index 8e67ce5b032f..de112998501d 100644 --- a/sw/inc/tgrditem.hxx +++ b/sw/inc/tgrditem.hxx @@ -108,7 +108,7 @@ public: inline const SwTextGridItem &SwAttrSet::GetTextGrid(bool bInP) const { return static_cast<const SwTextGridItem&>(Get( RES_TEXTGRID, bInP )); } -inline const SwTextGridItem &SwFmt::GetTextGrid(bool bInP) const +inline const SwTextGridItem &SwFormat::GetTextGrid(bool bInP) const { return static_cast<const SwTextGridItem&>(m_aSet.Get( RES_TEXTGRID, bInP )); } #endif diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index 6e394742b0bb..1b75da2d9472 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -38,7 +38,7 @@ namespace com { namespace sun { namespace star { class SwTOXType; class SwTOXMark; -class SwTxtTOXMark; +class SwTextTOXMark; class SwDoc; typedef std::vector<SwTOXMark*> SwTOXMarks; @@ -54,7 +54,7 @@ class SW_DLLPUBLIC SwTOXMark , public SwModify { friend void _InitCore(); - friend class SwTxtTOXMark; + friend class SwTextTOXMark; OUString aAltText; // Text of caption is different. OUString aPrimaryKey; @@ -66,7 +66,7 @@ class SW_DLLPUBLIC SwTOXMark OUString aPrimaryKeyReading; OUString aSecondaryKeyReading; - SwTxtTOXMark* pTxtAttr; + SwTextTOXMark* pTextAttr; sal_uInt16 nLevel; OUString m_aBookmarkName; @@ -137,8 +137,8 @@ public: inline const SwTOXType* GetTOXType() const; - const SwTxtTOXMark* GetTxtTOXMark() const { return pTxtAttr; } - SwTxtTOXMark* GetTxtTOXMark() { return pTxtAttr; } + const SwTextTOXMark* GetTextTOXMark() const { return pTextAttr; } + SwTextTOXMark* GetTextTOXMark() { return pTextAttr; } SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference< ::com::sun::star::text::XDocumentIndexMark> const& GetXTOXMark() const @@ -332,7 +332,7 @@ public: static OUString GetFormLinkStt(); static OUString GetFormLinkEnd(); static OUString GetFormEntryNum(); - static OUString GetFormEntryTxt(); + static OUString GetFormEntryText(); static OUString GetFormChapterMark(); static OUString GetFormText(); static OUString GetFormAuth(); @@ -585,10 +585,10 @@ inline void SwTOXMark::SetSecondaryKey( const OUString& rKey ) aSecondaryKey = rKey; } -inline void SwTOXMark::SetTextReading( const OUString& rTxt ) +inline void SwTOXMark::SetTextReading( const OUString& rText ) { SAL_WARN_IF(GetTOXType()->GetType() != TOX_INDEX, "sw", "Wrong type"); - aTextReading = rTxt; + aTextReading = rText; } inline void SwTOXMark::SetPrimaryKeyReading( const OUString& rKey ) diff --git a/sw/inc/toxwrap.hxx b/sw/inc/toxwrap.hxx index d1588022cc15..b83e34906146 100644 --- a/sw/inc/toxwrap.hxx +++ b/sw/inc/toxwrap.hxx @@ -45,7 +45,7 @@ public: void SetLocale( const ::com::sun::star::lang::Locale& rLocale ) { aLcl = rLocale; } - OUString GetIndexKey( const OUString& rTxt, const OUString& rTxtReading, + OUString GetIndexKey( const OUString& rText, const OUString& rTextReading, const ::com::sun::star::lang::Locale& rLocale ) const; OUString GetFollowingText( bool bMorePages ) const; @@ -56,9 +56,9 @@ public: bool LoadAlgorithm( const ::com::sun::star::lang::Locale& rLcl, const OUString& sSortAlgorithm, long nOptions ) const; - sal_Int16 CompareIndexEntry( const OUString& rTxt1, const OUString& rTxtReading1, + sal_Int16 CompareIndexEntry( const OUString& rText1, const OUString& rTextReading1, const ::com::sun::star::lang::Locale& rLcl1, - const OUString& rTxt2, const OUString& rTxtReading2, + const OUString& rText2, const OUString& rTextReading2, const ::com::sun::star::lang::Locale& rLcl2 ) const; }; diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx index d8ccb02eded6..f1f70b431555 100644 --- a/sw/inc/txatbase.hxx +++ b/sw/inc/txatbase.hxx @@ -38,7 +38,7 @@ class SfxItemPool; class SvXMLAttrContainerItem; -class SwTxtAttr : private boost::noncopyable +class SwTextAttr : private boost::noncopyable { private: SfxPoolItem * const m_pAttr; @@ -47,23 +47,23 @@ private: bool m_bLockExpandFlag : 1; bool m_bDontMoveAttr : 1; // refmarks, toxmarks - bool m_bCharFmtAttr : 1; // charfmt, inet + bool m_bCharFormatAttr : 1; // charfmt, inet bool m_bOverlapAllowedAttr : 1; // refmarks, toxmarks bool m_bPriorityAttr : 1; // attribute has priority (redlining) bool m_bDontExpandStart : 1; // don't expand start at paragraph start (ruby) - bool m_bNesting : 1; // SwTxtAttrNesting + bool m_bNesting : 1; // SwTextAttrNesting bool m_bHasDummyChar : 1; // without end + meta bool m_bFormatIgnoreStart : 1; ///< text formatting should ignore start bool m_bFormatIgnoreEnd : 1; ///< text formatting should ignore end bool m_bHasContent : 1; // text attribute with content protected: - SwTxtAttr( SfxPoolItem& rAttr, sal_Int32 nStart ); - virtual ~SwTxtAttr(); + SwTextAttr( SfxPoolItem& rAttr, sal_Int32 nStart ); + virtual ~SwTextAttr(); void SetLockExpandFlag( bool bFlag ) { m_bLockExpandFlag = bFlag; } void SetDontMoveAttr( bool bFlag ) { m_bDontMoveAttr = bFlag; } - void SetCharFmtAttr( bool bFlag ) { m_bCharFmtAttr = bFlag; } + void SetCharFormatAttr( bool bFlag ) { m_bCharFormatAttr = bFlag; } void SetOverlapAllowedAttr( bool bFlag ){ m_bOverlapAllowedAttr = bFlag; } void SetDontExpandStartAttr(bool bFlag) { m_bDontExpandStart = bFlag; } void SetNesting(const bool bFlag) { m_bNesting = bFlag; } @@ -73,7 +73,7 @@ protected: public: /// destroy instance - static void Destroy( SwTxtAttr * pToDestroy, SfxItemPool& rPool ); + static void Destroy( SwTextAttr * pToDestroy, SfxItemPool& rPool ); /// start position sal_Int32& GetStart() { return m_nStart; } @@ -89,7 +89,7 @@ public: bool DontExpand() const { return m_bDontExpand; } bool IsLockExpandFlag() const { return m_bLockExpandFlag; } bool IsDontMoveAttr() const { return m_bDontMoveAttr; } - bool IsCharFmtAttr() const { return m_bCharFmtAttr; } + bool IsCharFormatAttr() const { return m_bCharFormatAttr; } bool IsOverlapAllowedAttr() const { return m_bOverlapAllowedAttr; } bool IsPriorityAttr() const { return m_bPriorityAttr; } void SetPriorityAttr( bool bFlag ) { m_bPriorityAttr = bFlag; } @@ -106,66 +106,66 @@ public: inline SfxPoolItem& GetAttr(); inline sal_uInt16 Which() const { return GetAttr().Which(); } - bool operator==( const SwTxtAttr& ) const; + bool operator==( const SwTextAttr& ) const; - inline const SwFmtCharFmt &GetCharFmt() const; - inline const SwFmtAutoFmt &GetAutoFmt() const; - inline const SwFmtFld &GetFmtFld() const; - inline const SwFmtFtn &GetFtn() const; - inline const SwFmtFlyCnt &GetFlyCnt() const; + inline const SwFormatCharFormat &GetCharFormat() const; + inline const SwFormatAutoFormat &GetAutoFormat() const; + inline const SwFormatField &GetFormatField() const; + inline const SwFormatFootnote &GetFootnote() const; + inline const SwFormatFlyCnt &GetFlyCnt() const; inline const SwTOXMark &GetTOXMark() const; - inline const SwFmtRefMark &GetRefMark() const; - inline const SwFmtINetFmt &GetINetFmt() const; - inline const SwFmtRuby &GetRuby() const; - inline const SwFmtMeta &GetMeta() const; + inline const SwFormatRefMark &GetRefMark() const; + inline const SwFormatINetFormat &GetINetFormat() const; + inline const SwFormatRuby &GetRuby() const; + inline const SwFormatMeta &GetMeta() const; void dumpAsXml(struct _xmlTextWriter* pWriter) const; }; -class SwTxtAttrEnd : public virtual SwTxtAttr +class SwTextAttrEnd : public virtual SwTextAttr { protected: sal_Int32 m_nEnd; public: - SwTxtAttrEnd( SfxPoolItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); + SwTextAttrEnd( SfxPoolItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); virtual sal_Int32* GetEnd() SAL_OVERRIDE; }; // attribute that must not overlap others -class SwTxtAttrNesting : public SwTxtAttrEnd +class SwTextAttrNesting : public SwTextAttrEnd { protected: - SwTxtAttrNesting( SfxPoolItem & i_rAttr, + SwTextAttrNesting( SfxPoolItem & i_rAttr, const sal_Int32 i_nStart, const sal_Int32 i_nEnd ); - virtual ~SwTxtAttrNesting(); + virtual ~SwTextAttrNesting(); }; -inline const sal_Int32* SwTxtAttr::End() const +inline const sal_Int32* SwTextAttr::End() const { - return const_cast<SwTxtAttr * >(this)->GetEnd(); + return const_cast<SwTextAttr * >(this)->GetEnd(); } -inline const sal_Int32* SwTxtAttr::GetAnyEnd() const +inline const sal_Int32* SwTextAttr::GetAnyEnd() const { const sal_Int32* pEnd = End(); return pEnd ? pEnd : &GetStart(); } -inline const SfxPoolItem& SwTxtAttr::GetAttr() const +inline const SfxPoolItem& SwTextAttr::GetAttr() const { assert( m_pAttr ); return *m_pAttr; } -inline SfxPoolItem& SwTxtAttr::GetAttr() +inline SfxPoolItem& SwTextAttr::GetAttr() { return const_cast<SfxPoolItem&>( - const_cast<const SwTxtAttr*>(this)->GetAttr()); + const_cast<const SwTextAttr*>(this)->GetAttr()); } -inline void SwTxtAttr::SetDontExpand( bool bDontExpand ) +inline void SwTextAttr::SetDontExpand( bool bDontExpand ) { if ( !m_bLockExpandFlag ) { @@ -173,68 +173,68 @@ inline void SwTxtAttr::SetDontExpand( bool bDontExpand ) } } -inline const SwFmtCharFmt& SwTxtAttr::GetCharFmt() const +inline const SwFormatCharFormat& SwTextAttr::GetCharFormat() const { assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_CHARFMT ); - return static_cast<const SwFmtCharFmt&>(*m_pAttr); + return static_cast<const SwFormatCharFormat&>(*m_pAttr); } -inline const SwFmtAutoFmt& SwTxtAttr::GetAutoFmt() const +inline const SwFormatAutoFormat& SwTextAttr::GetAutoFormat() const { assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_AUTOFMT ); - return static_cast<const SwFmtAutoFmt&>(*m_pAttr); + return static_cast<const SwFormatAutoFormat&>(*m_pAttr); } -inline const SwFmtFld& SwTxtAttr::GetFmtFld() const +inline const SwFormatField& SwTextAttr::GetFormatField() const { assert( m_pAttr && ( m_pAttr->Which() == RES_TXTATR_FIELD || m_pAttr->Which() == RES_TXTATR_ANNOTATION || m_pAttr->Which() == RES_TXTATR_INPUTFIELD )); - return static_cast<const SwFmtFld&>(*m_pAttr); + return static_cast<const SwFormatField&>(*m_pAttr); } -inline const SwFmtFtn& SwTxtAttr::GetFtn() const +inline const SwFormatFootnote& SwTextAttr::GetFootnote() const { assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_FTN ); - return static_cast<const SwFmtFtn&>(*m_pAttr); + return static_cast<const SwFormatFootnote&>(*m_pAttr); } -inline const SwFmtFlyCnt& SwTxtAttr::GetFlyCnt() const +inline const SwFormatFlyCnt& SwTextAttr::GetFlyCnt() const { assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_FLYCNT ); - return static_cast<const SwFmtFlyCnt&>(*m_pAttr); + return static_cast<const SwFormatFlyCnt&>(*m_pAttr); } -inline const SwTOXMark& SwTxtAttr::GetTOXMark() const +inline const SwTOXMark& SwTextAttr::GetTOXMark() const { assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_TOXMARK ); return static_cast<const SwTOXMark&>(*m_pAttr); } -inline const SwFmtRefMark& SwTxtAttr::GetRefMark() const +inline const SwFormatRefMark& SwTextAttr::GetRefMark() const { assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_REFMARK ); - return static_cast<const SwFmtRefMark&>(*m_pAttr); + return static_cast<const SwFormatRefMark&>(*m_pAttr); } -inline const SwFmtINetFmt& SwTxtAttr::GetINetFmt() const +inline const SwFormatINetFormat& SwTextAttr::GetINetFormat() const { assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_INETFMT ); - return static_cast<const SwFmtINetFmt&>(*m_pAttr); + return static_cast<const SwFormatINetFormat&>(*m_pAttr); } -inline const SwFmtRuby& SwTxtAttr::GetRuby() const +inline const SwFormatRuby& SwTextAttr::GetRuby() const { assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_CJK_RUBY ); - return static_cast<const SwFmtRuby&>(*m_pAttr); + return static_cast<const SwFormatRuby&>(*m_pAttr); } -inline const SwFmtMeta& SwTxtAttr::GetMeta() const +inline const SwFormatMeta& SwTextAttr::GetMeta() const { assert( m_pAttr && (m_pAttr->Which() == RES_TXTATR_META || m_pAttr->Which() == RES_TXTATR_METAFIELD) ); - return static_cast<const SwFmtMeta&>(*m_pAttr); + return static_cast<const SwFormatMeta&>(*m_pAttr); } // these should be static_casts but with virtual inheritance it's not possible diff --git a/sw/inc/txatritr.hxx b/sw/inc/txatritr.hxx index ced47511f808..6ab4f0c1a06d 100644 --- a/sw/inc/txatritr.hxx +++ b/sw/inc/txatritr.hxx @@ -26,8 +26,8 @@ #include <swtypes.hxx> #include <deque> -class SwTxtNode; -class SwTxtAttr; +class SwTextNode; +class SwTextAttr; class SfxPoolItem; class SwScriptIterator @@ -48,22 +48,22 @@ public: const OUString& GetText() const { return m_rText; } }; -class SwTxtAttrIterator +class SwTextAttrIterator { SwScriptIterator aSIter; - std::deque<const SwTxtAttr*> aStack; - const SwTxtNode& rTxtNd; + std::deque<const SwTextAttr*> aStack; + const SwTextNode& rTextNd; const SfxPoolItem *pParaItem, *pCurItem; size_t nAttrPos; sal_Int32 nChgPos; sal_uInt16 nWhichId; bool bIsUseGetWhichOfScript; - void AddToStack( const SwTxtAttr& rAttr ); + void AddToStack( const SwTextAttr& rAttr ); void SearchNextChg(); public: - SwTxtAttrIterator( const SwTxtNode& rTxtNd, sal_uInt16 nWhichId, + SwTextAttrIterator( const SwTextNode& rTextNd, sal_uInt16 nWhichId, sal_Int32 nStart = 0, bool bUseGetWhichOfScript = true ); bool Next(); @@ -72,13 +72,13 @@ public: sal_Int32 GetChgPos() const { return nChgPos; } }; -class SwLanguageIterator : public SwTxtAttrIterator +class SwLanguageIterator : public SwTextAttrIterator { public: - SwLanguageIterator( const SwTxtNode& rTxtNode, sal_Int32 nStart = 0, + SwLanguageIterator( const SwTextNode& rTextNode, sal_Int32 nStart = 0, sal_uInt16 nWhich = RES_CHRATR_LANGUAGE, bool bUseGetWhichOfScript = true ) - : SwTxtAttrIterator( rTxtNode, nWhich, nStart, bUseGetWhichOfScript ) + : SwTextAttrIterator( rTextNode, nWhich, nStart, bUseGetWhichOfScript ) {} sal_uInt16 GetLanguage() const diff --git a/sw/inc/txtannotationfld.hxx b/sw/inc/txtannotationfld.hxx index 5dc18ecd303c..7f7e330b6134 100644 --- a/sw/inc/txtannotationfld.hxx +++ b/sw/inc/txtannotationfld.hxx @@ -25,15 +25,15 @@ class SwDoc; -class SwTxtAnnotationFld : public SwTxtFld +class SwTextAnnotationField : public SwTextField { public: - SwTxtAnnotationFld( - SwFmtFld & rAttr, + SwTextAnnotationField( + SwFormatField & rAttr, sal_Int32 const nStart, bool const bInClipboard ); - virtual ~SwTxtAnnotationFld(); + virtual ~SwTextAnnotationField(); ::sw::mark::IMark* GetAnnotationMark( SwDoc* pDoc = NULL ) const; diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx index a5a4e1d8b282..02e5a1f2b82d 100644 --- a/sw/inc/txtatr.hxx +++ b/sw/inc/txtatr.hxx @@ -22,82 +22,82 @@ #include <txatbase.hxx> #include <calbck.hxx> -class SwTxtNode; -class SwCharFmt; +class SwTextNode; +class SwCharFormat; namespace sw { class MetaFieldManager; } -class SwTxtCharFmt : public SwTxtAttrEnd +class SwTextCharFormat : public SwTextAttrEnd { - SwTxtNode * m_pTxtNode; + SwTextNode * m_pTextNode; sal_uInt16 m_nSortNumber; public: - SwTxtCharFmt( SwFmtCharFmt& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); - virtual ~SwTxtCharFmt( ); + SwTextCharFormat( SwFormatCharFormat& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); + virtual ~SwTextCharFormat( ); - // Passed from SwFmtCharFmt (no derivation from SwClient!). + // Passed from SwFormatCharFormat (no derivation from SwClient!). void ModifyNotification( const SfxPoolItem*, const SfxPoolItem* ); bool GetInfo( SfxPoolItem& rInfo ) const; - // get and set TxtNode pointer - void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; } + // get and set TextNode pointer + void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; } void SetSortNumber( sal_uInt16 nSortNumber ) { m_nSortNumber = nSortNumber; } sal_uInt16 GetSortNumber() const { return m_nSortNumber; } }; -class SwTxtMeta : public SwTxtAttrNesting +class SwTextMeta : public SwTextAttrNesting { private: - SwTxtMeta( SwFmtMeta & i_rAttr, + SwTextMeta( SwFormatMeta & i_rAttr, const sal_Int32 i_nStart, const sal_Int32 i_nEnd ); public: - static SwTxtMeta * CreateTxtMeta( + static SwTextMeta * CreateTextMeta( ::sw::MetaFieldManager & i_rTargetDocManager, - SwTxtNode *const i_pTargetTxtNode, - SwFmtMeta & i_rAttr, + SwTextNode *const i_pTargetTextNode, + SwFormatMeta & i_rAttr, sal_Int32 const i_nStart, sal_Int32 const i_nEnd, bool const i_bIsCopy); - virtual ~SwTxtMeta(); + virtual ~SwTextMeta(); - void ChgTxtNode(SwTxtNode * const pNode); + void ChgTextNode(SwTextNode * const pNode); }; -class SW_DLLPUBLIC SwTxtRuby : public SwTxtAttrNesting, public SwClient +class SW_DLLPUBLIC SwTextRuby : public SwTextAttrNesting, public SwClient { - SwTxtNode* m_pTxtNode; + SwTextNode* m_pTextNode; protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; public: - SwTxtRuby( SwFmtRuby& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); - virtual ~SwTxtRuby(); + SwTextRuby( SwFormatRuby& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); + virtual ~SwTextRuby(); TYPEINFO_OVERRIDE(); virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE; - SAL_DLLPRIVATE void InitRuby(SwTxtNode & rNode); + SAL_DLLPRIVATE void InitRuby(SwTextNode & rNode); - /// Get and set TxtNode pointer. - const SwTxtNode* GetpTxtNode() const { return m_pTxtNode; } - inline const SwTxtNode& GetTxtNode() const; - void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; } + /// Get and set TextNode pointer. + const SwTextNode* GetpTextNode() const { return m_pTextNode; } + inline const SwTextNode& GetTextNode() const; + void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; } - SwCharFmt* GetCharFmt(); - const SwCharFmt* GetCharFmt() const - { return (const_cast<SwTxtRuby*>(this))->GetCharFmt(); } + SwCharFormat* GetCharFormat(); + const SwCharFormat* GetCharFormat() const + { return (const_cast<SwTextRuby*>(this))->GetCharFormat(); } }; -inline const SwTxtNode& SwTxtRuby::GetTxtNode() const +inline const SwTextNode& SwTextRuby::GetTextNode() const { - assert( m_pTxtNode ); - return *m_pTxtNode; + assert( m_pTextNode ); + return *m_pTextNode; } #endif diff --git a/sw/inc/txtflcnt.hxx b/sw/inc/txtflcnt.hxx index b3e2b6cfb103..74f78691db0f 100644 --- a/sw/inc/txtflcnt.hxx +++ b/sw/inc/txtflcnt.hxx @@ -23,34 +23,34 @@ class SwFlyInCntFrm; class SwFrm; -class SwTxtNode; +class SwTextNode; class SwDoc; // Attribute for line-bound frames (without end index). -class SwTxtFlyCnt : public SwTxtAttr +class SwTextFlyCnt : public SwTextAttr { SwFlyInCntFrm *_GetFlyFrm( const SwFrm *pCurrFrm ); public: - SwTxtFlyCnt( SwFmtFlyCnt& rAttr, sal_Int32 nStart ); + SwTextFlyCnt( SwFormatFlyCnt& rAttr, sal_Int32 nStart ); - // Sets anchor in pFmt and - void SetAnchor( const SwTxtNode *pNode ); + // Sets anchor in pFormat and + void SetAnchor( const SwTextNode *pNode ); inline SwFlyInCntFrm *GetFlyFrm( const SwFrm *pCurrFrm ); inline const SwFlyInCntFrm *GetFlyFrm( const SwFrm *pCurrFrm ) const; // creates for itself a new FlyFrameFormat. - void CopyFlyFmt( SwDoc* pDoc ); + void CopyFlyFormat( SwDoc* pDoc ); }; -inline SwFlyInCntFrm *SwTxtFlyCnt::GetFlyFrm( const SwFrm *pCurrFrm ) +inline SwFlyInCntFrm *SwTextFlyCnt::GetFlyFrm( const SwFrm *pCurrFrm ) { return _GetFlyFrm( pCurrFrm ); } -inline const SwFlyInCntFrm *SwTxtFlyCnt::GetFlyFrm( const SwFrm *pCurrFrm ) const +inline const SwFlyInCntFrm *SwTextFlyCnt::GetFlyFrm( const SwFrm *pCurrFrm ) const { - return (const_cast<SwTxtFlyCnt*>(this))->_GetFlyFrm( pCurrFrm ); + return (const_cast<SwTextFlyCnt*>(this))->_GetFlyFrm( pCurrFrm ); } #endif diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx index fa40f76090d3..d4189ed6f8cd 100644 --- a/sw/inc/txtfld.hxx +++ b/sw/inc/txtfld.hxx @@ -26,70 +26,70 @@ #include <boost/shared_ptr.hpp> class SwPaM; -class SwTxtNode; +class SwTextNode; -class SwTxtFld : public virtual SwTxtAttr +class SwTextField : public virtual SwTextAttr { - mutable OUString m_aExpand; // only used to determine, if field content is changing in <ExpandTxtFld()> - SwTxtNode * m_pTxtNode; + mutable OUString m_aExpand; // only used to determine, if field content is changing in <ExpandTextField()> + SwTextNode * m_pTextNode; public: - SwTxtFld( - SwFmtFld & rAttr, + SwTextField( + SwFormatField & rAttr, sal_Int32 const nStart, bool const bInClipboard ); - virtual ~SwTxtFld(); + virtual ~SwTextField(); - void CopyTxtFld( SwTxtFld *pDest ) const; + void CopyTextField( SwTextField *pDest ) const; - void ExpandTxtFld( const bool bForceNotify = false ) const; + void ExpandTextField( const bool bForceNotify = false ) const; - // get and set TxtNode pointer - SwTxtNode* GetpTxtNode() const + // get and set TextNode pointer + SwTextNode* GetpTextNode() const { - return m_pTxtNode; + return m_pTextNode; } - SwTxtNode& GetTxtNode() const + SwTextNode& GetTextNode() const { - OSL_ENSURE( m_pTxtNode, "SwTxtFld:: where is my TxtNode?" ); - return *m_pTxtNode; + OSL_ENSURE( m_pTextNode, "SwTextField:: where is my TextNode?" ); + return *m_pTextNode; } - void ChgTxtNode( SwTxtNode* pNew ) + void ChgTextNode( SwTextNode* pNew ) { - m_pTxtNode = pNew; + m_pTextNode = pNew; } - bool IsFldInDoc() const; + bool IsFieldInDoc() const; // enable notification that field content has changed and needs reformatting - virtual void NotifyContentChange( SwFmtFld& rFmtFld ); + virtual void NotifyContentChange( SwFormatField& rFormatField ); // deletes the given field via removing the corresponding text selection from the document's content - static void DeleteTxtFld( const SwTxtFld& rTxtFld ); + static void DeleteTextField( const SwTextField& rTextField ); // return text selection for the given field - static void GetPamForTxtFld( const SwTxtFld& rTxtFld, - boost::shared_ptr< SwPaM >& rPamForTxtFld ); + static void GetPamForTextField( const SwTextField& rTextField, + boost::shared_ptr< SwPaM >& rPamForTextField ); }; -class SwTxtInputFld - : public SwTxtAttrNesting - , public SwTxtFld +class SwTextInputField + : public SwTextAttrNesting + , public SwTextField { public: - SwTxtInputFld( - SwFmtFld & rAttr, + SwTextInputField( + SwFormatField & rAttr, sal_Int32 const nStart, sal_Int32 const nEnd, bool const bInClipboard ); - virtual ~SwTxtInputFld(); + virtual ~SwTextInputField(); void LockNotifyContentChange(); void UnlockNotifyContentChange(); - virtual void NotifyContentChange( SwFmtFld& rFmtFld ) SAL_OVERRIDE; + virtual void NotifyContentChange( SwFormatField& rFormatField ) SAL_OVERRIDE; void UpdateTextNodeContent( const OUString& rNewContent ); diff --git a/sw/inc/txtftn.hxx b/sw/inc/txtftn.hxx index 94b2712c2f0a..2d34daaabae6 100644 --- a/sw/inc/txtftn.hxx +++ b/sw/inc/txtftn.hxx @@ -24,34 +24,34 @@ namespace rtl { class OUString; } class SwNodeIndex; -class SwTxtNode; +class SwTextNode; class SwNodes; class SwDoc; class SwFrm; -class SW_DLLPUBLIC SwTxtFtn : public SwTxtAttr +class SW_DLLPUBLIC SwTextFootnote : public SwTextAttr { SwNodeIndex * m_pStartNode; - SwTxtNode * m_pTxtNode; + SwTextNode * m_pTextNode; sal_uInt16 m_nSeqNo; public: - SwTxtFtn( SwFmtFtn& rAttr, sal_Int32 nStart ); - virtual ~SwTxtFtn(); + SwTextFootnote( SwFormatFootnote& rAttr, sal_Int32 nStart ); + virtual ~SwTextFootnote(); inline SwNodeIndex *GetStartNode() const { return m_pStartNode; } void SetStartNode( const SwNodeIndex *pNode, bool bDelNodes = true ); void SetNumber( const sal_uInt16 nNumber, const OUString &sNumStr ); - void CopyFtn(SwTxtFtn & rDest, SwTxtNode & rDestNode) const; + void CopyFootnote(SwTextFootnote & rDest, SwTextNode & rDestNode) const; - // Get and set TxtNode pointer. - inline const SwTxtNode& GetTxtNode() const; - void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; } + // Get and set TextNode pointer. + inline const SwTextNode& GetTextNode() const; + void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; } // Create a new empty TextSection for this footnote. void MakeNewTextSection( SwNodes& rNodes ); - // Delete the FtnFrame from page. + // Delete the FootnoteFrame from page. void DelFrms( const SwFrm* ); // Check conditional paragraph styles. @@ -65,10 +65,10 @@ public: static void SetUniqueSeqRefNo( SwDoc& rDoc ); }; -inline const SwTxtNode& SwTxtFtn::GetTxtNode() const +inline const SwTextNode& SwTextFootnote::GetTextNode() const { - assert( m_pTxtNode ); - return *m_pTxtNode; + assert( m_pTextNode ); + return *m_pTextNode; } #endif diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx index 8e70df02e96c..9a08f70faa67 100644 --- a/sw/inc/txtinet.hxx +++ b/sw/inc/txtinet.hxx @@ -23,12 +23,12 @@ #include <txtatr.hxx> #include <calbck.hxx> -class SwTxtNode; -class SwCharFmt; +class SwTextNode; +class SwCharFormat; -class SW_DLLPUBLIC SwTxtINetFmt : public SwTxtAttrNesting, public SwClient +class SW_DLLPUBLIC SwTextINetFormat : public SwTextAttrNesting, public SwClient { - SwTxtNode * m_pTxtNode; + SwTextNode * m_pTextNode; bool m_bVisited : 1; // visited link? bool m_bVisitedValid : 1; // is m_bVisited valid? @@ -36,23 +36,23 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; public: - SwTxtINetFmt( SwFmtINetFmt& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); - virtual ~SwTxtINetFmt(); + SwTextINetFormat( SwFormatINetFormat& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); + virtual ~SwTextINetFormat(); TYPEINFO_OVERRIDE(); virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE; - SAL_DLLPRIVATE void InitINetFmt(SwTxtNode & rNode); + SAL_DLLPRIVATE void InitINetFormat(SwTextNode & rNode); - // get and set TxtNode pointer - const SwTxtNode* GetpTxtNode() const { return m_pTxtNode; } - inline const SwTxtNode& GetTxtNode() const; - inline SwTxtNode& GetTxtNode(); - void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; } + // get and set TextNode pointer + const SwTextNode* GetpTextNode() const { return m_pTextNode; } + inline const SwTextNode& GetTextNode() const; + inline SwTextNode& GetTextNode(); + void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; } - SwCharFmt* GetCharFmt(); - const SwCharFmt* GetCharFmt() const - { return const_cast<SwTxtINetFmt*>(this)->GetCharFmt(); } + SwCharFormat* GetCharFormat(); + const SwCharFormat* GetCharFormat() const + { return const_cast<SwTextINetFormat*>(this)->GetCharFormat(); } bool IsVisited() const { return m_bVisited; } void SetVisited( bool bNew ) { m_bVisited = bNew; } @@ -63,15 +63,15 @@ public: bool IsProtect() const; }; -inline const SwTxtNode& SwTxtINetFmt::GetTxtNode() const +inline const SwTextNode& SwTextINetFormat::GetTextNode() const { - assert( m_pTxtNode ); - return *m_pTxtNode; + assert( m_pTextNode ); + return *m_pTextNode; } -inline SwTxtNode& SwTxtINetFmt::GetTxtNode() +inline SwTextNode& SwTextINetFormat::GetTextNode() { - return const_cast<SwTxtNode&>( const_cast<SwTxtINetFmt const*>(this)->GetTxtNode() ); + return const_cast<SwTextNode&>( const_cast<SwTextINetFormat const*>(this)->GetTextNode() ); } #endif diff --git a/sw/inc/txtrfmrk.hxx b/sw/inc/txtrfmrk.hxx index eee21e2f9f32..ab72f76d3cf0 100644 --- a/sw/inc/txtrfmrk.hxx +++ b/sw/inc/txtrfmrk.hxx @@ -21,29 +21,29 @@ #include <txatbase.hxx> -class SwTxtNode; +class SwTextNode; // Attribute for content-/position references in text. -class SwTxtRefMark : public SwTxtAttrEnd +class SwTextRefMark : public SwTextAttrEnd { - SwTxtNode * m_pTxtNode; + SwTextNode * m_pTextNode; sal_Int32 * m_pEnd; // end is optional (point reference) public: - SwTxtRefMark( SwFmtRefMark& rAttr, + SwTextRefMark( SwFormatRefMark& rAttr, sal_Int32 const nStart, sal_Int32 const*const pEnd = 0); - virtual sal_Int32* GetEnd() SAL_OVERRIDE; // SwTxtAttr + virtual sal_Int32* GetEnd() SAL_OVERRIDE; // SwTextAttr - // get and set TxtNode pointer - inline const SwTxtNode& GetTxtNode() const; - void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; } + // get and set TextNode pointer + inline const SwTextNode& GetTextNode() const; + void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; } }; -inline const SwTxtNode& SwTxtRefMark::GetTxtNode() const +inline const SwTextNode& SwTextRefMark::GetTextNode() const { - assert( m_pTxtNode ); - return *m_pTxtNode; + assert( m_pTextNode ); + return *m_pTextNode; } #endif diff --git a/sw/inc/txttxmrk.hxx b/sw/inc/txttxmrk.hxx index 6436b859f342..f935254fc682 100644 --- a/sw/inc/txttxmrk.hxx +++ b/sw/inc/txttxmrk.hxx @@ -21,34 +21,34 @@ #include <txatbase.hxx> -class SwTxtNode; +class SwTextNode; class SwDoc; // Attribute for indices/tables of contents. -class SwTxtTOXMark : public SwTxtAttrEnd +class SwTextTOXMark : public SwTextAttrEnd { - SwTxtNode * m_pTxtNode; + SwTextNode * m_pTextNode; sal_Int32 * m_pEnd; // 0 if SwTOXMark without AlternativeText public: - SwTxtTOXMark( SwTOXMark& rAttr, + SwTextTOXMark( SwTOXMark& rAttr, sal_Int32 const nStart, sal_Int32 const*const pEnd = 0); - virtual ~SwTxtTOXMark(); + virtual ~SwTextTOXMark(); - virtual sal_Int32 *GetEnd() SAL_OVERRIDE; // SwTxtAttr + virtual sal_Int32 *GetEnd() SAL_OVERRIDE; // SwTextAttr void CopyTOXMark( SwDoc* pDestDoc ); - // get and set TxtNode pointer - inline const SwTxtNode* GetpTxtNd() const { return m_pTxtNode; } - inline const SwTxtNode& GetTxtNode() const; - void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; } + // get and set TextNode pointer + inline const SwTextNode* GetpTextNd() const { return m_pTextNode; } + inline const SwTextNode& GetTextNode() const; + void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; } }; -inline const SwTxtNode& SwTxtTOXMark::GetTxtNode() const +inline const SwTextNode& SwTextTOXMark::GetTextNode() const { - assert( m_pTxtNode ); - return *m_pTxtNode; + assert( m_pTextNode ); + return *m_pTextNode; } #endif diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index 9ec5e4dc7d88..69703760d8a5 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -34,8 +34,8 @@ class SwIndex; class SwPaM; struct SwPosition; class SwDoc; -class SwTxtFmtColl; -class SwFrmFmt; +class SwTextFormatColl; +class SwFrameFormat; class SwNodeIndex; class SwNodeRange; class SwRedlineData; @@ -116,30 +116,30 @@ public: // Save and set Redline data. static bool FillSaveData( const SwPaM& rRange, SwRedlineSaveDatas& rSData, bool bDelRange = true, bool bCopyNext = true ); - static bool FillSaveDataForFmt( const SwPaM& , SwRedlineSaveDatas& ); + static bool FillSaveDataForFormat( const SwPaM& , SwRedlineSaveDatas& ); static void SetSaveData( SwDoc& rDoc, SwRedlineSaveDatas& rSData ); static bool HasHiddenRedlines( const SwRedlineSaveDatas& rSData ); }; -typedef sal_uInt16 DelCntntType; -namespace nsDelCntntType +typedef sal_uInt16 DelContentType; +namespace nsDelContentType { - const DelCntntType DELCNT_FTN = 0x01; - const DelCntntType DELCNT_FLY = 0x02; - const DelCntntType DELCNT_TOC = 0x04; - const DelCntntType DELCNT_BKM = 0x08; - const DelCntntType DELCNT_ALL = 0x0F; - const DelCntntType DELCNT_CHKNOCNTNT = 0x80; + const DelContentType DELCNT_FTN = 0x01; + const DelContentType DELCNT_FLY = 0x02; + const DelContentType DELCNT_TOC = 0x04; + const DelContentType DELCNT_BKM = 0x08; + const DelContentType DELCNT_ALL = 0x0F; + const DelContentType DELCNT_CHKNOCNTNT = 0x80; } -/// will DelCntntIndex destroy a frame anchored at character at rAnchorPos? +/// will DelContentIndex destroy a frame anchored at character at rAnchorPos? bool IsDestroyFrameAnchoredAtChar(SwPosition const & rAnchorPos, SwPosition const & rStart, SwPosition const & rEnd, const SwDoc* doc, - DelCntntType const nDelCntntType = nsDelCntntType::DELCNT_ALL); + DelContentType const nDelContentType = nsDelContentType::DELCNT_ALL); // This class has to be inherited into an Undo-object if it saves content // for Redo/Undo... -class SwUndoSaveCntnt +class SwUndoSaveContent { protected: @@ -166,16 +166,16 @@ protected: // Before moving stuff into UndoNodes-Array care has to be taken that // the content-bearing attributes are removed from the nodes-array. - void DelCntntIndex( const SwPosition& pMark, const SwPosition& pPoint, - DelCntntType nDelCntntType = nsDelCntntType::DELCNT_ALL ); + void DelContentIndex( const SwPosition& pMark, const SwPosition& pPoint, + DelContentType nDelContentType = nsDelContentType::DELCNT_ALL ); public: - SwUndoSaveCntnt(); - ~SwUndoSaveCntnt(); + SwUndoSaveContent(); + ~SwUndoSaveContent(); }; // Save a complete section in nodes-array. -class SwUndoSaveSection : private SwUndoSaveCntnt +class SwUndoSaveSection : private SwUndoSaveContent { SwNodeIndex *pMvStt; SwRedlineSaveDatas* pRedlSaveData; @@ -205,27 +205,27 @@ class SwUndRng { public: sal_uLong nSttNode, nEndNode; - sal_Int32 nSttCntnt, nEndCntnt; + sal_Int32 nSttContent, nEndContent; SwUndRng(); SwUndRng( const SwPaM& ); void SetValues( const SwPaM& rPam ); - void SetPaM( SwPaM&, bool bCorrToCntnt = false ) const; + void SetPaM( SwPaM&, bool bCorrToContent = false ) const; SwPaM & AddUndoRedoPaM( - ::sw::UndoRedoContext &, bool const bCorrToCntnt = false) const; + ::sw::UndoRedoContext &, bool const bCorrToContent = false) const; }; -class SwUndoInsLayFmt; +class SwUndoInsLayFormat; // base class for insertion of Document, Glossaries and Copy -class SwUndoInserts : public SwUndo, public SwUndRng, private SwUndoSaveCntnt +class SwUndoInserts : public SwUndo, public SwUndRng, private SwUndoSaveContent { - SwTxtFmtColl *pTxtFmtColl, *pLastNdColl; - std::vector<SwFrmFmt*>* pFrmFmts; - ::std::vector< ::boost::shared_ptr<SwUndoInsLayFmt> > m_FlyUndos; + SwTextFormatColl *pTextFormatColl, *pLastNdColl; + std::vector<SwFrameFormat*>* pFrameFormats; + ::std::vector< ::boost::shared_ptr<SwUndoInsLayFormat> > m_FlyUndos; SwRedlineData* pRedlData; - bool bSttWasTxtNd; + bool bSttWasTextNd; protected: sal_uLong nNdDiff; /// start of Content in UndoNodes for Redo @@ -242,7 +242,7 @@ public: // Set destination range after reading. void SetInsertRange( const SwPaM&, bool bScanFlys = true, - bool bSttWasTxtNd = true ); + bool bSttWasTextNd = true ); }; class SwUndoInsDoc : public SwUndoInserts @@ -260,16 +260,16 @@ public: class SwUndoFlyBase : public SwUndo, private SwUndoSaveSection { protected: - SwFrmFmt* pFrmFmt; // The saved FlyFormat. + SwFrameFormat* pFrameFormat; // The saved FlyFormat. sal_uLong nNdPgPos; sal_Int32 nCntPos; // Page at/in paragraph. sal_uInt16 nRndId; - bool bDelFmt; // Delete saved format. + bool bDelFormat; // Delete saved format. void InsFly(::sw::UndoRedoContext & rContext, bool bShowSel = true); void DelFly( SwDoc* ); - SwUndoFlyBase( SwFrmFmt* pFormat, SwUndoId nUndoId ); + SwUndoFlyBase( SwFrameFormat* pFormat, SwUndoId nUndoId ); SwNodeIndex* GetMvSttIdx() const { return SwUndoSaveSection::GetMvSttIdx(); } sal_uLong GetMvNodeCnt() const { return SwUndoSaveSection::GetMvNodeCnt(); } @@ -279,14 +279,14 @@ public: }; -class SwUndoInsLayFmt : public SwUndoFlyBase +class SwUndoInsLayFormat : public SwUndoFlyBase { sal_uLong mnCrsrSaveIndexPara; // Cursor position sal_Int32 mnCrsrSaveIndexPos; // for undo public: - SwUndoInsLayFmt( SwFrmFmt* pFormat, sal_uLong nNodeIdx, sal_Int32 nCntIdx ); + SwUndoInsLayFormat( SwFrameFormat* pFormat, sal_uLong nNodeIdx, sal_Int32 nCntIdx ); - virtual ~SwUndoInsLayFmt(); + virtual ~SwUndoInsLayFormat(); virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; @@ -296,11 +296,11 @@ public: }; -class SwUndoDelLayFmt : public SwUndoFlyBase +class SwUndoDelLayFormat : public SwUndoFlyBase { bool bShowSelFrm; public: - SwUndoDelLayFmt( SwFrmFmt* pFormat ); + SwUndoDelLayFormat( SwFrameFormat* pFormat ); virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index 8f135031bb52..ebee75cf4092 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -58,7 +58,7 @@ class SwTableBox; class SwUnoCrsr; struct SwRangeDescriptor; class SwSelBoxes; -class SwFrmFmt; +class SwFrameFormat; bool FillRangeDescriptor( SwRangeDescriptor &rDesc, const OUString &rCellRangeName ); @@ -190,7 +190,7 @@ public: virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); } + SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); } void AddDataSequence( const SwTable &rTable, ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > &rxDataSequence ); void RemoveDataSequence( const SwTable &rTable, ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > &rxDataSequence ); @@ -265,7 +265,7 @@ class SwChartDataSequence : ::com::sun::star::uno::Reference< com::sun::star::chart2::data::XDataProvider > xDataProvider; SwChartDataProvider * pDataProvider; - SwUnoCrsr* pTblCrsr; // cursor spanned over cells to use + SwUnoCrsr* pTableCrsr; // cursor spanned over cells to use SwDepend aCursorDepend; //the cursor is removed after the doc has been removed const SfxItemPropertySet* _pPropSet; @@ -281,7 +281,7 @@ protected: public: SwChartDataSequence( SwChartDataProvider &rProvider, - SwFrmFmt &rTblFmt, + SwFrameFormat &rTableFormat, SwUnoCrsr *pTableCursor ); virtual ~SwChartDataSequence(); @@ -345,7 +345,7 @@ public: virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); } + SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); } bool DeleteBox( const SwTableBox &rBox ); void FillRangeDesc( SwRangeDescriptor &rRangeDesc ) const; diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx index 4426e3582028..ff27c0ad0586 100644 --- a/sw/inc/unocoll.hxx +++ b/sw/inc/unocoll.hxx @@ -31,7 +31,7 @@ #include "swdllapi.h" class SwDoc; -class SwFrmFmt; +class SwFrameFormat; namespace com{namespace sun {namespace star {namespace text { class XTextTable; @@ -39,12 +39,12 @@ namespace com{namespace sun {namespace star {namespace text class XFootnote; }}}} class SwXFrame; -class SwFrmFmt; -class SwFmtFtn; +class SwFrameFormat; +class SwFormatFootnote; class XBookmark; class SwXReferenceMark; -class SwSectionFmt; -class SwFmtRefMark; +class SwSectionFormat; +class SwFormatRefMark; class SwXReferenceMark; class SwXBookmark; struct SvEventDescription; @@ -290,7 +290,7 @@ public: virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - static css::uno::Reference<css::text::XTextTable> GetObject(SwFrmFmt& rFmt); + static css::uno::Reference<css::text::XTextTable> GetObject(SwFrameFormat& rFormat); }; typedef @@ -404,7 +404,7 @@ public: virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - static ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection> GetObject( SwSectionFmt& rFmt ); + static ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection> GetObject( SwSectionFormat& rFormat ); }; class SwXBookmarks : public SwCollectionBaseClass, @@ -487,7 +487,7 @@ public: virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - static ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote> GetObject( SwDoc& rDoc, const SwFmtFtn& rFmt ); + static ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote> GetObject( SwDoc& rDoc, const SwFormatFootnote& rFormat ); }; class SwXReferenceMarks : public SwCollectionBaseClass, diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx index 66aa05ab7c5f..c32905025539 100644 --- a/sw/inc/unocrsr.hxx +++ b/sw/inc/unocrsr.hxx @@ -35,7 +35,7 @@ public: protected: - virtual const SwCntntFrm* DoSetBidiLevelLeftRight( + virtual const SwContentFrm* DoSetBidiLevelLeftRight( bool & io_rbLeft, bool bVisualAllowed, bool bInsertCrsr) SAL_OVERRIDE; virtual void DoSetBidiLevelUpDown() SAL_OVERRIDE; @@ -74,7 +74,7 @@ class SwUnoTableCrsr : public virtual SwUnoCrsr, public virtual SwTableCursor // The selection has the same order as the table boxes, i.e. // if something is deleted from the one array at a certain position // it has also to be deleted from the other! - SwCursor m_aTblSel; + SwCursor m_aTableSel; using SwTableCursor::MakeBoxSels; @@ -93,8 +93,8 @@ public: void MakeBoxSels(); - SwCursor& GetSelRing() { return m_aTblSel; } - const SwCursor& GetSelRing() const { return m_aTblSel; } + SwCursor& GetSelRing() { return m_aTableSel; } + const SwCursor& GetSelRing() const { return m_aTableSel; } }; #endif diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx index 4d14357831b0..a7bd39e0ab40 100644 --- a/sw/inc/unocrsrhelper.hxx +++ b/sw/inc/unocrsrhelper.hxx @@ -33,11 +33,11 @@ class SfxItemSet; class SfxItemPropertySet; struct SfxItemPropertySimpleEntry; class SdrObject; -class SwTxtNode; +class SwTextNode; class SwCursor; class SwUnoCrsr; class SwUnoTableCrsr; -class SwFmtColl; +class SwFormatColl; struct SwSortOptions; class SwDoc; @@ -76,22 +76,22 @@ namespace SwUnoCursorHelper }; ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > - GetNestedTextContent(SwTxtNode & rTextNode, sal_Int32 const nIndex, + GetNestedTextContent(SwTextNode & rTextNode, sal_Int32 const nIndex, bool const bParent); bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry , SwPaM& rPam , com::sun::star::uno::Any *pAny , com::sun::star::beans::PropertyState& eState - , const SwTxtNode* pNode = 0 ); + , const SwTextNode* pNode = 0 ); void GetCurPageStyle(SwPaM& rPaM, OUString &rString); inline bool IsStartOfPara(SwPaM& rUnoCrsr) { return rUnoCrsr.GetPoint()->nContent == 0;} inline bool IsEndOfPara(SwPaM& rUnoCrsr) - { return rUnoCrsr.GetCntntNode() && - rUnoCrsr.GetPoint()->nContent == rUnoCrsr.GetCntntNode()->Len();} + { return rUnoCrsr.GetContentNode() && + rUnoCrsr.GetPoint()->nContent == rUnoCrsr.GetContentNode()->Len();} void resetCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPam); void InsertFile(SwUnoCrsr* pUnoCrsr, @@ -135,10 +135,10 @@ namespace SwUnoCursorHelper const SetAttrMode nAttrMode, const bool bTableMode = false); void GetCrsrAttr(SwPaM & rPam, SfxItemSet & rSet, - const bool bOnlyTxtAttr = false, - const bool bGetFromChrFmt = true); + const bool bOnlyTextAttr = false, + const bool bGetFromChrFormat = true); void GetTextFromPam(SwPaM & rPam, OUString & rBuffer); - SwFmtColl * GetCurTxtFmtColl(SwPaM & rPam, const bool bConditional); + SwFormatColl * GetCurTextFormatColl(SwPaM & rPam, const bool bConditional); void SelectPam(SwPaM & rPam, const bool bExpand); void SetString(SwCursor & rCursor, const OUString & rString); @@ -216,7 +216,7 @@ namespace SwUnoCursorHelper bool SetPageDesc( const ::com::sun::star::uno::Any& rValue, SwDoc & rDoc, SfxItemSet & rSet); - void SetTxtFmtColl(const ::com::sun::star::uno::Any & rAny, SwPaM & rPaM) + void SetTextFormatColl(const ::com::sun::star::uno::Any & rAny, SwPaM & rPaM) throw (::com::sun::star::lang::IllegalArgumentException, css::uno::RuntimeException); bool SetCursorPropertyValue( SfxItemPropertySimpleEntry const& rEntry, diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx index 68e4d40e2910..ce894a9687b7 100644 --- a/sw/inc/unodraw.hxx +++ b/sw/inc/unodraw.hxx @@ -119,7 +119,7 @@ public: void InvalidateSwDoc(); // {pDoc = 0;} SwDoc* GetDoc(); /// Same as getByIndex(nIndex), except that it also takes a set of formats to ignore, so the method itself doesn't have to generate such a list. - css::uno::Any getByIndex(sal_Int32 nIndex, std::set<const SwFrmFmt*>* pTextBoxes) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); + css::uno::Any getByIndex(sal_Int32 nIndex, std::set<const SwFrameFormat*>* pTextBoxes) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); }; class SwShapeDescriptor_Impl; @@ -273,11 +273,11 @@ public: virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; SwShapeDescriptor_Impl* GetDescImpl() {return pImpl;} - SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); } + SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); } ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > GetAggregationInterface() {return xShapeAgg;} // helper - static void AddExistingShapeToFmt( SdrObject& _rObj ); + static void AddExistingShapeToFormat( SdrObject& _rObj ); }; class SwXGroupShape : diff --git a/sw/inc/unofieldcoll.hxx b/sw/inc/unofieldcoll.hxx index 1d1fbb1701a2..1b1cab829262 100644 --- a/sw/inc/unofieldcoll.hxx +++ b/sw/inc/unofieldcoll.hxx @@ -43,7 +43,7 @@ protected: public: SwXTextFieldMasters(SwDoc* pDoc); - static bool getInstanceName(const SwFieldType& rFldType, OUString& rName); + static bool getInstanceName(const SwFieldType& rFieldType, OUString& rName); // XServiceInfo virtual OUString SAL_CALL getImplementationName() diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index 281098940a4f..730a93954c97 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -39,8 +39,8 @@ class SdrObject; class SwDoc; -class SwFmt; -class SwFlyFrmFmt; +class SwFormat; +class SwFlyFrameFormat; class BaseFrameProperties_Impl; class SwXFrame : public cppu::WeakImplHelper @@ -80,12 +80,12 @@ protected: SwXFrame(FlyCntType eSet, const SfxItemPropertySet* pPropSet, SwDoc *pDoc ); //Descriptor-If - SwXFrame(SwFrmFmt& rFrmFmt, FlyCntType eSet, + SwXFrame(SwFrameFormat& rFrameFormat, FlyCntType eSet, const SfxItemPropertySet* pPropSet); template<class Interface, class Impl> static css::uno::Reference<Interface> - CreateXFrame(SwDoc & rDoc, SwFrmFmt *const pFrmFmt); + CreateXFrame(SwDoc & rDoc, SwFrameFormat *const pFrameFormat); public: static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); @@ -139,13 +139,13 @@ public: void attachToRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange)throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); void attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xTextRange ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - const SwFrmFmt* GetFrmFmt() const + const SwFrameFormat* GetFrameFormat() const { - return PTR_CAST ( SwFrmFmt, GetRegisteredIn() ); + return PTR_CAST ( SwFrameFormat, GetRegisteredIn() ); } - SwFrmFmt* GetFrmFmt() + SwFrameFormat* GetFrameFormat() { - return PTR_CAST ( SwFrmFmt, GetRegisteredIn() ); + return PTR_CAST ( SwFrameFormat, GetRegisteredIn() ); } FlyCntType GetFlyCntType()const {return eType;} @@ -153,7 +153,7 @@ public: void ResetDescriptor(); //copy text from a given source PaM void SetSelection(SwPaM& rCopySource); - static SW_DLLPUBLIC SdrObject *GetOrCreateSdrObject(SwFlyFrmFmt &rFmt); + static SW_DLLPUBLIC SdrObject *GetOrCreateSdrObject(SwFlyFrameFormat &rFormat); }; typedef cppu::WeakImplHelper @@ -181,11 +181,11 @@ protected: virtual ~SwXTextFrame(); SwXTextFrame(SwDoc *pDoc); - SwXTextFrame(SwFrmFmt& rFmt); + SwXTextFrame(SwFrameFormat& rFormat); public: static SW_DLLPUBLIC css::uno::Reference<css::text::XTextFrame> - CreateXTextFrame(SwDoc & rDoc, SwFrmFmt * pFrmFmt); + CreateXTextFrame(SwDoc & rDoc, SwFrameFormat * pFrameFormat); // FIXME: EVIL HACK: make available for SwXFrame::attachToRange void SetDoc(SwDoc *const pDoc) { SwXText::SetDoc(pDoc); }; @@ -254,12 +254,12 @@ protected: virtual ~SwXTextGraphicObject(); SwXTextGraphicObject( SwDoc *pDoc ); - SwXTextGraphicObject(SwFrmFmt& rFmt); + SwXTextGraphicObject(SwFrameFormat& rFormat); public: static css::uno::Reference<css::text::XTextContent> - CreateXTextGraphicObject(SwDoc & rDoc, SwFrmFmt * pFrmFmt); + CreateXTextGraphicObject(SwDoc & rDoc, SwFrameFormat * pFrameFormat); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE; @@ -307,12 +307,12 @@ protected: virtual ~SwXTextEmbeddedObject(); SwXTextEmbeddedObject( SwDoc *pDoc ); - SwXTextEmbeddedObject(SwFrmFmt& rFmt); + SwXTextEmbeddedObject(SwFrameFormat& rFormat); public: static css::uno::Reference<css::text::XTextContent> - CreateXTextEmbeddedObject(SwDoc & rDoc, SwFrmFmt * pFrmFmt); + CreateXTextEmbeddedObject(SwDoc & rDoc, SwFrameFormat * pFrameFormat); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE; @@ -357,9 +357,9 @@ class SwXOLEListener : public cppu::WeakImplHelper { ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xOLEModel; - SwFmt* GetFmt() const { return const_cast<SwFmt*>(static_cast<const SwFmt*>(GetRegisteredIn())); } + SwFormat* GetFormat() const { return const_cast<SwFormat*>(static_cast<const SwFormat*>(GetRegisteredIn())); } public: - SwXOLEListener(SwFmt& rOLEFmt, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xOLE); + SwXOLEListener(SwFormat& rOLEFormat, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xOLE); virtual ~SwXOLEListener(); TYPEINFO_OVERRIDE(); diff --git a/sw/inc/unomid.h b/sw/inc/unomid.h index bc0794409c74..db8ba9335565 100644 --- a/sw/inc/unomid.h +++ b/sw/inc/unomid.h @@ -90,7 +90,7 @@ #define MID_COLUMNS 0 #define MID_COLUMN_SEPARATOR_LINE 1 -//SwFmtFtnAtTxtEnd +//SwFormatFootnoteAtTextEnd #define MID_COLLECT 0 #define MID_RESTART_NUM 1 #define MID_NUM_START_AT 2 @@ -109,7 +109,7 @@ #define MID_LINE_FOOTNOTE_DIST 6 #define MID_FTN_LINE_STYLE 7 -//SwFmtRuby +//SwFormatRuby #define MID_RUBY_TEXT 0 #define MID_RUBY_ADJUST 1 #define MID_RUBY_CHARSTYLE 2 @@ -143,7 +143,7 @@ #define MID_ENV_SHIFT_RIGHT 12 #define MID_ENV_SHIFT_DOWN 13 -// SwFmtWrapInfluenceOnObjPos +// SwFormatWrapInfluenceOnObjPos #define MID_WRAP_INFLUENCE 0 #endif diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx index 8c048865fcf5..5bca49d1912b 100644 --- a/sw/inc/unoparagraph.hxx +++ b/sw/inc/unoparagraph.hxx @@ -43,7 +43,7 @@ struct SwPosition; class SwPaM; class SwUnoCrsr; class SwStartNode; -class SwTxtNode; +class SwTextNode; class SwTable; class SwXText; @@ -74,7 +74,7 @@ private: SwXParagraph(::com::sun::star::uno::Reference< ::com::sun::star::text::XText > const & xParent, - SwTxtNode & rTxtNode, + SwTextNode & rTextNode, const sal_Int32 nSelStart = -1, const sal_Int32 nSelEnd = - 1); /// descriptor @@ -84,17 +84,17 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent> - CreateXParagraph(SwDoc & rDoc, SwTxtNode * pTxtNode, + CreateXParagraph(SwDoc & rDoc, SwTextNode * pTextNode, ::com::sun::star::uno::Reference< ::com::sun::star::text::XText> const& xParentText = 0, const sal_Int32 nSelStart = -1, const sal_Int32 nSelEnd = - 1); - const SwTxtNode * GetTxtNode() const; + const SwTextNode * GetTextNode() const; bool IsDescriptor() const; /// make rPaM select the paragraph bool SelectPaM(SwPaM & rPaM); /// for SwXText - void attachToText(SwXText & rParent, SwTxtNode & rTxtNode); + void attachToText(SwXText & rParent, SwTextNode & rTextNode); // MetadatableMixin virtual ::sfx2::Metadatable* GetCoreObject() SAL_OVERRIDE; diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx index 2f97eb84bc1d..94935ad8a2ac 100644 --- a/sw/inc/unosett.hxx +++ b/sw/inc/unosett.hxx @@ -34,10 +34,10 @@ #include <svl/itemprop.hxx> class SwDoc; -class SwFmtCol; +class SwFormatCol; class SwDocShell; class SwNumRule; -class SwNumFmt; +class SwNumFormat; class SwXFootnoteProperties : public cppu::WeakAggImplHelper2 < @@ -206,11 +206,11 @@ public: void Invalidate() {pDocShell = 0;} OUString GetCreatedNumRuleName() const {return m_sCreatedNumRuleName;} - static css::uno::Sequence<css::beans::PropertyValue> GetPropertiesForNumFmt( - const SwNumFmt& rFmt, OUString const& rCharFormatName, + static css::uno::Sequence<css::beans::PropertyValue> GetPropertiesForNumFormat( + const SwNumFormat& rFormat, OUString const& rCharFormatName, OUString const* pHeadingStyleName); - static void SetPropertiesToNumFmt( - SwNumFmt & aFmt, + static void SetPropertiesToNumFormat( + SwNumFormat & aFormat, OUString & rCharStyleName, OUString *const pBulletFontName, OUString *const pHeadingStyleName, @@ -264,7 +264,7 @@ protected: virtual ~SwXTextColumns(); public: SwXTextColumns(sal_uInt16 nColCount); - SwXTextColumns(const SwFmtCol& rFmtCol); + SwXTextColumns(const SwFormatCol& rFormatCol); static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index ffe6985b43ec..11b30a346ca7 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -48,9 +48,9 @@ class SwTable; class SwTableBox; class SwTableLine; class SwTableCursor; -class SwTableBoxFmt; +class SwTableBoxFormat; class SwChartDataProvider; -class SwFrmFmt; +class SwFrameFormat; typedef cppu::WeakImplHelper @@ -65,8 +65,8 @@ class SwXCell SAL_FINAL : public SwXCellBaseClass, public SwXText, public SwClient { - friend void sw_setString( SwXCell &rCell, const OUString &rTxt, - bool bKeepNumberFmt ); + friend void sw_setString( SwXCell &rCell, const OUString &rText, + bool bKeepNumberFormat ); friend double sw_getValue( SwXCell &rCell ); friend void sw_setValue( SwXCell &rCell, double nVal ); @@ -95,8 +95,8 @@ protected: virtual void SwClientNotify(const SwModify&, const SfxHint&) SAL_OVERRIDE; public: - SwXCell(SwFrmFmt* pTblFmt, SwTableBox* pBox, size_t nPos = NOTFOUND); - SwXCell(SwFrmFmt* pTblFmt, const SwStartNode& rStartNode); // XML import interface + SwXCell(SwFrameFormat* pTableFormat, SwTableBox* pBox, size_t nPos = NOTFOUND); + SwXCell(SwFrameFormat* pTableFormat, const SwStartNode& rStartNode); // XML import interface TYPEINFO_OVERRIDE(); @@ -147,11 +147,11 @@ public: virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - SwTableBox* GetTblBox()const {return pBox;} - static SwXCell* CreateXCell(SwFrmFmt* pTblFmt, SwTableBox* pBox, SwTable *pTbl = 0 ); + SwTableBox* GetTableBox()const {return pBox;} + static SwXCell* CreateXCell(SwFrameFormat* pTableFormat, SwTableBox* pBox, SwTable *pTable = 0 ); SwTableBox* FindBox(SwTable* pTable, SwTableBox* pBox); - SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); } + SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); } }; class SwXTextTableRow SAL_FINAL : public cppu::WeakImplHelper @@ -164,8 +164,8 @@ class SwXTextTableRow SAL_FINAL : public cppu::WeakImplHelper const SfxItemPropertySet* m_pPropSet; SwTableLine* pLine; - SwFrmFmt* GetFrmFmt() { return static_cast<SwFrmFmt*>(GetRegisteredIn()); } - const SwFrmFmt* GetFrmFmt() const { return const_cast<SwXTextTableRow*>(this)->GetFrmFmt(); } + SwFrameFormat* GetFrameFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); } + const SwFrameFormat* GetFrameFormat() const { return const_cast<SwXTextTableRow*>(this)->GetFrameFormat(); } protected: virtual ~SwXTextTableRow(); //SwClient @@ -173,7 +173,7 @@ protected: virtual void SwClientNotify(const SwModify&, const SfxHint&) SAL_OVERRIDE; public: - SwXTextTableRow(SwFrmFmt* pFmt, SwTableLine* pLine); + SwXTextTableRow(SwFrameFormat* pFormat, SwTableLine* pLine); TYPEINFO_OVERRIDE(); @@ -197,7 +197,7 @@ public: virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - const SwTableLine* GetTblRow() const {return pLine;} + const SwTableLine* GetTableRow() const {return pLine;} static SwTableLine* FindLine(SwTable* pTable, SwTableLine* pLine); }; @@ -216,8 +216,8 @@ class SW_DLLPUBLIC SwXTextTableCursor : public SwXTextTableCursor_Base protected: virtual ~SwXTextTableCursor(); public: - SwXTextTableCursor(SwFrmFmt* pFmt, SwTableBox* pBox); - SwXTextTableCursor(SwFrmFmt& rTableFmt, + SwXTextTableCursor(SwFrameFormat* pFormat, SwTableBox* pBox); + SwXTextTableCursor(SwFrameFormat& rTableFormat, const SwTableCursor* pTableSelection); DECLARE_XINTERFACE() @@ -275,7 +275,7 @@ public: const SwUnoCrsr* GetCrsr() const; SwUnoCrsr* GetCrsr(); - SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); } + SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); } }; struct SwRangeDescriptor @@ -324,11 +324,11 @@ private: protected: virtual ~SwXTextTable(); SwXTextTable(); - SwXTextTable(SwFrmFmt& rFrmFmt); + SwXTextTable(SwFrameFormat& rFrameFormat); public: static css::uno::Reference<css::text::XTextTable> - CreateXTextTable(SwFrmFmt * pFrmFmt); + CreateXTextTable(SwFrameFormat * pFrameFormat); SW_DLLPUBLIC static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); @@ -428,14 +428,14 @@ public: sal_uInt16 getRowCount(); sal_uInt16 getColumnCount(); - static ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > GetRangeByName(SwFrmFmt* pFmt, SwTable* pTable, + static ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > GetRangeByName(SwFrameFormat* pFormat, SwTable* pTable, const OUString& sTLName, const OUString& sBRName, SwRangeDescriptor& rDesc); //SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; - SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); } + SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); } }; class SwXCellRange : public cppu::WeakImplHelper @@ -457,7 +457,7 @@ class SwXCellRange : public cppu::WeakImplHelper SwRangeDescriptor aRgDesc; const SfxItemPropertySet* m_pPropSet; - SwUnoCrsr* pTblCrsr; + SwUnoCrsr* pTableCrsr; bool m_bFirstRowAsLabel; bool m_bFirstColumnAsLabel; @@ -466,7 +466,7 @@ class SwXCellRange : public cppu::WeakImplHelper void setLabelDescriptions(const css::uno::Sequence<OUString>& rDesc, bool bRow); public: - SwXCellRange(SwUnoCrsr* pCrsr, SwFrmFmt& rFrmFmt, SwRangeDescriptor& rDesc); + SwXCellRange(SwUnoCrsr* pCrsr, SwFrameFormat& rFrameFormat, SwRangeDescriptor& rDesc); void SetLabels(bool bFirstRowAsLabel, bool bFirstColumnAsLabel) { m_bFirstRowAsLabel = bFirstRowAsLabel, m_bFirstColumnAsLabel = bFirstColumnAsLabel; } std::vector< css::uno::Reference< css::table::XCell > > getCells(); @@ -538,16 +538,16 @@ public: //SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; - SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); } + SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); } sal_uInt16 getRowCount(); sal_uInt16 getColumnCount(); - const SwUnoCrsr* GetTblCrsr() const; + const SwUnoCrsr* GetTableCrsr() const; // for SwChartDataSequence void GetDataSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > *pAnySeq, - ::com::sun::star::uno::Sequence< OUString > *pTxtSeq, + ::com::sun::star::uno::Sequence< OUString > *pTextSeq, ::com::sun::star::uno::Sequence< double > *pDblSeq, bool bForceNumberResults = false ) throw (::com::sun::star::uno::RuntimeException); @@ -561,12 +561,12 @@ class SwXTableRows SAL_FINAL : public cppu::WeakImplHelper public SwClient { - SwFrmFmt* GetFrmFmt() { return static_cast<SwFrmFmt*>(GetRegisteredIn()); } - const SwFrmFmt* GetFrmFmt() const { return const_cast<SwXTableRows*>(this)->GetFrmFmt(); } + SwFrameFormat* GetFrameFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); } + const SwFrameFormat* GetFrameFormat() const { return const_cast<SwXTableRows*>(this)->GetFrameFormat(); } protected: virtual ~SwXTableRows(); public: - SwXTableRows(SwFrmFmt& rFrmFmt); + SwXTableRows(SwFrameFormat& rFrameFormat); TYPEINFO_OVERRIDE(); @@ -603,11 +603,11 @@ class SwXTableColumns : public cppu::WeakImplHelper public SwClient { - SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); } + SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); } protected: virtual ~SwXTableColumns(); public: - SwXTableColumns(SwFrmFmt& rFrmFmt); + SwXTableColumns(SwFrameFormat& rFrameFormat); TYPEINFO_OVERRIDE(); diff --git a/sw/inc/unotextbodyhf.hxx b/sw/inc/unotextbodyhf.hxx index 71662286ff6d..6f46a3905734 100644 --- a/sw/inc/unotextbodyhf.hxx +++ b/sw/inc/unotextbodyhf.hxx @@ -30,7 +30,7 @@ #include <unotext.hxx> class SwDoc; -class SwFrmFmt; +class SwFrameFormat; class SwXTextCursor; typedef ::cppu::WeakAggImplHelper2 @@ -134,12 +134,12 @@ protected: virtual ~SwXHeadFootText(); - SwXHeadFootText(SwFrmFmt & rHeadFootFmt, const bool bIsHeader); + SwXHeadFootText(SwFrameFormat & rHeadFootFormat, const bool bIsHeader); public: static ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > - CreateXHeadFootText(SwFrmFmt & rHeadFootFmt, const bool bIsHeader); + CreateXHeadFootText(SwFrameFormat & rHeadFootFormat, const bool bIsHeader); static bool IsXHeadFootText(SwClient *const pClient); // XInterface diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx index 312b68eec8a8..b7f7ae90b743 100644 --- a/sw/inc/unotextrange.hxx +++ b/sw/inc/unotextrange.hxx @@ -37,7 +37,7 @@ class SwDoc; class SwUnoCrsr; -class SwFrmFmt; +class SwFrameFormat; class SW_DLLPUBLIC SwUnoInternalPaM : public SwPaM @@ -114,7 +114,7 @@ public: ::com::sun::star::text::XText > & xParent, const enum RangePosition eRange = RANGE_IN_TEXT); // only for RANGE_IS_TABLE - SwXTextRange(SwFrmFmt& rTblFmt); + SwXTextRange(SwFrameFormat& rTableFormat); const SwDoc* GetDoc() const; SwDoc* GetDoc(); diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index b7fb3d0e4f9c..90e7f02b9335 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -148,7 +148,7 @@ private: css::uno::Reference< css::text::XText > xBodyText; SwXBodyText* pBodyText; - css::uno::Reference< css::uno::XAggregation > xNumFmtAgg; + css::uno::Reference< css::uno::XAggregation > xNumFormatAgg; css::uno::Reference< css::container::XIndexAccess > * pxXNumberingRules; css::uno::Reference< css::container::XIndexAccess > * pxXFootnotes; diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx index ef4c88d0dfbf..e0d1730c5ce7 100644 --- a/sw/inc/usrfld.hxx +++ b/sw/inc/usrfld.hxx @@ -41,10 +41,10 @@ public: virtual OUString GetName() const SAL_OVERRIDE; virtual SwFieldType* Copy() const SAL_OVERRIDE; - OUString Expand(sal_uInt32 nFmt, sal_uInt16 nSubType, sal_uInt16 nLng); + OUString Expand(sal_uInt32 nFormat, sal_uInt16 nSubType, sal_uInt16 nLng); - OUString GetContent( sal_uInt32 nFmt = 0 ); - void SetContent( const OUString& rStr, sal_uInt32 nFmt = 0 ); + OUString GetContent( sal_uInt32 nFormat = 0 ); + void SetContent( const OUString& rStr, sal_uInt32 nFormat = 0 ); inline bool IsValid() const; inline void ChgValid( bool bNew ); @@ -95,7 +95,7 @@ class SW_DLLPUBLIC SwUserField : public SwValueField virtual SwField* Copy() const SAL_OVERRIDE; public: - SwUserField(SwUserFieldType*, sal_uInt16 nSub = 0, sal_uInt32 nFmt = 0); + SwUserField(SwUserFieldType*, sal_uInt16 nSub = 0, sal_uInt32 nFormat = 0); virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; virtual void SetSubType(sal_uInt16 nSub) SAL_OVERRIDE; diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index 8f10c195d0e6..64c1e269f2f6 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -157,7 +157,7 @@ protected: sal_uInt16 nZoom; // In percent. SvxZoomType eZoom; // 'enum' for zoom. - sal_uInt8 nTblDest; // Destination for table background. + sal_uInt8 nTableDest; // Destination for table background. #ifdef DBG_UTIL // Corresponds to statements in ui/config/cfgvw.src. @@ -236,8 +236,8 @@ public: inline void SetSoftHyph( bool b ) { b ? (nCoreOptions |= VIEWOPT_1_SOFTHYPH ) : ( nCoreOptions &= ~VIEWOPT_1_SOFTHYPH); } - inline bool IsFldName() const { return !bReadonly && (nCoreOptions & VIEWOPT_1_FLDNAME) != 0; } - inline void SetFldName( bool b ) + inline bool IsFieldName() const { return !bReadonly && (nCoreOptions & VIEWOPT_1_FLDNAME) != 0; } + inline void SetFieldName( bool b ) { b ? (nCoreOptions |= VIEWOPT_1_FLDNAME ) : ( nCoreOptions &= ~VIEWOPT_1_FLDNAME); } inline bool IsPostIts() const @@ -462,7 +462,7 @@ public: SvxZoomType GetZoomType() const { return eZoom; } - sal_uInt8 GetTblDest() const { return nTblDest; } + sal_uInt8 GetTableDest() const { return nTableDest; } void SetViewVScrollBar(bool b) { b ? (nUIOptions |= VIEWOPT_2_VSCROLLBAR ) : ( nUIOptions &= ~VIEWOPT_2_VSCROLLBAR); } @@ -480,7 +480,7 @@ public: { b ? (nUIOptions |= VIEWOPT_2_SCROLLBAR_TIPS) : (nUIOptions &= ~VIEWOPT_2_SCROLLBAR_TIPS); } void SetZoomType (SvxZoomType eZoom_){ eZoom = eZoom_; } - void SetTblDest( sal_uInt8 nNew ) { nTblDest = nNew; } + void SetTableDest( sal_uInt8 nNew ) { nTableDest = nNew; } const OUString& GetSymbolFont() const {return sSymbolFont;} void SetSymbolFont(const OUString& sSet) {sSymbolFont = sSet;} @@ -597,7 +597,7 @@ inline bool SwViewOption::operator==( const SwViewOption &rOpt ) const inline void SwViewOption::SetUIOptions( const SwViewOption& rVOpt ) { nUIOptions = rVOpt.nUIOptions; - nTblDest = rVOpt.nTblDest; + nTableDest = rVOpt.nTableDest; nShdwCrsrFillMode = rVOpt.nShdwCrsrFillMode; } diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index fee06ba39842..b63eaeffd284 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -70,7 +70,7 @@ class SwRegionRects; class SwFrm; class SvtAccessibilityOptions; class SwPagePreviewLayout; -class SwTxtFrm; +class SwTextFrm; class BitmapEx; struct SwAccessibilityOptions; @@ -381,7 +381,7 @@ public: void CalcPagesForPrint( sal_uInt16 nMax ); // All about fields. - void UpdateFlds(bool bCloseDB = false); + void UpdateFields(bool bCloseDB = false); bool IsAnyFieldInDoc() const; // Update all charts, for that exists any table. void UpdateAllCharts(); @@ -520,18 +520,18 @@ public: @author OD - @param _pFromTxtFrm + @param _pFromTextFrm input parameter - paragraph frame, for which the relation CONTENT_FLOWS_FROM has to be invalidated. If NULL, no CONTENT_FLOWS_FROM relation has to be invalidated - @param _pToTxtFrm + @param _pToTextFrm input parameter - paragraph frame, for which the relation CONTENT_FLOWS_TO has to be invalidated. If NULL, no CONTENT_FLOWS_TO relation has to be invalidated */ - void InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFromTxtFrm, - const SwTxtFrm* _pToTxtFrm ); + void InvalidateAccessibleParaFlowRelation( const SwTextFrm* _pFromTextFrm, + const SwTextFrm* _pToTextFrm ); /** invalidate text selection for paragraphs @@ -546,10 +546,10 @@ public: @author OD - @param rTxtFrm + @param rTextFrm input parameter - paragraph frame, whose attributes have changed */ - void InvalidateAccessibleParaAttrs( const SwTxtFrm& rTxtFrm ); + void InvalidateAccessibleParaAttrs( const SwTextFrm& rTextFrm ); SwAccessibleMap* GetAccessibleMap(); diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx index 99b25f761f22..a15dbd30b04b 100644 --- a/sw/inc/viscrs.hxx +++ b/sw/inc/viscrs.hxx @@ -28,7 +28,7 @@ class SwCrsrShell; class SwShellCrsr; -class SwTxtInputFld; +class SwTextInputField; // From here classes/methods for non-text cursor. @@ -40,7 +40,7 @@ class SwVisCrsr bool m_bIsVisible; bool m_bIsDragCrsr; - vcl::Cursor m_aTxtCrsr; + vcl::Cursor m_aTextCrsr; const SwCrsrShell* m_pCrsrShell; void _SetPosAndShow(); @@ -79,10 +79,10 @@ class SwSelPaintRects : public SwRects void setCursorOverlay(sdr::overlay::OverlayObject* pNew) { m_pCursorOverlay = pNew; } #endif - bool m_bShowTxtInputFldOverlay; - sw::overlay::OverlayRangesOutline* m_pTxtInputFldOverlay; + bool m_bShowTextInputFieldOverlay; + sw::overlay::OverlayRangesOutline* m_pTextInputFieldOverlay; - void HighlightInputFld(); + void HighlightInputField(); public: SwSelPaintRects( const SwCrsrShell& rCSh ); @@ -100,9 +100,9 @@ public: void Hide(); void Invalidate( const SwRect& rRect ); - inline void SetShowTxtInputFldOverlay( const bool bShow ) + inline void SetShowTextInputFieldOverlay( const bool bShow ) { - m_bShowTxtInputFldOverlay = bShow; + m_bShowTextInputFieldOverlay = bShow; } const SwCrsrShell* GetShell() const { return m_pCursorShell; } @@ -152,7 +152,7 @@ public: virtual SwCursor* Create( SwPaM* pRing = 0 ) const SAL_OVERRIDE; virtual short MaxReplaceArived() SAL_OVERRIDE; //returns RET_YES/RET_CANCEL/RET_NO - virtual void SaveTblBoxCntnt( const SwPosition* pPos = 0 ) SAL_OVERRIDE; + virtual void SaveTableBoxContent( const SwPosition* pPos = 0 ) SAL_OVERRIDE; bool UpDown( bool bUp, sal_uInt16 nCnt = 1 ); @@ -192,7 +192,7 @@ public: virtual SwCursor* Create( SwPaM* pRing = 0 ) const SAL_OVERRIDE; virtual short MaxReplaceArived() SAL_OVERRIDE; //returns RET_YES/RET_CANCEL/RET_NO - virtual void SaveTblBoxCntnt( const SwPosition* pPos = 0 ) SAL_OVERRIDE; + virtual void SaveTableBoxContent( const SwPosition* pPos = 0 ) SAL_OVERRIDE; // true: Cursor can be set to this position. virtual bool IsAtValidPos( bool bPoint = true ) const SAL_OVERRIDE; |