From a238b1f8d304bf1e2ffb357937f3ec888ee8ac89 Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Tue, 9 Feb 2016 18:16:42 +1100 Subject: Remove excess newlines A ridiculously fast way of doing this is: for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \ --exclude-dir=workdir --exclude-dir=instdir '^ {3,}' .) do perl -0777 -i -pe 's/^ {3,}/ /gm' $i done Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c Reviewed-on: https://gerrit.libreoffice.org/22224 Tested-by: Jenkins Reviewed-by: Chris Sherlock --- io/source/TextInputStream/TextInputStream.cxx | 2 -- io/source/TextOutputStream/TextOutputStream.cxx | 2 -- io/source/acceptor/acc_pipe.cxx | 1 - io/source/connector/ctr_socket.cxx | 1 - io/source/stm/odata.cxx | 13 ------------- io/source/stm/omark.cxx | 19 ------------------- io/source/stm/opipe.cxx | 3 --- io/source/stm/opump.cxx | 12 ------------ io/test/stm/datatest.cxx | 11 ----------- io/test/stm/marktest.cxx | 19 ------------------- io/test/stm/pipetest.cxx | 7 ------- io/test/stm/pumptest.cxx | 5 ----- io/test/testcomponent.cxx | 1 - io/test/testconnection.cxx | 3 --- 14 files changed, 99 deletions(-) (limited to 'io') diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx index d0cbf9fbca88..a82bd4c1c9ff 100644 --- a/io/source/TextInputStream/TextInputStream.cxx +++ b/io/source/TextInputStream/TextInputStream.cxx @@ -147,7 +147,6 @@ void OTextInputStream::implResizeBuffer() } - // XTextInputStream OUString OTextInputStream::readLine( ) @@ -414,7 +413,6 @@ void OTextInputStream::closeInput( ) } - // XActiveDataSink void OTextInputStream::setInputStream( const Reference< XInputStream >& aStream ) diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx index f3533ef1c4a7..684d2fe7349f 100644 --- a/io/source/TextOutputStream/TextOutputStream.cxx +++ b/io/source/TextOutputStream/TextOutputStream.cxx @@ -158,7 +158,6 @@ Sequence OTextOutputStream::implConvert( const OUString& rSource ) } - // XTextOutputStream void OTextOutputStream::writeString( const OUString& aString ) @@ -223,7 +222,6 @@ void OTextOutputStream::checkOutputStream() } - // XActiveDataSource void OTextOutputStream::setOutputStream( const Reference< XOutputStream >& aStream ) diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx index 74baf3b2651a..87f47dcace20 100644 --- a/io/source/acceptor/acc_pipe.cxx +++ b/io/source/acceptor/acc_pipe.cxx @@ -66,7 +66,6 @@ namespace io_acceptor }; - PipeConnection::PipeConnection( const OUString &sConnectionDescription) : m_nStatus( 0 ), m_sDescription( sConnectionDescription ) diff --git a/io/source/connector/ctr_socket.cxx b/io/source/connector/ctr_socket.cxx index 2995aad0a24b..2c0d3f691b2f 100644 --- a/io/source/connector/ctr_socket.cxx +++ b/io/source/connector/ctr_socket.cxx @@ -223,7 +223,6 @@ namespace stoc_connector { } - // XConnectionBroadcaster void SAL_CALL SocketConnection::addStreamListener(const Reference & aListener) throw(RuntimeException, std::exception) { diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx index 878e0dfffd91..5b61d14e919c 100644 --- a/io/source/stm/odata.cxx +++ b/io/source/stm/odata.cxx @@ -92,7 +92,6 @@ public: // XDataInputStream virtual OUString SAL_CALL readUTF() throw (IOException, RuntimeException, std::exception) override; - public: // XActiveDataSink virtual void SAL_CALL setInputStream(const Reference< XInputStream > & aStream) throw (RuntimeException, std::exception) override; @@ -207,8 +206,6 @@ void ODataInputStream::closeInput() } - - //== XDataInputStream =========================================== // XDataInputStream @@ -384,7 +381,6 @@ OUString ODataInputStream::readUTF() throw (IOException, RuntimeException, std:: } - // XActiveDataSource void ODataInputStream::setInputStream(const Reference< XInputStream > & aStream) throw (RuntimeException, std::exception) @@ -406,7 +402,6 @@ Reference< XInputStream > ODataInputStream::getInputStream() throw (RuntimeExcep } - // XDataSink void ODataInputStream::setSuccessor( const Reference < XConnectable > &r ) throw (RuntimeException, std::exception) { @@ -491,8 +486,6 @@ Sequence ODataInputStream_getSupportedServiceNames() } - - class ODataOutputStream : public WeakImplHelper < XDataOutputStream, @@ -796,8 +789,6 @@ Reference< XOutputStream > ODataOutputStream::getOutputStream() } - - // XDataSink void ODataOutputStream::setSuccessor( const Reference < XConnectable > &r ) throw (RuntimeException, std::exception) @@ -839,7 +830,6 @@ Reference < XConnectable > ODataOutputStream::getPredecessor() throw (RuntimeEx } - // XServiceInfo OUString ODataOutputStream::getImplementationName() throw (std::exception) { @@ -1056,7 +1046,6 @@ void OObjectOutputStream::writeObject( const Reference< XPersistObject > & xPObj } - void OObjectOutputStream::connectToMarkable() { if( ! m_bValidMarkable ) { @@ -1133,8 +1122,6 @@ sal_Int32 OObjectOutputStream::offsetToMark(sal_Int32 nMark) } - - Reference< XInterface > SAL_CALL OObjectOutputStream_CreateInstance( SAL_UNUSED_PARAMETER const Reference < XComponentContext > & ) throw(Exception) diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx index c653efb87c08..55c2fcdd8fc4 100644 --- a/io/source/stm/omark.cxx +++ b/io/source/stm/omark.cxx @@ -316,7 +316,6 @@ sal_Int32 OMarkableOutputStream::offsetToMark(sal_Int32 nMark) } - // XActiveDataSource2 void OMarkableOutputStream::setOutputStream(const Reference < XOutputStream >& aStream) throw (RuntimeException, std::exception) @@ -336,7 +335,6 @@ Reference< XOutputStream > OMarkableOutputStream::getOutputStream() throw (Runti } - void OMarkableOutputStream::setSuccessor( const Reference< XConnectable > &r ) throw (RuntimeException, std::exception) { @@ -456,16 +454,9 @@ Sequence OMarkableOutputStream_getSupportedServiceNames() } - - - - - - // XMarkableInputStream - class OMarkableInputStream : public WeakImplHelper < @@ -565,8 +556,6 @@ OMarkableInputStream::~OMarkableInputStream() } - - // XInputStream sal_Int32 OMarkableInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) @@ -807,11 +796,6 @@ sal_Int32 OMarkableInputStream::offsetToMark(sal_Int32 nMark) } - - - - - // XActiveDataSource void OMarkableInputStream::setInputStream(const Reference< XInputStream > & aStream) throw (RuntimeException, std::exception) @@ -834,7 +818,6 @@ Reference< XInputStream > OMarkableInputStream::getInputStream() throw (RuntimeE } - // XDataSink void OMarkableInputStream::setSuccessor( const Reference< XConnectable > &r ) throw (RuntimeException, std::exception) @@ -876,8 +859,6 @@ Reference< XConnectable > OMarkableInputStream::getPredecessor() throw (Runtime } - - void OMarkableInputStream::checkMarksAndFlush() { map >::iterator ii; diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx index ec7b70320700..8e3ecd2f2b67 100644 --- a/io/source/stm/opipe.cxx +++ b/io/source/stm/opipe.cxx @@ -122,7 +122,6 @@ private: }; - OPipeImpl::OPipeImpl() { m_nBytesToSkip = 0; @@ -384,8 +383,6 @@ Reference < XConnectable > OPipeImpl::getPredecessor() throw( RuntimeException, } - - // XServiceInfo OUString OPipeImpl::getImplementationName() throw(std::exception ) { diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx index 3386ba48966f..8cf275620862 100644 --- a/io/source/stm/opump.cxx +++ b/io/source/stm/opump.cxx @@ -199,7 +199,6 @@ void Pump::fireTerminated() } - void Pump::close() { // close streams and release references @@ -301,7 +300,6 @@ void Pump::run() } - /* * XConnectable */ @@ -313,7 +311,6 @@ void Pump::setPredecessor( const Reference< XConnectable >& xPred ) throw(std::e } - Reference< XConnectable > Pump::getPredecessor() throw(std::exception) { Guard< Mutex > aGuard( m_aMutex ); @@ -321,7 +318,6 @@ Reference< XConnectable > Pump::getPredecessor() throw(std::exception) } - void Pump::setSuccessor( const Reference< XConnectable >& xSucc ) throw(std::exception) { Guard< Mutex > aGuard( m_aMutex ); @@ -329,7 +325,6 @@ void Pump::setSuccessor( const Reference< XConnectable >& xSucc ) throw(std::exc } - Reference< XConnectable > Pump::getSuccessor() throw(std::exception) { Guard< Mutex > aGuard( m_aMutex ); @@ -337,7 +332,6 @@ Reference< XConnectable > Pump::getSuccessor() throw(std::exception) } - /* * XActiveDataControl */ @@ -348,14 +342,12 @@ void Pump::addListener( const Reference< XStreamListener >& xListener ) throw(st } - void Pump::removeListener( const Reference< XStreamListener >& xListener ) throw(std::exception) { m_cnt.removeInterface( xListener ); } - void Pump::start() throw( RuntimeException, std::exception ) { Guard< Mutex > aGuard( m_aMutex ); @@ -375,7 +367,6 @@ void Pump::start() throw( RuntimeException, std::exception ) } - void Pump::terminate() throw(std::exception) { close(); @@ -389,7 +380,6 @@ void Pump::terminate() throw(std::exception) } - /* * XActiveDataSink */ @@ -405,7 +395,6 @@ void Pump::setInputStream( const Reference< XInputStream >& xStream ) throw(std: } - Reference< XInputStream > Pump::getInputStream() throw(std::exception) { Guard< Mutex > aGuard( m_aMutex ); @@ -413,7 +402,6 @@ Reference< XInputStream > Pump::getInputStream() throw(std::exception) } - /* * XActiveDataSource */ diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx index e6cc3238f84c..283344c271ee 100644 --- a/io/test/stm/datatest.cxx +++ b/io/test/stm/datatest.cxx @@ -95,8 +95,6 @@ protected: }; - - void ODataStreamTest::testInvariant( const OUString& TestName, const Reference < XInterface >& TestObject ) @@ -220,7 +218,6 @@ sal_Int32 ODataStreamTest::test( } - sal_Bool ODataStreamTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; @@ -323,7 +320,6 @@ void ODataStreamTest::testSimple( const Reference < XDataInputStream > &rInput } - /** * for external binding * @@ -440,7 +436,6 @@ public: }; - Reference MyPersistObject::getPropertySetInfo() throw (RuntimeException) { @@ -566,8 +561,6 @@ void MyPersistObject::removeVetoableChangeListener( } - - OUString MyPersistObject::getServiceName() throw (RuntimeException) { return m_sServiceName; @@ -887,7 +880,6 @@ void OObjectStreamTest::testObject( const Reference< XObjectOutputStream > ERROR_ASSERT( rIn.is() , "no objectInputStream" ); - // tests, if saving an object with an unknown service name allows // reading the data behind the object ! { @@ -1035,9 +1027,6 @@ void OObjectStreamTest::testObject( const Reference< XObjectOutputStream > markableOut->jumpToFurthest(); - - - ERROR_ASSERT( 0 != rIn->available() , "no data arrived at input" ); Reference < XPersistObject > xReadPersistRef = rIn->readObject( ); diff --git a/io/test/stm/marktest.cxx b/io/test/stm/marktest.cxx index c8d2d1997299..8892e7338330 100644 --- a/io/test/stm/marktest.cxx +++ b/io/test/stm/marktest.cxx @@ -95,8 +95,6 @@ OMarkableOutputStreamTest::~OMarkableOutputStreamTest() } - - void OMarkableOutputStreamTest::testInvariant( const OUString& TestName, const Reference < XInterface >& TestObject ) throw ( IllegalArgumentException, RuntimeException) @@ -171,7 +169,6 @@ sal_Int32 OMarkableOutputStreamTest::test( } - sal_Bool OMarkableOutputStreamTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; @@ -357,9 +354,6 @@ void OMarkableOutputStreamTest::testSimple( const Reference< XOutputStream > ****/ - - - /** * for external binding * @@ -372,7 +366,6 @@ Reference < XInterface > SAL_CALL OMarkableOutputStreamTest_CreateInstance( cons } - Sequence OMarkableOutputStreamTest_getSupportedServiceNames() throw () { Sequence aRet { OMarkableOutputStreamTest_getImplementationName() }; @@ -391,12 +384,6 @@ OUString OMarkableOutputStreamTest_getImplementationName() throw () } - - - - - - // Input stream @@ -456,7 +443,6 @@ OMarkableInputStreamTest::~OMarkableInputStreamTest() } - void OMarkableInputStreamTest::testInvariant( const OUString& TestName, const Reference < XInterface >& TestObject ) throw ( IllegalArgumentException, RuntimeException) @@ -537,7 +523,6 @@ sal_Int32 OMarkableInputStreamTest::test( } - sal_Bool OMarkableInputStreamTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; @@ -628,9 +613,6 @@ void OMarkableInputStreamTest::testSimple( const Reference< XOutputStream > ****/ - - - /** * for external binding * @@ -643,7 +625,6 @@ Reference < XInterface > SAL_CALL OMarkableInputStreamTest_CreateInstance( const } - Sequence OMarkableInputStreamTest_getSupportedServiceNames() throw () { Sequence aRet { OMarkableInputStreamTest_getImplementationName() }; diff --git a/io/test/stm/pipetest.cxx b/io/test/stm/pipetest.cxx index 6c99969360f9..f817cd2acff2 100644 --- a/io/test/stm/pipetest.cxx +++ b/io/test/stm/pipetest.cxx @@ -90,7 +90,6 @@ private: }; - class OPipeTest : public WeakImplHelper < XSimpleTest > { public: @@ -129,7 +128,6 @@ private: }; - OPipeTest::OPipeTest( const Reference< XMultiServiceFactory > &rFactory ) { @@ -141,7 +139,6 @@ OPipeTest::~OPipeTest() } - void OPipeTest::testInvariant( const OUString& TestName, const Reference < XInterface >& TestObject ) throw ( IllegalArgumentException, RuntimeException) @@ -205,7 +202,6 @@ sal_Int32 OPipeTest::test( } - sal_Bool OPipeTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; @@ -356,7 +352,6 @@ void OPipeTest::testBufferResizing( const Reference < XInterface > &r ) } - void OPipeTest::testMultithreading( const Reference < XInterface > &r ) { @@ -394,7 +389,6 @@ void OPipeTest::testMultithreading( const Reference < XInterface > &r ) } - /** * for external binding * @@ -408,7 +402,6 @@ Reference < XInterface > SAL_CALL OPipeTest_CreateInstance( const Reference< XMu } - Sequence OPipeTest_getSupportedServiceNames() throw() { Sequence aRet { OPipeTest_getServiceName() }; diff --git a/io/test/stm/pumptest.cxx b/io/test/stm/pumptest.cxx index ae2a28bebf38..898805b068df 100644 --- a/io/test/stm/pumptest.cxx +++ b/io/test/stm/pumptest.cxx @@ -41,8 +41,6 @@ #include - - using namespace ::osl; using namespace ::cppu; using namespace ::com::sun::star::uno; @@ -111,7 +109,6 @@ OPumpTest::~OPumpTest() } - void OPumpTest::testInvariant( const OUString& TestName, const Reference < XInterface >& TestObject ) throw ( IllegalArgumentException, RuntimeException) @@ -189,7 +186,6 @@ sal_Int32 OPumpTest::test( } - sal_Bool OPumpTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; @@ -317,7 +313,6 @@ private: }; - void OPumpTest::testClose( const Reference< XInterface > &r ) { TestCase t( m_rSmgr, r ); diff --git a/io/test/testcomponent.cxx b/io/test/testcomponent.cxx index 1703526c0605..fd1e3d7e5e31 100644 --- a/io/test/testcomponent.cxx +++ b/io/test/testcomponent.cxx @@ -18,7 +18,6 @@ */ - // testcomponent - Loads a service and its testcomponent from dlls performs a test. // Expands the dll-names depending on the actual environment. // Example : testcomponent com.sun.star.io.Pipe stm diff --git a/io/test/testconnection.cxx b/io/test/testconnection.cxx index 38cf44662015..69a2bdeccfb8 100644 --- a/io/test/testconnection.cxx +++ b/io/test/testconnection.cxx @@ -111,9 +111,6 @@ void MyThread::run() } - - - void testConnection( const OUString &sConnectionDescription , const Reference < XAcceptor > &rAcceptor, const Reference < XConnector > &rConnector ) -- cgit