diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2012-03-10 22:23:34 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2012-03-12 13:35:59 +0100 |
commit | ca939177d6823ed0dddb15283cc20709a0af5eb9 (patch) | |
tree | 2c74bf318c14fcb414cf7bdd136dd78502e7731b /chart2/source/controller | |
parent | @since 3.6 -> @since LibreOffice 3.6 (diff) | |
download | core-ca939177d6823ed0dddb15283cc20709a0af5eb9.tar.gz core-ca939177d6823ed0dddb15283cc20709a0af5eb9.zip |
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
Diffstat (limited to 'chart2/source/controller')
-rw-r--r-- | chart2/source/controller/main/ChartController.cxx | 100 |
1 files changed, 50 insertions, 50 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" ) ; } |