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

New commits:
commit 1141fc3247bf8cf901af3f9c0194cbb2621ff707
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Wed Dec 26 18:13:58 2018 +0100
Commit:     Julien Nabet <serval2...@yahoo.fr>
CommitDate: Wed Dec 26 20:10:10 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/65623
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
    Tested-by: Julien Nabet <serval2...@yahoo.fr>

diff --git a/xmloff/source/draw/shapeexport.cxx 
b/xmloff/source/draw/shapeexport.cxx
index 44f4f7051d98..6dce321f61fd 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:display (do not export 
in ODF 1.2 or older)
+                                        if (rExport.getDefaultVersion() <= 
SvtSaveOptions::ODFVER_012)
+                                        {
+                                            continue;
+                                        }
                                         uno::Sequence< awt::Size > 
aSubViewSizes;
                                         rProp.Value >>= aSubViewSizes;
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to