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

[Libreoffice Gerrit user]

 framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 949e16267ba5338f58bae353806c36f6eec55fcc
Author:     Zdibák Zoltán <zdibakzol...@gmail.com>
AuthorDate: Tue Oct 30 18:29:02 2018 +0100
Commit:     Markus Mohrhard <markus.mohrh...@googlemail.com>
CommitDate: Wed Oct 31 02:16:50 2018 +0100

    Reduced scope of the rDefaultElementType variable
    
    Change-Id: I6a18502c933937b50a78389b04c5545644d2e3ba
    Reviewed-on: https://gerrit.libreoffice.org/62638
    Tested-by: Jenkins
    Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>

diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx 
b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index d6c2201a364f..866679cffc2a 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -1513,10 +1513,12 @@ void SAL_CALL ModuleUIConfigurationManager::reload()
             try
             {
                 UIElementType& rUserElementType    = 
m_aUIElements[LAYER_USERDEFINED][i];
-                UIElementType& rDefaultElementType = 
m_aUIElements[LAYER_DEFAULT][i];
 
                 if ( rUserElementType.bModified )
+                {
+                    UIElementType& rDefaultElementType = 
m_aUIElements[LAYER_DEFAULT][i];
                     impl_reloadElementTypeData( rUserElementType, 
rDefaultElementType, aRemoveNotifyContainer, aReplaceNotifyContainer );
+                }
             }
             catch ( const Exception& )
             {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits