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 /svl | |
| parent | d0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff) | |
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/config/itemholder2.cxx | 2 | ||||
| -rw-r--r-- | svl/source/misc/strmadpt.cxx | 2 | ||||
| -rw-r--r-- | svl/source/misc/urihelper.cxx | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx index ceb518c4a012..fc12e7681ce4 100644 --- a/svl/source/config/itemholder2.cxx +++ b/svl/source/config/itemholder2.cxx @@ -127,7 +127,7 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem) break; default: - assert(false); + OSL_ASSERT(false); break; } } diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx index 0fc546948f2b..1e36c637a388 100644 --- a/svl/source/misc/strmadpt.cxx +++ b/svl/source/misc/strmadpt.cxx @@ -257,7 +257,7 @@ sal_uInt64 SvInputStream::SeekPos(sal_uInt64 const nPos) try { sal_Int64 nLength = m_xSeekable->getLength(); - assert(nLength >= 0); + OSL_ASSERT(nLength >= 0); if (static_cast<sal_uInt64>(nLength) < STREAM_SEEK_TO_END) { diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx index b78c66f954d2..6da98476fa06 100644 --- a/svl/source/misc/urihelper.cxx +++ b/svl/source/misc/urihelper.cxx @@ -136,7 +136,7 @@ enum Result { Success, GeneralFailure, SpecificFailure }; Result normalizePrefix( css::uno::Reference< css::ucb::XUniversalContentBroker > const & broker, OUString const & uri, OUString * normalized) { - assert(broker.is() && normalized != nullptr); + OSL_ASSERT(broker.is() && normalized != nullptr); css::uno::Reference< css::ucb::XContent > content; try { content = broker->queryContent(broker->createContentIdentifier(uri)); @@ -153,7 +153,7 @@ Result normalizePrefix( css::uno::Reference< css::ucb::XUniversalContentBroker > 0, css::uno::Reference< css::ucb::XCommandEnvironment >()) >>= *normalized); - assert(ok); + OSL_ASSERT(ok); } catch (css::uno::RuntimeException &) { throw; } catch (css::ucb::UnsupportedCommandException &) { @@ -255,7 +255,7 @@ URIHelper::normalizedMakeRelative( css::uno::Reference< css::uno::XComponentContext > const & context, OUString const & baseUriReference, OUString const & uriReference) { - assert(context.is()); + OSL_ASSERT(context.is()); css::uno::Reference< css::ucb::XUniversalContentBroker > broker( css::ucb::UniversalContentBroker::create(context)); css::uno::Reference< css::uri::XUriReferenceFactory > uriFactory( |