loplugin: cstylecast

Change-Id: Ica3b54a7c331f0179294e2b52aadd884f53d53dc

7 files changed, 51 insertions, 37 deletions

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index ba3f5d618c1a..63c32b3fc97b 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -45,6 +45,7 @@
 #include <tox.hxx>
 #include <frmfmt.hxx>
 #include <charfmt.hxx>
+#include <docary.hxx>
 
 #include <boost/unordered_map.hpp>
 
@@ -828,7 +829,7 @@ public:
                           bool bBroadcast = false, bool bAuto = true);
     void       DelFrmFmt( SwFrmFmt *pFmt, bool bBroadcast = false );
     SwFrmFmt* FindFrmFmtByName( const OUString& rName ) const
-        {   return static_cast<SwFrmFmt*>(FindFmtByName( (SwFmtsBase&)*mpFrmFmtTbl, rName )); }
+        {   return static_cast<SwFrmFmt*>(FindFmtByName( static_cast<SwFmtsBase&>(*mpFrmFmtTbl), rName )); }
 
     SwCharFmt *MakeCharFmt(const OUString &rFmtName, SwCharFmt *pDerivedFrom,
                            bool bBroadcast = false,
diff --git a/sw/inc/edimp.hxx b/sw/inc/edimp.hxx
index ea7f14f7665a..c6e2956fc994 100644
--- a/sw/inc/edimp.hxx
+++ b/sw/inc/edimp.hxx
@@ -35,7 +35,7 @@ class SwNodeIndex;
         do {
 
 #define FOREACHPAM_END() \
-        } while( (_pStartCrsr=(SwPaM *)_pStartCrsr->GetNext()) != __pStartCrsr ); \
+        } while( (_pStartCrsr=static_cast<SwPaM *>(_pStartCrsr->GetNext())) != __pStartCrsr ); \
     }
 
 struct SwPamRange
diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx
index d782728be17d..14d916dd3154 100644
--- a/sw/inc/fmtcnct.hxx
+++ b/sw/inc/fmtcnct.hxx
@@ -50,8 +50,8 @@ public:
 
     virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
 
-    SwFlyFrmFmt* GetPrev() const { return (SwFlyFrmFmt*)aPrev.GetRegisteredIn(); }
-    SwFlyFrmFmt* GetNext() const { return (SwFlyFrmFmt*)aNext.GetRegisteredIn(); }
+    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())); }
 
     void SetPrev( SwFlyFrmFmt *pFmt );
     void SetNext( SwFlyFrmFmt *pFmt );
@@ -65,7 +65,7 @@ SwFmtChain &SwFmtChain::operator=( const SwFmtChain &rCpy )
 }
 
 inline const SwFmtChain &SwAttrSet::GetChain(bool bInP) const
-    { return (const SwFmtChain&)Get( RES_CHAIN,bInP); }
+    { return static_cast<const SwFmtChain&>(Get( RES_CHAIN,bInP)); }
 
 inline const SwFmtChain &SwFmt::GetChain(bool bInP) const
     { return aSet.GetChain(bInP); }
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx
index 3fcc988c31cb..ce2afbe6af59 100644
--- a/sw/inc/fmthdft.hxx
+++ b/sw/inc/fmthdft.hxx
@@ -53,8 +53,8 @@ public:
                                     OUString &rText,
                                     const IntlWrapper*    pIntl = 0 ) const SAL_OVERRIDE;
 
-    const SwFrmFmt *GetHeaderFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
-          SwFrmFmt *GetHeaderFmt()       { return (SwFrmFmt*)GetRegisteredIn(); }
+    const SwFrmFmt *GetHeaderFmt() const { return static_cast<const SwFrmFmt*>(GetRegisteredIn()); }
+          SwFrmFmt *GetHeaderFmt()       { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
 
     void RegisterToFormat( SwFmt& rFmt );
     bool IsActive() const { return bActive; }
@@ -86,8 +86,8 @@ public:
                                     OUString &rText,
                                     const IntlWrapper*    pIntl = 0 ) const SAL_OVERRIDE;
 
-    const SwFrmFmt *GetFooterFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
-          SwFrmFmt *GetFooterFmt()       { return (SwFrmFmt*)GetRegisteredIn(); }
+    const SwFrmFmt *GetFooterFmt() const { return static_cast<const SwFrmFmt*>(GetRegisteredIn()); }
+          SwFrmFmt *GetFooterFmt()       { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
 
     void RegisterToFormat( SwFmt& rFmt );
     bool IsActive() const { return bActive; }
@@ -95,9 +95,9 @@ public:
 };
 
 inline const SwFmtHeader &SwAttrSet::GetHeader(bool bInP) const
-    { return (const SwFmtHeader&)Get( RES_HEADER,bInP); }
+    { return static_cast<const SwFmtHeader&>(Get( RES_HEADER,bInP)); }
 inline const SwFmtFooter &SwAttrSet::GetFooter(bool bInP) const
-    { return (const SwFmtFooter&)Get( RES_FOOTER,bInP); }
+    { return static_cast<const SwFmtFooter&>(Get( RES_FOOTER,bInP)); }
 
 inline const SwFmtHeader &SwFmt::GetHeader(bool bInP) const
     { return aSet.GetHeader(bInP); }
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index f8f9e46a71a8..3eaa75a4a3af 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -217,12 +217,12 @@ public:
 // Inline methods from Node.hxx - it is only now that we know TxtNode!!
 inline       SwGrfNode   *SwNode::GetGrfNode()
 {
-     return ND_GRFNODE == nNodeType ? (SwGrfNode*)this : 0;
+     return ND_GRFNODE == nNodeType ? static_cast<SwGrfNode*>(this) : 0;
 }
 
 inline const SwGrfNode   *SwNode::GetGrfNode() const
 {
-     return ND_GRFNODE == nNodeType ? (const SwGrfNode*)this : 0;
+     return ND_GRFNODE == nNodeType ? static_cast<const SwGrfNode*>(this) : 0;
 }
 
 inline bool SwGrfNode::IsLinkedFile() const
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index ef9b322335cb..53492faca2d3 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -25,8 +25,20 @@
 #include <calbck.hxx>
 #include <swatrset.hxx>
 #include <format.hxx>
+#include <charfmt.hxx>
 #include <swtypes.hxx>
 #include <editeng/adjustitem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/spltitem.hxx>
+#include <editeng/widwitem.hxx>
+#include <editeng/orphitem.hxx>
+#include <editeng/tstpitem.hxx>
+#include <editeng/hyphenzoneitem.hxx>
+#include <editeng/scriptspaceitem.hxx>
+#include <editeng/hngpnctitem.hxx>
+#include <editeng/forbiddenruleitem.hxx>
+#include <editeng/paravertalignitem.hxx>
+#include <editeng/pgrditem.hxx>
 
 class SwCharFmt;
 class IntlWrapper;
@@ -86,8 +98,8 @@ public:
     inline sal_uInt16 GetDistance() const { return nDistance; }
     inline sal_uInt16 &GetDistance() { return nDistance; }
 
-   inline const SwCharFmt *GetCharFmt() const { return (SwCharFmt*)GetRegisteredIn(); }
-    inline SwCharFmt *GetCharFmt()       { return (SwCharFmt*)GetRegisteredIn(); }
+    inline const SwCharFmt *GetCharFmt() const { return static_cast<const SwCharFmt*>(GetRegisteredIn()); }
+    inline SwCharFmt *GetCharFmt()       { return static_cast<SwCharFmt*>(GetRegisteredIn()); }
     void SetCharFmt( SwCharFmt *pNew );
     /// Get information from Client.
     virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
@@ -190,37 +202,37 @@ inline SwParaConnectBorderItem& SwParaConnectBorderItem::operator=(
 
 //  Implementation of paragraph-attributes methods of SwAttrSet
 inline const SvxLineSpacingItem &SwAttrSet::GetLineSpacing(bool bInP) const
-    {   return (const SvxLineSpacingItem&)Get( RES_PARATR_LINESPACING,bInP); }
+    {   return static_cast<const SvxLineSpacingItem&>(Get( RES_PARATR_LINESPACING,bInP)); }
 inline const SvxAdjustItem &SwAttrSet::GetAdjust(bool bInP) const
-    {   return (const SvxAdjustItem&)Get( RES_PARATR_ADJUST,bInP); }
+    {   return static_cast<const SvxAdjustItem&>(Get( RES_PARATR_ADJUST,bInP)); }
 inline const SvxFmtSplitItem &SwAttrSet::GetSplit(bool bInP) const
-    {   return (const SvxFmtSplitItem&)Get( RES_PARATR_SPLIT,bInP); }
+    {   return static_cast<const SvxFmtSplitItem&>(Get( RES_PARATR_SPLIT,bInP)); }
 inline const SwRegisterItem &SwAttrSet::GetRegister(bool bInP) const
-    {   return (const SwRegisterItem&)Get( RES_PARATR_REGISTER,bInP); }
+    {   return static_cast<const SwRegisterItem&>(Get( RES_PARATR_REGISTER,bInP)); }
 inline const SvxWidowsItem &SwAttrSet::GetWidows(bool bInP) const
-    {   return (const SvxWidowsItem&)Get( RES_PARATR_WIDOWS,bInP); }
+    {   return static_cast<const SvxWidowsItem&>(Get( RES_PARATR_WIDOWS,bInP)); }
 inline const SvxOrphansItem &SwAttrSet::GetOrphans(bool bInP) const
-    {   return (const SvxOrphansItem&)Get( RES_PARATR_ORPHANS,bInP); }
+    {   return static_cast<const SvxOrphansItem&>(Get( RES_PARATR_ORPHANS,bInP)); }
 inline const SvxTabStopItem &SwAttrSet::GetTabStops(bool bInP) const
-    {   return (const SvxTabStopItem&)Get( RES_PARATR_TABSTOP,bInP); }
+    {   return static_cast<const SvxTabStopItem&>(Get( RES_PARATR_TABSTOP,bInP)); }
 inline const SvxHyphenZoneItem &SwAttrSet::GetHyphenZone(bool bInP) const
-    {   return (const SvxHyphenZoneItem&)Get(RES_PARATR_HYPHENZONE,bInP); }
+    {   return static_cast<const SvxHyphenZoneItem&>(Get(RES_PARATR_HYPHENZONE,bInP)); }
 inline const SwFmtDrop &SwAttrSet::GetDrop(bool bInP) const
-    {   return (const SwFmtDrop&)Get(RES_PARATR_DROP,bInP); }
+    {   return static_cast<const SwFmtDrop&>(Get(RES_PARATR_DROP,bInP)); }
 inline const SwNumRuleItem &SwAttrSet::GetNumRule(bool bInP) const
-    {   return (const SwNumRuleItem&)Get(RES_PARATR_NUMRULE,bInP); }
+    {   return static_cast<const SwNumRuleItem&>(Get(RES_PARATR_NUMRULE,bInP)); }
 inline const SvxScriptSpaceItem& SwAttrSet::GetScriptSpace(bool bInP) const
-    {   return (const SvxScriptSpaceItem&)Get(RES_PARATR_SCRIPTSPACE,bInP); }
+    {   return static_cast<const SvxScriptSpaceItem&>(Get(RES_PARATR_SCRIPTSPACE,bInP)); }
 inline const SvxHangingPunctuationItem &SwAttrSet::GetHangingPunctuation(bool bInP) const
-    {   return (const SvxHangingPunctuationItem&)Get(RES_PARATR_HANGINGPUNCTUATION,bInP); }
+    {   return static_cast<const SvxHangingPunctuationItem&>(Get(RES_PARATR_HANGINGPUNCTUATION,bInP)); }
 inline const SvxForbiddenRuleItem &SwAttrSet::GetForbiddenRule(bool bInP) const
-    {   return (const SvxForbiddenRuleItem&)Get(RES_PARATR_FORBIDDEN_RULES, bInP); }
+    {   return static_cast<const SvxForbiddenRuleItem&>(Get(RES_PARATR_FORBIDDEN_RULES, bInP)); }
 inline const SvxParaVertAlignItem &SwAttrSet::GetParaVertAlign(bool bInP) const
-    {   return (const SvxParaVertAlignItem&)Get( RES_PARATR_VERTALIGN, bInP ); }
+    {   return static_cast<const SvxParaVertAlignItem&>(Get( RES_PARATR_VERTALIGN, bInP )); }
 inline const SvxParaGridItem &SwAttrSet::GetParaGrid(bool bInP) const
-    {   return (const SvxParaGridItem&)Get( RES_PARATR_SNAPTOGRID, bInP ); }
+    {   return static_cast<const SvxParaGridItem&>(Get( RES_PARATR_SNAPTOGRID, bInP )); }
 inline const SwParaConnectBorderItem &SwAttrSet::GetParaConnectBorder(bool bInP) const
-    {   return (const SwParaConnectBorderItem&)Get( RES_PARATR_CONNECT_BORDER, bInP ); }
+    {   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
@@ -248,13 +260,13 @@ inline const SvxScriptSpaceItem& SwFmt::GetScriptSpace(bool bInP) const
 inline const SvxHangingPunctuationItem &SwFmt::GetHangingPunctuation(bool bInP) const
     {   return aSet.GetHangingPunctuation(bInP) ; }
 inline const SvxForbiddenRuleItem &SwFmt::GetForbiddenRule(bool bInP) const
-    {   return (const SvxForbiddenRuleItem&)aSet.Get(RES_PARATR_FORBIDDEN_RULES, bInP); }
+    {   return static_cast<const SvxForbiddenRuleItem&>(aSet.Get(RES_PARATR_FORBIDDEN_RULES, bInP)); }
 inline const SvxParaVertAlignItem &SwFmt::GetParaVertAlign(bool bInP) const
-    {   return (const SvxParaVertAlignItem&)aSet.Get( RES_PARATR_VERTALIGN, bInP ); }
+    {   return static_cast<const SvxParaVertAlignItem&>(aSet.Get( RES_PARATR_VERTALIGN, bInP )); }
 inline const SvxParaGridItem &SwFmt::GetParaGrid(bool bInP) const
-    {   return (const SvxParaGridItem&)aSet.Get( RES_PARATR_SNAPTOGRID, bInP ); }
+    {   return static_cast<const SvxParaGridItem&>(aSet.Get( RES_PARATR_SNAPTOGRID, bInP )); }
 inline const SwParaConnectBorderItem &SwFmt::GetParaConnectBorder(bool bInP) const
-    {   return (const SwParaConnectBorderItem&)aSet.Get( RES_PARATR_CONNECT_BORDER, bInP ); }
+    {   return static_cast<const SwParaConnectBorderItem&>(aSet.Get( RES_PARATR_CONNECT_BORDER, bInP )); }
 
 #endif
 
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index a3689555468d..30bd2ba5b939 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -52,6 +52,7 @@
 #include <vcl/timer.hxx>
 
 #include <calbck.hxx>
+#include <frmfmt.hxx>
 
 class SfxItemPropertySet;
 class SwDoc;
@@ -194,7 +195,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 (SwFrmFmt*)GetRegisteredIn(); }
+    SwFrmFmt*       GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(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 );
@@ -351,7 +352,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 (SwFrmFmt*)GetRegisteredIn(); }
+    SwFrmFmt*   GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
     bool    DeleteBox( const SwTableBox &rBox );
 
     void        FillRangeDesc( SwRangeDescriptor &rRangeDesc ) const;