summaryrefslogtreecommitdiff
path: root/svl
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-04-20 11:08:35 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-04-21 09:15:11 +0200
commit8c8f2a528534c31708028825d327601d7bec804c (patch)
treec7905b70ed9dac0f53f72eef4efc33e1e7cf1c0d /svl
parent841e1a6f3619054ecc9240e061cd83d4e41d1ca9 (diff)
remove unnecessary explicit linefeeds from end of SAL and OSL log calls
Change-Id: I3fa363c8e76e6cfb297f4ec346e3f031c09d6fbf Reviewed-on: https://gerrit.libreoffice.org/36727 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svl')
-rw-r--r--svl/source/fsstor/fsstorage.cxx4
-rw-r--r--svl/source/inc/fsfactory.hxx2
-rw-r--r--svl/source/passwordcontainer/passwordcontainer.cxx30
3 files changed, 18 insertions, 18 deletions
diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index b79b626a94f4..7d39b8c256ad 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -233,7 +233,7 @@ void FSStorage::CopyContentToStorage_Impl( ::ucbhelper::Content* pContent, const
catch( ucb::InteractiveIOException& r )
{
if ( r.Code == ucb::IOErrorCode_NOT_EXISTING )
- OSL_FAIL( "The folder does not exist!\n" );
+ OSL_FAIL( "The folder does not exist!" );
else
throw;
}
@@ -939,7 +939,7 @@ uno::Sequence< OUString > SAL_CALL FSStorage::getElementNames()
catch( const ucb::InteractiveIOException& r )
{
if ( r.Code == ucb::IOErrorCode_NOT_EXISTING )
- OSL_FAIL( "The folder does not exist!\n" );
+ OSL_FAIL( "The folder does not exist!" );
else
{
uno::Any aCaught( ::cppu::getCaughtException() );
diff --git a/svl/source/inc/fsfactory.hxx b/svl/source/inc/fsfactory.hxx
index 77451966b8e4..86a921f06fa1 100644
--- a/svl/source/inc/fsfactory.hxx
+++ b/svl/source/inc/fsfactory.hxx
@@ -36,7 +36,7 @@ public:
FSStorageFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext )
: m_xContext( xContext )
{
- OSL_ENSURE( xContext.is(), "No service manager is provided!\n" );
+ OSL_ENSURE( xContext.is(), "No service manager is provided!" );
}
static css::uno::Sequence< OUString > SAL_CALL
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index 1d7790070e7b..7f17e57c640f 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -110,7 +110,7 @@ static vector< OUString > getInfoFromInd( const OUString& aInd )
&& ( pLine[i] < 'a' || pLine[i] > 'f' )
&& ( pLine[i] < 'A' || pLine[i] > 'F' ) ) )
{
- OSL_FAIL( "Wrong index syntax!\n" );
+ OSL_FAIL( "Wrong index syntax!" );
return aResult;
}
@@ -125,7 +125,7 @@ static vector< OUString > getInfoFromInd( const OUString& aInd )
} while( pLine[0] == '_' && pLine[1] == '_' );
if( *pLine )
- OSL_FAIL( "Wrong index syntax!\n" );
+ OSL_FAIL( "Wrong index syntax!" );
return aResult;
}
@@ -165,7 +165,7 @@ static OUString getAsciiLine( const ::rtl::ByteSequence& buf )
static ::rtl::ByteSequence getBufFromAsciiLine( const OUString& line )
{
- OSL_ENSURE( line.getLength() % 2 == 0, "Wrong syntax!\n" );
+ OSL_ENSURE( line.getLength() % 2 == 0, "Wrong syntax!" );
OString tmpLine = OUStringToOString( line, RTL_TEXTENCODING_ASCII_US );
::rtl::ByteSequence aResult(line.getLength()/2);
@@ -196,7 +196,7 @@ PassMap StorageItem::getInfo()
if( aPropertyValues.getLength() != aNodeNames.getLength() )
{
- OSL_ENSURE( aPropertyValues.getLength() == aNodeNames.getLength(), "Problems during reading\n" );
+ OSL_ENSURE( aPropertyValues.getLength() == aNodeNames.getLength(), "Problems during reading" );
return aResult;
}
@@ -224,7 +224,7 @@ PassMap StorageItem::getInfo()
}
}
else
- OSL_FAIL( "Wrong index syntax!\n" );
+ OSL_FAIL( "Wrong index syntax!" );
}
return aResult;
@@ -253,7 +253,7 @@ bool StorageItem::useStorage()
if( aPropertyValues.getLength() != aNodeNames.getLength() )
{
- OSL_ENSURE( aPropertyValues.getLength() == aNodeNames.getLength(), "Problems during reading\n" );
+ OSL_ENSURE( aPropertyValues.getLength() == aNodeNames.getLength(), "Problems during reading" );
return false;
}
@@ -280,7 +280,7 @@ bool StorageItem::getEncodedMP( OUString& aResult )
if( aPropertyValues.getLength() != aNodeNames.getLength() )
{
- OSL_ENSURE( aPropertyValues.getLength() == aNodeNames.getLength(), "Problems during reading\n" );
+ OSL_ENSURE( aPropertyValues.getLength() == aNodeNames.getLength(), "Problems during reading" );
return false;
}
@@ -424,11 +424,11 @@ vector< OUString > PasswordContainer::DecodePasswords( const OUString& aLine, co
if( !aMasterPasswd.isEmpty() )
{
rtlCipher aDecoder = rtl_cipher_create (rtl_Cipher_AlgorithmBF, rtl_Cipher_ModeStream );
- OSL_ENSURE( aDecoder, "Can't create decoder\n" );
+ OSL_ENSURE( aDecoder, "Can't create decoder" );
if( aDecoder )
{
- OSL_ENSURE( aMasterPasswd.getLength() == RTL_DIGEST_LENGTH_MD5 * 2, "Wrong master password format!\n" );
+ OSL_ENSURE( aMasterPasswd.getLength() == RTL_DIGEST_LENGTH_MD5 * 2, "Wrong master password format!" );
unsigned char code[RTL_DIGEST_LENGTH_MD5];
for( int ind = 0; ind < RTL_DIGEST_LENGTH_MD5; ind++ )
@@ -459,12 +459,12 @@ vector< OUString > PasswordContainer::DecodePasswords( const OUString& aLine, co
}
else
{
- OSL_FAIL( "No master password provided!\n" );
+ OSL_FAIL( "No master password provided!" );
// throw special exception
}
// problems with decoding
- OSL_FAIL( "Problem with decoding\n" );
+ OSL_FAIL( "Problem with decoding" );
throw RuntimeException("Can't decode!" );
}
@@ -475,11 +475,11 @@ OUString PasswordContainer::EncodePasswords(const vector< OUString >& lines, con
OString aSeq = OUStringToOString( createIndex( lines ), RTL_TEXTENCODING_UTF8 );
rtlCipher aEncoder = rtl_cipher_create (rtl_Cipher_AlgorithmBF, rtl_Cipher_ModeStream );
- OSL_ENSURE( aEncoder, "Can't create encoder\n" );
+ OSL_ENSURE( aEncoder, "Can't create encoder" );
if( aEncoder )
{
- OSL_ENSURE( aMasterPasswd.getLength() == RTL_DIGEST_LENGTH_MD5 * 2, "Wrong master password format!\n" );
+ OSL_ENSURE( aMasterPasswd.getLength() == RTL_DIGEST_LENGTH_MD5 * 2, "Wrong master password format!" );
unsigned char code[RTL_DIGEST_LENGTH_MD5];
for( int ind = 0; ind < RTL_DIGEST_LENGTH_MD5; ind++ )
@@ -536,12 +536,12 @@ OUString PasswordContainer::EncodePasswords(const vector< OUString >& lines, con
}
else
{
- OSL_FAIL( "No master password provided!\n" );
+ OSL_FAIL( "No master password provided!" );
// throw special exception
}
// problems with encoding
- OSL_FAIL( "Problem with encoding\n" );
+ OSL_FAIL( "Problem with encoding" );
throw RuntimeException("Can't encode!" );
}