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

Mike Kaganski mike.kaganski at collabora.com
Thu Feb 22 21:42:23 UTC 2018


 sfx2/source/dialog/tabdlg.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 06f04bf84d48d6542d9b47d1e16228923de61302
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Wed Feb 21 21:45:35 2018 +0100

    Simplify conditions a little
    
    Change-Id: Iaa587f1a2d78f14b999f2e9e866db058d466493f
    Reviewed-on: https://gerrit.libreoffice.org/50137
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index f6fd5f90299f..c707cccea6a8 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -776,10 +776,10 @@ short SfxTabDialog::Ok()
 
     if ( !m_pOutSet )
     {
-        if ( !m_pExampleSet && m_pSet )
-            m_pOutSet = m_pSet->Clone( false );  // without Items
-        else if ( m_pExampleSet )
+        if ( m_pExampleSet )
             m_pOutSet = new SfxItemSet( *m_pExampleSet );
+        else if ( m_pSet )
+            m_pOutSet = m_pSet->Clone( false );  // without Items
     }
     bool bModified = false;
 


More information about the Libreoffice-commits mailing list