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

[Christoph Lutz]

 sw/source/uibase/uno/unomailmerge.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit b092dfa9316212722b56b9e027c54eee91aba963
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date:   Mon Mar 23 13:50:52 2015 +0000

    tdf#90594: MM: Fix for broken translation between Bookmarks and row indizes
    
    The datasets used in the unomailmerge service can be selected via a
    property "Selection". This property expects a sequence of sdbc::Bookmark
    elements that need to be translated into row-inizes. This translation
    was broken - the loop-pointer pTranslated was never incremented which
    caused a wrong "result" selection in which only the first element was
    changed.
    
    Change-Id: I319131caa89e327b11406ab7d0c56a833385d433
    Reviewed-on: https://gerrit.libreoffice.org/15289
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx
index 31cbc11..65d78e5 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -573,6 +573,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
                         *pTranslated <<= xCurResultSet->getRow();
                     else
                         bEverythingsFine = false;
+                    ++pTranslated;
                 }
                 if ( bEverythingsFine )
                     bValid = true;