[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sfx2/source

[Caolán McNamara (via logerrit)]

 sfx2/source/dialog/templdlg.cxx |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 0f77b8a44e7ee5541c97304d37f0c52cd8275cba
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Sep 17 12:14:25 2020 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Oct 1 09:54:03 2020 +0200

    tdf#134598 call FmtSelect to update watercan
    
    Change-Id: Idd88acfdaac66b999b0bcd8cf0a4fe69f7ae6ac5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102926
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 03da396a51b5..4ca4b292cfbf 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -868,7 +868,7 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const OUString &rStr, bool bIsCal
                     {
                         mxTreeBox->scroll_to_row(*xEntry);
                         mxTreeBox->select(*xEntry);
-                        return;
+                        break;
                     }
                     bEntry = mxTreeBox->iter_next(*xEntry);
                 }
@@ -894,7 +894,6 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const OUString &rStr, bool bIsCal
                         mxFmtLb->unselect_all();
                         mxFmtLb->scroll_to_row(*xEntry);
                         mxFmtLb->select(*xEntry);
-                        FmtSelect(nullptr, bIsCallback);
                     }
                 }
             }
@@ -910,6 +909,12 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const OUString &rStr, bool bIsCal
     }
 
     bWaterDisabled = !IsSafeForWaterCan();
+
+    if (!bIsCallback)
+    {
+        // tdf#134598 call FmtSelect to update watercan
+        FmtSelect(nullptr, false);
+    }
 }
 
 OUString SfxCommonTemplateDialog_Impl::GetSelectedEntry() const