commit 0a36be3fee1b4f1b47b55a64668b6aa99896ab24
author Mike Kaganski <mike.kaganski@collabora.com> Thu Nov 29 17:17:15 2018 +0300
committer Mike Kaganski <mike.kaganski@collabora.com> Thu Nov 29 20:41:24 2018 +0100
tree 09d2353b108b2abdaaa642a735516c8042390ed7
parent 20b8522e6c40625e662a2225521881f5c029fd90

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.kaganski@collabora.com>

sfx2/source/notebookbar/SfxNotebookBar.cxx

diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index 953bacf..5dcaea7 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 @@
            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;