[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - include/sfx2 sw/source

Jim Raykowski (via logerrit) logerrit at kemper.freedesktop.org
Tue Jun 25 23:12:26 UTC 2019


 include/sfx2/tabdlg.hxx           |    1 +
 sw/source/ui/dialog/swdlgfact.cxx |    3 +++
 2 files changed, 4 insertions(+)

New commits:
commit 8c6b8e8c684fb24ee4d50d4b4638242a82356760
Author:     Jim Raykowski <raykowj at gmail.com>
AuthorDate: Tue Jun 18 15:36:09 2019 -0800
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Wed Jun 26 01:11:49 2019 +0200

    tdf#125362 Update tab dialog example set after Apply
    
    Change-Id: I0f6ad5273b285080bf2bc55fca3a2365b5b42bbf
    Reviewed-on: https://gerrit.libreoffice.org/74325
    Tested-by: Jenkins
    Reviewed-by: Jim Raykowski <raykowj at gmail.com>
    (cherry picked from commit fc938b4310a8f5fcc8ee2846acfeb6f6d818b9f5)
    Reviewed-on: https://gerrit.libreoffice.org/74712
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 77f9125ef8d2..d98af8b09090 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -147,6 +147,7 @@ public:
 
     //calls Ok without closing dialog
     bool Apply();
+    void Applied() { m_xExampleSet->Put(*GetInputSetImpl()); }
 };
 
 enum class DeactivateRC {
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index a1f3b67fe6f4..c08ec419eb9c 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -317,7 +317,10 @@ void AbstractTabController_Impl::SetText( const OUString& rStr )
 IMPL_LINK_NOARG(AbstractApplyTabController_Impl, ApplyHdl, weld::Button&, void)
 {
     if (m_xDlg->Apply())
+    {
         m_aHandler.Call(nullptr);
+        m_xDlg->Applied();
+    }
 }
 
 void AbstractApplyTabController_Impl::SetApplyHdl( const Link<LinkParamNone*,void>& rLink )


More information about the Libreoffice-commits mailing list