[Libreoffice-commits] .: Branch 'feature/mork' - connectivity/source

[David Ostrovsky]

 connectivity/source/drivers/mork/MQueryHelper.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 90734440b27960a23e8b40041e53f58f73df2530
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Thu Aug 16 22:53:52 2012 +0200

    create MQueryHelperResultEntry per row and not per cell
    
    Change-Id: Ibec6eca8807c298f72a440a0e022bf4022132d7c

diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx
index 7097110..6b4e351 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.cxx
@@ -205,6 +205,7 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection)
                 // Iterate all rows
                 for ( rowIter = Rows->begin(); rowIter != Rows->end(); rowIter++ )
                 {
+                    MQueryHelperResultEntry* entry = new MQueryHelperResultEntry();
                     for (MorkCells::iterator CellsIter = rowIter->second.begin();
                          CellsIter != rowIter->second.end(); CellsIter++ )
                     {
@@ -213,14 +214,12 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection)
 
                         //SAL_INFO("connectivity.mork", "key: " << column << " value: " << value);
 
-                        MQueryHelperResultEntry* entry = new MQueryHelperResultEntry();
-
                         OString key(column.c_str(), static_cast<sal_Int32>(column.size()));
                         OString valueOString(value.c_str(), static_cast<sal_Int32>(value.size()));
                         rtl::OUString valueOUString = ::rtl::OStringToOUString( valueOString, RTL_TEXTENCODING_UTF8 );
                         entry->setValue(key, valueOUString);
-                        append(entry);
                     }
+                    append(entry);
                 }
             }
         }