diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
| commit | 97eb00c75e173d4c8d0b483a7941ad3d2f23783e (patch) | |
| tree | 7974a8b9423c56982646366b0859dfb2a1a88d50 /unoxml | |
| parent | d0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff) | |
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
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 64ccfd51e276..39cb53230c9a 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()) { - assert(!m_aNodePtr->parent); + OSL_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()) { - assert(!m_aNodePtr->parent); + OSL_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()) { - assert(!m_aNodePtr->parent); + OSL_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 77ccebffa426..b9c167ee2486 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); - assert(ret.is()); + OSL_ASSERT(ret.is()); return ret; } } @@ -265,7 +265,7 @@ namespace DOM ::std::make_pair(WeakReference<XNode>(pCNode.get()), pCNode.get())) ).second; - assert(bInserted); + OSL_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); - assert(nullptr != m_aNodePtr); + OSL_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 85e47daede05..2d191b5cd997 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)) { - assert(m_aNodePtr); + OSL_ASSERT(m_aNodePtr); } void CNode::invalidate() @@ -181,7 +181,7 @@ namespace DOM CDocument & CNode::GetOwnerDocument() { - assert(m_xDocument.is()); + OSL_ASSERT(m_xDocument.is()); return *m_xDocument; // needs overriding in CDocument! } |