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 --- dbaccess/source/core/api/RowSet.hxx | 1 - dbaccess/source/core/api/RowSetCache.cxx | 1 - dbaccess/source/core/api/querycomposer.cxx | 1 - dbaccess/source/core/dataaccess/bookmarkcontainer.cxx | 1 - dbaccess/source/core/dataaccess/intercept.cxx | 2 -- dbaccess/source/core/inc/querycomposer.hxx | 1 - dbaccess/source/core/misc/dsntypes.cxx | 1 - dbaccess/source/ui/dlg/adodatalinks.cxx | 1 - dbaccess/source/ui/inc/JoinDesignView.hxx | 1 - dbaccess/source/ui/inc/RelationDesignView.hxx | 1 - dbaccess/source/ui/inc/TableWindowListBox.hxx | 2 -- dbaccess/source/ui/inc/dbexchange.hxx | 5 ----- dbaccess/source/ui/inc/dlgsave.hxx | 1 - dbaccess/source/ui/querydesign/querydlg.hxx | 1 - dbaccess/source/ui/tabledesign/FieldDescriptions.cxx | 1 - 15 files changed, 21 deletions(-) (limited to 'dbaccess/source') diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx index 4bc14a83e252..e06bcb62a089 100644 --- a/dbaccess/source/core/api/RowSet.hxx +++ b/dbaccess/source/core/api/RowSet.hxx @@ -441,7 +441,6 @@ namespace dbaccess }; - // ORowSetClone class ORowSetClone : public comphelper::OBaseMutex diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index ca288c4cd3cd..81316864ea04 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -692,7 +692,6 @@ bool ORowSetCache::next( ) } - bool ORowSetCache::isFirst( ) { return m_nPosition == 1; // ask resultset for diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx index 6a6a7f8ab605..c328f3a07f96 100644 --- a/dbaccess/source/core/api/querycomposer.cxx +++ b/dbaccess/source/core/api/querycomposer.cxx @@ -62,7 +62,6 @@ using namespace ::osl; using namespace ::utl; - OQueryComposer::OQueryComposer(const Reference< XConnection>& _xConnection) : OSubComponent(m_aMutex,_xConnection) { diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx index 173ed8866437..87d423798fa1 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx @@ -53,7 +53,6 @@ OBookmarkContainer::OBookmarkContainer(OWeakObject& _rParent, Mutex& _rMutex) } - void SAL_CALL OBookmarkContainer::acquire( ) throw() { m_rParent.acquire(); diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index ef3713e143dd..c7d27fa1ec98 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -74,7 +74,6 @@ void SAL_CALL OInterceptor::dispose() } - OInterceptor::OInterceptor( ODocumentDefinition* _pContentHolder ) :m_pContentHolder( _pContentHolder ) ,m_aInterceptedURL(7) @@ -349,7 +348,6 @@ Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches( cons } - //XDispatchProviderInterceptor Reference< XDispatchProvider > SAL_CALL OInterceptor::getSlaveDispatchProvider( ) throw ( RuntimeException, std::exception ) diff --git a/dbaccess/source/core/inc/querycomposer.hxx b/dbaccess/source/core/inc/querycomposer.hxx index 8d1d38783a38..9d7f688b637c 100644 --- a/dbaccess/source/core/inc/querycomposer.hxx +++ b/dbaccess/source/core/inc/querycomposer.hxx @@ -34,7 +34,6 @@ #include - namespace dbaccess { typedef ::cppu::ImplHelper5< css::sdb::XSQLQueryComposer, diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx index 9f8550e631e0..40a511ae7214 100644 --- a/dbaccess/source/core/misc/dsntypes.cxx +++ b/dbaccess/source/core/misc/dsntypes.cxx @@ -315,7 +315,6 @@ OUString ODsnTypeCollection::getEmbeddedDatabase() const } - DATASOURCE_TYPE ODsnTypeCollection::determineType(const OUString& _rDsn) const { OUString sDsn(comphelper::string::stripEnd(_rDsn, '*')); diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx index e30fbd493870..5ce581ba1e3a 100644 --- a/dbaccess/source/ui/dlg/adodatalinks.cxx +++ b/dbaccess/source/ui/dlg/adodatalinks.cxx @@ -18,7 +18,6 @@ */ - #if defined(WNT) #if defined _MSC_VER #pragma warning(push, 1) diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx index a89fbf432150..fea1c67a7b43 100644 --- a/dbaccess/source/ui/inc/JoinDesignView.hxx +++ b/dbaccess/source/ui/inc/JoinDesignView.hxx @@ -68,5 +68,4 @@ namespace dbaui #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_JOINDESIGNVIEW_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/RelationDesignView.hxx b/dbaccess/source/ui/inc/RelationDesignView.hxx index a3898ec52112..ae498b119c6f 100644 --- a/dbaccess/source/ui/inc/RelationDesignView.hxx +++ b/dbaccess/source/ui/inc/RelationDesignView.hxx @@ -47,5 +47,4 @@ namespace dbaui #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONDESIGNVIEW_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx index 5a3ce03125b0..f921e7e6cd90 100644 --- a/dbaccess/source/ui/inc/TableWindowListBox.hxx +++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx @@ -74,7 +74,6 @@ namespace dbaui virtual void dragFinished( ) override; - public: OTableWindowListBox(OTableWindow* pParent); virtual ~OTableWindowListBox(); @@ -98,5 +97,4 @@ namespace dbaui #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWLISTBOX_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx index e8190d660e1d..b79d9c7e38e1 100644 --- a/dbaccess/source/ui/inc/dbexchange.hxx +++ b/dbaccess/source/ui/inc/dbexchange.hxx @@ -86,9 +86,4 @@ namespace dbaui #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_DBEXCHANGE_HXX - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx index 5ae14cdf8aa5..07d44c8393f0 100644 --- a/dbaccess/source/ui/inc/dlgsave.hxx +++ b/dbaccess/source/ui/inc/dlgsave.hxx @@ -83,5 +83,4 @@ namespace dbaui #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_DLGSAVE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx index 9b804323e7f8..92136919ad99 100644 --- a/dbaccess/source/ui/querydesign/querydlg.hxx +++ b/dbaccess/source/ui/querydesign/querydlg.hxx @@ -86,5 +86,4 @@ namespace dbaui #endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYDLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx index 69c6fb40fad9..9763f639f2b3 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx @@ -597,7 +597,6 @@ bool OFieldDescription::IsAutoIncrement() const } - bool OFieldDescription::IsNullable() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_ISNULLABLE) ) -- cgit