[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - xmloff/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Dec 31 20:45:56 UTC 2018
xmloff/source/draw/shapeexport.cxx | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit e694119f1246e46b2f525e6111b3c7c775909f91
Author: Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Wed Dec 26 18:13:58 2018 +0100
Commit: Markus Mohrhard <markus.mohrhard at googlemail.com>
CommitDate: Mon Dec 31 21:45:34 2018 +0100
tdf#122335: sub-view-size can only be used with ODF ver > 1.2
Change-Id: I7dd767fddd11319017a215c240684dcc17238c4e
Reviewed-on: https://gerrit.libreoffice.org/65626
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 44f4f7051d98..fbbd35f32b41 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -4571,6 +4571,11 @@ static void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Referenc
{
case EAS_SubViewSize:
{
+ // export draw:sub-view-size (do not export in ODF 1.2 or older)
+ if (rExport.getDefaultVersion() <= SvtSaveOptions::ODFVER_012)
+ {
+ continue;
+ }
uno::Sequence< awt::Size > aSubViewSizes;
rProp.Value >>= aSubViewSizes;
More information about the Libreoffice-commits
mailing list