[Libreoffice-commits] .: 2 commits - sc/source

[Caolán McNamara]

 sc/source/ui/docshell/dbdocimp.cxx  |    2 +-
 sc/source/ui/vba/vbachartobject.cxx |    2 +-
 sc/source/ui/vba/vbachartobject.hxx |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f6727dc6d3d44285a4571f0b599c94cddb7b4531
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 16 12:13:23 2010 +0000

    cppcheck: can be const

diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx
index 839b7cf..99fcbef 100644
--- a/sc/source/ui/vba/vbachartobject.cxx
+++ b/sc/source/ui/vba/vbachartobject.cxx
@@ -205,7 +205,7 @@ ScVbaChartObject::setTop(double _fTop)
 }
 
 uno::Reference< uno::XInterface > 
-ScVbaChartObject::getUnoObject() throw (script::BasicErrorException) 
+ScVbaChartObject::getUnoObject() const throw (script::BasicErrorException)
 {
     return uno::Reference< uno::XInterface >( xShape, uno::UNO_QUERY );
 }
diff --git a/sc/source/ui/vba/vbachartobject.hxx b/sc/source/ui/vba/vbachartobject.hxx
index 4e995d9..ad816b6 100644
--- a/sc/source/ui/vba/vbachartobject.hxx
+++ b/sc/source/ui/vba/vbachartobject.hxx
@@ -75,7 +75,7 @@ public:
     void setTop( double _ftop );
     // should make this part of the XHelperInterface with a default
     // implementation returning NULL
-    css::uno::Reference< css::uno::XInterface > getUnoObject() throw ( css::script::BasicErrorException );
+    css::uno::Reference< css::uno::XInterface > getUnoObject() const throw ( css::script::BasicErrorException );
 };
 
 #endif //SC_VBA_WINDOW_HXX
commit ec9b926fcbee47497eb36f1f520df8303c140afd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 16 11:47:18 2010 +0000

    cppcheck: can reduce the scope of this variable

diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index 8e7f000..4a5a293 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -280,7 +280,6 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
         //	progress bar
         //	only text (title is still needed, for the cancel button)
         ScProgress aProgress( &rDocShell, ScGlobal::GetRscString(STR_UNDO_IMPORTDATA), 0 );
-        USHORT nInserted = 0;
 
         uno::Reference<sdbc::XRowSet> xRowSet = uno::Reference<sdbc::XRowSet>(
                 xResultSet, uno::UNO_QUERY );
@@ -380,6 +379,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
                 BOOL bEnd = FALSE;
                 if ( !bDoSelection )
                     xRowSet->beforeFirst();
+                USHORT nInserted = 0;
                 while ( !bEnd )
                 {
                     //	skip rows that are not selected