summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2014-11-06 21:07:21 +1100
committerChris Sherlock <chris.sherlock79@gmail.com>2014-11-07 01:48:33 +1100
commitab2ed5a360e565299ae558b97bc39cf7aba1a81c (patch)
tree147e3b38f50f91fb6a19f8eed260905cb45b01fe
parenta5ad25c44765c5e98e639bb45464d2166ea8e24d (diff)
vcl: split asserts in VclBuilder::get() for fdo#85939
Change-Id: I41e9961ae797ac99fdfb1480e1a58dbe92178bb8
-rw-r--r--include/vcl/builder.hxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 9d952c063e26..af10f76478a1 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;
}