diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-01-27 11:24:43 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-01-27 12:21:54 +0000 |
| commit | 890219fa025eaa8037bd04d4539e93d3921207ef (patch) | |
| tree | dbff1b8a7955a29b963038c0bf023a5137b0a20c /padmin | |
| parent | 9f06603d3234bf8b45a71f42f47c1393bf60f278 (diff) | |
WaE: gcc 4.6.0 various warnings
Diffstat (limited to 'padmin')
| -rw-r--r-- | padmin/source/cmddlg.cxx | 6 | ||||
| -rw-r--r-- | padmin/source/fontentry.cxx | 2 | ||||
| -rw-r--r-- | padmin/source/padialog.cxx | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx index f26ca0293d63..0b307465b5e5 100644 --- a/padmin/source/cmddlg.cxx +++ b/padmin/source/cmddlg.cxx @@ -333,7 +333,7 @@ void RTSCommandPage::save() String aOldPdfPath; bool bOldFaxSwallow = false; bool bFaxSwallow = m_aFaxSwallowBox.IsChecked() ? true : false; - bool bOldExternalDialog = false, bExternalDialog = m_aExternalCB.IsChecked() ? true : false; + bool bExternalDialog = m_aExternalCB.IsChecked() ? true : false; while( nIndex != -1 ) { @@ -360,10 +360,6 @@ void RTSCommandPage::save() sal_Int32 nPos = 0; bOldFaxSwallow = aToken.getToken( 1, '=', nPos ).compareToAscii( "swallow", 7 ) ? false : true; } - else if( ! aToken.compareToAscii( "external_dialog" ) ) - { - bOldExternalDialog = true; - } } ::std::list< String >* pList = &m_aPrinterCommands; if( bExternalDialog ) diff --git a/padmin/source/fontentry.cxx b/padmin/source/fontentry.cxx index 43abfe3b2bac..3323360aa0e7 100644 --- a/padmin/source/fontentry.cxx +++ b/padmin/source/fontentry.cxx @@ -216,7 +216,7 @@ void FontNameDlg::init() else aEntry = fillFontEntry( aInfo, String( ByteString( aFile ), osl_getThreadTextEncoding() ), aFamilies[ aInfo.m_aFamilyName ] > 1 ); USHORT nEntry = m_aFontBox.InsertEntry( aEntry ); - m_aFontBox.SetEntryData( nEntry, (void*)(*font_it) ); + m_aFontBox.SetEntryData( nEntry, (void*)(sal_IntPtr)(*font_it) ); } } } diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx index 85a1d52c5875..4f1056a48a1c 100644 --- a/padmin/source/padialog.cxx +++ b/padmin/source/padialog.cxx @@ -737,7 +737,7 @@ void PADialog::UpdateDevice() bFax ? m_aFaxImg : bPdf ? m_aPdfImg : m_aPrinterImg ); - m_aDevicesLB.SetEntryData( nPos, (void*)it->getLength() ); + m_aDevicesLB.SetEntryData( nPos, (void*)(sal_IntPtr)it->getLength() ); if( *it == m_rPIManager.getDefaultPrinter() ) { m_aDevicesLB.SelectEntryPos( nPos ); |