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/fmtsrnd.hxx | |
| 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/fmtsrnd.hxx')
| -rw-r--r-- | sw/inc/fmtsrnd.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
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 |