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 /sw | |
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 'sw')
20 files changed, 0 insertions, 43 deletions
diff --git a/sw/inc/ToxWhitespaceStripper.hxx b/sw/inc/ToxWhitespaceStripper.hxx index dc3e741bf95a..db27fec04a2c 100644 --- a/sw/inc/ToxWhitespaceStripper.hxx +++ b/sw/inc/ToxWhitespaceStripper.hxx @@ -49,5 +49,4 @@ private: } // end namespace sw - #endif /* TOXWHITESPACESTRIPPER_HXX_ */ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 1eae331bd7c2..7e693894ce9b 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -154,7 +154,6 @@ DECLARE_OOXMLEXPORT_TEST(testfdo80897 , "fdo80897.docx") } - DECLARE_OOXMLEXPORT_TEST(testFdo80997, "fdo80997.docx") { // The problem was that the DOCX exporter not able to export text behind textbox, if textbox has a wrap property. diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx index 759ccf1327e6..59c0668fadeb 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx @@ -385,9 +385,6 @@ DECLARE_OOXMLEXPORT_TEST(testFdo71302, "fdo71302.docx") } - - - DECLARE_OOXMLEXPORT_TEST(testSmartart, "smartart.docx") { uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY); diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx index 5b885a6c3a1a..c36ae2a52c73 100644 --- a/sw/source/core/SwNumberTree/SwNodeNum.cxx +++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx @@ -44,7 +44,6 @@ SwNodeNum::~SwNodeNum() } - void SwNodeNum::ChangeNumRule( SwNumRule& rNumRule ) { OSL_ENSURE( GetNumRule() && GetTextNode(), diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx b/sw/source/core/doc/DocumentDrawModelManager.cxx index ecebc1302262..b889b8c575d5 100644 --- a/sw/source/core/doc/DocumentDrawModelManager.cxx +++ b/sw/source/core/doc/DocumentDrawModelManager.cxx @@ -204,9 +204,6 @@ void DocumentDrawModelManager::ReleaseDrawModel() } - - - const SwDrawModel* DocumentDrawModelManager::GetDrawModel() const { return mpDrawModel; diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx index a249f2c82bbf..27dba28b24b5 100644 --- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx +++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx @@ -561,7 +561,6 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr, } - } diff --git a/sw/source/core/doc/DocumentListsManager.cxx b/sw/source/core/doc/DocumentListsManager.cxx index 5285c8768691..d2b86ae45154 100644 --- a/sw/source/core/doc/DocumentListsManager.cxx +++ b/sw/source/core/doc/DocumentListsManager.cxx @@ -192,8 +192,6 @@ void DocumentListsManager::trackChangeOfListStyleName( const OUString& sListStyl } - - DocumentListsManager::~DocumentListsManager() { for ( std::unordered_map< OUString, SwList*, OUStringHash >::iterator diff --git a/sw/source/core/doc/DocumentStateManager.cxx b/sw/source/core/doc/DocumentStateManager.cxx index ec6286afcea5..80869a6a68ad 100644 --- a/sw/source/core/doc/DocumentStateManager.cxx +++ b/sw/source/core/doc/DocumentStateManager.cxx @@ -108,8 +108,4 @@ void DocumentStateManager::SetLoaded(bool b) } - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/doc/DocumentTimerManager.cxx b/sw/source/core/doc/DocumentTimerManager.cxx index 18e649a0e359..2840e9b381f9 100644 --- a/sw/source/core/doc/DocumentTimerManager.cxx +++ b/sw/source/core/doc/DocumentTimerManager.cxx @@ -172,5 +172,4 @@ DocumentTimerManager::~DocumentTimerManager() {} } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/doc/list.cxx b/sw/source/core/doc/list.cxx index 4d0bac68f47b..4976f07ca99e 100644 --- a/sw/source/core/doc/list.cxx +++ b/sw/source/core/doc/list.cxx @@ -110,7 +110,6 @@ SwListImpl::~SwListImpl() } - void SwListImpl::InsertListItem( SwNodeNum& rNodeNum, const int nLevel ) { diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx index 61c64da53c9d..31d3f80317eb 100644 --- a/sw/source/core/docnode/ndcopy.cxx +++ b/sw/source/core/docnode/ndcopy.cxx @@ -38,7 +38,6 @@ #endif - // Structure for the mapping from old and new frame formats to the // boxes and lines of a table struct _MapTableFrameFormat diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index cd54815d2ea0..cd3f5674c200 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -1720,7 +1720,6 @@ void SwPostItField::SetName(const OUString& rName) } - void SwPostItField::SetTextObject( OutlinerParaObject* pText ) { delete mpText; diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index 973ad932586b..572ca7f2630c 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -1146,7 +1146,6 @@ void SwInputField::SetFormatField( SwFormatField& rFormatField ) } - void SwInputField::LockNotifyContentChange() { if ( GetFormatField() != nullptr ) diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx index ee31b1bb0f05..5d16e5fcb823 100644 --- a/sw/source/core/fields/flddropdown.cxx +++ b/sw/source/core/fields/flddropdown.cxx @@ -125,9 +125,6 @@ uno::Sequence<OUString> SwDropDownField::GetItemSequence() const } - - - bool SwDropDownField::SetSelectedItem(const OUString & rItem) { vector<OUString>::const_iterator aIt = diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx index ff0df5e38a84..07a0fb71dab9 100644 --- a/sw/source/core/layout/anchoredobject.cxx +++ b/sw/source/core/layout/anchoredobject.cxx @@ -112,9 +112,6 @@ void SwAnchoredObject::SetDrawObj( SdrObject& _rDrawObj ) } - - - void SwAnchoredObject::ChgAnchorFrame( SwFrame* _pNewAnchorFrame ) { mpAnchorFrame = _pNewAnchorFrame; @@ -145,7 +142,6 @@ SwFrame* SwAnchoredObject::GetAnchorFrameContainingAnchPos() } - void SwAnchoredObject::SetPageFrame( SwPageFrame* _pNewPageFrame ) { if ( mpPageFrame != _pNewPageFrame ) diff --git a/sw/source/core/txtnode/txtatr2.cxx b/sw/source/core/txtnode/txtatr2.cxx index 450444911fe1..4bebebc673cb 100644 --- a/sw/source/core/txtnode/txtatr2.cxx +++ b/sw/source/core/txtnode/txtatr2.cxx @@ -36,7 +36,6 @@ #include <IDocumentStylePoolAccess.hxx> - SwTextCharFormat::SwTextCharFormat( SwFormatCharFormat& rAttr, sal_Int32 nStt, sal_Int32 nEnde ) : SwTextAttr( rAttr, nStt ) diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index 2b1827560566..dc870e8ee757 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -1640,7 +1640,6 @@ struct SwXParaFrameEnumerationImpl final : public SwXParaFrameEnumeration }; - SwXParaFrameEnumeration* SwXParaFrameEnumeration::Create(const SwPaM& rPaM, const enum ParaFrameMode eParaFrameMode, SwFrameFormat* const pFormat) { return new SwXParaFrameEnumerationImpl(rPaM, eParaFrameMode, pFormat); } diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx index c1d2f612f248..6dddab0189a1 100644 --- a/sw/source/filter/basflt/fltshell.cxx +++ b/sw/source/filter/basflt/fltshell.cxx @@ -914,7 +914,6 @@ void SwFltAnchor::SetFrameFormat(SwFrameFormat * _pFrameFormat) } - bool SwFltAnchor::operator==(const SfxPoolItem& rItem) const { return pFrameFormat == static_cast<const SwFltAnchor&>(rItem).pFrameFormat; diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx index 6bb6f54870b5..cfc0fada5d4e 100644 --- a/sw/source/filter/ww8/WW8TableInfo.cxx +++ b/sw/source/filter/ww8/WW8TableInfo.cxx @@ -120,13 +120,6 @@ void WW8TableNodeInfoInner::setRect(const SwRect & rRect) } - - - - - - - const SwNode * WW8TableNodeInfoInner::getNode() const { const SwNode * pResult = nullptr; @@ -352,8 +345,6 @@ RowSpansPtr WW8TableNodeInfoInner::getRowSpansOfRow() } - - #ifdef DBG_UTIL ::std::string WW8TableNodeInfoInner::toString() const { @@ -1472,8 +1463,6 @@ void WW8TableCellGridRow::setRowSpans(RowSpansPtr pRowSpans) } - - CellInfo::CellInfo(const SwRect & aRect, WW8TableNodeInfo * pNodeInfo) : m_aRect(aRect), m_pNodeInfo(pNodeInfo), m_nFormatFrameWidth(0) { diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index bdeb1946833d..454d04a86c05 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -704,7 +704,6 @@ WW8FieldEntry &WW8FieldEntry::operator=(const WW8FieldEntry &rOther) throw() } - void WW8FieldEntry::SetBookmarkName(const OUString& bookmarkName) { msBookmarkName=bookmarkName; |