sfx2/source/notebookbar/SfxNotebookBar.cxx | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 0a36be3fee1b4f1b47b55a64668b6aa99896ab24
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Nov 29 17:17:15 2018 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Nov 29 20:41:24 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>
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
