vcl/source/window/builder.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 28e2dc30149178bbe6f59e28ddef3f0bd62d4bb1
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Wed Aug 28 11:11:57 2019 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Wed Aug 28 12:14:42 2019 +0200
Add DISABLE_DYNLOADING guard for notebookbar addons builder
Change-Id: I99487a8adaa24f155eec2182899127c5bab6a21f
Reviewed-on: https://gerrit.libreoffice.org/78219
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index c114a660ca3e..e25665771af1 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2183,10 +2183,12 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window
*pParent, const OString &
}
else if (name == "NotebookBarAddonsToolMergePoint")
{
+#ifndef DISABLE_DYNLOADING
customMakeWidget pFunction = nullptr;
ModuleMap::iterator aI = g_aModuleMap.find("libsfxlo.so");
pFunction =
reinterpret_cast<customMakeWidget>(aI->second->getFunctionSymbol("makeNotebookbarToolBox"));
NotebookBarAddonsMerger::MergeNotebookBarAddons( pParent, pFunction,
m_xFrame, m_pNotebookBarAddonsItem, rMap );
+#endif
return nullptr;
}
else if (name == "GtkToolButton" || name == "GtkMenuToolButton" ||
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
