diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-17 15:28:18 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-17 16:54:18 +0200 |
| commit | b7feee55782f83e356611a90c8a22e3509880ac2 (patch) | |
| tree | 58fffb8362e7b2369dc80e68a3386a3d33bc483d /oox | |
| parent | d66140be01a2a0b4566988ef090287f08fd8e8f3 (diff) | |
oox customshapepresetdata: handle multiple definitions
Change-Id: I41b1ff9fa030267ef05fadeb6f77d33a183af8f1
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/customshapepresetdata.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/oox/source/drawingml/customshapepresetdata.cxx b/oox/source/drawingml/customshapepresetdata.cxx index 49cb2c2dc102..a3740a9bb6a5 100644 --- a/oox/source/drawingml/customshapepresetdata.cxx +++ b/oox/source/drawingml/customshapepresetdata.cxx @@ -647,11 +647,16 @@ void CustomShapeProperties::initializePresetDataMap() OUString aName; bool bNotDone = aStream.ReadLine(aLine); PropertyMap aPropertyMap; + bool bFirst = true; while (bNotDone) { static const OString aCommentPrefix("/* "); if (aLine.startsWith(aCommentPrefix)) { + if (bFirst) + bFirst = false; + else + maPresetDataMap[StaticTokenMap::get().getTokenFromUnicode(aName)] = aPropertyMap; aName = OStringToOUString(aLine.copy(aCommentPrefix.getLength(), aLine.getLength() - aCommentPrefix.getLength() - strlen(" */")), RTL_TEXTENCODING_UTF8); } else |