summaryrefslogtreecommitdiff
path: root/desktop/source/pkgchk
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 17:03:35 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 17:03:35 +1000
commit97eb00c75e173d4c8d0b483a7941ad3d2f23783e (patch)
tree7974a8b9423c56982646366b0859dfb2a1a88d50 /desktop/source/pkgchk
parentd0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff)
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'desktop/source/pkgchk')
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_app.cxx2
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx12
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_misc.cxx10
3 files changed, 12 insertions, 12 deletions
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index fa1f270b31e7..31a93cecea8a 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -334,7 +334,7 @@ extern "C" int unopkg_main()
else if (repository == "bundled")
extensionUnorc = "$BUNDLED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc";
else
- assert(false);
+ OSL_ASSERT(false);
::rtl::Bootstrap::expandMacros(extensionUnorc);
oslFileError e = osl_removeFile(extensionUnorc.pData);
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index 238cbb444e36..80ed1bcec910 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() );
- assert( request.getValueTypeClass() == TypeClass_EXCEPTION );
+ OSL_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 );
- assert( xPackage.is() );
+ OSL_ASSERT( xPackage.is() );
if (xPackage.is()) {
const Reference<deployment::XPackageTypeInfo> xPackageType(
xPackage->getPackageType() );
- assert( xPackageType.is() );
+ OSL_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 );
- assert( m_logLevel >= 0 );
+ OSL_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;
}
- assert( m_logLevel >= 0 );
+ OSL_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()
{
- assert( m_logLevel > 0 );
+ OSL_ASSERT( m_logLevel > 0 );
--m_logLevel;
if (m_xLogFile.is())
m_xLogFile->pop();
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index 1615b22006b9..c74d9e0d98aa 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -124,7 +124,7 @@ bool isOption( OptionInfo const * option_info, sal_uInt32 * pIndex )
bool isBootstrapVariable(sal_uInt32 * pIndex)
{
- assert(osl_getCommandArgCount() >= *pIndex);
+ OSL_ASSERT(osl_getCommandArgCount() >= *pIndex);
OUString arg;
osl_getCommandArg(*pIndex, &arg.pData);
@@ -144,7 +144,7 @@ bool readArgument(
{
if (*pIndex < osl_getCommandArgCount())
{
- assert( pValue != nullptr );
+ OSL_ASSERT( pValue != nullptr );
osl_getCommandArg( *pIndex, &pValue->pData );
dp_misc::TRACE(__FILE__ ": argument value: "
+ *pValue + "\n");
@@ -273,7 +273,7 @@ void printf_package(
const Reference<deployment::XPackageTypeInfo> xPackageType(
xPackage->getPackageType() );
- assert( xPackageType.is() );
+ OSL_ASSERT( xPackageType.is() );
if (xPackageType.is()) {
printf_line( "Media-Type", xPackageType->getMediaType(), level + 1 );
}
@@ -310,7 +310,7 @@ void printf_packages(
std::vector<bool> const & vecUnaccepted,
Reference<XCommandEnvironment> const & xCmdEnv, sal_Int32 level )
{
- assert(allExtensions.size() == vecUnaccepted.size());
+ OSL_ASSERT(allExtensions.size() == vecUnaccepted.size());
if (allExtensions.empty())
{
@@ -383,7 +383,7 @@ Reference<XComponentContext> connectToOffice(
if (verbose)
dp_misc::writeConsole("OK. Connecting...");
- assert( buf.isEmpty() );
+ OSL_ASSERT( buf.isEmpty() );
buf.append( "uno:pipe,name=" );
buf.append( pipeId );
buf.append( ";urp;StarOffice.ComponentContext" );