diff options
| -rwxr-xr-x | oox/source/drawingml/customshapes/generatePresetsCXX.pl | 2 | ||||
| -rw-r--r-- | oox/source/helper/propertymap.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/oox/source/drawingml/customshapes/generatePresetsCXX.pl b/oox/source/drawingml/customshapes/generatePresetsCXX.pl index 7822f2e7a914..e3e331617b28 100755 --- a/oox/source/drawingml/customshapes/generatePresetsCXX.pl +++ b/oox/source/drawingml/customshapes/generatePresetsCXX.pl @@ -130,7 +130,7 @@ sub generateSource print OUT " {\n"; print OUT " PropertyMap aPropertyMap;\n\n"; print OUT @{$sources->{$shape}}; - print OUT " aPropertyMap [ PROP_Type ] <<= OUString(\"ooxml-", $shape, "\");\n\n"; + print OUT " aPropertyMap.setProperty( PROP_Type, OUString(\"ooxml-", $shape, "\"));\n\n"; print OUT " return aPropertyMap;\n"; print OUT " }\n"; print OUT "};\n"; diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx index 7f0c843cb70f..800aaabead3d 100644 --- a/oox/source/helper/propertymap.cxx +++ b/oox/source/helper/propertymap.cxx @@ -767,9 +767,9 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0) fprintf (stderr,"%f\n", floatValue); else if( value >>= boolValue ) { if (boolValue) - return "Any ((sal_Bool) sal_True)"; + return "(sal_Bool) sal_True"; else - return "Any ((sal_Bool) sal_False)"; + return "(sal_Bool) sal_False"; } else if( value >>= xNumRule ) { fprintf (stderr, "XIndexReplace\n"); @@ -882,7 +882,7 @@ void PropertyMap::dumpCode( Reference< XPropertySet > rXPropSet ) fprintf (stderr, "{\n"); const char* var = lclDumpAnyValueCode (rXPropSet->getPropertyValue (props [i].Name), level + 1); printLevel (level + 1); - fprintf (stderr,"aPropertyMap [PROP_%s] <<= %s;\n", name.getStr(), var); + fprintf (stderr,"aPropertyMap.setProperty(PROP_%s, %s);\n", name.getStr(), var); printLevel (level); fprintf (stderr, "}\n"); } catch (const Exception&) { |