[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Nov 5 17:25:50 UTC 2018
vcl/source/window/builder.cxx | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit fb597f840b6ebbb30d4198dcbbdd3e0c15324767
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Nov 5 18:08:50 2018 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Nov 5 18:25:01 2018 +0100
Add assertion for the non-DESKTOP case if the function is not found
Change-Id: I8ac042ca99037f99e36449bcc9799beb2b2fd5d5
Reviewed-on: https://gerrit.libreoffice.org/62919
Reviewed-by: Tor Lillqvist <tml at collabora.com>
Tested-by: Tor Lillqvist <tml at collabora.com>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index a5b8764cd740..d8b80b5a10a5 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include <config_features.h>
+
#include <memory>
#include <com/sun/star/packages/zip/ZipFileAccess.hpp>
@@ -1698,6 +1700,10 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
pFunction = reinterpret_cast<customMakeWidget>(aI->second->getFunctionSymbol(sFunction));
#else
pFunction = reinterpret_cast<customMakeWidget>(osl_getFunctionSymbol((oslModule) RTLD_DEFAULT, sFunction.pData));
+#if !HAVE_FEATURE_DESKTOP
+ SAL_WARN_IF(!pFunction, "vcl.layout", "Lookup of " << sFunction << " failed");
+ assert(pFunction);
+#endif
#endif
if (pFunction)
{
More information about the Libreoffice-commits
mailing list