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 --- linguistic/source/convdic.cxx | 2 -- linguistic/source/convdicxml.cxx | 1 - linguistic/source/dicimp.cxx | 2 -- linguistic/source/dicimp.hxx | 2 -- linguistic/source/dlistimp.cxx | 5 ----- linguistic/source/gciterator.cxx | 2 -- linguistic/source/gciterator.hxx | 4 ---- linguistic/source/hhconvdic.cxx | 2 -- linguistic/source/hyphdsp.cxx | 1 - linguistic/source/hyphdsp.hxx | 2 -- linguistic/source/hyphdta.cxx | 3 --- linguistic/source/iprcache.cxx | 1 - linguistic/source/lngopt.cxx | 3 --- linguistic/source/lngopt.hxx | 1 - linguistic/source/lngprophelp.cxx | 2 -- linguistic/source/lngsvcmgr.cxx | 3 --- linguistic/source/lngsvcmgr.hxx | 2 -- linguistic/source/spelldsp.cxx | 1 - linguistic/source/spelldta.cxx | 1 - linguistic/source/thesdsp.cxx | 2 -- linguistic/source/thesdsp.hxx | 2 -- 21 files changed, 44 deletions(-) (limited to 'linguistic/source') diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx index e78127c97ff2..9b2597910425 100644 --- a/linguistic/source/convdic.cxx +++ b/linguistic/source/convdic.cxx @@ -161,7 +161,6 @@ bool IsConvDic( const OUString &rFileURL, sal_Int16 &nLang, sal_Int16 &nConvType } - ConvDic::ConvDic( const OUString &rName, sal_Int16 nLang, @@ -669,5 +668,4 @@ uno::Sequence< OUString > ConvDic::getSupportedServiceNames_Static() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index 534b163c5122..62843b2e6225 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -288,7 +288,6 @@ void ConvDicXMLRightTextContext_Impl::EndElement() } - bool ConvDicXMLExport::Export() { uno::Reference< document::XExporter > xExporter( this ); diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index 25311be0a06c..51bce42697d9 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -52,7 +52,6 @@ using namespace com::sun::star::linguistic2; using namespace linguistic; - #define BUFSIZE 4096 #define VERS2_NOLANGUAGE 1024 @@ -1142,5 +1141,4 @@ OUString SAL_CALL DicEntry::getReplacementText( ) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx index 6b5ca473d8b4..321a47bbcf28 100644 --- a/linguistic/source/dicimp.hxx +++ b/linguistic/source/dicimp.hxx @@ -167,7 +167,6 @@ public: }; - class DicEntry : public cppu::WeakImplHelper< css::linguistic2::XDictionaryEntry > { @@ -198,7 +197,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 020eaf782c66..7aee242904ba 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -52,7 +52,6 @@ using namespace com::sun::star::linguistic2; using namespace linguistic; - static bool IsVers2OrNewer( const OUString& rFileURL, sal_uInt16& nLng, bool& bNeg ); static void AddInternal( const uno::Reference< XDictionary > &rDic, @@ -228,8 +227,6 @@ bool DicEvtListenerHelper::RemoveDicListEvtListener( } - - sal_Int16 DicEvtListenerHelper::EndCollectEvents() { DBG_ASSERT(nNumCollectEvtListeners > 0, "lng: mismatched function call"); @@ -265,8 +262,6 @@ sal_Int16 DicEvtListenerHelper::FlushEvents() } - - void DicList::MyAppExitListener::AtExit() { rMyDicList.SaveDics(); diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index 50d2bf50ac5c..92e27b2a36f3 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -1066,8 +1066,6 @@ void GrammarCheckingIterator::GetConfiguredGCSvcs_Impl() } - - sal_Bool SAL_CALL GrammarCheckingIterator::supportsService( const OUString & rServiceName ) throw(uno::RuntimeException, std::exception) diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx index a00618da3eac..3b15744f4074 100644 --- a/linguistic/source/gciterator.hxx +++ b/linguistic/source/gciterator.hxx @@ -43,7 +43,6 @@ #include "defs.hxx" - struct FPEntry { // flat paragraph iterator @@ -70,8 +69,6 @@ struct FPEntry }; - - class GrammarCheckingIterator: public cppu::WeakImplHelper < @@ -183,7 +180,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx index 34ceecf1c9b5..5ab1e8785fe3 100644 --- a/linguistic/source/hhconvdic.cxx +++ b/linguistic/source/hhconvdic.cxx @@ -70,7 +70,6 @@ sal_Int16 SAL_CALL checkScriptType(sal_Unicode c) throw (RuntimeException) } - bool TextIsAllScriptType( const OUString &rTxt, sal_Int16 nScriptType ) { bool bIsAll = true; @@ -83,7 +82,6 @@ bool TextIsAllScriptType( const OUString &rTxt, sal_Int16 nScriptType ) } - HHConvDic::HHConvDic( const OUString &rName, const OUString &rMainURL ) : ConvDic( rName, LANGUAGE_KOREAN, ConversionDictionaryType::HANGUL_HANJA, true, rMainURL ) { diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx index 0ab84859f81a..5ed22c5fc929 100644 --- a/linguistic/source/hyphdsp.cxx +++ b/linguistic/source/hyphdsp.cxx @@ -47,7 +47,6 @@ using namespace com::sun::star::linguistic2; using namespace linguistic; - HyphenatorDispatcher::HyphenatorDispatcher( LngSvcMgr &rLngSvcMgr ) : rMgr (rLngSvcMgr) { diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx index 9623e07d5a82..39b7030ca701 100644 --- a/linguistic/source/hyphdsp.hxx +++ b/linguistic/source/hyphdsp.hxx @@ -138,8 +138,6 @@ inline css::uno::Reference< css::linguistic2::XSearchableDictionaryList > } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx index 844b2fbd4442..0eb88f1837de 100644 --- a/linguistic/source/hyphdta.cxx +++ b/linguistic/source/hyphdta.cxx @@ -119,8 +119,6 @@ sal_Bool SAL_CALL HyphenatedWord::isAlternativeSpelling() } - - PossibleHyphens::PossibleHyphens(const OUString &rWord, sal_Int16 nLang, const OUString &rHyphWord, const Sequence< sal_Int16 > &rPositions) : @@ -184,7 +182,6 @@ css::uno::Reference < css::linguistic2::XPossibleHyphens > PossibleHyphens::Crea } - } // namespace linguistic /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx index c3291c0b9bcc..a83cb6bc0d81 100644 --- a/linguistic/source/iprcache.cxx +++ b/linguistic/source/iprcache.cxx @@ -187,7 +187,6 @@ void SAL_CALL FlushListener::propertyChange( } - SpellCache::SpellCache() { pFlushLstnr = new FlushListener( *this ); diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index fb861991591f..4c5f832a4255 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -48,8 +48,6 @@ using namespace linguistic; using namespace com::sun::star::registry; - - // static member initialization SvtLinguOptions * LinguOptions::pData = nullptr; oslInterlockedCount LinguOptions::nRefCount; @@ -138,7 +136,6 @@ OUString LinguOptions::GetName( sal_Int32 nWID ) } - //! map must be sorted by first entry in alphabetical increasing order. static const SfxItemPropertyMapEntry* lcl_GetLinguProps() { diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx index bec8f1004500..f594c10323a5 100644 --- a/linguistic/source/lngopt.hxx +++ b/linguistic/source/lngopt.hxx @@ -44,7 +44,6 @@ namespace com { namespace sun { namespace star { }}} - // LinguOptions // This class represents all Linguistik relevant options. diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx index 9dc4588cba40..68851a0e1b23 100644 --- a/linguistic/source/lngprophelp.cxx +++ b/linguistic/source/lngprophelp.cxx @@ -305,7 +305,6 @@ sal_Bool SAL_CALL } - PropertyHelper_Thes::PropertyHelper_Thes( const Reference< XInterface > &rxSource, Reference< XLinguProperties > &rxPropSet ) : @@ -330,7 +329,6 @@ void SAL_CALL } - // list of properties from the property set to be used // and listened to static const char *aSP[] = diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index c7a38ffe49a8..643c5a6cfb7c 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -425,8 +425,6 @@ bool LngSvcMgrListenerHelper::RemoveLngSvcEvtBroadcaster( } - - LngSvcMgr::LngSvcMgr() : utl::ConfigItem("Office.Linguistic") , aEvtListeners(GetLinguMutex()) @@ -1868,7 +1866,6 @@ static uno::Sequence< OUString > GetLangSvc( const uno::Any &rVal ) } - uno::Sequence< OUString > SAL_CALL LngSvcMgr::getConfiguredServices( const OUString& rServiceName, diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx index 27a7aa86a038..1180444c29bc 100644 --- a/linguistic/source/lngsvcmgr.hxx +++ b/linguistic/source/lngsvcmgr.hxx @@ -54,7 +54,6 @@ namespace com { namespace sun { namespace star { namespace linguistic2 { } } } } - class LngSvcMgr : public cppu::WeakImplHelper < @@ -190,7 +189,6 @@ inline OUString LngSvcMgr::getImplementationName_Static() } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx index 2757d47b7030..5c09ae84a3a6 100644 --- a/linguistic/source/spelldsp.cxx +++ b/linguistic/source/spelldsp.cxx @@ -858,7 +858,6 @@ void SpellCheckerDispatcher::setCharClass(const LanguageTag& rLanguageTag) } - OUString SAL_CALL SpellCheckerDispatcher::makeLowerCase(const OUString& aTerm, CharClass * pCC) { if (pCC) diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx index ffe86417b947..bb62a5a059d4 100644 --- a/linguistic/source/spelldta.cxx +++ b/linguistic/source/spelldta.cxx @@ -176,7 +176,6 @@ Sequence< OUString > MergeProposalSeqs( } - SpellAlternatives::SpellAlternatives() { nLanguage = LANGUAGE_NONE; diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx index e38a30f35860..3e81ed8e9fd8 100644 --- a/linguistic/source/thesdsp.cxx +++ b/linguistic/source/thesdsp.cxx @@ -39,7 +39,6 @@ using namespace com::sun::star::linguistic2; using namespace linguistic; - static bool SvcListHasLanguage( const Sequence< Reference< XThesaurus > > &rRefs, const Locale &rLocale ) @@ -58,7 +57,6 @@ static bool SvcListHasLanguage( } - ThesaurusDispatcher::ThesaurusDispatcher() { } diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx index 37c17b0f30e3..cf75d4994ed1 100644 --- a/linguistic/source/thesdsp.hxx +++ b/linguistic/source/thesdsp.hxx @@ -43,7 +43,6 @@ #include "lngopt.hxx" - class ThesaurusDispatcher : public cppu::WeakImplHelper< css::linguistic2::XThesaurus >, public LinguDispatcher @@ -99,7 +98,6 @@ inline css::uno::Reference< css::linguistic2::XLinguProperties > } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit