diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 08:54:57 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 08:55:03 +1000 |
| commit | 367fa84af9783be40cc05adb154612e38c237172 (patch) | |
| tree | 2ad6337a713f8ef7a948066fac378d36e4c7896d /svl | |
| parent | f4da706256bbf3d7828419c97ffbfa98d4d48120 (diff) | |
tdf#43157: convert ucb and svl from OSL_ASSERT to assert
Change-Id: I34579b2ec0b9a2a98361108bc259ddb1fc1df7b5
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 fc12e7681ce4..ceb518c4a012 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: - OSL_ASSERT(false); + assert(false); break; } } diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx index 1e36c637a388..0fc546948f2b 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(); - OSL_ASSERT(nLength >= 0); + 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 6da98476fa06..b78c66f954d2 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) { - OSL_ASSERT(broker.is() && normalized != nullptr); + 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); - OSL_ASSERT(ok); + 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) { - OSL_ASSERT(context.is()); + assert(context.is()); css::uno::Reference< css::ucb::XUniversalContentBroker > broker( css::ucb::UniversalContentBroker::create(context)); css::uno::Reference< css::uri::XUriReferenceFactory > uriFactory( |