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

[Caolán McNamara (via logerrit)]

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

New commits:
commit fe13c79964073fa2502cf9efc8f115d00bba6fae
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun May 3 20:54:39 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue May 5 09:39:58 2020 +0200

    same code on each branch
    
    Change-Id: Ifb98c6dbd1f72fcfae3958b0444facfc9c6f4cfc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93359
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 6cfc649abf44..bd4691c41f22 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1622,9 +1622,10 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(const OString& rEntry)
 
             // why? : FloatingWindow must not be parent of a modal dialog
             SfxNewStyleDlg aDlg(pWindow ? pWindow->GetFrameWeld() : nullptr, *pStyleSheetPool, eFam, SfxStyleSearchBits::UserDefined);
-            if (aDlg.run() ==  RET_OK)
+            auto nResult = aDlg.run();
+            pStyleSheetPool->SetSearchMask(eFam, nFilter);
+            if (nResult ==  RET_OK)
             {
-                pStyleSheetPool->SetSearchMask(eFam, nFilter);
                 const OUString aTemplName(aDlg.GetName());
                 Execute_Impl(SID_STYLE_NEW_BY_EXAMPLE,
                              aTemplName, "",
@@ -1632,7 +1633,6 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(const OString& rEntry)
                              nFilter);
                 UpdateFamily_Impl();
             }
-            pStyleSheetPool->SetSearchMask( eFam, nFilter );
         }
     }
     else if (rEntry == "update")