summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-02-11 18:35:38 +0100
committerZolnai Tamás <tamas.zolnai@collabora.com>2014-02-12 13:20:31 +0100
commit2efd433478cf4820b308b20cf42595345e023af2 (patch)
tree9ff1854fa52a4b3ef178877e5af2aadeb1f41a5b /oox
parent682ab832522b1349f1714bcb16f6e83468ea2920 (diff)
drawingML import: picture with scheme color
Theme fragment must be loaded for pictures too. Change-Id: If4c412926319df2beaecfc120065bd011fc3eb57
Diffstat (limited to 'oox')
-rw-r--r--oox/source/shape/ShapeContextHandler.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index 34ddd3db76f8..eeb70ae76943 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -272,7 +272,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))
+ if (Element == DGM_TOKEN(relIds) || Element == LC_TOKEN(lockedCanvas) || Element == C_TOKEN(chart) || Element == WPS_TOKEN(wsp) || Element == WPG_TOKEN(wgp) || PPT_TOKEN( pic ))
{
// Parse the theme relation, if available; the diagram won't have colors without it.
if (!msRelationFragmentPath.isEmpty())