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 /desktop/source/pkgchk/unopkg/unopkg_misc.cxx | |
| parent | d0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff) | |
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'desktop/source/pkgchk/unopkg/unopkg_misc.cxx')
| -rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
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" ); |