diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-15 16:10:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-16 10:44:03 +0100 |
| commit | 882cadaac40226ea9b5dbbceb7e82328d5a935ee (patch) | |
| tree | 8739f3398b596ede283f8891bb8a5c7e4f0b941d /include/svx | |
| parent | 67d245adca298134fc8ab4364acbe880b4e0911a (diff) | |
convert EETextFormat to scoped enum
and drop unused BIN constant
Change-Id: I4ecda96f39147f7e9bceb11ecdb4f0ffe42d2053
Reviewed-on: https://gerrit.libreoffice.org/46589
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/svx')
| -rw-r--r-- | include/svx/svdotext.hxx | 5 | ||||
| -rw-r--r-- | include/svx/svdxcgv.hxx | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index a2860906481f..25b1e9095c6d 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -49,6 +49,7 @@ class EditStatus; class TextChain; class TextChainFlow; enum class EEAnchorMode; +enum class EETextFormat; namespace sdr { namespace properties { class TextProperties; @@ -377,8 +378,8 @@ public: void SetDisableAutoWidthOnDragging(bool bOn) { bDisableAutoWidthOnDragging=bOn; } void NbcSetText(const OUString& rStr); void SetText(const OUString& rStr); - void NbcSetText(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat); - void SetText(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat); + void NbcSetText(SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat); + void SetText(SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat); // FitToSize and Fontwork are not taken into account in GetTextSize()! virtual const Size& GetTextSize() const; diff --git a/include/svx/svdxcgv.hxx b/include/svx/svdxcgv.hxx index fe37cdaca05b..8c4deca123b9 100644 --- a/include/svx/svdxcgv.hxx +++ b/include/svx/svdxcgv.hxx @@ -110,7 +110,7 @@ public: const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions); bool Paste(const OUString& rStr, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions); - bool Paste(SvStream& rInput, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions); + bool Paste(SvStream& rInput, EETextFormat eFormat, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions); }; #endif // INCLUDED_SVX_SVDXCGV_HXX |