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

Zolnai Tamás tamas.zolnai at collabora.com
Wed Feb 12 07:21:27 PST 2014


 oox/source/shape/ShapeContextHandler.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7accbd8c0d7f1d0b87748f0de599c4d8b469a61e
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Wed Feb 12 16:20:21 2014 +0100

    drawingML import: wrong namespace for 'pic'
    
    Change-Id: I97311b737c7cb706ddff95d1b1b8fe61241f055d

diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index 9a0d727..26fda73 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -273,7 +273,7 @@ void SAL_CALL ShapeContextHandler::startFastElement
     mpThemePtr.reset(new Theme());
 
     if (Element == DGM_TOKEN(relIds) || Element == LC_TOKEN(lockedCanvas) || Element == C_TOKEN(chart) ||
-        Element == WPS_TOKEN(wsp) || Element == WPG_TOKEN(wgp) || Element == PPT_TOKEN(pic))
+        Element == WPS_TOKEN(wsp) || Element == WPG_TOKEN(wgp) || Element == OOX_TOKEN(dmlPicture, pic))
     {
         // Parse the theme relation, if available; the diagram won't have colors without it.
         if (!msRelationFragmentPath.isEmpty())


More information about the Libreoffice-commits mailing list