summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-02-21 09:20:33 +0200
committerTor Lillqvist <tlillqvist@novell.com>2011-02-21 09:26:06 +0200
commit0df206e02d54d26a934505e19ba69fb3c11a7209 (patch)
treebb2a6db117ffc29c0ce34a03bcb9b9be918920b3
parentbcca5a18533b5003d31d13177fc87887823efe3e (diff)
Drop a few apparently pointless assertions
-rw-r--r--unotools/source/config/configitem.cxx6
-rw-r--r--unotools/source/config/viewoptions.cxx1
2 files changed, 0 insertions, 7 deletions
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index dc0fabfd298d..9d13d10223b0 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -1324,12 +1324,6 @@ Reference< XHierarchicalNameAccess> ConfigItem::GetTree()
xRet = pImpl->pManager->AcquireTree(*this);
else
xRet = m_xHierarchyAccess;
-#if OSL_DEBUG_LEVEL > 1
- // I think this is a pointless assertion, the callers seem to cope
- // fine with returning an invalid reference, no need to crash in a
- // dbglevel=1 build.
- OSL_ENSURE(xRet.is(), "AcquireTree failed");
-#endif
return xRet;
}
diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx
index a1fc4a59a8a9..c2c46b47afb6 100644
--- a/unotools/source/config/viewoptions.cxx
+++ b/unotools/source/config/viewoptions.cxx
@@ -104,7 +104,6 @@ namespace css = ::com::sun::star;
sMsg.appendAscii("Unexpected exception catched. Original message was:\n\"" ); \
sMsg.append (SVTVIEWOPTIONS_LOG_UNEXPECTED_EXCEPTION_PARAM_EXCEPTION.Message); \
sMsg.appendAscii("\"" ); \
- OSL_ENSURE(sal_False, ::rtl::OUStringToOString(sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr()); \
}
//_________________________________________________________________________________________________________________