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

[Andrzej Hunt]

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

New commits:
commit de7b3820d3f8de380401fe435a83301561d17384
Author: Andrzej Hunt <andrzej.hunt at collabora.com>
Date:   Wed Feb 12 14:15:54 2014 +0000

    loplugin:implicitboolconversion
    
    Presumably we need to specifically check whether Element is a
    PPT pic token here too?
    
    Change-Id: Id5c90099c8762042f9a2a886631faa72737704fb

diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index bd983e3..9a0d727 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -272,7 +272,8 @@ 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) || PPT_TOKEN( pic ))
+    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))
     {
         // Parse the theme relation, if available; the diagram won't have colors without it.
         if (!msRelationFragmentPath.isEmpty())