better pptx custom shape presets import/export

- sometimes we produced unreadable pptx document with custom shape presets
- fixes part of n#760997
- before we rely on simple rule that adjustments were named
adj1, adj2, ... in case of multiple adjustments and named
adj in case there was only one. there are few exceptions though,
so now we use exact adjustment names defined in presetShapeDefinitions.xml
- TODO: there still might be problem when exporting custom shapes, which
didn't originated in pptx import

Change-Id: Ic9517a69145a295ba6f680ddc3cc30fc771db3fd

1 files changed, 4 insertions, 0 deletions

diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index a7bace4d6a22..2d54e46a4d17 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -631,6 +631,10 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0)
                 const char *var = lclDumpAnyValueCode( makeAny (adjArray[i].Value), level + 1 );
                 printLevel (level + 1);
                 fprintf (stderr, "aAdjSequence [%d].Value = %s;\n", i, var);
+                if (adjArray[i].Name.getLength() > 0) {
+                    printLevel (level + 1);
+                    fprintf (stderr, "aAdjSequence [%d].Name = CREATE_OUSTRING (\"%s\");\n", i, USS (adjArray[i].Name));
+                }
                 printLevel (level);
                 fprintf (stderr, "}\n");
             }