summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2011-10-26 16:21:28 +0200
committerStephan Bergmann <sbergman@redhat.com>2011-10-26 16:21:58 +0200
commit267aa59dfe918f97c32b0ba8f9a54b548c89b4c9 (patch)
tree056cd8dc2334642fef51e655cbcefe76a95aa870
parent3afa389d61f6d06ecefe59f201465783bda4b969 (diff)
Reverted GetX11SalData to always use dynamic_cast.
-rw-r--r--vcl/unx/generic/app/saldata.cxx6
1 files changed, 1 insertions, 5 deletions
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index 93d5ea6cf8b4..8eb660202483 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -94,14 +94,10 @@
X11SalData* GetX11SalData()
{
SalData * p1 = ImplGetSVData()->mpSalData;
-
-#if OSL_DEBUG_LEVEL > 0
+ OSL_ASSERT(p1 != 0);
X11SalData * p2 = dynamic_cast< X11SalData * >(p1);
OSL_ASSERT(p2 != 0);
return p2;
-#else
- return (X11SalData *) p1;
-#endif
}
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=