diff options
| -rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 5 | ||||
| -rw-r--r-- | package/source/zipapi/ZipFile.cxx | 6 | ||||
| -rw-r--r-- | package/source/zippackage/ZipPackageStream.cxx | 12 |
3 files changed, 11 insertions, 12 deletions
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index 6cad2723cf8e..b3038d947c25 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -470,8 +470,7 @@ Reference<XComponentContext> getUNO( //We show a message box or print to the console that there //is another instance already running if ( ! InitVCL() ) - throw RuntimeException( "Cannot initialize VCL!", - NULL ); + throw RuntimeException( "Cannot initialize VCL!" ); { WarningBox warn(NULL, WB_OK | WB_DEF_OK, sMsg); warn.SetText(utl::ConfigManager::getProductName()); @@ -481,7 +480,7 @@ Reference<XComponentContext> getUNO( DeInitVCL(); } - throw LockFileException("\n" + sError + sMsg + "\n"); + throw LockFileException(sError + sMsg); } } diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index 493a6cb49622..839a1c4ea623 100644 --- a/package/source/zipapi/ZipFile.cxx +++ b/package/source/zipapi/ZipFile.cxx @@ -381,18 +381,18 @@ uno::Reference< XInputStream > ZipFile::StaticGetDataFromRawStream( const uno::R throw ( packages::WrongPasswordException, ZipIOException, RuntimeException ) { if ( !rData.is() ) - throw ZipIOException("Encrypted stream without encryption data!\n" ); + throw ZipIOException("Encrypted stream without encryption data!" ); if ( !rData->m_aKey.getLength() ) throw packages::WrongPasswordException(THROW_WHERE ); uno::Reference< XSeekable > xSeek( xStream, UNO_QUERY ); if ( !xSeek.is() ) - throw ZipIOException("The stream must be seekable!\n" ); + throw ZipIOException("The stream must be seekable!" ); // if we have a digest, then this file is an encrypted one and we should // check if we can decrypt it or not - OSL_ENSURE( rData->m_aDigest.getLength(), "Can't detect password correctness without digest!\n" ); + OSL_ENSURE( rData->m_aDigest.getLength(), "Can't detect password correctness without digest!" ); if ( rData->m_aDigest.getLength() ) { sal_Int32 nSize = sal::static_int_cast< sal_Int32 >( xSeek->getLength() ); diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx index d05676cc09c6..1c827c4fc8f6 100644 --- a/package/source/zippackage/ZipPackageStream.cxx +++ b/package/source/zippackage/ZipPackageStream.cxx @@ -715,7 +715,7 @@ void SAL_CALL ZipPackageStream::setPropertyValue( const OUString& aPropertyName, } } else - throw IllegalArgumentException(THROW_WHERE "MediaType must be a string!\n", + throw IllegalArgumentException(THROW_WHERE "MediaType must be a string!", uno::Reference< XInterface >(), 2 ); @@ -723,7 +723,7 @@ void SAL_CALL ZipPackageStream::setPropertyValue( const OUString& aPropertyName, else if ( aPropertyName == "Size" ) { if ( !( aValue >>= aEntry.nSize ) ) - throw IllegalArgumentException(THROW_WHERE "Wrong type for Size property!\n", + throw IllegalArgumentException(THROW_WHERE "Wrong type for Size property!", uno::Reference< XInterface >(), 2 ); } @@ -746,7 +746,7 @@ void SAL_CALL ZipPackageStream::setPropertyValue( const OUString& aPropertyName, m_xBaseEncryptionData = new BaseEncryptionData; } else - throw IllegalArgumentException(THROW_WHERE "Wrong type for Encrypted property!\n", + throw IllegalArgumentException(THROW_WHERE "Wrong type for Encrypted property!", uno::Reference< XInterface >(), 2 ); @@ -772,7 +772,7 @@ void SAL_CALL ZipPackageStream::setPropertyValue( const OUString& aPropertyName, aNewKey = aSequence; } else - throw IllegalArgumentException(THROW_WHERE "Wrong type for EncryptionKey property!\n", + throw IllegalArgumentException(THROW_WHERE "Wrong type for EncryptionKey property!", uno::Reference< XInterface >(), 2 ); } @@ -804,7 +804,7 @@ void SAL_CALL ZipPackageStream::setPropertyValue( const OUString& aPropertyName, uno::Sequence< beans::NamedValue > aKeys; if ( !( aValue >>= aKeys ) ) { - throw IllegalArgumentException(THROW_WHERE "Wrong type for StorageEncryptionKeys property!\n", + throw IllegalArgumentException(THROW_WHERE "Wrong type for StorageEncryptionKeys property!", uno::Reference< XInterface >(), 2 ); } @@ -845,7 +845,7 @@ void SAL_CALL ZipPackageStream::setPropertyValue( const OUString& aPropertyName, m_bCompressedIsSetFromOutside = true; } else - throw IllegalArgumentException(THROW_WHERE "Wrong type for Compressed property!\n", + throw IllegalArgumentException(THROW_WHERE "Wrong type for Compressed property!", uno::Reference< XInterface >(), 2 ); } |