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/oox/ole | |
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/oox/ole')
-rw-r--r-- | include/oox/ole/axbinaryreader.hxx | 4 | ||||
-rw-r--r-- | include/oox/ole/axcontrol.hxx | 32 | ||||
-rw-r--r-- | include/oox/ole/axcontrolfragment.hxx | 3 | ||||
-rw-r--r-- | include/oox/ole/axfontdata.hxx | 1 | ||||
-rw-r--r-- | include/oox/ole/olehelper.hxx | 7 | ||||
-rw-r--r-- | include/oox/ole/oleobjecthelper.hxx | 2 | ||||
-rw-r--r-- | include/oox/ole/olestorage.hxx | 2 | ||||
-rw-r--r-- | include/oox/ole/vbacontrol.hxx | 4 | ||||
-rw-r--r-- | include/oox/ole/vbahelper.hxx | 2 | ||||
-rw-r--r-- | include/oox/ole/vbainputstream.hxx | 2 | ||||
-rw-r--r-- | include/oox/ole/vbamodule.hxx | 2 | ||||
-rw-r--r-- | include/oox/ole/vbaproject.hxx | 4 |
12 files changed, 0 insertions, 65 deletions
diff --git a/include/oox/ole/axbinaryreader.hxx b/include/oox/ole/axbinaryreader.hxx index 3d4e2a273150..5823fbb8ef19 100644 --- a/include/oox/ole/axbinaryreader.hxx +++ b/include/oox/ole/axbinaryreader.hxx @@ -29,7 +29,6 @@ namespace oox { namespace ole { - /** A wrapper for a binary input stream that supports aligned read operations. The implementation does not support seeking back the wrapped stream. All @@ -83,7 +82,6 @@ private: }; - /** A pair of integer values as a property. */ typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData; @@ -91,7 +89,6 @@ typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData; typedef ::std::vector< OUString > AxArrayString; - /** Import helper to read simple and complex ActiveX form control properties from a binary input stream. */ class AxBinaryPropertyReader @@ -241,7 +238,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index a9c8eee451be..87b8515fa6a9 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -46,7 +46,6 @@ namespace oox { namespace ole { - #define COMCTL_GUID_SCROLLBAR_60 "{FE38753A-44A3-11D1-B5B7-0000C09000C4}" #define COMCTL_GUID_PROGRESSBAR_50 "{0713E8D2-850A-101B-AFC0-4210102A8DA7}" #define COMCTL_GUID_PROGRESSBAR_60 "{35053A22-8589-11D1-B16A-00C0F0283628}" @@ -55,7 +54,6 @@ const sal_uInt16 COMCTL_VERSION_50 = 5; const sal_uInt16 COMCTL_VERSION_60 = 6; - #define AX_GUID_COMMANDBUTTON "{D7053240-CE69-11CD-a777-00dd01143c57}" #define AX_GUID_LABEL "{978C9E23-D4B0-11CE-bf2d-00aa003f40d0}" #define AX_GUID_IMAGE "{4C599241-6926-101B-9992-00000b65c6f9}" @@ -142,7 +140,6 @@ const sal_Int32 AX_SCROLLBAR_HORIZONTAL = 0x01; const sal_Int32 AX_SCROLLBAR_VERTICAL = 0x02; - /** Enumerates all UNO API control types supported by these filters. */ enum ApiControlType { @@ -167,7 +164,6 @@ enum ApiControlType }; - /** Specifies how a form control supports transparent background. */ enum ApiTransparencyMode { @@ -185,7 +181,6 @@ enum ApiDefaultStateMode }; - /** A base class with useful helper functions for something that is able to convert ActiveX and ComCtl form controls. */ @@ -345,7 +340,6 @@ private: }; - /** Base class for all models of form controls. */ class OOX_DLLPUBLIC ControlModelBase { @@ -392,7 +386,6 @@ protected: typedef std::shared_ptr< ControlModelBase > ControlModelRef; - /** Base class for all models of ComCtl form controls. */ class ComCtlModelBase : public ControlModelBase { @@ -434,7 +427,6 @@ private: }; - /** Model for a ComCtl scroll bar. */ class ComCtlScrollBarModel : public ComCtlModelBase { @@ -457,7 +449,6 @@ private: }; - /** Model for a ComCtl progress bar. */ class ComCtlProgressBarModel : public ComCtlModelBase { @@ -478,7 +469,6 @@ private: }; - /** Base class for all models of Form 2.0 form controls. */ class OOX_DLLPUBLIC AxControlModelBase : public ControlModelBase { @@ -489,7 +479,6 @@ public: }; - /** Base class for Forms 2.0 controls supporting text formatting. */ class OOX_DLLPUBLIC AxFontDataModel : public AxControlModelBase { @@ -513,7 +502,6 @@ private: }; - /** Model for a Forms 2.0 command button. */ class OOX_DLLPUBLIC AxCommandButtonModel : public AxFontDataModel { @@ -542,7 +530,6 @@ public: // direct access needed for legacy VML drawing controls }; - /** Model for a Forms 2.0 label. */ class OOX_DLLPUBLIC AxLabelModel : public AxFontDataModel { @@ -570,7 +557,6 @@ public: // direct access needed for legacy VML drawing controls }; - /** Model for a Forms 2.0 image. */ class OOX_DLLPUBLIC AxImageModel : public AxControlModelBase { @@ -617,7 +603,6 @@ public: }; - /** Base class for a Forms 2.0 morph data control. */ class OOX_DLLPUBLIC AxMorphDataModelBase : public AxFontDataModel { @@ -654,7 +639,6 @@ public: // direct access needed for legacy VML drawing controls }; - /** Model for a Forms 2.0 toggle button. */ class OOX_DLLPUBLIC AxToggleButtonModel : public AxMorphDataModelBase { @@ -668,7 +652,6 @@ public: }; - /** Model for a Forms 2.0 check box. */ class OOX_DLLPUBLIC AxCheckBoxModel : public AxMorphDataModelBase { @@ -682,7 +665,6 @@ public: }; - /** Model for a Forms 2.0 option button. */ class OOX_DLLPUBLIC AxOptionButtonModel : public AxMorphDataModelBase { @@ -699,7 +681,6 @@ public: }; - /** Model for a Forms 2.0 text box. */ class OOX_DLLPUBLIC AxTextBoxModel : public AxMorphDataModelBase { @@ -713,7 +694,6 @@ public: }; - /** Model for a numeric field (legacy drawing controls only). */ class OOX_DLLPUBLIC AxNumericFieldModel : public AxMorphDataModelBase { @@ -727,7 +707,6 @@ public: }; - /** Model for a Forms 2.0 list box. */ class OOX_DLLPUBLIC AxListBoxModel : public AxMorphDataModelBase { @@ -741,7 +720,6 @@ public: }; - /** Model for a Forms 2.0 combo box. */ class OOX_DLLPUBLIC AxComboBoxModel : public AxMorphDataModelBase { @@ -755,7 +733,6 @@ public: }; - /** Model for a Forms 2.0 spin button. */ class OOX_DLLPUBLIC AxSpinButtonModel : public AxControlModelBase { @@ -784,7 +761,6 @@ public: // direct access needed for legacy VML drawing controls }; - /** Model for a Forms 2.0 scroll bar. */ class OOX_DLLPUBLIC AxScrollBarModel : public AxControlModelBase { @@ -815,7 +791,6 @@ public: // direct access needed for legacy VML drawing controls }; - typedef ::std::vector< OUString > AxClassTable; /** Base class for ActiveX container controls. */ @@ -856,8 +831,6 @@ public: // direct access needed for legacy VML drawing controls }; - - /** Model for a Forms 2.0 frame control. */ class OOX_DLLPUBLIC AxFrameModel : public AxContainerModelBase { @@ -891,8 +864,6 @@ public: }; - - /** Model for a Forms 2.0 user form. */ class OOX_DLLPUBLIC AxUserFormModel : public AxContainerModelBase { @@ -966,7 +937,6 @@ private: }; - template< typename ModelType > inline ModelType& EmbeddedControl::createModel() { @@ -986,7 +956,6 @@ inline ModelType& EmbeddedControl::createModel( const ParamType& rParam ) } - /** A wrapper for a control form embedded directly in a draw page. */ class EmbeddedForm { @@ -1019,7 +988,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/axcontrolfragment.hxx b/include/oox/ole/axcontrolfragment.hxx index 7964e55225cd..b4284cf892e7 100644 --- a/include/oox/ole/axcontrolfragment.hxx +++ b/include/oox/ole/axcontrolfragment.hxx @@ -29,7 +29,6 @@ class ControlModelBase; class EmbeddedControl; - /** Context handler for ActiveX form control model properties. */ class AxControlPropertyContext : public ::oox::core::ContextHandler2 { @@ -47,7 +46,6 @@ private: }; - /** Fragment handler for an embedded ActiveX form control fragment. */ class AxControlFragment : public ::oox::core::FragmentHandler2 { @@ -65,7 +63,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/axfontdata.hxx b/include/oox/ole/axfontdata.hxx index c8e764e997cc..05694fbcd12e 100644 --- a/include/oox/ole/axfontdata.hxx +++ b/include/oox/ole/axfontdata.hxx @@ -29,7 +29,6 @@ namespace oox { namespace ole { - const sal_Char* const AX_GUID_CFONT = "{AFC20920-DA4E-11CE-B943-00AA006887B4}"; const sal_uInt32 AX_FONTDATA_BOLD = 0x00000001; diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx index 12ae732ebf6c..0a6ba4a76302 100644 --- a/include/oox/ole/olehelper.hxx +++ b/include/oox/ole/olehelper.hxx @@ -56,13 +56,10 @@ namespace oox { namespace ole { - - #define OLE_GUID_STDFONT "{0BE35203-8F91-11CE-9DE3-00AA004BB851}" #define OLE_GUID_STDPIC "{0BE35204-8F91-11CE-9DE3-00AA004BB851}" - const sal_uInt16 OLE_STDFONT_NORMAL = 400; const sal_uInt16 OLE_STDFONT_BOLD = 700; @@ -89,7 +86,6 @@ struct StdFontInfo }; - /** Stores data about a StdHlink hyperlink. */ struct StdHlinkInfo { @@ -99,7 +95,6 @@ struct StdHlinkInfo }; - /** Static helper functions for OLE import/export. */ namespace OleHelper { @@ -170,8 +165,6 @@ public: }; - - } // namespace ole } // namespace oox diff --git a/include/oox/ole/oleobjecthelper.hxx b/include/oox/ole/oleobjecthelper.hxx index 85b9ee59c022..0947ad1f9447 100644 --- a/include/oox/ole/oleobjecthelper.hxx +++ b/include/oox/ole/oleobjecthelper.hxx @@ -36,7 +36,6 @@ namespace oox { namespace ole { - /** Contains generic information about an OLE object. */ struct OOX_DLLPUBLIC OleObjectInfo { @@ -51,7 +50,6 @@ struct OOX_DLLPUBLIC OleObjectInfo }; - /** Helper for OLE object handling. */ class OleObjectHelper { diff --git a/include/oox/ole/olestorage.hxx b/include/oox/ole/olestorage.hxx index 6b00ada1b61a..9039cae2dedb 100644 --- a/include/oox/ole/olestorage.hxx +++ b/include/oox/ole/olestorage.hxx @@ -31,7 +31,6 @@ namespace oox { namespace ole { - /** Implements stream access for binary OLE storages. */ class OOX_DLLPUBLIC OleStorage : public StorageBase { @@ -101,7 +100,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbacontrol.hxx b/include/oox/ole/vbacontrol.hxx index 7d4a4bbe1d93..a50054e5f5c2 100644 --- a/include/oox/ole/vbacontrol.hxx +++ b/include/oox/ole/vbacontrol.hxx @@ -34,7 +34,6 @@ namespace oox { namespace ole { - /** Common properties for all controls that are part of a VBA user form or of another container control in a VBA user form. */ class VbaSiteModel @@ -95,7 +94,6 @@ protected: typedef std::shared_ptr< VbaSiteModel > VbaSiteModelRef; - /** A control that is embedded in a VBA user form or in another container control in a VBA user form. @@ -172,7 +170,6 @@ private: }; - class VbaUserForm : public VbaFormControl { public: @@ -197,7 +194,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbahelper.hxx b/include/oox/ole/vbahelper.hxx index 75ad1b57e1a9..94a63efe34a8 100644 --- a/include/oox/ole/vbahelper.hxx +++ b/include/oox/ole/vbahelper.hxx @@ -50,7 +50,6 @@ const sal_uInt16 VBA_ID_PROJECTNAME = 0x0004; const sal_uInt16 VBA_ID_PROJECTVERSION = 0x0009; - /** Static helper functions for the VBA filters. */ namespace VbaHelper { @@ -84,7 +83,6 @@ namespace VbaHelper } - } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbainputstream.hxx b/include/oox/ole/vbainputstream.hxx index 393f517c06b4..dd6e53ad6a9a 100644 --- a/include/oox/ole/vbainputstream.hxx +++ b/include/oox/ole/vbainputstream.hxx @@ -27,7 +27,6 @@ namespace oox { namespace ole { - /** A non-seekable input stream that implements run-length decompression. */ class VbaInputStream : public BinaryInputStream { @@ -65,7 +64,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbamodule.hxx b/include/oox/ole/vbamodule.hxx index 9fa2de0408fe..68aef13e82e1 100644 --- a/include/oox/ole/vbamodule.hxx +++ b/include/oox/ole/vbamodule.hxx @@ -39,7 +39,6 @@ namespace oox { namespace ole { - class VbaModule { public: @@ -100,7 +99,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx index 9478c9adde96..e4ed68255bdb 100644 --- a/include/oox/ole/vbaproject.hxx +++ b/include/oox/ole/vbaproject.hxx @@ -42,7 +42,6 @@ namespace oox { namespace ole { - class OOX_DLLPUBLIC VbaFilterConfig { public: @@ -64,7 +63,6 @@ private: }; - /** Base class for objects that attach a macro to a specific action. Purpose is to collect objects that need to attach a VBA macro to an action. @@ -105,7 +103,6 @@ private: typedef std::shared_ptr< VbaMacroAttacherBase > VbaMacroAttacherRef; - class OOX_DLLPUBLIC VbaProject : public VbaFilterConfig { public: @@ -204,7 +201,6 @@ private: }; - } // namespace ole } // namespace oox |