summaryrefslogtreecommitdiffstats
path: root/configmgr/source/parsemanager.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2011-11-29 11:54:46 +0100
committerStephan Bergmann <sbergman@redhat.com>2011-11-29 13:12:20 +0100
commit048a25b4c89cb33bbdc72c0525418891c08a6acb (patch)
tree04c16e90cefdd78cf41f5abccfbaea1d332b8ce5 /configmgr/source/parsemanager.cxx
parent...originally probably replaced an en-dash (thanks Roman Eisele). (diff)
downloadcore-048a25b4c89cb33bbdc72c0525418891c08a6acb.tar.gz
core-048a25b4c89cb33bbdc72c0525418891c08a6acb.zip
Adapted to new assertion/logging mechanisms.
Diffstat (limited to 'configmgr/source/parsemanager.cxx')
-rw-r--r--configmgr/source/parsemanager.cxx11
1 files changed, 6 insertions, 5 deletions
diff --git a/configmgr/source/parsemanager.cxx b/configmgr/source/parsemanager.cxx
index d228791adff7..7d9abd4ab485 100644
--- a/configmgr/source/parsemanager.cxx
+++ b/configmgr/source/parsemanager.cxx
@@ -28,9 +28,10 @@
#include "sal/config.h"
+#include <cassert>
+
#include "com/sun/star/container/NoSuchElementException.hpp"
#include "com/sun/star/uno/RuntimeException.hpp"
-#include "osl/diagnose.h"
#include "sal/types.h"
#include "xmlreader/span.hxx"
#include "xmlreader/xmlreader.hxx"
@@ -52,21 +53,21 @@ ParseManager::ParseManager(
css::container::NoSuchElementException, css::uno::RuntimeException)):
reader_(url), parser_(parser)
{
- OSL_ASSERT(parser.is());
+ assert(parser.is());
int id;
id = reader_.registerNamespaceIri(
xmlreader::Span(
RTL_CONSTASCII_STRINGPARAM("http://openoffice.org/2001/registry")));
- OSL_ASSERT(id == NAMESPACE_OOR);
+ assert(id == NAMESPACE_OOR);
id = reader_.registerNamespaceIri(
xmlreader::Span(
RTL_CONSTASCII_STRINGPARAM("http://www.w3.org/2001/XMLSchema")));
- OSL_ASSERT(id == NAMESPACE_XS);
+ assert(id == NAMESPACE_XS);
id = reader_.registerNamespaceIri(
xmlreader::Span(
RTL_CONSTASCII_STRINGPARAM(
"http://www.w3.org/2001/XMLSchema-instance")));
- OSL_ASSERT(id == NAMESPACE_XSI);
+ assert(id == NAMESPACE_XSI);
(void)id;
}