summaryrefslogtreecommitdiff
path: root/oox/source/export/shapes.cxx
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2015-02-06 11:00:47 +0100
committerJan Holesovsky <kendy@collabora.com>2015-02-06 11:00:47 +0100
commitf2f3dd240bf90b2f66de90fb6fe03f83a9024297 (patch)
tree63a704c8083adb6705b946c59b423d0754d6beb8 /oox/source/export/shapes.cxx
parentb1751e6ed0fd6d6d26141e4405df92520e3c04cd (diff)
static const to avoid re-init all the time + c++11.
Change-Id: I24ac6405f03e2d55f832d1ffe0c71e575883c5c8
Diffstat (limited to 'oox/source/export/shapes.cxx')
-rw-r--r--oox/source/export/shapes.cxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index a96831ef3b2f..2d040c732396 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -281,7 +281,7 @@ ShapeExport& ShapeExport::WriteGroupShape(uno::Reference<drawing::XShape> xShape
static bool lcl_IsOnBlacklist(OUString& rShapeType)
{
- OUString aBlacklist[] = {
+ static const std::vector<OUString> vBlacklist = {
"ring",
"can",
"cube",
@@ -336,18 +336,16 @@ static bool lcl_IsOnBlacklist(OUString& rShapeType)
"flowchart-direct-access-storage",
"flowchart-display"
};
- std::vector<OUString> vBlacklist(aBlacklist, aBlacklist + SAL_N_ELEMENTS(aBlacklist));
return std::find(vBlacklist.begin(), vBlacklist.end(), rShapeType) != vBlacklist.end();
}
static bool lcl_IsOnWhitelist(OUString& rShapeType)
{
- OUString aWhitelist[] = {
+ static const std::vector<OUString> vWhitelist = {
"heart",
"puzzle"
};
- std::vector<OUString> vWhitelist(aWhitelist, aWhitelist + SAL_N_ELEMENTS(aWhitelist));
return std::find(vWhitelist.begin(), vWhitelist.end(), rShapeType) != vWhitelist.end();
}