diff options
| author | Sumit Chauhan <sumitcn25@gmail.com> | 2019-09-03 02:05:07 +0530 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-09-03 19:36:02 +0200 |
| commit | 0473141a91a686de700fd73118bcc142b4f636b4 (patch) | |
| tree | 45a90f21e4726d386c7d6bbcc560b8b068f7808c | |
| parent | 81b91d9eb70c117884d6ad16067bc151b373096c (diff) | |
tdf#127272 Writer crash issue resolve
Change-Id: Ibbdc10cc11170b8d8d55c42e6626d064ce4ef702
Reviewed-on: https://gerrit.libreoffice.org/78427
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Jenkins
| -rw-r--r-- | vcl/source/window/builder.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index ad9706cd7339..c83f6339d432 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -2235,14 +2235,11 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString & { xWindow = VclPtr<ToolBox>::Create(pParent, WB_3DLOOK | WB_TABSTOP); } - else if (name == "NotebookBarAddonsToolMergePoint") + else if(name == "NotebookBarAddonsToolMergePoint") { -#ifndef DISABLE_DYNLOADING - customMakeWidget pFunction = nullptr; - ModuleMap::iterator aI = g_aModuleMap.find(SAL_DLLPREFIX "sfxlo" SAL_DLLEXTENSION); - pFunction = reinterpret_cast<customMakeWidget>(aI->second->getFunctionSymbol("makeNotebookbarToolBox")); - NotebookBarAddonsMerger::MergeNotebookBarAddons( pParent, pFunction, m_xFrame, m_pNotebookBarAddonsItem, rMap ); -#endif + customMakeWidget pFunction = GetCustomMakeWidget("sfxlo-NotebookbarToolBox"); + if(pFunction != nullptr) + NotebookBarAddonsMerger::MergeNotebookBarAddons(pParent, pFunction, m_xFrame, m_pNotebookBarAddonsItem, rMap); return nullptr; } else if (name == "GtkToolButton" || name == "GtkMenuToolButton" || |