diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-05-03 20:54:39 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-05-05 09:39:58 +0200 |
| commit | fe13c79964073fa2502cf9efc8f115d00bba6fae (patch) | |
| tree | 24bf82c64fd316cdfde3e0ed9134f63abe68d057 /sfx2 | |
| parent | 988c5d8976536ebb87c9470e48650d90bcc27389 (diff) | |
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@redhat.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
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") |