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

[Chris Sherlock]

 include/vcl/builder.hxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ab2ed5a360e565299ae558b97bc39cf7aba1a81c
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Thu Nov 6 21:07:21 2014 +1100

    vcl: split asserts in VclBuilder::get() for fdo#85939
    
    Change-Id: I41e9961ae797ac99fdfb1480e1a58dbe92178bb8

diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 9d952c0..af10f76 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -404,7 +404,8 @@ inline T* VclBuilder::get(T*& ret, const OString& sID)
     SAL_WARN_IF(!w, "vcl.layout", "widget \"" << sID.getStr() << "\" not found in .ui");
     SAL_WARN_IF(!dynamic_cast<T*>(w),
        "vcl.layout", ".ui widget \"" << sID.getStr() << "\" needs to correspond to vcl type " << typeid(T).name());
-    assert(w && dynamic_cast<T*>(w));
+    assert(w);
+    assert(dynamic_cast<T*>(w));
     ret = static_cast<T*>(w);
     return ret;
 }