cmcfixes71: #i108580#: fix sw strict aliasing warnings
This commit is contained in:
parent
fdde737ea0
commit
2c87517fcc
2 changed files with 5 additions and 5 deletions
|
@ -176,8 +176,8 @@ BOOL lcl_GetBoxSel( const SwCursor& rCursor, SwSelBoxes& rBoxes,
|
||||||
|
|
||||||
inline void InsertLine( SvPtrarr& rLineArr, SwTableLine* pLine )
|
inline void InsertLine( SvPtrarr& rLineArr, SwTableLine* pLine )
|
||||||
{
|
{
|
||||||
if( USHRT_MAX == rLineArr.GetPos( (void*&)pLine ) )
|
if( USHRT_MAX == rLineArr.GetPos( pLine ) )
|
||||||
rLineArr.Insert( (void*&)pLine, rLineArr.Count() );
|
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 )
|
inline void InsertCell( SvPtrarr& rCellArr, SwCellFrm* pCellFrm )
|
||||||
{
|
{
|
||||||
if( USHRT_MAX == rCellArr.GetPos( (void*&)pCellFrm ) )
|
if( USHRT_MAX == rCellArr.GetPos( pCellFrm ) )
|
||||||
rCellArr.Insert( (void*&)pCellFrm, rCellArr.Count() );
|
rCellArr.Insert( pCellFrm, rCellArr.Count() );
|
||||||
}
|
}
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
|
@ -557,7 +557,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
|
||||||
(nL1b <= nL2b && nL1c + nAdd > nL2b)) )
|
(nL1b <= nL2b && nL1c + nAdd > nL2b)) )
|
||||||
{
|
{
|
||||||
SwLineRect *pMSC = &rL2;
|
SwLineRect *pMSC = &rL2;
|
||||||
aCheck.Insert( (void*&)pMSC, aCheck.Count() );
|
aCheck.Insert( pMSC, aCheck.Count() );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ( aCheck.Count() < 2 )
|
if ( aCheck.Count() < 2 )
|
||||||
|
|
Loading…
Reference in a new issue