strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WaE: gcc 4.6.0 various warnings

Browse source
This commit is contained in:
Caolán McNamara 2011-01-27 11:24:02 +00:00
parent b4b0e7a234
commit cde0d74192
11 changed files with 5 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fpicker/source/office/iodlg.cxx
View file

@ -2489,7 +2489,6 @@ void SvtFileDialog::InitSize()
if ( !_pImp->_nFixDeltaHeight )
{
// Fixgr"ossen errechnen und merken
Point aPnt = _pFileView->GetPosPixel();
long nBoxH = _pFileView->GetSizePixel().Height();
long nH = GetSizePixel().Height();
_pImp->_nFixDeltaHeight = nH - nBoxH;

3
framework/source/classes/fwktabwindow.cxx
View file

@ -194,8 +194,7 @@ void FwkTabPage::Resize()
{
if ( m_xPage.is () )
{
Size aSize = GetSizePixel ();
Point aPos = GetPosPixel ();
Size aSize = GetSizePixel();
m_xPage->setPosSize( 0, 0, aSize.Width()-1 , aSize.Height()-1, awt::PosSize::POSSIZE );
}

2
framework/source/helper/actiontriggerhelper.cxx
View file

@ -138,7 +138,6 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta
OUString aHelpURL;
Reference< XBitmap > xBitmap;
Reference< XIndexContainer > xSubContainer;
sal_Bool bSpecialItemId = sal_False;
USHORT nNewItemId = nItemId++;
GetMenuItemAttributes( xPropSet, aLabel, aCommandURL, aHelpURL, xBitmap, xSubContainer );
@ -153,7 +152,6 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta
// command url but uses the item id as a unqiue identifier. These entries
// got a special url during conversion from menu=>actiontriggercontainer.
// Now we have to extract this special url and set the correct item id!!!
bSpecialItemId = sal_True;
nNewItemId = (USHORT)aCommandURL.copy( nIndex+aSlotURL.getLength() ).toInt32();
pSubMenu->InsertItem( nNewItemId, aLabel );
}

6
framework/source/layoutmanager/layoutmanager.cxx
View file

@ -4726,7 +4726,6 @@ throw (RuntimeException)
RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::hideElement" );
sal_Bool bResult( sal_False );
sal_Bool bNotify( sal_False );
::rtl::OUString aElementType;
::rtl::OUString aElementName;
@ -4755,7 +4754,6 @@ throw (RuntimeException)
if ( pMenuBar )
{
pMenuBar->SetDisplayable( sal_False );
bResult = sal_True;
bNotify = sal_True;
}
}
@ -4774,14 +4772,13 @@ throw (RuntimeException)
implts_writeWindowStateData( m_aStatusBarAlias, m_aStatusBarElement );
doLayout();
bNotify = sal_True;
bResult = sal_True;
}
}
}
else if ( aElementType.equalsIgnoreAsciiCaseAscii( "progressbar" ) &&
aElementName.equalsIgnoreAsciiCaseAscii( "progressbar" ))
{
bResult = bNotify = implts_hideProgressBar();
bNotify = implts_hideProgressBar();
}
else if ( aElementType.equalsIgnoreAsciiCaseAscii( "toolbar" ))
{
@ -4806,7 +4803,6 @@ throw (RuntimeException)
if ( xDockWindow.is() && !xDockWindow->isFloating() )
doLayout();
bResult = sal_True;
bNotify = sal_True;
} // if ( xDockWindow.is() )
break;

1
svx/source/dialog/measctrl.cxx
View file

@ -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 ) );

2
svx/source/form/fmsrcimp.cxx
View file

@ -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);
}
}

12
svx/source/gallery2/gallery1.cxx
View file

@ -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;
}
}

1
svx/source/stbctrls/modctrl.cxx
View file

@ -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();

2
svx/source/stbctrls/xmlsecctrl.cxx
View file

@ -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();

5
svx/source/svdraw/svdcrtv.cxx
View file

@ -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);

2
svx/source/tbxctrls/layctrl.cxx
View file

@ -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();