[Libreoffice-commits] core.git: oox/source

Julien Nabet (via logerrit) logerrit at kemper.freedesktop.org
Fri Apr 24 08:04:08 UTC 2020


 oox/source/drawingml/shapecontext.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7e82d7bf88f63b1dcd9da939904330054fc426f6
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Mon Apr 20 12:16:39 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Apr 24 10:03:27 2020 +0200

    Related tdf#111461: ignore picLocks attribute
    
    If we ignore "nvPicPr", we can't take "picLocks" into account
    since this tag is used inside "nvPicPr"
    
    It allows to avoid this log:
    warn:oox:24274:24274:oox/source/drawingml/shapecontext.cxx:125: ShapeContext::onCreateContext: unhandled element: 3974
    
    Change-Id: Icba7a732f59cf5f3ea587bc23c27cec7a10367c9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92556
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/oox/source/drawingml/shapecontext.cxx b/oox/source/drawingml/shapecontext.cxx
index c6ee29a9f89e..b4c284a03edd 100644
--- a/oox/source/drawingml/shapecontext.cxx
+++ b/oox/source/drawingml/shapecontext.cxx
@@ -116,6 +116,7 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 aElementToken, const
     case XML_cNvPicPr:
         break;
     case XML_nvPicPr:
+    case XML_picLocks:
         break;
     case XML_relIds:
         break;


More information about the Libreoffice-commits mailing list