diff options
author | Noel Grandin <noel@peralex.com> | 2014-11-14 08:36:38 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-11-14 10:57:28 +0200 |
commit | a05da74d0bdf691f097aa925fa59e21203ade8ed (patch) | |
tree | 519ce8d2ee5c722acc46a269c67b44aec960ed97 /sw/inc | |
parent | d32be3ace8c8fd430bbecdf69f88a116b0ee91d1 (diff) |
loplugin: cstylecast
Change-Id: I7235a67e85c10ec9fefe7f718cda18f633cda97a
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/charatr.hxx | 137 | ||||
-rw-r--r-- | sw/inc/dbfld.hxx | 7 | ||||
-rw-r--r-- | sw/inc/docufld.hxx | 4 | ||||
-rw-r--r-- | sw/inc/edimp.hxx | 9 | ||||
-rw-r--r-- | sw/inc/ftninfo.hxx | 3 | ||||
-rw-r--r-- | sw/inc/unoframe.hxx | 2 |
6 files changed, 100 insertions, 62 deletions
diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx index b791a7ceadd2..6e24a988ce68 100644 --- a/sw/inc/charatr.hxx +++ b/sw/inc/charatr.hxx @@ -21,89 +21,116 @@ #include <format.hxx> #include <hintids.hxx> +#include <editeng/postitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/shdditem.hxx> +#include <editeng/autokernitem.hxx> +#include <editeng/wrlmitem.hxx> +#include <editeng/contouritem.hxx> +#include <editeng/kernitem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/crossedoutitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/prszitem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/charsetcoloritem.hxx> +#include <editeng/escapementitem.hxx> +#include <editeng/cmapitem.hxx> +#include <editeng/nhypitem.hxx> +#include <editeng/blinkitem.hxx> +#include <editeng/brushitem.hxx> +#include <editeng/emphasismarkitem.hxx> +#include <editeng/twolinesitem.hxx> +#include <editeng/charscaleitem.hxx> +#include <editeng/charrotateitem.hxx> +#include <editeng/charreliefitem.hxx> +#include <editeng/charhiddenitem.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/shaditem.hxx> +#include <editeng/langitem.hxx> // implementation of the character attribute methods of SwAttrSet inline const SvxPostureItem &SwAttrSet::GetPosture(bool bInP) const - { return (const SvxPostureItem&)Get( RES_CHRATR_POSTURE,bInP); } + { return static_cast<const SvxPostureItem&>(Get( RES_CHRATR_POSTURE,bInP)); } inline const SvxPostureItem &SwAttrSet::GetCJKPosture(bool bInP) const - { return (const SvxPostureItem&)Get( RES_CHRATR_CJK_POSTURE,bInP); } + { return static_cast<const SvxPostureItem&>(Get( RES_CHRATR_CJK_POSTURE,bInP)); } inline const SvxPostureItem &SwAttrSet::GetCTLPosture(bool bInP) const - { return (const SvxPostureItem&)Get( RES_CHRATR_CTL_POSTURE,bInP); } + { return static_cast<const SvxPostureItem&>(Get( RES_CHRATR_CTL_POSTURE,bInP)); } inline const SvxWeightItem &SwAttrSet::GetWeight(bool bInP) const - { return (const SvxWeightItem&)Get( RES_CHRATR_WEIGHT,bInP); } + { return static_cast<const SvxWeightItem&>(Get( RES_CHRATR_WEIGHT,bInP)); } inline const SvxWeightItem &SwAttrSet::GetCJKWeight(bool bInP) const - { return (const SvxWeightItem&)Get( RES_CHRATR_CJK_WEIGHT,bInP); } + { return static_cast<const SvxWeightItem&>(Get( RES_CHRATR_CJK_WEIGHT,bInP)); } inline const SvxWeightItem &SwAttrSet::GetCTLWeight(bool bInP) const - { return (const SvxWeightItem&)Get( RES_CHRATR_CTL_WEIGHT,bInP); } + { return static_cast<const SvxWeightItem&>(Get( RES_CHRATR_CTL_WEIGHT,bInP)); } inline const SvxShadowedItem &SwAttrSet::GetShadowed(bool bInP) const - { return (const SvxShadowedItem&)Get( RES_CHRATR_SHADOWED,bInP); } + { return static_cast<const SvxShadowedItem&>(Get( RES_CHRATR_SHADOWED,bInP)); } inline const SvxAutoKernItem &SwAttrSet::GetAutoKern(bool bInP) const - { return (const SvxAutoKernItem&)Get( RES_CHRATR_AUTOKERN,bInP); } -inline const SvxWordLineModeItem &SwAttrSet::GetWordLineMode(bool bInP) const - { return (const SvxWordLineModeItem&)Get( RES_CHRATR_WORDLINEMODE,bInP); } + { return static_cast<const SvxAutoKernItem&>(Get( RES_CHRATR_AUTOKERN,bInP)); } +inline const SvxWordLineModeItem &SwAttrSet::GetWordLineMode(bool bInP) const + { return static_cast<const SvxWordLineModeItem&>(Get( RES_CHRATR_WORDLINEMODE,bInP)); } inline const SvxContourItem &SwAttrSet::GetContour(bool bInP) const - { return (const SvxContourItem&)Get( RES_CHRATR_CONTOUR,bInP); } + { return static_cast<const SvxContourItem&>(Get( RES_CHRATR_CONTOUR,bInP)); } inline const SvxKerningItem &SwAttrSet::GetKerning(bool bInP) const - { return (const SvxKerningItem&)Get( RES_CHRATR_KERNING,bInP); } + { return static_cast<const SvxKerningItem&>(Get( RES_CHRATR_KERNING,bInP)); } inline const SvxUnderlineItem &SwAttrSet::GetUnderline(bool bInP) const - { return (const SvxUnderlineItem&)Get( RES_CHRATR_UNDERLINE,bInP); } + { return static_cast<const SvxUnderlineItem&>(Get( RES_CHRATR_UNDERLINE,bInP)); } inline const SvxOverlineItem &SwAttrSet::GetOverline(bool bInP) const - { return (const SvxOverlineItem&)Get( RES_CHRATR_OVERLINE,bInP); } + { return static_cast<const SvxOverlineItem&>(Get( RES_CHRATR_OVERLINE,bInP)); } inline const SvxCrossedOutItem &SwAttrSet::GetCrossedOut(bool bInP) const - { return (const SvxCrossedOutItem&)Get( RES_CHRATR_CROSSEDOUT,bInP); } -inline const SvxFontHeightItem &SwAttrSet::GetSize(bool bInP) const - { return (const SvxFontHeightItem&)Get( RES_CHRATR_FONTSIZE,bInP); } -inline const SvxFontHeightItem &SwAttrSet::GetCJKSize(bool bInP) const - { return (const SvxFontHeightItem&)Get( RES_CHRATR_CJK_FONTSIZE,bInP); } -inline const SvxFontHeightItem &SwAttrSet::GetCTLSize(bool bInP) const - { return (const SvxFontHeightItem&)Get( RES_CHRATR_CTL_FONTSIZE,bInP); } + { return static_cast<const SvxCrossedOutItem&>(Get( RES_CHRATR_CROSSEDOUT,bInP)); } +inline const SvxFontHeightItem &SwAttrSet::GetSize(bool bInP) const + { return static_cast<const SvxFontHeightItem&>(Get( RES_CHRATR_FONTSIZE,bInP)); } +inline const SvxFontHeightItem &SwAttrSet::GetCJKSize(bool bInP) const + { return static_cast<const SvxFontHeightItem&>(Get( RES_CHRATR_CJK_FONTSIZE,bInP)); } +inline const SvxFontHeightItem &SwAttrSet::GetCTLSize(bool bInP) const + { return static_cast<const SvxFontHeightItem&>(Get( RES_CHRATR_CTL_FONTSIZE,bInP)); } inline const SvxPropSizeItem &SwAttrSet::GetPropSize(bool bInP) const - { return (const SvxPropSizeItem&)Get( RES_CHRATR_PROPORTIONALFONTSIZE,bInP); } + { return static_cast<const SvxPropSizeItem&>(Get( RES_CHRATR_PROPORTIONALFONTSIZE,bInP)); } inline const SvxFontItem &SwAttrSet::GetFont(bool bInP) const - { return (const SvxFontItem&)Get( RES_CHRATR_FONT,bInP); } + { return static_cast<const SvxFontItem&>(Get( RES_CHRATR_FONT,bInP)); } inline const SvxFontItem &SwAttrSet::GetCJKFont(bool bInP) const - { return (const SvxFontItem&)Get( RES_CHRATR_CJK_FONT,bInP); } + { return static_cast<const SvxFontItem&>(Get( RES_CHRATR_CJK_FONT,bInP)); } inline const SvxFontItem &SwAttrSet::GetCTLFont(bool bInP) const - { return (const SvxFontItem&)Get( RES_CHRATR_CTL_FONT,bInP); } + { return static_cast<const SvxFontItem&>(Get( RES_CHRATR_CTL_FONT,bInP)); } inline const SvxColorItem &SwAttrSet::GetColor(bool bInP) const - { return (const SvxColorItem&)Get( RES_CHRATR_COLOR,bInP); } + { return static_cast<const SvxColorItem&>(Get( RES_CHRATR_COLOR,bInP)); } inline const SvxCharSetColorItem &SwAttrSet::GetCharSetColor(bool bInP) const - { return (const SvxCharSetColorItem&)Get( RES_CHRATR_CHARSETCOLOR,bInP); } + { return static_cast<const SvxCharSetColorItem&>(Get( RES_CHRATR_CHARSETCOLOR,bInP)); } inline const SvxLanguageItem &SwAttrSet::GetLanguage(bool bInP) const - { return (const SvxLanguageItem&)Get( RES_CHRATR_LANGUAGE,bInP); } + { return static_cast<const SvxLanguageItem&>(Get( RES_CHRATR_LANGUAGE,bInP)); } inline const SvxLanguageItem &SwAttrSet::GetCJKLanguage(bool bInP) const - { return (const SvxLanguageItem&)Get( RES_CHRATR_CJK_LANGUAGE,bInP); } + { return static_cast<const SvxLanguageItem&>(Get( RES_CHRATR_CJK_LANGUAGE,bInP)); } inline const SvxLanguageItem &SwAttrSet::GetCTLLanguage(bool bInP) const - { return (const SvxLanguageItem&)Get( RES_CHRATR_CTL_LANGUAGE,bInP); } + { return static_cast<const SvxLanguageItem&>(Get( RES_CHRATR_CTL_LANGUAGE,bInP)); } inline const SvxEscapementItem &SwAttrSet::GetEscapement(bool bInP) const - { return (const SvxEscapementItem&)Get( RES_CHRATR_ESCAPEMENT,bInP); } -inline const SvxCaseMapItem &SwAttrSet::GetCaseMap(bool bInP) const - { return (const SvxCaseMapItem&)Get( RES_CHRATR_CASEMAP,bInP); } -inline const SvxNoHyphenItem &SwAttrSet::GetNoHyphenHere(bool bInP) const - { return (const SvxNoHyphenItem&)Get( RES_CHRATR_NOHYPHEN,bInP); } -inline const SvxBlinkItem &SwAttrSet::GetBlink(bool bInP) const - { return (const SvxBlinkItem&)Get( RES_CHRATR_BLINK,bInP); } -inline const SvxBrushItem &SwAttrSet::GetChrBackground( bool bInP ) const - { return (const SvxBrushItem&)Get( RES_CHRATR_BACKGROUND, bInP ); } -inline const SvxBrushItem &SwAttrSet::GetChrHighlight( bool bInP ) const - { return (const SvxBrushItem&)Get( RES_CHRATR_HIGHLIGHT, bInP ); } + { return static_cast<const SvxEscapementItem&>(Get( RES_CHRATR_ESCAPEMENT,bInP)); } +inline const SvxCaseMapItem &SwAttrSet::GetCaseMap(bool bInP) const + { return static_cast<const SvxCaseMapItem&>(Get( RES_CHRATR_CASEMAP,bInP)); } +inline const SvxNoHyphenItem &SwAttrSet::GetNoHyphenHere(bool bInP) const + { return static_cast<const SvxNoHyphenItem&>(Get( RES_CHRATR_NOHYPHEN,bInP)); } +inline const SvxBlinkItem &SwAttrSet::GetBlink(bool bInP) const + { return static_cast<const SvxBlinkItem&>(Get( RES_CHRATR_BLINK,bInP)); } +inline const SvxBrushItem &SwAttrSet::GetChrBackground( bool bInP ) const + { return static_cast<const SvxBrushItem&>(Get( RES_CHRATR_BACKGROUND, bInP )); } +inline const SvxBrushItem &SwAttrSet::GetChrHighlight( bool bInP ) const + { return static_cast<const SvxBrushItem&>(Get( RES_CHRATR_HIGHLIGHT, bInP )); } inline const SvxEmphasisMarkItem &SwAttrSet::GetEmphasisMark( bool bInP ) const - { return (const SvxEmphasisMarkItem&)Get( RES_CHRATR_EMPHASIS_MARK, bInP ); } -inline const SvxTwoLinesItem &SwAttrSet::Get2Lines( bool bInP ) const - { return (const SvxTwoLinesItem&)Get( RES_CHRATR_TWO_LINES, bInP ); } + { return static_cast<const SvxEmphasisMarkItem&>(Get( RES_CHRATR_EMPHASIS_MARK, bInP )); } +inline const SvxTwoLinesItem &SwAttrSet::Get2Lines( bool bInP ) const + { return static_cast<const SvxTwoLinesItem&>(Get( RES_CHRATR_TWO_LINES, bInP )); } inline const SvxCharScaleWidthItem &SwAttrSet::GetCharScaleW( bool bInP ) const - { return (const SvxCharScaleWidthItem&)Get( RES_CHRATR_SCALEW, bInP ); } -inline const SvxCharRotateItem &SwAttrSet::GetCharRotate( bool bInP ) const - { return (const SvxCharRotateItem&)Get( RES_CHRATR_ROTATE, bInP ); } -inline const SvxCharReliefItem &SwAttrSet::GetCharRelief( bool bInP ) const - { return (const SvxCharReliefItem&)Get( RES_CHRATR_RELIEF, bInP ); } -inline const SvxCharHiddenItem &SwAttrSet::GetCharHidden( bool bInP ) const - { return (const SvxCharHiddenItem&)Get( RES_CHRATR_HIDDEN, bInP ); } -inline const SvxBoxItem &SwAttrSet::GetCharBorder( bool bInP ) const - { return (const SvxBoxItem&)Get( RES_CHRATR_BOX, bInP ); } -inline const SvxShadowItem &SwAttrSet::GetCharShadow( bool bInP ) const - { return (const SvxShadowItem&)Get( RES_CHRATR_SHADOW, bInP ); } + { return static_cast<const SvxCharScaleWidthItem&>(Get( RES_CHRATR_SCALEW, bInP )); } +inline const SvxCharRotateItem &SwAttrSet::GetCharRotate( bool bInP ) const + { return static_cast<const SvxCharRotateItem&>(Get( RES_CHRATR_ROTATE, bInP )); } +inline const SvxCharReliefItem &SwAttrSet::GetCharRelief( bool bInP ) const + { return static_cast<const SvxCharReliefItem&>(Get( RES_CHRATR_RELIEF, bInP )); } +inline const SvxCharHiddenItem &SwAttrSet::GetCharHidden( bool bInP ) const + { return static_cast<const SvxCharHiddenItem&>(Get( RES_CHRATR_HIDDEN, bInP )); } +inline const SvxBoxItem &SwAttrSet::GetCharBorder( bool bInP ) const + { return static_cast<const SvxBoxItem&>(Get( RES_CHRATR_BOX, bInP )); } +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 diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx index 28b78b4fda33..9ee797c76f19 100644 --- a/sw/inc/dbfld.hxx +++ b/sw/inc/dbfld.hxx @@ -124,7 +124,7 @@ inline void SwDBField::ChgBodyTxtFlag( bool bIsInBody ) // Base class for all other database fields. class SW_DLLPUBLIC SwDBNameInfField : public SwField { - SwDBData aDBData; + SwDBData aDBData; sal_uInt16 nSubType; protected: @@ -135,7 +135,8 @@ protected: public: /// DBName - inline const SwDBData& GetRealDBData() { return aDBData; } + inline const SwDBData& GetRealDBData() const { return aDBData; } + inline SwDBData& GetRealDBData() { return aDBData; } SwDBData GetDBData(SwDoc* pDoc); void SetDBData(const SwDBData& rDBData); @@ -144,7 +145,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; - virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; + virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; virtual void SetSubType(sal_uInt16 nType) SAL_OVERRIDE; }; diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 0f44505f672a..01753a40110a 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -340,9 +340,9 @@ public: /// True/False - String virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; - virtual OUString GetPar2() const SAL_OVERRIDE; + virtual OUString GetPar2() const SAL_OVERRIDE; - virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; + virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; 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/edimp.hxx b/sw/inc/edimp.hxx index c6e2956fc994..29aea41c2a71 100644 --- a/sw/inc/edimp.hxx +++ b/sw/inc/edimp.hxx @@ -38,6 +38,15 @@ class SwNodeIndex; } while( (_pStartCrsr=static_cast<SwPaM *>(_pStartCrsr->GetNext())) != __pStartCrsr ); \ } +#define FOREACHPAM_START_CONST(pCURSH) \ + {\ + const SwPaM *_pStartCrsr = (pCURSH), *__pStartCrsr = _pStartCrsr; \ + do { + +#define FOREACHPAM_END_CONST() \ + } while( (_pStartCrsr=static_cast<const SwPaM *>(_pStartCrsr->GetNext())) != __pStartCrsr ); \ + } + struct SwPamRange { sal_uLong nStart, nEnd; diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx index 2ff9034d8c3f..2b250287892b 100644 --- a/sw/inc/ftninfo.hxx +++ b/sw/inc/ftninfo.hxx @@ -23,6 +23,7 @@ #include "swdllapi.h" #include <calbck.hxx> #include <editeng/numitem.hxx> +#include <fmtcol.hxx> class SwTxtFmtColl; class SwPageDesc; @@ -49,7 +50,7 @@ public: bool DependsOn( const SwPageDesc* ) const; void SetFtnTxtColl(SwTxtFmtColl& rColl); - SwTxtFmtColl* GetFtnTxtColl() const { return (SwTxtFmtColl*) GetRegisteredIn(); } // can be 0. + SwTxtFmtColl* GetFtnTxtColl() const { return const_cast<SwTxtFmtColl*>(static_cast<const SwTxtFmtColl*>(GetRegisteredIn())); } // can be 0. SwCharFmt* GetCharFmt(SwDoc &rDoc) const; void SetCharFmt( SwCharFmt* ); diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index 08f8cf6b6b09..fa27f9711966 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -358,7 +358,7 @@ class SwXOLEListener : public cppu::WeakImplHelper1 { ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xOLEModel; - SwFmt* GetFmt() const { return (SwFmt*)GetRegisteredIn(); } + SwFmt* GetFmt() const { return const_cast<SwFmt*>(static_cast<const SwFmt*>(GetRegisteredIn())); } public: SwXOLEListener(SwFmt& rOLEFmt, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xOLE); virtual ~SwXOLEListener(); |