[Libreoffice-commits] .: unotools/source

[Tor Lillqvist]

 unotools/source/config/configitem.cxx  |    6 ------
 unotools/source/config/viewoptions.cxx |    1 -
 2 files changed, 7 deletions(-)

New commits:
commit 8b09e97588969e0e4f6433cf6868566e1ab317ad
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Feb 21 09:20:33 2011 +0200

    Drop a few apparently pointless assertions

diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index e26b55c..e08f96e 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 234312a..97f8bc3 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()); \
     }
 
 //_________________________________________________________________________________________________________________