Kaydet (Commit) 5cb6144f authored tarafından Noel Grandin's avatar Noel Grandin

loplugin: cstylecast

Change-Id: Ie57f543681790e662f6ac7d074ccb37925999790
üst 7623a483
...@@ -98,11 +98,11 @@ public: ...@@ -98,11 +98,11 @@ public:
}; };
inline const SwTblBoxNumFormat &SwAttrSet::GetTblBoxNumFmt(bool bInP) const inline const SwTblBoxNumFormat &SwAttrSet::GetTblBoxNumFmt(bool bInP) const
{ return (const SwTblBoxNumFormat&)Get( RES_BOXATR_FORMAT,bInP); } { return static_cast<const SwTblBoxNumFormat&>(Get( RES_BOXATR_FORMAT,bInP)); }
inline const SwTblBoxFormula &SwAttrSet::GetTblBoxFormula(bool bInP) const inline const SwTblBoxFormula &SwAttrSet::GetTblBoxFormula(bool bInP) const
{ return (const SwTblBoxFormula&)Get( RES_BOXATR_FORMULA,bInP); } { return static_cast<const SwTblBoxFormula&>(Get( RES_BOXATR_FORMULA,bInP)); }
inline const SwTblBoxValue &SwAttrSet::GetTblBoxValue(bool bInP) const inline const SwTblBoxValue &SwAttrSet::GetTblBoxValue(bool bInP) const
{ return (const SwTblBoxValue&)Get( RES_BOXATR_VALUE, bInP); } { return static_cast<const SwTblBoxValue&>(Get( RES_BOXATR_VALUE, bInP)); }
inline const SwTblBoxNumFormat &SwFmt::GetTblBoxNumFmt(bool bInP) const inline const SwTblBoxNumFormat &SwFmt::GetTblBoxNumFmt(bool bInP) const
{ return aSet.GetTblBoxNumFmt(bInP); } { return aSet.GetTblBoxNumFmt(bInP); }
......
...@@ -869,7 +869,7 @@ inline SwMoveFnCollection* SwCrsrShell::MakeFindRange( ...@@ -869,7 +869,7 @@ inline SwMoveFnCollection* SwCrsrShell::MakeFindRange(
inline SwCursor* SwCrsrShell::GetSwCrsr( bool bMakeTblCrsr ) const inline SwCursor* SwCrsrShell::GetSwCrsr( bool bMakeTblCrsr ) const
{ {
return (SwCursor*)GetCrsr( bMakeTblCrsr ); return static_cast<SwCursor*>(GetCrsr( bMakeTblCrsr ));
} }
inline SwPaM* SwCrsrShell::GetStkCrsr() const { return m_pCrsrStk; } inline SwPaM* SwCrsrShell::GetStkCrsr() const { return m_pCrsrStk; }
......
...@@ -862,7 +862,7 @@ public: ...@@ -862,7 +862,7 @@ public:
const bool bReset = true, const bool bReset = true,
const bool bResetListAttrs = false); const bool bResetListAttrs = false);
SwTxtFmtColl* FindTxtFmtCollByName( const OUString& rName ) const SwTxtFmtColl* FindTxtFmtCollByName( const OUString& rName ) const
{ return (SwTxtFmtColl*)FindFmtByName( (SwFmtsBase&)*mpTxtFmtCollTbl, rName ); } { return static_cast<SwTxtFmtColl*>(FindFmtByName( (SwFmtsBase&)*mpTxtFmtCollTbl, rName )); }
void ChkCondColls(); void ChkCondColls();
...@@ -872,7 +872,7 @@ public: ...@@ -872,7 +872,7 @@ public:
SwGrfFmtColl *MakeGrfFmtColl(const OUString &rFmtName, SwGrfFmtColl *MakeGrfFmtColl(const OUString &rFmtName,
SwGrfFmtColl *pDerivedFrom); SwGrfFmtColl *pDerivedFrom);
SwGrfFmtColl* FindGrfFmtCollByName( const OUString& rName ) const SwGrfFmtColl* FindGrfFmtCollByName( const OUString& rName ) const
{ return (SwGrfFmtColl*)FindFmtByName( (SwFmtsBase&)*mpGrfFmtCollTbl, rName ); } { return static_cast<SwGrfFmtColl*>(FindFmtByName( (SwFmtsBase&)*mpGrfFmtCollTbl, rName )); }
// Table formatting // Table formatting
const SwFrmFmts* GetTblFrmFmts() const { return mpTblFrmFmtTbl; } const SwFrmFmts* GetTblFrmFmts() const { return mpTblFrmFmtTbl; }
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <tblenum.hxx> #include <tblenum.hxx>
#include <IMark.hxx> #include <IMark.hxx>
#include <tox.hxx> #include <tox.hxx>
#include <frmfmt.hxx>
#include <vector> #include <vector>
#include <set> #include <set>
...@@ -357,7 +358,7 @@ public: ...@@ -357,7 +358,7 @@ public:
/// @return required automatic format. /// @return required automatic format.
SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId ) SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId )
{ return (SwFrmFmt*)SwEditShell::GetFmtFromPool( nId ); } { return static_cast<SwFrmFmt*>(SwEditShell::GetFmtFromPool( nId )); }
SwCharFmt* GetCharFmtFromPool( sal_uInt16 nId ) SwCharFmt* GetCharFmtFromPool( sal_uInt16 nId )
{ return (SwCharFmt*)SwEditShell::GetFmtFromPool( nId ); } { return (SwCharFmt*)SwEditShell::GetFmtFromPool( nId ); }
......
...@@ -163,7 +163,7 @@ public: ...@@ -163,7 +163,7 @@ public:
}; };
inline const SwFmtCol &SwAttrSet::GetCol(bool bInP) const inline const SwFmtCol &SwAttrSet::GetCol(bool bInP) const
{ return (const SwFmtCol&)Get( RES_COL,bInP); } { return static_cast<const SwFmtCol&>(Get( RES_COL,bInP)); }
inline const SwFmtCol &SwFmt::GetCol(bool bInP) const inline const SwFmtCol &SwFmt::GetCol(bool bInP) const
{ return aSet.GetCol(bInP); } { return aSet.GetCol(bInP); }
......
...@@ -229,7 +229,7 @@ public: ...@@ -229,7 +229,7 @@ public:
{ return aSubCondition.pFldExpression; } { return aSubCondition.pFldExpression; }
void SetCondition( sal_uLong nCond, sal_uLong nSubCond ); void SetCondition( sal_uLong nCond, sal_uLong nSubCond );
SwTxtFmtColl* GetTxtFmtColl() const { return (SwTxtFmtColl*)GetRegisteredIn(); } SwTxtFmtColl* GetTxtFmtColl() const { return const_cast<SwTxtFmtColl*>(static_cast<const SwTxtFmtColl*>(GetRegisteredIn())); }
void RegisterToFormat( SwFmt& ); void RegisterToFormat( SwFmt& );
}; };
......
...@@ -108,7 +108,7 @@ public: ...@@ -108,7 +108,7 @@ public:
@return count of deleted hints. */ @return count of deleted hints. */
virtual sal_uInt16 ResetAllFmtAttr(); virtual sal_uInt16 ResetAllFmtAttr();
inline SwFmt* DerivedFrom() const { return (SwFmt*)GetRegisteredIn(); } inline SwFmt* DerivedFrom() const { return const_cast<SwFmt*>(static_cast<const SwFmt*>(GetRegisteredIn())); }
inline bool IsDefault() const { return DerivedFrom() == 0; } inline bool IsDefault() const { return DerivedFrom() == 0; }
inline OUString GetName() const { return aFmtName; } inline OUString GetName() const { return aFmtName; }
......
...@@ -21,38 +21,52 @@ ...@@ -21,38 +21,52 @@
#include <hintids.hxx> #include <hintids.hxx>
#include <format.hxx> #include <format.hxx>
#include <editeng/pbinitem.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/ulspitem.hxx>
#include <editeng/prntitem.hxx>
#include <editeng/opaqitem.hxx>
#include <editeng/protitem.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/keepitem.hxx>
#include <editeng/brushitem.hxx>
#include <editeng/shaditem.hxx>
#include <editeng/formatbreakitem.hxx>
#include <editeng/frmdiritem.hxx>
#include <svl/macitem.hxx>
#include <svx/sdtaitm.hxx>
// Inlines // Inlines
// Implementation of FrameAttribute methods of SwAttrSet. // Implementation of FrameAttribute methods of SwAttrSet.
inline const SvxPaperBinItem &SwAttrSet::GetPaperBin(bool bInP) const inline const SvxPaperBinItem &SwAttrSet::GetPaperBin(bool bInP) const
{ return (const SvxPaperBinItem&)Get( RES_PAPER_BIN,bInP); } { return static_cast<const SvxPaperBinItem&>(Get( RES_PAPER_BIN,bInP)); }
inline const SvxLRSpaceItem &SwAttrSet::GetLRSpace(bool bInP) const inline const SvxLRSpaceItem &SwAttrSet::GetLRSpace(bool bInP) const
{ return (const SvxLRSpaceItem&)Get( RES_LR_SPACE,bInP); } { return static_cast<const SvxLRSpaceItem&>(Get( RES_LR_SPACE,bInP)); }
inline const SvxULSpaceItem &SwAttrSet::GetULSpace(bool bInP) const inline const SvxULSpaceItem &SwAttrSet::GetULSpace(bool bInP) const
{ return (const SvxULSpaceItem&)Get( RES_UL_SPACE,bInP); } { return static_cast<const SvxULSpaceItem&>(Get( RES_UL_SPACE,bInP)); }
inline const SvxPrintItem &SwAttrSet::GetPrint(bool bInP) const inline const SvxPrintItem &SwAttrSet::GetPrint(bool bInP) const
{ return (const SvxPrintItem&)Get( RES_PRINT,bInP); } { return static_cast<const SvxPrintItem&>(Get( RES_PRINT,bInP)); }
inline const SvxOpaqueItem &SwAttrSet::GetOpaque(bool bInP) const inline const SvxOpaqueItem &SwAttrSet::GetOpaque(bool bInP) const
{ return (const SvxOpaqueItem&)Get( RES_OPAQUE,bInP); } { return static_cast<const SvxOpaqueItem&>(Get( RES_OPAQUE,bInP)); }
inline const SvxProtectItem &SwAttrSet::GetProtect(bool bInP) const inline const SvxProtectItem &SwAttrSet::GetProtect(bool bInP) const
{ return (const SvxProtectItem&)Get( RES_PROTECT,bInP); } { return static_cast<const SvxProtectItem&>(Get( RES_PROTECT,bInP)); }
inline const SvxBoxItem &SwAttrSet::GetBox(bool bInP) const inline const SvxBoxItem &SwAttrSet::GetBox(bool bInP) const
{ return (const SvxBoxItem&)Get( RES_BOX,bInP); } { return static_cast<const SvxBoxItem&>(Get( RES_BOX,bInP)); }
inline const SvxFmtKeepItem &SwAttrSet::GetKeep(bool bInP) const inline const SvxFmtKeepItem &SwAttrSet::GetKeep(bool bInP) const
{ return (const SvxFmtKeepItem&)Get( RES_KEEP,bInP); } { return static_cast<const SvxFmtKeepItem&>(Get( RES_KEEP,bInP)); }
inline const SvxBrushItem &SwAttrSet::GetBackground(bool bInP) const inline const SvxBrushItem &SwAttrSet::GetBackground(bool bInP) const
{ return (const SvxBrushItem&)Get( RES_BACKGROUND,bInP); } { return static_cast<const SvxBrushItem&>(Get( RES_BACKGROUND,bInP)); }
inline const SvxShadowItem &SwAttrSet::GetShadow(bool bInP) const inline const SvxShadowItem &SwAttrSet::GetShadow(bool bInP) const
{ return (const SvxShadowItem&)Get( RES_SHADOW,bInP); } { return static_cast<const SvxShadowItem&>(Get( RES_SHADOW,bInP)); }
inline const SvxFmtBreakItem &SwAttrSet::GetBreak(bool bInP) const inline const SvxFmtBreakItem &SwAttrSet::GetBreak(bool bInP) const
{ return (const SvxFmtBreakItem&)Get( RES_BREAK,bInP); } { return static_cast<const SvxFmtBreakItem&>(Get( RES_BREAK,bInP)); }
inline const SvxMacroItem &SwAttrSet::GetMacro(bool bInP) const inline const SvxMacroItem &SwAttrSet::GetMacro(bool bInP) const
{ return (const SvxMacroItem&)Get( RES_FRMMACRO,bInP); } { return static_cast<const SvxMacroItem&>(Get( RES_FRMMACRO,bInP)); }
inline const SvxFrameDirectionItem &SwAttrSet::GetFrmDir(bool bInP) const inline const SvxFrameDirectionItem &SwAttrSet::GetFrmDir(bool bInP) const
{ return (const SvxFrameDirectionItem&)Get( RES_FRAMEDIR,bInP); } { return static_cast<const SvxFrameDirectionItem&>(Get( RES_FRAMEDIR,bInP)); }
inline const SdrTextVertAdjustItem &SwAttrSet::GetTextVertAdjust(bool bInP) const inline const SdrTextVertAdjustItem &SwAttrSet::GetTextVertAdjust(bool bInP) const
{ return (const SdrTextVertAdjustItem&)Get( RES_TEXT_VERT_ADJUST,bInP); } { return static_cast<const SdrTextVertAdjustItem&>(Get( RES_TEXT_VERT_ADJUST,bInP)); }
// Implementation of FrameAttribute methods of SwFmt. // Implementation of FrameAttribute methods of SwFmt.
inline const SvxPaperBinItem &SwFmt::GetPaperBin(bool bInP) const inline const SvxPaperBinItem &SwFmt::GetPaperBin(bool bInP) const
......
...@@ -455,7 +455,7 @@ public: ...@@ -455,7 +455,7 @@ public:
inline bool HasSwAttrSet() const { return mpAttrSet ? sal_True : sal_False; } inline bool HasSwAttrSet() const { return mpAttrSet ? sal_True : sal_False; }
virtual SwFmtColl* ChgFmtColl( SwFmtColl* ); virtual SwFmtColl* ChgFmtColl( SwFmtColl* );
SwFmtColl* GetFmtColl() const { return (SwFmtColl*)GetRegisteredIn(); } SwFmtColl* GetFmtColl() const { return const_cast<SwFmtColl*>(static_cast<const SwFmtColl*>(GetRegisteredIn())); }
//FEATURE::CONDCOLL //FEATURE::CONDCOLL
inline SwFmtColl& GetAnyFmtColl() const; inline SwFmtColl& GetAnyFmtColl() const;
...@@ -587,43 +587,43 @@ private: ...@@ -587,43 +587,43 @@ private:
inline SwEndNode *SwNode::GetEndNode() inline SwEndNode *SwNode::GetEndNode()
{ {
return ND_ENDNODE == nNodeType ? (SwEndNode*)this : 0; return ND_ENDNODE == nNodeType ? static_cast<SwEndNode*>(this) : 0;
} }
inline const SwEndNode *SwNode::GetEndNode() const inline const SwEndNode *SwNode::GetEndNode() const
{ {
return ND_ENDNODE == nNodeType ? (const SwEndNode*)this : 0; return ND_ENDNODE == nNodeType ? static_cast<const SwEndNode*>(this) : 0;
} }
inline SwStartNode *SwNode::GetStartNode() inline SwStartNode *SwNode::GetStartNode()
{ {
return ND_STARTNODE & nNodeType ? (SwStartNode*)this : 0; return ND_STARTNODE & nNodeType ? static_cast<SwStartNode*>(this) : 0;
} }
inline const SwStartNode *SwNode::GetStartNode() const inline const SwStartNode *SwNode::GetStartNode() const
{ {
return ND_STARTNODE & nNodeType ? (const SwStartNode*)this : 0; return ND_STARTNODE & nNodeType ? static_cast<const SwStartNode*>(this) : 0;
} }
inline SwTableNode *SwNode::GetTableNode() inline SwTableNode *SwNode::GetTableNode()
{ {
return ND_TABLENODE == nNodeType ? (SwTableNode*)this : 0; return ND_TABLENODE == nNodeType ? static_cast<SwTableNode*>(this) : 0;
} }
inline const SwTableNode *SwNode::GetTableNode() const inline const SwTableNode *SwNode::GetTableNode() const
{ {
return ND_TABLENODE == nNodeType ? (const SwTableNode*)this : 0; return ND_TABLENODE == nNodeType ? static_cast<const SwTableNode*>(this) : 0;
} }
inline SwSectionNode *SwNode::GetSectionNode() inline SwSectionNode *SwNode::GetSectionNode()
{ {
return ND_SECTIONNODE == nNodeType ? (SwSectionNode*)this : 0; return ND_SECTIONNODE == nNodeType ? static_cast<SwSectionNode*>(this) : 0;
} }
inline const SwSectionNode *SwNode::GetSectionNode() const inline const SwSectionNode *SwNode::GetSectionNode() const
{ {
return ND_SECTIONNODE == nNodeType ? (const SwSectionNode*)this : 0; return ND_SECTIONNODE == nNodeType ? static_cast<const SwSectionNode*>(this) : 0;
} }
inline SwCntntNode *SwNode::GetCntntNode() inline SwCntntNode *SwNode::GetCntntNode()
{ {
return ND_CONTENTNODE & nNodeType ? (SwCntntNode*)this : 0; return ND_CONTENTNODE & nNodeType ? static_cast<SwCntntNode*>(this) : 0;
} }
inline const SwCntntNode *SwNode::GetCntntNode() const inline const SwCntntNode *SwNode::GetCntntNode() const
{ {
return ND_CONTENTNODE & nNodeType ? (const SwCntntNode*)this : 0; return ND_CONTENTNODE & nNodeType ? static_cast<const SwCntntNode*>(this) : 0;
} }
inline bool SwNode::IsStartNode() const inline bool SwNode::IsStartNode() const
...@@ -681,27 +681,27 @@ inline sal_uLong SwNode::StartOfSectionIndex() const ...@@ -681,27 +681,27 @@ inline sal_uLong SwNode::StartOfSectionIndex() const
} }
inline sal_uLong SwNode::EndOfSectionIndex() const inline sal_uLong SwNode::EndOfSectionIndex() const
{ {
const SwStartNode* pStNd = IsStartNode() ? (SwStartNode*)this : pStartOfSection; const SwStartNode* pStNd = IsStartNode() ? static_cast<const SwStartNode*>(this) : pStartOfSection;
return pStNd->pEndOfSection->GetIndex(); return pStNd->pEndOfSection->GetIndex();
} }
inline const SwEndNode* SwNode::EndOfSectionNode() const inline const SwEndNode* SwNode::EndOfSectionNode() const
{ {
const SwStartNode* pStNd = IsStartNode() ? (SwStartNode*)this : pStartOfSection; const SwStartNode* pStNd = IsStartNode() ? static_cast<const SwStartNode*>(this) : pStartOfSection;
return pStNd->pEndOfSection; return pStNd->pEndOfSection;
} }
inline SwEndNode* SwNode::EndOfSectionNode() inline SwEndNode* SwNode::EndOfSectionNode()
{ {
SwStartNode* pStNd = IsStartNode() ? (SwStartNode*)this : pStartOfSection; const SwStartNode* pStNd = IsStartNode() ? static_cast<const SwStartNode*>(this) : pStartOfSection;
return pStNd->pEndOfSection; return pStNd->pEndOfSection;
} }
inline SwNodes& SwNode::GetNodes() inline SwNodes& SwNode::GetNodes()
{ {
return (SwNodes&)GetArray(); return static_cast<SwNodes&>(GetArray());
} }
inline const SwNodes& SwNode::GetNodes() const inline const SwNodes& SwNode::GetNodes() const
{ {
return (SwNodes&)GetArray(); return static_cast<SwNodes&>(GetArray());
} }
inline SwDoc* SwNode::GetDoc() inline SwDoc* SwNode::GetDoc()
...@@ -715,14 +715,14 @@ inline const SwDoc* SwNode::GetDoc() const ...@@ -715,14 +715,14 @@ inline const SwDoc* SwNode::GetDoc() const
inline SwFmtColl* SwCntntNode::GetCondFmtColl() const inline SwFmtColl* SwCntntNode::GetCondFmtColl() const
{ {
return pCondColl ? (SwFmtColl*)pCondColl->GetRegisteredIn() : 0; return pCondColl ? static_cast<SwFmtColl*>(pCondColl->GetRegisteredIn()) : 0;
} }
inline SwFmtColl& SwCntntNode::GetAnyFmtColl() const inline SwFmtColl& SwCntntNode::GetAnyFmtColl() const
{ {
return pCondColl && pCondColl->GetRegisteredIn() return pCondColl && pCondColl->GetRegisteredIn()
? *(SwFmtColl*)pCondColl->GetRegisteredIn() ? *static_cast<SwFmtColl*>(pCondColl->GetRegisteredIn())
: *(SwFmtColl*)GetRegisteredIn(); : *const_cast<SwFmtColl*>(static_cast<const SwFmtColl*>(GetRegisteredIn()));
} }
inline const SwAttrSet& SwCntntNode::GetSwAttrSet() const inline const SwAttrSet& SwCntntNode::GetSwAttrSet() const
......
...@@ -199,7 +199,7 @@ public: ...@@ -199,7 +199,7 @@ public:
void GetPresentation( SfxItemPresentation ePres, void GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText ) const; SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText ) const;
SwAttrPool* GetPool() const { return (SwAttrPool*)SfxItemSet::GetPool(); } SwAttrPool* GetPool() const { return static_cast<SwAttrPool*>(SfxItemSet::GetPool()); }
// Copy attributes, if necessary across documents. // Copy attributes, if necessary across documents.
void CopyToModify( SwModify& rMod ) const; void CopyToModify( SwModify& rMod ) const;
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <swtypes.hxx> #include <swtypes.hxx>
#include <calbck.hxx> #include <calbck.hxx>
#include <swrect.hxx> #include <swrect.hxx>
#include <swtblfmt.hxx>
#include <memory> #include <memory>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
...@@ -183,9 +184,9 @@ public: ...@@ -183,9 +184,9 @@ public:
SwTableLines &GetTabLines() { return aLines; } SwTableLines &GetTabLines() { return aLines; }
const SwTableLines &GetTabLines() const { return aLines; } const SwTableLines &GetTabLines() const { return aLines; }
SwFrmFmt* GetFrmFmt() { return (SwFrmFmt*)GetRegisteredIn(); } SwFrmFmt* GetFrmFmt() { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); } SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
SwTableFmt* GetTableFmt() const { return (SwTableFmt*)GetRegisteredIn(); } SwTableFmt* GetTableFmt() const { return const_cast<SwTableFmt*>(static_cast<const SwTableFmt*>(GetRegisteredIn())); }
void GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart, void GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart,
bool bHidden = false, bool bCurRowOnly = false ) const; bool bHidden = false, bool bCurRowOnly = false ) const;
...@@ -356,8 +357,8 @@ public: ...@@ -356,8 +357,8 @@ public:
const SwTableBox *GetUpper() const { return pUpper; } const SwTableBox *GetUpper() const { return pUpper; }
void SetUpper( SwTableBox *pNew ) { pUpper = pNew; } void SetUpper( SwTableBox *pNew ) { pUpper = pNew; }
SwFrmFmt* GetFrmFmt() { return (SwFrmFmt*)GetRegisteredIn(); } SwFrmFmt* GetFrmFmt() { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); } SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
// Creates a own FrmFmt if more lines depend on it. // Creates a own FrmFmt if more lines depend on it.
SwFrmFmt* ClaimFrmFmt(); SwFrmFmt* ClaimFrmFmt();
...@@ -412,8 +413,8 @@ public: ...@@ -412,8 +413,8 @@ public:
const SwTableLine *GetUpper() const { return pUpper; } const SwTableLine *GetUpper() const { return pUpper; }
void SetUpper( SwTableLine *pNew ) { pUpper = pNew; } void SetUpper( SwTableLine *pNew ) { pUpper = pNew; }
SwFrmFmt* GetFrmFmt() { return (SwFrmFmt*)GetRegisteredIn(); } SwFrmFmt* GetFrmFmt() { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); } SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
// Creates its own FrmFmt if more boxes depend on it. // Creates its own FrmFmt if more boxes depend on it.
SwFrmFmt* ClaimFrmFmt(); SwFrmFmt* ClaimFrmFmt();
......
...@@ -547,7 +547,7 @@ inline OUString SwTOXMark::GetEntryTypeName() const ...@@ -547,7 +547,7 @@ inline OUString SwTOXMark::GetEntryTypeName() const
{ return m_aEntryTypeName; } { return m_aEntryTypeName; }
inline const SwTOXType* SwTOXMark::GetTOXType() const inline const SwTOXType* SwTOXMark::GetTOXType() const
{ return (SwTOXType*)GetRegisteredIn(); } { return static_cast<const SwTOXType*>(GetRegisteredIn()); }
inline bool SwTOXMark::IsAlternativeText() const inline bool SwTOXMark::IsAlternativeText() const
{ return !aAltText.isEmpty(); } { return !aAltText.isEmpty(); }
...@@ -685,7 +685,7 @@ inline TOXTypes SwTOXType::GetType() const ...@@ -685,7 +685,7 @@ inline TOXTypes SwTOXType::GetType() const
// SwTOXBase // SwTOXBase
inline const SwTOXType* SwTOXBase::GetTOXType() const inline const SwTOXType* SwTOXBase::GetTOXType() const
{ return (SwTOXType*)GetRegisteredIn(); } { return static_cast<const SwTOXType*>(GetRegisteredIn()); }
inline sal_uInt16 SwTOXBase::GetCreateType() const inline sal_uInt16 SwTOXBase::GetCreateType() const
{ return nCreateType; } { return nCreateType; }
......
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