[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - xmloff/source

[Libreoffice Gerrit user]

 xmloff/source/draw/shapeexport.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 26ad33a6f1e894d7352fb3d175c8d15dd28673b2
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:48:28 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/65627
    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 733df9b1ba98..e81b99b52978 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -4599,6 +4599,11 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean
                                 {
                                     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;