[Libreoffice-commits] .: Branch 'libreoffice-3-5' - dbaccess/source

Caolán McNamara caolan at kemper.freedesktop.org
Tue Jun 5 04:28:41 PDT 2012


 dbaccess/source/core/api/KeySet.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 16910edcae542e8eb8a5f9b4278aceaa39262b44
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Fri Jun 1 16:40:41 2012 +0200

    fdo#47520 use the already retrieved row instead of driver row
    
    This avoids asking the driver for the same data twice.
    This is particularly important for ODBC data sources, because when asking for (VAR)CHAR data the second time, one gets no data (and status SQL_NO_DATA) because of the "retrieve in parts" semantics of these datatypes.
    
    Change-Id: I96f2df9927fda72ccf19f78ec5c561f5626c003f

diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 881da40..44c17d8 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -1271,8 +1271,7 @@ sal_Bool OKeySet::absolute_checked( sal_Int32 row,sal_Bool i_bFetchRow )
                     bNext = fetchRow();
                 if ( bNext )
                 {
-                    m_xRow.set(m_xDriverRow,UNO_QUERY_THROW);
-                    return m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin();
+                    i_bFetchRow = true;
                 }
             }
             else


More information about the Libreoffice-commits mailing list