summaryrefslogtreecommitdiff
path: root/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 12:54:03 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 12:54:03 +1000
commitfbea669c74f686f5a75aa80384bbfeff98680f8d (patch)
tree53a8106ad6bf3d9fe9e16224e62936a498db0a40 /desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
parent2b1737f648024328390bf44c4f2c614e748a92fd (diff)
tdf#43157: convert desktop module away from OSL_ASSERT to assert
Change-Id: I521042a79cf93a51d84b72554d04715b321dd942
Diffstat (limited to 'desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx')
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index 80ed1bcec910..238cbb444e36 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
@@ -204,7 +204,7 @@ void CommandEnvironmentImpl::handle(
Reference<task::XInteractionRequest> const & xRequest )
{
Any request( xRequest->getRequest() );
- OSL_ASSERT( request.getValueTypeClass() == TypeClass_EXCEPTION );
+ assert( request.getValueTypeClass() == TypeClass_EXCEPTION );
dp_misc::TRACE("[unopkg_cmdenv.cxx] incoming request:\n"
+ ::comphelper::anyToString(request) + "\n\n");
@@ -224,11 +224,11 @@ void CommandEnvironmentImpl::handle(
// former pkgchk behaviour:
const Reference<deployment::XPackage> xPackage(
wtExc.Context, UNO_QUERY );
- OSL_ASSERT( xPackage.is() );
+ assert( xPackage.is() );
if (xPackage.is()) {
const Reference<deployment::XPackageTypeInfo> xPackageType(
xPackage->getPackageType() );
- OSL_ASSERT( xPackageType.is() );
+ assert( xPackageType.is() );
if (xPackageType.is()) {
approve = (xPackage->isBundle() &&
xPackageType->getMediaType().match(
@@ -319,7 +319,7 @@ void CommandEnvironmentImpl::handle(
void CommandEnvironmentImpl::push( Any const & Status )
{
update_( Status );
- OSL_ASSERT( m_logLevel >= 0 );
+ assert( m_logLevel >= 0 );
++m_logLevel;
if (m_xLogFile.is())
m_xLogFile->push( Status );
@@ -351,7 +351,7 @@ void CommandEnvironmentImpl::update_( Any const & Status )
msg = buf.makeStringAndClear();
bUseErr = true;
}
- OSL_ASSERT( m_logLevel >= 0 );
+ assert( m_logLevel >= 0 );
for ( sal_Int32 n = 0; n < m_logLevel; ++n )
{
if (bUseErr)
@@ -377,7 +377,7 @@ void CommandEnvironmentImpl::update( Any const & Status )
void CommandEnvironmentImpl::pop()
{
- OSL_ASSERT( m_logLevel > 0 );
+ assert( m_logLevel > 0 );
--m_logLevel;
if (m_xLogFile.is())
m_xLogFile->pop();