diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2010-02-15 15:55:35 +0100 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2010-02-15 15:55:35 +0100 |
| commit | ec9b67f5c9dcc15c4e83bff54c618aa386ce7f20 (patch) | |
| tree | 8b7a9eceaf24ec75ce6e004bfce82d0734df4943 | |
| parent | 52c49083999d9588d8656f7a78cf7d23a3d67ca7 (diff) | |
| parent | 3b5229de0020283ea955a0ee330fefd7d69c2040 (diff) | |
CWS-TOOLING: integrate CWS cmcfixes71
| -rw-r--r-- | sw/source/core/docnode/ndtbl1.cxx | 8 | ||||
| -rw-r--r-- | sw/source/core/fields/expfld.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/unocore/unoobj.cxx | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx index bd80f9fa49..06a30c5688 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/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index f3c810b3ee..2ba55c3e6a 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -1298,7 +1298,7 @@ BOOL SwSetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId ) break; case FIELD_PROP_DOUBLE: { - double fVal; + double fVal = 0.0; rAny >>= fVal; SetValue(fVal); } diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 93fece7590..ee8be50610 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 ) diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index f3727e1ffd..f6e0af486f 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -843,7 +843,7 @@ void SwXTextCursor::Impl::Modify(SfxPoolItem *pOld, SfxPoolItem *pNew) if (!GetRegisteredIn() || // if the cursor leaves its designated section, it becomes invalid - (pOld != NULL) && (pOld->Which() == RES_UNOCURSOR_LEAVES_SECTION)) + ((pOld != NULL) && (pOld->Which() == RES_UNOCURSOR_LEAVES_SECTION))) { Invalidate(); } |