[Libreoffice-commits] core.git: vcl/source

[Sumit Chauhan (via logerrit)]

 vcl/source/window/builder.cxx |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 0473141a91a686de700fd73118bcc142b4f636b4
Author:     Sumit Chauhan <sumitcn25 at gmail.com>
AuthorDate: Tue Sep 3 02:05:07 2019 +0530
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Tue Sep 3 19:36:02 2019 +0200

    tdf#127272 Writer crash issue resolve
    
    Change-Id: Ibbdc10cc11170b8d8d55c42e6626d064ce4ef702
    Reviewed-on: https://gerrit.libreoffice.org/78427
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Jenkins

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" ||