diff options
20 files changed, 33 insertions, 34 deletions
diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx index cabdc1a15ddc..4f04cab85b99 100644 --- a/UnoControls/source/controls/progressmonitor.cxx +++ b/UnoControls/source/controls/progressmonitor.cxx @@ -226,7 +226,7 @@ void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbe { // Safe impossible cases // Check valid call of this method. - DBG_ASSERT ( impl_debug_checkParameter ( rTopic ), "ProgressMonitor::removeText()\nCall without valid parameters!\n" ); + DBG_ASSERT ( impl_debug_checkParameter ( rTopic ), "ProgressMonitor::removeText()\nCall without valid parameters!" ); // Search the topic ... IMPL_TextlistItem* pSearchItem = impl_searchTopic ( rTopic, bbeforeProgress ); diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index c5d7b031ded6..4fbb49c4a65c 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -395,7 +395,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbedde AddEmbeddedObject( xObj, rNewName ); OSL_ENSURE( !xObj.is() || xObj->getCurrentState() != embed::EmbedStates::LOADED, - "A freshly create object should be running always!\n" ); + "A freshly create object should be running always!" ); } catch (uno::Exception const& e) { @@ -614,7 +614,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbedde uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY ); OSL_ENSURE( !xObj.is() || xObj->getCurrentState() != embed::EmbedStates::LOADED, - "A freshly create object should be running always!\n" ); + "A freshly create object should be running always!" ); // possible optimization: store later! if ( xPersist.is()) @@ -646,7 +646,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbedde uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY ); OSL_ENSURE( !xObj.is() || xObj->getCurrentState() != embed::EmbedStates::LOADED, - "A freshly create object should be running always!\n" ); + "A freshly create object should be running always!" ); // possible optimization: store later! if ( xPersist.is()) diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 950a478b6ec1..5413b9f30ff3 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -1462,8 +1462,7 @@ void BackendImpl::PackageImpl::scanBundle( } else { - SAL_WARN( - "desktop.deployment", "manifest.xml contains a duplicate entry!\n"); + SAL_WARN("desktop.deployment", "manifest.xml contains a duplicate entry!"); } } diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx index c87d945441b6..f85ce88c133e 100644 --- a/embeddedobj/source/commonembedding/embedobj.cxx +++ b/embeddedobj/source/commonembedding/embedobj.cxx @@ -616,7 +616,7 @@ void SAL_CALL OCommonEmbeddedObject::setUpdateMode( sal_Int32 nMode ) OSL_ENSURE( nMode == embed::EmbedUpdateModes::ALWAYS_UPDATE || nMode == embed::EmbedUpdateModes::EXPLICIT_UPDATE, - "Unknown update mode!\n" ); + "Unknown update mode!" ); m_nUpdateMode = nMode; } diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx index 8dd202d16ea1..f8c2c9903a73 100644 --- a/embeddedobj/source/msole/oleembed.cxx +++ b/embeddedobj/source/msole/oleembed.cxx @@ -1087,7 +1087,7 @@ void SAL_CALL OleEmbeddedObject::setUpdateMode( sal_Int32 nMode ) OSL_ENSURE( nMode == embed::EmbedUpdateModes::ALWAYS_UPDATE || nMode == embed::EmbedUpdateModes::EXPLICIT_UPDATE, - "Unknown update mode!\n" ); + "Unknown update mode!" ); m_nUpdateMode = nMode; } diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx index fa7847e5696f..d3fd2155f5e4 100644 --- a/framework/source/fwi/threadhelp/transactionmanager.cxx +++ b/framework/source/fwi/threadhelp/transactionmanager.cxx @@ -164,7 +164,7 @@ void TransactionManager::registerTransaction( EExceptionMode eMode ) // Help programmer to find out, why this exception is thrown! SAL_WARN( "fwk", "TransactionManager...: Owner instance not correctly initialized yet. Call was rejected! Normally it's an algorithm error ... wrong use of class!" ); //ATTENTION: temp. disabled - till all bad code positions are detected and changed! */ - // throw css::uno::RuntimeException( "TransactionManager...\nOwner instance not right initialized yet. Call was rejected! Normally it's an algorithm error... wrong using of class!\n", css::uno::Reference< css::uno::XInterface >() ); + // throw css::uno::RuntimeException( "TransactionManager.: Owner instance not right initialized yet. Call was rejected! Normally it's an algorithm error... wrong using of class!\n", css::uno::Reference< css::uno::XInterface >() ); } break; case E_WORK: @@ -174,13 +174,13 @@ void TransactionManager::registerTransaction( EExceptionMode eMode ) { // Help programmer to find out, why this exception is thrown! SAL_WARN( "fwk", "TransactionManager...: Owner instance stand in close method. Call was rejected!" ); - throw css::lang::DisposedException( "TransactionManager...\nOwner instance stand in close method. Call was rejected!" ); + throw css::lang::DisposedException( "TransactionManager: Owner instance stand in close method. Call was rejected!" ); } break; case E_CLOSE: // Help programmer to find out, why this exception is thrown! SAL_WARN( "fwk", "TransactionManager...: Owner instance already closed. Call was rejected!" ); - throw css::lang::DisposedException( "TransactionManager...\nOwner instance already closed. Call was rejected!" ); + throw css::lang::DisposedException( "TransactionManager: Owner instance already closed. Call was rejected!" ); } // Register this new transaction. diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx index 2cc0f85f96f8..6bee879b5a75 100644 --- a/package/source/xstor/owriteablestream.cxx +++ b/package/source/xstor/owriteablestream.cxx @@ -1533,7 +1533,7 @@ void OWriteStream_Impl::CommitStreamRelInfo( const uno::Reference< embed::XStora if ( m_nStorageType == embed::StorageFormats::OFOPXML ) { OSL_ENSURE( !aOrigStreamName.isEmpty() && !aNewStreamName.isEmpty() && xRelStorage.is(), - "Wrong relation persistence information is provided!\n" ); + "Wrong relation persistence information is provided!" ); if ( !xRelStorage.is() || aOrigStreamName.isEmpty() || aNewStreamName.isEmpty() ) throw uno::RuntimeException(); diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index cf67ee18ca8d..569bd30f86c0 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -985,7 +985,7 @@ void OStorage_Impl::Commit() throw embed::InvalidStorageException( THROW_WHERE ); OSL_ENSURE( m_nStorageMode & embed::ElementModes::WRITE, - "Commit of readonly storage, should be detected before!\n" ); + "Commit of readonly storage, should be detected before!" ); uno::Reference< container::XNameContainer > xNewPackageFolder; @@ -1804,7 +1804,7 @@ OStorage::OStorage( OStorage_Impl* pImpl, bool bReadOnlyWrap ) OSL_ENSURE( ( m_pImpl->m_nStorageMode & embed::ElementModes::WRITE ) == embed::ElementModes::WRITE || m_pData->m_bReadOnlyWrap, - "The wrapper can not allow writing in case implementation does not!\n" ); + "The wrapper can not allow writing in case implementation does not!" ); if ( !bReadOnlyWrap ) m_pImpl->m_pAntiImpl = this; @@ -1843,7 +1843,7 @@ void SAL_CALL OStorage::InternalDispose( bool bNotifyImpl ) if ( m_pData->m_bReadOnlyWrap ) { OSL_ENSURE( !m_pData->m_aOpenSubComponentsList.size() || m_pData->m_pSubElDispListener.get(), - "If any subelements are open the listener must exist!\n" ); + "If any subelements are open the listener must exist!" ); if (m_pData->m_pSubElDispListener.get()) { @@ -2006,7 +2006,7 @@ SotElement_Impl* OStorage::OpenStreamElement_Impl( const OUString& aStreamName, ::osl::MutexGuard aGuard( m_pData->m_xSharedMutex->GetMutex() ); OSL_ENSURE( !m_pData->m_bReadOnlyWrap || ( nOpenMode & embed::ElementModes::WRITE ) != embed::ElementModes::WRITE, - "An element can not be opened for writing in readonly storage!\n" ); + "An element can not be opened for writing in readonly storage!" ); SotElement_Impl *pElement = m_pImpl->FindElement( aStreamName ); if ( !pElement ) diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 71e412a74fe9..7f998ccf01ec 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -327,7 +327,7 @@ void ZipPackage::parseManifest() if ( !bManifestParsed && !m_bForceRecovery ) throw ZipIOException( - THROW_WHERE "Could not parse manifest.xml\n" ); + THROW_WHERE "Could not parse manifest.xml" ); const OUString sMimetype ("mimetype"); if ( m_xRootFolder->hasByName( sMimetype ) ) @@ -1039,7 +1039,7 @@ void ZipPackage::WriteContentTypes( ZipOutputStream& aZipOut, const vector< uno: OUString aPath; OUString aType; OSL_ENSURE( ( *aIter )[PKG_MNFST_MEDIATYPE].Name == "MediaType" && ( *aIter )[PKG_MNFST_FULLPATH].Name == "FullPath", - "The mediatype sequence format is wrong!\n" ); + "The mediatype sequence format is wrong!" ); ( *aIter )[PKG_MNFST_MEDIATYPE].Value >>= aType; if ( !aType.isEmpty() ) { diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx index 9074de45353b..7c664bdf4bf9 100644 --- a/sal/osl/w32/socket.cxx +++ b/sal/osl/w32/socket.cxx @@ -1116,7 +1116,7 @@ oslSocketResult SAL_CALL osl_connectSocketTo ( SAL_WARN_IF( !FD_ISSET(pSocket->m_Socket, &fds), "sal.osl", - "osl_connectSocketTo(): select returned but socket not set\n"); + "osl_connectSocketTo(): select returned but socket not set"); Result= osl_Socket_Ok; diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index db7a7d1ca73e..828d32043cd9 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -217,14 +217,14 @@ bool SfxObjectShell::PutURLContentsToVersionStream_Impl( embed::ElementModes::READWRITE ); DBG_ASSERT( xVersion.is(), - "The method must throw an exception if the storage can not be opened!\n" ); + "The method must throw an exception if the storage can not be opened!" ); if ( !xVersion.is() ) throw uno::RuntimeException(); uno::Reference< io::XStream > xVerStream = xVersion->openStreamElement( aStreamName, embed::ElementModes::READWRITE ); - DBG_ASSERT( xVerStream.is(), "The method must throw an exception if the storage can not be opened!\n" ); + DBG_ASSERT( xVerStream.is(), "The method must throw an exception if the storage can not be opened!" ); if ( !xVerStream.is() ) throw uno::RuntimeException(); @@ -3315,7 +3315,7 @@ bool SfxObjectShell::CopyStoragesOfUnknownMediaType( const uno::Reference< embed if ( xSource->isStorageElement( aSubElements[nInd] ) ) { OSL_ENSURE( !xTarget->hasByName( aSubElements[nInd] ), - "The target storage is an output storage, the element should not exist in the target!\n" ); + "The target storage is an output storage, the element should not exist in the target!" ); xSource->copyElementTo( aSubElements[nInd], xTarget, aSubElements[nInd] ); } @@ -3388,7 +3388,7 @@ bool SfxObjectShell::CopyStoragesOfUnknownMediaType( const uno::Reference< embed default: { OSL_ENSURE( aSubElements[nInd] == "Configurations2" || nFormat == SotClipboardFormatId::STARBASE_8 || !xTarget->hasByName( aSubElements[nInd] ), - "The target storage is an output storage, the element should not exist in the target!\n" ); + "The target storage is an output storage, the element should not exist in the target!" ); if ( !xTarget->hasByName( aSubElements[nInd] ) ) { diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx index 8bec940d4000..2edd4fb3a520 100644 --- a/svtools/source/config/menuoptions.cxx +++ b/svtools/source/config/menuoptions.cxx @@ -279,7 +279,7 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) if ( seqValues[nProperty] >>= nContextMenuShortcuts ) m_eContextMenuShortcuts = static_cast<TriState>(nContextMenuShortcuts); } - else assert( false && "SvtMenuOptions_Impl::Notify()\nUnknown property detected ... I can't handle these!\n" ); + else assert( false && "SvtMenuOptions_Impl::Notify()\nUnknown property detected ... I can't handle these!" ); } if ( bMenuSettingsChanged ) diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 1eb65c014790..18a9915626db 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -2332,7 +2332,7 @@ void AttributeOutputBase::GetNumberPara( OUString& rStr, const SwField& rField ) break; default: OSL_ENSURE(rField.GetFormat() == SVX_NUM_ARABIC, - "Unknown numbering type exported as default of Arabic\n"); + "Unknown numbering type exported as default of Arabic"); SAL_FALLTHROUGH; case SVX_NUM_ARABIC: rStr += "\\* ARABIC "; diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 1c639e3c5a50..2804d0a76625 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -6557,7 +6557,7 @@ WW8Style::WW8Style(SvStream& rStream, WW8Fib& rFibPara) const sal_uInt16 nMaxPossibleRecords = nRemaining/nMinRecordSize; OSL_ENSURE(cstd <= nMaxPossibleRecords, - "allegedly more styles that available data\n"); + "allegedly more styles that available data"); cstd = std::min(cstd, nMaxPossibleRecords); } diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx index d9ce673e82a6..ec4d4d846bee 100644 --- a/unotools/source/config/fontoptions.cxx +++ b/unotools/source/config/fontoptions.cxx @@ -181,7 +181,7 @@ void SvtFontOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) seqValues[nProperty] >>= m_bFontWYSIWYG; } #if OSL_DEBUG_LEVEL > 0 - else assert(false && "SvtFontOptions_Impl::Notify()\nUnknown property detected ... I can't handle these!\n"); + else assert(false && "Unknown property detected ... I can't handle these!"); #endif } } diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index 951785ed687b..ce16fc9ad633 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -403,7 +403,7 @@ void SvtSecurityOptions_Impl::SetProperty( sal_Int32 nProperty, const Any& rValu #if OSL_DEBUG_LEVEL > 0 default: - assert(false && "SvtSecurityOptions_Impl::SetProperty()\nUnknown property!\n"); + assert(false && "Unknown property!"); #endif } } diff --git a/vcl/osx/DragSource.cxx b/vcl/osx/DragSource.cxx index 1a50d4fbc3db..559ae5c9461a 100644 --- a/vcl/osx/DragSource.cxx +++ b/vcl/osx/DragSource.cxx @@ -220,8 +220,8 @@ void SAL_CALL DragSource::startDrag(const DragGestureEvent& trigger, { MutexGuard guard(m_aMutex); - assert(listener.is() && "DragSource::startDrag: No XDragSourceListener provided\n"); - assert(transferable.is() && "DragSource::startDrag: No transferable provided\n"); + assert(listener.is() && "DragSource::startDrag: No XDragSourceListener provided"); + assert(transferable.is() && "DragSource::startDrag: No transferable provided"); trigger.Event >>= mMouseEvent; m_MouseButton= mMouseEvent.Buttons; diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx index a29dd9f61944..c19be66d9235 100644 --- a/vcl/source/fontsubset/ttcr.cxx +++ b/vcl/source/fontsubset/ttcr.cxx @@ -1103,7 +1103,7 @@ int GetRawData(TrueTypeTable *_this, sal_uInt8 **ptr, sal_uInt32 *len, sal_uInt3 } } - assert(!"Unknown TrueType table.\n"); + assert(!"Unknown TrueType table."); return TTCR_UNKNOWN; } @@ -1491,7 +1491,7 @@ extern "C" return; } } - assert(!"Unknown TrueType table.\n"); + assert(!"Unknown TrueType table."); } } diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx index 7c66faac4e96..622e418c5594 100644 --- a/xmloff/source/meta/xmlversion.cxx +++ b/xmloff/source/meta/xmlversion.cxx @@ -396,7 +396,7 @@ uno::Sequence< util::RevisionTag > SAL_CALL XMLVersionListPersistence::load( con aParserInput.aInputStream = xDocStream->getInputStream(); OSL_ENSURE( aParserInput.aInputStream.is(), - "The stream was successfully opened for reading, the input part must be accessible!\n" ); + "The stream was successfully opened for reading, the input part must be accessible!" ); if ( !aParserInput.aInputStream.is() ) throw uno::RuntimeException(); diff --git a/xmlsecurity/test_docs/tools/httpserv/src/httpserv/Main.java b/xmlsecurity/test_docs/tools/httpserv/src/httpserv/Main.java index b6d2d548c319..1f9fd91d2364 100644 --- a/xmlsecurity/test_docs/tools/httpserv/src/httpserv/Main.java +++ b/xmlsecurity/test_docs/tools/httpserv/src/httpserv/Main.java @@ -130,7 +130,7 @@ class MyHandler implements HttpHandler { throw new IOException("The file " + fileRequest + " does not exist!"); } else if (fileRequest.isDirectory()) { - throw new IOException(fileRequest + " is a directory!\n"); + throw new IOException(fileRequest + " is a directory!"); } |