diff options
author | Szymon Kłos <eszkadev@gmail.com> | 2016-09-30 22:57:35 +0200 |
---|---|---|
committer | Szymon Kłos <eszkadev@gmail.com> | 2016-10-01 06:35:30 +0000 |
commit | a2765c02cd44a7f4ab7d30716d8fe7c1811aa3a6 (patch) | |
tree | d2f1257ba4c4e5437cfa5599662ddedc9bead12e /sfx2 | |
parent | 74b2cc607448d24146bd3508abb832d6ab42cb56 (diff) |
Notebookbar: fixed context handling
After last changes context switching was not working.
Removed unnecessary Resize call to avoid flickering.
Change-Id: I7931f4d442737c704c41bb7944c6d95e45b964f7
Reviewed-on: https://gerrit.libreoffice.org/29411
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <eszkadev@gmail.com>
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/notebookbar/SfxNotebookBar.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx index db8db52ca529..dd3bb66f0e18 100644 --- a/sfx2/source/notebookbar/SfxNotebookBar.cxx +++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx @@ -252,8 +252,6 @@ bool SfxNotebookBar::StateMethod(SystemWindow* pSysWindow, if (IsActive()) { - RemoveListeners(pSysWindow); - const Reference<frame::XModuleManager> xModuleManager = frame::ModuleManager::create( ::comphelper::getProcessComponentContext() ); vcl::EnumContext::Application eApp = vcl::EnumContext::GetApplicationEnum(xModuleManager->identify(xFrame)); OUString sFile = lcl_getNotebookbarFileName( eApp ); @@ -275,6 +273,8 @@ bool SfxNotebookBar::StateMethod(SystemWindow* pSysWindow, if ( ( !sFile.isEmpty() && bChangedFile ) || !pSysWindow->GetNotebookBar()->IsVisible() ) { + RemoveListeners(pSysWindow); + OUStringBuffer aBuf(rUIFile); aBuf.append( sFile ); |