summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
authorAttila Bakos <bakos.attilakaroly@nisz.hu>2020-04-09 17:10:22 +0200
committerLászló Németh <nemeth@numbertext.org>2020-04-28 10:18:08 +0200
commit2150fdc7d0f63288ac56c33cb898589512057642 (patch)
treea7f6c1fbc6050b13b8950880c4a1ad02c1e71c21 /sw/source/filter
parentc431661ac716178305f64d98ce81aa8276bdbe8f (diff)
tdf#131539 DOCX export: fix position of OLE objects
Keeping position of OLE objects anchored to text as a character. Co-developer: Tibor Nagy (NISZ) Change-Id: I9699250ae5c418f9994ea2a7a3b102681b042214 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91983 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw/source/filter')
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx42
1 files changed, 42 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 1648600dfdb8..22cad9dff565 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -5539,11 +5539,53 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode, const Size& rSize, const S
m_pSerializer->startElementNS(XML_w, XML_object);
}
+ //tdf#131539: Export OLE positions in docx:
+ //This string will store the position output for the xml
+ OString aPos;
+ //This string will store the relative position for aPos
+ OString aAnch;
+
+ if (!rFlyFrameFormat->GetName().isEmpty())
+ {
+ //Get the horizontal alignment of the OLE via the frame format, to aHAlign
+ OString aHAlign = convertToOOXMLHoriOrient(rFlyFrameFormat->GetHoriOrient().GetHoriOrient(),
+ rFlyFrameFormat->GetHoriOrient().IsPosToggle());
+ //Get the vertical alignment of the OLE via the frame format to aVAlign
+ OString aVAlign = convertToOOXMLVertOrient(rFlyFrameFormat->GetVertOrient().GetVertOrient());
+
+ //Get the relative horizontal positions for the anchors
+ OString aHAnch = convertToOOXMLHoriOrientRel(rFlyFrameFormat->GetHoriOrient().GetRelationOrient());
+ //Get the relative vertical positions for the anchors
+ OString aVAnch = convertToOOXMLVertOrientRel(rFlyFrameFormat->GetVertOrient().GetRelationOrient());
+
+ //Choice that the horizontal position is relative or not
+ if (!aHAlign.isEmpty())
+ aHAlign = ";mso-position-horizontal:" + aHAlign;
+ aHAlign = ";mso-position-horizontal-relative:" + aHAnch;
+
+ //Choice that the vertical position is relative or not
+ if (!aVAlign.isEmpty())
+ aVAlign = ";mso-position-vertical:" + aVAlign;
+ aVAlign = ";mso-position-vertical-relative:" + aVAnch;
+
+ //Set the anchoring information into one string for aPos
+ aAnch = aHAlign + aVAlign;
+
+ //Query the positions to aPos from frameformat
+ aPos =
+ "position:absolute;margin-left:" + OString::number(double(rFlyFrameFormat->GetHoriOrient().GetPos()) / 20) +
+ "pt;margin-top:" + OString::number(double(rFlyFrameFormat->GetVertOrient().GetPos()) / 20) + "pt;";
+ }
+
OString sShapeStyle = "width:" + OString::number( double( rSize.Width() ) / 20 ) +
"pt;height:" + OString::number( double( rSize.Height() ) / 20 ) +
"pt"; //from VMLExport::AddRectangleDimensions(), it does: value/20
OString sShapeId = "ole_" + sId;
+ //Export anchor setting, if it exists
+ if (!aPos.isEmpty() && !aAnch.isEmpty())
+ sShapeStyle = aPos + sShapeStyle + aAnch;
+
// shape definition
m_pSerializer->startElementNS( XML_v, XML_shape,
XML_id, sShapeId.getStr(),