Kaydet (Commit) 2111f607 authored tarafından Patrick Jaap's avatar Patrick Jaap Kaydeden (comit) Julien Nabet

Fix in convertToOOXMLHoriOrient: values of VertOrient were taken

Change-Id: I47093292aeed5c0579dd4b365561ee86935632e4
Reviewed-on: https://gerrit.libreoffice.org/70197
Tested-by: Jenkins
Reviewed-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
üst 478ecc26
......@@ -517,24 +517,21 @@ static OString convertToOOXMLVertOrient(sal_Int16 nOrient)
}
}
static OString convertToOOXMLHoriOrient(sal_Int16 nOrient)
static OString convertToOOXMLHoriOrient(sal_Int16 nOrient, bool bIsPosToggle)
{
switch( nOrient )
{
case text::VertOrientation::NONE:
case text::HoriOrientation::NONE:
return OString();
case text::VertOrientation::CENTER:
case text::VertOrientation::LINE_CENTER:
return OString( "center" );
case text::VertOrientation::BOTTOM:
return OString( "bottom" );
case text::VertOrientation::LINE_BOTTOM:
return OString( "outside" );
case text::VertOrientation::TOP:
return OString( "top" );
case text::VertOrientation::LINE_TOP:
case text::HoriOrientation::LEFT:
return OString( bIsPosToggle ? "inside" : "left" );
case text::HoriOrientation::RIGHT:
return OString( bIsPosToggle ? "outside" : "right" );
case text::HoriOrientation::CENTER:
// fall-through indended
case text::HoriOrientation::FULL:
default:
return OString( "inside" );
return OString( "center" );
}
}
......@@ -8392,7 +8389,7 @@ void DocxAttributeOutput::FormatVertOrientation( const SwFormatVertOrient& rFlyV
void DocxAttributeOutput::FormatHorizOrientation( const SwFormatHoriOrient& rFlyHori )
{
OString sAlign = convertToOOXMLHoriOrient( rFlyHori.GetHoriOrient() );
OString sAlign = convertToOOXMLHoriOrient( rFlyHori.GetHoriOrient(), rFlyHori.IsPosToggle() );
OString sHAnchor = convertToOOXMLHoriOrientRel( rFlyHori.GetRelationOrient() );
if (m_rExport.SdrExporter().getTextFrameSyntax())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment