[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - unotools/source

[Vitaliy Anderson]

 unotools/source/config/compatibility.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 4b0a2b0ab9e03f20c5cde4064447ffa15f19b90f
Author: Vitaliy Anderson <vanderson at smartru.com>
Date:   Sat Aug 19 17:18:19 2017 +0000

    tdf#110355: regression fix
    
    The regression from 91ccb4dbf7cbe7e684c7a8183863e597d7205e57
    "Compatibility
    options refactoring. Part 1" patch.
    
    SvtCompatibilityOptions_Impl::SvtCompatibilityOptions_Impl() solve
    problem with wrong filling SvtCompatibilityEntry item fields from
    lValues sequence
    
    Change-Id: I695ad78bacbcce41b19b5fb90b86ff08fc041971
    Reviewed-on: https://gerrit.libreoffice.org/41328
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit 52275c689bcdd46f23ff5ebd5cfcc94614bfbffe)
    Reviewed-on: https://gerrit.libreoffice.org/41426
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx
index bea5cb841a3b..aa10fbc18601 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.cxx
@@ -169,6 +169,7 @@ SvtCompatibilityOptions_Impl::SvtCompatibilityOptions_Impl() : ConfigItem( ROOTN
     // Get names/values for new menu.
     // 4 subkeys for every item!
     bool bDefaultFound = false;
+    sal_Int32 nDestStep    = 0;
     for ( sal_uInt32 nItem = 0; nItem < nCount; ++nItem )
     {
         SvtCompatibilityEntry aItem;
@@ -176,7 +177,10 @@ SvtCompatibilityOptions_Impl::SvtCompatibilityOptions_Impl() : ConfigItem( ROOTN
         aItem.setValue<OUString>( SvtCompatibilityEntry::Index::Name, lNodes[ nItem ] );
 
         for ( int i = static_cast<int>(SvtCompatibilityEntry::Index::Module); i < static_cast<int>(SvtCompatibilityEntry::Index::INVALID); ++i )
-            aItem.setValue( SvtCompatibilityEntry::Index(i), lValues[ i - 1 ] );
+        {
+            aItem.setValue( SvtCompatibilityEntry::Index(i), lValues[ nDestStep ] );
+            nDestStep++;
+        }
 
         m_aOptions.push_back( aItem );