diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 19:06:16 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-01 09:51:32 -0600 |
commit | 8792ec7b2129650777b7b4bfacaa7c13d923279b (patch) | |
tree | f181e37b61533b460397cc68625fd21f46bb6393 /include/oox/ole/axcontrol.hxx | |
parent | import date cells from OOXML (diff) | |
download | core-8792ec7b2129650777b7b4bfacaa7c13d923279b.tar.gz core-8792ec7b2129650777b7b4bfacaa7c13d923279b.zip |
Remove visual noise from include
Conflicts:
include/framework/preventduplicateinteraction.hxx
include/sfx2/sfxbasecontroller.hxx
include/sfx2/sfxbasemodel.hxx
include/toolkit/awt/vclxtabpagemodel.hxx
include/vcl/field.hxx
include/vcl/settings.hxx
Change-Id: Ibccf9f88c68267a3d7e656012b51eaf644c418c2
Reviewed-on: https://gerrit.libreoffice.org/8272
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/oox/ole/axcontrol.hxx')
-rw-r--r-- | include/oox/ole/axcontrol.hxx | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index 90d48a51e2f7..15994434e67d 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -45,7 +45,7 @@ namespace oox { namespace oox { namespace ole { -// ============================================================================ + #define COMCTL_GUID_SCROLLBAR_60 "{FE38753A-44A3-11D1-B5B7-0000C09000C4}" #define COMCTL_GUID_PROGRESSBAR_50 "{0713E8D2-850A-101B-AFC0-4210102A8DA7}" @@ -54,7 +54,7 @@ namespace ole { 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}" @@ -141,7 +141,7 @@ const sal_Int32 AX_SCROLLBAR_NONE = 0x00; 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 @@ -166,7 +166,7 @@ enum ApiControlType API_CONTROL_DIALOG // 17 }; -// ============================================================================ + /** Specifies how a form control supports transparent background. */ enum ApiTransparencyMode @@ -184,7 +184,7 @@ enum ApiDefaultStateMode API_DEFAULTSTATE_TRISTATE ///< Control supports tri-state, state is given as short. }; -// ---------------------------------------------------------------------------- + /** A base class with useful helper functions for something that is able to convert ActiveX and ComCtl form controls. @@ -344,7 +344,7 @@ private: bool mbDefaultColorBgr; }; -// ============================================================================ + /** Base class for all models of form controls. */ class OOX_DLLPUBLIC ControlModelBase @@ -391,7 +391,7 @@ protected: typedef ::boost::shared_ptr< ControlModelBase > ControlModelRef; -// ============================================================================ + /** Base class for all models of ComCtl form controls. */ class ComCtlModelBase : public ControlModelBase @@ -435,7 +435,7 @@ private: bool mbComplexPart; ///< True = the COMCTL_COMPLEXDATA part exists. }; -// ============================================================================ + /** Model for a ComCtl scroll bar. */ class ComCtlScrollBarModel : public ComCtlModelBase @@ -458,7 +458,7 @@ private: sal_Int32 mnPosition; ///< Value of the spin button. }; -// ============================================================================ + /** Model for a ComCtl progress bar. */ class ComCtlProgressBarModel : public ComCtlModelBase @@ -479,7 +479,7 @@ private: sal_uInt16 mnSmooth; ///< 0 = progress blocks, 1 = pixel resolution. }; -// ============================================================================ + /** Base class for all models of Form 2.0 form controls. */ class OOX_DLLPUBLIC AxControlModelBase : public ControlModelBase @@ -490,7 +490,7 @@ public: virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ); }; -// ============================================================================ + /** Base class for Forms 2.0 controls supporting text formatting. */ class OOX_DLLPUBLIC AxFontDataModel : public AxControlModelBase @@ -514,7 +514,7 @@ private: bool mbSupportsAlign; ///< True = UNO model supports Align property. }; -// ============================================================================ + /** Model for a Forms 2.0 command button. */ class OOX_DLLPUBLIC AxCommandButtonModel : public AxFontDataModel @@ -543,7 +543,7 @@ public: // direct access needed for legacy VML drawing controls bool mbFocusOnClick; ///< True = take focus on click. }; -// ============================================================================ + /** Model for a Forms 2.0 label. */ class OOX_DLLPUBLIC AxLabelModel : public AxFontDataModel @@ -571,7 +571,7 @@ public: // direct access needed for legacy VML drawing controls sal_Int32 mnVerticalAlign; ///< Vertical alignment (legacy VML drawing controls only). }; -// ============================================================================ + /** Model for a Forms 2.0 image. */ class OOX_DLLPUBLIC AxImageModel : public AxControlModelBase @@ -618,7 +618,7 @@ public: std::vector< ::rtl::OUString > maTabNames; // names for each tab }; -// ============================================================================ + /** Base class for a Forms 2.0 morph data control. */ class OOX_DLLPUBLIC AxMorphDataModelBase : public AxFontDataModel @@ -655,7 +655,7 @@ public: // direct access needed for legacy VML drawing controls sal_Int32 mnVerticalAlign; ///< Vertical alignment (legacy VML drawing controls only). }; -// ============================================================================ + /** Model for a Forms 2.0 toggle button. */ class OOX_DLLPUBLIC AxToggleButtonModel : public AxMorphDataModelBase @@ -669,7 +669,7 @@ public: virtual void exportCompObj( BinaryOutputStream& rOutStrm ); }; -// ============================================================================ + /** Model for a Forms 2.0 check box. */ class OOX_DLLPUBLIC AxCheckBoxModel : public AxMorphDataModelBase @@ -683,7 +683,7 @@ public: virtual void exportCompObj( BinaryOutputStream& rOutStrm ); }; -// ============================================================================ + /** Model for a Forms 2.0 option button. */ class OOX_DLLPUBLIC AxOptionButtonModel : public AxMorphDataModelBase @@ -700,7 +700,7 @@ public: virtual void exportCompObj( BinaryOutputStream& rOutStrm ); }; -// ============================================================================ + /** Model for a Forms 2.0 text box. */ class OOX_DLLPUBLIC AxTextBoxModel : public AxMorphDataModelBase @@ -714,7 +714,7 @@ public: virtual void exportCompObj( BinaryOutputStream& rOutStrm ); }; -// ============================================================================ + /** Model for a numeric field (legacy drawing controls only). */ class OOX_DLLPUBLIC AxNumericFieldModel : public AxMorphDataModelBase @@ -728,7 +728,7 @@ public: virtual void exportCompObj( BinaryOutputStream& rOutStrm ); }; -// ============================================================================ + /** Model for a Forms 2.0 list box. */ class OOX_DLLPUBLIC AxListBoxModel : public AxMorphDataModelBase @@ -742,7 +742,7 @@ public: virtual void exportCompObj( BinaryOutputStream& rOutStrm ); }; -// ============================================================================ + /** Model for a Forms 2.0 combo box. */ class OOX_DLLPUBLIC AxComboBoxModel : public AxMorphDataModelBase @@ -756,7 +756,7 @@ public: virtual void exportCompObj( BinaryOutputStream& rOutStrm ); }; -// ============================================================================ + /** Model for a Forms 2.0 spin button. */ class OOX_DLLPUBLIC AxSpinButtonModel : public AxControlModelBase @@ -785,7 +785,7 @@ public: // direct access needed for legacy VML drawing controls sal_Int32 mnDelay; ///< Repeat delay in milliseconds. }; -// ============================================================================ + /** Model for a Forms 2.0 scroll bar. */ class OOX_DLLPUBLIC AxScrollBarModel : public AxControlModelBase @@ -816,7 +816,7 @@ public: // direct access needed for legacy VML drawing controls sal_Int32 mnDelay; ///< Repeat delay in milliseconds. }; -// ============================================================================ + typedef ::std::vector< OUString > AxClassTable; @@ -859,7 +859,7 @@ public: // direct access needed for legacy VML drawing controls typedef ::boost::shared_ptr< AxContainerModelBase > AxContainerModelRef; -// ============================================================================ + /** Model for a Forms 2.0 frame control. */ class OOX_DLLPUBLIC AxFrameModel : public AxContainerModelBase @@ -893,7 +893,7 @@ public: sal_uInt32 mnTabStyle; }; -// ============================================================================ + /** Model for a Forms 2.0 user form. */ @@ -922,7 +922,7 @@ public: explicit HtmlTextBoxModel(); virtual bool importBinaryModel( BinaryInputStream& rInStrm ); }; -// ============================================================================ + /** A form control embedded in a document draw page. Contains a specific model structure according to the type of the control. */ @@ -968,7 +968,7 @@ private: OUString maName; ///< Name of the control. }; -// ---------------------------------------------------------------------------- + template< typename ModelType > inline ModelType& EmbeddedControl::createModel() @@ -988,7 +988,7 @@ inline ModelType& EmbeddedControl::createModel( const ParamType& rParam ) return *xModel; } -// ============================================================================ + /** A wrapper for a control form embedded directly in a draw page. */ class EmbeddedForm @@ -1021,7 +1021,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > mxFormIC; }; -// ============================================================================ + } // namespace ole } // namespace oox |