diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 10:13:21 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 10:13:21 +1000 |
| commit | 9cf1ea364ae57ae3e27fef0896d9552fe9e83e1a (patch) | |
| tree | facdf7a92fd16c3d5c2c408dd9ae90cb8e604c11 /unoxml | |
| parent | 74fa31e12355a45476458d0e6f907894bf4793cd (diff) | |
tdf#43157: convert xmloff module away from OSL_ASSERT to assert
Change-Id: I7eb36a11a7de5f7cf35ce97b59c8b461b64385a7
Diffstat (limited to 'unoxml')
| -rw-r--r-- | unoxml/source/dom/attr.cxx | 6 | ||||
| -rw-r--r-- | unoxml/source/dom/document.cxx | 6 | ||||
| -rw-r--r-- | unoxml/source/dom/node.cxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx index 39cb53230c9a..64ccfd51e276 100644 --- a/unoxml/source/dom/attr.cxx +++ b/unoxml/source/dom/attr.cxx @@ -217,7 +217,7 @@ namespace DOM if (!m_aNodePtr) { return; } if (m_pNamespace.get()) { - OSL_ASSERT(!m_aNodePtr->parent); + assert(!m_aNodePtr->parent); m_pNamespace->second = OUStringToOString(prefix, RTL_TEXTENCODING_UTF8); } else { @@ -232,7 +232,7 @@ namespace DOM if (!m_aNodePtr) { return OUString(); } if (m_pNamespace.get()) { - OSL_ASSERT(!m_aNodePtr->parent); + assert(!m_aNodePtr->parent); OUString const ret(OStringToOUString( m_pNamespace->second, RTL_TEXTENCODING_UTF8)); return ret; @@ -248,7 +248,7 @@ namespace DOM if (!m_aNodePtr) { return OUString(); } if (m_pNamespace.get()) { - OSL_ASSERT(!m_aNodePtr->parent); + assert(!m_aNodePtr->parent); OUString const ret(OStringToOUString( m_pNamespace->first, RTL_TEXTENCODING_UTF8)); return ret; diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx index b9c167ee2486..77ccebffa426 100644 --- a/unoxml/source/dom/document.cxx +++ b/unoxml/source/dom/document.cxx @@ -173,7 +173,7 @@ namespace DOM if (xNode.is()) { ::rtl::Reference<CNode> ret(i->second.second); - OSL_ASSERT(ret.is()); + assert(ret.is()); return ret; } } @@ -265,7 +265,7 @@ namespace DOM ::std::make_pair(WeakReference<XNode>(pCNode.get()), pCNode.get())) ).second; - OSL_ASSERT(bInserted); + assert(bInserted); if (!bInserted) { // if insertion failed, delete new instance and return null return nullptr; @@ -939,7 +939,7 @@ namespace DOM { ::osl::MutexGuard const g(m_rMutex); - OSL_ASSERT(nullptr != m_aNodePtr); + assert(nullptr != m_aNodePtr); if (nullptr == m_aNodePtr) { return nullptr; } diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx index 2d191b5cd997..85e47daede05 100644 --- a/unoxml/source/dom/node.cxx +++ b/unoxml/source/dom/node.cxx @@ -141,7 +141,7 @@ namespace DOM ? &const_cast<CDocument&>(rDocument) : nullptr ) , m_rMutex(const_cast< ::osl::Mutex & >(rMutex)) { - OSL_ASSERT(m_aNodePtr); + assert(m_aNodePtr); } void CNode::invalidate() @@ -181,7 +181,7 @@ namespace DOM CDocument & CNode::GetOwnerDocument() { - OSL_ASSERT(m_xDocument.is()); + assert(m_xDocument.is()); return *m_xDocument; // needs overriding in CDocument! } |