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 --- embedserv/source/embed/docholder.cxx | 3 --- embedserv/source/embed/ed_ioleobject.cxx | 1 - embedserv/source/embed/ed_ipersiststr.cxx | 3 --- embedserv/source/embed/iipaobj.cxx | 1 - embedserv/source/embed/intercept.cxx | 4 ---- embedserv/source/embed/servprov.cxx | 1 - embedserv/source/embed/syswinwrapper.cxx | 9 --------- embedserv/source/embed/tracker.cxx | 3 --- embedserv/source/inc/intercept.hxx | 1 - embedserv/source/inc/syswinwrapper.hxx | 2 -- embedserv/source/inprocserv/dllentry.cxx | 4 ---- embedserv/source/inprocserv/inprocembobj.cxx | 2 -- 12 files changed, 34 deletions(-) (limited to 'embedserv') diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index c95f46ef4d61..aa96aa009111 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -193,7 +193,6 @@ void DocumentHolder::OnPosRectChanged(LPRECT lpRect) const } - void DocumentHolder::DisableInplaceActivation(BOOL b) { m_bAllowInPlace = ! b; @@ -1268,7 +1267,6 @@ css::uno::Reference< css::awt::XWindow> SAL_CALL DocumentHolder::getContainerWin } - sal_Bool SAL_CALL DocumentHolder::requestDockingAreaSpace( const css::awt::Rectangle& RequestedSpace ) throw( css::uno::RuntimeException @@ -1409,7 +1407,6 @@ DocumentHolder::notifyTermination( } - void SAL_CALL DocumentHolder::modified( const lang::EventObject& /*aEvent*/ ) throw (uno::RuntimeException) { diff --git a/embedserv/source/embed/ed_ioleobject.cxx b/embedserv/source/embed/ed_ioleobject.cxx index 778522778ccb..986d6fdef991 100644 --- a/embedserv/source/embed/ed_ioleobject.cxx +++ b/embedserv/source/embed/ed_ioleobject.cxx @@ -244,7 +244,6 @@ STDMETHODIMP EmbedDocument_Impl::DoVerb( } - STDMETHODIMP EmbedDocument_Impl::EnumVerbs( IEnumOLEVERB ** /*ppEnumOleVerb*/ ) { return OLE_S_USEREG; diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx index 64513b4f8c52..eae7ae0f555e 100644 --- a/embedserv/source/embed/ed_ipersiststr.cxx +++ b/embedserv/source/embed/ed_ipersiststr.cxx @@ -163,7 +163,6 @@ HRESULT copyXTempOutToIStream( uno::Reference< io::XOutputStream > xTempOut, ISt } - // EmbedDocument_Impl @@ -921,7 +920,6 @@ STDMETHODIMP EmbedDocument_Impl::GetCurFile( LPOLESTR *ppszFileName ) } - LockedEmbedDocument_Impl EmbeddedDocumentInstanceAccess_Impl::GetEmbedDocument() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -935,7 +933,6 @@ void EmbeddedDocumentInstanceAccess_Impl::ClearEmbedDocument() } - LockedEmbedDocument_Impl::LockedEmbedDocument_Impl() : m_pEmbedDocument( NULL ) {} diff --git a/embedserv/source/embed/iipaobj.cxx b/embedserv/source/embed/iipaobj.cxx index 43ecad4c0204..081a6c301eb9 100644 --- a/embedserv/source/embed/iipaobj.cxx +++ b/embedserv/source/embed/iipaobj.cxx @@ -21,7 +21,6 @@ #include "embeddoc.hxx" - CIIAObj::CIIAObj(DocumentHolder* pDocHolder) : m_refCount( 0L ), m_rDocHolder( pDocHolder ) diff --git a/embedserv/source/embed/intercept.cxx b/embedserv/source/embed/intercept.cxx index bd4d288fc6f5..2f412d338db2 100644 --- a/embedserv/source/embed/intercept.cxx +++ b/embedserv/source/embed/intercept.cxx @@ -26,11 +26,9 @@ using namespace ::com::sun::star; - #define IUL 6 - uno::Sequence< OUString > Interceptor::m_aInterceptedURL(IUL); class StatusChangeListenerContainer @@ -90,7 +88,6 @@ void SAL_CALL Interceptor::dispose() } - Interceptor::Interceptor( const ::rtl::Reference< EmbeddedDocumentInstanceAccess_Impl >& xOleAccess, DocumentHolder* pDocH, @@ -477,7 +474,6 @@ Interceptor::queryDispatches( } - //XDispatchProviderInterceptor uno::Reference< frame::XDispatchProvider > SAL_CALL diff --git a/embedserv/source/embed/servprov.cxx b/embedserv/source/embed/servprov.cxx index 113209448672..209163d1dad2 100644 --- a/embedserv/source/embed/servprov.cxx +++ b/embedserv/source/embed/servprov.cxx @@ -98,7 +98,6 @@ void o2u_attachCurrentThread() } - // EmbedServer_Impl EmbedServer_Impl::EmbedServer_Impl( const uno::Reference& xFactory): diff --git a/embedserv/source/embed/syswinwrapper.cxx b/embedserv/source/embed/syswinwrapper.cxx index a71b9ef2249d..e079d6c73344 100644 --- a/embedserv/source/embed/syswinwrapper.cxx +++ b/embedserv/source/embed/syswinwrapper.cxx @@ -48,7 +48,6 @@ typedef CHatchWin *PCHatchWin; void DrawShading(LPRECT prc, HDC hDC, UINT cWidth); - winwrap::CWindow::CWindow(HINSTANCE hInst) { m_hInst=hInst; @@ -65,7 +64,6 @@ winwrap::CWindow::~CWindow() } - /* * CWindow::Window * @@ -82,7 +80,6 @@ HWND winwrap::CWindow::Window() } - /* * CWindow::Instance * @@ -131,8 +128,6 @@ BOOL winwrap::HatchWindowRegister(HINSTANCE hInst) } - - /* * CHatchWin:CHatchWin * CHatchWin::~CHatchWin @@ -176,7 +171,6 @@ CHatchWin::~CHatchWin() } - /* * CHatchWin::Init * @@ -305,7 +299,6 @@ void CHatchWin::RectsSet(LPRECT prcPos, LPRECT prcClip) } - /* * CHatchWin::ChildSet * @@ -335,7 +328,6 @@ void CHatchWin::ChildSet(HWND hWndKid) } - /* * CHatchWin::ShowHatch * @@ -367,7 +359,6 @@ void CHatchWin::ShowHatch(BOOL fHatch) } - /* * HatchWndProc * diff --git a/embedserv/source/embed/tracker.cxx b/embedserv/source/embed/tracker.cxx index d40e69a29174..a202e94cc041 100644 --- a/embedserv/source/embed/tracker.cxx +++ b/embedserv/source/embed/tracker.cxx @@ -94,7 +94,6 @@ HBRUSH HalftoneBrush() } - void DrawDragRect( HDC hDC,LPRECT lpRect,SIZE size, LPRECT lpRectLast,SIZE sizeLast, @@ -328,7 +327,6 @@ BOOL Tracker::SetCursor(HWND pWnd, UINT nHitTest) const } - BOOL Tracker::Track(HWND hWnd,POINT point,BOOL bAllowInvert, HWND hWndClipTo) { @@ -781,7 +779,6 @@ int Tracker::HitTestHandles(POINT point) const } - void Tracker::GetModifyPointers( int nHandle, int** ppx, int** ppy, int* px, int* py) { diff --git a/embedserv/source/inc/intercept.hxx b/embedserv/source/inc/intercept.hxx index 5470eb4a2d0d..3dc08c790efa 100644 --- a/embedserv/source/inc/intercept.hxx +++ b/embedserv/source/inc/intercept.hxx @@ -71,7 +71,6 @@ public: dispose() throw(css::uno::RuntimeException); - //XDispatch virtual void SAL_CALL dispatch( diff --git a/embedserv/source/inc/syswinwrapper.hxx b/embedserv/source/inc/syswinwrapper.hxx index 9814248e5d55..52bf7d03d19c 100644 --- a/embedserv/source/inc/syswinwrapper.hxx +++ b/embedserv/source/inc/syswinwrapper.hxx @@ -60,7 +60,6 @@ namespace winwrap { }; - class Tracker { public: // Constructors @@ -130,7 +129,6 @@ protected: }; - //Width of the border #define HATCHWIN_BORDERWIDTHDEFAULT 4 diff --git a/embedserv/source/inprocserv/dllentry.cxx b/embedserv/source/inprocserv/dllentry.cxx index b7086068a3a0..4c7baf0afbb8 100644 --- a/embedserv/source/inprocserv/dllentry.cxx +++ b/embedserv/source/inprocserv/dllentry.cxx @@ -160,11 +160,9 @@ protected: }; // namespace inprocserv - // Entry points - extern "C" INPROC_DLLPUBLIC BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/ ) { if (dwReason == DLL_PROCESS_ATTACH) @@ -239,7 +237,6 @@ namespace inprocserv // InprocCountedObject_Impl implementation - InprocCountedObject_Impl::InprocCountedObject_Impl() { g_nObj++; @@ -255,7 +252,6 @@ InprocCountedObject_Impl::~InprocCountedObject_Impl() // InprocEmbedProvider_Impl implementation - InprocEmbedProvider_Impl::InprocEmbedProvider_Impl( const GUID& guid ) : m_refCount( 0 ) , m_guid( guid ) diff --git a/embedserv/source/inprocserv/inprocembobj.cxx b/embedserv/source/inprocserv/inprocembobj.cxx index 70db0c218ee9..c2fc1dc71947 100644 --- a/embedserv/source/inprocserv/inprocembobj.cxx +++ b/embedserv/source/inprocserv/inprocembobj.cxx @@ -1507,7 +1507,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetExtent( DWORD dwDrawAspect, LONG linde } - // IOleWindow methods STDMETHODIMP InprocEmbedDocument_Impl::GetWindow( HWND *phwnd ) @@ -1674,7 +1673,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::Invoke( DISPID dispIdMember, REFIID riid, } - // InternalCacheWrapper -- cgit