[Libreoffice-commits] .: 4 commits - dbaccess/source sc/source shell/source

[Michael Stahl]

 dbaccess/source/ui/dlg/directsql.cxx                    |    2 +-
 sc/source/core/data/validat.cxx                         |    8 ++++++--
 shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx |    6 ++++--
 shell/source/win32/shlxthandler/util/registry.cxx       |    3 ++-
 4 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 68a04271325dbb9add90960212a5b19e89220f29
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jul 12 22:54:59 2012 +0200

    ScValidationDataList: use const_iterator
    
    Change-Id: Ia465bc3b4bb4c075d235ccd14cac0248b198d470

diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index f41adff..4ccb551 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -884,8 +884,10 @@ ScValidationDataList::ScValidationDataList(const ScValidationDataList& rList) :
 {
     //  fuer Ref-Undo - echte Kopie mit neuen Tokens!
 
-    for( iterator it = rList.begin(); it != rList.end(); ++it )
+    for (const_iterator it = rList.begin(); it != rList.end(); ++it)
+    {
         InsertNew( (*it)->Clone() );
+    }
 
     //!     sortierte Eintraege aus rList schneller einfuegen ???
 }
@@ -895,8 +897,10 @@ ScValidationDataList::ScValidationDataList(ScDocument* pNewDoc,
 {
     //  fuer neues Dokument - echte Kopie mit neuen Tokens!
 
-    for( iterator it = rList.begin(); it != rList.end(); ++it )
+    for (const_iterator it = rList.begin(); it != rList.end(); ++it)
+    {
         InsertNew( (*it)->Clone(pNewDoc) );
+    }
 
     //!     sortierte Eintraege aus rList schneller einfuegen ???
 }
commit 7677eafaabb29b2bc3f136144d22e3e07e0e0790
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jul 12 22:51:51 2012 +0200

    warning C4267: conversion from 'size_t' to 'DWORD'
    
    Change-Id: If6cbb99b59b14fc7911c0fe76f44ac21b0db5042

diff --git a/shell/source/win32/shlxthandler/util/registry.cxx b/shell/source/win32/shlxthandler/util/registry.cxx
index 3824dc5..06f8240 100644
--- a/shell/source/win32/shlxthandler/util/registry.cxx
+++ b/shell/source/win32/shlxthandler/util/registry.cxx
@@ -64,7 +64,8 @@ bool SetRegistryKey(HKEY RootKey, const char* KeyName, const char* ValueName, co
     if (ERROR_SUCCESS == rc)
     {
         rc = RegSetValueExA(
-            hSubKey, ValueName, 0, REG_SZ, reinterpret_cast<const BYTE*>(Value), strlen(Value) + 1);
+            hSubKey, ValueName, 0, REG_SZ, reinterpret_cast<const BYTE*>(Value),
+            static_cast<DWORD>(strlen(Value) + 1));
 
         RegCloseKey(hSubKey);
     }
commit 9e20e9a7b88d64c521c55bde8b4e5f10578d6ccf
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jul 12 22:50:51 2012 +0200

    warning C4100: unreferenced formal parameter
    
    Change-Id: I0965bb0cf13becd8a55170789f81714919cbbdf2

diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
index c9ea9b3..21a2513 100644
--- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
+++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
@@ -186,7 +186,8 @@ HRESULT STDMETHODCALLTYPE CPropertyHdl::GetValue( REFPROPERTYKEY key, PROPVARIAN
 }
 
 //-----------------------------
-HRESULT STDMETHODCALLTYPE CPropertyHdl::SetValue( REFPROPERTYKEY key, REFPROPVARIANT propVar )
+HRESULT STDMETHODCALLTYPE
+CPropertyHdl::SetValue(REFPROPERTYKEY /*key*/, REFPROPVARIANT /*propVar*/)
 {
     HRESULT hr = E_UNEXPECTED;
     if ( m_pCache )
@@ -205,7 +206,8 @@ HRESULT STDMETHODCALLTYPE CPropertyHdl::Commit()
 //-----------------------------
 // IPropertyStore
 //-----------------------------
-HRESULT STDMETHODCALLTYPE CPropertyHdl::IsPropertyWritable( REFPROPERTYKEY key )
+HRESULT STDMETHODCALLTYPE
+CPropertyHdl::IsPropertyWritable(REFPROPERTYKEY /*key*/)
 {
     // We start with read only properties only
     return S_FALSE;
commit d59024b652ccfaf7247da113ec36788fe260de74
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jul 12 22:18:43 2012 +0200

    warning C4101: unreferenced local variable
    
    Change-Id: I0648821a4d0c716371bb011df8cd9b21db79ccf5

diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index 5c917f4..2f57720 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -252,7 +252,7 @@ DBG_NAME(DirectSQLDialog)
                             }
                         }
                         // trap for when we fall off the end of the row
-                        catch (const SQLException& e)
+                        catch (const SQLException&)
                         {
                         }
                         // report the output