[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source

Michael Stahl mstahl at redhat.com
Wed Feb 13 00:56:25 PST 2013


 sw/source/ui/dbui/dbinsdlg.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b1004870a37aba0232c451580ca21d33184bbeca
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Feb 12 14:48:56 2013 +0100

    fdo#60092: fix STL regression in SwInsertDBColAutoPilot::DataToDoc
    
    (regression from f7d681dc34e60eb8532403079d007ca1250f4941)
    
    Change-Id: Ida92854efe6ddffffb8fe10e5ef1f42c53747f40
    (cherry picked from commit cbc722733bb272b0f26efec09b478bed9a3cdb96)
    Reviewed-on: https://gerrit.libreoffice.org/2119
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 617da5a..451cb66 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -1002,8 +1002,8 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
         {
             SwInsDBColumn aSrch( aLbTableCol.GetEntry( n ), 0 );
             SwInsDBColumns::const_iterator it = aDBColumns.find( &aSrch );
-            if( it != aDBColumns.end() )
-                aColFlds[ n ] = *it;
+            if (it != aDBColumns.end())
+                aColFlds.push_back(*it);
             else {
                 OSL_ENSURE( !this, "database column not found" );
             }


More information about the Libreoffice-commits mailing list