summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 14:34:20 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 14:34:20 +1000
commit381c43eb5d5455aeb5ed3335e89bb6b56c843080 (patch)
treea76e096a75f63ae861dfc971932b70dba639249a
parent392dbe6fe982e11009e04229e7e5200f838ea4f9 (diff)
tdf#43157: convert writerfilter module away from OSL_ASSERT to assert
Change-Id: Ia1a265b6a799c51a5ce1b855dc110ddeea1cc530
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index bf72067b9afb..81286e94cf92 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)
{
- OSL_ASSERT(xInputStream.is());
+ 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);
- OSL_ASSERT(pShape.get());
+ assert(pShape.get());
if (pShape)
pShape->getAny() >>= xShape;
if (xShape.is())
@@ -3073,7 +3073,7 @@ RTFError RTFDocumentImpl::popState()
if (aState.pCurrentBuffer == &m_aSuperBuffer)
{
- OSL_ASSERT(!m_aStates.empty() && m_aStates.top().pCurrentBuffer == nullptr);
+ assert(!m_aStates.empty() && m_aStates.top().pCurrentBuffer == nullptr);
if (!m_aSuperBuffer.empty())
replayBuffer(m_aSuperBuffer, nullptr, nullptr);