diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-31 13:49:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-03 06:24:33 +0000 |
| commit | 4809096a1f60d9ef57a494ba6ae8fb8541361572 (patch) | |
| tree | 6d83f7a2c806eeb28c72ba0f83cbb5ae8db275d0 /sw/inc | |
| parent | fcad02149f3a9964f36522d97faaf303fc321788 (diff) | |
use actual UNO enums in sw
Change-Id: If0f4a6532cc255f632d88d97e6b1a9e57462f5fc
Reviewed-on: https://gerrit.libreoffice.org/35969
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/fmtruby.hxx | 15 | ||||
| -rw-r--r-- | sw/inc/unosett.hxx | 5 |
2 files changed, 11 insertions, 9 deletions
diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx index dcf5575ce873..646a26f7df43 100644 --- a/sw/inc/fmtruby.hxx +++ b/sw/inc/fmtruby.hxx @@ -20,6 +20,7 @@ #define INCLUDED_SW_INC_FMTRUBY_HXX #include <svl/poolitem.hxx> +#include <com/sun/star/text/RubyAdjust.hpp> class SwTextRuby; @@ -27,12 +28,12 @@ class SW_DLLPUBLIC SwFormatRuby : public SfxPoolItem { friend class SwTextRuby; - OUString sRubyText; ///< The ruby txt. - OUString sCharFormatName; ///< Name of the charformat. - SwTextRuby* pTextAttr; ///< The TextAttribute. - sal_uInt16 nCharFormatId; ///< PoolId of the charformat. + OUString sRubyText; ///< The ruby txt. + OUString sCharFormatName; ///< Name of the charformat. + SwTextRuby* pTextAttr; ///< The TextAttribute. + sal_uInt16 nCharFormatId; ///< PoolId of the charformat. sal_uInt16 nPosition; ///< Position of the Ruby-character. - sal_uInt16 nAdjustment; ///< Specific adjustment of the Ruby-ch. + css::text::RubyAdjust nAdjustment; ///< Specific adjustment of the Ruby-ch. public: SwFormatRuby( const OUString& rRubyText ); @@ -68,8 +69,8 @@ public: sal_uInt16 GetPosition() const { return nPosition; } void SetPosition( sal_uInt16 nNew ) { nPosition = nNew; } - sal_uInt16 GetAdjustment() const { return nAdjustment; } - void SetAdjustment( sal_uInt16 nNew ) { nAdjustment = nNew; } + css::text::RubyAdjust GetAdjustment() const { return nAdjustment; } + void SetAdjustment( css::text::RubyAdjust nNew ) { nAdjustment = nNew; } }; #endif diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx index 0c2e9c796e95..96668f3680c0 100644 --- a/sw/inc/unosett.hxx +++ b/sw/inc/unosett.hxx @@ -28,6 +28,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XNamed.hpp> +#include <com/sun/star/style/VerticalAlignment.hpp> #include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase4.hxx> #include <cppuhelper/implbase5.hxx> @@ -257,7 +258,7 @@ class SwXTextColumns : public cppu::WeakAggImplHelper4 sal_Int32 nSepLineWidth; sal_Int32 nSepLineColor; sal_Int8 nSepLineHeightRelative; - sal_Int8 nSepLineVertAlign;//style::VerticalAlignment + css::style::VerticalAlignment nSepLineVertAlign; bool bSepLineIsOn; sal_Int8 nSepLineStyle; @@ -296,7 +297,7 @@ public: sal_Int32 GetSepLineWidth() const {return nSepLineWidth;} sal_Int32 GetSepLineColor() const {return nSepLineColor;} sal_Int8 GetSepLineHeightRelative() const {return nSepLineHeightRelative;} - sal_Int8 GetSepLineVertAlign() const {return nSepLineVertAlign;} + css::style::VerticalAlignment GetSepLineVertAlign() const {return nSepLineVertAlign;} bool GetSepLineIsOn() const {return bSepLineIsOn;} sal_Int8 GetSepLineStyle() const {return nSepLineStyle;} |