diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-12 13:24:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-12 15:42:34 +0200 |
| commit | 4f55dfb564e56515b6ebb4d10b089f67ad628fb6 (patch) | |
| tree | a0a64cff53868567020bc817bc1c5691567071f1 /include | |
| parent | ec366658fcad31165ec6771b397f50cd9a2ffc2c (diff) | |
convert AX_FONTDATA constants to scoped enum
Change-Id: I0de365c8f654973f483d09fc9170f40bda7cbd9e
Reviewed-on: https://gerrit.libreoffice.org/36457
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/ole/axbinarywriter.hxx | 2 | ||||
| -rw-r--r-- | include/oox/ole/axfontdata.hxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/oox/ole/axbinarywriter.hxx b/include/oox/ole/axbinarywriter.hxx index d1fe1a23fcea..c8b1bdb29158 100644 --- a/include/oox/ole/axbinarywriter.hxx +++ b/include/oox/ole/axbinarywriter.hxx @@ -85,7 +85,7 @@ public: /** Write an integer property value to the stream, the respective flag in the property mask is set. */ template< typename StreamType, typename DataType > - void writeIntProperty( DataType& ornValue ) + void writeIntProperty( DataType ornValue ) { if( startNextProperty() ) maOutStrm.writeAligned< StreamType >( ornValue ); } /** Write a boolean property value to the stream, the respective flag in the property mask is set. */ diff --git a/include/oox/ole/axfontdata.hxx b/include/oox/ole/axfontdata.hxx index 3e01af488da4..c255747357fa 100644 --- a/include/oox/ole/axfontdata.hxx +++ b/include/oox/ole/axfontdata.hxx @@ -39,9 +39,9 @@ const sal_uInt32 AX_FONTDATA_STRIKEOUT = 0x00000008; const sal_uInt32 AX_FONTDATA_DISABLED = 0x00002000; const sal_uInt32 AX_FONTDATA_AUTOCOLOR = 0x40000000; -const sal_Int32 AX_FONTDATA_LEFT = 1; -const sal_Int32 AX_FONTDATA_RIGHT = 2; -const sal_Int32 AX_FONTDATA_CENTER = 3; +enum class AxHorizontalAlign { + Left = 1, Right = 2, Center = 3 +}; /** All entries of a font property. */ struct OOX_DLLPUBLIC AxFontData @@ -50,7 +50,7 @@ struct OOX_DLLPUBLIC AxFontData 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. + AxHorizontalAlign mnHorAlign; ///< Horizontal text alignment. bool mbDblUnderline; ///< True = double underline style (legacy VML drawing controls only). explicit AxFontData(); |