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/docxattributeoutput.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/docxattributeoutput.cxx')
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index e5ce36a58bb8..80ea26fdb94f 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -396,16 +396,16 @@ void DocxAttributeOutput::PopulateFrameProperties(const SwFrameFormat* pFrameFor switch (pFrameFormat->GetSurround().GetValue()) { - case SURROUND_NONE: + case css::text::WrapTextMode_NONE: attrList->add( FSNS( XML_w, XML_wrap), "none"); break; - case SURROUND_THROUGHT: + case css::text::WrapTextMode_THROUGHT: attrList->add( FSNS( XML_w, XML_wrap), "through"); break; - case SURROUND_PARALLEL: + case css::text::WrapTextMode_PARALLEL: attrList->add( FSNS( XML_w, XML_wrap), "notBeside"); break; - case SURROUND_IDEAL: + case css::text::WrapTextMode_DYNAMIC: default: attrList->add( FSNS( XML_w, XML_wrap), "auto"); break; @@ -7475,25 +7475,25 @@ void DocxAttributeOutput::FormatSurround( const SwFormatSurround& rSurround ) OString sType, sSide; switch (rSurround.GetSurround()) { - case SURROUND_NONE: + case css::text::WrapTextMode_NONE: sType = "topAndBottom"; break; - case SURROUND_PARALLEL: + case css::text::WrapTextMode_PARALLEL: sType = "square"; break; - case SURROUND_IDEAL: + case css::text::WrapTextMode_DYNAMIC: sType = "square"; sSide = "largest"; break; - case SURROUND_LEFT: + case css::text::WrapTextMode_LEFT: sType = "square"; sSide = "left"; break; - case SURROUND_RIGHT: + case css::text::WrapTextMode_RIGHT: sType = "square"; sSide = "right"; break; - case SURROUND_THROUGHT: + case css::text::WrapTextMode_THROUGHT: /* empty type and side means throught */ default: break; @@ -7515,16 +7515,16 @@ void DocxAttributeOutput::FormatSurround( const SwFormatSurround& rSurround ) OString sWrap( "auto" ); switch ( rSurround.GetSurround( ) ) { - case SURROUND_NONE: + case css::text::WrapTextMode_NONE: sWrap = OString( "none" ); break; - case SURROUND_THROUGHT: + case css::text::WrapTextMode_THROUGHT: sWrap = OString( "through" ); break; - case SURROUND_IDEAL: - case SURROUND_PARALLEL: - case SURROUND_LEFT: - case SURROUND_RIGHT: + case css::text::WrapTextMode_DYNAMIC: + case css::text::WrapTextMode_PARALLEL: + case css::text::WrapTextMode_LEFT: + case css::text::WrapTextMode_RIGHT: default: sWrap = OString( "around" ); } |