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 --- xmlhelp/source/cxxhelp/inc/qe/Query.hxx | 1 - xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx | 6 ------ xmlhelp/source/cxxhelp/provider/inputstream.cxx | 2 -- xmlhelp/source/cxxhelp/provider/resultsetbase.cxx | 11 ----------- xmlhelp/source/cxxhelp/provider/resultsetfactory.hxx | 2 -- xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx | 1 - xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 15 --------------- xmlhelp/source/cxxhelp/provider/urlparameter.hxx | 2 -- xmlhelp/source/cxxhelp/test/searchdemo.cxx | 2 -- 9 files changed, 42 deletions(-) (limited to 'xmlhelp') diff --git a/xmlhelp/source/cxxhelp/inc/qe/Query.hxx b/xmlhelp/source/cxxhelp/inc/qe/Query.hxx index fca4b17be5bc..cfb0a723802e 100644 --- a/xmlhelp/source/cxxhelp/inc/qe/Query.hxx +++ b/xmlhelp/source/cxxhelp/inc/qe/Query.hxx @@ -48,7 +48,6 @@ namespace xmlsearch { }; // end class QueryHit - class QueryHitData { public: diff --git a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx index 2a8dd90c0669..79856b4c4bc9 100644 --- a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx +++ b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx @@ -101,7 +101,6 @@ void SAL_CALL BufferedInputStream::release() throw() } - sal_Int32 SAL_CALL BufferedInputStream::readBytes( Sequence< sal_Int8 >& aData,sal_Int32 nBytesToRead ) throw( NotConnectedException, BufferSizeExceededException, @@ -138,7 +137,6 @@ sal_Int32 SAL_CALL BufferedInputStream::readSomeBytes( } - void SAL_CALL BufferedInputStream::skipBytes( sal_Int32 nBytesToSkip ) throw( NotConnectedException, BufferSizeExceededException, @@ -156,7 +154,6 @@ void SAL_CALL BufferedInputStream::skipBytes( sal_Int32 nBytesToSkip ) } - sal_Int32 SAL_CALL BufferedInputStream::available() throw( NotConnectedException, IOException, @@ -167,7 +164,6 @@ sal_Int32 SAL_CALL BufferedInputStream::available() } - void SAL_CALL BufferedInputStream::closeInput() throw( NotConnectedException, IOException, @@ -191,7 +187,6 @@ void SAL_CALL BufferedInputStream::seek( sal_Int64 location ) } - sal_Int64 SAL_CALL BufferedInputStream::getPosition() throw( IOException, RuntimeException, std::exception ) @@ -201,7 +196,6 @@ sal_Int64 SAL_CALL BufferedInputStream::getPosition() } - sal_Int64 SAL_CALL BufferedInputStream::getLength() throw( IOException,RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.cxx b/xmlhelp/source/cxxhelp/provider/inputstream.cxx index af845caacb2f..36b902768100 100644 --- a/xmlhelp/source/cxxhelp/provider/inputstream.cxx +++ b/xmlhelp/source/cxxhelp/provider/inputstream.cxx @@ -28,7 +28,6 @@ using namespace com::sun::star; using namespace com::sun::star::ucb; - XInputStream_impl::XInputStream_impl( const OUString& aUncPath ) : m_bIsOpen( false ), m_aFile( aUncPath ) @@ -73,7 +72,6 @@ XInputStream_impl::release( } - sal_Int32 SAL_CALL XInputStream_impl::readBytes( uno::Sequence< sal_Int8 >& aData, diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx index 0266ef118a03..3ac086f461a6 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx @@ -74,7 +74,6 @@ ResultSetBase::release( } - uno::Any SAL_CALL ResultSetBase::queryInterface( const uno::Type& rType ) @@ -91,7 +90,6 @@ ResultSetBase::queryInterface( } - // XComponent @@ -122,7 +120,6 @@ ResultSetBase::removeEventListener( } - void SAL_CALL ResultSetBase::dispose() throw( uno::RuntimeException, std::exception ) @@ -147,7 +144,6 @@ ResultSetBase::dispose() } - // XResultSet sal_Bool SAL_CALL @@ -282,8 +278,6 @@ sal_Bool SAL_CALL ResultSetBase::absolute( sal_Int32 row ) } - - sal_Bool SAL_CALL ResultSetBase::relative( sal_Int32 row ) @@ -304,7 +298,6 @@ ResultSetBase::relative( } - sal_Bool SAL_CALL ResultSetBase::previous( void ) @@ -419,7 +412,6 @@ ResultSetBase::queryContent( } - class XPropertySetInfoImpl : public cppu::OWeakObject, public beans::XPropertySetInfo @@ -483,7 +475,6 @@ private: }; - // XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL ResultSetBase::getPropertySetInfo() @@ -505,7 +496,6 @@ ResultSetBase::getPropertySetInfo() } - void SAL_CALL ResultSetBase::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw( beans::UnknownPropertyException, @@ -625,7 +615,6 @@ void SAL_CALL ResultSetBase::removeVetoableChangeListener( } - // XResultSetMetaDataSupplier uno::Reference< sdbc::XResultSetMetaData > SAL_CALL ResultSetBase::getMetaData( diff --git a/xmlhelp/source/cxxhelp/provider/resultsetfactory.hxx b/xmlhelp/source/cxxhelp/provider/resultsetfactory.hxx index dd5e4a79662c..2dba0ec05fb6 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetfactory.hxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetfactory.hxx @@ -36,11 +36,9 @@ namespace chelp { }; - } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx index 197b9de37550..f269653af518 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx @@ -29,7 +29,6 @@ using namespace com::sun::star; using namespace com::sun::star::ucb; - ResultSetForRoot::ResultSetForRoot( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< XContentProvider >& xProvider, const uno::Sequence< beans::Property >& seq, diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index 75a54dc37187..b2c3da0d7202 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -222,7 +222,6 @@ OUString URLParameter::get_the_tag() } - OUString URLParameter::get_the_path() { if(m_bUseDB) { @@ -237,7 +236,6 @@ OUString URLParameter::get_the_path() } - OUString URLParameter::get_the_title() { if(m_bUseDB) { @@ -314,7 +312,6 @@ void URLParameter::readHelpDataFile() } - // Class encapsulating the transformation of the XInputStream to XHTML @@ -383,7 +380,6 @@ private: }; - void URLParameter::open( const Command& aCommand, sal_Int32 CommandId, const Reference< XCommandEnvironment >& Environment, @@ -410,7 +406,6 @@ void URLParameter::open( const Command& aCommand, } - void URLParameter::open( const Command& aCommand, sal_Int32 CommandId, const Reference< XCommandEnvironment >& Environment, @@ -492,7 +487,6 @@ bool URLParameter::module() } - bool URLParameter::name( bool modulePresent ) { // if modulepresent, a name may be present, but must not @@ -954,21 +948,18 @@ Any SAL_CALL InputStreamTransformer::queryInterface( const Type& rType ) throw( } - void SAL_CALL InputStreamTransformer::acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL InputStreamTransformer::release() throw() { OWeakObject::release(); } - sal_Int32 SAL_CALL InputStreamTransformer::readBytes( Sequence< sal_Int8 >& aData,sal_Int32 nBytesToRead ) throw( NotConnectedException, BufferSizeExceededException, @@ -1003,7 +994,6 @@ sal_Int32 SAL_CALL InputStreamTransformer::readSomeBytes( Sequence< sal_Int8 >& } - void SAL_CALL InputStreamTransformer::skipBytes( sal_Int32 nBytesToSkip ) throw( NotConnectedException, BufferSizeExceededException, IOException, @@ -1014,7 +1004,6 @@ void SAL_CALL InputStreamTransformer::skipBytes( sal_Int32 nBytesToSkip ) throw( } - sal_Int32 SAL_CALL InputStreamTransformer::available() throw( NotConnectedException, IOException, RuntimeException, std::exception ) @@ -1024,7 +1013,6 @@ sal_Int32 SAL_CALL InputStreamTransformer::available() throw( NotConnectedExcept } - void SAL_CALL InputStreamTransformer::closeInput() throw( NotConnectedException, IOException, RuntimeException, std::exception ) @@ -1032,7 +1020,6 @@ void SAL_CALL InputStreamTransformer::closeInput() throw( NotConnectedException, } - void SAL_CALL InputStreamTransformer::seek( sal_Int64 location ) throw( IllegalArgumentException, IOException, RuntimeException, std::exception ) @@ -1048,7 +1035,6 @@ void SAL_CALL InputStreamTransformer::seek( sal_Int64 location ) throw( IllegalA } - sal_Int64 SAL_CALL InputStreamTransformer::getPosition() throw( IOException, RuntimeException, std::exception ) { @@ -1057,7 +1043,6 @@ sal_Int64 SAL_CALL InputStreamTransformer::getPosition() throw( IOException, } - sal_Int64 SAL_CALL InputStreamTransformer::getLength() throw( IOException,RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx index da0819252463..13bdff6dd003 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx @@ -106,8 +106,6 @@ namespace chelp { }; - - class URLParameter { public: diff --git a/xmlhelp/source/cxxhelp/test/searchdemo.cxx b/xmlhelp/source/cxxhelp/test/searchdemo.cxx index e2ee86611c09..612418335deb 100644 --- a/xmlhelp/source/cxxhelp/test/searchdemo.cxx +++ b/xmlhelp/source/cxxhelp/test/searchdemo.cxx @@ -36,11 +36,9 @@ using namespace xmlsearch::db; using namespace xmlsearch::qe; - extern RandomAccessStream* theFile(); - void print_rtl_OUString( const OUString bla ) { OString bluber = OString( bla.getStr(),bla.getLength(),RTL_TEXTENCODING_UTF8 ); -- cgit v1.2.3