diff options
| author | Daniel Arato (NISZ) <arato.daniel@nisz.hu> | 2020-09-02 15:46:56 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2020-09-15 12:55:59 +0200 |
| commit | 2048a2c268125f17a440ec449df4030b91758172 (patch) | |
| tree | 49a86a8b2117aaf5ceb378f04ab7a797c76c795c /writerfilter | |
| parent | 22886babfdb9fad2e50d40e04250d54366a9a708 (diff) | |
tdf#135665 DOCX: import tight wrap setting of VML shapes
The wrap setting that OOXML calls "tight" and LibreOffice calls
"contour" (== true) was not supported by the import code, only
the export.
Change-Id: I48739ffaad48e28df05fd87a9b51a14238dc47e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101932
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
(cherry picked from commit 4b7ee7bd61f78be60211cc72ba36da987191266e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102124
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 3c6d165facb6..0e9e87f6df46 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2223,14 +2223,15 @@ void DomainMapper_Impl::appendOLE( const OUString& rStreamName, const std::share if (xReplacementProperties.is()) { OUString pProperties[] = { - OUString("AnchorType"), - OUString("Surround"), - OUString("HoriOrient"), - OUString("HoriOrientPosition"), - OUString("VertOrient"), - OUString("VertOrientPosition"), - OUString("VertOrientRelation"), - OUString("HoriOrientRelation") + "AnchorType", + "Surround", + "SurroundContour", + "HoriOrient", + "HoriOrientPosition", + "VertOrient", + "VertOrientPosition", + "VertOrientRelation", + "HoriOrientRelation" }; for (const OUString & s : pProperties) xOLEProperties->setPropertyValue(s, xReplacementProperties->getPropertyValue(s)); |