[Libreoffice-commits] core.git: Branch 'feature/gsoc17-revamp-customize-dialog' - cui/source

Muhammet Kara muhammet.kara at pardus.org.tr
Fri Aug 11 20:03:29 UTC 2017


 cui/source/customize/cfgutil.cxx |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 9c20d012c243534ede16b4b4c98bd96baf90deb3
Author: Muhammet Kara <muhammet.kara at pardus.org.tr>
Date:   Fri Aug 11 12:36:52 2017 +0300

    Remove useless if check
    
    And the return in the default case, which could cause the UI element to
    stop updating
    
    Change-Id: I29d35818b015f71890f615a02ea215034c048326
    Reviewed-on: https://gerrit.libreoffice.org/41020
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    (cherry picked from commit 114d3b369ae765ce106ffebfeac4498598b6c6b7)
    Reviewed-on: https://gerrit.libreoffice.org/41043
    Reviewed-by: Muhammet Kara <muhammet.kara at pardus.org.tr>

diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index cd86a24b8cbd..a8b5a245b7cf 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -865,14 +865,6 @@ void SfxConfigGroupListBox::GroupSelected()
     SfxGroupInfo_Impl *pInfo = static_cast<SfxGroupInfo_Impl*>(pEntry->GetUserData());
     pFunctionListBox->SetUpdateMode(false);
     pFunctionListBox->ClearAll();
-    if ( pInfo->nKind != SfxCfgKind::GROUP_FUNCTION &&
-         pInfo->nKind != SfxCfgKind::GROUP_ALLFUNCTIONS &&
-             pInfo->nKind != SfxCfgKind::GROUP_SCRIPTCONTAINER &&
-             pInfo->nKind != SfxCfgKind::GROUP_STYLES )
-    {
-        pFunctionListBox->SetUpdateMode(true);
-        return;
-    }
 
     switch ( pInfo->nKind )
     {
@@ -994,7 +986,9 @@ void SfxConfigGroupListBox::GroupSelected()
         }
 
         default:
-            return;
+            // Do nothing, the list box will stay empty
+            SAL_INFO( "cui.customize", "Ignoring unexpected SfxCfgKind: " <<  static_cast<int>(pInfo->nKind) );
+            break;
     }
 
     if ( pFunctionListBox->GetEntryCount() )


More information about the Libreoffice-commits mailing list