svx/source/svdraw/presetooxhandleadjustmentrelations.cxx | 493 +++++++--------
1 file changed, 246 insertions(+), 247 deletions(-)
New commits:
commit 980fb234ca9c380e1560b07a43f16abbcbeb7a8f
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu May 2 13:41:38 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat May 4 08:19:40 2024 +0200
replace createFromAscii with OUString literals in svx
Change-Id: Ifefa5d3c26e49e29e476a4faba704ba9b2c7e7e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167062
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/svx/source/svdraw/presetooxhandleadjustmentrelations.cxx
b/svx/source/svdraw/presetooxhandleadjustmentrelations.cxx
index 528c8b35cd50..592632dc7196 100644
--- a/svx/source/svdraw/presetooxhandleadjustmentrelations.cxx
+++ b/svx/source/svdraw/presetooxhandleadjustmentrelations.cxx
@@ -25,7 +25,7 @@ struct HandleAdjRel
// Shape name without leading "ooxml-", underscore, zero based handle index
// e.g. The third handle in shape of type "ooxml-circularArrow" will be
// identified by key "circularArrow_2"
- const char* sShape_Handle;
+ OUString sShape_Handle;
// 4 tokens with separator "|"
// first: RefX or RefR, na if not exists
@@ -35,256 +35,256 @@ struct HandleAdjRel
// e.g. The third handle in shape <circularArrow> has in the preset
// the tag <ahPolar gdRefR="adj5" minR="0" maxR="25000"> .
// The resulting value in the map here is "RefR|adj5|na|na"
- const char* sAdjReferences;
+ OUString sAdjReferences;
};
// The array initializer has been extracted from
// oox/source/drawingml/customshapes/presetShapeDefinitions.xml
// by using an XSLT file. That file is attached to tdf#126512.
constexpr HandleAdjRel aHandleAdjRelArray[]
- = { { "accentBorderCallout1_0", "RefX|adj2|RefY|adj1" },
- { "accentBorderCallout1_1", "RefX|adj4|RefY|adj3" },
- { "accentBorderCallout2_0", "RefX|adj2|RefY|adj1" },
- { "accentBorderCallout2_1", "RefX|adj4|RefY|adj3" },
- { "accentBorderCallout2_2", "RefX|adj6|RefY|adj5" },
- { "accentBorderCallout3_0", "RefX|adj2|RefY|adj1" },
- { "accentBorderCallout3_1", "RefX|adj4|RefY|adj3" },
- { "accentBorderCallout3_2", "RefX|adj6|RefY|adj5" },
- { "accentBorderCallout3_3", "RefX|adj8|RefY|adj7" },
- { "accentCallout1_0", "RefX|adj2|RefY|adj1" },
- { "accentCallout1_1", "RefX|adj4|RefY|adj3" },
- { "accentCallout2_0", "RefX|adj2|RefY|adj1" },
- { "accentCallout2_1", "RefX|adj4|RefY|adj3" },
- { "accentCallout2_2", "RefX|adj6|RefY|adj5" },
- { "accentCallout3_0", "RefX|adj2|RefY|adj1" },
- { "accentCallout3_1", "RefX|adj4|RefY|adj3" },
- { "accentCallout3_2", "RefX|adj6|RefY|adj5" },
- { "accentCallout3_3", "RefX|adj8|RefY|adj7" },
- { "arc_0", "na|na|RefAngle|adj1" },
- { "arc_1", "na|na|RefAngle|adj2" },
- { "bentArrow_0", "RefX|adj1|na|na" },
- { "bentArrow_1", "na|na|RefY|adj2" },
- { "bentArrow_2", "RefX|adj3|na|na" },
- { "bentArrow_3", "RefX|adj4|na|na" },
- { "bentConnector3_0", "RefX|adj1|na|na" },
- { "bentConnector4_0", "RefX|adj1|na|na" },
- { "bentConnector4_1", "na|na|RefY|adj2" },
- { "bentConnector5_0", "RefX|adj1|na|na" },
- { "bentConnector5_1", "na|na|RefY|adj2" },
- { "bentConnector5_2", "RefX|adj3|na|na" },
- { "bentUpArrow_0", "na|na|RefY|adj1" },
- { "bentUpArrow_1", "RefX|adj2|na|na" },
- { "bentUpArrow_2", "na|na|RefY|adj3" },
- { "bevel_0", "RefX|adj|na|na" },
- { "blockArc_0", "na|na|RefAngle|adj1" },
- { "blockArc_1", "RefR|adj3|RefAngle|adj2" },
- { "borderCallout1_0", "RefX|adj2|RefY|adj1" },
- { "borderCallout1_1", "RefX|adj4|RefY|adj3" },
- { "borderCallout2_0", "RefX|adj2|RefY|adj1" },
- { "borderCallout2_1", "RefX|adj4|RefY|adj3" },
- { "borderCallout2_2", "RefX|adj6|RefY|adj5" },
- { "borderCallout3_0", "RefX|adj2|RefY|adj1" },
- { "borderCallout3_1", "RefX|adj4|RefY|adj3" },
- { "borderCallout3_2", "RefX|adj6|RefY|adj5" },
- { "borderCallout3_3", "RefX|adj8|RefY|adj7" },
- { "bracePair_0", "na|na|RefY|adj" },
- { "bracketPair_0", "na|na|RefY|adj" },
- { "callout1_0", "RefX|adj2|RefY|adj1" },
- { "callout1_1", "RefX|adj4|RefY|adj3" },
- { "callout2_0", "RefX|adj2|RefY|adj1" },
- { "callout2_1", "RefX|adj4|RefY|adj3" },
- { "callout2_2", "RefX|adj6|RefY|adj5" },
- { "callout3_0", "RefX|adj2|RefY|adj1" },
- { "callout3_1", "RefX|adj4|RefY|adj3" },
- { "callout3_2", "RefX|adj6|RefY|adj5" },
- { "callout3_3", "RefX|adj8|RefY|adj7" },
- { "can_0", "na|na|RefY|adj" },
- { "chevron_0", "RefX|adj|na|na" },
- { "chord_0", "na|na|RefAngle|adj1" },
- { "chord_1", "na|na|RefAngle|adj2" },
- { "circularArrow_0", "na|na|RefAngle|adj2" },
- { "circularArrow_1", "na|na|RefAngle|adj4" },
- { "circularArrow_2", "RefR|adj1|RefAngle|adj3" },
- { "circularArrow_3", "RefR|adj5|na|na" },
- { "cloudCallout_0", "RefX|adj1|RefY|adj2" },
- { "corner_0", "na|na|RefY|adj1" },
- { "corner_1", "RefX|adj2|na|na" },
- { "cube_0", "na|na|RefY|adj" },
- { "curvedConnector3_0", "RefX|adj1|na|na" },
- { "curvedConnector4_0", "RefX|adj1|na|na" },
- { "curvedConnector4_1", "na|na|RefY|adj2" },
- { "curvedConnector5_0", "RefX|adj1|na|na" },
- { "curvedConnector5_1", "na|na|RefY|adj2" },
- { "curvedConnector5_2", "RefX|adj3|na|na" },
- { "curvedDownArrow_0", "RefX|adj1|na|na" },
- { "curvedDownArrow_1", "RefX|adj2|na|na" },
- { "curvedDownArrow_2", "na|na|RefY|adj3" },
- { "curvedLeftArrow_0", "na|na|RefY|adj1" },
- { "curvedLeftArrow_1", "na|na|RefY|adj2" },
- { "curvedLeftArrow_2", "RefX|adj3|na|na" },
- { "curvedRightArrow_0", "na|na|RefY|adj1" },
- { "curvedRightArrow_1", "na|na|RefY|adj2" },
- { "curvedRightArrow_2", "RefX|adj3|na|na" },
- { "curvedUpArrow_0", "RefX|adj1|na|na" },
- { "curvedUpArrow_1", "RefX|adj2|na|na" },
- { "curvedUpArrow_2", "na|na|RefY|adj3" },
- { "diagStripe_0", "na|na|RefY|adj" },
- { "donut_0", "RefR|adj|na|na" },
- { "doubleWave_0", "na|na|RefY|adj1" },
- { "doubleWave_1", "RefX|adj2|na|na" },
- { "downArrow_0", "RefX|adj1|na|na" },
- { "downArrow_1", "na|na|RefY|adj2" },
- { "downArrowCallout_0", "RefX|adj1|na|na" },
- { "downArrowCallout_1", "RefX|adj2|na|na" },
- { "downArrowCallout_2", "na|na|RefY|adj3" },
- { "downArrowCallout_3", "na|na|RefY|adj4" },
- { "ellipseRibbon_0", "na|na|RefY|adj1" },
- { "ellipseRibbon_1", "RefX|adj2|na|na" },
- { "ellipseRibbon_2", "na|na|RefY|adj3" },
- { "ellipseRibbon2_0", "na|na|RefY|adj1" },
- { "ellipseRibbon2_1", "RefX|adj2|na|na" },
- { "ellipseRibbon2_2", "na|na|RefY|adj3" },
- { "foldedCorner_0", "RefX|adj|na|na" },
- { "frame_0", "RefX|adj1|na|na" },
- { "gear6_0", "na|na|RefY|adj1" },
- { "gear6_1", "RefX|adj2|na|na" },
- { "gear9_0", "na|na|RefY|adj1" },
- { "gear9_1", "RefX|adj2|na|na" },
- { "halfFrame_0", "na|na|RefY|adj1" },
- { "halfFrame_1", "RefX|adj2|na|na" },
- { "hexagon_0", "RefX|adj|na|na" },
- { "homePlate_0", "RefX|adj|na|na" },
- { "horizontalScroll_0", "RefX|adj|na|na" },
- { "leftArrow_0", "na|na|RefY|adj1" },
- { "leftArrow_1", "RefX|adj2|na|na" },
- { "leftArrowCallout_0", "na|na|RefY|adj1" },
- { "leftArrowCallout_1", "na|na|RefY|adj2" },
- { "leftArrowCallout_2", "RefX|adj3|na|na" },
- { "leftArrowCallout_3", "RefX|adj4|na|na" },
- { "leftBrace_0", "na|na|RefY|adj1" },
- { "leftBrace_1", "na|na|RefY|adj2" },
- { "leftBracket_0", "na|na|RefY|adj" },
- { "leftCircularArrow_0", "na|na|RefAngle|adj2" },
- { "leftCircularArrow_1", "na|na|RefAngle|adj4" },
- { "leftCircularArrow_2", "RefR|adj1|RefAngle|adj3" },
- { "leftCircularArrow_3", "RefR|adj5|na|na" },
- { "leftRightArrow_0", "na|na|RefY|adj1" },
- { "leftRightArrow_1", "RefX|adj2|na|na" },
- { "leftRightArrowCallout_0", "na|na|RefY|adj1" },
- { "leftRightArrowCallout_1", "na|na|RefY|adj2" },
- { "leftRightArrowCallout_2", "RefX|adj3|na|na" },
- { "leftRightArrowCallout_3", "RefX|adj4|na|na" },
- { "leftRightCircularArrow_0", "na|na|RefAngle|adj2" },
- { "leftRightCircularArrow_1", "na|na|RefAngle|adj4" },
- { "leftRightCircularArrow_2", "RefR|adj1|RefAngle|adj3" },
- { "leftRightCircularArrow_3", "RefR|adj5|na|na" },
- { "leftRightRibbon_0", "na|na|RefY|adj1" },
- { "leftRightRibbon_1", "RefX|adj2|na|na" },
- { "leftRightRibbon_2", "na|na|RefY|adj3" },
- { "leftRightUpArrow_0", "RefX|adj1|na|na" },
- { "leftRightUpArrow_1", "RefX|adj2|na|na" },
- { "leftRightUpArrow_2", "na|na|RefY|adj3" },
- { "leftUpArrow_0", "na|na|RefY|adj1" },
- { "leftUpArrow_1", "RefX|adj2|na|na" },
- { "leftUpArrow_2", "na|na|RefY|adj3" },
- { "mathDivide_0", "na|na|RefY|adj1" },
- { "mathDivide_1", "na|na|RefY|adj2" },
- { "mathDivide_2", "RefX|adj3|na|na" },
- { "mathEqual_0", "na|na|RefY|adj1" },
- { "mathEqual_1", "na|na|RefY|adj2" },
- { "mathMinus_0", "na|na|RefY|adj1" },
- { "mathMultiply_0", "na|na|RefY|adj1" },
- { "mathNotEqual_0", "na|na|RefY|adj1" },
- { "mathNotEqual_1", "na|na|RefAngle|adj2" },
- { "mathNotEqual_2", "na|na|RefY|adj3" },
- { "mathPlus_0", "na|na|RefY|adj1" },
- { "moon_0", "RefX|adj|na|na" },
- { "nonIsoscelesTrapezoid_0", "RefX|adj1|na|na" },
- { "nonIsoscelesTrapezoid_1", "RefX|adj2|na|na" },
- { "noSmoking_0", "RefR|adj|na|na" },
- { "notchedRightArrow_0", "na|na|RefY|adj1" },
- { "notchedRightArrow_1", "RefX|adj2|na|na" },
- { "octagon_0", "RefX|adj|na|na" },
- { "parallelogram_0", "RefX|adj|na|na" },
- { "pie_0", "na|na|RefAngle|adj1" },
- { "pie_1", "na|na|RefAngle|adj2" },
- { "plaque_0", "RefX|adj|na|na" },
- { "plus_0", "RefX|adj|na|na" },
- { "quadArrow_0", "RefX|adj1|na|na" },
- { "quadArrow_1", "RefX|adj2|na|na" },
- { "quadArrow_2", "na|na|RefY|adj3" },
- { "quadArrowCallout_0", "RefX|adj1|na|na" },
- { "quadArrowCallout_1", "RefX|adj2|na|na" },
- { "quadArrowCallout_2", "na|na|RefY|adj3" },
- { "quadArrowCallout_3", "na|na|RefY|adj4" },
- { "ribbon_0", "na|na|RefY|adj1" },
- { "ribbon_1", "RefX|adj2|na|na" },
- { "ribbon2_0", "na|na|RefY|adj1" },
- { "ribbon2_1", "RefX|adj2|na|na" },
- { "rightArrow_0", "na|na|RefY|adj1" },
- { "rightArrow_1", "RefX|adj2|na|na" },
- { "rightArrowCallout_0", "na|na|RefY|adj1" },
- { "rightArrowCallout_1", "na|na|RefY|adj2" },
- { "rightArrowCallout_2", "RefX|adj3|na|na" },
- { "rightArrowCallout_3", "RefX|adj4|na|na" },
- { "rightBrace_0", "na|na|RefY|adj1" },
- { "rightBrace_1", "na|na|RefY|adj2" },
- { "rightBracket_0", "na|na|RefY|adj" },
- { "round1Rect_0", "RefX|adj|na|na" },
- { "round2DiagRect_0", "RefX|adj1|na|na" },
- { "round2DiagRect_1", "RefX|adj2|na|na" },
- { "round2SameRect_0", "RefX|adj1|na|na" },
- { "round2SameRect_1", "RefX|adj2|na|na" },
- { "roundRect_0", "RefX|adj|na|na" },
- { "smileyFace_0", "na|na|RefY|adj" },
- { "snip1Rect_0", "RefX|adj|na|na" },
- { "snip2DiagRect_0", "RefX|adj1|na|na" },
- { "snip2DiagRect_1", "RefX|adj2|na|na" },
- { "snip2SameRect_0", "RefX|adj1|na|na" },
- { "snip2SameRect_1", "RefX|adj2|na|na" },
- { "snipRoundRect_0", "RefX|adj1|na|na" },
- { "snipRoundRect_1", "RefX|adj2|na|na" },
- { "star10_0", "na|na|RefY|adj" },
- { "star12_0", "na|na|RefY|adj" },
- { "star16_0", "na|na|RefY|adj" },
- { "star24_0", "na|na|RefY|adj" },
- { "star32_0", "na|na|RefY|adj" },
- { "star4_0", "na|na|RefY|adj" },
- { "star5_0", "na|na|RefY|adj" },
- { "star6_0", "na|na|RefY|adj" },
- { "star7_0", "na|na|RefY|adj" },
- { "star8_0", "na|na|RefY|adj" },
- { "stripedRightArrow_0", "na|na|RefY|adj1" },
- { "stripedRightArrow_1", "RefX|adj2|na|na" },
- { "sun_0", "RefX|adj|na|na" },
- { "swooshArrow_0", "na|na|RefY|adj1" },
- { "swooshArrow_1", "RefX|adj2|na|na" },
- { "teardrop_0", "RefX|adj|na|na" },
- { "trapezoid_0", "RefX|adj|na|na" },
- { "triangle_0", "RefX|adj|na|na" },
- { "upArrowCallout_0", "RefX|adj1|na|na" },
- { "upArrowCallout_1", "RefX|adj2|na|na" },
- { "upArrowCallout_2", "na|na|RefY|adj3" },
- { "upArrowCallout_3", "na|na|RefY|adj4" },
- { "upDownArrow_0", "RefX|adj1|na|na" },
- { "upDownArrow_1", "na|na|RefY|adj2" },
- { "upArrow_0", "RefX|adj1|na|na" },
- { "upArrow_1", "na|na|RefY|adj2" },
- { "upDownArrowCallout_0", "RefX|adj1|na|na" },
- { "upDownArrowCallout_1", "RefX|adj2|na|na" },
- { "upDownArrowCallout_2", "na|na|RefY|adj3" },
- { "upDownArrowCallout_3", "na|na|RefY|adj4" },
- { "uturnArrow_0", "RefX|adj1|na|na" },
- { "uturnArrow_1", "RefX|adj2|na|na" },
- { "uturnArrow_2", "na|na|RefY|adj3" },
- { "uturnArrow_3", "RefX|adj4|na|na" },
- { "uturnArrow_4", "na|na|RefY|adj5" },
- { "verticalScroll_0", "na|na|RefY|adj" },
- { "wave_0", "na|na|RefY|adj1" },
- { "wave_1", "RefX|adj2|na|na" },
- { "wedgeEllipseCallout_0", "RefX|adj1|RefY|adj2" },
- { "wedgeRectCallout_0", "RefX|adj1|RefY|adj2" },
- { "wedgeRoundRectCallout_0", "RefX|adj1|RefY|adj2" } };
+ = { { u"accentBorderCallout1_0"_ustr, u"RefX|adj2|RefY|adj1"_ustr },
+ { u"accentBorderCallout1_1"_ustr, u"RefX|adj4|RefY|adj3"_ustr },
+ { u"accentBorderCallout2_0"_ustr, u"RefX|adj2|RefY|adj1"_ustr },
+ { u"accentBorderCallout2_1"_ustr, u"RefX|adj4|RefY|adj3"_ustr },
+ { u"accentBorderCallout2_2"_ustr, u"RefX|adj6|RefY|adj5"_ustr },
+ { u"accentBorderCallout3_0"_ustr, u"RefX|adj2|RefY|adj1"_ustr },
+ { u"accentBorderCallout3_1"_ustr, u"RefX|adj4|RefY|adj3"_ustr },
+ { u"accentBorderCallout3_2"_ustr, u"RefX|adj6|RefY|adj5"_ustr },
+ { u"accentBorderCallout3_3"_ustr, u"RefX|adj8|RefY|adj7"_ustr },
+ { u"accentCallout1_0"_ustr, u"RefX|adj2|RefY|adj1"_ustr },
+ { u"accentCallout1_1"_ustr, u"RefX|adj4|RefY|adj3"_ustr },
+ { u"accentCallout2_0"_ustr, u"RefX|adj2|RefY|adj1"_ustr },
+ { u"accentCallout2_1"_ustr, u"RefX|adj4|RefY|adj3"_ustr },
+ { u"accentCallout2_2"_ustr, u"RefX|adj6|RefY|adj5"_ustr },
+ { u"accentCallout3_0"_ustr, u"RefX|adj2|RefY|adj1"_ustr },
+ { u"accentCallout3_1"_ustr, u"RefX|adj4|RefY|adj3"_ustr },
+ { u"accentCallout3_2"_ustr, u"RefX|adj6|RefY|adj5"_ustr },
+ { u"accentCallout3_3"_ustr, u"RefX|adj8|RefY|adj7"_ustr },
+ { u"arc_0"_ustr, u"na|na|RefAngle|adj1"_ustr },
+ { u"arc_1"_ustr, u"na|na|RefAngle|adj2"_ustr },
+ { u"bentArrow_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"bentArrow_1"_ustr, u"na|na|RefY|adj2"_ustr },
+ { u"bentArrow_2"_ustr, u"RefX|adj3|na|na"_ustr },
+ { u"bentArrow_3"_ustr, u"RefX|adj4|na|na"_ustr },
+ { u"bentConnector3_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"bentConnector4_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"bentConnector4_1"_ustr, u"na|na|RefY|adj2"_ustr },
+ { u"bentConnector5_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"bentConnector5_1"_ustr, u"na|na|RefY|adj2"_ustr },
+ { u"bentConnector5_2"_ustr, u"RefX|adj3|na|na"_ustr },
+ { u"bentUpArrow_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"bentUpArrow_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"bentUpArrow_2"_ustr, u"na|na|RefY|adj3"_ustr },
+ { u"bevel_0"_ustr, u"RefX|adj|na|na"_ustr },
+ { u"blockArc_0"_ustr, u"na|na|RefAngle|adj1"_ustr },
+ { u"blockArc_1"_ustr, u"RefR|adj3|RefAngle|adj2"_ustr },
+ { u"borderCallout1_0"_ustr, u"RefX|adj2|RefY|adj1"_ustr },
+ { u"borderCallout1_1"_ustr, u"RefX|adj4|RefY|adj3"_ustr },
+ { u"borderCallout2_0"_ustr, u"RefX|adj2|RefY|adj1"_ustr },
+ { u"borderCallout2_1"_ustr, u"RefX|adj4|RefY|adj3"_ustr },
+ { u"borderCallout2_2"_ustr, u"RefX|adj6|RefY|adj5"_ustr },
+ { u"borderCallout3_0"_ustr, u"RefX|adj2|RefY|adj1"_ustr },
+ { u"borderCallout3_1"_ustr, u"RefX|adj4|RefY|adj3"_ustr },
+ { u"borderCallout3_2"_ustr, u"RefX|adj6|RefY|adj5"_ustr },
+ { u"borderCallout3_3"_ustr, u"RefX|adj8|RefY|adj7"_ustr },
+ { u"bracePair_0"_ustr, u"na|na|RefY|adj"_ustr },
+ { u"bracketPair_0"_ustr, u"na|na|RefY|adj"_ustr },
+ { u"callout1_0"_ustr, u"RefX|adj2|RefY|adj1"_ustr },
+ { u"callout1_1"_ustr, u"RefX|adj4|RefY|adj3"_ustr },
+ { u"callout2_0"_ustr, u"RefX|adj2|RefY|adj1"_ustr },
+ { u"callout2_1"_ustr, u"RefX|adj4|RefY|adj3"_ustr },
+ { u"callout2_2"_ustr, u"RefX|adj6|RefY|adj5"_ustr },
+ { u"callout3_0"_ustr, u"RefX|adj2|RefY|adj1"_ustr },
+ { u"callout3_1"_ustr, u"RefX|adj4|RefY|adj3"_ustr },
+ { u"callout3_2"_ustr, u"RefX|adj6|RefY|adj5"_ustr },
+ { u"callout3_3"_ustr, u"RefX|adj8|RefY|adj7"_ustr },
+ { u"can_0"_ustr, u"na|na|RefY|adj"_ustr },
+ { u"chevron_0"_ustr, u"RefX|adj|na|na"_ustr },
+ { u"chord_0"_ustr, u"na|na|RefAngle|adj1"_ustr },
+ { u"chord_1"_ustr, u"na|na|RefAngle|adj2"_ustr },
+ { u"circularArrow_0"_ustr, u"na|na|RefAngle|adj2"_ustr },
+ { u"circularArrow_1"_ustr, u"na|na|RefAngle|adj4"_ustr },
+ { u"circularArrow_2"_ustr, u"RefR|adj1|RefAngle|adj3"_ustr },
+ { u"circularArrow_3"_ustr, u"RefR|adj5|na|na"_ustr },
+ { u"cloudCallout_0"_ustr, u"RefX|adj1|RefY|adj2"_ustr },
+ { u"corner_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"corner_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"cube_0"_ustr, u"na|na|RefY|adj"_ustr },
+ { u"curvedConnector3_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"curvedConnector4_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"curvedConnector4_1"_ustr, u"na|na|RefY|adj2"_ustr },
+ { u"curvedConnector5_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"curvedConnector5_1"_ustr, u"na|na|RefY|adj2"_ustr },
+ { u"curvedConnector5_2"_ustr, u"RefX|adj3|na|na"_ustr },
+ { u"curvedDownArrow_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"curvedDownArrow_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"curvedDownArrow_2"_ustr, u"na|na|RefY|adj3"_ustr },
+ { u"curvedLeftArrow_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"curvedLeftArrow_1"_ustr, u"na|na|RefY|adj2"_ustr },
+ { u"curvedLeftArrow_2"_ustr, u"RefX|adj3|na|na"_ustr },
+ { u"curvedRightArrow_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"curvedRightArrow_1"_ustr, u"na|na|RefY|adj2"_ustr },
+ { u"curvedRightArrow_2"_ustr, u"RefX|adj3|na|na"_ustr },
+ { u"curvedUpArrow_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"curvedUpArrow_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"curvedUpArrow_2"_ustr, u"na|na|RefY|adj3"_ustr },
+ { u"diagStripe_0"_ustr, u"na|na|RefY|adj"_ustr },
+ { u"donut_0"_ustr, u"RefR|adj|na|na"_ustr },
+ { u"doubleWave_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"doubleWave_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"downArrow_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"downArrow_1"_ustr, u"na|na|RefY|adj2"_ustr },
+ { u"downArrowCallout_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"downArrowCallout_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"downArrowCallout_2"_ustr, u"na|na|RefY|adj3"_ustr },
+ { u"downArrowCallout_3"_ustr, u"na|na|RefY|adj4"_ustr },
+ { u"ellipseRibbon_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"ellipseRibbon_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"ellipseRibbon_2"_ustr, u"na|na|RefY|adj3"_ustr },
+ { u"ellipseRibbon2_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"ellipseRibbon2_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"ellipseRibbon2_2"_ustr, u"na|na|RefY|adj3"_ustr },
+ { u"foldedCorner_0"_ustr, u"RefX|adj|na|na"_ustr },
+ { u"frame_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"gear6_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"gear6_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"gear9_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"gear9_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"halfFrame_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"halfFrame_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"hexagon_0"_ustr, u"RefX|adj|na|na"_ustr },
+ { u"homePlate_0"_ustr, u"RefX|adj|na|na"_ustr },
+ { u"horizontalScroll_0"_ustr, u"RefX|adj|na|na"_ustr },
+ { u"leftArrow_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"leftArrow_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"leftArrowCallout_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"leftArrowCallout_1"_ustr, u"na|na|RefY|adj2"_ustr },
+ { u"leftArrowCallout_2"_ustr, u"RefX|adj3|na|na"_ustr },
+ { u"leftArrowCallout_3"_ustr, u"RefX|adj4|na|na"_ustr },
+ { u"leftBrace_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"leftBrace_1"_ustr, u"na|na|RefY|adj2"_ustr },
+ { u"leftBracket_0"_ustr, u"na|na|RefY|adj"_ustr },
+ { u"leftCircularArrow_0"_ustr, u"na|na|RefAngle|adj2"_ustr },
+ { u"leftCircularArrow_1"_ustr, u"na|na|RefAngle|adj4"_ustr },
+ { u"leftCircularArrow_2"_ustr, u"RefR|adj1|RefAngle|adj3"_ustr },
+ { u"leftCircularArrow_3"_ustr, u"RefR|adj5|na|na"_ustr },
+ { u"leftRightArrow_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"leftRightArrow_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"leftRightArrowCallout_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"leftRightArrowCallout_1"_ustr, u"na|na|RefY|adj2"_ustr },
+ { u"leftRightArrowCallout_2"_ustr, u"RefX|adj3|na|na"_ustr },
+ { u"leftRightArrowCallout_3"_ustr, u"RefX|adj4|na|na"_ustr },
+ { u"leftRightCircularArrow_0"_ustr, u"na|na|RefAngle|adj2"_ustr },
+ { u"leftRightCircularArrow_1"_ustr, u"na|na|RefAngle|adj4"_ustr },
+ { u"leftRightCircularArrow_2"_ustr, u"RefR|adj1|RefAngle|adj3"_ustr },
+ { u"leftRightCircularArrow_3"_ustr, u"RefR|adj5|na|na"_ustr },
+ { u"leftRightRibbon_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"leftRightRibbon_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"leftRightRibbon_2"_ustr, u"na|na|RefY|adj3"_ustr },
+ { u"leftRightUpArrow_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"leftRightUpArrow_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"leftRightUpArrow_2"_ustr, u"na|na|RefY|adj3"_ustr },
+ { u"leftUpArrow_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"leftUpArrow_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"leftUpArrow_2"_ustr, u"na|na|RefY|adj3"_ustr },
+ { u"mathDivide_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"mathDivide_1"_ustr, u"na|na|RefY|adj2"_ustr },
+ { u"mathDivide_2"_ustr, u"RefX|adj3|na|na"_ustr },
+ { u"mathEqual_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"mathEqual_1"_ustr, u"na|na|RefY|adj2"_ustr },
+ { u"mathMinus_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"mathMultiply_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"mathNotEqual_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"mathNotEqual_1"_ustr, u"na|na|RefAngle|adj2"_ustr },
+ { u"mathNotEqual_2"_ustr, u"na|na|RefY|adj3"_ustr },
+ { u"mathPlus_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"moon_0"_ustr, u"RefX|adj|na|na"_ustr },
+ { u"nonIsoscelesTrapezoid_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"nonIsoscelesTrapezoid_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"noSmoking_0"_ustr, u"RefR|adj|na|na"_ustr },
+ { u"notchedRightArrow_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"notchedRightArrow_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"octagon_0"_ustr, u"RefX|adj|na|na"_ustr },
+ { u"parallelogram_0"_ustr, u"RefX|adj|na|na"_ustr },
+ { u"pie_0"_ustr, u"na|na|RefAngle|adj1"_ustr },
+ { u"pie_1"_ustr, u"na|na|RefAngle|adj2"_ustr },
+ { u"plaque_0"_ustr, u"RefX|adj|na|na"_ustr },
+ { u"plus_0"_ustr, u"RefX|adj|na|na"_ustr },
+ { u"quadArrow_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"quadArrow_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"quadArrow_2"_ustr, u"na|na|RefY|adj3"_ustr },
+ { u"quadArrowCallout_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"quadArrowCallout_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"quadArrowCallout_2"_ustr, u"na|na|RefY|adj3"_ustr },
+ { u"quadArrowCallout_3"_ustr, u"na|na|RefY|adj4"_ustr },
+ { u"ribbon_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"ribbon_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"ribbon2_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"ribbon2_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"rightArrow_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"rightArrow_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"rightArrowCallout_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"rightArrowCallout_1"_ustr, u"na|na|RefY|adj2"_ustr },
+ { u"rightArrowCallout_2"_ustr, u"RefX|adj3|na|na"_ustr },
+ { u"rightArrowCallout_3"_ustr, u"RefX|adj4|na|na"_ustr },
+ { u"rightBrace_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"rightBrace_1"_ustr, u"na|na|RefY|adj2"_ustr },
+ { u"rightBracket_0"_ustr, u"na|na|RefY|adj"_ustr },
+ { u"round1Rect_0"_ustr, u"RefX|adj|na|na"_ustr },
+ { u"round2DiagRect_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"round2DiagRect_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"round2SameRect_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"round2SameRect_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"roundRect_0"_ustr, u"RefX|adj|na|na"_ustr },
+ { u"smileyFace_0"_ustr, u"na|na|RefY|adj"_ustr },
+ { u"snip1Rect_0"_ustr, u"RefX|adj|na|na"_ustr },
+ { u"snip2DiagRect_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"snip2DiagRect_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"snip2SameRect_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"snip2SameRect_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"snipRoundRect_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"snipRoundRect_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"star10_0"_ustr, u"na|na|RefY|adj"_ustr },
+ { u"star12_0"_ustr, u"na|na|RefY|adj"_ustr },
+ { u"star16_0"_ustr, u"na|na|RefY|adj"_ustr },
+ { u"star24_0"_ustr, u"na|na|RefY|adj"_ustr },
+ { u"star32_0"_ustr, u"na|na|RefY|adj"_ustr },
+ { u"star4_0"_ustr, u"na|na|RefY|adj"_ustr },
+ { u"star5_0"_ustr, u"na|na|RefY|adj"_ustr },
+ { u"star6_0"_ustr, u"na|na|RefY|adj"_ustr },
+ { u"star7_0"_ustr, u"na|na|RefY|adj"_ustr },
+ { u"star8_0"_ustr, u"na|na|RefY|adj"_ustr },
+ { u"stripedRightArrow_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"stripedRightArrow_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"sun_0"_ustr, u"RefX|adj|na|na"_ustr },
+ { u"swooshArrow_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"swooshArrow_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"teardrop_0"_ustr, u"RefX|adj|na|na"_ustr },
+ { u"trapezoid_0"_ustr, u"RefX|adj|na|na"_ustr },
+ { u"triangle_0"_ustr, u"RefX|adj|na|na"_ustr },
+ { u"upArrowCallout_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"upArrowCallout_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"upArrowCallout_2"_ustr, u"na|na|RefY|adj3"_ustr },
+ { u"upArrowCallout_3"_ustr, u"na|na|RefY|adj4"_ustr },
+ { u"upDownArrow_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"upDownArrow_1"_ustr, u"na|na|RefY|adj2"_ustr },
+ { u"upArrow_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"upArrow_1"_ustr, u"na|na|RefY|adj2"_ustr },
+ { u"upDownArrowCallout_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"upDownArrowCallout_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"upDownArrowCallout_2"_ustr, u"na|na|RefY|adj3"_ustr },
+ { u"upDownArrowCallout_3"_ustr, u"na|na|RefY|adj4"_ustr },
+ { u"uturnArrow_0"_ustr, u"RefX|adj1|na|na"_ustr },
+ { u"uturnArrow_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"uturnArrow_2"_ustr, u"na|na|RefY|adj3"_ustr },
+ { u"uturnArrow_3"_ustr, u"RefX|adj4|na|na"_ustr },
+ { u"uturnArrow_4"_ustr, u"na|na|RefY|adj5"_ustr },
+ { u"verticalScroll_0"_ustr, u"na|na|RefY|adj"_ustr },
+ { u"wave_0"_ustr, u"na|na|RefY|adj1"_ustr },
+ { u"wave_1"_ustr, u"RefX|adj2|na|na"_ustr },
+ { u"wedgeEllipseCallout_0"_ustr, u"RefX|adj1|RefY|adj2"_ustr },
+ { u"wedgeRectCallout_0"_ustr, u"RefX|adj1|RefY|adj2"_ustr },
+ { u"wedgeRoundRectCallout_0"_ustr, u"RefX|adj1|RefY|adj2"_ustr } };
}
static sal_Int32 lcl_getAdjIndexFromToken(const sal_Int32 nTokenPos,
std::u16string_view rMapValue)
@@ -310,8 +310,7 @@ void PresetOOXHandleAdj::GetOOXHandleAdjRelation(
HandleAdjRelHashMap aH;
aH.reserve(std::size(aHandleAdjRelArray));
for (const auto& item : aHandleAdjRelArray)
- aH.emplace(OUString::createFromAscii(item.sShape_Handle),
- OUString::createFromAscii(item.sAdjReferences));
+ aH.emplace(item.sShape_Handle, item.sAdjReferences);
return aH;
}();
