sfx2/source/appl/workwin.cxx | 3 ++-
sfx2/source/notebookbar/SfxNotebookBar.cxx | 11 ++++++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 53170cae2057f705e779ec4b8538d422d071986e
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Nov 29 21:18:57 2018 +0100
Commit: Xisco Faulí <xiscofa...@libreoffice.org>
CommitDate: Sun Dec 2 14:34:16 2018 +0100
Revert "Revert "Notebookbar:Disabled appearence of context toolbars""
This reverts commit 9a6169529eb687190531225bfe9fef850325ee9e now
that proper fix for both tdf#121591 and tdf#119945 is pushed -
see commit 0a36be3fee1b4f1b47b55a64668b6aa99896ab24.
Change-Id: Ia44510d427e0626a5f566210247db8848653f8e2
Reviewed-on: https://gerrit.libreoffice.org/64279
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
(cherry picked from commit f3ea5e21bea80004b04edbf0287d4a2e1aaef5d0)
Reviewed-on: https://gerrit.libreoffice.org/64316
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 5320d832b13a..b7f6eddd9777 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -55,6 +55,7 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <type_traits>
#include <unordered_map>
+#include <sfx2/notebookbar/SfxNotebookBar.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -1203,7 +1204,7 @@ void SfxWorkWindow::UpdateObjectBars_Impl2()
// Is a ToolBox required in this context ?
bool bModesMatching = (nUpdateMode != SfxVisibilityFlags::Invisible)
&& ((nTbxMode & nUpdateMode) == nUpdateMode);
- if ( bDestroy )
+ if ( bDestroy || sfx2::SfxNotebookBar::IsActive())
{
OUString aTbxId = g_aTbxTypeName +
GetResourceURLFromToolbarId(eId);
xLayoutManager->destroyElement( aTbxId );
commit 9ce21daf20faae0e5c8dd8eeb0909106e23a4319
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Nov 29 17:17:15 2018 +0300
Commit: Xisco Faulí <xiscofa...@libreoffice.org>
CommitDate: Sun Dec 2 14:34:04 2018 +0100
tdf#121591, tdf#119945: ModuleManager::identify throws for embedded modules
Change-Id: Ief1a664fdf26c837fd55c9a236f45aa045067309
Reviewed-on: https://gerrit.libreoffice.org/64256
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
(cherry picked from commit 0a36be3fee1b4f1b47b55a64668b6aa99896ab24)
Reviewed-on: https://gerrit.libreoffice.org/64280
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx
b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index 953bacf4bfe8..5dcaea7861d8 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -17,6 +17,7 @@
#include <vcl/tabctrl.hxx>
#include <sfx2/viewfrm.hxx>
#include <comphelper/processfactory.hxx>
+#include <com/sun/star/frame/UnknownModuleException.hpp>
#include <com/sun/star/ui/ContextChangeEventMultiplexer.hpp>
#include <com/sun/star/ui/XContextChangeEventMultiplexer.hpp>
#include <com/sun/star/util/URLTransformer.hpp>
@@ -208,7 +209,15 @@ bool SfxNotebookBar::IsActive()
return false;
const Reference<frame::XModuleManager> xModuleManager =
frame::ModuleManager::create( ::comphelper::getProcessComponentContext() );
- eApp =
vcl::EnumContext::GetApplicationEnum(xModuleManager->identify(xFrame));
+ try
+ {
+ eApp =
vcl::EnumContext::GetApplicationEnum(xModuleManager->identify(xFrame));
+ }
+ catch (css::frame::UnknownModuleException& e)
+ {
+ SAL_WARN("sfx.appl", "SfxNotebookBar::IsActive(): " + e.Message);
+ return false;
+ }
}
else
return false;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
