From be6a8677a6ddb6387272a78406ec2149c4319f3d Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Tue, 20 Sep 2011 10:18:12 +0200 Subject: OSL_TRACE: Remove trailing newlines Done with perl regex: s/(\n\s*OSL_TRACE\(\s*\"[^\n]+?)\s*(\\n)+(\"[^\n]*\)\;\n)/$1$3/gs; - removed trailing whitespaces and (multiple) newlines --- sdext/source/pdfimport/filterdet.cxx | 10 +++++----- sdext/source/pdfimport/misc/pwdinteract.cxx | 2 +- sdext/source/pdfimport/pdfiadaptor.cxx | 16 ++++++++-------- sdext/source/pdfimport/test/pdf2xml.cxx | 2 +- sdext/source/pdfimport/tree/genericelements.cxx | 6 +++--- sdext/source/pdfimport/wrapper/wrapper.cxx | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) (limited to 'sdext/source/pdfimport') diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index c75a3eeececa..54bba9708b14 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -640,13 +640,13 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString& chk = pTrailer->m_pDict->m_aMap.find( "DocChecksum" ); if( chk == pTrailer->m_pDict->m_aMap.end() ) { - OSL_TRACE( "no DocChecksum entry\n" ); + OSL_TRACE( "no DocChecksum entry" ); continue; } pdfparse::PDFName* pChkSumName = dynamic_cast(chk->second); if( pChkSumName == NULL ) { - OSL_TRACE( "no name for DocChecksum entry\n" ); + OSL_TRACE( "no name for DocChecksum entry" ); continue; } @@ -657,13 +657,13 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString& add_stream = pTrailer->m_pDict->m_aMap.find( "AdditionalStreams" ); if( add_stream == pTrailer->m_pDict->m_aMap.end() ) { - OSL_TRACE( "no AdditionalStreams entry\n" ); + OSL_TRACE( "no AdditionalStreams entry" ); continue; } pdfparse::PDFArray* pStreams = dynamic_cast(add_stream->second); if( ! pStreams || pStreams->m_aSubElements.size() < 2 ) { - OSL_TRACE( "AdditionalStreams array too small\n" ); + OSL_TRACE( "AdditionalStreams array too small" ); continue; } @@ -727,7 +727,7 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString& } while( bEntered && ! bAuthenticated ); } - OSL_TRACE( "password: %s\n", bAuthenticated ? "matches" : "does not match" ); + OSL_TRACE( "password: %s", bAuthenticated ? "matches" : "does not match" ); if( ! bAuthenticated ) continue; } diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx index 6ef2a17c2875..36b9a9950765 100644 --- a/sdext/source/pdfimport/misc/pwdinteract.cxx +++ b/sdext/source/pdfimport/misc/pwdinteract.cxx @@ -151,7 +151,7 @@ bool getPassword( const uno::Reference< task::XInteractionHandler >& xHandler, { } - OSL_TRACE( "request %s selected\n", pRequest->isSelected() ? "was" : "was not" ); + OSL_TRACE( "request %s selected", pRequest->isSelected() ? "was" : "was not" ); if( pRequest->isSelected() ) { bSuccess = true; diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx index df1a6898dfac..f8aba49a233c 100644 --- a/sdext/source/pdfimport/pdfiadaptor.cxx +++ b/sdext/source/pdfimport/pdfiadaptor.cxx @@ -116,7 +116,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert rtl::OUString aURL; if( osl_createTempFile( NULL, &aFile, &aURL.pData ) == osl_File_E_None ) { - OSL_TRACE( "created temp file %s\n", rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE( "created temp file %s", rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ).getStr() ); const sal_Int32 nBufSize = 4096; uno::Sequence aBuf(nBufSize); // copy the bytes @@ -155,7 +155,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert aArgs[0] <<= m_xModel; aArgs[1] <<= xSubStream; - OSL_TRACE( "try to instantiate subfilter\n" ); + OSL_TRACE( "try to instantiate subfilter" ); uno::Reference< document::XFilter > xSubFilter; try { xSubFilter = uno::Reference( @@ -172,7 +172,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } - OSL_TRACE( "subfilter: %p\n", xSubFilter.get() ); + OSL_TRACE( "subfilter: %p", xSubFilter.get() ); if( xSubFilter.is() ) { if( bAddPwdProp ) @@ -194,12 +194,12 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert } #if OSL_DEBUG_LEVEL > 1 else - OSL_TRACE( "PDFIAdaptor::filter: no embedded substream set\n" ); + OSL_TRACE( "PDFIAdaptor::filter: no embedded substream set" ); #endif } #if OSL_DEBUG_LEVEL > 1 else - OSL_TRACE( "PDFIAdaptor::filter: no model set\n" ); + OSL_TRACE( "PDFIAdaptor::filter: no model set" ); #endif return bRet; @@ -212,7 +212,7 @@ void SAL_CALL PDFIHybridAdaptor::cancel() throw() //XImporter void SAL_CALL PDFIHybridAdaptor::setTargetDocument( const uno::Reference< lang::XComponent >& xDocument ) throw( lang::IllegalArgumentException ) { - OSL_TRACE( "PDFIAdaptor::setTargetDocument\n" ); + OSL_TRACE( "PDFIAdaptor::setTargetDocument" ); m_xModel = uno::Reference< frame::XModel >( xDocument, uno::UNO_QUERY ); if( xDocument.is() && ! m_xModel.is() ) throw lang::IllegalArgumentException(); @@ -293,7 +293,7 @@ sal_Bool SAL_CALL PDFIRawAdaptor::importer( const uno::Sequence< beans::Property sal_Int32 nAttribs = rSourceData.getLength(); for( sal_Int32 i = 0; i < nAttribs; i++, pAttribs++ ) { - OSL_TRACE("importer Attrib: %s\n", OUStringToOString( pAttribs->Name, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("importer Attrib: %s", OUStringToOString( pAttribs->Name, RTL_TEXTENCODING_UTF8 ).getStr() ); if( pAttribs->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InputStream" ) ) ) pAttribs->Value >>= xInput; else if( pAttribs->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) ) @@ -321,7 +321,7 @@ sal_Bool SAL_CALL PDFIRawAdaptor::importer( const uno::Sequence< beans::Property //XImporter void SAL_CALL PDFIRawAdaptor::setTargetDocument( const uno::Reference< lang::XComponent >& xDocument ) throw( lang::IllegalArgumentException ) { - OSL_TRACE( "PDFIAdaptor::setTargetDocument\n" ); + OSL_TRACE( "PDFIAdaptor::setTargetDocument" ); m_xModel = uno::Reference< frame::XModel >( xDocument, uno::UNO_QUERY ); if( xDocument.is() && ! m_xModel.is() ) throw lang::IllegalArgumentException(); diff --git a/sdext/source/pdfimport/test/pdf2xml.cxx b/sdext/source/pdfimport/test/pdf2xml.cxx index a8278ccf2267..f54f90e6170c 100644 --- a/sdext/source/pdfimport/test/pdf2xml.cxx +++ b/sdext/source/pdfimport/test/pdf2xml.cxx @@ -94,7 +94,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) if( !xFactory.is() ) { - OSL_TRACE( "Could not bootstrap UNO, installation must be in disorder. Exiting.\n" ); + OSL_TRACE( "Could not bootstrap UNO, installation must be in disorder. Exiting." ); return 1; } diff --git a/sdext/source/pdfimport/tree/genericelements.cxx b/sdext/source/pdfimport/tree/genericelements.cxx index e6a50a0331db..5206e8ee0f3a 100644 --- a/sdext/source/pdfimport/tree/genericelements.cxx +++ b/sdext/source/pdfimport/tree/genericelements.cxx @@ -109,7 +109,7 @@ void Element::emitStructure( int nLevel) x, y, w, h ); for( std::list< Element* >::iterator it = Children.begin(); it != Children.end(); ++it ) (*it)->emitStructure(nLevel+1 ); - OSL_TRACE( "%*s\n", nLevel, "", typeid( *this ).name() ); + OSL_TRACE( "%*s", nLevel, "", typeid( *this ).name() ); } #endif @@ -179,7 +179,7 @@ void PolyPolyElement::visitedBy( ElementTreeVisitor& rV #if OSL_DEBUG_LEVEL > 1 void PolyPolyElement::emitStructure( int nLevel) { - OSL_TRACE( "%*s<%s %p>\n", nLevel, "", typeid( *this ).name(), this ); + OSL_TRACE( "%*s<%s %p>", nLevel, "", typeid( *this ).name(), this ); OSL_TRACE( "path=" ); int nPoly = PolyPoly.count(); for( int i = 0; i < nPoly; i++ ) @@ -195,7 +195,7 @@ void PolyPolyElement::emitStructure( int nLevel) } for( std::list< Element* >::iterator it = Children.begin(); it != Children.end(); ++it ) (*it)->emitStructure( nLevel+1 ); - OSL_TRACE( "%*s\n", nLevel, "", typeid( *this ).name() ); + OSL_TRACE( "%*s", nLevel, "", typeid( *this ).name() ); } #endif diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index 098ee584c910..cb51cd4cd1ed 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -964,7 +964,7 @@ static bool checkEncryption( const rtl::OUString& } while( bEntered && ! bAuthenticated ); } - OSL_TRACE( "password: %s\n", bAuthenticated ? "matches" : "does not match" ); + OSL_TRACE( "password: %s", bAuthenticated ? "matches" : "does not match" ); bSuccess = bAuthenticated; } // trash password string on heap -- cgit