diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 18:16:42 +1100 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 08:18:05 +0000 |
commit | a238b1f8d304bf1e2ffb357937f3ec888ee8ac89 (patch) | |
tree | 083c0582d4bf80e313ed256ca476ba8f69c7f7a6 /include/toolkit | |
parent | 538f276ae0414ea34ede6090b5f56e8fecd6fc65 (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
Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c
Reviewed-on: https://gerrit.libreoffice.org/22224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'include/toolkit')
29 files changed, 0 insertions, 62 deletions
diff --git a/include/toolkit/awt/animatedimagespeer.hxx b/include/toolkit/awt/animatedimagespeer.hxx index ad7ee08bea82..4acfd46b055d 100644 --- a/include/toolkit/awt/animatedimagespeer.hxx +++ b/include/toolkit/awt/animatedimagespeer.hxx @@ -33,7 +33,6 @@ namespace toolkit { - //= AnimatedImagesPeer struct AnimatedImagesPeer_Data; diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx index f5d65de55874..b6a556b6a2e7 100644 --- a/include/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx @@ -46,7 +46,6 @@ class AccessibleStateSetHelper; } - // class VCLXAccessibleComponent typedef ::cppu::ImplHelper1< diff --git a/include/toolkit/awt/vclxbitmap.hxx b/include/toolkit/awt/vclxbitmap.hxx index 9e5391f0a874..fdbbf3a1fe7e 100644 --- a/include/toolkit/awt/vclxbitmap.hxx +++ b/include/toolkit/awt/vclxbitmap.hxx @@ -29,7 +29,6 @@ #include <vcl/bitmapex.hxx> - // class VCLXBitmap @@ -73,8 +72,6 @@ public: }; - - #endif // INCLUDED_TOOLKIT_AWT_VCLXBITMAP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxcontainer.hxx b/include/toolkit/awt/vclxcontainer.hxx index 7cafa4ac9764..2ba61b179674 100644 --- a/include/toolkit/awt/vclxcontainer.hxx +++ b/include/toolkit/awt/vclxcontainer.hxx @@ -30,7 +30,6 @@ #include <toolkit/awt/vclxwindow.hxx> - // class VCLXContainer @@ -69,8 +68,6 @@ public: }; - - #endif // INCLUDED_TOOLKIT_AWT_VCLXCONTAINER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx index 4d54ec521c59..e216f2df4468 100644 --- a/include/toolkit/awt/vclxdevice.hxx +++ b/include/toolkit/awt/vclxdevice.hxx @@ -108,8 +108,6 @@ public: }; - - #endif // INCLUDED_TOOLKIT_AWT_VCLXDEVICE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx index c65684682bff..85b00d1cad4d 100644 --- a/include/toolkit/awt/vclxfont.hxx +++ b/include/toolkit/awt/vclxfont.hxx @@ -83,7 +83,6 @@ public: }; - #endif // INCLUDED_TOOLKIT_AWT_VCLXFONT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxpointer.hxx b/include/toolkit/awt/vclxpointer.hxx index 18c41f89ad30..145d3bc7f99f 100644 --- a/include/toolkit/awt/vclxpointer.hxx +++ b/include/toolkit/awt/vclxpointer.hxx @@ -69,8 +69,6 @@ public: }; - - #endif // INCLUDED_TOOLKIT_AWT_VCLXPOINTER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxregion.hxx b/include/toolkit/awt/vclxregion.hxx index 727baebd0c75..6225b258a18f 100644 --- a/include/toolkit/awt/vclxregion.hxx +++ b/include/toolkit/awt/vclxregion.hxx @@ -82,7 +82,6 @@ public: }; - #endif // INCLUDED_TOOLKIT_AWT_VCLXREGION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxspinbutton.hxx b/include/toolkit/awt/vclxspinbutton.hxx index d7114a175b2c..6d932925075f 100644 --- a/include/toolkit/awt/vclxspinbutton.hxx +++ b/include/toolkit/awt/vclxspinbutton.hxx @@ -30,7 +30,6 @@ namespace toolkit { - //= VCLXSpinButton typedef ::cppu::ImplHelper1 < css::awt::XSpinValue diff --git a/include/toolkit/awt/vclxsystemdependentwindow.hxx b/include/toolkit/awt/vclxsystemdependentwindow.hxx index 29840ffb5458..684136cf5f5e 100644 --- a/include/toolkit/awt/vclxsystemdependentwindow.hxx +++ b/include/toolkit/awt/vclxsystemdependentwindow.hxx @@ -53,8 +53,6 @@ public: }; - - #endif // INCLUDED_TOOLKIT_AWT_VCLXSYSTEMDEPENDENTWINDOW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx index 1c0b6af7fb9b..5a65a949b11a 100644 --- a/include/toolkit/awt/vclxtopwindow.hxx +++ b/include/toolkit/awt/vclxtopwindow.hxx @@ -106,8 +106,6 @@ public: }; - - #endif // INCLUDED_TOOLKIT_AWT_VCLXTOPWINDOW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index de95b539a122..f065f4788070 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -108,7 +108,6 @@ class VclMenuEvent; // deriving from VCLXWindow, drawing the graphic which exists as "Graphic" at the model - class TOOLKIT_DLLPUBLIC VCLXGraphicControl : public VCLXWindow { private: @@ -401,8 +400,6 @@ public: }; - - // class VCLXDialog class TOOLKIT_DLLPUBLIC VCLXDialog : public css::awt::XDialog2, diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx index 286be0861491..e7ab21bc16fd 100644 --- a/include/toolkit/controls/accessiblecontrolcontext.hxx +++ b/include/toolkit/controls/accessiblecontrolcontext.hxx @@ -34,7 +34,6 @@ namespace toolkit { - //= OAccessibleControlContext diff --git a/include/toolkit/controls/formattedcontrol.hxx b/include/toolkit/controls/formattedcontrol.hxx index bbf694baed73..f6ef3585ea45 100644 --- a/include/toolkit/controls/formattedcontrol.hxx +++ b/include/toolkit/controls/formattedcontrol.hxx @@ -31,7 +31,6 @@ namespace toolkit { - // = UnoControlFormattedFieldModel class UnoControlFormattedFieldModel : public UnoControlModel diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx index e858e0722b04..549e7e12cbdc 100644 --- a/include/toolkit/controls/geometrycontrolmodel.hxx +++ b/include/toolkit/controls/geometrycontrolmodel.hxx @@ -50,7 +50,6 @@ namespace com { namespace sun { namespace star { // { - //= OGeometryControlModel_Base typedef ::cppu::WeakAggComponentImplHelper2 < css::util::XCloneable diff --git a/include/toolkit/controls/roadmapcontrol.hxx b/include/toolkit/controls/roadmapcontrol.hxx index 5efc1f354c75..e7eedd0096bc 100644 --- a/include/toolkit/controls/roadmapcontrol.hxx +++ b/include/toolkit/controls/roadmapcontrol.hxx @@ -53,7 +53,6 @@ namespace toolkit > UnoControlRoadmapModel_IBase; - typedef UnoControlBase UnoControlRoadmap_Base; typedef ::cppu::ImplHelper4 < css::awt::XItemEventBroadcaster , css::container::XContainerListener @@ -62,13 +61,10 @@ namespace toolkit > UnoControlRoadmap_IBase; - - typedef ::cppu::ImplHelper2< css::container::XContainerListener, css::awt::XItemEventBroadcaster> SVTXRoadmap_Base; - // = UnoControlRoadmapModel class UnoControlRoadmapModel : public UnoControlRoadmapModel_Base, @@ -147,7 +143,6 @@ namespace toolkit }; - // = UnoRoadmapControl class UnoRoadmapControl : public UnoControlRoadmap_Base, @@ -194,8 +189,6 @@ namespace toolkit } // toolkit - - #endif // _ INCLUDED_TOOLKIT_CONTROLS_ROADMAPCONTROL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/stdtabcontroller.hxx b/include/toolkit/controls/stdtabcontroller.hxx index 540ef9ca76b1..d915fc723941 100644 --- a/include/toolkit/controls/stdtabcontroller.hxx +++ b/include/toolkit/controls/stdtabcontroller.hxx @@ -88,7 +88,6 @@ public: }; - #endif // _TOOLKIT_AWT_STDTABCONTROLLER_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/stdtabcontrollermodel.hxx b/include/toolkit/controls/stdtabcontrollermodel.hxx index bcace97f0ce3..92d54dbc4386 100644 --- a/include/toolkit/controls/stdtabcontrollermodel.hxx +++ b/include/toolkit/controls/stdtabcontrollermodel.hxx @@ -139,7 +139,6 @@ public: }; - #endif // _TOOLKIT_HELPER_STDTABCONTROLLERMODEL_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/tkscrollbar.hxx b/include/toolkit/controls/tkscrollbar.hxx index cfd29157dd22..7e1f3c6b0cba 100644 --- a/include/toolkit/controls/tkscrollbar.hxx +++ b/include/toolkit/controls/tkscrollbar.hxx @@ -32,7 +32,6 @@ namespace toolkit { - //= UnoControlScrollBarModel class UnoControlScrollBarModel : public UnoControlModel @@ -116,8 +115,6 @@ namespace toolkit }; - - } // namespacetoolkit diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx index a410c722add8..ba9519e5a940 100644 --- a/include/toolkit/controls/unocontrol.hxx +++ b/include/toolkit/controls/unocontrol.hxx @@ -230,8 +230,6 @@ private: }; - - #endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/unocontrolbase.hxx b/include/toolkit/controls/unocontrolbase.hxx index aa15a3e2cdec..9021c97186cf 100644 --- a/include/toolkit/controls/unocontrolbase.hxx +++ b/include/toolkit/controls/unocontrolbase.hxx @@ -62,7 +62,6 @@ protected: }; - #endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLBASE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/unocontrolcontainer.hxx b/include/toolkit/controls/unocontrolcontainer.hxx index b08430984fd9..2c220b01c88e 100644 --- a/include/toolkit/controls/unocontrolcontainer.hxx +++ b/include/toolkit/controls/unocontrolcontainer.hxx @@ -158,7 +158,6 @@ private: }; - #endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLCONTAINER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/unocontrolcontainermodel.hxx b/include/toolkit/controls/unocontrolcontainermodel.hxx index cc7fcbc84d64..46ee1cab2ecc 100644 --- a/include/toolkit/controls/unocontrolcontainermodel.hxx +++ b/include/toolkit/controls/unocontrolcontainermodel.hxx @@ -26,7 +26,6 @@ #include <toolkit/helper/servicenames.hxx> - // class css::awt::UnoControlContainerModel class UnoControlContainerModel : public UnoControlModel @@ -56,7 +55,6 @@ public: }; - #endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLCONTAINERMODEL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx index 220c32aa933d..c81ba5268627 100644 --- a/include/toolkit/controls/unocontrols.hxx +++ b/include/toolkit/controls/unocontrols.hxx @@ -1095,7 +1095,6 @@ public: }; - // class UnoControlDateFieldModel class UnoControlDateFieldModel : public UnoControlModel @@ -1556,7 +1555,6 @@ public: }; - // class UnoControlFixedLineModel class UnoControlFixedLineModel : public UnoControlModel @@ -1605,7 +1603,6 @@ public: }; - #endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/helper/emptyfontdescriptor.hxx b/include/toolkit/helper/emptyfontdescriptor.hxx index 96d5ab54a426..9dc25084cf7c 100644 --- a/include/toolkit/helper/emptyfontdescriptor.hxx +++ b/include/toolkit/helper/emptyfontdescriptor.hxx @@ -42,8 +42,6 @@ public: }; - - #endif // INCLUDED_TOOLKIT_HELPER_EMPTYFONTDESCRIPTOR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/helper/listenermultiplexer.hxx b/include/toolkit/helper/listenermultiplexer.hxx index d1a1e6a11e07..ef1acc37759d 100644 --- a/include/toolkit/helper/listenermultiplexer.hxx +++ b/include/toolkit/helper/listenermultiplexer.hxx @@ -74,7 +74,6 @@ public: }; - // class EventListenerMultiplexer DECL_LISTENERMULTIPLEXER_START( EventListenerMultiplexer, css::lang::XEventListener ) @@ -89,7 +88,6 @@ DECL_LISTENERMULTIPLEXER_START_DLLPUB( FocusListenerMultiplexer, css::awt::XFocu DECL_LISTENERMULTIPLEXER_END - // class WindowListenerMultiplexer DECL_LISTENERMULTIPLEXER_START_DLLPUB( WindowListenerMultiplexer, css::awt::XWindowListener ) @@ -100,8 +98,6 @@ DECL_LISTENERMULTIPLEXER_START_DLLPUB( WindowListenerMultiplexer, css::awt::XWin DECL_LISTENERMULTIPLEXER_END - - // class VclContainerListenerMultiplexer DECL_LISTENERMULTIPLEXER_START( VclContainerListenerMultiplexer, css::awt::XVclContainerListener ) diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx index 20e7c7cbf30a..a3a0e04a8173 100644 --- a/include/toolkit/helper/macros.hxx +++ b/include/toolkit/helper/macros.hxx @@ -70,7 +70,6 @@ css::uno::Sequence< css::uno::Type > ClassName::getTypes() throw(css::uno::Runti cppu::UnoType<css::lang::XTypeProvider>::get(), - #define IMPL_XTYPEPROVIDER_END \ ); \ pCollection = &collection; \ @@ -80,7 +79,6 @@ css::uno::Sequence< css::uno::Type > ClassName::getTypes() throw(css::uno::Runti } - #define DECL_LISTENERMULTIPLEXER_START( ClassName, InterfaceName ) \ class ClassName : public ListenerMultiplexerBase, public InterfaceName \ { \ @@ -92,7 +90,6 @@ public: \ void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; - #define DECL_LISTENERMULTIPLEXER_START_DLLPUB( ClassName, InterfaceName ) \ class TOOLKIT_DLLPUBLIC ClassName : public ListenerMultiplexerBase, public InterfaceName \ { \ @@ -104,12 +101,10 @@ public: \ void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; - #define DECL_LISTENERMULTIPLEXER_END \ }; - #define IMPL_LISTENERMULTIPLEXER_BASEMETHODS( ClassName, InterfaceName ) \ ClassName::ClassName( ::cppu::OWeakObject& rSource ) \ : ListenerMultiplexerBase( rSource ) \ @@ -129,7 +124,6 @@ void ClassName::disposing( const css::lang::EventObject& ) throw(css::uno::Runti } - #if OSL_DEBUG_LEVEL > 0 #define DISPLAY_EXCEPTION( ClassName, MethodName, e ) \ OString sMessage( #ClassName "::" #MethodName ": caught an exception!\n" ); \ diff --git a/include/toolkit/helper/mutexhelper.hxx b/include/toolkit/helper/mutexhelper.hxx index 949d644d9558..a43504c0a103 100644 --- a/include/toolkit/helper/mutexhelper.hxx +++ b/include/toolkit/helper/mutexhelper.hxx @@ -37,8 +37,6 @@ public: }; - - #endif // INCLUDED_TOOLKIT_HELPER_MUTEXHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/helper/property.hxx b/include/toolkit/helper/property.hxx index 114795b880f7..d3a637dc46d4 100644 --- a/include/toolkit/helper/property.hxx +++ b/include/toolkit/helper/property.hxx @@ -243,8 +243,6 @@ bool DoesDependOnOthers( sal_uInt16 nPropertyId ); bool CompareProperties( const css::uno::Any& r1, const css::uno::Any& r2 ); - - #endif // INCLUDED_TOOLKIT_HELPER_PROPERTY_HXX |