diff options
author | Michael Stahl <mstahl@redhat.com> | 2017-10-18 12:28:45 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2017-10-18 12:34:03 +0200 |
commit | e2c85365dfa40c03c6ea04023627366d118bb530 (patch) | |
tree | 55e6c673869f4278e17cd83bea04bb782a2519d0 /include | |
parent | 8304de4701eca8a41f0dd70c84e437707cbb43cf (diff) |
svx: remove pointless duplicate SdrFitToSizeType
Change-Id: I7a59ecfdb8d09ecbc0b760003dbc453ac5646d1c
Diffstat (limited to 'include')
-rw-r--r-- | include/svx/sdtfsitm.hxx | 24 | ||||
-rw-r--r-- | include/svx/svddef.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdotext.hxx | 2 |
3 files changed, 10 insertions, 18 deletions
diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx index 51909e891de5..2c9d6bb75ddb 100644 --- a/include/svx/sdtfsitm.hxx +++ b/include/svx/sdtfsitm.hxx @@ -19,33 +19,25 @@ #ifndef INCLUDED_SVX_SDTFSITM_HXX #define INCLUDED_SVX_SDTFSITM_HXX +#include <com/sun/star/drawing/TextFitToSizeType.hpp> + #include <svl/eitem.hxx> #include <svx/svddef.hxx> #include <svx/svxdllapi.h> -enum class SdrFitToSizeType -{ - NONE, // - no fit-to-size - Proportional, // - resize all glyphs proportionally - // (might scale anisotrophically) - AllLines, // - like SdrFitToSizeType::Proportional, but - // scales each line separately - Autofit // - mimics PPT's automatic adaption of - // font size to text rect - comparable - // to SdrFitToSizeType::Proportional, but - // scales isotrophically -}; -// No AutoGrow and no automatic line breaks for -// SdrFitToSizeType::Proportional and SdrFitToSizeType::AllLines. // No automatic line breaks for AutoGrowingWidth as well (only if // TextMaxFrameWidth is reached). -class SVX_DLLPUBLIC SdrTextFitToSizeTypeItem: public SfxEnumItem<SdrFitToSizeType> { +class SVX_DLLPUBLIC SdrTextFitToSizeTypeItem + : public SfxEnumItem<css::drawing::TextFitToSizeType> +{ public: static SfxPoolItem* CreateDefault(); - SdrTextFitToSizeTypeItem(SdrFitToSizeType eFit=SdrFitToSizeType::NONE): SfxEnumItem(SDRATTR_TEXT_FITTOSIZE, eFit) {} + SdrTextFitToSizeTypeItem( + css::drawing::TextFitToSizeType const eFit = css::drawing::TextFitToSizeType_NONE) + : SfxEnumItem(SDRATTR_TEXT_FITTOSIZE, eFit) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx index eed623e04149..61e61df07ffc 100644 --- a/include/svx/svddef.hxx +++ b/include/svx/svddef.hxx @@ -88,7 +88,7 @@ #define SDRATTR_ECKENRADIUS (SDRATTR_MISC_FIRST + 0) /* 1097 */ /* 1097 */ /* 1080 long, def=0 */ #define SDRATTR_TEXT_MINFRAMEHEIGHT (SDRATTR_MISC_FIRST + 1) /* 1098 */ /* 1098 */ /* 1081 long, def=0 */ #define SDRATTR_TEXT_AUTOGROWHEIGHT (SDRATTR_MISC_FIRST + 2) /* 1099 */ /* 1099 */ /* 1082 sal_Bool, def=sal_True */ -#define SDRATTR_TEXT_FITTOSIZE (SDRATTR_MISC_FIRST + 3) /* 1100 */ /* 1100 */ /* 1083 enum, def=SdrFitToSizeType::NONE */ +#define SDRATTR_TEXT_FITTOSIZE (SDRATTR_MISC_FIRST + 3) /* 1100 */ /* 1100 */ /* 1083 enum, def=css::drawing::TextFitToSizeType_NONE */ #define SDRATTR_TEXT_LEFTDIST (SDRATTR_MISC_FIRST + 4) /* 1101 */ /* 1101 */ /* 1084 long, def=0 */ /* Pool V2 */ #define SDRATTR_TEXT_RIGHTDIST (SDRATTR_MISC_FIRST + 5) /* 1102 */ /* 1102 */ /* 1085 long, def=0 */ /* Pool V2 */ #define SDRATTR_TEXT_UPPERDIST (SDRATTR_MISC_FIRST + 6) /* 1103 */ /* 1103 */ /* 1086 long, def=0 */ /* Pool V2 */ diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 33fa54a321fa..a2860906481f 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -400,7 +400,7 @@ public: long GetMinTextFrameWidth() const; long GetMaxTextFrameWidth() const; - SdrFitToSizeType GetFitToSize() const; + css::drawing::TextFitToSizeType GetFitToSize() const; const tools::Rectangle &GetGeoRect() const; // check if it's a TextFontwork |