Kaydet (Commit) 8b33808a authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Revert "loplugin: cstylecast"

The change was broken. Luckily MSVC noticed: sw\inc\doc.hxx(1707) :
warning C4717: 'SwDoc::GetNumberFormatter' : recursive on all control
paths, function will cause runtime stack overflow.

This reverts commit 7ca3303a.
üst e7ac7ba7
...@@ -71,7 +71,7 @@ public: ...@@ -71,7 +71,7 @@ public:
SwTableBox* GetTableBox(); SwTableBox* GetTableBox();
const SwTableBox* GetTableBox() const const SwTableBox* GetTableBox() const
{ return const_cast<SwTblBoxFormula*>(this)->GetTableBox(); } { return ((SwTblBoxFormula*)this)->GetTableBox(); }
void ChangeState( const SfxPoolItem* pItem ); void ChangeState( const SfxPoolItem* pItem );
void Calc( SwTblCalcPara& rCalcPara, double& rValue ); void Calc( SwTblCalcPara& rCalcPara, double& rValue );
......
...@@ -1691,7 +1691,7 @@ void ClrContourCache(); ...@@ -1691,7 +1691,7 @@ void ClrContourCache();
inline const SwTableNode* SwDoc::IsIdxInTbl( const SwNodeIndex& rIdx ) const inline const SwTableNode* SwDoc::IsIdxInTbl( const SwNodeIndex& rIdx ) const
{ {
return static_cast<const SwDoc*>(this)->IsIdxInTbl( rIdx ); return ((SwDoc*)this)->IsIdxInTbl( rIdx );
} }
inline SvNumberFormatter* SwDoc::GetNumberFormatter( bool bCreate ) inline SvNumberFormatter* SwDoc::GetNumberFormatter( bool bCreate )
...@@ -1703,7 +1703,7 @@ inline SvNumberFormatter* SwDoc::GetNumberFormatter( bool bCreate ) ...@@ -1703,7 +1703,7 @@ inline SvNumberFormatter* SwDoc::GetNumberFormatter( bool bCreate )
inline const SvNumberFormatter* SwDoc::GetNumberFormatter( bool bCreate ) const inline const SvNumberFormatter* SwDoc::GetNumberFormatter( bool bCreate ) const
{ {
return static_cast<const SwDoc*>(this)->GetNumberFormatter( bCreate ); return ((SwDoc*)this)->GetNumberFormatter( bCreate );
} }
inline void SwDoc::SetOLEPrtNotifyPending( bool bSet ) inline void SwDoc::SetOLEPrtNotifyPending( bool bSet )
......
...@@ -222,7 +222,7 @@ public: ...@@ -222,7 +222,7 @@ public:
/// For Core - it knows the DocShell but not the WrtShell! /// For Core - it knows the DocShell but not the WrtShell!
SwFEShell *GetFEShell(); SwFEShell *GetFEShell();
const SwFEShell *GetFEShell() const const SwFEShell *GetFEShell() const
{ return const_cast<SwDocShell*>(this)->GetFEShell(); } { return ((SwDocShell*)this)->GetFEShell(); }
/// For inserting document. /// For inserting document.
Reader* StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr, Reader* StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr,
......
...@@ -869,7 +869,7 @@ public: ...@@ -869,7 +869,7 @@ public:
/// Query NumberFormater from document. /// Query NumberFormater from document.
SvNumberFormatter* GetNumberFormatter(); SvNumberFormatter* GetNumberFormatter();
const SvNumberFormatter* GetNumberFormatter() const const SvNumberFormatter* GetNumberFormatter() const
{ return const_cast<SwEditShell*>(this)->GetNumberFormatter(); } { return ((SwEditShell*)this)->GetNumberFormatter(); }
/// Interfaces for GlobalDocument. /// Interfaces for GlobalDocument.
bool IsGlobalDoc() const; bool IsGlobalDoc() const;
...@@ -955,7 +955,7 @@ private: ...@@ -955,7 +955,7 @@ private:
}; };
inline const sfx2::LinkManager& SwEditShell::GetLinkManager() const inline const sfx2::LinkManager& SwEditShell::GetLinkManager() const
{ return const_cast<SwEditShell*>(this)->GetLinkManager(); } { return ((SwEditShell*)this)->GetLinkManager(); }
/// Class for automated call of Start- and EndAction(). /// Class for automated call of Start- and EndAction().
class SwActContext { class SwActContext {
......
...@@ -272,7 +272,7 @@ public: ...@@ -272,7 +272,7 @@ public:
inline void SwFieldType::UpdateFlds() const inline void SwFieldType::UpdateFlds() const
{ {
const_cast<SwFieldType*>(this)->ModifyNotification( 0, 0 ); ((SwFieldType*)this)->ModifyNotification( 0, 0 );
} }
/** Base class of all fields. /** Base class of all fields.
......
...@@ -97,7 +97,7 @@ public: ...@@ -97,7 +97,7 @@ public:
The UserCall knows its SdrObject. */ The UserCall knows its SdrObject. */
SwContact *FindContactObj(); SwContact *FindContactObj();
const SwContact *FindContactObj() const const SwContact *FindContactObj() const
{ return const_cast<SwFrmFmt*>(this)->FindContactObj(); } { return ((SwFrmFmt*)this)->FindContactObj(); }
/** @return the SdrObject, that is connected to the ContactObject. /** @return the SdrObject, that is connected to the ContactObject.
Only DrawFrmFmts are connected to the "real SdrObject". FlyFrmFmts Only DrawFrmFmts are connected to the "real SdrObject". FlyFrmFmts
...@@ -105,11 +105,11 @@ public: ...@@ -105,11 +105,11 @@ public:
"Real SdrObject" has position and a Z-order. */ "Real SdrObject" has position and a Z-order. */
SdrObject *FindSdrObject(); SdrObject *FindSdrObject();
const SdrObject *FindSdrObject() const const SdrObject *FindSdrObject() const
{ return const_cast<SwFrmFmt*>(this)->FindSdrObject(); } { return ((SwFrmFmt*)this)->FindSdrObject(); }
SdrObject *FindRealSdrObject(); SdrObject *FindRealSdrObject();
const SdrObject *FindRealSdrObject() const const SdrObject *FindRealSdrObject() const
{ return const_cast<SwFrmFmt*>(this)->FindRealSdrObject(); } { return ((SwFrmFmt*)this)->FindRealSdrObject(); }
bool IsLowerOf( const SwFrmFmt& rFmt ) const; bool IsLowerOf( const SwFrmFmt& rFmt ) const;
......
...@@ -665,15 +665,15 @@ inline bool SwNode::IsGrfNode() const ...@@ -665,15 +665,15 @@ inline bool SwNode::IsGrfNode() const
inline const SwStartNode* SwNode::FindSttNodeByType( SwStartNodeType eTyp ) const inline const SwStartNode* SwNode::FindSttNodeByType( SwStartNodeType eTyp ) const
{ {
return const_cast<SwNode*>(this)->FindSttNodeByType( eTyp ); return ((SwNode*)this)->FindSttNodeByType( eTyp );
} }
inline const SwTableNode* SwNode::FindTableNode() const inline const SwTableNode* SwNode::FindTableNode() const
{ {
return const_cast<SwNode*>(this)->FindTableNode(); return ((SwNode*)this)->FindTableNode();
} }
inline const SwSectionNode* SwNode::FindSectionNode() const inline const SwSectionNode* SwNode::FindSectionNode() const
{ {
return const_cast<SwNode*>(this)->FindSectionNode(); return ((SwNode*)this)->FindSectionNode();
} }
inline sal_uLong SwNode::StartOfSectionIndex() const inline sal_uLong SwNode::StartOfSectionIndex() const
{ {
......
...@@ -47,7 +47,7 @@ protected: ...@@ -47,7 +47,7 @@ protected:
inline const SwDDEFieldType* SwDDETable::GetDDEFldType() const inline const SwDDEFieldType* SwDDETable::GetDDEFldType() const
{ {
return const_cast<SwDDETable*>(this)->GetDDEFldType(); return ((SwDDETable*)this)->GetDDEFldType();
} }
#endif #endif
......
...@@ -285,7 +285,7 @@ public: ...@@ -285,7 +285,7 @@ public:
// Get box, whose start index is set on nBoxStt. // Get box, whose start index is set on nBoxStt.
SwTableBox* GetTblBox( sal_uLong nSttIdx ); SwTableBox* GetTblBox( sal_uLong nSttIdx );
const SwTableBox* GetTblBox( sal_uLong nSttIdx ) const const SwTableBox* GetTblBox( sal_uLong nSttIdx ) const
{ return const_cast<SwTable*>(this)->GetTblBox( nSttIdx ); } { return ((SwTable*)this)->GetTblBox( nSttIdx ); }
// Returns true if table contains nestings. // Returns true if table contains nestings.
bool IsTblComplex() const; bool IsTblComplex() const;
......
...@@ -473,7 +473,7 @@ public: ...@@ -473,7 +473,7 @@ public:
// DrawView may be used at UI. // DrawView may be used at UI.
SdrView *GetDrawView(); SdrView *GetDrawView();
const SdrView *GetDrawView() const { return const_cast<SwViewShell*>(this)->GetDrawView(); } const SdrView *GetDrawView() const { return ((SwViewShell*)this)->GetDrawView(); }
// Take care that MarkList is up-to-date in any case (Bug 57153). // Take care that MarkList is up-to-date in any case (Bug 57153).
SdrView *GetDrawViewWithValidMarkList(); SdrView *GetDrawViewWithValidMarkList();
...@@ -613,7 +613,7 @@ inline void SwViewShell::UnlockPaint( bool bVirDev ) ...@@ -613,7 +613,7 @@ inline void SwViewShell::UnlockPaint( bool bVirDev )
} }
inline const SfxItemPool& SwViewShell::GetAttrPool() const inline const SfxItemPool& SwViewShell::GetAttrPool() const
{ {
return const_cast<SwViewShell*>(this)->GetAttrPool(); return ((SwViewShell*)this)->GetAttrPool();
} }
#endif // INCLUDED_SW_INC_VIEWSH_HXX #endif // INCLUDED_SW_INC_VIEWSH_HXX
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment