summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/inc/doc.hxx3
-rw-r--r--sw/inc/edimp.hxx2
-rw-r--r--sw/inc/fmtcnct.hxx6
-rw-r--r--sw/inc/fmthdft.hxx12
-rw-r--r--sw/inc/ndgrf.hxx4
-rw-r--r--sw/inc/paratr.hxx56
-rw-r--r--sw/inc/unochart.hxx5
-rw-r--r--sw/source/core/crsr/trvlcol.cxx4
-rw-r--r--sw/source/core/crsr/trvlfnfl.cxx2
-rw-r--r--sw/source/core/crsr/trvltbl.cxx14
-rw-r--r--sw/source/core/crsr/viscrs.cxx8
11 files changed, 65 insertions, 51 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;
diff --git a/sw/source/core/crsr/trvlcol.cxx b/sw/source/core/crsr/trvlcol.cxx
index 87067976050c..71ae0eb50814 100644
--- a/sw/source/core/crsr/trvlcol.cxx
+++ b/sw/source/core/crsr/trvlcol.cxx
@@ -35,13 +35,13 @@ SwLayoutFrm* GetCurrColumn( const SwLayoutFrm* pLayFrm )
SwLayoutFrm* GetNextColumn( const SwLayoutFrm* pLayFrm )
{
SwLayoutFrm* pActCol = GetCurrColumn( pLayFrm );
- return pActCol ? (SwLayoutFrm*)pActCol->GetNext() : 0;
+ return pActCol ? static_cast<SwLayoutFrm*>(pActCol->GetNext()) : 0;
}
SwLayoutFrm* GetPrevColumn( const SwLayoutFrm* pLayFrm )
{
SwLayoutFrm* pActCol = GetCurrColumn( pLayFrm );
- return pActCol ? (SwLayoutFrm*)pActCol->GetPrev() : 0;
+ return pActCol ? static_cast<SwLayoutFrm*>(pActCol->GetPrev()) : 0;
}
SwCntntFrm* GetColumnStt( const SwLayoutFrm* pColFrm )
diff --git a/sw/source/core/crsr/trvlfnfl.cxx b/sw/source/core/crsr/trvlfnfl.cxx
index d9c7cd35e7dc..62cdca2b27e2 100644
--- a/sw/source/core/crsr/trvlfnfl.cxx
+++ b/sw/source/core/crsr/trvlfnfl.cxx
@@ -59,7 +59,7 @@ bool SwCursor::GotoFtnTxt()
if (pFtn)
{
SwCrsrSaveState aSaveState( *this );
- GetPoint()->nNode = *((SwTxtFtn*)pFtn)->GetStartNode();
+ GetPoint()->nNode = *static_cast<SwTxtFtn*>(pFtn)->GetStartNode();
SwCntntNode* pCNd = GetDoc()->GetNodes().GoNextSection(
&GetPoint()->nNode,
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index e72992c0b174..057408690c04 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -93,10 +93,10 @@ bool SwCrsrShell::GoNextCell( bool bAppendLine )
SwSelBoxes aBoxes;
// the document might change; w/o Action views would not be notified
- ((SwEditShell*)this)->StartAllAction();
+ static_cast<SwEditShell*>(this)->StartAllAction();
bRet = mpDoc->InsertRow( pTblNd->GetTable().
SelLineFromBox( pTableBox, aBoxes, false ));
- ((SwEditShell*)this)->EndAllAction();
+ static_cast<SwEditShell*>(this)->EndAllAction();
}
}
if( bRet && ( bRet = pCrsr->GoNextCell() ) )
@@ -731,7 +731,7 @@ OUString SwCrsrShell::GetBoxNms() const
if( !pFrm )
return sNm;
- sNm = ((SwCellFrm*)pFrm)->GetTabBox()->GetName();
+ sNm = static_cast<SwCellFrm*>(pFrm)->GetTabBox()->GetName();
sNm += ":";
pPos = m_pTblCrsr->End();
}
@@ -753,7 +753,7 @@ OUString SwCrsrShell::GetBoxNms() const
} while ( pFrm && !pFrm->IsCellFrm() );
if( pFrm )
- sNm += ((SwCellFrm*)pFrm)->GetTabBox()->GetName();
+ sNm += static_cast<SwCellFrm*>(pFrm)->GetTabBox()->GetName();
}
return sNm;
}
@@ -885,10 +885,10 @@ bool SwCrsrShell::EndAllTblBoxEdit()
SwViewShell *pSh = this;
do {
if( pSh->IsA( TYPE( SwCrsrShell ) ) )
- bRet |= ((SwCrsrShell*)pSh)->CheckTblBoxCntnt(
- ((SwCrsrShell*)pSh)->m_pCurCrsr->GetPoint() );
+ bRet |= static_cast<SwCrsrShell*>(pSh)->CheckTblBoxCntnt(
+ static_cast<SwCrsrShell*>(pSh)->m_pCurCrsr->GetPoint() );
- } while( this != (pSh = (SwViewShell *)pSh->GetNext()) );
+ } while( this != (pSh = static_cast<SwViewShell *>(pSh->GetNext())) );
return bRet;
}
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index c102401493a3..4c2854aefd47 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -138,7 +138,7 @@ void SwVisCrsr::_SetPosAndShow()
const SwFrm* pFrm = rTNd.getLayoutFrm( m_pCrsrShell->GetLayout(), 0, 0, false );
if ( pFrm )
{
- const SwScriptInfo* pSI = ((SwTxtFrm*)pFrm)->GetScriptInfo();
+ const SwScriptInfo* pSI = static_cast<const SwTxtFrm*>(pFrm)->GetScriptInfo();
// cursor level has to be shown
if ( pSI && pSI->CountDirChg() > 1 )
{
@@ -177,7 +177,7 @@ void SwVisCrsr::_SetPosAndShow()
if ( !m_pCrsrShell->IsCrsrReadonly() || m_pCrsrShell->GetViewOptions()->IsSelectionInReadonly() )
{
if ( m_pCrsrShell->GetDrawView() )
- ((SwDrawView*)m_pCrsrShell->GetDrawView())->SetAnimationEnabled(
+ const_cast<SwDrawView*>(static_cast<const SwDrawView*>(m_pCrsrShell->GetDrawView()))->SetAnimationEnabled(
!m_pCrsrShell->IsSelection() );
sal_uInt16 nStyle = m_bIsDragCrsr ? CURSOR_SHADOW : 0;
@@ -598,7 +598,7 @@ short SwShellCrsr::MaxReplaceArived()
for( nActCnt = 0; pSh->ActionPend(); ++nActCnt )
pSh->EndAction();
aArr.push_back( nActCnt );
- } while( pShell != ( pSh = (SwViewShell*)pSh->GetNext() ) );
+ } while( pShell != ( pSh = static_cast<SwViewShell*>(pSh->GetNext()) ) );
{
nRet = MessageDialog(pDlg, "AskSearchDialog",
@@ -609,7 +609,7 @@ short SwShellCrsr::MaxReplaceArived()
{
for( nActCnt = aArr[n]; nActCnt--; )
pSh->StartAction();
- pSh = (SwViewShell*)pSh->GetNext();
+ pSh = static_cast<SwViewShell*>(pSh->GetNext());
}
}
else