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 /writerfilter | |
| parent | d0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff) | |
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 81286e94cf92..bf72067b9afb 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -288,7 +288,7 @@ RTFDocumentImpl::RTFDocumentImpl(uno::Reference<uno::XComponentContext> const& x m_bIsNewDoc(!rMediaDescriptor.getUnpackedValueOrDefault("InsertMode", false)), m_rMediaDescriptor(rMediaDescriptor) { - assert(xInputStream.is()); + OSL_ASSERT(xInputStream.is()); m_pInStream.reset(utl::UcbStreamHelper::CreateStream(xInputStream, true)); m_xModelFactory.set(m_xDstDoc, uno::UNO_QUERY); @@ -2343,7 +2343,7 @@ RTFError RTFDocumentImpl::popState() writerfilter::Reference<Properties>::Pointer_t pProperties = std::make_shared<RTFReferenceProperties>(aObjAttributes, aObjSprms); uno::Reference<drawing::XShape> xShape; RTFValue::Pointer_t pShape = m_aObjectAttributes.find(NS_ooxml::LN_shape); - assert(pShape.get()); + OSL_ASSERT(pShape.get()); if (pShape) pShape->getAny() >>= xShape; if (xShape.is()) @@ -3073,7 +3073,7 @@ RTFError RTFDocumentImpl::popState() if (aState.pCurrentBuffer == &m_aSuperBuffer) { - assert(!m_aStates.empty() && m_aStates.top().pCurrentBuffer == nullptr); + OSL_ASSERT(!m_aStates.empty() && m_aStates.top().pCurrentBuffer == nullptr); if (!m_aSuperBuffer.empty()) replayBuffer(m_aSuperBuffer, nullptr, nullptr); |