[Libreoffice-commits] .: chart2/source chart2/workbench
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Nov 9 13:12:47 PST 2010
chart2/source/inc/chartview/servicenames_charttypes.hxx | 12 +--
chart2/source/inc/servicenames.hxx | 36 ++++-----
chart2/source/inc/servicenames_charttypes.hxx | 20 ++---
chart2/source/inc/servicenames_coosystems.hxx | 8 +-
chart2/source/inc/servicenames_dlwrapper.hxx | 4 -
chart2/source/model/main/ChartModel.cxx | 8 +-
chart2/source/model/main/ChartModel_Persistence.cxx | 6 -
chart2/workbench/addin/sampleaddin.cxx | 58 ++++++++--------
8 files changed, 76 insertions(+), 76 deletions(-)
New commits:
commit d8bd5bfa9727a8e383e52ca7a7821c462000af01
Author: Kevin Hunter <hunteke at earlham.edu>
Date: Mon Nov 8 06:05:04 2010 -0500
EasyHack: createFromAscii to RTL macro
diff --git a/chart2/source/inc/chartview/servicenames_charttypes.hxx b/chart2/source/inc/chartview/servicenames_charttypes.hxx
index 99c49a7..237545a 100644
--- a/chart2/source/inc/chartview/servicenames_charttypes.hxx
+++ b/chart2/source/inc/chartview/servicenames_charttypes.hxx
@@ -33,14 +33,14 @@ namespace chart
{
//.............................................................................
-#define CHART2_VIEW_BARCHART_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.view.BarChart_Impl")
-#define CHART2_VIEW_BARCHART_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.view.BarChart")
+#define CHART2_VIEW_BARCHART_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.view.BarChart_Impl" ))
+#define CHART2_VIEW_BARCHART_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.view.BarChart" ))
-#define CHART2_VIEW_PIECHART_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.view.PieChart_Impl")
-#define CHART2_VIEW_PIECHART_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.view.PieChart")
+#define CHART2_VIEW_PIECHART_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.view.PieChart_Impl" ))
+#define CHART2_VIEW_PIECHART_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.view.PieChart" ))
-#define CHART2_VIEW_AREACHART_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.view.AreaChart_Impl")
-#define CHART2_VIEW_AREACHART_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.view.AreaChart")
+#define CHART2_VIEW_AREACHART_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.view.AreaChart_Impl" ))
+#define CHART2_VIEW_AREACHART_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.view.AreaChart" ))
//.............................................................................
} //namespace chart
diff --git a/chart2/source/inc/servicenames.hxx b/chart2/source/inc/servicenames.hxx
index 0a44727..16a5693 100644
--- a/chart2/source/inc/servicenames.hxx
+++ b/chart2/source/inc/servicenames.hxx
@@ -33,37 +33,37 @@ namespace chart
{
//.............................................................................
-#define CHART_MODEL_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.ChartModel")
-#define CHART_MODEL_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.ChartDocument")
+#define CHART_MODEL_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartModel" ))
+#define CHART_MODEL_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ChartDocument" ))
//@todo create your own service containing the service com.sun.star.document.OfficeDocument
-#define CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.ChartController")
-#define CHART_CONTROLLER_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.ChartController")
+#define CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartController" ))
+#define CHART_CONTROLLER_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ChartController" ))
//@todo create your own service containing the service com.sun.star.frame.Controller
-#define CHART_VIEW_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.ChartView")
-#define CHART_VIEW_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.ChartView")
+#define CHART_VIEW_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartView" ))
+#define CHART_VIEW_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ChartView" ))
-#define CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.ChartFrameLoader")
-#define CHART_FRAMELOADER_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.frame.SynchronousFrameLoader")
+#define CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartFrameLoader" ))
+#define CHART_FRAMELOADER_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.SynchronousFrameLoader" ))
-#define CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.WizardDialog")
-#define CHART_WIZARD_DIALOG_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.WizardDialog")
+#define CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.WizardDialog" ))
+#define CHART_WIZARD_DIALOG_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.WizardDialog" ))
-#define CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.ChartTypeDialog")
-#define CHART_TYPE_DIALOG_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.ChartTypeDialog")
+#define CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartTypeDialog" ))
+#define CHART_TYPE_DIALOG_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ChartTypeDialog" ))
// wrapper for old UNO API (com.sun.star.chart)
-#define CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.ChartDocumentWrapper")
-#define CHART_CHARTAPIWRAPPER_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.ChartDocumentWrapper")
+#define CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartDocumentWrapper" ))
+#define CHART_CHARTAPIWRAPPER_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ChartDocumentWrapper" ))
// accessibility
-#define CHART_ACCESSIBLE_TEXT_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.AccessibleTextComponent")
-#define CHART_ACCESSIBLE_TEXT_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.accessibility.AccessibleTextComponent")
+#define CHART_ACCESSIBLE_TEXT_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.AccessibleTextComponent" ))
+#define CHART_ACCESSIBLE_TEXT_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleTextComponent" ))
-#define CHART_RENDERER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.ChartRenderer")
+#define CHART_RENDERER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartRenderer" ))
-#define CHART_UNDOMANAGER_SERVICE_NAME ::rtl::OUString::createFromAscii( "com.sun.star.chart2.UndoManager" )
+#define CHART_UNDOMANAGER_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.UndoManager" ))
//.............................................................................
} //namespace chart
diff --git a/chart2/source/inc/servicenames_charttypes.hxx b/chart2/source/inc/servicenames_charttypes.hxx
index f84312e..e0dd09c 100644
--- a/chart2/source/inc/servicenames_charttypes.hxx
+++ b/chart2/source/inc/servicenames_charttypes.hxx
@@ -33,16 +33,16 @@ namespace chart
{
//.............................................................................
-#define CHART2_SERVICE_NAME_CHARTTYPE_AREA ::rtl::OUString::createFromAscii("com.sun.star.chart2.AreaChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_BAR ::rtl::OUString::createFromAscii("com.sun.star.chart2.BarChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_COLUMN ::rtl::OUString::createFromAscii("com.sun.star.chart2.ColumnChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_LINE ::rtl::OUString::createFromAscii("com.sun.star.chart2.LineChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_SCATTER ::rtl::OUString::createFromAscii("com.sun.star.chart2.ScatterChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_PIE ::rtl::OUString::createFromAscii("com.sun.star.chart2.PieChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_NET ::rtl::OUString::createFromAscii("com.sun.star.chart2.NetChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET ::rtl::OUString::createFromAscii("com.sun.star.chart2.FilledNetChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK ::rtl::OUString::createFromAscii("com.sun.star.chart2.CandleStickChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE ::rtl::OUString::createFromAscii("com.sun.star.chart2.BubbleChartType")
+#define CHART2_SERVICE_NAME_CHARTTYPE_AREA ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.AreaChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_BAR ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.BarChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_COLUMN ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ColumnChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_LINE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.LineChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_SCATTER ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ScatterChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_PIE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.PieChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_NET ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.NetChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.FilledNetChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CandleStickChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.BubbleChartType" ))
//.............................................................................
} //namespace chart
diff --git a/chart2/source/inc/servicenames_coosystems.hxx b/chart2/source/inc/servicenames_coosystems.hxx
index 6b90764..8cc1543 100644
--- a/chart2/source/inc/servicenames_coosystems.hxx
+++ b/chart2/source/inc/servicenames_coosystems.hxx
@@ -33,10 +33,10 @@ namespace chart
{
//.............................................................................
-#define CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.CoordinateSystems.Cartesian")
-#define CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.CoordinateSystems.CartesianView")
-#define CHART2_COOSYSTEM_POLAR_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.CoordinateSystems.Polar")
-#define CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.CoordinateSystems.PolarView")
+#define CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CoordinateSystems.Cartesian" ))
+#define CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CoordinateSystems.CartesianView" ))
+#define CHART2_COOSYSTEM_POLAR_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CoordinateSystems.Polar" ))
+#define CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CoordinateSystems.PolarView" ))
//.............................................................................
} //namespace chart
diff --git a/chart2/source/inc/servicenames_dlwrapper.hxx b/chart2/source/inc/servicenames_dlwrapper.hxx
index c72dc22..bdfb46f 100644
--- a/chart2/source/inc/servicenames_dlwrapper.hxx
+++ b/chart2/source/inc/servicenames_dlwrapper.hxx
@@ -33,8 +33,8 @@ namespace chart
{
//.............................................................................
-#define CHART2_VIEW_DLWRAPPER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.DrawModelWrapper")
-#define CHART2_VIEW_DLWRAPPER_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.DrawModelWrapper")
+#define CHART2_VIEW_DLWRAPPER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.DrawModelWrapper" ))
+#define CHART2_VIEW_DLWRAPPER_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.DrawModelWrapper" ))
//.............................................................................
} //namespace chart
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index f66ca37..8748494 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -738,16 +738,16 @@ Reference< chart2::data::XDataSource > ChartModel::impl_createDefaultData()
//create data
uno::Sequence< beans::PropertyValue > aArgs( 4 );
aArgs[0] = beans::PropertyValue(
- ::rtl::OUString::createFromAscii("CellRangeRepresentation"), -1,
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CellRangeRepresentation" )), -1,
uno::makeAny( C2U("all") ), beans::PropertyState_DIRECT_VALUE );
aArgs[1] = beans::PropertyValue(
- ::rtl::OUString::createFromAscii("HasCategories"), -1,
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasCategories" )), -1,
uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE );
aArgs[2] = beans::PropertyValue(
- ::rtl::OUString::createFromAscii("FirstCellAsLabel"), -1,
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FirstCellAsLabel" )), -1,
uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE );
aArgs[3] = beans::PropertyValue(
- ::rtl::OUString::createFromAscii("DataRowSource"), -1,
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DataRowSource" )), -1,
uno::makeAny( ::com::sun::star::chart::ChartDataRowSource_COLUMNS ), beans::PropertyState_DIRECT_VALUE );
xDataSource = m_xInternalDataProvider->createDataSource( aArgs );
}
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index 1b107c1..7b55b02 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -160,7 +160,7 @@ Reference< document::XFilter > ChartModel::impl_createFilter(
// find FilterName in MediaDescriptor
OUString aFilterName(
- lcl_getProperty< OUString >( rMediaDescriptor, OUString::createFromAscii("FilterName")));
+ lcl_getProperty< OUString >( rMediaDescriptor, OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ))));
// if FilterName was found, get Filter from factory
if( aFilterName.getLength() > 0 )
@@ -178,7 +178,7 @@ Reference< document::XFilter > ChartModel::impl_createFilter(
(aFilterProps >>= aProps))
{
OUString aFilterServiceName(
- lcl_getProperty< OUString >( aProps, OUString::createFromAscii("FilterService")));
+ lcl_getProperty< OUString >( aProps, OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterService" ))));
if( aFilterServiceName.getLength())
{
@@ -389,7 +389,7 @@ void ChartModel::impl_store(
apphelper::MediaDescriptorHelper aMDHelper(rMediaDescriptor);
try
{
- xPropSet->setPropertyValue( OUString::createFromAscii("SavedObject"),
+ xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "SavedObject" )),
uno::makeAny( aMDHelper.HierarchicalDocumentName ) );
}
catch ( uno::Exception& )
diff --git a/chart2/workbench/addin/sampleaddin.cxx b/chart2/workbench/addin/sampleaddin.cxx
index 02f2c1b..507610c 100644
--- a/chart2/workbench/addin/sampleaddin.cxx
+++ b/chart2/workbench/addin/sampleaddin.cxx
@@ -56,9 +56,9 @@ sal_Bool SAL_CALL component_writeInfo(
{
try
{
- OUString aImpl = OUString::createFromAscii( "/" );
+ OUString aImpl( RTL_CONSTASCII_USTRINGPARAM( "/" ));
aImpl += SampleAddIn::getImplementationName_Static();
- aImpl += OUString::createFromAscii( "/UNO/SERVICES" );
+ aImpl += OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
uno::Reference< registry::XRegistryKey> xNewKey(
reinterpret_cast<registry::XRegistryKey*>( pRegistryKey )->createKey( aImpl ) );
@@ -137,9 +137,9 @@ sal_Bool SampleAddIn::getLogicalPosition( uno::Reference< drawing::XShape >& xAx
try
{
double fMin(0.0), fMax(0.0);
- uno::Any aAny = xProp->getPropertyValue( OUString::createFromAscii( "Min" ));
+ uno::Any aAny = xProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Min" )));
aAny >>= fMin;
- aAny = xProp->getPropertyValue( OUString::createFromAscii( "Max" ));
+ aAny = xProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Max" )));
aAny >>= fMax;
double fRange = fMax - fMin;
@@ -174,17 +174,17 @@ sal_Bool SampleAddIn::getLogicalPosition( uno::Reference< drawing::XShape >& xAx
OUString SampleAddIn::getImplementationName_Static()
{
- return OUString::createFromAscii( "SampleAddIn" );
+ return OUString( RTL_CONSTASCII_USTRINGPARAM( "SampleAddIn" ));
}
uno::Sequence< ::rtl::OUString > SampleAddIn::getSupportedServiceNames_Static()
{
uno::Sequence< OUString > aSeq( 4 );
- aSeq[ 0 ] = OUString::createFromAscii( "com.sun.star.chart.ChartAxisXSupplier" );
- aSeq[ 1 ] = OUString::createFromAscii( "com.sun.star.chart.ChartAxisYSupplier" );
- aSeq[ 2 ] = OUString::createFromAscii( "com.sun.star.chart.Diagram" );
- aSeq[ 3 ] = OUString::createFromAscii( "com.sun.star.chart.SampleAddIn" );
+ aSeq[ 0 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartAxisXSupplier" ));
+ aSeq[ 1 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartAxisYSupplier" ));
+ aSeq[ 2 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.Diagram" ));
+ aSeq[ 3 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.SampleAddIn" ));
return aSeq;
}
@@ -219,7 +219,7 @@ void SAL_CALL SampleAddIn::initialize( const uno::Sequence< uno::Any >& aArgumen
aBaseType <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.XYDiagram" ));
try
{
- xDocProp->setPropertyValue( rtl::OUString::createFromAscii( "BaseDiagram" ), aBaseType );
+ xDocProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseDiagram" )), aBaseType );
}
catch( ... )
{}
@@ -236,8 +236,8 @@ void SAL_CALL SampleAddIn::initialize( const uno::Sequence< uno::Any >& aArgumen
{
uno::Any aAny;
aAny <<= (sal_Int32)( 0xe0e0f0 );
- xDiaProp->setPropertyValue( OUString::createFromAscii( "FillColor" ), aAny );
- xLegendProp->setPropertyValue( OUString::createFromAscii( "FillColor" ), aAny );
+ xDiaProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "FillColor" )), aAny );
+ xLegendProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "FillColor" )), aAny );
}
}
}
@@ -285,7 +285,7 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
if( ! mxMyRedLine.is())
{
mxMyRedLine = uno::Reference< drawing::XShape >(
- xFactory->createInstance( OUString::createFromAscii( "com.sun.star.drawing.LineShape" )),
+ xFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.LineShape" ))),
uno::UNO_QUERY );
xPage->add( mxMyRedLine );
@@ -298,8 +298,8 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
aWidth <<= (sal_Int32)(50); // 0.5 mm
try
{
- xShapeProp->setPropertyValue( OUString::createFromAscii( "LineColor" ), aColor );
- xShapeProp->setPropertyValue( OUString::createFromAscii( "LineWidth" ), aWidth );
+ xShapeProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "LineColor" )), aColor );
+ xShapeProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "LineWidth" )), aWidth );
}
catch( ... )
{}
@@ -309,16 +309,16 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
if( ! mxMyText.is())
{
mxMyText = uno::Reference< drawing::XShape >(
- xFactory->createInstance( OUString::createFromAscii( "com.sun.star.drawing.TextShape" )),
+ xFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.TextShape" ))),
uno::UNO_QUERY );
xPage->add( mxMyText );
// change text
OUString aText;
-// if( maLocale.Language.equalsIgnoreCase( OUString::createFromAscii("DE")))
-// aText = OUString::createFromAscii( "Kleines Beispiel" );
+// if( maLocale.Language.equalsIgnoreCase( OUString( RTL_CONSTASCII_USTRINGPARAM( "DE" ))))
+// aText = OUString( RTL_CONSTASCII_USTRINGPARAM( "Kleines Beispiel" ));
// else
- aText = OUString::createFromAscii( "Little Example" );
+ aText = OUString( RTL_CONSTASCII_USTRINGPARAM( "Little Example" ));
uno::Reference< beans::XPropertySet > xTextProp( mxMyText, uno::UNO_QUERY );
if( xTextProp.is())
@@ -327,7 +327,7 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
aTrueAny <<= (sal_Bool)(sal_True);
try
{
- xTextProp->setPropertyValue( rtl::OUString::createFromAscii( "TextAutoGrowWidth" ), aTrueAny );
+ xTextProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextAutoGrowWidth" )), aTrueAny );
}
catch( ... )
{}
@@ -379,7 +379,7 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
{
uno::Any aAny;
aAny <<= aPtSeq;
- xShapeProp->setPropertyValue( rtl::OUString::createFromAscii( "PolyPolygon" ), aAny );
+ xShapeProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PolyPolygon" )), aAny );
}
}
if( mxMyText.is())
@@ -400,10 +400,10 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
// {
// uno::Any aAny;
// aAny <<= (sal_Bool)(sal_False);
-// xXAxis->setPropertyValue( rtl::OUString::createFromAscii( "AutoStepMain" ),
+// xXAxis->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoStepMain" )),
// aAny );
// aAny <<= (double)(200.0);
-// xXAxis->setPropertyValue( rtl::OUString::createFromAscii( "StepMain" ),
+// xXAxis->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StepMain" )),
// aAny );
// }
@@ -413,9 +413,9 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
// {
// uno::Any aAny;
// aAny <<= (sal_Int32)(-1);
-// xProp->setPropertyValue( OUString::createFromAscii( "SymbolType" ), aAny );
-// aAny <<= rtl::OUString::createFromAscii( "http://mib-1168/www/images/go.gif" );
-// xProp->setPropertyValue( OUString::createFromAscii( "SymbolBitmapURL" ), aAny );
+// xProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "SymbolType" )), aAny );
+// aAny <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "http://mib-1168/www/images/go.gif" ));
+// xProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "SymbolBitmapURL" )), aAny );
// }
}
@@ -436,7 +436,7 @@ void SAL_CALL SampleAddIn::removeRefreshListener( const uno::Reference< util::XR
// XDiagram
OUString SAL_CALL SampleAddIn::getDiagramType() throw( uno::RuntimeException )
{
- return OUString::createFromAscii( "com.sun.star.chart.SampleDiagram" );
+ return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.SampleDiagram" ));
}
// the following methods just delegate to the "parent diagram" (which in the future might no longer exist)
@@ -521,7 +521,7 @@ void SAL_CALL SampleAddIn::setPosition( const awt::Point& aPos )
// XShapeDescriptor ( ::XShape ::XDiagram )
rtl::OUString SAL_CALL SampleAddIn::getShapeType() throw( com::sun::star::uno::RuntimeException )
{
- return OUString::createFromAscii( "com.sun.star.chart.SampleAddinShape" );
+ return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.SampleAddinShape" ));
}
// XAxisXSupplier
@@ -673,7 +673,7 @@ uno::Reference< beans::XPropertySet > SAL_CALL SampleAddIn::getMinMaxLine()
// XServiceName
OUString SAL_CALL SampleAddIn::getServiceName() throw( uno::RuntimeException )
{
- return OUString::createFromAscii( "com.sun.star.chart.SampleAddIn" );
+ return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.SampleAddIn" ));
}
// XServiceInfo
More information about the Libreoffice-commits
mailing list