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/sfx2 | |
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/sfx2')
28 files changed, 0 insertions, 112 deletions
diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx index 413ce7ebd9a5..186e6b6c5668 100644 --- a/include/sfx2/bindings.hxx +++ b/include/sfx2/bindings.hxx @@ -225,11 +225,6 @@ public: #endif - - - - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index a01b9d114a1f..d56e7f26aba8 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -34,11 +34,9 @@ #include <svtools/ctrlbox.hxx> - namespace sfx { - /** List position type of VCL ListBox. */ typedef sal_uInt16 ListBoxPosType; /** List position type of SVTOOLS ValueSet. */ @@ -212,7 +210,6 @@ private: }; - /** A dummy wrapper for a VCL Window that does nothing special. This wrapper is used to implement the DummyItemConnection. It does not @@ -233,7 +230,6 @@ public: }; - /** A wrapper for the VCL CheckBox. */ class SFX2_DLLPUBLIC CheckBoxWrapper: public SingleControlWrapper< CheckBox, bool > @@ -249,7 +245,6 @@ public: }; - /** A wrapper for the SVTOOLS ColorListBox. */ class SFX2_DLLPUBLIC ColorListBoxWrapper: public SingleControlWrapper< ColorListBox, Color > @@ -270,7 +265,6 @@ public: }; - /** A wrapper for the VCL NumericField. */ template< typename ValueT > class NumericFieldWrapper : public SingleControlWrapper< NumericField, ValueT > @@ -287,11 +281,6 @@ public: }; - - - - - /** A wrapper for the VCL MetricField. Adds support for field units during accessing the control value. The @@ -316,8 +305,6 @@ private: }; - - #define WRAPPER_LISTBOX_ENTRY_NOTFOUND 0xFFFF /* XXX was value of LISTBOX_ENTRY_NOTFOUND */ /** A wrapper for the VCL ListBox. @@ -351,11 +338,6 @@ public: }; - - - - - #define WRAPPER_VALUESET_ITEM_NOTFOUND 0xFFFF /* XXX was value of VALUESET_ITEM_NOTFOUND */ /** A wrapper for the SVTOOLS ValueSet. @@ -389,10 +371,6 @@ public: }; - - - - // Multi control wrappers @@ -428,7 +406,6 @@ private: }; - /** A multi control wrapper with extended interface. This template class extends the MultiControlWrapperHelper class by the @@ -465,13 +442,9 @@ private: }; - - - // *** Implementation of template functions *** - // Helpers @@ -525,7 +498,6 @@ inline void SingleControlWrapper< ControlT, ValueT >::ModifyControl( TriState eE } - template< typename ValueT > bool NumericFieldWrapper< ValueT >::IsControlDontKnow() const { @@ -552,7 +524,6 @@ void NumericFieldWrapper< ValueT >::SetControlValue( ValueT nValue ) } - template< typename ValueT > bool MetricFieldWrapper< ValueT >::IsControlDontKnow() const { @@ -579,7 +550,6 @@ void MetricFieldWrapper< ValueT >::SetControlValue( ValueT nValue ) } - template< typename ValueT > ValueT ListBoxWrapper< ValueT >::GetControlValue() const { @@ -595,7 +565,6 @@ void ListBoxWrapper< ValueT >::SetControlValue( ValueT nValue ) } - template< typename ValueT > ValueT ValueSetWrapper< ValueT >::GetControlValue() const { @@ -611,8 +580,6 @@ void ValueSetWrapper< ValueT >::SetControlValue( ValueT nValue ) } - - } // namespace sfx #endif diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx index c333c94cf972..45c4fcc45578 100644 --- a/include/sfx2/ctrlitem.hxx +++ b/include/sfx2/ctrlitem.hxx @@ -84,7 +84,6 @@ public: }; - class SFX2_DLLPUBLIC SfxStatusForwarder: public SfxControllerItem { SfxControllerItem* pMaster; diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx index 7011f93ece4d..ebe2e198c344 100644 --- a/include/sfx2/docmacromode.hxx +++ b/include/sfx2/docmacromode.hxx @@ -35,7 +35,6 @@ namespace sfx2 { - //= IMacroDocumentAccess /** provides access to several settings of a document, which are needed by ->DocumentMacroMode diff --git a/include/sfx2/docstoragemodifylistener.hxx b/include/sfx2/docstoragemodifylistener.hxx index e2ec5b47cc6b..4a4374d4a4e4 100644 --- a/include/sfx2/docstoragemodifylistener.hxx +++ b/include/sfx2/docstoragemodifylistener.hxx @@ -33,7 +33,6 @@ namespace sfx2 { - //= IModifiableDocument /** callback for the DocumentStorageModifyListener class diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx index 079a13aafc54..37a71b338015 100644 --- a/include/sfx2/event.hxx +++ b/include/sfx2/event.hxx @@ -34,7 +34,6 @@ class SfxObjectShell; - class SFX2_DLLPUBLIC SfxEventHint : public SfxHint { SfxObjectShell* pObjShell; @@ -59,7 +58,6 @@ public: }; - class SFX2_DLLPUBLIC SfxViewEventHint : public SfxEventHint { css::uno::Reference< css::frame::XController2 > xViewController; diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx index 7b4af17d661c..98d231d02ac1 100644 --- a/include/sfx2/evntconf.hxx +++ b/include/sfx2/evntconf.hxx @@ -90,7 +90,6 @@ public: }; - #define PROP_EVENT_TYPE "EventType" #define PROP_LIBRARY "Library" #define PROP_SCRIPT "Script" diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 82a7a0cf9a29..0111f5e92577 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -207,7 +207,6 @@ public: }; - class SFX2_DLLPUBLIC SfxFrameItem: public SfxPoolItem { SfxFrame* pFrame; diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx index 590ec7f8d0b7..f94d70608e6d 100644 --- a/include/sfx2/ipclient.hxx +++ b/include/sfx2/ipclient.hxx @@ -37,7 +37,6 @@ class SfxObjectShell; class Fraction; - class SFX2_DLLPUBLIC SfxInPlaceClient { friend class SfxInPlaceClient_Impl; diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx index a414b461415c..95cc97f9f229 100644 --- a/include/sfx2/itemconnect.hxx +++ b/include/sfx2/itemconnect.hxx @@ -213,7 +213,6 @@ private: }; - /** Base class template for single item <-> single control connection objects. This template uses functions provided by the SingleItemWrapper and the @@ -290,12 +289,10 @@ private: }; - /** Connection between an SfxBoolItem and a VCL CheckBox. */ typedef ItemControlConnection< BoolItemWrapper, CheckBoxWrapper > CheckBoxConnection; - /** Connection between an item and the VCL NumericField. */ template< typename ItemWrpT > class NumericConnection : public ItemControlConnection< ItemWrpT, @@ -313,10 +310,6 @@ public: }; - - - - /** Connection between an item and the VCL MetricField. Adds support of different field units during control value <-> item value @@ -340,7 +333,6 @@ public: }; - /** Connection between an item and a VCL ListBox. Optionally a map can be passed that maps list box positions to item values. @@ -366,10 +358,6 @@ public: }; - - - - /** Connection between an item and an SVTOOLS ValueSet. Optionally a map can be passed that maps value set identifiers to item @@ -395,9 +383,6 @@ public: }; - - - // Array of connections @@ -430,12 +415,9 @@ private: }; - - // *** Implementation of template functions *** - // Base connection classes @@ -519,7 +501,6 @@ NumericConnection< ItemWrpT >::NumericConnection( } - template< typename ItemWrpT > MetricConnection< ItemWrpT >::MetricConnection( sal_uInt16 nSlot, MetricField& rField, FieldUnit eItemUnit, ItemConnFlags nFlags ) : @@ -528,7 +509,6 @@ MetricConnection< ItemWrpT >::MetricConnection( } - template< typename ItemWrpT > ListBoxConnection< ItemWrpT >::ListBoxConnection( sal_uInt16 nSlot, ListBox& rListBox, const MapEntryType* pMap, ItemConnFlags nFlags ) : @@ -537,7 +517,6 @@ ListBoxConnection< ItemWrpT >::ListBoxConnection( } - template< typename ItemWrpT > ValueSetConnection< ItemWrpT >::ValueSetConnection( sal_uInt16 nSlot, ValueSet& rValueSet, const MapEntryType* pMap, ItemConnFlags nFlags ) : @@ -546,7 +525,6 @@ ValueSetConnection< ItemWrpT >::ValueSetConnection( } - } // namespace sfx #endif diff --git a/include/sfx2/itemwrapper.hxx b/include/sfx2/itemwrapper.hxx index 92ac1a05fb7f..64fbf6d22824 100644 --- a/include/sfx2/itemwrapper.hxx +++ b/include/sfx2/itemwrapper.hxx @@ -28,7 +28,6 @@ #include <svl/itemset.hxx> - namespace sfx { @@ -118,7 +117,6 @@ private: }; - /** An item wrapper usable for most types of items. The item type must support the following functions: @@ -145,13 +143,11 @@ public: }; - typedef ValueItemWrapper< SfxBoolItem, sal_Bool > BoolItemWrapper; typedef ValueItemWrapper< SfxUInt16Item, sal_uInt16 > UInt16ItemWrapper; typedef ValueItemWrapper< SfxInt32Item, sal_Int32 > Int32ItemWrapper; - /** An item wrapper that uses the item itself as value. */ template< typename ItemT > class IdentItemWrapper : public SingleItemWrapper< ItemT, const ItemT& > @@ -169,13 +165,9 @@ public: }; - - - // *** Implementation of template functions *** - // Item wrappers @@ -192,7 +184,6 @@ const ItemT& SingleItemWrapper< ItemT, ValueT >::GetDefaultItem( const SfxItemSe } - } // namespace sfx #endif diff --git a/include/sfx2/mnumgr.hxx b/include/sfx2/mnumgr.hxx index 5f51b064690e..46349955011f 100644 --- a/include/sfx2/mnumgr.hxx +++ b/include/sfx2/mnumgr.hxx @@ -63,7 +63,6 @@ public: }; - class SAL_DLLPUBLIC_EXPORT SfxPopupMenuManager : public SfxMenuManager { private: diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx index 97313d06ff30..f00b94b3c804 100644 --- a/include/sfx2/msg.hxx +++ b/include/sfx2/msg.hxx @@ -84,7 +84,6 @@ class SfxRequest; #define SFX_STUB_PTR_STATE_NONE &SfxShell::EmptyStateStub - enum class SfxSlotKind { Standard, @@ -93,7 +92,6 @@ enum class SfxSlotKind }; - struct SfxTypeAttrib { sal_uInt16 nAID; @@ -204,7 +202,6 @@ struct SfxFormalArgument }; - class SfxSlot { public: @@ -257,7 +254,6 @@ public: }; - // returns the id of the function inline sal_uInt16 SfxSlot::GetSlotId() const diff --git a/include/sfx2/msgpool.hxx b/include/sfx2/msgpool.hxx index 4308418ac1b2..7ea00d1fe75c 100644 --- a/include/sfx2/msgpool.hxx +++ b/include/sfx2/msgpool.hxx @@ -65,7 +65,6 @@ public: }; - // seeks to the first func in the current group inline const SfxSlot* SfxSlotPool::FirstSlot() diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx index 8c02ba274928..56a7c2f865a8 100644 --- a/include/sfx2/new.hxx +++ b/include/sfx2/new.hxx @@ -30,12 +30,10 @@ #include <o3tl/typed_flags_set.hxx> - class SfxObjectShellLock; class SfxObjectShell; - #define SFXWB_PREVIEW 0x0003 #define SFXWB_LOAD_TEMPLATE 0x0004 diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx index 22b28a37304c..7ca1b97d4c89 100644 --- a/include/sfx2/objface.hxx +++ b/include/sfx2/objface.hxx @@ -92,7 +92,6 @@ public: }; - // returns the number of functions in this cluster inline sal_uInt16 SfxInterface::Count() const @@ -101,7 +100,6 @@ inline sal_uInt16 SfxInterface::Count() const } - // returns a function by position in the array inline SfxSlot* SfxInterface::operator[]( sal_uInt16 nPos ) const diff --git a/include/sfx2/objitem.hxx b/include/sfx2/objitem.hxx index db4139285f44..b07478c318ef 100644 --- a/include/sfx2/objitem.hxx +++ b/include/sfx2/objitem.hxx @@ -26,7 +26,6 @@ #include <sfx2/shell.hxx> - class SFX2_DLLPUBLIC SfxObjectItem: public SfxPoolItem { SfxShell* _pSh; diff --git a/include/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx index 675d5711e8ce..289d57dc65f2 100644 --- a/include/sfx2/prnmon.hxx +++ b/include/sfx2/prnmon.hxx @@ -30,7 +30,6 @@ class SfxViewShell; - struct SfxPrintOptDlg_Impl; class SfxPrintOptionsDialog : public ModalDialog { diff --git a/include/sfx2/request.hxx b/include/sfx2/request.hxx index 13c52aa831e4..99f42dcab468 100644 --- a/include/sfx2/request.hxx +++ b/include/sfx2/request.hxx @@ -56,7 +56,6 @@ private: SAL_DLLPRIVATE void Done_Impl( const SfxItemSet *pSet ); - public: SfxRequest( SfxViewFrame*, sal_uInt16 nSlotId ); SfxRequest( sal_uInt16 nSlot, SfxCallMode nCallMode, SfxItemPool &rPool ); diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx index cc0eb949913e..cfb28f1443b8 100644 --- a/include/sfx2/securitypage.hxx +++ b/include/sfx2/securitypage.hxx @@ -25,7 +25,6 @@ #include <memory> - struct SfxSecurityPage_Impl; class SfxSecurityPage : public SfxTabPage diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx index 834443fecff2..638d9e8f1e75 100644 --- a/include/sfx2/sfxbasemodel.hxx +++ b/include/sfx2/sfxbasemodel.hxx @@ -241,7 +241,6 @@ public: virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) override ; - // XStarBasicAccess @@ -272,7 +271,6 @@ public: throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; - // XChild @@ -428,8 +426,6 @@ public: throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; - - // XLoadable @@ -545,7 +541,6 @@ public: throw (css::uno::RuntimeException, std::exception) override; - // XEventsSupplier @@ -558,7 +553,6 @@ public: virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents() throw( css::uno::RuntimeException, std::exception ) override; - // XEmbeddedScripts @@ -661,7 +655,6 @@ public: virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL getUndoManager( ) throw (css::uno::RuntimeException, std::exception) override; - // css::rdf::XNode: virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception) override; diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx index 38d9d145d7f1..a9da7f680f92 100644 --- a/include/sfx2/sidebar/Theme.hxx +++ b/include/sfx2/sidebar/Theme.hxx @@ -270,7 +270,6 @@ private: }; - } } // end of namespace sfx2::sidebar #endif diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx index 43eb733a249d..8ec6cc13ae10 100644 --- a/include/sfx2/stbitem.hxx +++ b/include/sfx2/stbitem.hxx @@ -52,7 +52,6 @@ struct SfxStbCtrlFactory }; - class CommandEvent; class MouseEvent; class UserDrawEvent; @@ -120,7 +119,6 @@ public: }; - #define SFX_DECL_STATUSBAR_CONTROL() \ static SfxStatusBarControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar &rStb ); \ static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=nullptr) diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index b971be938910..571242ae284c 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -60,8 +60,6 @@ struct SfxTbxCtrlFactory }; - - /* Floating windows that can be torn from tool boxes should be derived from this class. Since it is also derived from SfxControllerItem, its instances will also receive the StateChanged calls. @@ -131,7 +129,6 @@ public: }; - #define SFX_DECL_TOOLBOX_CONTROL() \ static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ); \ static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=nullptr) @@ -242,8 +239,6 @@ public: Class::CreateImpl, typeid(nItemClass), nSlotId ) ); } - - class SfxDragButton_Impl : public FixedImage { public: diff --git a/include/sfx2/userinputinterception.hxx b/include/sfx2/userinputinterception.hxx index 54462aafd34c..737e5330802e 100644 --- a/include/sfx2/userinputinterception.hxx +++ b/include/sfx2/userinputinterception.hxx @@ -35,7 +35,6 @@ namespace sfx2 { - //= UserInputInterception struct UserInputInterception_Data; diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 6c4d090d43b3..9497e86a2693 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -270,7 +270,6 @@ private: }; - class SFX2_DLLPUBLIC SfxViewFrameItem: public SfxPoolItem { SfxViewFrame* pFrame; diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index c5e5a6380bad..466ced7776dd 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -89,7 +89,6 @@ namespace o3tl #define DEFAULT_MARGIN_HEIGHT 12 - // @[SfxViewShell-Flags] enum class SfxViewShellFlags @@ -113,7 +112,6 @@ namespace o3tl */ - #define SFX_DECL_VIEWFACTORY(Class) \ private: \ static SfxViewFactory *pFactory; \ @@ -331,7 +329,6 @@ public: }; - inline SfxViewFrame* SfxViewShell::GetViewFrame() const /* [Description] diff --git a/include/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx index d595b7ec24d9..84632ea96643 100644 --- a/include/sfx2/zoomitem.hxx +++ b/include/sfx2/zoomitem.hxx @@ -80,7 +80,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |