[Libreoffice-commits] .: oox/inc
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Aug 22 04:44:26 PDT 2012
oox/inc/oox/ole/axbinaryreader.hxx | 30 ++--
oox/inc/oox/ole/axbinarywriter.hxx | 34 ++--
oox/inc/oox/ole/axcontrol.hxx | 236 +++++++++++++++++-----------------
oox/inc/oox/ole/axcontrolfragment.hxx | 2
oox/inc/oox/ole/axfontdata.hxx | 12 -
oox/inc/oox/ole/olehelper.hxx | 10 -
oox/inc/oox/ole/oleobjecthelper.hxx | 8 -
oox/inc/oox/ole/olestorage.hxx | 6
8 files changed, 169 insertions(+), 169 deletions(-)
New commits:
commit 0e3510d14e46b0986a58a1aaffadbf6e42261abd
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Wed Aug 22 13:42:42 2012 +0200
oox: fix doxygen errors in ole headers
Change-Id: Iae78fa7487e2646b1ba61101c5e39d304388a5c6
diff --git a/oox/inc/oox/ole/axbinaryreader.hxx b/oox/inc/oox/ole/axbinaryreader.hxx
index 2607402..d88ea80 100644
--- a/oox/inc/oox/ole/axbinaryreader.hxx
+++ b/oox/inc/oox/ole/axbinaryreader.hxx
@@ -76,9 +76,9 @@ public:
inline void skipAligned() { align( sizeof( Type ) ); skip( sizeof( Type ) ); }
private:
- BinaryInputStream* mpInStrm; /// The wrapped input stream.
- sal_Int64 mnStrmPos; /// Tracks relative position in the stream.
- sal_Int64 mnStrmSize; /// Size of the wrapped stream data.
+ BinaryInputStream* mpInStrm; ///< The wrapped input stream.
+ sal_Int64 mnStrmPos; ///< Tracks relative position in the stream.
+ sal_Int64 mnStrmSize; ///< Size of the wrapped stream data.
};
// ============================================================================
@@ -233,18 +233,18 @@ private:
typedef RefVector< ComplexProperty > ComplexPropVector;
private:
- AxAlignedInputStream maInStrm; /// The input stream to read from.
- ComplexPropVector maLargeProps; /// Stores info for all used large properties.
- ComplexPropVector maStreamProps; /// Stores info for all used stream data properties.
- AxPairData maDummyPairData; /// Dummy pair for unsupported properties.
- AxFontData maDummyFontData; /// Dummy font for unsupported properties.
- StreamDataSequence maDummyPicData; /// Dummy picture for unsupported properties.
- ::rtl::OUString maDummyString; /// Dummy string for unsupported properties.
- AxStringArray maDummyStringArray; /// Dummy string array for unsupported properties.
- sal_Int64 mnPropFlags; /// Flags specifying existing properties.
- sal_Int64 mnNextProp; /// Next property to read.
- sal_Int64 mnPropsEnd; /// End position of simple/large properties.
- bool mbValid; /// True = stream still valid.
+ AxAlignedInputStream maInStrm; ///< The input stream to read from.
+ ComplexPropVector maLargeProps; ///< Stores info for all used large properties.
+ ComplexPropVector maStreamProps; ///< Stores info for all used stream data properties.
+ AxPairData maDummyPairData; ///< Dummy pair for unsupported properties.
+ AxFontData maDummyFontData; ///< Dummy font for unsupported properties.
+ StreamDataSequence maDummyPicData; ///< Dummy picture for unsupported properties.
+ ::rtl::OUString maDummyString; ///< Dummy string for unsupported properties.
+ AxStringArray maDummyStringArray; ///< Dummy string array for unsupported properties.
+ sal_Int64 mnPropFlags; ///< Flags specifying existing properties.
+ sal_Int64 mnNextProp; ///< Next property to read.
+ sal_Int64 mnPropsEnd; ///< End position of simple/large properties.
+ bool mbValid; ///< True = stream still valid.
};
// ============================================================================
diff --git a/oox/inc/oox/ole/axbinarywriter.hxx b/oox/inc/oox/ole/axbinarywriter.hxx
index 227ac41..fbd0921 100644
--- a/oox/inc/oox/ole/axbinarywriter.hxx
+++ b/oox/inc/oox/ole/axbinarywriter.hxx
@@ -81,10 +81,10 @@ public:
inline void padAligned() { align( sizeof( Type ) ); pad( sizeof( Type ) ); }
private:
- BinaryOutputStream* mpOutStrm; /// The wrapped input stream.
- sal_Int64 mnStrmPos; /// Tracks relative position in the stream.
- sal_Int64 mnStrmSize; /// Size of the wrapped stream data.
- sal_Int64 mnWrappedBeginPos; /// starting pos or wrapped stream
+ BinaryOutputStream* mpOutStrm; ///< The wrapped input stream.
+ sal_Int64 mnStrmPos; ///< Tracks relative position in the stream.
+ sal_Int64 mnStrmSize; ///< Size of the wrapped stream data.
+ sal_Int64 mnWrappedBeginPos; ///< starting pos or wrapped stream
};
/** A pair of integer values as a property. */
@@ -170,19 +170,19 @@ private:
typedef RefVector< ComplexProperty > ComplexPropVector;
private:
- AxAlignedOutputStream maOutStrm; /// The input stream to read from.
- ComplexPropVector maLargeProps; /// Stores info for all used large properties.
- ComplexPropVector maStreamProps; /// Stores info for all used stream data properties.
- AxPairData maDummyPairData; /// Dummy pair for unsupported properties.
- StreamDataSequence maDummyPicData; /// Dummy picture for unsupported properties.
- ::rtl::OUString maDummyString; /// Dummy string for unsupported properties.
- AxStringArray maDummyStringArray; /// Dummy string array for unsupported properties.
- sal_Int16 mnBlockSize; ///
- sal_Int64 mnPropFlagsStart; /// pos of Prop flags
- sal_Int64 mnPropFlags; /// Flags specifying existing properties.
- sal_Int64 mnNextProp; /// Next property to read.
- sal_Int64 mnPropsEnd; /// End position of simple/large properties.
- bool mbValid; /// True = stream still valid.
+ AxAlignedOutputStream maOutStrm; ///< The input stream to read from.
+ ComplexPropVector maLargeProps; ///< Stores info for all used large properties.
+ ComplexPropVector maStreamProps; ///< Stores info for all used stream data properties.
+ AxPairData maDummyPairData; ///< Dummy pair for unsupported properties.
+ StreamDataSequence maDummyPicData; ///< Dummy picture for unsupported properties.
+ ::rtl::OUString maDummyString; ///< Dummy string for unsupported properties.
+ AxStringArray maDummyStringArray; ///< Dummy string array for unsupported properties.
+ sal_Int16 mnBlockSize;
+ sal_Int64 mnPropFlagsStart; ///< pos of Prop flags
+ sal_Int64 mnPropFlags; ///< Flags specifying existing properties.
+ sal_Int64 mnNextProp; ///< Next property to read.
+ sal_Int64 mnPropsEnd; ///< End position of simple/large properties.
+ bool mbValid; ///< True = stream still valid.
bool mb64BitPropFlags;
};
diff --git a/oox/inc/oox/ole/axcontrol.hxx b/oox/inc/oox/ole/axcontrol.hxx
index 4c453c3..c41e764 100644
--- a/oox/inc/oox/ole/axcontrol.hxx
+++ b/oox/inc/oox/ole/axcontrol.hxx
@@ -171,17 +171,17 @@ enum ApiControlType
/** Specifies how a form control supports transparent background. */
enum ApiTransparencyMode
{
- API_TRANSPARENCY_NOTSUPPORTED, /// Control does not support transparency.
- API_TRANSPARENCY_VOID, /// Transparency is enabled by missing fill color.
- API_TRANSPARENCY_PAINTTRANSPARENT /// Transparency is enabled by the 'PaintTransparent' property.
+ API_TRANSPARENCY_NOTSUPPORTED, ///< Control does not support transparency.
+ API_TRANSPARENCY_VOID, ///< Transparency is enabled by missing fill color.
+ API_TRANSPARENCY_PAINTTRANSPARENT ///< Transparency is enabled by the 'PaintTransparent' property.
};
/** Specifies how a form control supports the DefaultState property. */
enum ApiDefaultStateMode
{
- API_DEFAULTSTATE_BOOLEAN, /// Control does not support tri-state, state is given as boolean.
- API_DEFAULTSTATE_SHORT, /// Control does not support tri-state, state is given as short.
- API_DEFAULTSTATE_TRISTATE /// Control supports tri-state, state is given as short.
+ API_DEFAULTSTATE_BOOLEAN, ///< Control does not support tri-state, state is given as boolean.
+ API_DEFAULTSTATE_SHORT, ///< Control does not support tri-state, state is given as short.
+ API_DEFAULTSTATE_TRISTATE ///< Control supports tri-state, state is given as short.
};
// ----------------------------------------------------------------------------
@@ -378,10 +378,10 @@ public:
void convertSize( PropertyMap& rPropMap, const ControlConverter& rConv ) const;
public: // direct access needed for legacy VML drawing controls
- AxPairData maSize; /// Size of the control in 1/100 mm.
+ AxPairData maSize; ///< Size of the control in 1/100 mm.
protected:
- bool mbAwtModel; /// True = AWT control model, false = form component.
+ bool mbAwtModel; ///< True = AWT control model, false = form component.
};
typedef ::boost::shared_ptr< ControlModelBase > ControlModelRef;
@@ -418,16 +418,16 @@ private:
bool importComplexPart( BinaryInputStream& rInStrm );
protected:
- StdFontInfo maFontData; /// Font formatting.
- StreamDataSequence maMouseIcon; /// Binary picture stream for mouse icon.
- sal_uInt32 mnFlags; /// Common flags for ComCtl controls.
- const sal_uInt16 mnVersion; /// Current version of the ComCtl control model.
+ StdFontInfo maFontData; ///< Font formatting.
+ StreamDataSequence maMouseIcon; ///< Binary picture stream for mouse icon.
+ sal_uInt32 mnFlags; ///< Common flags for ComCtl controls.
+ const sal_uInt16 mnVersion; ///< Current version of the ComCtl control model.
private:
- sal_uInt32 mnDataPartId5; /// Identifier for version 5.0 control data.
- sal_uInt32 mnDataPartId6; /// Identifier for version 6.0 control data.
- bool mbCommonPart; /// True = the COMCTL_COMMONDATA part exists.
- bool mbComplexPart; /// True = the COMCTL_COMPLEXDATA part exists.
+ sal_uInt32 mnDataPartId5; ///< Identifier for version 5.0 control data.
+ sal_uInt32 mnDataPartId6; ///< Identifier for version 6.0 control data.
+ bool mbCommonPart; ///< True = the COMCTL_COMMONDATA part exists.
+ bool mbComplexPart; ///< True = the COMCTL_COMPLEXDATA part exists.
};
// ============================================================================
@@ -445,12 +445,12 @@ protected:
virtual void importControlData( BinaryInputStream& rInStrm );
private:
- sal_uInt32 mnScrollBarFlags; /// Special flags for scroll bar model.
- sal_Int32 mnLargeChange; /// Increment step size (thumb).
- sal_Int32 mnSmallChange; /// Increment step size (buttons).
- sal_Int32 mnMin; /// Minimum of the value range.
- sal_Int32 mnMax; /// Maximum of the value range.
- sal_Int32 mnPosition; /// Value of the spin button.
+ sal_uInt32 mnScrollBarFlags; ///< Special flags for scroll bar model.
+ sal_Int32 mnLargeChange; ///< Increment step size (thumb).
+ sal_Int32 mnSmallChange; ///< Increment step size (buttons).
+ sal_Int32 mnMin; ///< Minimum of the value range.
+ sal_Int32 mnMax; ///< Maximum of the value range.
+ sal_Int32 mnPosition; ///< Value of the spin button.
};
// ============================================================================
@@ -468,10 +468,10 @@ protected:
virtual void importControlData( BinaryInputStream& rInStrm );
private:
- float mfMin; /// Minimum of the value range.
- float mfMax; /// Maximum of the value range.
- sal_uInt16 mnVertical; /// 0 = horizontal, 1 = vertical.
- sal_uInt16 mnSmooth; /// 0 = progress blocks, 1 = pixel resolution.
+ float mfMin; ///< Minimum of the value range.
+ float mfMax; ///< Maximum of the value range.
+ sal_uInt16 mnVertical; ///< 0 = horizontal, 1 = vertical.
+ sal_uInt16 mnSmooth; ///< 0 = progress blocks, 1 = pixel resolution.
};
// ============================================================================
@@ -503,10 +503,10 @@ public:
inline sal_Int16 getFontHeight() const { return maFontData.getHeightPoints(); }
public: // direct access needed for legacy VML drawing controls
- AxFontData maFontData; /// The font settings.
+ AxFontData maFontData; ///< The font settings.
private:
- bool mbSupportsAlign; /// True = UNO model supports Align property.
+ bool mbSupportsAlign; ///< True = UNO model supports Align property.
};
// ============================================================================
@@ -528,14 +528,14 @@ public:
virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv );
public: // direct access needed for legacy VML drawing controls
- StreamDataSequence maPictureData; /// Binary picture stream.
- ::rtl::OUString maCaption; /// Visible caption of the button.
- sal_uInt32 mnTextColor; /// Text color.
- sal_uInt32 mnBackColor; /// Fill color.
- sal_uInt32 mnFlags; /// Various flags.
- sal_uInt32 mnPicturePos; /// Position of the picture relative to text.
- sal_Int32 mnVerticalAlign; /// Vertical alignment (legacy VML drawing controls only).
- bool mbFocusOnClick; /// True = take focus on click.
+ StreamDataSequence maPictureData; ///< Binary picture stream.
+ ::rtl::OUString maCaption; ///< Visible caption of the button.
+ sal_uInt32 mnTextColor; ///< Text color.
+ sal_uInt32 mnBackColor; ///< Fill color.
+ sal_uInt32 mnFlags; ///< Various flags.
+ sal_uInt32 mnPicturePos; ///< Position of the picture relative to text.
+ sal_Int32 mnVerticalAlign; ///< Vertical alignment (legacy VML drawing controls only).
+ bool mbFocusOnClick; ///< True = take focus on click.
};
// ============================================================================
@@ -556,14 +556,14 @@ public:
virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv );
public: // direct access needed for legacy VML drawing controls
- ::rtl::OUString maCaption; /// Visible caption of the button.
- sal_uInt32 mnTextColor; /// Text color.
- sal_uInt32 mnBackColor; /// Fill color.
- sal_uInt32 mnFlags; /// Various flags.
- sal_uInt32 mnBorderColor; /// Flat border color.
- sal_Int32 mnBorderStyle; /// Flat border style.
- sal_Int32 mnSpecialEffect; /// 3D border effect.
- sal_Int32 mnVerticalAlign; /// Vertical alignment (legacy VML drawing controls only).
+ ::rtl::OUString maCaption; ///< Visible caption of the button.
+ sal_uInt32 mnTextColor; ///< Text color.
+ sal_uInt32 mnBackColor; ///< Fill color.
+ sal_uInt32 mnFlags; ///< Various flags.
+ sal_uInt32 mnBorderColor; ///< Flat border color.
+ sal_Int32 mnBorderStyle; ///< Flat border style.
+ sal_Int32 mnSpecialEffect; ///< 3D border effect.
+ sal_Int32 mnVerticalAlign; ///< Vertical alignment (legacy VML drawing controls only).
};
// ============================================================================
@@ -584,15 +584,15 @@ public:
virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const;
private:
- StreamDataSequence maPictureData; /// Binary picture stream.
- sal_uInt32 mnBackColor; /// Fill color.
- sal_uInt32 mnFlags; /// Various flags.
- sal_uInt32 mnBorderColor; /// Flat border color.
- sal_Int32 mnBorderStyle; /// Flat border style.
- sal_Int32 mnSpecialEffect; /// 3D border effect.
- sal_Int32 mnPicSizeMode; /// Clip, stretch, zoom.
- sal_Int32 mnPicAlign; /// Anchor position of the picture.
- bool mbPicTiling; /// True = picture is repeated.
+ StreamDataSequence maPictureData; ///< Binary picture stream.
+ sal_uInt32 mnBackColor; ///< Fill color.
+ sal_uInt32 mnFlags; ///< Various flags.
+ sal_uInt32 mnBorderColor; ///< Flat border color.
+ sal_Int32 mnBorderStyle; ///< Flat border style.
+ sal_Int32 mnSpecialEffect; ///< 3D border effect.
+ sal_Int32 mnPicSizeMode; ///< Clip, stretch, zoom.
+ sal_Int32 mnPicAlign; ///< Anchor position of the picture.
+ bool mbPicTiling; ///< True = picture is repeated.
};
// ============================================================================
@@ -610,26 +610,26 @@ public:
virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const;
public: // direct access needed for legacy VML drawing controls
- StreamDataSequence maPictureData; /// Binary picture stream.
- ::rtl::OUString maCaption; /// Visible caption of the button.
- ::rtl::OUString maValue; /// Current value of the control.
- ::rtl::OUString maGroupName; /// Group name for option buttons.
- sal_uInt32 mnTextColor; /// Text color.
- sal_uInt32 mnBackColor; /// Fill color.
- sal_uInt32 mnFlags; /// Various flags.
- sal_uInt32 mnPicturePos; /// Position of the picture relative to text.
- sal_uInt32 mnBorderColor; /// Flat border color.
- sal_Int32 mnBorderStyle; /// Flat border style.
- sal_Int32 mnSpecialEffect; /// 3D border effect.
- sal_Int32 mnDisplayStyle; /// Type of the morph control.
- sal_Int32 mnMultiSelect; /// Selection mode.
- sal_Int32 mnScrollBars; /// Horizontal/vertical scroll bar.
- sal_Int32 mnMatchEntry; /// Auto completion mode.
- sal_Int32 mnShowDropButton; /// When to show the dropdown button.
- sal_Int32 mnMaxLength; /// Maximum character count.
- sal_Int32 mnPasswordChar; /// Password character in edit fields.
- sal_Int32 mnListRows; /// Number of rows in dropdown box.
- sal_Int32 mnVerticalAlign; /// Vertical alignment (legacy VML drawing controls only).
+ StreamDataSequence maPictureData; ///< Binary picture stream.
+ ::rtl::OUString maCaption; ///< Visible caption of the button.
+ ::rtl::OUString maValue; ///< Current value of the control.
+ ::rtl::OUString maGroupName; ///< Group name for option buttons.
+ sal_uInt32 mnTextColor; ///< Text color.
+ sal_uInt32 mnBackColor; ///< Fill color.
+ sal_uInt32 mnFlags; ///< Various flags.
+ sal_uInt32 mnPicturePos; ///< Position of the picture relative to text.
+ sal_uInt32 mnBorderColor; ///< Flat border color.
+ sal_Int32 mnBorderStyle; ///< Flat border style.
+ sal_Int32 mnSpecialEffect; ///< 3D border effect.
+ sal_Int32 mnDisplayStyle; ///< Type of the morph control.
+ sal_Int32 mnMultiSelect; ///< Selection mode.
+ sal_Int32 mnScrollBars; ///< Horizontal/vertical scroll bar.
+ sal_Int32 mnMatchEntry; ///< Auto completion mode.
+ sal_Int32 mnShowDropButton; ///< When to show the dropdown button.
+ sal_Int32 mnMaxLength; ///< Maximum character count.
+ sal_Int32 mnPasswordChar; ///< Password character in edit fields.
+ sal_Int32 mnListRows; ///< Number of rows in dropdown box.
+ sal_Int32 mnVerticalAlign; ///< Vertical alignment (legacy VML drawing controls only).
};
// ============================================================================
@@ -751,15 +751,15 @@ public:
virtual void exportCompObj( BinaryOutputStream& rOutStrm );
public: // direct access needed for legacy VML drawing controls
- sal_uInt32 mnArrowColor; /// Button arrow color.
- sal_uInt32 mnBackColor; /// Fill color.
- sal_uInt32 mnFlags; /// Various flags.
- sal_Int32 mnOrientation; /// Orientation of the buttons.
- sal_Int32 mnMin; /// Minimum of the value range.
- sal_Int32 mnMax; /// Maximum of the value range.
- sal_Int32 mnPosition; /// Value of the spin button.
- sal_Int32 mnSmallChange; /// Increment step size.
- sal_Int32 mnDelay; /// Repeat delay in milliseconds.
+ sal_uInt32 mnArrowColor; ///< Button arrow color.
+ sal_uInt32 mnBackColor; ///< Fill color.
+ sal_uInt32 mnFlags; ///< Various flags.
+ sal_Int32 mnOrientation; ///< Orientation of the buttons.
+ sal_Int32 mnMin; ///< Minimum of the value range.
+ sal_Int32 mnMax; ///< Maximum of the value range.
+ sal_Int32 mnPosition; ///< Value of the spin button.
+ sal_Int32 mnSmallChange; ///< Increment step size.
+ sal_Int32 mnDelay; ///< Repeat delay in milliseconds.
};
// ============================================================================
@@ -780,17 +780,17 @@ public:
virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv );
public: // direct access needed for legacy VML drawing controls
- sal_uInt32 mnArrowColor; /// Button arrow color.
- sal_uInt32 mnBackColor; /// Fill color.
- sal_uInt32 mnFlags; /// Various flags.
- sal_Int32 mnOrientation; /// Orientation of the buttons.
- sal_Int32 mnPropThumb; /// Proportional thumb size.
- sal_Int32 mnMin; /// Minimum of the value range.
- sal_Int32 mnMax; /// Maximum of the value range.
- sal_Int32 mnPosition; /// Value of the spin button.
- sal_Int32 mnSmallChange; /// Increment step size (buttons).
- sal_Int32 mnLargeChange; /// Increment step size (thumb).
- sal_Int32 mnDelay; /// Repeat delay in milliseconds.
+ sal_uInt32 mnArrowColor; ///< Button arrow color.
+ sal_uInt32 mnBackColor; ///< Fill color.
+ sal_uInt32 mnFlags; ///< Various flags.
+ sal_Int32 mnOrientation; ///< Orientation of the buttons.
+ sal_Int32 mnPropThumb; ///< Proportional thumb size.
+ sal_Int32 mnMin; ///< Minimum of the value range.
+ sal_Int32 mnMax; ///< Maximum of the value range.
+ sal_Int32 mnPosition; ///< Value of the spin button.
+ sal_Int32 mnSmallChange; ///< Increment step size (buttons).
+ sal_Int32 mnLargeChange; ///< Increment step size (thumb).
+ sal_Int32 mnDelay; ///< Repeat delay in milliseconds.
};
// ============================================================================
@@ -810,13 +810,13 @@ public:
::rtl::OUString getCaption( sal_Int32 nIndex ) const;
private:
- AxStringArray maCaptions; /// Captions of all tabs.
- sal_uInt32 mnBackColor; /// Fill color.
- sal_uInt32 mnTextColor; /// Text color.
- sal_uInt32 mnFlags; /// Various flags.
- sal_Int32 mnSelectedTab; /// The index of the selected tab.
- sal_uInt32 mnTabStyle; /// Visual style of the tabs.
- sal_Int32 mnTabFlagCount; /// Number of entries in tab flag array.
+ AxStringArray maCaptions; ///< Captions of all tabs.
+ sal_uInt32 mnBackColor; ///< Fill color.
+ sal_uInt32 mnTextColor; ///< Text color.
+ sal_uInt32 mnFlags; ///< Various flags.
+ sal_Int32 mnSelectedTab; ///< The index of the selected tab.
+ sal_uInt32 mnTabStyle; ///< Visual style of the tabs.
+ sal_Int32 mnTabFlagCount; ///< Number of entries in tab flag array.
};
typedef ::boost::shared_ptr< AxTabStripModel > AxTabStripModelRef;
@@ -844,22 +844,22 @@ public:
bool importClassTable( BinaryInputStream& rInStrm, AxClassTable& orClassTable );
public: // direct access needed for legacy VML drawing controls
- StreamDataSequence maPictureData; /// Binary picture stream.
- ::rtl::OUString maCaption; /// Visible caption of the form.
- AxPairData maLogicalSize; /// Logical form size (scroll area).
- AxPairData maScrollPos; /// Scroll position.
- sal_uInt32 mnBackColor; /// Fill color.
- sal_uInt32 mnTextColor; /// Text color.
- sal_uInt32 mnFlags; /// Various flags.
- sal_uInt32 mnBorderColor; /// Flat border color.
- sal_Int32 mnBorderStyle; /// Flat border style.
- sal_Int32 mnScrollBars; /// Horizontal/vertical scroll bar.
- sal_Int32 mnCycleType; /// Cycle in all forms or in this form.
- sal_Int32 mnSpecialEffect; /// 3D border effect.
- sal_Int32 mnPicAlign; /// Anchor position of the picture.
- sal_Int32 mnPicSizeMode; /// Clip, stretch, zoom.
- bool mbPicTiling; /// True = picture is repeated.
- bool mbFontSupport; /// True = control supports the font property.
+ StreamDataSequence maPictureData; ///< Binary picture stream.
+ ::rtl::OUString maCaption; ///< Visible caption of the form.
+ AxPairData maLogicalSize; ///< Logical form size (scroll area).
+ AxPairData maScrollPos; ///< Scroll position.
+ sal_uInt32 mnBackColor; ///< Fill color.
+ sal_uInt32 mnTextColor; ///< Text color.
+ sal_uInt32 mnFlags; ///< Various flags.
+ sal_uInt32 mnBorderColor; ///< Flat border color.
+ sal_Int32 mnBorderStyle; ///< Flat border style.
+ sal_Int32 mnScrollBars; ///< Horizontal/vertical scroll bar.
+ sal_Int32 mnCycleType; ///< Cycle in all forms or in this form.
+ sal_Int32 mnSpecialEffect; ///< 3D border effect.
+ sal_Int32 mnPicAlign; ///< Anchor position of the picture.
+ sal_Int32 mnPicSizeMode; ///< Clip, stretch, zoom.
+ bool mbPicTiling; ///< True = picture is repeated.
+ bool mbFontSupport; ///< True = control supports the font property.
};
typedef ::boost::shared_ptr< AxContainerModelBase > AxContainerModelRef;
@@ -978,8 +978,8 @@ public:
const ControlConverter& rConv );
private:
- ControlModelRef mxModel; /// Control model containing the properties.
- ::rtl::OUString maName; /// Name of the control.
+ ControlModelRef mxModel; ///< Control model containing the properties.
+ ::rtl::OUString maName; ///< Name of the control.
};
// ----------------------------------------------------------------------------
diff --git a/oox/inc/oox/ole/axcontrolfragment.hxx b/oox/inc/oox/ole/axcontrolfragment.hxx
index 3cd11ad..28ae526 100644
--- a/oox/inc/oox/ole/axcontrolfragment.hxx
+++ b/oox/inc/oox/ole/axcontrolfragment.hxx
@@ -43,7 +43,7 @@ public:
private:
ControlModelBase& mrModel;
- sal_Int32 mnPropId; /// Identifier of currently processed property.
+ sal_Int32 mnPropId; ///< Identifier of currently processed property.
};
// ============================================================================
diff --git a/oox/inc/oox/ole/axfontdata.hxx b/oox/inc/oox/ole/axfontdata.hxx
index 3b3838d..2660f38 100644
--- a/oox/inc/oox/ole/axfontdata.hxx
+++ b/oox/inc/oox/ole/axfontdata.hxx
@@ -46,12 +46,12 @@ const sal_Int32 AX_FONTDATA_CENTER = 3;
/** All entries of a font property. */
struct OOX_DLLPUBLIC AxFontData
{
- ::rtl::OUString maFontName; /// Name of the used font.
- sal_uInt32 mnFontEffects; /// Font effect flags.
- sal_Int32 mnFontHeight; /// Height of the font (not really twips, see code).
- sal_Int32 mnFontCharSet; /// Windows character set of the font.
- sal_Int32 mnHorAlign; /// Horizontal text alignment.
- bool mbDblUnderline; /// True = double underline style (legacy VML drawing controls only).
+ ::rtl::OUString maFontName; ///< Name of the used font.
+ sal_uInt32 mnFontEffects; ///< Font effect flags.
+ sal_Int32 mnFontHeight; ///< Height of the font (not really twips, see code).
+ sal_Int32 mnFontCharSet; ///< Windows character set of the font.
+ sal_Int32 mnHorAlign; ///< Horizontal text alignment.
+ bool mbDblUnderline; ///< True = double underline style (legacy VML drawing controls only).
explicit AxFontData();
diff --git a/oox/inc/oox/ole/olehelper.hxx b/oox/inc/oox/ole/olehelper.hxx
index 920f7ae..8825baf 100644
--- a/oox/inc/oox/ole/olehelper.hxx
+++ b/oox/inc/oox/ole/olehelper.hxx
@@ -71,11 +71,11 @@ const sal_uInt8 OLE_STDFONT_STRIKE = 0x08;
/** Stores data about a StdFont font structure. */
struct StdFontInfo
{
- ::rtl::OUString maName; /// Font name.
- sal_uInt32 mnHeight; /// Font height (1/10,000 points).
- sal_uInt16 mnWeight; /// Font weight (normal/bold).
- sal_uInt16 mnCharSet; /// Font charset.
- sal_uInt8 mnFlags; /// Font flags.
+ ::rtl::OUString maName; ///< Font name.
+ sal_uInt32 mnHeight; ///< Font height (1/10,000 points).
+ sal_uInt16 mnWeight; ///< Font weight (normal/bold).
+ sal_uInt16 mnCharSet; ///< Font charset.
+ sal_uInt8 mnFlags; ///< Font flags.
explicit StdFontInfo();
explicit StdFontInfo(
diff --git a/oox/inc/oox/ole/oleobjecthelper.hxx b/oox/inc/oox/ole/oleobjecthelper.hxx
index 2520233..a07f0c3 100644
--- a/oox/inc/oox/ole/oleobjecthelper.hxx
+++ b/oox/inc/oox/ole/oleobjecthelper.hxx
@@ -38,11 +38,11 @@ namespace ole {
/** Contains generic information about an OLE object. */
struct OleObjectInfo
{
- StreamDataSequence maEmbeddedData; /// Data of an embedded OLE object.
- ::rtl::OUString maTargetLink; /// Path to external data for linked OLE object.
+ StreamDataSequence maEmbeddedData; ///< Data of an embedded OLE object.
+ ::rtl::OUString maTargetLink; ///< Path to external data for linked OLE object.
::rtl::OUString maProgId;
- bool mbLinked; /// True = linked OLE object, false = embedded OLE object.
- bool mbShowAsIcon; /// True = show as icon, false = show contents.
+ bool mbLinked; ///< True = linked OLE object, false = embedded OLE object.
+ bool mbShowAsIcon; ///< True = show as icon, false = show contents.
bool mbAutoUpdate;
explicit OleObjectInfo();
diff --git a/oox/inc/oox/ole/olestorage.hxx b/oox/inc/oox/ole/olestorage.hxx
index 91696fc..ff5ab59 100644
--- a/oox/inc/oox/ole/olestorage.hxx
+++ b/oox/inc/oox/ole/olestorage.hxx
@@ -94,10 +94,10 @@ private:
private:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
- mxContext; /// Component context with service manager.
+ mxContext; ///< Component context with service manager.
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
- mxStorage; /// Access to elements of this sub storage.
- const OleStorage* mpParentStorage; /// Parent OLE storage that contains this storage.
+ mxStorage; ///< Access to elements of this sub storage.
+ const OleStorage* mpParentStorage; ///< Parent OLE storage that contains this storage.
};
// ============================================================================
More information about the Libreoffice-commits
mailing list