[Libreoffice-commits] .: 2 commits - canvas/source padmin/source

[Caolán McNamara]

 canvas/source/tools/prioritybooster.cxx |    2 +-
 padmin/source/cmddlg.cxx                |    6 +-----
 padmin/source/fontentry.cxx             |    2 +-
 padmin/source/padialog.cxx              |    2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit f7d99fae6aab153a874986d135bcfa21bd902043
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 27 16:53:22 2011 +0000

    WaE: gcc 4.6.0 various warnings

diff --git a/canvas/source/tools/prioritybooster.cxx b/canvas/source/tools/prioritybooster.cxx
index 4256965..142c25c 100644
--- a/canvas/source/tools/prioritybooster.cxx
+++ b/canvas/source/tools/prioritybooster.cxx
@@ -68,7 +68,7 @@ namespace canvas
                             "PriorityBooster::PriorityBooster(): Was not able to modify thread priority" );
             }
 #else
-            nDelta = 0; // #i55991# placate gcc warning
+            (void)nDelta;
 #endif
         }
 
commit fa1bb962027718f44e4bbce6dd92cc1087ee69bd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 27 11:24:43 2011 +0000

    WaE: gcc 4.6.0 various warnings

diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx
index 3252ee7..fedd1b2 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 edd48fc..5d4e37e 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 85a1d52..4f1056a 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 );