diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 18:16:42 +1100 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-12 22:06:25 -0400 |
commit | 8dcf22abfc6a07ececcef6bb830fdea825d416ec (patch) | |
tree | 7e0b3686991aef9689218ed309f462987f36e273 /formula | |
parent | b91e39cf1b2d0c4201993d768a1b2c686eeff0de (diff) |
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
Reviewed-on: https://gerrit.libreoffice.org/22224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
(cherry picked from commit a238b1f8d304bf1e2ffb357937f3ec888ee8ac89)
Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c
Diffstat (limited to 'formula')
-rw-r--r-- | formula/source/core/api/token.cxx | 3 | ||||
-rw-r--r-- | formula/source/core/inc/core_resource.hxx | 1 | ||||
-rw-r--r-- | formula/source/ui/dlg/ControlHelper.hxx | 1 | ||||
-rw-r--r-- | formula/source/ui/dlg/FormulaHelper.cxx | 5 | ||||
-rw-r--r-- | formula/source/ui/dlg/formula.cxx | 5 | ||||
-rw-r--r-- | formula/source/ui/dlg/funcpage.hxx | 1 | ||||
-rw-r--r-- | formula/source/ui/dlg/parawin.cxx | 2 | ||||
-rw-r--r-- | formula/source/ui/dlg/parawin.hxx | 1 | ||||
-rw-r--r-- | formula/source/ui/dlg/structpg.hxx | 3 |
9 files changed, 0 insertions, 22 deletions
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index ca9928fb748b..b6c0d74b4391 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -336,7 +336,6 @@ bool FormulaToken::TextEqual( const FormulaToken& rToken ) const // real implementations of virtual functions - sal_uInt8 FormulaByteToken::GetByte() const { return nByte; } void FormulaByteToken::SetByte( sal_uInt8 n ) { nByte = n; } bool FormulaByteToken::IsInForceArray() const { return bIsInForceArray; } @@ -1013,7 +1012,6 @@ FormulaToken* FormulaTokenArray::AddStringXML( const OUString& rStr ) } - void FormulaTokenArray::AddRecalcMode( ScRecalcMode nBits ) { //! Order is important. @@ -1714,7 +1712,6 @@ bool FormulaTokenIterator::IsEndOfPath() const } - // real implementations of virtual functions diff --git a/formula/source/core/inc/core_resource.hxx b/formula/source/core/inc/core_resource.hxx index 51989f2170e5..fbd6aa389657 100644 --- a/formula/source/core/inc/core_resource.hxx +++ b/formula/source/core/inc/core_resource.hxx @@ -67,7 +67,6 @@ namespace formula }; - } // formula diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx index 62bcfeb43300..0057a3afde2e 100644 --- a/formula/source/ui/dlg/ControlHelper.hxx +++ b/formula/source/ui/dlg/ControlHelper.hxx @@ -81,7 +81,6 @@ private: }; - // class ArgInput class ArgInput diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx index 1e296f710709..d074de9a3bc6 100644 --- a/formula/source/ui/dlg/FormulaHelper.cxx +++ b/formula/source/ui/dlg/FormulaHelper.cxx @@ -123,7 +123,6 @@ bool FormulaHelper::GetNextFunc( const OUString& rFormula, } - void FormulaHelper::FillArgStrings( const OUString& rFormula, sal_Int32 nFuncPos, sal_uInt16 nArgs, @@ -163,7 +162,6 @@ void FormulaHelper::FillArgStrings( const OUString& rFormula, } - void FormulaHelper::GetArgStrings( ::std::vector< OUString >& _rArgs, const OUString& rFormula, sal_Int32 nFuncPos, @@ -176,7 +174,6 @@ void FormulaHelper::GetArgStrings( ::std::vector< OUString >& _rArgs, } - inline bool IsFormulaText( const CharClass* _pCharClass,const OUString& rStr, sal_Int32 nPos ) { if( _pCharClass->isLetterNumeric( rStr, nPos ) ) @@ -283,7 +280,6 @@ sal_Int32 FormulaHelper::GetFunctionStart( const OUString& rFormula, } - sal_Int32 FormulaHelper::GetFunctionEnd( const OUString& rStr, sal_Int32 nStart ) const { sal_Int32 nStrLen = rStr.getLength(); @@ -341,7 +337,6 @@ sal_Int32 FormulaHelper::GetFunctionEnd( const OUString& rStr, sal_Int32 nStart } - sal_Int32 FormulaHelper::GetArgStart( const OUString& rStr, sal_Int32 nStart, sal_uInt16 nArg ) const { sal_Int32 nStrLen = rStr.getLength(); diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 5ae6e48825cc..f8229a1c45e6 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -1071,13 +1071,9 @@ IMPL_LINK_TYPED( FormulaDlg_Impl, BtnHdl, Button*, pBtn, void ) } - - // Functions for 1. Page - - // Handler for Listboxes IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, DblClkHdl, FuncPage&, void) @@ -1111,7 +1107,6 @@ IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, DblClkHdl, FuncPage&, void) } - // Functions for right Page void FormulaDlg_Impl::SetData(sal_Int32 nFStart, sal_Int32 nNextFStart, sal_Int32 nNextFEnd, sal_Int32& PrivStart, sal_Int32& PrivEnd) diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index 05ab42c6d4b6..c6eaea1f818a 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -54,7 +54,6 @@ public: }; - typedef const IFunctionDescription* TFunctionDesc; class FuncPage : public TabPage diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index ed9aa3ef3d27..ce3d9970125e 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -594,7 +594,6 @@ IMPL_LINK_TYPED( ParaWin, GetFxFocusHdl, ArgInput&, rPtr, void ) } - IMPL_LINK_TYPED( ParaWin, GetEdFocusHdl, ArgInput&, rPtr, void ) { sal_uInt16 nOffset = GetSliderPos(); @@ -656,7 +655,6 @@ IMPL_LINK_TYPED( ParaWin, ModifyHdl, ArgInput&, rPtr, void ) } - } // formula /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx index 4c6ec6e38bb2..f21eef3c9eef 100644 --- a/formula/source/ui/dlg/parawin.hxx +++ b/formula/source/ui/dlg/parawin.hxx @@ -152,7 +152,6 @@ public: }; - } // formula #endif // INCLUDED_FORMULA_SOURCE_UI_DLG_PARAWIN_HXX diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx index c2a66906179e..e88ec26a4010 100644 --- a/formula/source/ui/dlg/structpg.hxx +++ b/formula/source/ui/dlg/structpg.hxx @@ -31,8 +31,6 @@ #include "formula/omoduleclient.hxx" - - namespace formula { @@ -65,7 +63,6 @@ public: }; - class StructPage : public TabPage { private: |