Kaydet (Commit) 8c8f2a52 authored tarafından Noel Grandin's avatar Noel Grandin

remove unnecessary explicit linefeeds from end of SAL and OSL log calls

Change-Id: I3fa363c8e76e6cfb297f4ec346e3f031c09d6fbf
Reviewed-on: https://gerrit.libreoffice.org/36727Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 841e1a6f
......@@ -74,7 +74,7 @@ bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput)
const bool bIsKMZ = rSourceURL.endsWithIgnoreAsciiCase(".kmz");
if( !bIsDAE && !bIsKMZ )
{
SAL_WARN("avmedia.opengl", "KmzDae2Gltf converter got a file with wrong extension\n" << rSourceURL);
SAL_WARN("avmedia.opengl", "KmzDae2Gltf converter got a file with wrong extension " << rSourceURL);
return false;
}
......@@ -108,7 +108,7 @@ bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput)
}
catch (const uno::Exception&)
{
SAL_WARN("avmedia.opengl", "Exception while trying to copy source file to the temp folder for conversion:\n" << sInput);
SAL_WARN("avmedia.opengl", "Exception while trying to copy source file to the temp folder for conversion: " << sInput);
return false;
}
}
......@@ -121,7 +121,7 @@ bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput)
lcl_UnzipKmz(sInput, sOutput, sDaeFilePath);
if ( sDaeFilePath.isEmpty() )
{
SAL_WARN("avmedia.opengl", "Cannot find dae file in kmz:\n" << rSourceURL);
SAL_WARN("avmedia.opengl", "Cannot find the file in kmz: " << rSourceURL);
return false;
}
......
......@@ -31,7 +31,7 @@ using namespace ::com::sun::star;
static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& rxFact )
{
SAL_INFO("avmedia", "create VLC Media player !\n");
SAL_INFO("avmedia", "create VLC Media player !");
// Experimental for now - code is neither elegant nor well tested.
uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext();
......@@ -52,7 +52,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediavlc_component_getFactory(
if (!xContext.is() || !officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
return nullptr;
SAL_INFO("avmedia", "Create VLC Media component: '" << pImplName << "'\n");
SAL_INFO("avmedia", "Create VLC Media component: " << pImplName);
if( rtl_str_compare( pImplName, IMPL_NAME ) == 0 )
{
const OUString aServiceName( SERVICE_NAME );
......
......@@ -271,7 +271,7 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement
//Reference< XMultiServiceFactory > xMSF( comphelper::getProcessServiceFactory() );
//if( !xMSF.is() )
//{
// OSL_FAIL( "### couldn't get ProcessServiceFactory\n" );
// OSL_FAIL( "### couldn't get ProcessServiceFactory" );
// return aRetAny;
//}
......@@ -282,7 +282,7 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement
UNO_QUERY );
if( !xDialogModel.is() )
{
OSL_FAIL( "### couldn't create com.sun.star.awt.UnoControlDialogModel component\n" );
OSL_FAIL( "### couldn't create com.sun.star.awt.UnoControlDialogModel component" );
return aRetAny;
}
......@@ -321,7 +321,7 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement
}
catch(const Exception& )
{
OSL_FAIL( "Parsing error\n" );
OSL_FAIL( "Parsing error" );
SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aFile );
ErrorHandler::HandleError( ERRCODE_IO_GENERAL );
return aRetAny;
......
......@@ -681,7 +681,7 @@ bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, cons
}
catch(const uno::Exception& )
{
OSL_FAIL( "Problem on storing of password library!\n" );
OSL_FAIL( "Problem on storing of password library!" );
// TODO: error handling
}
}
......@@ -898,7 +898,7 @@ bool SfxScriptLibraryContainer::implLoadPasswordLibrary
}
catch(const uno::Exception& )
{
OSL_FAIL( "### couldn't open sub storage for library\n" );
OSL_FAIL( "### couldn't open sub storage for library" );
return false;
}
}
......
......@@ -179,7 +179,7 @@ void EmbeddedObjectContainer::ReleaseImageSubStorage()
}
catch (const uno::Exception&)
{
SAL_WARN( "comphelper.container", "Problems releasing image substorage!\n" );
SAL_WARN( "comphelper.container", "Problems releasing image substorage!" );
}
}
}
......@@ -786,7 +786,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb
{
// impossibility to copy readonly property is not treated as an error for now
// but the assertion is helpful to detect such scenarios and review them
SAL_WARN( "comphelper.container", "Could not copy readonly property!\n" );
SAL_WARN( "comphelper.container", "Could not copy readonly property!" );
}
}
}
......@@ -811,7 +811,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb
}
}
SAL_WARN_IF( !xResult.is(), "comphelper.container", "Can not copy embedded object that has no persistence!\n" );
SAL_WARN_IF( !xResult.is(), "comphelper.container", "Can not copy embedded object that has no persistence!" );
if ( xResult.is() )
{
......@@ -992,7 +992,7 @@ bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < embed
static const OUStringLiteral s_sMediaType("MediaType");
xStorProps->getPropertyValue( s_sMediaType ) >>= aOrigStorMediaType;
SAL_WARN_IF( aOrigStorMediaType.isEmpty(), "comphelper.container", "No valuable media type in the storage!\n" );
SAL_WARN_IF( aOrigStorMediaType.isEmpty(), "comphelper.container", "No valuable media type in the storage!" );
uno::Reference< beans::XPropertySet > xTargetStorProps(
pImpl->mpTempObjectContainer->pImpl->mxStorage,
......@@ -1001,7 +1001,7 @@ bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < embed
}
catch (const uno::Exception&)
{
SAL_WARN( "comphelper.container", "Can not set the new media type to a storage!\n" );
SAL_WARN( "comphelper.container", "Can not set the new media type to a storage!" );
}
}
......@@ -1221,7 +1221,7 @@ namespace {
const uno::Reference< io::XInputStream >& xInStream,
const OUString& aStreamName )
{
OSL_ENSURE( !aStreamName.isEmpty() && xInStream.is() && xDocStor.is(), "Misuse of the method!\n" );
OSL_ENSURE( !aStreamName.isEmpty() && xInStream.is() && xDocStor.is(), "Misuse of the method!" );
try
{
......@@ -1243,7 +1243,7 @@ namespace {
}
catch (const uno::Exception&)
{
SAL_WARN( "comphelper.container", "The images storage is not available!\n" );
SAL_WARN( "comphelper.container", "The images storage is not available!" );
}
}
......@@ -1261,7 +1261,7 @@ bool EmbeddedObjectContainer::StoreAsChildren(bool _bOasisFormat,bool _bCreateEm
for(;pIter != pEnd;++pIter)
{
uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( *pIter );
SAL_WARN_IF( !xObj.is(), "comphelper.container", "An empty entry in the embedded objects list!\n" );
SAL_WARN_IF( !xObj.is(), "comphelper.container", "An empty entry in the embedded objects list!" );
if ( xObj.is() )
{
bool bSwitchBackToLoaded = false;
......@@ -1381,7 +1381,7 @@ bool EmbeddedObjectContainer::StoreChildren(bool _bOasisFormat,bool _bObjectsOnl
for(;pIter != pEnd;++pIter)
{
uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( *pIter );
SAL_WARN_IF( !xObj.is(), "comphelper.container", "An empty entry in the embedded objects list!\n" );
SAL_WARN_IF( !xObj.is(), "comphelper.container", "An empty entry in the embedded objects list!" );
if ( xObj.is() )
{
sal_Int32 nCurState = xObj->getCurrentState();
......@@ -1528,7 +1528,7 @@ bool EmbeddedObjectContainer::SetPersistentEntries(const uno::Reference< embed::
for(;pIter != pEnd;++pIter)
{
uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( *pIter );
SAL_WARN_IF( !xObj.is(), "comphelper.container", "An empty entry in the embedded objects list!\n" );
SAL_WARN_IF( !xObj.is(), "comphelper.container", "An empty entry in the embedded objects list!" );
if ( xObj.is() )
{
uno::Reference< embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY );
......
......@@ -637,7 +637,7 @@ OUString MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName(
break;
}
OSL_ENSURE( !aDocName.isEmpty(), "The name must exist at this point!\n" );
OSL_ENSURE( !aDocName.isEmpty(), "The name must exist at this point!" );
bool bNeedsAddition = true;
......
......@@ -579,7 +579,7 @@ Reference< XResultSet > OCommonStatement::impl_executeQuery_throw( const QueryDa
Reference< XResultSet > OCommonStatement::impl_executeQuery_throw( const OUString& _rSql )
{
SAL_INFO( "connectivity.evoab2", "OCommonStatement::impl_executeQuery_throw(" << _rSql << "%s)\n" );
SAL_INFO( "connectivity.evoab2", "OCommonStatement::impl_executeQuery_throw " << _rSql );
#if OSL_DEBUG_LEVEL > 1
g_message( "Parse SQL '%s'\n",
......
......@@ -125,8 +125,7 @@ void SAL_CALL Blob::disposing()
catch (SQLException &e)
{
// we cannot throw any exceptions here...
SAL_WARN("connectivity.firebird", "isc_close_blob failed\n" <<
e.Message);
SAL_WARN("connectivity.firebird", "isc_close_blob failed " << e.Message);
assert(false);
}
Blob_BASE::disposing();
......
......@@ -81,7 +81,7 @@ MacabGroup::MacabGroup(const ABAddressBookRef _addressBook, const MacabRecords *
}
}
}
OSL_ENSURE(bFound, "MacabGroup::MacabGroup : Could not find group member based on UID!\n");
OSL_ENSURE(bFound, "MacabGroup::MacabGroup : Could not find group member based on UID!");
CFRelease(sGroupMemberUID);
}
}
......
......@@ -87,7 +87,7 @@ namespace cppcanvas
{
#if OSL_DEBUG_LEVEL > 1
if (width == 0.0) {
SAL_INFO("cppcanvas.emf", "TODO: pen with zero width - using minimal which might not be correct\n");
SAL_INFO("cppcanvas.emf", "TODO: pen with zero width - using minimal which might not be correct");
}
#endif
rStrokeAttributes.StrokeWidth = fabs((rState.mapModeTransform * rR.MapSize(width == 0.0 ? 0.05 : width, 0)).getLength());
......
......@@ -60,7 +60,7 @@ namespace cppu_threadpool
DisposedCallerAdmin::~DisposedCallerAdmin()
{
SAL_WARN_IF( !m_lst.empty(), "cppu.threadpool", "DisposedCallerList : " << m_lst.size() << " left\n");
SAL_WARN_IF( !m_lst.empty(), "cppu.threadpool", "DisposedCallerList : " << m_lst.size() << " left");
}
void DisposedCallerAdmin::dispose( sal_Int64 nDisposeId )
......@@ -107,7 +107,7 @@ namespace cppu_threadpool
ThreadPool::~ThreadPool()
{
SAL_WARN_IF( m_mapQueue.size(), "cppu.threadpool", "ThreadIdHashMap: " << m_mapQueue.size() << " left\n");
SAL_WARN_IF( m_mapQueue.size(), "cppu.threadpool", "ThreadIdHashMap: " << m_mapQueue.size() << " left");
}
void ThreadPool::dispose( sal_Int64 nDisposeId )
......
......@@ -120,7 +120,7 @@ IMPL_LINK_NOARG(SvInsertOleDlg, BrowseHdl, Button*, void)
}
catch( const IllegalArgumentException& )
{
SAL_WARN( "cui.dialogs", "caught IllegalArgumentException when registering filter\n" );
SAL_WARN( "cui.dialogs", "caught IllegalArgumentException when registering filter" );
}
if( xFilePicker->execute() == ExecutableDialogResults::OK )
......
......@@ -112,7 +112,7 @@ sal_Int32 ReadThroughComponent(
catch (const SAXParseException& r)
{
#if OSL_DEBUG_LEVEL > 0
SAL_WARN("dbaccess", "SAX parse exception catched while importing:\n" << r.Message << r.LineNumber << "," << r.ColumnNumber);
SAL_WARN("dbaccess", "SAX parse exception catched while importing: " << r.Message << r.LineNumber << "," << r.ColumnNumber);
#else
(void)r;
#endif
......
......@@ -94,7 +94,7 @@ OCommonEmbeddedObject::OCommonEmbeddedObject(
void OCommonEmbeddedObject::CommonInit_Impl( const uno::Sequence< beans::NamedValue >& aObjectProps )
{
OSL_ENSURE( m_xContext.is(), "No ServiceFactory is provided!\n" );
OSL_ENSURE( m_xContext.is(), "No ServiceFactory is provided!" );
if ( !m_xContext.is() )
throw uno::RuntimeException();
......@@ -227,7 +227,7 @@ void OCommonEmbeddedObject::LinkInit_Impl(
else if ( aMediaDescr[nInd].Name == "FilterName" )
aMediaDescr[nInd].Value >>= m_aLinkFilterName;
OSL_ENSURE( m_aLinkURL.getLength() && m_aLinkFilterName.getLength(), "Filter and URL must be provided!\n" );
OSL_ENSURE( m_aLinkURL.getLength() && m_aLinkFilterName.getLength(), "Filter and URL must be provided!" );
m_bReadOnly = true;
if ( m_aLinkFilterName.getLength() )
......@@ -295,12 +295,12 @@ void OCommonEmbeddedObject::requestPositioning( const awt::Rectangle& aRect )
{
// the method is called in case object is inplace active and the object window was resized
OSL_ENSURE( m_xClientSite.is(), "The client site must be set for inplace active object!\n" );
OSL_ENSURE( m_xClientSite.is(), "The client site must be set for inplace active object!" );
if ( m_xClientSite.is() )
{
uno::Reference< embed::XInplaceClient > xInplaceClient( m_xClientSite, uno::UNO_QUERY );
OSL_ENSURE( xInplaceClient.is(), "The client site must support XInplaceClient to allow inplace activation!\n" );
OSL_ENSURE( xInplaceClient.is(), "The client site must support XInplaceClient to allow inplace activation!" );
if ( xInplaceClient.is() )
{
try {
......@@ -308,7 +308,7 @@ void OCommonEmbeddedObject::requestPositioning( const awt::Rectangle& aRect )
}
catch( const uno::Exception& )
{
OSL_FAIL( "Exception on request to resize!\n" );
OSL_FAIL( "Exception on request to resize!" );
}
}
}
......@@ -552,7 +552,7 @@ void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership )
if ( m_xObjectStorage.is() )
{
uno::Reference< lang::XComponent > xComp( m_xObjectStorage, uno::UNO_QUERY );
OSL_ENSURE( xComp.is(), "Storage does not support XComponent!\n" );
OSL_ENSURE( xComp.is(), "Storage does not support XComponent!" );
if ( xComp.is() )
{
......
......@@ -978,7 +978,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
// for now support of this interface is required to allow breaking of links and converting them to normal embedded
// objects, so the persist name must be handled correctly ( althowgh no real persist entry is used )
// OSL_ENSURE( !m_bIsLink, "This method implementation must not be used for links!\n" );
// OSL_ENSURE( !m_bIsLink, "This method implementation must not be used for links!" );
if ( m_bIsLink )
{
m_aEntryName = sEntName;
......@@ -1157,11 +1157,11 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed::
// for now support of this interface is required to allow breaking of links and converting them to normal embedded
// objects, so the persist name must be handled correctly ( althowgh no real persist entry is used )
// OSL_ENSURE( !m_bIsLink, "This method implementation must not be used for links!\n" );
// OSL_ENSURE( !m_bIsLink, "This method implementation must not be used for links!" );
if ( m_bIsLink )
return;
OSL_ENSURE( m_xParentStorage.is() && m_xObjectStorage.is(), "The object has no valid persistence!\n" );
OSL_ENSURE( m_xParentStorage.is() && m_xObjectStorage.is(), "The object has no valid persistence!" );
sal_Int32 nTargetStorageFormat = SOFFICE_FILEFORMAT_CURRENT;
sal_Int32 nOriginalStorageFormat = SOFFICE_FILEFORMAT_CURRENT;
......@@ -1285,14 +1285,14 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::
// for now support of this interface is required to allow breaking of links and converting them to normal embedded
// objects, so the persist name must be handled correctly ( althowgh no real persist entry is used )
// OSL_ENSURE( !m_bIsLink, "This method implementation must not be used for links!\n" );
// OSL_ENSURE( !m_bIsLink, "This method implementation must not be used for links!" );
if ( m_bIsLink )
{
m_aNewEntryName = sEntName;
return;
}
OSL_ENSURE( m_xParentStorage.is() && m_xObjectStorage.is(), "The object has no valid persistence!\n" );
OSL_ENSURE( m_xParentStorage.is() && m_xObjectStorage.is(), "The object has no valid persistence!" );
sal_Int32 nTargetStorageFormat = SOFFICE_FILEFORMAT_CURRENT;
sal_Int32 nOriginalStorageFormat = SOFFICE_FILEFORMAT_CURRENT;
......@@ -1417,7 +1417,7 @@ void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew )
// for now support of this interface is required to allow breaking of links and converting them to normal embedded
// objects, so the persist name must be handled correctly ( althowgh no real persist entry is used )
// OSL_ENSURE( !m_bIsLink, "This method implementation must not be used for links!\n" );
// OSL_ENSURE( !m_bIsLink, "This method implementation must not be used for links!" );
if ( m_bIsLink )
{
if ( bUseNew )
......@@ -1434,7 +1434,7 @@ void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew )
if ( !m_bWaitSaveCompleted )
throw io::IOException(); // TODO: illegal call
OSL_ENSURE( m_xNewObjectStorage.is() && m_xNewParentStorage.is() , "Internal object information is broken!\n" );
OSL_ENSURE( m_xNewObjectStorage.is() && m_xNewParentStorage.is() , "Internal object information is broken!" );
if ( !m_xNewObjectStorage.is() || !m_xNewParentStorage.is() )
throw uno::RuntimeException(); // TODO: broken internal information
......@@ -1569,7 +1569,7 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn()
}
else
{
OSL_ENSURE( m_xParentStorage.is() && m_xObjectStorage.is(), "The object has no valid persistence!\n" );
OSL_ENSURE( m_xParentStorage.is() && m_xObjectStorage.is(), "The object has no valid persistence!" );
if ( !m_xObjectStorage.is() )
throw io::IOException(); //TODO: access denied
......
......@@ -85,7 +85,7 @@ embed::VisualRepresentation SAL_CALL OSpecialEmbeddedObject::getPreferredVisualR
throw embed::WrongStateException( "The own object has no model!",
static_cast< ::cppu::OWeakObject* >(this) );
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!" );
if ( nAspect == embed::Aspects::MSOLE_ICON )
// no representation can be retrieved
throw embed::WrongStateException( "Illegal call!",
......@@ -102,7 +102,7 @@ void SAL_CALL OSpecialEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, cons
if ( m_bDisposed )
throw lang::DisposedException(); // TODO
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!" );
if ( nAspect == embed::Aspects::MSOLE_ICON )
// no representation can be retrieved
throw embed::WrongStateException( "Illegal call!",
......@@ -117,7 +117,7 @@ awt::Size SAL_CALL OSpecialEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect
if ( m_bDisposed )
throw lang::DisposedException(); // TODO
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!" );
if ( nAspect == embed::Aspects::MSOLE_ICON )
// no representation can be retrieved
throw embed::WrongStateException( "Illegal call!",
......@@ -136,7 +136,7 @@ sal_Int32 SAL_CALL OSpecialEmbeddedObject::getMapUnit( sal_Int64 nAspect )
if ( m_bDisposed )
throw lang::DisposedException(); // TODO
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!" );
if ( nAspect == embed::Aspects::MSOLE_ICON )
// no representation can be retrieved
throw embed::WrongStateException( "Illegal call!",
......
......@@ -42,7 +42,7 @@ public:
: m_xContext( rxContext )
, m_aConfigHelper( rxContext )
{
OSL_ENSURE( rxContext.is(), "No service manager is provided!\n" );
OSL_ENSURE( rxContext.is(), "No service manager is provided!" );
}
static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames();
......@@ -89,7 +89,7 @@ public:
: m_xContext( rxContext )
, m_aConfigHelper( rxContext )
{
OSL_ENSURE( rxContext.is(), "No service manager is provided!\n" );
OSL_ENSURE( rxContext.is(), "No service manager is provided!" );
}
static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames();
......
......@@ -469,7 +469,7 @@ bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >& xPar
if ( !SetFrameLMVisibility( m_xFrame, false ) )
{
OSL_FAIL( "Can't deactivate LayoutManager!\n" );
OSL_FAIL( "Can't deactivate LayoutManager!" );
// TODO/LATER: error handling?
}
......
......@@ -204,7 +204,7 @@ void SAL_CALL ODummyEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const
::osl::MutexGuard aGuard( m_aMutex );
CheckInit_WrongState();
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!" );
if ( nAspect == embed::Aspects::MSOLE_ICON )
// no representation can be retrieved
throw embed::WrongStateException( "Illegal call!",
......@@ -221,7 +221,7 @@ awt::Size SAL_CALL ODummyEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
::osl::MutexGuard aGuard( m_aMutex );
CheckInit_WrongState();
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!" );
if ( nAspect == embed::Aspects::MSOLE_ICON )
// no representation can be retrieved
throw embed::WrongStateException( "Illegal call!",
......@@ -241,7 +241,7 @@ sal_Int32 SAL_CALL ODummyEmbeddedObject::getMapUnit( sal_Int64 nAspect )
::osl::MutexGuard aGuard( m_aMutex );
CheckInit_Runtime();
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!" );
if ( nAspect == embed::Aspects::MSOLE_ICON )
// no representation can be retrieved
throw embed::WrongStateException( "Illegal call!",
......@@ -373,11 +373,11 @@ void SAL_CALL ODummyEmbeddedObject::saveCompleted( sal_Bool bUseNew )
if ( !m_bWaitSaveCompleted && !bUseNew )
return;
OSL_ENSURE( m_bWaitSaveCompleted, "Unexpected saveCompleted() call!\n" );
OSL_ENSURE( m_bWaitSaveCompleted, "Unexpected saveCompleted() call!" );
if ( !m_bWaitSaveCompleted )
throw io::IOException(); // TODO: illegal call
OSL_ENSURE( m_xNewParentStorage.is() , "Internal object information is broken!\n" );
OSL_ENSURE( m_xNewParentStorage.is() , "Internal object information is broken!" );
if ( !m_xNewParentStorage.is() )
throw uno::RuntimeException(); // TODO: broken internal information
......
......@@ -30,7 +30,7 @@ public:
TargetStateControl_Impl( sal_Int32& nVariable, sal_Int32 nValue )
: m_nTargetStateVariable( nVariable )
{
OSL_ENSURE( m_nTargetStateVariable == -1, "The target state variable is not initialized properly!\n" );
OSL_ENSURE( m_nTargetStateVariable == -1, "The target state variable is not initialized properly!" );
m_nTargetStateVariable = nValue;
}
......
......@@ -40,7 +40,7 @@ public:
: m_xContext( rxContext )
, m_aConfigHelper( rxContext )
{
OSL_ENSURE( rxContext.is(), "No service manager is provided!\n" );
OSL_ENSURE( rxContext.is(), "No service manager is provided!" );
}
static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames();
......
......@@ -27,7 +27,7 @@ OleWrapperAdviseSink::OleWrapperAdviseSink( OleComponent* pOleComp )
: m_nRefCount( 0 )
, m_pOleComp( pOleComp )
{
OSL_ENSURE( m_pOleComp, "No ole component is provided!\n" );
OSL_ENSURE( m_pOleComp, "No ole component is provided!" );
}
OleWrapperAdviseSink::~OleWrapperAdviseSink()
......
......@@ -30,13 +30,13 @@ void SAL_CALL OClosePreventer::queryClosing( const css::lang::EventObject&, sal_
void SAL_CALL OClosePreventer::notifyClosing( const css::lang::EventObject& )
{
// just a disaster
OSL_FAIL( "The object can not be prevented from closing!\n" );
OSL_FAIL( "The object can not be prevented from closing!" );
}
void SAL_CALL OClosePreventer::disposing( const css::lang::EventObject& )
{
// just a disaster
OSL_FAIL( "The object can not be prevented from closing!\n" );
OSL_FAIL( "The object can not be prevented from closing!" );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -434,7 +434,7 @@ OleComponent::OleComponent( const uno::Reference< lang::XMultiServiceFactory >&
OSL_ENSURE( m_pUnoOleObject, "No owner object is provided!" );
HRESULT hr = OleInitialize( nullptr );
OSL_ENSURE( hr == S_OK || hr == S_FALSE, "The ole can not be successfully initialized\n" );
OSL_ENSURE( hr == S_OK || hr == S_FALSE, "The ole can not be successfully initialized" );
if ( hr == S_OK || hr == S_FALSE )
m_bOleInitialized = true;
......@@ -968,7 +968,7 @@ void OleComponent::InitEmbeddedCopyOfLink( OleComponent* pOleLinkComponent )
void OleComponent::RunObject()
{
OSL_ENSURE( m_pNativeImpl->m_pOleObject, "The pointer can not be set to NULL here!\n" );
OSL_ENSURE( m_pNativeImpl->m_pOleObject, "The pointer can not be set to NULL here!" );
if ( !m_pNativeImpl->m_pOleObject )
throw embed::WrongStateException(); // TODO: the object is in wrong state
......
......@@ -283,7 +283,7 @@ void OleEmbeddedObject::Dispose()
if ( m_xObjectStream.is() )
{
uno::Reference< lang::XComponent > xComp( m_xObjectStream, uno::UNO_QUERY );
OSL_ENSURE( xComp.is(), "Storage stream doesn't support XComponent!\n" );
OSL_ENSURE( xComp.is(), "Storage stream doesn't support XComponent!" );
if ( xComp.is() )
{
......
......@@ -109,7 +109,7 @@ OUString GetNewTempFileURL_Impl( const uno::Reference< lang::XMultiServiceFactor
OUString GetNewFilledTempFile_Impl( const uno::Reference< io::XInputStream >& xInStream,
const uno::Reference< lang::XMultiServiceFactory >& xFactory )
{
OSL_ENSURE( xInStream.is() && xFactory.is(), "Wrong parameters are provided!\n" );
OSL_ENSURE( xInStream.is() && xFactory.is(), "Wrong parameters are provided!" );
OUString aResult = GetNewTempFileURL_Impl( xFactory );
......@@ -363,7 +363,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToGetAcceptableFormat_Impl(
void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStream >& xTargetStream,
const uno::Reference< io::XStream >& xCachedVisualRepresentation )
{
OSL_ENSURE( xTargetStream.is() && xCachedVisualRepresentation.is(), "Invalid arguments!\n" );
OSL_ENSURE( xTargetStream.is() && xCachedVisualRepresentation.is(), "Invalid arguments!" );
if ( !xTargetStream.is() || !xCachedVisualRepresentation.is() )
throw uno::RuntimeException();
......@@ -507,7 +507,7 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea
void OleEmbeddedObject::RemoveVisualCache_Impl( const uno::Reference< io::XStream >& xTargetStream )
{
OSL_ENSURE( xTargetStream.is(), "Invalid argument!\n" );
OSL_ENSURE( xTargetStream.is(), "Invalid argument!" );
if ( !xTargetStream.is() )
throw uno::RuntimeException();
......@@ -551,7 +551,7 @@ bool OleEmbeddedObject::HasVisReplInStream()
uno::Reference< io::XInputStream > xStream;
OSL_ENSURE( !m_pOleComponent || !m_aTempURL.isEmpty(), "The temporary file must exist if there is a component!\n" );
OSL_ENSURE( !m_pOleComponent || !m_aTempURL.isEmpty(), "The temporary file must exist if there is a component!" );
if ( !m_aTempURL.isEmpty() )
{
try
......@@ -1059,7 +1059,7 @@ void OleEmbeddedObject::StoreToLocation_Impl(
"The object waits for saveCompleted() call!",
static_cast< ::cppu::OWeakObject* >(this) );
OSL_ENSURE( m_xParentStorage.is() && m_xObjectStream.is(), "The object has no valid persistence!\n" );
OSL_ENSURE( m_xParentStorage.is() && m_xObjectStream.is(), "The object has no valid persistence!" );
bool bVisReplIsStored = false;
......@@ -1531,11 +1531,11 @@ void SAL_CALL OleEmbeddedObject::saveCompleted( sal_Bool bUseNew )
if ( !m_bWaitSaveCompleted && !bUseNew )
return;
SAL_WARN_IF( !m_bWaitSaveCompleted, "embeddedobj.ole", "Unexpected saveCompleted() call!\n" );
SAL_WARN_IF( !m_bWaitSaveCompleted, "embeddedobj.ole", "Unexpected saveCompleted() call!" );
if ( !m_bWaitSaveCompleted )
throw io::IOException(); // TODO: illegal call
OSL_ENSURE( m_xNewObjectStream.is() && m_xNewParentStorage.is() , "Internal object information is broken!\n" );
OSL_ENSURE( m_xNewObjectStream.is() && m_xNewParentStorage.is() , "Internal object information is broken!" );
if ( !m_xNewObjectStream.is() || !m_xNewParentStorage.is() )
throw uno::RuntimeException(); // TODO: broken internal information
......@@ -1704,7 +1704,7 @@ void SAL_CALL OleEmbeddedObject::storeOwn()
{
bStoreLoaded = false;
OSL_ENSURE( m_xParentStorage.is() && m_xObjectStream.is(), "The object has no valid persistence!\n" );
OSL_ENSURE( m_xParentStorage.is() && m_xObjectStream.is(), "The object has no valid persistence!" );
if ( !m_xObjectStream.is() )
throw io::IOException(); //TODO: access denied
......
......@@ -93,7 +93,7 @@ void SAL_CALL OleEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const awt
if ( m_bDisposed )
throw lang::DisposedException(); // TODO
SAL_WARN_IF( nAspect == embed::Aspects::MSOLE_ICON, "embeddedobj.ole", "For iconified objects no graphical replacement is required!\n" );
SAL_WARN_IF( nAspect == embed::Aspects::MSOLE_ICON, "embeddedobj.ole", "For iconified objects no graphical replacement is required!" );
if ( nAspect == embed::Aspects::MSOLE_ICON )
// no representation can be retrieved
throw embed::WrongStateException( "Illegal call!",
......@@ -121,7 +121,7 @@ void SAL_CALL OleEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const awt
}
catch( const uno::Exception& )
{
SAL_WARN( "embeddedobj.ole", "The object should not be resized without activation!\n" );
SAL_WARN( "embeddedobj.ole", "The object should not be resized without activation!" );
}
aGuard.reset();
}
......