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/fmtflcnt.hxx | |
parent | 0db96caf0fcce09b87621c11b584a6d81cc7df86 (diff) |
bin/rename-sw-abbreviations.shlibreoffice-5-0-branch-point
renames the most annoying abbreviations in Writer (and partially
in the shared code too).
Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9
Diffstat (limited to 'sw/inc/fmtflcnt.hxx')
-rw-r--r-- | sw/inc/fmtflcnt.hxx | 24 |
1 files changed, 12 insertions, 12 deletions
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; }; |