Skip to content

C
core
Kaydet (Commit) 82f02546 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

coverity#704972 Unchecked dynamic_cast 

Change-Id: I8a3a93b9440992b8107aef6b1f4b204b0399fae1
üst 29d1781f
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 27 deletions
sw/source/core/unocore/unotbl.cxx
Dosyayı görüntüle @ 82f02546
...@@ -618,16 +618,15 @@ static void lcl_FormatTable(SwFrmFmt* pTblFmt) ...@@ -618,16 +618,15 @@ static void lcl_FormatTable(SwFrmFmt* pTblFmt)
} }
} }
static void lcl_CrsrSelect(SwPaM* pCrsr, bool bExpand) static void lcl_CrsrSelect(SwPaM& rCrsr, bool bExpand)
{ {
if(bExpand) if(bExpand)
{ {
if(!pCrsr->HasMark()) if(!rCrsr.HasMark())
pCrsr->SetMark(); rCrsr.SetMark();
} }
else if(pCrsr->HasMark()) else if(rCrsr.HasMark())
pCrsr->DeleteMark(); rCrsr.DeleteMark();
} }
static void lcl_GetTblSeparators(uno::Any& rRet, SwTable* pTable, SwTableBox* pBox, bool bRow) static void lcl_GetTblSeparators(uno::Any& rRet, SwTable* pTable, SwTableBox* pBox, bool bRow)
...@@ -1648,9 +1647,9 @@ sal_Bool SwXTextTableCursor::gotoCellByName(const OUString& sCellName, sal_Bool ...@@ -1648,9 +1647,9 @@ sal_Bool SwXTextTableCursor::gotoCellByName(const OUString& sCellName, sal_Bool
SwUnoCrsr* pUnoCrsr = GetCrsr(); SwUnoCrsr* pUnoCrsr = GetCrsr();
if(pUnoCrsr) if(pUnoCrsr)
{ {
SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr); SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
lcl_CrsrSelect( pTblCrsr, Expand ); lcl_CrsrSelect(rTblCrsr, Expand);
bRet = pTblCrsr->GotoTblBox(sCellName); bRet = rTblCrsr.GotoTblBox(sCellName);
} }
return bRet; return bRet;
} }
...@@ -1662,9 +1661,9 @@ sal_Bool SwXTextTableCursor::goLeft(sal_Int16 Count, sal_Bool Expand) throw( uno ...@@ -1662,9 +1661,9 @@ sal_Bool SwXTextTableCursor::goLeft(sal_Int16 Count, sal_Bool Expand) throw( uno
SwUnoCrsr* pUnoCrsr = GetCrsr(); SwUnoCrsr* pUnoCrsr = GetCrsr();
if(pUnoCrsr) if(pUnoCrsr)
{ {
SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr); SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
lcl_CrsrSelect( pTblCrsr, Expand ); lcl_CrsrSelect(rTblCrsr, Expand);
bRet = pTblCrsr->Left( Count,CRSR_SKIP_CHARS, false, false); bRet = rTblCrsr.Left(Count, CRSR_SKIP_CHARS, false, false);
} }
return bRet; return bRet;
} }
...@@ -1676,9 +1675,9 @@ sal_Bool SwXTextTableCursor::goRight(sal_Int16 Count, sal_Bool Expand) throw( un ...@@ -1676,9 +1675,9 @@ sal_Bool SwXTextTableCursor::goRight(sal_Int16 Count, sal_Bool Expand) throw( un
SwUnoCrsr* pUnoCrsr = GetCrsr(); SwUnoCrsr* pUnoCrsr = GetCrsr();
if(pUnoCrsr) if(pUnoCrsr)
{ {
SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr); SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
lcl_CrsrSelect( pTblCrsr, Expand ); lcl_CrsrSelect(rTblCrsr, Expand);
bRet = pTblCrsr->Right( Count, CRSR_SKIP_CHARS, false, false); bRet = rTblCrsr.Right(Count, CRSR_SKIP_CHARS, false, false);
} }
return bRet; return bRet;
} }
...@@ -1690,9 +1689,9 @@ sal_Bool SwXTextTableCursor::goUp(sal_Int16 Count, sal_Bool Expand) throw( uno:: ...@@ -1690,9 +1689,9 @@ sal_Bool SwXTextTableCursor::goUp(sal_Int16 Count, sal_Bool Expand) throw( uno::
SwUnoCrsr* pUnoCrsr = GetCrsr(); SwUnoCrsr* pUnoCrsr = GetCrsr();
if(pUnoCrsr) if(pUnoCrsr)
{ {
SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr); SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
lcl_CrsrSelect( pTblCrsr, Expand ); lcl_CrsrSelect(rTblCrsr, Expand);
bRet = pTblCrsr->UpDown(true, Count, 0, 0); bRet = rTblCrsr.UpDown(true, Count, 0, 0);
} }
return bRet; return bRet;
} }
...@@ -1704,9 +1703,9 @@ sal_Bool SwXTextTableCursor::goDown(sal_Int16 Count, sal_Bool Expand) throw( uno ...@@ -1704,9 +1703,9 @@ sal_Bool SwXTextTableCursor::goDown(sal_Int16 Count, sal_Bool Expand) throw( uno
SwUnoCrsr* pUnoCrsr = GetCrsr(); SwUnoCrsr* pUnoCrsr = GetCrsr();
if(pUnoCrsr) if(pUnoCrsr)
{ {
SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr); SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
lcl_CrsrSelect( pTblCrsr, Expand ); lcl_CrsrSelect(rTblCrsr, Expand);
bRet = pTblCrsr->UpDown(false, Count, 0, 0); bRet = rTblCrsr.UpDown(false, Count, 0, 0);
} }
return bRet; return bRet;
} }
...@@ -1717,9 +1716,9 @@ void SwXTextTableCursor::gotoStart(sal_Bool Expand) throw( uno::RuntimeException ...@@ -1717,9 +1716,9 @@ void SwXTextTableCursor::gotoStart(sal_Bool Expand) throw( uno::RuntimeException
SwUnoCrsr* pUnoCrsr = GetCrsr(); SwUnoCrsr* pUnoCrsr = GetCrsr();
if(pUnoCrsr) if(pUnoCrsr)
{ {
SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr); SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
lcl_CrsrSelect( pTblCrsr, Expand ); lcl_CrsrSelect(rTblCrsr, Expand);
pTblCrsr->MoveTable(fnTableCurr, fnTableStart); rTblCrsr.MoveTable(fnTableCurr, fnTableStart);
} }
} }
...@@ -1729,9 +1728,9 @@ void SwXTextTableCursor::gotoEnd(sal_Bool Expand) throw( uno::RuntimeException, ...@@ -1729,9 +1728,9 @@ void SwXTextTableCursor::gotoEnd(sal_Bool Expand) throw( uno::RuntimeException,
SwUnoCrsr* pUnoCrsr = GetCrsr(); SwUnoCrsr* pUnoCrsr = GetCrsr();
if(pUnoCrsr) if(pUnoCrsr)
{ {
SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr); SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
lcl_CrsrSelect( pTblCrsr, Expand ); lcl_CrsrSelect(rTblCrsr, Expand);
pTblCrsr->MoveTable(fnTableCurr, fnTableEnd); rTblCrsr.MoveTable(fnTableCurr, fnTableEnd);
} }
} }
......
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