diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2011-01-05 12:19:22 +0100 |
---|---|---|
committer | Radek Doulik <rodo@novell.com> | 2011-01-05 12:19:22 +0100 |
commit | b9c9c248426daba51e1c24a11333a507083b8550 (patch) | |
tree | 9173c4cd8bf23d3b64c68554d25ca98867cc40e5 /svx | |
parent | c089f09311e87b920fb45ebe1218954438eb6402 (diff) |
cppcheck cleaning in svx part 2
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/dialog/dialcontrol.cxx | 4 | ||||
-rw-r--r-- | svx/source/dialog/hdft.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/hyprlink.cxx | 1 | ||||
-rw-r--r-- | svx/source/dialog/imapimp.hxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/simptabl.cxx | 7 | ||||
-rw-r--r-- | svx/source/dialog/svxruler.cxx | 4 |
6 files changed, 11 insertions, 9 deletions
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index d5d5d5cfd9..5c235847fc 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -77,6 +77,8 @@ private: DialControlBmp::DialControlBmp( Window& rParent ) : VirtualDevice( rParent, 0, 0 ), mrParent( rParent ), + mnCenterX(0), + mnCenterY(0), mbEnabled( true ) { EnableRTL( FALSE ); @@ -266,6 +268,8 @@ DialControl_Impl::DialControl_Impl( Window& rParent ) : maBmpBuffered( rParent ), mpLinkField( 0 ), mnAngle( 0 ), + mnCenterX( 0 ), + mnCenterY( 0 ), mbNoRot( false ) { } diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index be81e088e0..089bb4d8e4 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -385,13 +385,13 @@ void SvxHFPage::Reset( const SfxItemSet& rSet ) aCntSharedBox.SaveValue(); RangeHdl( 0 ); - USHORT nHtmlMode = 0; const SfxPoolItem* pItem = 0; SfxObjectShell* pShell; if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, FALSE, &pItem) || ( 0 != (pShell = SfxObjectShell::Current()) && 0 != (pItem = pShell->GetItem(SID_HTML_MODE)))) { + USHORT nHtmlMode = 0; nHtmlMode = ((SfxUInt16Item*)pItem)->GetValue(); if(nHtmlMode && HTMLMODE_ON) { diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx index 76dd98cf78..bd66b25d99 100644 --- a/svx/source/dialog/hyprlink.cxx +++ b/svx/source/dialog/hyprlink.cxx @@ -809,6 +809,7 @@ void SvxHyperlinkDlg::SetImages() HyperCombo::HyperCombo( SvxHyperlinkDlg* pDialog, const ResId& rResId ) : ComboBox( (Window *)pDialog, rResId ) { + nRatio = 0; pDlg = pDialog; nMaxWidth = GetSizePixel().Width(); diff --git a/svx/source/dialog/imapimp.hxx b/svx/source/dialog/imapimp.hxx index 4887298e35..51ebf403f9 100644 --- a/svx/source/dialog/imapimp.hxx +++ b/svx/source/dialog/imapimp.hxx @@ -50,7 +50,7 @@ public: void* pUpdateEditingObject; BOOL bExecState; - IMapOwnData( SvxIMapDlg* pIMapDlg ) : pIMap ( pIMapDlg ) {} + IMapOwnData( SvxIMapDlg* pIMapDlg ) : pIMap ( pIMapDlg ), pUpdateEditingObject( NULL ) {} }; diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx index d1b37a9a5b..30d2c4214e 100644 --- a/svx/source/dialog/simptabl.cxx +++ b/svx/source/dialog/simptabl.cxx @@ -226,7 +226,6 @@ void SvxSimpleTable::Paint( const Rectangle& rRect ) SvHeaderTabListBox::Paint(rRect ); USHORT nPrivTabCount = TabCount(); - USHORT nPos = 0; USHORT nNewSize = ( nPrivTabCount > 0 ) ? (USHORT)GetTab(0) : 0; long nOffset=-GetXOffset(); @@ -240,6 +239,7 @@ void SvxSimpleTable::Paint( const Rectangle& rRect ) if(nPrivTabCount>aHeaderBar.GetItemCount()) nPrivTabCount=aHeaderBar.GetItemCount(); + USHORT nPos = 0; for(USHORT i=1;i<nPrivTabCount;i++) { nNewSize = static_cast< USHORT >( GetTab(i) ) - nPos; @@ -442,15 +442,14 @@ void SvxSimpleTable::HBarEndDrag() { HideTracking(); USHORT nPrivTabCount=TabCount(); - USHORT nPos=0; - USHORT nNewSize=0; if(nPrivTabCount) { if(nPrivTabCount>aHeaderBar.GetItemCount()) nPrivTabCount=aHeaderBar.GetItemCount(); - //for(USHORT i=1;i<=nPrivTabCount;i++) + USHORT nPos=0; + USHORT nNewSize=0; for(USHORT i=1;i<nPrivTabCount;i++) { nNewSize = static_cast< USHORT >( aHeaderBar.GetItemSize(i) ) + nPos; diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 6440fc5137..bc3534b268 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -2186,16 +2186,14 @@ ADD_DEBUG_TEXT("lLastLMargin: ", String::CreateFromInt32(pRuler_Imp->lLastLMargi //This includes the left border when the table is not limited //to a lower frame border. int nLimit; - long lLeft; if(GetDragType()==RULER_TYPE_BORDER) { nLimit=nIdx+1; - lLeft=(pBorders[nIdx].nPos+=lDiff); + pBorders[nIdx].nPos+=lDiff; } else { nLimit=0; - lLeft=pRuler_Imp->lLastLMargin+lDiff; } //in vertical tables the left borders have to be moved if(bHorz) |