diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-02 09:22:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-02 07:58:24 +0000 |
| commit | 1e2bd1771808da00ec959995ab1284c6193a57f5 (patch) | |
| tree | 67f08641cc63649d1e072b48e1269eb187f509ec /sw/source/filter/ww8/rtfattributeoutput.cxx | |
| parent | 04fe439b053f2d361e74975a4b66cd359980976e (diff) | |
elide the SwSurround enum
no point in redeclaring an existing enum exactly
Change-Id: I4fb367e4b27e36601f1f36b629097a87b5f00096
Reviewed-on: https://gerrit.libreoffice.org/34773
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/filter/ww8/rtfattributeoutput.cxx')
| -rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 30942293853a..5cb920df4e77 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -3040,10 +3040,10 @@ void RtfAttributeOutput::FormatSurround(const SwFormatSurround& rSurround) { if (m_rExport.m_bOutFlyFrameAttrs && !m_rExport.m_bRTFFlySyntax) { - SwSurround eSurround = rSurround.GetSurround(); - bool bGold = SURROUND_IDEAL == eSurround; + css::text::WrapTextMode eSurround = rSurround.GetSurround(); + bool bGold = css::text::WrapTextMode_DYNAMIC == eSurround; if (bGold) - eSurround = SURROUND_PARALLEL; + eSurround = css::text::WrapTextMode_PARALLEL; RTFSurround aMC(bGold, static_cast< sal_uInt8 >(eSurround)); m_aRunText->append(OOO_STRING_SVTOOLS_RTF_FLYMAINCNT); m_aRunText->append((sal_Int32) aMC.GetValue()); @@ -3055,17 +3055,17 @@ void RtfAttributeOutput::FormatSurround(const SwFormatSurround& rSurround) boost::optional<sal_Int32> oWrk; switch (rSurround.GetValue()) { - case SURROUND_NONE: + case css::text::WrapTextMode_NONE: nWr = 1; // top and bottom break; - case SURROUND_THROUGHT: + case css::text::WrapTextMode_THROUGHT: nWr = 3; // none break; - case SURROUND_PARALLEL: + case css::text::WrapTextMode_PARALLEL: nWr = 2; // around oWrk = 0; // both sides break; - case SURROUND_IDEAL: + case css::text::WrapTextMode_DYNAMIC: default: nWr = 2; // around oWrk = 3; // largest |