diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-01-27 11:24:02 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-01-27 11:26:22 +0000 |
commit | cde0d74192fdc6563786f4fa35dccd27d1d85271 (patch) | |
tree | 0133e0598099882548e740c8fe29df088c32942b /svx/source | |
parent | b4b0e7a23433d9e54061682dc1d4ca5386564b29 (diff) |
WaE: gcc 4.6.0 various warnings
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/dialog/measctrl.cxx | 1 | ||||
-rw-r--r-- | svx/source/form/fmsrcimp.cxx | 2 | ||||
-rw-r--r-- | svx/source/gallery2/gallery1.cxx | 12 | ||||
-rw-r--r-- | svx/source/stbctrls/modctrl.cxx | 1 | ||||
-rw-r--r-- | svx/source/stbctrls/xmlsecctrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdcrtv.cxx | 5 | ||||
-rw-r--r-- | svx/source/tbxctrls/layctrl.cxx | 2 |
7 files changed, 3 insertions, 22 deletions
diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx index cf8c560fd3fa..5e26a9d64116 100644 --- a/svx/source/dialog/measctrl.cxx +++ b/svx/source/dialog/measctrl.cxx @@ -66,7 +66,6 @@ SvxXMeasurePreview::SvxXMeasurePreview SetMapMode( aMapMode ); aSize = GetOutputSize(); - Rectangle aRect = Rectangle( Point(), aSize ); Point aPt1 = Point( aSize.Width() / 5, (long) ( aSize.Height() / 2 ) ); Point aPt2 = Point( aSize.Width() * 4 / 5, (long) ( aSize.Height() / 2 ) ); diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index 18c045e32b27..b0023385db27 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -164,7 +164,7 @@ void FmRecordCountListener::NotifyCurrentCount() if (m_lnkWhoWantsToKnow.IsSet()) { DBG_ASSERT(m_xListening.is(), "FmRecordCountListener::NotifyCurrentCount : I have no propset ... !?"); - void* pTheCount = (void*)::comphelper::getINT32(m_xListening->getPropertyValue(FM_PROP_ROWCOUNT)); + void* pTheCount = (void*)(sal_IntPtr)::comphelper::getINT32(m_xListening->getPropertyValue(FM_PROP_ROWCOUNT)); m_lnkWhoWantsToKnow.Call(pTheCount); } } diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 43e8dbdc1c9f..d3044f27c2c5 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -94,25 +94,17 @@ INetURLObject GalleryThemeEntry::ImplGetURLIgnoreCase( const INetURLObject& rURL { INetURLObject aURL( rURL ); String aFileName; - BOOL bExists = FALSE; // check original file name - if( FileExists( aURL ) ) - bExists = TRUE; - else + if( !FileExists( aURL ) ) { // check upper case file name aURL.setName( aURL.getName().toAsciiUpperCase() ); - if( FileExists( aURL ) ) - bExists = TRUE; - else + if(!FileExists( aURL ) ) { // check lower case file name aURL.setName( aURL.getName().toAsciiLowerCase() ); - - if( FileExists( aURL ) ) - bExists = TRUE; } } diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx index a2470b9a3bb5..26379211de3f 100644 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -122,7 +122,6 @@ Point centerImage(const Rectangle& rBoundingRect, const Image& rImg) } void SvxModifyControl::Paint( const UserDrawEvent& rUsrEvt ) { - const Rectangle aControlRect = getControlRect(); OutputDevice* pDev = rUsrEvt.GetDevice(); Rectangle aRect = rUsrEvt.GetRect(); diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index eda2ddda5eec..c83abbcd6d36 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -147,8 +147,6 @@ void XmlSecStatusBarControl::Paint( const UserDrawEvent& rUsrEvt ) OutputDevice* pDev = rUsrEvt.GetDevice(); DBG_ASSERT( pDev, "-XmlSecStatusBarControl::Paint(): no Output Device... this will lead to nirvana..." ); Rectangle aRect = rUsrEvt.GetRect(); - StatusBar& rBar = GetStatusBar(); - Point aItemPos = rBar.GetItemTextPos( GetId() ); Color aOldLineColor = pDev->GetLineColor(); Color aOldFillColor = pDev->GetFillColor(); diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index a518511911c5..f3ff2141c36b 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -473,7 +473,6 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point& } if (pAktCreate!=NULL) { - BOOL bStartEdit=FALSE; // nach Ende von Create automatisch TextEdit starten if (pDefaultStyleSheet!=NULL) pAktCreate->NbcSetStyleSheet(pDefaultStyleSheet, sal_False); // #101618# SW uses a naked SdrObject for frame construction. Normally, such an @@ -492,8 +491,6 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point& aSet.Put(XFillStyleItem(XFILL_NONE)); pAktCreate->SetMergedItemSet(aSet); - - bStartEdit=TRUE; } if (nInvent==SdrInventor && (nIdent==OBJ_TEXT || nIdent==OBJ_TEXTEXT || nIdent==OBJ_TITLETEXT || nIdent==OBJ_OUTLINETEXT)) @@ -506,8 +503,6 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point& aSet.Put(XLineStyleItem(XLINE_NONE)); pAktCreate->SetMergedItemSet(aSet); - - bStartEdit=TRUE; } if (!rLogRect.IsEmpty()) pAktCreate->NbcSetLogicRect(rLogRect); diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index c67194929ce9..c3dc54e999e0 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -307,7 +307,6 @@ void TableWindow::Paint( const Rectangle& ) aText += String(SVX_RESSTR(RID_SVXSTR_PAGES)); } - Size aSize = GetOutputSizePixel(); Size aTextSize( GetTextWidth( aText ), GetTextHeight() ); long nTextX = nSelectionWidth + TABLE_CELL_WIDTH; @@ -490,7 +489,6 @@ void ColumnsWindow::MouseMove( const MouseEvent& rMEvt ) SfxPopupWindow::MouseMove( rMEvt ); Point aPos = rMEvt.GetPosPixel(); Point aMousePos = aPos; - Point aWinPos = GetPosPixel(); if ( rMEvt.IsEnterWindow() ) CaptureMouse(); |