summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2019-08-28 11:11:57 +0200
committerSzymon Kłos <szymon.klos@collabora.com>2019-08-28 12:14:42 +0200
commit28e2dc30149178bbe6f59e28ddef3f0bd62d4bb1 (patch)
tree029221af77cb7e8cc4207a9acf96d4ff3e49682d
parent13c77cc3b34555aefd898a15c6ad898049f8aed6 (diff)
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.klos@collabora.com>
-rw-r--r--vcl/source/window/builder.cxx2
1 files changed, 2 insertions, 0 deletions
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" ||