diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-30 15:47:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-31 06:59:31 +0000 |
| commit | dcffc21805828ddff7de1282f3d40ffdf3fac38d (patch) | |
| tree | 1b4e81850b3fcd42cee470a18413745732c36c4a /include | |
| parent | 7fca8e61ce992e9dc6f900b77142a123c0c10b6d (diff) | |
use actual UNO enums in svx
Change-Id: I00f53260667861ca2595892b5605479da3401adb
Reviewed-on: https://gerrit.libreoffice.org/35913
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/fillctrl.hxx | 2 | ||||
| -rw-r--r-- | include/svx/swframeexample.hxx | 12 | ||||
| -rw-r--r-- | include/svx/swframevalidation.hxx | 6 |
3 files changed, 13 insertions, 7 deletions
diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx index c7181a8a1ab3..3ee9d551a6ed 100644 --- a/include/svx/fillctrl.hxx +++ b/include/svx/fillctrl.hxx @@ -55,7 +55,7 @@ private: VclPtr<ToolBox> mpToolBoxColor; VclPtr<SvxFillAttrBox> mpLbFillAttr; - sal_uInt16 meLastXFS; + css::drawing::FillStyle meLastXFS; sal_Int32 mnLastPosGradient; sal_Int32 mnLastPosHatch; sal_Int32 mnLastPosBitmap; diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx index bc1928029e18..a780f5770add 100644 --- a/include/svx/swframeexample.hxx +++ b/include/svx/swframeexample.hxx @@ -24,6 +24,8 @@ #include <tools/color.hxx> #include <tools/gen.hxx> #include <svx/svxdllapi.h> +#include <com/sun/star/text/TextContentAnchorType.hpp> +#include <com/sun/star/text/WrapTextMode.hpp> // class SwFrmPagePreview ------------------------------------------------------- @@ -55,8 +57,10 @@ class SVX_DLLPUBLIC SvxSwFrameExample : public vcl::Window short nVAlign; short nVRel; - short nWrap; - short nAnchor; + css::text::WrapTextMode + nWrap; + css::text::TextContentAnchorType + nAnchor; bool bTrans; Point aRelPos; @@ -74,7 +78,7 @@ public: SvxSwFrameExample(vcl::Window* pParent, WinBits nStyle); - void SetWrap(sal_uInt16 nW) { nWrap = nW; } + void SetWrap(css::text::WrapTextMode nW) { nWrap = nW; } void SetHAlign(short nH) { nHAlign = nH; } void SetHoriRel(short nR) { nHRel = nR; } @@ -83,7 +87,7 @@ public: void SetVertRel(short nR) { nVRel = nR; } void SetTransparent(bool bT) { bTrans = bT; } - void SetAnchor(short nA) { nAnchor = nA; } + void SetAnchor(css::text::TextContentAnchorType nA) { nAnchor = nA; } void SetRelPos(const Point& rP); }; diff --git a/include/svx/swframevalidation.hxx b/include/svx/swframevalidation.hxx index 124434f1e343..cb75145937c8 100644 --- a/include/svx/swframevalidation.hxx +++ b/include/svx/swframevalidation.hxx @@ -18,16 +18,18 @@ */ #ifndef INCLUDED_SVX_SWFRAMEVALIDATION_HXX #define INCLUDED_SVX_SWFRAMEVALIDATION_HXX + #include <sal/types.h> #include <tools/gen.hxx> #include <limits.h> +#include <com/sun/star/text/TextContentAnchorType.hpp> /* struct to determine min/max values for fly frame positioning in Writer */ struct SvxSwFrameValidation { - sal_Int16 nAnchorType; //css::text::TextContentAnchorType + css::text::TextContentAnchorType nAnchorType; sal_Int16 nHoriOrient; //css::text::HoriOrientation sal_Int16 nVertOrient; //css::text::VertOrientation sal_Int16 nHRelOrient; //css::text::RelOrientation @@ -56,7 +58,7 @@ struct SvxSwFrameValidation Size aPercentSize; // Size for 100% value SvxSwFrameValidation() : - nAnchorType(0), + nAnchorType(css::text::TextContentAnchorType_AT_PARAGRAPH), nHoriOrient(0), nVertOrient(0), nHRelOrient(0), |