[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - svx/source

[Caolán McNamara]

 svx/source/tbxctrls/tbcontrl.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8d357a851f7dc4374eda88628a970f766d2234f2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 18 16:28:08 2017 +0100

    Resolves: tdf#113214 change back to previous entry after 'more' is dispatcher
    
    Change-Id: Ic5bd5f9182e47c6dfdab8fcd6399ffc482a4fb6a
    Reviewed-on: https://gerrit.libreoffice.org/43512
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 7ff293f2d2793b30f30d2f499b332e5329d4ddb4)
    Reviewed-on: https://gerrit.libreoffice.org/43517
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 85ab2abfede7..706bdecd860e 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -459,6 +459,8 @@ void SvxStyleBox_Impl::Select()
                 pViewFrm->ShowChildWindow( SID_SIDEBAR );
                 ::sfx2::sidebar::Sidebar::ShowPanel("StyleListPanel",
                                                     pViewFrm->GetFrame().GetFrameInterface());
+                //tdf#113214 change text back to previous entry
+                SetText(GetSavedValue());
                 bDoIt = false;
             }
         }