summaryrefslogtreecommitdiff
path: root/include/oox/ole
diff options
context:
space:
mode:
authorAlexander Wilms <f.alexander.wilms@gmail.com>2014-02-25 19:06:16 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-03-01 09:51:32 -0600
commit8792ec7b2129650777b7b4bfacaa7c13d923279b (patch)
treef181e37b61533b460397cc68625fd21f46bb6393 /include/oox/ole
parentdff29fadfe418421f2af9fd4f1dccc8a9b4cd545 (diff)
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')
-rw-r--r--include/oox/ole/axbinaryreader.hxx8
-rw-r--r--include/oox/ole/axbinarywriter.hxx6
-rw-r--r--include/oox/ole/axcontrol.hxx62
-rw-r--r--include/oox/ole/axcontrolfragment.hxx6
-rw-r--r--include/oox/ole/axfontdata.hxx2
-rw-r--r--include/oox/ole/olehelper.hxx10
-rw-r--r--include/oox/ole/oleobjecthelper.hxx6
-rw-r--r--include/oox/ole/olestorage.hxx4
-rw-r--r--include/oox/ole/vbacontrol.hxx8
-rw-r--r--include/oox/ole/vbahelper.hxx4
-rw-r--r--include/oox/ole/vbainputstream.hxx4
-rw-r--r--include/oox/ole/vbamodule.hxx4
-rw-r--r--include/oox/ole/vbaproject.hxx8
13 files changed, 66 insertions, 66 deletions
diff --git a/include/oox/ole/axbinaryreader.hxx b/include/oox/ole/axbinaryreader.hxx
index c334d380dcf2..f722281a5375 100644
--- a/include/oox/ole/axbinaryreader.hxx
+++ b/include/oox/ole/axbinaryreader.hxx
@@ -28,7 +28,7 @@
namespace oox {
namespace ole {
-// ============================================================================
+
/** A wrapper for a binary input stream that supports aligned read operations.
@@ -81,7 +81,7 @@ private:
sal_Int64 mnStrmSize; ///< Size of the wrapped stream data.
};
-// ============================================================================
+
/** A pair of integer values as a property. */
typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData;
@@ -89,7 +89,7 @@ typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData;
/** An array of string values as a property. */
typedef ::std::vector< OUString > AxArrayString;
-// ============================================================================
+
/** Import helper to read simple and complex ActiveX form control properties
from a binary input stream. */
@@ -247,7 +247,7 @@ private:
bool mbValid; ///< True = stream still valid.
};
-// ============================================================================
+
} // namespace ole
} // namespace oox
diff --git a/include/oox/ole/axbinarywriter.hxx b/include/oox/ole/axbinarywriter.hxx
index ba7a4866c50b..abb2fafbe645 100644
--- a/include/oox/ole/axbinarywriter.hxx
+++ b/include/oox/ole/axbinarywriter.hxx
@@ -16,7 +16,7 @@
namespace oox {
namespace ole {
-// ============================================================================
+
/** A wrapper for a binary output stream that supports aligned write operations.
@@ -75,7 +75,7 @@ typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData;
/** An array of string values as a property. */
typedef ::std::vector< OUString > AxStringArray;
-// ============================================================================
+
/** Export helper to write simple and complex ActiveX form control properties
to a binary input stream. */
@@ -167,7 +167,7 @@ private:
bool mb64BitPropFlags;
};
-// ============================================================================
+
} // namespace ole
} // namespace oox
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
diff --git a/include/oox/ole/axcontrolfragment.hxx b/include/oox/ole/axcontrolfragment.hxx
index 92173c1851b7..3139060f9030 100644
--- a/include/oox/ole/axcontrolfragment.hxx
+++ b/include/oox/ole/axcontrolfragment.hxx
@@ -28,7 +28,7 @@ namespace ole {
class ControlModelBase;
class EmbeddedControl;
-// ============================================================================
+
/** Context handler for ActiveX form control model properties. */
class AxControlPropertyContext : public ::oox::core::ContextHandler2
@@ -46,7 +46,7 @@ private:
sal_Int32 mnPropId; ///< Identifier of currently processed property.
};
-// ============================================================================
+
/** Fragment handler for an embedded ActiveX form control fragment. */
class AxControlFragment : public ::oox::core::FragmentHandler2
@@ -64,7 +64,7 @@ private:
EmbeddedControl& mrControl;
};
-// ============================================================================
+
} // namespace ole
} // namespace oox
diff --git a/include/oox/ole/axfontdata.hxx b/include/oox/ole/axfontdata.hxx
index ce1b0f6aaaf5..c8e764e997cc 100644
--- a/include/oox/ole/axfontdata.hxx
+++ b/include/oox/ole/axfontdata.hxx
@@ -28,7 +28,7 @@
namespace oox {
namespace ole {
-// ============================================================================
+
const sal_Char* const AX_GUID_CFONT = "{AFC20920-DA4E-11CE-B943-00AA006887B4}";
diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx
index 0b5dc4f03a3d..82afa4173112 100644
--- a/include/oox/ole/olehelper.hxx
+++ b/include/oox/ole/olehelper.hxx
@@ -55,13 +55,13 @@ typedef ::boost::shared_ptr< oox::BinaryXInputStream > BinaryXInputStreamRef;
namespace ole {
-// ============================================================================
+
#define OLE_GUID_STDFONT "{0BE35203-8F91-11CE-9DE3-00AA004BB851}"
#define OLE_GUID_STDPIC "{0BE35204-8F91-11CE-9DE3-00AA004BB851}"
#define OLE_GUID_STDHLINK "{79EAC9D0-BAF9-11CE-8C82-00AA004BA90B}"
-// ============================================================================
+
const sal_uInt16 OLE_STDFONT_NORMAL = 400;
const sal_uInt16 OLE_STDFONT_BOLD = 700;
@@ -88,7 +88,7 @@ struct StdFontInfo
sal_uInt8 nFlags = 0 );
};
-// ============================================================================
+
/** Stores data about a StdHlink hyperlink. */
struct StdHlinkInfo
@@ -99,7 +99,7 @@ struct StdHlinkInfo
OUString maFrame;
};
-// ============================================================================
+
/** Static helper functions for OLE import/export. */
class OOX_DLLPUBLIC OleHelper
@@ -197,7 +197,7 @@ public:
};
-// ============================================================================
+
} // namespace ole
} // namespace oox
diff --git a/include/oox/ole/oleobjecthelper.hxx b/include/oox/ole/oleobjecthelper.hxx
index d869712067f2..a723949f539c 100644
--- a/include/oox/ole/oleobjecthelper.hxx
+++ b/include/oox/ole/oleobjecthelper.hxx
@@ -33,7 +33,7 @@ namespace oox { class PropertyMap; }
namespace oox {
namespace ole {
-// ============================================================================
+
/** Contains generic information about an OLE object. */
struct OleObjectInfo
@@ -48,7 +48,7 @@ struct OleObjectInfo
explicit OleObjectInfo();
};
-// ============================================================================
+
/** Helper for OLE object handling. */
class OleObjectHelper
@@ -69,7 +69,7 @@ private:
sal_Int32 mnObjectId;
};
-// ============================================================================
+
} // namespace ole
} // namespace oox
diff --git a/include/oox/ole/olestorage.hxx b/include/oox/ole/olestorage.hxx
index 78e4c4c442a6..22223aee2785 100644
--- a/include/oox/ole/olestorage.hxx
+++ b/include/oox/ole/olestorage.hxx
@@ -30,7 +30,7 @@ namespace com { namespace sun { namespace star {
namespace oox {
namespace ole {
-// ============================================================================
+
/** Implements stream access for binary OLE storages. */
class OOX_DLLPUBLIC OleStorage : public StorageBase
@@ -100,7 +100,7 @@ private:
const OleStorage* mpParentStorage; ///< Parent OLE storage that contains this storage.
};
-// ============================================================================
+
} // namespace ole
} // namespace oox
diff --git a/include/oox/ole/vbacontrol.hxx b/include/oox/ole/vbacontrol.hxx
index fa0ed5ebeda0..01612bdbd332 100644
--- a/include/oox/ole/vbacontrol.hxx
+++ b/include/oox/ole/vbacontrol.hxx
@@ -33,7 +33,7 @@ namespace oox { class StorageBase; }
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. */
@@ -94,7 +94,7 @@ protected:
typedef ::boost::shared_ptr< VbaSiteModel > VbaSiteModelRef;
-// ============================================================================
+
/** A control that is embedded in a VBA user form or in another container
control in a VBA user form.
@@ -171,7 +171,7 @@ private:
AxClassTable maClassTable; ///< Class identifiers for exotic embedded controls.
};
-// ============================================================================
+
class VbaUserForm : public VbaFormControl
{
@@ -196,7 +196,7 @@ private:
ControlConverter maConverter;
};
-// ============================================================================
+
} // namespace ole
} // namespace oox
diff --git a/include/oox/ole/vbahelper.hxx b/include/oox/ole/vbahelper.hxx
index a593a176ba4b..3f9202f5b1cb 100644
--- a/include/oox/ole/vbahelper.hxx
+++ b/include/oox/ole/vbahelper.hxx
@@ -49,7 +49,7 @@ const sal_uInt16 VBA_ID_PROJECTMODULES = 0x000F;
const sal_uInt16 VBA_ID_PROJECTNAME = 0x0004;
const sal_uInt16 VBA_ID_PROJECTVERSION = 0x0009;
-// ============================================================================
+
/** Static helper functions for the VBA filters. */
class VbaHelper
@@ -88,7 +88,7 @@ private:
~VbaHelper();
};
-// ============================================================================
+
} // namespace ole
} // namespace oox
diff --git a/include/oox/ole/vbainputstream.hxx b/include/oox/ole/vbainputstream.hxx
index c4c4f0c1aa51..c0adb5bda13f 100644
--- a/include/oox/ole/vbainputstream.hxx
+++ b/include/oox/ole/vbainputstream.hxx
@@ -26,7 +26,7 @@
namespace oox {
namespace ole {
-// ============================================================================
+
/** A non-seekable input stream that implements run-length decompression. */
class VbaInputStream : public BinaryInputStream
@@ -64,7 +64,7 @@ private:
size_t mnChunkPos;
};
-// ============================================================================
+
} // namespace ole
} // namespace oox
diff --git a/include/oox/ole/vbamodule.hxx b/include/oox/ole/vbamodule.hxx
index 01678bec5264..03d64f6ecd9e 100644
--- a/include/oox/ole/vbamodule.hxx
+++ b/include/oox/ole/vbamodule.hxx
@@ -38,7 +38,7 @@ namespace oox {
namespace oox {
namespace ole {
-// ============================================================================
+
class VbaModule
{
@@ -99,7 +99,7 @@ private:
bool mbExecutable;
};
-// ============================================================================
+
} // namespace ole
} // namespace oox
diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx
index 9c83c67f4eba..0bfd244d04d6 100644
--- a/include/oox/ole/vbaproject.hxx
+++ b/include/oox/ole/vbaproject.hxx
@@ -41,7 +41,7 @@ namespace oox { class GraphicHelper; }
namespace oox {
namespace ole {
-// ============================================================================
+
class OOX_DLLPUBLIC VbaFilterConfig
{
@@ -63,7 +63,7 @@ private:
mxConfigAccess;
};
-// ============================================================================
+
/** Base class for objects that attach a amcro to a specific action.
@@ -104,7 +104,7 @@ private:
typedef ::boost::shared_ptr< VbaMacroAttacherBase > VbaMacroAttacherRef;
-// ============================================================================
+
class OOX_DLLPUBLIC VbaProject : public VbaFilterConfig
{
@@ -205,7 +205,7 @@ private:
VbaModuleMap maModulesByStrm;
};
-// ============================================================================
+
} // namespace ole
} // namespace oox