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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Nov 5 17:18:45 UTC 2018


 vcl/source/window/builder.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 485efed71807ecee5ce69fa556db98dbc78a97e5
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 19:16:40 2018 +0200

    Add assertion for the non-DESKTOP case if the function is not found
    
    Change-Id: I8ac042ca99037f99e36449bcc9799beb2b2fd5d5

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 480c2f7b6c47..6be921bff169 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 <unordered_map>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
@@ -2040,6 +2042,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