diff options
| -rw-r--r-- | oox/source/export/shapes.cxx | 110 |
1 files changed, 55 insertions, 55 deletions
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 5b2f4eec1914..a324d27d7136 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -292,59 +292,59 @@ ShapeExport& ShapeExport::WriteGroupShape(uno::Reference<drawing::XShape> xShape static bool lcl_IsOnBlacklist(OUString& rShapeType) { OUString aBlacklist[] = { - "ring", - "can", - "cube", - "paper", - "frame", - "smiley", - "sun", - "flower", - "forbidden", - "bracket-pair", - "brace-pair", - "col-60da8460", - "col-502ad400", - "quad-bevel", - "cloud-callout", - "line-callout-1", - "line-callout-2", - "line-callout-3", - "paper", - "vertical-scroll", - "horizontal-scroll", - "mso-spt34", - "mso-spt75", - "mso-spt164", - "mso-spt180", - "flowchart-process", - "flowchart-alternate-process", - "flowchart-decision", - "flowchart-data", - "flowchart-predefined-process", - "flowchart-internal-storage", - "flowchart-document", - "flowchart-multidocument", - "flowchart-terminator", - "flowchart-preparation", - "flowchart-manual-input", - "flowchart-manual-operation", - "flowchart-connector", - "flowchart-off-page-connector", - "flowchart-card", - "flowchart-punched-tape", - "flowchart-summing-junction", - "flowchart-or", - "flowchart-collate", - "flowchart-sort", - "flowchart-extract", - "flowchart-merge", - "flowchart-stored-data", - "flowchart-delay", - "flowchart-sequential-access", - "flowchart-magnetic-disk", - "flowchart-direct-access-storage", - "flowchart-display" + OUString("ring"), + OUString("can"), + OUString("cube"), + OUString("paper"), + OUString("frame"), + OUString("smiley"), + OUString("sun"), + OUString("flower"), + OUString("forbidden"), + OUString("bracket-pair"), + OUString("brace-pair"), + OUString("col-60da8460"), + OUString("col-502ad400"), + OUString("quad-bevel"), + OUString("cloud-callout"), + OUString("line-callout-1"), + OUString("line-callout-2"), + OUString("line-callout-3"), + OUString("paper"), + OUString("vertical-scroll"), + OUString("horizontal-scroll"), + OUString("mso-spt34"), + OUString("mso-spt75"), + OUString("mso-spt164"), + OUString("mso-spt180"), + OUString("flowchart-process"), + OUString("flowchart-alternate-process"), + OUString("flowchart-decision"), + OUString("flowchart-data"), + OUString("flowchart-predefined-process"), + OUString("flowchart-internal-storage"), + OUString("flowchart-document"), + OUString("flowchart-multidocument"), + OUString("flowchart-terminator"), + OUString("flowchart-preparation"), + OUString("flowchart-manual-input"), + OUString("flowchart-manual-operation"), + OUString("flowchart-connector"), + OUString("flowchart-off-page-connector"), + OUString("flowchart-card"), + OUString("flowchart-punched-tape"), + OUString("flowchart-summing-junction"), + OUString("flowchart-or"), + OUString("flowchart-collate"), + OUString("flowchart-sort"), + OUString("flowchart-extract"), + OUString("flowchart-merge"), + OUString("flowchart-stored-data"), + OUString("flowchart-delay"), + OUString("flowchart-sequential-access"), + OUString("flowchart-magnetic-disk"), + OUString("flowchart-direct-access-storage"), + OUString("flowchart-display") }; std::vector<OUString> vBlacklist(aBlacklist, aBlacklist + SAL_N_ELEMENTS(aBlacklist)); @@ -354,8 +354,8 @@ static bool lcl_IsOnBlacklist(OUString& rShapeType) static bool lcl_IsOnWhitelist(OUString& rShapeType) { OUString aWhitelist[] = { - "heart", - "puzzle" + OUString("heart"), + OUString("puzzle") }; std::vector<OUString> vWhitelist(aWhitelist, aWhitelist + SAL_N_ELEMENTS(aWhitelist)); |