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 --- sax/inc/xml2utf.hxx | 2 -- sax/source/expatwrap/sax_expat.cxx | 5 ----- sax/source/expatwrap/xml2utf.cxx | 5 ----- sax/source/tools/converter.cxx | 1 - sax/test/sax/testwriter.cxx | 16 ---------------- sax/test/saxdemo.cxx | 8 -------- 6 files changed, 37 deletions(-) (limited to 'sax') diff --git a/sax/inc/xml2utf.hxx b/sax/inc/xml2utf.hxx index 76cd10dab85f..25245b2a803a 100644 --- a/sax/inc/xml2utf.hxx +++ b/sax/inc/xml2utf.hxx @@ -71,7 +71,6 @@ private: }; - /*---------------------------------------- * * XMLFile2UTFConverter @@ -92,7 +91,6 @@ public: void setEncoding( const OString &s ) { m_sEncoding = s; } - // @param nMaxToRead The number of chars, that should be read. Note that this is no exact number. There // may be returned less or more bytes than ordered. sal_Int32 readAndConvert( css::uno::Sequence &seq , sal_Int32 nMaxToRead ) diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx index ce8c0f12d6a4..5e995405ed18 100644 --- a/sax/source/expatwrap/sax_expat.cxx +++ b/sax/source/expatwrap/sax_expat.cxx @@ -313,7 +313,6 @@ extern "C" } - // LocatorImpl class LocatorImpl : @@ -364,8 +363,6 @@ private: }; - - SaxExpatParser::SaxExpatParser( ) { m_pImpl = new SaxExpatParser_Impl; @@ -722,7 +719,6 @@ void SaxExpatParser_Impl::parse( ) } - // The C-Callbacks @@ -836,7 +832,6 @@ void SaxExpatParser_Impl::callbackNotationDecl( } - bool SaxExpatParser_Impl::callbackExternalEntityRef( XML_Parser parser, const XML_Char *context, SAL_UNUSED_PARAMETER const XML_Char * /*base*/, const XML_Char *systemId, diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx index 68b44f6461cb..0c3e96564ab7 100644 --- a/sax/source/expatwrap/xml2utf.cxx +++ b/sax/source/expatwrap/xml2utf.cxx @@ -341,8 +341,6 @@ void XMLFile2UTFConverter::initializeDecoding() } - - // Text2UnicodeConverter @@ -444,9 +442,6 @@ Sequence Text2UnicodeConverter::convert( const Sequence & } - - - // Unicode2TextConverter diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index cf061c9c6361..0570024cfd45 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -1944,7 +1944,6 @@ const // p q r s t u v w x y z - void ThreeByteToFourByte (const sal_Int8* pBuffer, const sal_Int32 nStart, const sal_Int32 nFullLen, OUStringBuffer& sBuffer) { sal_Int32 nLen(nFullLen - nStart); diff --git a/sax/test/sax/testwriter.cxx b/sax/test/sax/testwriter.cxx index f07097fd1bfd..c031db370fe0 100644 --- a/sax/test/sax/testwriter.cxx +++ b/sax/test/sax/testwriter.cxx @@ -136,7 +136,6 @@ private: }; - /*---------------------------------------- * * Attributlist implementation @@ -197,7 +196,6 @@ struct AttributeListImpl_impl }; - sal_Int16 AttributeListImpl::getLength() throw (RuntimeException) { return m_pImpl->vecAttribute.size(); @@ -265,14 +263,12 @@ OUString AttributeListImpl::getValueByName(const OUString& sName) throw (Runtim } - AttributeListImpl::AttributeListImpl() { m_pImpl = new AttributeListImpl_impl; } - AttributeListImpl::~AttributeListImpl() { delete m_pImpl; @@ -293,15 +289,6 @@ void AttributeListImpl::clear() } - - - - - - - - - /** * for external binding * @@ -331,7 +318,6 @@ Sequence OSaxWriterTest_getSupportedServiceNames( ) throw () } - void OSaxWriterTest::testInvariant( const OUString& TestName, const Reference < XInterface >& TestObject ) throw ( IllegalArgumentException, RuntimeException) @@ -406,7 +392,6 @@ sal_Int32 OSaxWriterTest::test( } - sal_Bool OSaxWriterTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; @@ -452,7 +437,6 @@ void OSaxWriterTest::writeParagraph( } - void OSaxWriterTest::testSimple( const Reference< XExtendedDocumentHandler > &r ) { OUString testParagraph = OUString( diff --git a/sax/test/saxdemo.cxx b/sax/test/saxdemo.cxx index 3f7d21c85dd0..419ce7ea799b 100644 --- a/sax/test/saxdemo.cxx +++ b/sax/test/saxdemo.cxx @@ -304,7 +304,6 @@ struct AttributeListImpl_impl }; - sal_Int16 AttributeListImpl::getLength() throw (RuntimeException) { return (sal_Int16) m_pImpl->vecAttribute.size(); @@ -368,14 +367,12 @@ OUString AttributeListImpl::getValueByName(const OUString& sName) throw (Runtim } - AttributeListImpl::AttributeListImpl() { m_pImpl = new AttributeListImpl_impl; } - AttributeListImpl::~AttributeListImpl() { delete m_pImpl; @@ -395,7 +392,6 @@ void AttributeListImpl::clear() } - // helper function for writing // ensures that linebreaks are inserted // when writing a long text. @@ -425,7 +421,6 @@ void writeParagraphHelper( } - // helper implementation for SAX-Writer // writes data to a file @@ -474,7 +469,6 @@ void OFileWriter::closeOutput() } - // Needed to switch on solaris threads #ifdef SOLARIS extern "C" void ChangeGlobalInit(); @@ -525,7 +519,6 @@ int main (int argc, char **argv) } - // parser demo // read xml from a file and count elements @@ -566,7 +559,6 @@ int main (int argc, char **argv) } - // The SAX-Writer demo x= xSMgr->createInstance("com.sun.star.xml.sax.Writer"); -- cgit