remove C2U usage, string literal OUString ctors will do the job

and this also avoids reaching the parse recursion limit with clang,
because all the macros C2U expands to, although clang's limit is
probably tad a bit low

2 files changed, 156 insertions, 156 deletions

diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 1d8424bbd80b..e9b4aba3f5ac 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1492,66 +1492,66 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn
 {
     return ::comphelper::MakeSet< ::rtl::OUString >
         // commands for container forward
-        ( C2U("AddDirect"))           ( C2U("NewDoc"))                ( C2U("Open"))
-        ( C2U("Save"))                ( C2U("SaveAs"))                ( C2U("SendMail"))
-        ( C2U("EditDoc"))             ( C2U("ExportDirectToPDF"))     ( C2U("PrintDefault"))
+        ( "AddDirect" )           ( "NewDoc" )                ( "Open" )
+        ( "Save" )                ( "SaveAs" )                ( "SendMail" )
+        ( "EditDoc" )             ( "ExportDirectToPDF" )     ( "PrintDefault" )
 
         // own commands
-        ( C2U("Cut") )                ( C2U("Copy") )                 ( C2U("Paste") )
-        ( C2U("DataRanges") )         ( C2U("DiagramData") )
+        ( "Cut" )                ( "Copy" )                 ( "Paste" )
+        ( "DataRanges" )         ( "DiagramData" )
         // insert objects
-        ( C2U("InsertMenuTitles") )   ( C2U("InsertTitles") )
-        ( C2U("InsertMenuLegend") )   ( C2U("InsertLegend") )         ( C2U("DeleteLegend") )
-        ( C2U("InsertMenuDataLabels") )
-        ( C2U("InsertMenuAxes") )     ( C2U("InsertRemoveAxes") )         ( C2U("InsertMenuGrids") )
-        ( C2U("InsertSymbol") )
-        ( C2U("InsertTrendlineEquation") )  ( C2U("InsertTrendlineEquationAndR2") )
-        ( C2U("InsertR2Value") )      ( C2U("DeleteR2Value") )
-        ( C2U("InsertMenuTrendlines") )  ( C2U("InsertTrendline") )
-        ( C2U("InsertMenuMeanValues") ) ( C2U("InsertMeanValue") )
-        ( C2U("InsertMenuYErrorBars") )   ( C2U("InsertYErrorBars") )
-        ( C2U("InsertDataLabels") )   ( C2U("InsertDataLabel") )
-        ( C2U("DeleteTrendline") )    ( C2U("DeleteMeanValue") )      ( C2U("DeleteTrendlineEquation") )
-        ( C2U("DeleteYErrorBars") )
-        ( C2U("DeleteDataLabels") )   ( C2U("DeleteDataLabel") )
+        ( "InsertMenuTitles" )   ( "InsertTitles" )
+        ( "InsertMenuLegend" )   ( "InsertLegend" )         ( "DeleteLegend" )
+        ( "InsertMenuDataLabels" )
+        ( "InsertMenuAxes" )     ( "InsertRemoveAxes" )         ( "InsertMenuGrids" )
+        ( "InsertSymbol" )
+        ( "InsertTrendlineEquation" )  ( "InsertTrendlineEquationAndR2" )
+        ( "InsertR2Value" )      ( "DeleteR2Value" )
+        ( "InsertMenuTrendlines" )  ( "InsertTrendline" )
+        ( "InsertMenuMeanValues" ) ( "InsertMeanValue" )
+        ( "InsertMenuYErrorBars" )   ( "InsertYErrorBars" )
+        ( "InsertDataLabels" )   ( "InsertDataLabel" )
+        ( "DeleteTrendline" )    ( "DeleteMeanValue" )      ( "DeleteTrendlineEquation" )
+        ( "DeleteYErrorBars" )
+        ( "DeleteDataLabels" )   ( "DeleteDataLabel" )
         //format objects
-        ( C2U("FormatSelection") )     ( C2U("TransformDialog") )
-        ( C2U("DiagramType") )        ( C2U("View3D") )
-        ( C2U("Forward") )            ( C2U("Backward") )
-        ( C2U("MainTitle") )          ( C2U("SubTitle") )
-        ( C2U("XTitle") )             ( C2U("YTitle") )               ( C2U("ZTitle") )
-        ( C2U("SecondaryXTitle") )    ( C2U("SecondaryYTitle") )
-        ( C2U("AllTitles") )          ( C2U("Legend") )
-        ( C2U("DiagramAxisX") )       ( C2U("DiagramAxisY") )         ( C2U("DiagramAxisZ") )
-        ( C2U("DiagramAxisA") )       ( C2U("DiagramAxisB") )         ( C2U("DiagramAxisAll") )
-        ( C2U("DiagramGridXMain") )   ( C2U("DiagramGridYMain") )     ( C2U("DiagramGridZMain") )
-        ( C2U("DiagramGridXHelp") )   ( C2U("DiagramGridYHelp") )     ( C2U("DiagramGridZHelp") )
-        ( C2U("DiagramGridAll") )
-        ( C2U("DiagramWall") )        ( C2U("DiagramFloor") )         ( C2U("DiagramArea") )
+        ( "FormatSelection" )     ( "TransformDialog" )
+        ( "DiagramType" )        ( "View3D" )
+        ( "Forward" )            ( "Backward" )
+        ( "MainTitle" )          ( "SubTitle" )
+        ( "XTitle" )             ( "YTitle" )               ( "ZTitle" )
+        ( "SecondaryXTitle" )    ( "SecondaryYTitle" )
+        ( "AllTitles" )          ( "Legend" )
+        ( "DiagramAxisX" )       ( "DiagramAxisY" )         ( "DiagramAxisZ" )
+        ( "DiagramAxisA" )       ( "DiagramAxisB" )         ( "DiagramAxisAll" )
+        ( "DiagramGridXMain" )   ( "DiagramGridYMain" )     ( "DiagramGridZMain" )
+        ( "DiagramGridXHelp" )   ( "DiagramGridYHelp" )     ( "DiagramGridZHelp" )
+        ( "DiagramGridAll" )
+        ( "DiagramWall" )        ( "DiagramFloor" )         ( "DiagramArea" )
 
         //context menu - format objects entries
-        ( C2U("FormatWall") )        ( C2U("FormatFloor") )         ( C2U("FormatChartArea") )
-        ( C2U("FormatLegend") )
+        ( "FormatWall" )        ( "FormatFloor" )         ( "FormatChartArea" )
+        ( "FormatLegend" )
 
-        ( C2U("FormatAxis") )           ( C2U("FormatTitle") )
-        ( C2U("FormatDataSeries") )     ( C2U("FormatDataPoint") )
-        ( C2U("ResetAllDataPoints") )   ( C2U("ResetDataPoint") )
-        ( C2U("FormatDataLabels") )     ( C2U("FormatDataLabel") )
-        ( C2U("FormatMeanValue") )      ( C2U("FormatTrendline") )      ( C2U("FormatTrendlineEquation") )
-        ( C2U("FormatYErrorBars") )
-        ( C2U("FormatStockLoss") )      ( C2U("FormatStockGain") )
+        ( "FormatAxis" )           ( "FormatTitle" )
+        ( "FormatDataSeries" )     ( "FormatDataPoint" )
+        ( "ResetAllDataPoints" )   ( "ResetDataPoint" )
+        ( "FormatDataLabels" )     ( "FormatDataLabel" )
+        ( "FormatMeanValue" )      ( "FormatTrendline" )      ( "FormatTrendlineEquation" )
+        ( "FormatYErrorBars" )
+        ( "FormatStockLoss" )      ( "FormatStockGain" )
 
-        ( C2U("FormatMajorGrid") )      ( C2U("InsertMajorGrid") )      ( C2U("DeleteMajorGrid") )
-        ( C2U("FormatMinorGrid") )      ( C2U("InsertMinorGrid") )      ( C2U("DeleteMinorGrid") )
-        ( C2U("InsertAxis") )           ( C2U("DeleteAxis") )           ( C2U("InsertAxisTitle") )
+        ( "FormatMajorGrid" )      ( "InsertMajorGrid" )      ( "DeleteMajorGrid" )
+        ( "FormatMinorGrid" )      ( "InsertMinorGrid" )      ( "DeleteMinorGrid" )
+        ( "InsertAxis" )           ( "DeleteAxis" )           ( "InsertAxisTitle" )
 
         // toolbar commands
-        ( C2U("ToggleGridHorizontal"))( C2U("ToggleLegend") )         ( C2U("ScaleText") )
-        ( C2U("NewArrangement") )     ( C2U("Update") )
-        ( C2U("DefaultColors") )      ( C2U("BarWidth") )             ( C2U("NumberOfLines") )
-        ( C2U("ArrangeRow") )
-        ( C2U("StatusBarVisible") )
-        ( C2U("ChartElementSelector") )
+        ( "ToggleGridHorizontal" )( "ToggleLegend" )         ( "ScaleText" )
+        ( "NewArrangement" )     ( "Update" )
+        ( "DefaultColors" )      ( "BarWidth" )             ( "NumberOfLines" )
+        ( "ArrangeRow" )
+        ( "StatusBarVisible" )
+        ( "ChartElementSelector" )
         ;
 }
 
diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx
index 1221e15c71df..f6d39e76c5b5 100644
--- a/chart2/source/view/main/PropertyMapper.cxx
+++ b/chart2/source/view/main/PropertyMapper.cxx
@@ -176,53 +176,53 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForCharacterProper
     //shape property -- chart model object property
     static tMakePropertyNameMap m_aShapePropertyMapForCharacterProperties =
         tMakePropertyNameMap
-        ( C2U( "CharColor" ),               C2U("CharColor") )
-        ( C2U( "CharContoured" ),           C2U("CharContoured") )
-        ( C2U( "CharEmphasis" ),            C2U("CharEmphasis") )//the service style::CharacterProperties  describes a property called 'CharEmphasize' wich is nowhere implemented
-
-        ( C2U( "CharFontFamily" ),          C2U("CharFontFamily") )
-        ( C2U( "CharFontFamilyAsian" ),     C2U("CharFontFamilyAsian") )
-        ( C2U( "CharFontFamilyComplex" ),   C2U("CharFontFamilyComplex") )
-        ( C2U( "CharFontCharSet" ),         C2U("CharFontCharSet") )
-        ( C2U( "CharFontCharSetAsian" ),    C2U("CharFontCharSetAsian") )
-        ( C2U( "CharFontCharSetComplex" ),  C2U("CharFontCharSetComplex") )
-        ( C2U( "CharFontName" ),            C2U("CharFontName") )
-        ( C2U( "CharFontNameAsian" ),       C2U("CharFontNameAsian") )
-        ( C2U( "CharFontNameComplex" ),     C2U("CharFontNameComplex") )
-        ( C2U( "CharFontPitch" ),           C2U("CharFontPitch") )
-        ( C2U( "CharFontPitchAsian" ),      C2U("CharFontPitchAsian") )
-        ( C2U( "CharFontPitchComplex" ),    C2U("CharFontPitchComplex") )
-        ( C2U( "CharFontStyleName" ),       C2U("CharFontStyleName") )
-        ( C2U( "CharFontStyleNameAsian" ),  C2U("CharFontStyleNameAsian") )
-        ( C2U( "CharFontStyleNameComplex" ),C2U("CharFontStyleNameComplex") )
-
-        ( C2U( "CharHeight" ),              C2U("CharHeight") )
-        ( C2U( "CharHeightAsian" ),         C2U("CharHeightAsian") )
-        ( C2U( "CharHeightComplex" ),       C2U("CharHeightComplex") )
-        ( C2U( "CharKerning" ),             C2U("CharKerning") )
-        ( C2U( "CharLocale" ),              C2U("CharLocale") )
-        ( C2U( "CharLocaleAsian" ),         C2U("CharLocaleAsian") )
-        ( C2U( "CharLocaleComplex" ),       C2U("CharLocaleComplex") )
-        ( C2U( "CharPosture" ),             C2U("CharPosture") )
-        ( C2U( "CharPostureAsian" ),        C2U("CharPostureAsian") )
-        ( C2U( "CharPostureComplex" ),      C2U("CharPostureComplex") )
-        ( C2U( "CharRelief" ),              C2U("CharRelief") )
-        ( C2U( "CharShadowed" ),            C2U("CharShadowed") )
-        ( C2U( "CharStrikeout" ),           C2U("CharStrikeout") )
-        ( C2U( "CharUnderline" ),           C2U("CharUnderline") )
-        ( C2U( "CharUnderlineColor" ),      C2U("CharUnderlineColor") )
-        ( C2U( "CharUnderlineHasColor" ),   C2U("CharUnderlineHasColor") )
-        ( C2U( "CharOverline" ),            C2U("CharOverline") )
-        ( C2U( "CharOverlineColor" ),       C2U("CharOverlineColor") )
-        ( C2U( "CharOverlineHasColor" ),    C2U("CharOverlineHasColor") )
-        ( C2U( "CharWeight" ),              C2U("CharWeight") )
-        ( C2U( "CharWeightAsian" ),         C2U("CharWeightAsian") )
-        ( C2U( "CharWeightComplex" ),       C2U("CharWeightComplex") )
-        ( C2U( "CharWordMode" ),            C2U("CharWordMode") )
-
-        ( C2U( "WritingMode" ),             C2U("WritingMode") )
-
-        ( C2U( "ParaIsCharacterDistance" ), C2U("ParaIsCharacterDistance") )
+        ( "CharColor",                "CharColor" )
+        ( "CharContoured",            "CharContoured" )
+        ( "CharEmphasis",             "CharEmphasis" )//the service style::CharacterProperties  describes a property called 'CharEmphasize' wich is nowhere implemented
+
+        ( "CharFontFamily",           "CharFontFamily" )
+        ( "CharFontFamilyAsian",      "CharFontFamilyAsian" )
+        ( "CharFontFamilyComplex",    "CharFontFamilyComplex" )
+        ( "CharFontCharSet",          "CharFontCharSet" )
+        ( "CharFontCharSetAsian",     "CharFontCharSetAsian" )
+        ( "CharFontCharSetComplex",   "CharFontCharSetComplex" )
+        ( "CharFontName",             "CharFontName" )
+        ( "CharFontNameAsian",        "CharFontNameAsian" )
+        ( "CharFontNameComplex",      "CharFontNameComplex" )
+        ( "CharFontPitch",            "CharFontPitch" )
+        ( "CharFontPitchAsian",       "CharFontPitchAsian" )
+        ( "CharFontPitchComplex",     "CharFontPitchComplex" )
+        ( "CharFontStyleName",        "CharFontStyleName" )
+        ( "CharFontStyleNameAsian",   "CharFontStyleNameAsian" )
+        ( "CharFontStyleNameComplex", "CharFontStyleNameComplex" )
+
+        ( "CharHeight",               "CharHeight" )
+        ( "CharHeightAsian",          "CharHeightAsian" )
+        ( "CharHeightComplex",        "CharHeightComplex" )
+        ( "CharKerning",              "CharKerning" )
+        ( "CharLocale",               "CharLocale" )
+        ( "CharLocaleAsian",          "CharLocaleAsian" )
+        ( "CharLocaleComplex",        "CharLocaleComplex" )
+        ( "CharPosture",              "CharPosture" )
+        ( "CharPostureAsian",         "CharPostureAsian" )
+        ( "CharPostureComplex",       "CharPostureComplex" )
+        ( "CharRelief",               "CharRelief" )
+        ( "CharShadowed",             "CharShadowed" )
+        ( "CharStrikeout",            "CharStrikeout" )
+        ( "CharUnderline",            "CharUnderline" )
+        ( "CharUnderlineColor",       "CharUnderlineColor" )
+        ( "CharUnderlineHasColor",    "CharUnderlineHasColor" )
+        ( "CharOverline",             "CharOverline" )
+        ( "CharOverlineColor",        "CharOverlineColor" )
+        ( "CharOverlineHasColor",     "CharOverlineHasColor" )
+        ( "CharWeight",               "CharWeight" )
+        ( "CharWeightAsian",          "CharWeightAsian" )
+        ( "CharWeightComplex",        "CharWeightComplex" )
+        ( "CharWordMode",             "CharWordMode" )
+
+        ( "WritingMode",              "WritingMode" )
+
+        ( "ParaIsCharacterDistance",  "ParaIsCharacterDistance" )
         ;
     return m_aShapePropertyMapForCharacterProperties;
 }
@@ -232,13 +232,13 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForParagraphProper
     //shape property -- chart model object property
     static tMakePropertyNameMap m_aShapePropertyMapForParagraphProperties =
         tMakePropertyNameMap
-        ( C2U( "ParaAdjust" ),          C2U("ParaAdjust") )
-        ( C2U( "ParaBottomMargin" ),    C2U("ParaBottomMargin") )
-        ( C2U( "ParaIsHyphenation" ),   C2U("ParaIsHyphenation") )
-        ( C2U( "ParaLastLineAdjust" ),  C2U("ParaLastLineAdjust") )
-        ( C2U( "ParaLeftMargin" ),      C2U("ParaLeftMargin") )
-        ( C2U( "ParaRightMargin" ),     C2U("ParaRightMargin") )
-        ( C2U( "ParaTopMargin" ),       C2U("ParaTopMargin") )
+        ( "ParaAdjust",          "ParaAdjust" )
+        ( "ParaBottomMargin",    "ParaBottomMargin" )
+        ( "ParaIsHyphenation",   "ParaIsHyphenation" )
+        ( "ParaLastLineAdjust",  "ParaLastLineAdjust" )
+        ( "ParaLeftMargin",      "ParaLeftMargin" )
+        ( "ParaRightMargin",     "ParaRightMargin" )
+        ( "ParaTopMargin",       "ParaTopMargin" )
         ;
     return m_aShapePropertyMapForParagraphProperties;
 }
@@ -248,25 +248,25 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForFillProperties(
     //shape property -- chart model object property
     static tMakePropertyNameMap m_aShapePropertyMapForFillProperties =
         tMakePropertyNameMap
-        ( C2U( "FillBackground" ),        C2U( "FillBackground" ) )
-        ( C2U( "FillBitmapName" ),        C2U( "FillBitmapName" ) )
-        ( C2U( "FillColor" ),             C2U( "FillColor" ) )
-        ( C2U( "FillGradientName" ),      C2U( "FillGradientName" ) )
-        ( C2U( "FillGradientStepCount" ), C2U( "FillGradientStepCount" ) )
-        ( C2U( "FillHatchName" ),         C2U( "FillHatchName" ) )
-        ( C2U( "FillStyle" ),             C2U( "FillStyle" ) )
-        ( C2U( "FillTransparence" ),      C2U( "FillTransparence" ) )
-        ( C2U( "FillTransparenceGradientName" ), C2U("FillTransparenceGradientName") )
+        ( "FillBackground",               "FillBackground" )
+        ( "FillBitmapName",               "FillBitmapName" )
+        ( "FillColor",                    "FillColor" )
+        ( "FillGradientName",             "FillGradientName" )
+        ( "FillGradientStepCount",        "FillGradientStepCount" )
+        ( "FillHatchName",                "FillHatchName" )
+        ( "FillStyle",                    "FillStyle" )
+        ( "FillTransparence",             "FillTransparence" )
+        ( "FillTransparenceGradientName", "FillTransparenceGradientName" )
         //bitmap properties
-        ( C2U( "FillBitmapMode" ),        C2U( "FillBitmapMode" ) )
-        ( C2U( "FillBitmapSizeX" ),       C2U( "FillBitmapSizeX" ) )
-        ( C2U( "FillBitmapSizeY" ),       C2U( "FillBitmapSizeY" ) )
-        ( C2U( "FillBitmapLogicalSize" ), C2U( "FillBitmapLogicalSize" ) )
-        ( C2U( "FillBitmapOffsetX" ),     C2U( "FillBitmapOffsetX" ) )
-        ( C2U( "FillBitmapOffsetY" ),     C2U( "FillBitmapOffsetY" ) )
-        ( C2U( "FillBitmapRectanglePoint" ),C2U( "FillBitmapRectanglePoint" ) )
-        ( C2U( "FillBitmapPositionOffsetX" ),C2U( "FillBitmapPositionOffsetX" ) )
-        ( C2U( "FillBitmapPositionOffsetY" ),C2U( "FillBitmapPositionOffsetY" ) )
+        ( "FillBitmapMode",               "FillBitmapMode" )
+        ( "FillBitmapSizeX",              "FillBitmapSizeX" )
+        ( "FillBitmapSizeY",              "FillBitmapSizeY" )
+        ( "FillBitmapLogicalSize",        "FillBitmapLogicalSize" )
+        ( "FillBitmapOffsetX",            "FillBitmapOffsetX" )
+        ( "FillBitmapOffsetY",            "FillBitmapOffsetY" )
+        ( "FillBitmapRectanglePoint",     "FillBitmapRectanglePoint" )
+        ( "FillBitmapPositionOffsetX",    "FillBitmapPositionOffsetX" )
+        ( "FillBitmapPositionOffsetY",    "FillBitmapPositionOffsetY" )
         ;
     return m_aShapePropertyMapForFillProperties;
 }
@@ -276,12 +276,12 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForLineProperties(
     //shape property -- chart model object property
     static tMakePropertyNameMap m_aShapePropertyMapForLineProperties =
         tMakePropertyNameMap
-        ( C2U( "LineColor" ),             C2U( "LineColor" ) )
-        ( C2U( "LineDashName" ),          C2U( "LineDashName" ) )
-        ( C2U( "LineJoint" ),             C2U( "LineJoint" ) )
-        ( C2U( "LineStyle" ),             C2U( "LineStyle" ) )
-        ( C2U( "LineTransparence" ),      C2U( "LineTransparence" ) )
-        ( C2U( "LineWidth" ),             C2U( "LineWidth" ) )
+        ( "LineColor",              "LineColor" )
+        ( "LineDashName",           "LineDashName" )
+        ( "LineJoint",              "LineJoint" )
+        ( "LineStyle",              "LineStyle" )
+        ( "LineTransparence",       "LineTransparence" )
+        ( "LineWidth",              "LineWidth" )
         ;
     return m_aShapePropertyMapForLineProperties;
 }
@@ -313,11 +313,11 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForLineSeriesPrope
     //shape property -- chart model object property
     static tMakePropertyNameMap m_aShapePropertyMapForLineSeriesProperties =
         tMakePropertyNameMap
-        ( C2U( "LineColor" ),           C2U("Color") )
-        ( C2U( "LineDashName" ),        C2U("LineDashName") )
-        ( C2U( "LineStyle" ),           C2U("LineStyle") )
-        ( C2U( "LineTransparence" ),    C2U("Transparency") )
-        ( C2U( "LineWidth" ),           C2U("LineWidth") )
+        ( "LineColor",           "Color" )
+        ( "LineDashName",        "LineDashName" )
+        ( "LineStyle",           "LineStyle" )
+        ( "LineTransparence",    "Transparency" )
+        ( "LineWidth",           "LineWidth" )
 
         ;
     return m_aShapePropertyMapForLineSeriesProperties;
@@ -328,31 +328,31 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForFilledSeriesPro
     //shape property -- chart model object property
     static tMakePropertyNameMap m_aShapePropertyMapForFilledSeriesProperties =
         tMakePropertyNameMap
-        ( C2U( "FillBackground"),       C2U("FillBackground") )
-        ( C2U( "FillBitmapName" ),      C2U("FillBitmapName") )
-        ( C2U( "FillColor" ),           C2U("Color") )
-        ( C2U( "FillGradientName" ),    C2U("GradientName") )
-        ( C2U( "FillGradientStepCount" ), C2U( "GradientStepCount" ) )
-        ( C2U( "FillHatchName" ),       C2U("HatchName") )
-        ( C2U( "FillStyle" ),           C2U("FillStyle") )
-        ( C2U( "FillTransparence" ),    C2U("Transparency") )
-        ( C2U( "FillTransparenceGradientName" ), C2U("TransparencyGradientName") )
+        ( "FillBackground",               "FillBackground" )
+        ( "FillBitmapName",               "FillBitmapName" )
+        ( "FillColor",                    "Color" )
+        ( "FillGradientName",             "GradientName" )
+        ( "FillGradientStepCount",        "GradientStepCount" )
+        ( "FillHatchName",                "HatchName" )
+        ( "FillStyle",                    "FillStyle" )
+        ( "FillTransparence",             "Transparency" )
+        ( "FillTransparenceGradientName", "TransparencyGradientName" )
         //bitmap properties
-        ( C2U( "FillBitmapMode" ),        C2U( "FillBitmapMode" ) )
-        ( C2U( "FillBitmapSizeX" ),       C2U( "FillBitmapSizeX" ) )
-        ( C2U( "FillBitmapSizeY" ),       C2U( "FillBitmapSizeY" ) )
-        ( C2U( "FillBitmapLogicalSize" ), C2U( "FillBitmapLogicalSize" ) )
-        ( C2U( "FillBitmapOffsetX" ),     C2U( "FillBitmapOffsetX" ) )
-        ( C2U( "FillBitmapOffsetY" ),     C2U( "FillBitmapOffsetY" ) )
-        ( C2U( "FillBitmapRectanglePoint" ),C2U( "FillBitmapRectanglePoint" ) )
-        ( C2U( "FillBitmapPositionOffsetX" ),C2U( "FillBitmapPositionOffsetX" ) )
-        ( C2U( "FillBitmapPositionOffsetY" ),C2U( "FillBitmapPositionOffsetY" ) )
+        ( "FillBitmapMode",               "FillBitmapMode" )
+        ( "FillBitmapSizeX",              "FillBitmapSizeX" )
+        ( "FillBitmapSizeY",              "FillBitmapSizeY" )
+        ( "FillBitmapLogicalSize",        "FillBitmapLogicalSize" )
+        ( "FillBitmapOffsetX",            "FillBitmapOffsetX" )
+        ( "FillBitmapOffsetY",            "FillBitmapOffsetY" )
+        ( "FillBitmapRectanglePoint",     "FillBitmapRectanglePoint" )
+        ( "FillBitmapPositionOffsetX",    "FillBitmapPositionOffsetX" )
+        ( "FillBitmapPositionOffsetY",    "FillBitmapPositionOffsetY" )
         //line properties
-        ( C2U( "LineColor" ),           C2U("BorderColor") )
-        ( C2U( "LineDashName" ),        C2U("BorderDashName") )
-        ( C2U( "LineStyle" ),           C2U("BorderStyle") )
-        ( C2U( "LineTransparence" ),    C2U("BorderTransparency") )
-        ( C2U( "LineWidth" ),           C2U("BorderWidth") )
+        ( "LineColor",                    "BorderColor" )
+        ( "LineDashName",                 "BorderDashName" )
+        ( "LineStyle",                    "BorderStyle" )
+        ( "LineTransparence",             "BorderTransparency" )
+        ( "LineWidth",                    "BorderWidth" )
         ;
     return m_aShapePropertyMapForFilledSeriesProperties;
 }