[Libreoffice-commits] .: basic/source connectivity/source svx/source

[Caolán McNamara]

 basic/source/comp/codegen.cxx                      |    8 +++-----
 basic/source/comp/loops.cxx                        |    3 +--
 connectivity/source/drivers/adabas/BConnection.cxx |    2 +-
 svx/source/fmcomp/fmgridcl.cxx                     |    1 -
 4 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit 2e0485d3748c33e310e3861aedf4bfcae754c071
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jan 29 17:12:46 2011 +0000

    WaE: various new gcc 4.6.0 warnings

diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index e3f6687..8663a7f 100644
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -33,6 +33,7 @@
 #include "sbcomp.hxx"
 #include "image.hxx"
 #include <limits>
+#include <algorithm>
 #include <com/sun/star/script/ModuleType.hpp>
 
 // nInc is the increment size of the buffers
@@ -243,7 +244,7 @@ void SbiCodeGen::Save()
                     if( nPass == 1 )
                         aPropName = aPropName.Copy( aIfaceName.Len() + 1 );
                     SbProcedureProperty* pProcedureProperty = NULL;
-                                        OSL_TRACE("*** getProcedureProperty for thing %s",
+                    OSL_TRACE("*** getProcedureProperty for thing %s",
                         rtl::OUStringToOString( aPropName,RTL_TEXTENCODING_UTF8 ).getStr() );
                     pProcedureProperty = rMod.GetProcedureProperty( aPropName, ePropType );
                 }
@@ -437,10 +438,7 @@ public:
         T result = 0 ; 
         static const S max = std::numeric_limits< S >::max();
         result = m_nNumOp0 + ( ( sizeof(S) + 1 ) * m_nNumSingleParams ) + ( (( sizeof(S) * 2 )+ 1 )  * m_nNumDoubleParams ); 
-        if ( result > max ) 
-            return max;
-    
-        return static_cast<S>(result); 
+        return std::min(static_cast<T>(max), result);
     }
    virtual bool processParams(){ return false; }
 };
diff --git a/basic/source/comp/loops.cxx b/basic/source/comp/loops.cxx
index 10284fb..d35d649 100644
--- a/basic/source/comp/loops.cxx
+++ b/basic/source/comp/loops.cxx
@@ -317,8 +317,7 @@ void SbiParser::OnGoto()
     UINT32 nLbl = 0;
     do
     {
-        SbiToken eTok2 = NIL;
-        eTok2 = Next();	// Label holen
+        Next();	// Label holen
         if( MayBeLabel() )
         {
             UINT32 nOff = pProc->GetLabels().Reference( aSym );
diff --git a/connectivity/source/drivers/adabas/BConnection.cxx b/connectivity/source/drivers/adabas/BConnection.cxx
index d0d76db..74e7cca 100644
--- a/connectivity/source/drivers/adabas/BConnection.cxx
+++ b/connectivity/source/drivers/adabas/BConnection.cxx
@@ -141,7 +141,7 @@ SQLRETURN OAdabasConnection::openConnectionWithAuth(const ::rtl::OUString& aConn
 
 
 
-    N3SQLSetConnectAttr(m_aConnectionHandle,SQL_ATTR_LOGIN_TIMEOUT,(SQLPOINTER)nTimeOut,SQL_IS_INTEGER);
+    N3SQLSetConnectAttr(m_aConnectionHandle,SQL_ATTR_LOGIN_TIMEOUT,(SQLPOINTER)(sal_IntPtr)nTimeOut,SQL_IS_INTEGER);
     // Verbindung aufbauen
 
     nSQLRETURN = N3SQLConnect(m_aConnectionHandle,
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 0f31ea4..26e1c4a 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -449,7 +449,6 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ )
         Reference< XIndexContainer >  xCols(static_cast<FmGridControl*>(GetParent())->GetPeer()->getColumns());
         Reference< XGridColumnFactory >  xFactory(xCols, UNO_QUERY);
 
-        Point aPos	= OutputToScreenPixel(m_pImpl->aDropPosPixel);
         sal_uInt16 nColId = GetItemId(m_pImpl->aDropPosPixel);
         // EinfuegePosition, immer vor der aktuellen Spalte
         sal_uInt16 nPos = GetModelColumnPos(nColId);