diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-23 15:00:14 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-25 08:11:05 +0000 |
| commit | 8821dc7f3ad75ec5a686952703dec25e16901656 (patch) | |
| tree | 0f2b771a67edb129c095fa176f280875291cfeb3 /include/xmloff | |
| parent | 3349594bffc1eda4ee1d258be207b40f2f6f9b12 (diff) | |
Convert XMLTextParagraphExport::FrameType to scoped enum
Change-Id: I9e36f6566310e960a2b49f5a57f4b4491d32bb9a
Reviewed-on: https://gerrit.libreoffice.org/25366
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/xmloff')
| -rw-r--r-- | include/xmloff/txtparae.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx index 5e445bd0da09..fc3edc0d7a8d 100644 --- a/include/xmloff/txtparae.hxx +++ b/include/xmloff/txtparae.hxx @@ -105,7 +105,7 @@ class XMLOFF_DLLPUBLIC XMLTextParagraphExport : public XMLStyleExport XMLTextListsHelper* mpTextListsHelper; ::std::vector< XMLTextListsHelper* > maTextListsHelperStack; - enum FrameType { FT_TEXT, FT_GRAPHIC, FT_EMBEDDED, FT_SHAPE }; + enum class FrameType { Text, Graphic, Embedded, Shape }; public: enum FieldmarkType { NONE, TEXT, CHECK }; // Used for simulating fieldmarks in OpenDocument 1.n Strict (for n <= 2). CHECK currently ignored. @@ -607,7 +607,7 @@ inline void XMLTextParagraphExport::exportTextFrame( bool bAutoStyles, bool bIsProgress, bool bExportContent, const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet) { - exportAnyTextFrame( rTextContent, FT_TEXT, bAutoStyles, bIsProgress, + exportAnyTextFrame( rTextContent, FrameType::Text, bAutoStyles, bIsProgress, bExportContent, pRangePropSet ); } @@ -616,7 +616,7 @@ inline void XMLTextParagraphExport::exportTextGraphic( bool bAutoStyles, const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet ) { - exportAnyTextFrame( rTextContent, FT_GRAPHIC, bAutoStyles, false, + exportAnyTextFrame( rTextContent, FrameType::Graphic, bAutoStyles, false, true, pRangePropSet ); } @@ -625,7 +625,7 @@ inline void XMLTextParagraphExport::exportTextEmbedded( bool bAutoStyles, const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet ) { - exportAnyTextFrame( rTextContent, FT_EMBEDDED, bAutoStyles, false, + exportAnyTextFrame( rTextContent, FrameType::Embedded, bAutoStyles, false, true, pRangePropSet ); } @@ -634,7 +634,7 @@ inline void XMLTextParagraphExport::exportShape( bool bAutoStyles, const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet ) { - exportAnyTextFrame( rTextContent, FT_SHAPE, bAutoStyles, false, + exportAnyTextFrame( rTextContent, FrameType::Shape, bAutoStyles, false, true, pRangePropSet ); } |