summaryrefslogtreecommitdiff
path: root/chart2/source/model/template/ChartTypeManager.cxx
diff options
context:
space:
mode:
authorJean-Noël Rouvignac <jn.rouvignac@gmail.com>2013-01-30 11:44:23 +0100
committerLuboš Luňák <l.lunak@suse.cz>2013-01-30 12:54:40 +0000
commit97eb8a6e0eb830f37dcba64a51d725aab4c5ff53 (patch)
treea1a95b8249052d846a997ad1729758168d6a3b24 /chart2/source/model/template/ChartTypeManager.cxx
parentf8569cd9a28a3a8856dba4ad53218aa6cc073521 (diff)
Removed several useless macros: A2OU, A2S, C2U, C2S, OUSTR, OUSTRING
Change-Id: Ie859cb2dfdc7103c379fce56be88eef8fe390afd Reviewed-on: https://gerrit.libreoffice.org/1924 Tested-by: Luboš Luňák <l.lunak@suse.cz> Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'chart2/source/model/template/ChartTypeManager.cxx')
-rw-r--r--chart2/source/model/template/ChartTypeManager.cxx140
1 files changed, 70 insertions, 70 deletions
diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx
index 61f55cffd54c..25aba04d05c1 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -135,72 +135,72 @@ const tTemplateMapType & lcl_DefaultChartTypeMap()
{
static const tTemplateMapType aMap = tTemplateMapType(
::comphelper::MakeMap< tTemplateMapType::key_type, tTemplateMapType::mapped_type >
- ( C2U( "com.sun.star.chart2.template.Symbol" ), TEMPLATE_SYMBOL )
- ( C2U( "com.sun.star.chart2.template.StackedSymbol" ), TEMPLATE_STACKEDSYMBOL )
- ( C2U( "com.sun.star.chart2.template.PercentStackedSymbol" ), TEMPLATE_PERCENTSTACKEDSYMBOL )
- ( C2U( "com.sun.star.chart2.template.Line" ), TEMPLATE_LINE )
- ( C2U( "com.sun.star.chart2.template.StackedLine" ), TEMPLATE_STACKEDLINE )
- ( C2U( "com.sun.star.chart2.template.PercentStackedLine" ), TEMPLATE_PERCENTSTACKEDLINE )
- ( C2U( "com.sun.star.chart2.template.LineSymbol" ), TEMPLATE_LINESYMBOL )
- ( C2U( "com.sun.star.chart2.template.StackedLineSymbol" ), TEMPLATE_STACKEDLINESYMBOL )
- ( C2U( "com.sun.star.chart2.template.PercentStackedLineSymbol" ), TEMPLATE_PERCENTSTACKEDLINESYMBOL )
- ( C2U( "com.sun.star.chart2.template.ThreeDLine" ), TEMPLATE_THREEDLINE )
- ( C2U( "com.sun.star.chart2.template.StackedThreeDLine" ), TEMPLATE_STACKEDTHREEDLINE )
- ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDLine" ), TEMPLATE_PERCENTSTACKEDTHREEDLINE )
- ( C2U( "com.sun.star.chart2.template.ThreeDLineDeep" ), TEMPLATE_THREEDLINEDEEP )
- ( C2U( "com.sun.star.chart2.template.Column" ), TEMPLATE_COLUMN )
- ( C2U( "com.sun.star.chart2.template.StackedColumn" ), TEMPLATE_STACKEDCOLUMN )
- ( C2U( "com.sun.star.chart2.template.PercentStackedColumn" ), TEMPLATE_PERCENTSTACKEDCOLUMN )
- ( C2U( "com.sun.star.chart2.template.Bar" ), TEMPLATE_BAR )
- ( C2U( "com.sun.star.chart2.template.StackedBar" ), TEMPLATE_STACKEDBAR )
- ( C2U( "com.sun.star.chart2.template.PercentStackedBar" ), TEMPLATE_PERCENTSTACKEDBAR )
- ( C2U( "com.sun.star.chart2.template.ThreeDColumnDeep" ), TEMPLATE_THREEDCOLUMNDEEP )
- ( C2U( "com.sun.star.chart2.template.ThreeDColumnFlat" ), TEMPLATE_THREEDCOLUMNFLAT )
- ( C2U( "com.sun.star.chart2.template.StackedThreeDColumnFlat" ), TEMPLATE_STACKEDTHREEDCOLUMNFLAT )
- ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDColumnFlat" ), TEMPLATE_PERCENTSTACKEDTHREEDCOLUMNFLAT )
- ( C2U( "com.sun.star.chart2.template.ThreeDBarDeep" ), TEMPLATE_THREEDBARDEEP )
- ( C2U( "com.sun.star.chart2.template.ThreeDBarFlat" ), TEMPLATE_THREEDBARFLAT )
- ( C2U( "com.sun.star.chart2.template.StackedThreeDBarFlat" ), TEMPLATE_STACKEDTHREEDBARFLAT )
- ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDBarFlat" ), TEMPLATE_PERCENTSTACKEDTHREEDBARFLAT )
- ( C2U( "com.sun.star.chart2.template.ColumnWithLine" ), TEMPLATE_COLUMNWITHLINE )
- ( C2U( "com.sun.star.chart2.template.StackedColumnWithLine" ), TEMPLATE_STACKEDCOLUMNWITHLINE )
- ( C2U( "com.sun.star.chart2.template.Area" ), TEMPLATE_AREA )
- ( C2U( "com.sun.star.chart2.template.StackedArea" ), TEMPLATE_STACKEDAREA )
- ( C2U( "com.sun.star.chart2.template.PercentStackedArea" ), TEMPLATE_PERCENTSTACKEDAREA )
- ( C2U( "com.sun.star.chart2.template.ThreeDArea" ), TEMPLATE_THREEDAREA )
- ( C2U( "com.sun.star.chart2.template.StackedThreeDArea" ), TEMPLATE_STACKEDTHREEDAREA )
- ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDArea" ), TEMPLATE_PERCENTSTACKEDTHREEDAREA )
- ( C2U( "com.sun.star.chart2.template.Pie" ), TEMPLATE_PIE )
- ( C2U( "com.sun.star.chart2.template.PieAllExploded" ), TEMPLATE_PIEALLEXPLODED )
- ( C2U( "com.sun.star.chart2.template.Donut" ), TEMPLATE_DONUT )
- ( C2U( "com.sun.star.chart2.template.DonutAllExploded" ), TEMPLATE_DONUTALLEXPLODED )
- ( C2U( "com.sun.star.chart2.template.ThreeDPie" ), TEMPLATE_THREEDPIE )
- ( C2U( "com.sun.star.chart2.template.ThreeDPieAllExploded" ), TEMPLATE_THREEDPIEALLEXPLODED )
- ( C2U( "com.sun.star.chart2.template.ThreeDDonut" ), TEMPLATE_THREEDDONUT )
- ( C2U( "com.sun.star.chart2.template.ThreeDDonutAllExploded" ), TEMPLATE_THREEDDONUTALLEXPLODED )
- ( C2U( "com.sun.star.chart2.template.ScatterLineSymbol" ), TEMPLATE_SCATTERLINESYMBOL )
- ( C2U( "com.sun.star.chart2.template.ScatterLine" ), TEMPLATE_SCATTERLINE )
- ( C2U( "com.sun.star.chart2.template.ScatterSymbol" ), TEMPLATE_SCATTERSYMBOL )
- ( C2U( "com.sun.star.chart2.template.ThreeDScatter" ), TEMPLATE_THREEDSCATTER )
- ( C2U( "com.sun.star.chart2.template.Net" ), TEMPLATE_NET )
- ( C2U( "com.sun.star.chart2.template.NetSymbol" ), TEMPLATE_NETSYMBOL )
- ( C2U( "com.sun.star.chart2.template.NetLine" ), TEMPLATE_NETLINE )
- ( C2U( "com.sun.star.chart2.template.StackedNet" ), TEMPLATE_STACKEDNET )
- ( C2U( "com.sun.star.chart2.template.StackedNetSymbol" ), TEMPLATE_STACKEDNETSYMBOL )
- ( C2U( "com.sun.star.chart2.template.StackedNetLine" ), TEMPLATE_STACKEDNETLINE )
- ( C2U( "com.sun.star.chart2.template.PercentStackedNet" ), TEMPLATE_PERCENTSTACKEDNET )
- ( C2U( "com.sun.star.chart2.template.PercentStackedNetSymbol" ), TEMPLATE_PERCENTSTACKEDNETSYMBOL )
- ( C2U( "com.sun.star.chart2.template.PercentStackedNetLine" ), TEMPLATE_PERCENTSTACKEDNETLINE )
- ( C2U( "com.sun.star.chart2.template.FilledNet" ), TEMPLATE_FILLEDNET )
- ( C2U( "com.sun.star.chart2.template.StackedFilledNet" ), TEMPLATE_STACKEDFILLEDNET )
- ( C2U( "com.sun.star.chart2.template.PercentStackedFilledNet" ), TEMPLATE_PERCENTSTACKEDFILLEDNET )
- ( C2U( "com.sun.star.chart2.template.StockLowHighClose" ), TEMPLATE_STOCKLOWHIGHCLOSE )
- ( C2U( "com.sun.star.chart2.template.StockOpenLowHighClose" ), TEMPLATE_STOCKOPENLOWHIGHCLOSE )
- ( C2U( "com.sun.star.chart2.template.StockVolumeLowHighClose" ), TEMPLATE_STOCKVOLUMELOWHIGHCLOSE )
- ( C2U( "com.sun.star.chart2.template.StockVolumeOpenLowHighClose" ), TEMPLATE_STOCKVOLUMEOPENLOWHIGHCLOSE )
- ( C2U( "com.sun.star.chart2.template.Bubble" ), TEMPLATE_BUBBLE )
-// ( C2U( "com.sun.star.chart2.template.Surface" ), TEMPLATE_SURFACE )
-// ( C2U( "com.sun.star.chart2.template.Addin" ), TEMPLATE_ADDIN )
+ ( "com.sun.star.chart2.template.Symbol", TEMPLATE_SYMBOL )
+ ( "com.sun.star.chart2.template.StackedSymbol", TEMPLATE_STACKEDSYMBOL )
+ ( "com.sun.star.chart2.template.PercentStackedSymbol", TEMPLATE_PERCENTSTACKEDSYMBOL )
+ ( "com.sun.star.chart2.template.Line", TEMPLATE_LINE )
+ ( "com.sun.star.chart2.template.StackedLine", TEMPLATE_STACKEDLINE )
+ ( "com.sun.star.chart2.template.PercentStackedLine", TEMPLATE_PERCENTSTACKEDLINE )
+ ( "com.sun.star.chart2.template.LineSymbol", TEMPLATE_LINESYMBOL )
+ ( "com.sun.star.chart2.template.StackedLineSymbol", TEMPLATE_STACKEDLINESYMBOL )
+ ( "com.sun.star.chart2.template.PercentStackedLineSymbol", TEMPLATE_PERCENTSTACKEDLINESYMBOL )
+ ( "com.sun.star.chart2.template.ThreeDLine", TEMPLATE_THREEDLINE )
+ ( "com.sun.star.chart2.template.StackedThreeDLine", TEMPLATE_STACKEDTHREEDLINE )
+ ( "com.sun.star.chart2.template.PercentStackedThreeDLine", TEMPLATE_PERCENTSTACKEDTHREEDLINE )
+ ( "com.sun.star.chart2.template.ThreeDLineDeep", TEMPLATE_THREEDLINEDEEP )
+ ( "com.sun.star.chart2.template.Column", TEMPLATE_COLUMN )
+ ( "com.sun.star.chart2.template.StackedColumn", TEMPLATE_STACKEDCOLUMN )
+ ( "com.sun.star.chart2.template.PercentStackedColumn", TEMPLATE_PERCENTSTACKEDCOLUMN )
+ ( "com.sun.star.chart2.template.Bar", TEMPLATE_BAR )
+ ( "com.sun.star.chart2.template.StackedBar", TEMPLATE_STACKEDBAR )
+ ( "com.sun.star.chart2.template.PercentStackedBar", TEMPLATE_PERCENTSTACKEDBAR )
+ ( "com.sun.star.chart2.template.ThreeDColumnDeep", TEMPLATE_THREEDCOLUMNDEEP )
+ ( "com.sun.star.chart2.template.ThreeDColumnFlat", TEMPLATE_THREEDCOLUMNFLAT )
+ ( "com.sun.star.chart2.template.StackedThreeDColumnFlat", TEMPLATE_STACKEDTHREEDCOLUMNFLAT )
+ ( "com.sun.star.chart2.template.PercentStackedThreeDColumnFlat", TEMPLATE_PERCENTSTACKEDTHREEDCOLUMNFLAT )
+ ( "com.sun.star.chart2.template.ThreeDBarDeep", TEMPLATE_THREEDBARDEEP )
+ ( "com.sun.star.chart2.template.ThreeDBarFlat", TEMPLATE_THREEDBARFLAT )
+ ( "com.sun.star.chart2.template.StackedThreeDBarFlat", TEMPLATE_STACKEDTHREEDBARFLAT )
+ ( "com.sun.star.chart2.template.PercentStackedThreeDBarFlat", TEMPLATE_PERCENTSTACKEDTHREEDBARFLAT )
+ ( "com.sun.star.chart2.template.ColumnWithLine", TEMPLATE_COLUMNWITHLINE )
+ ( "com.sun.star.chart2.template.StackedColumnWithLine", TEMPLATE_STACKEDCOLUMNWITHLINE )
+ ( "com.sun.star.chart2.template.Area", TEMPLATE_AREA )
+ ( "com.sun.star.chart2.template.StackedArea", TEMPLATE_STACKEDAREA )
+ ( "com.sun.star.chart2.template.PercentStackedArea", TEMPLATE_PERCENTSTACKEDAREA )
+ ( "com.sun.star.chart2.template.ThreeDArea", TEMPLATE_THREEDAREA )
+ ( "com.sun.star.chart2.template.StackedThreeDArea", TEMPLATE_STACKEDTHREEDAREA )
+ ( "com.sun.star.chart2.template.PercentStackedThreeDArea", TEMPLATE_PERCENTSTACKEDTHREEDAREA )
+ ( "com.sun.star.chart2.template.Pie", TEMPLATE_PIE )
+ ( "com.sun.star.chart2.template.PieAllExploded", TEMPLATE_PIEALLEXPLODED )
+ ( "com.sun.star.chart2.template.Donut", TEMPLATE_DONUT )
+ ( "com.sun.star.chart2.template.DonutAllExploded", TEMPLATE_DONUTALLEXPLODED )
+ ( "com.sun.star.chart2.template.ThreeDPie", TEMPLATE_THREEDPIE )
+ ( "com.sun.star.chart2.template.ThreeDPieAllExploded", TEMPLATE_THREEDPIEALLEXPLODED )
+ ( "com.sun.star.chart2.template.ThreeDDonut", TEMPLATE_THREEDDONUT )
+ ( "com.sun.star.chart2.template.ThreeDDonutAllExploded", TEMPLATE_THREEDDONUTALLEXPLODED )
+ ( "com.sun.star.chart2.template.ScatterLineSymbol", TEMPLATE_SCATTERLINESYMBOL )
+ ( "com.sun.star.chart2.template.ScatterLine", TEMPLATE_SCATTERLINE )
+ ( "com.sun.star.chart2.template.ScatterSymbol", TEMPLATE_SCATTERSYMBOL )
+ ( "com.sun.star.chart2.template.ThreeDScatter", TEMPLATE_THREEDSCATTER )
+ ( "com.sun.star.chart2.template.Net", TEMPLATE_NET )
+ ( "com.sun.star.chart2.template.NetSymbol", TEMPLATE_NETSYMBOL )
+ ( "com.sun.star.chart2.template.NetLine", TEMPLATE_NETLINE )
+ ( "com.sun.star.chart2.template.StackedNet", TEMPLATE_STACKEDNET )
+ ( "com.sun.star.chart2.template.StackedNetSymbol", TEMPLATE_STACKEDNETSYMBOL )
+ ( "com.sun.star.chart2.template.StackedNetLine", TEMPLATE_STACKEDNETLINE )
+ ( "com.sun.star.chart2.template.PercentStackedNet", TEMPLATE_PERCENTSTACKEDNET )
+ ( "com.sun.star.chart2.template.PercentStackedNetSymbol", TEMPLATE_PERCENTSTACKEDNETSYMBOL )
+ ( "com.sun.star.chart2.template.PercentStackedNetLine", TEMPLATE_PERCENTSTACKEDNETLINE )
+ ( "com.sun.star.chart2.template.FilledNet", TEMPLATE_FILLEDNET )
+ ( "com.sun.star.chart2.template.StackedFilledNet", TEMPLATE_STACKEDFILLEDNET )
+ ( "com.sun.star.chart2.template.PercentStackedFilledNet", TEMPLATE_PERCENTSTACKEDFILLEDNET )
+ ( "com.sun.star.chart2.template.StockLowHighClose", TEMPLATE_STOCKLOWHIGHCLOSE )
+ ( "com.sun.star.chart2.template.StockOpenLowHighClose", TEMPLATE_STOCKOPENLOWHIGHCLOSE )
+ ( "com.sun.star.chart2.template.StockVolumeLowHighClose", TEMPLATE_STOCKVOLUMELOWHIGHCLOSE )
+ ( "com.sun.star.chart2.template.StockVolumeOpenLowHighClose", TEMPLATE_STOCKVOLUMEOPENLOWHIGHCLOSE )
+ ( "com.sun.star.chart2.template.Bubble", TEMPLATE_BUBBLE )
+// ( "com.sun.star.chart2.template.Surface", TEMPLATE_SURFACE )
+// ( "com.sun.star.chart2.template.Addin", TEMPLATE_ADDIN )
);
return aMap;
@@ -573,7 +573,7 @@ uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames()
if( xEnumAcc.is())
{
uno::Reference< container::XEnumeration > xEnum(
- xEnumAcc->createContentEnumeration( C2U( "com.sun.star.chart2.ChartTypeTemplate" ) ));
+ xEnumAcc->createContentEnumeration( "com.sun.star.chart2.ChartTypeTemplate" ));
if( xEnum.is())
{
uno::Reference< uno::XInterface > xFactIntf;
@@ -597,8 +597,8 @@ uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames()
Sequence< OUString > ChartTypeManager::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 2 );
- aServices[ 0 ] = C2U( "com.sun.star.chart2.ChartTypeManager" );
- aServices[ 1 ] = C2U( "com.sun.star.lang.MultiServiceFactory" );
+ aServices[ 0 ] = "com.sun.star.chart2.ChartTypeManager";
+ aServices[ 1 ] = "com.sun.star.lang.MultiServiceFactory";
return aServices;
}
@@ -606,7 +606,7 @@ Sequence< OUString > ChartTypeManager::getSupportedServiceNames_Static()
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
APPHELPER_XSERVICEINFO_IMPL( ChartTypeManager,
- C2U( "com.sun.star.comp.chart.ChartTypeManager" ));
+ OUString("com.sun.star.comp.chart.ChartTypeManager") );
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */