diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2010-01-22 15:25:50 +0000 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2010-01-22 15:25:50 +0000 |
| commit | 2c87517fcc32bf1ca17ae4ce41108b0f3c81fd9e (patch) | |
| tree | 7144ca713e3b31b5046a3e010bb11bb7d8486cd9 /sw | |
| parent | fdde737ea0caf7450a6676f46651f78ee05321ab (diff) | |
cmcfixes71: #i108580#: fix sw strict aliasing warnings
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/docnode/ndtbl1.cxx | 8 | ||||
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx index d6d04062b74f..671307532428 100644 --- a/sw/source/core/docnode/ndtbl1.cxx +++ b/sw/source/core/docnode/ndtbl1.cxx @@ -176,8 +176,8 @@ BOOL lcl_GetBoxSel( const SwCursor& rCursor, SwSelBoxes& rBoxes, inline void InsertLine( SvPtrarr& rLineArr, SwTableLine* pLine ) { - if( USHRT_MAX == rLineArr.GetPos( (void*&)pLine ) ) - rLineArr.Insert( (void*&)pLine, rLineArr.Count() ); + if( USHRT_MAX == rLineArr.GetPos( pLine ) ) + rLineArr.Insert( pLine, rLineArr.Count() ); } //----------------------------------------------------------------------------- @@ -560,8 +560,8 @@ BOOL SwDoc::GetRowBackground( const SwCursor& rCursor, SvxBrushItem &rToFill ) c #***********************************************************************/ inline void InsertCell( SvPtrarr& rCellArr, SwCellFrm* pCellFrm ) { - if( USHRT_MAX == rCellArr.GetPos( (void*&)pCellFrm ) ) - rCellArr.Insert( (void*&)pCellFrm, rCellArr.Count() ); + if( USHRT_MAX == rCellArr.GetPos( pCellFrm ) ) + rCellArr.Insert( pCellFrm, rCellArr.Count() ); } //----------------------------------------------------------------------------- diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 96e775b93d7c..d95bfb76ce69 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -557,7 +557,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut ) (nL1b <= nL2b && nL1c + nAdd > nL2b)) ) { SwLineRect *pMSC = &rL2; - aCheck.Insert( (void*&)pMSC, aCheck.Count() ); + aCheck.Insert( pMSC, aCheck.Count() ); } } if ( aCheck.Count() < 2 ) |