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

[Szymon Kłos]

 vcl/source/control/tabctrl.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit cce54bf33808dc7422ded08a7d4d38fb0194a047
Author: Szymon Kłos <eszkadev at gmail.com>
Date:   Tue Jan 17 22:56:02 2017 +0100

    tdf#102139 : avoid switching to the empty tab after exiting the OLE Object
    
    Change-Id: I67c395106d2a24c679cddaddd9aba138388463a5
    Reviewed-on: https://gerrit.libreoffice.org/33237
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Szymon Kłos <eszkadev at gmail.com>

diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 740628b..4c69fce 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -2286,6 +2286,8 @@ void NotebookbarTabControl::SetCurPageId( sal_uInt16 nPageId )
 {
     if ( nPageId != 1 )
         TabControl::SetCurPageId( nPageId );
+    if ( nPageId == GetPageCount() )
+        ImplActivateTabPage( true );
 }
 
 void NotebookbarTabControl::ImplActivateTabPage( bool bNext )