[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/datauno.hxx              |    2 +-
 sc/source/ui/unoobj/datauno.cxx |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit b79294b824506dd78a7e0e4bbf6250343a618a26
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu May 12 16:21:15 2011 -0400

    Let's not change the signature of UNO call & prefer static_cast.

diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index 7d43e4f..423ab5f 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -683,7 +683,7 @@ public:
     virtual void SAL_CALL setByTable( const ::com::sun::star::table::CellRangeAddress& aRange )
                                 throw(::com::sun::star::uno::RuntimeException,
                                       ::com::sun::star::lang::IndexOutOfBoundsException );
-    virtual com::sun::star::uno::Any SAL_CALL getByTable( const sal_Int32 nTab )
+    virtual com::sun::star::uno::Any SAL_CALL getByTable( sal_Int32 nTab )
                                 throw(::com::sun::star::uno::RuntimeException,
                                 ::com::sun::star::lang::IndexOutOfBoundsException,
                                 ::com::sun::star::container::NoSuchElementException );
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 860db1b..f192242 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -2419,7 +2419,7 @@ void ScUnnamedDatabaseRangesObj::setByTable( const table::CellRangeAddress& aRan
         throw uno::RuntimeException();		// no other exceptions specified
 }
 
-uno::Any ScUnnamedDatabaseRangesObj::getByTable( const sal_Int32 nTab )
+uno::Any ScUnnamedDatabaseRangesObj::getByTable( sal_Int32 nTab )
                                 throw(uno::RuntimeException,
                                     lang::IndexOutOfBoundsException,
                                     container::NoSuchElementException)
@@ -2429,7 +2429,8 @@ uno::Any ScUnnamedDatabaseRangesObj::getByTable( const sal_Int32 nTab )
     {
         if ( pDocShell->GetDocument()->GetTableCount() <= nTab )
             throw lang::IndexOutOfBoundsException();
-        uno::Reference<sheet::XDatabaseRange> xRange( new ScDatabaseRangeObj(pDocShell, (SCTAB) nTab) );
+        uno::Reference<sheet::XDatabaseRange> xRange(
+            new ScDatabaseRangeObj(pDocShell, static_cast<SCTAB>(nTab)));
         if (xRange.is())
             return uno::makeAny(xRange);
         else