[Libreoffice-commits] core.git: connectivity/source

[Andrzej J.R. Hunt]

 connectivity/source/drivers/firebird/FResultSet.cxx |    4 ++--
 connectivity/source/drivers/firebird/FResultSet.hxx |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 37a1484535e2596afa6c871d4b288df0759459e1
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date:   Thu Jul 18 21:17:48 2013 +0200

    Avoid ORowSetValueDecorator as it seems broken on some platforms.
    
    Change-Id: I47c3be3faf62df2b8124f1c773d20a41405c4bbc

diff --git a/connectivity/source/drivers/firebird/FResultSet.cxx b/connectivity/source/drivers/firebird/FResultSet.cxx
index d06b6f5..392edde 100644
--- a/connectivity/source/drivers/firebird/FResultSet.cxx
+++ b/connectivity/source/drivers/firebird/FResultSet.cxx
@@ -164,7 +164,7 @@ void OResultSet::ensureDataAvailable() throw (SQLException)
     }
 }
 
-const ORowSetValueDecorator& OResultSet::getSqlData(sal_Int32 aRow, sal_Int32 aColumn)
+const ORowSetValue& OResultSet::getSqlData(sal_Int32 aRow, sal_Int32 aColumn)
     throw(SQLException)
 {
     // Validate input (throws Exceptions as appropriate)
@@ -467,7 +467,7 @@ const ORowSetValue& OResultSet::safelyRetrieveValue(sal_Int32 columnIndex)
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
     ensureDataAvailable();
 
-    return getSqlData(m_currentRow,columnIndex).getValue();
+    return getSqlData(m_currentRow,columnIndex);
 }
 
 sal_Bool SAL_CALL OResultSet::getBoolean(sal_Int32 columnIndex)
diff --git a/connectivity/source/drivers/firebird/FResultSet.hxx b/connectivity/source/drivers/firebird/FResultSet.hxx
index 3230186..149d72d 100644
--- a/connectivity/source/drivers/firebird/FResultSet.hxx
+++ b/connectivity/source/drivers/firebird/FResultSet.hxx
@@ -62,7 +62,7 @@ namespace connectivity
     namespace firebird
     {
 
-        typedef ::std::vector< ::connectivity::ORowSetValueDecorator > TRow;
+        typedef ::std::vector< ::connectivity::ORowSetValue > TRow;
         typedef ::std::vector< TRow >                  TTable;
 
         /*
@@ -105,7 +105,7 @@ namespace connectivity
 
             void ensureDataAvailable()
                 throw (::com::sun::star::sdbc::SQLException);
-            const ORowSetValueDecorator& getSqlData(sal_Int32 aRow, sal_Int32 aColumn)
+            const ::connectivity::ORowSetValue& getSqlData(sal_Int32 aRow, sal_Int32 aColumn)
                 throw (::com::sun::star::sdbc::SQLException);
 
             const ::connectivity::ORowSetValue& safelyRetrieveValue(sal_Int32 columnIndex)