From ab465b90f6c6da5595393a0ba73f33a1e71a2b65 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Wed, 20 May 2015 13:05:49 +0200 Subject: bin/rename-sw-abbreviations.sh renames the most annoying abbreviations in Writer (and partially in the shared code too). Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9 --- sw/inc/fmtcnct.hxx | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'sw/inc/fmtcnct.hxx') 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(static_cast(aPrev.GetRegisteredIn())); } - SwFlyFrmFmt* GetNext() const { return const_cast(static_cast(aNext.GetRegisteredIn())); } + SwFlyFrameFormat* GetPrev() const { return const_cast(static_cast(aPrev.GetRegisteredIn())); } + SwFlyFrameFormat* GetNext() const { return const_cast(static_cast(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(Get( RES_CHAIN,bInP)); } +inline const SwFormatChain &SwAttrSet::GetChain(bool bInP) const + { return static_cast(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 -- cgit v1.2.3