summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2012-10-13 17:41:05 +0200
committerAndras Timar <atimar@suse.com>2012-10-13 17:41:05 +0200
commite5ce011c3f32f53ef073aec5485450b2588b656a (patch)
tree8a838a53bcdd70cc3d4cdbca0ebe07504790952e /chart2
parentc6b26144c93aa5222e4260c5b0ef45ce5bdc18d2 (diff)
parente74fc93e4aba7887e6a278cc44c4bc0962471065 (diff)
Merge branch 'master' into feature/killsdf
Conflicts: Makefile.top Module_tail_build.mk RepositoryExternal.mk RepositoryFixes.mk accessibility/source/standard/vclxaccessibletoolbox.cxx basic/source/uno/dlgcont.cxx connectivity/Library_ado.mk cross_tail_build/prj/build.lst desktop/source/offacc/acceptor.cxx filter/Library_PptImporter.mk filter/source/t602/filterenv.cxx i18npool/Library_textconv_dict.mk ooo.lst.in saxon/ExternalProject_saxon.mk saxon/build.xml sc/sdi/scalc.sdi sc/source/filter/xml/xmlstyli.cxx sc/source/ui/condformat/condformatdlg.cxx sc/source/ui/condformat/condformatmgr.cxx sc/source/ui/view/cellsh1.cxx sdext/source/pdfimport/misc/pwdinteract.cxx shell/qa/zip/makefile.mk shell/qa/zip/testimpl/makefile.mk solenv/gbuild/CppunitTest.mk solenv/gbuild/gbuild.mk solenv/gbuild/platform/android.mk solenv/gbuild/platform/com_GCC_defs.mk solenv/gbuild/platform/macosx.mk soltools/Executable_adjustvisibility.mk soltools/Executable_checkdll.mk soltools/Executable_cpp.mk soltools/Executable_javadep.mk soltools/Executable_makedepend.mk sw/qa/extras/rtfimport/rtfimport.cxx tail_build/prj/build.lst tomcat/ExternalProject_tomcat.mk ucb/source/ucp/webdav/webdavcontent.cxx xml2cmp/Executable_xml2cmp.mk
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/controller/dialogs/ChartTypeDialogController.cxx164
-rw-r--r--chart2/source/controller/dialogs/ChartTypeDialogController.hxx4
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.cxx15
-rw-r--r--chart2/source/controller/dialogs/DataBrowserModel.cxx24
-rw-r--r--chart2/source/controller/dialogs/DialogModel.cxx88
-rw-r--r--chart2/source/controller/dialogs/ObjectNameProvider.cxx101
-rw-r--r--chart2/source/controller/dialogs/RangeSelectionHelper.cxx9
-rw-r--r--chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx42
-rw-r--r--chart2/source/controller/dialogs/dlg_ObjectProperties.cxx10
-rw-r--r--chart2/source/controller/dialogs/res_DataLabel.cxx4
-rw-r--r--chart2/source/controller/dialogs/res_ErrorBar.cxx10
-rw-r--r--chart2/source/controller/dialogs/res_LegendPosition.cxx12
-rw-r--r--chart2/source/controller/dialogs/res_TextSeparator.cxx18
-rw-r--r--chart2/source/controller/dialogs/res_TextSeparator.hxx6
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx10
-rw-r--r--chart2/source/controller/dialogs/tp_ChartType.cxx6
-rw-r--r--chart2/source/controller/dialogs/tp_ChartType.src4
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.cxx20
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_DataSourceControls.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_RangeChooser.cxx14
-rw-r--r--chart2/source/controller/dialogs/tp_RangeChooser.hxx2
-rw-r--r--chart2/source/controller/drawinglayer/DrawViewWrapper.cxx6
-rw-r--r--chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx56
-rw-r--r--chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx138
-rw-r--r--chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx80
-rw-r--r--chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx35
-rw-r--r--chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx136
-rw-r--r--chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx18
-rw-r--r--chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx12
-rw-r--r--chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx30
-rw-r--r--chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx51
-rw-r--r--chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx8
-rw-r--r--chart2/source/controller/main/ChartController.cxx282
-rw-r--r--chart2/source/controller/main/ChartRenderer.cxx2
-rw-r--r--chart2/source/model/filter/XMLFilter.cxx6
-rw-r--r--chart2/source/model/main/ChartModel.cxx2
-rw-r--r--chart2/source/view/axes/VAxisProperties.cxx6
-rw-r--r--chart2/source/view/axes/VAxisProperties.hxx10
-rw-r--r--chart2/source/view/charttypes/Splines.cxx6
-rw-r--r--chart2/source/view/main/ChartView.cxx2
42 files changed, 723 insertions, 734 deletions
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index ad05e71f9431..a03796fd42fa 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -62,7 +62,7 @@ ChartTypeParameter::ChartTypeParameter()
, nSplineOrder(3)
, nGeometry3D(DataPointGeometry3D::CUBOID)
, eThreeDLookScheme(ThreeDLookScheme_Realistic)
- , bSortByXValues(sal_False)
+ , bSortByXValues(false)
{
}
@@ -81,7 +81,7 @@ ChartTypeParameter::ChartTypeParameter( sal_Int32 SubTypeIndex, bool HasXAxisWit
, nSplineOrder(3)
, nGeometry3D(DataPointGeometry3D::CUBOID)
, eThreeDLookScheme(ThreeDLookScheme_Realistic)
- , bSortByXValues(sal_False)
+ , bSortByXValues(false)
{
}
ChartTypeParameter::~ChartTypeParameter()
@@ -129,7 +129,7 @@ Image ChartTypeDialogController::getImage()
{
return Image();
}
-bool ChartTypeDialogController::isSubType( const rtl::OUString& rServiceName )
+bool ChartTypeDialogController::isSubType( const OUString& rServiceName )
{
const tTemplateServiceChartTypeParameterMap& rTemplateMap = this->getTemplateMap();
tTemplateServiceChartTypeParameterMap::const_iterator aIt( rTemplateMap.find( rServiceName ));
@@ -138,7 +138,7 @@ bool ChartTypeDialogController::isSubType( const rtl::OUString& rServiceName )
return false;
}
ChartTypeParameter ChartTypeDialogController::getChartTypeParameterForService(
- const rtl::OUString& rServiceName
+ const OUString& rServiceName
, const uno::Reference< beans::XPropertySet >& xTemplateProps )
{
ChartTypeParameter aRet;
@@ -150,9 +150,9 @@ ChartTypeParameter ChartTypeDialogController::getChartTypeParameterForService(
{
try
{
- xTemplateProps->getPropertyValue( C2U( "CurveStyle" )) >>= aRet.eCurveStyle;
- xTemplateProps->getPropertyValue( C2U( "CurveResolution" )) >>= aRet.nCurveResolution;
- xTemplateProps->getPropertyValue( C2U( "SplineOrder" )) >>= aRet.nSplineOrder;
+ xTemplateProps->getPropertyValue( "CurveStyle" ) >>= aRet.eCurveStyle;
+ xTemplateProps->getPropertyValue( "CurveResolution" ) >>= aRet.nCurveResolution;
+ xTemplateProps->getPropertyValue( "SplineOrder" ) >>= aRet.nSplineOrder;
}
catch( uno::Exception & ex )
{
@@ -162,7 +162,7 @@ ChartTypeParameter ChartTypeDialogController::getChartTypeParameterForService(
try
{
- xTemplateProps->getPropertyValue( C2U( "Geometry3D" )) >>= aRet.nGeometry3D;
+ xTemplateProps->getPropertyValue( "Geometry3D" ) >>= aRet.nGeometry3D;
}
catch( uno::Exception& ex )
{
@@ -218,7 +218,7 @@ void ChartTypeDialogController::adjustParameterToMainType( ChartTypeParameter& r
sal_Int32 nSplineOrder = rParameter.nSplineOrder;
CurveStyle eCurveStyle = rParameter.eCurveStyle;
sal_Int32 nGeometry3D = rParameter.nGeometry3D;
- sal_Bool bSortByXValues = rParameter.bSortByXValues;
+ bool bSortByXValues = rParameter.bSortByXValues;
rParameter = (*aIter).second;
@@ -243,7 +243,7 @@ void ChartTypeDialogController::adjustParameterToMainType( ChartTypeParameter& r
rParameter = ChartTypeParameter();
}
}
-rtl::OUString ChartTypeDialogController::getServiceNameForParameter( const ChartTypeParameter& rParameter ) const
+OUString ChartTypeDialogController::getServiceNameForParameter( const ChartTypeParameter& rParameter ) const
{
ChartTypeParameter aParameter(rParameter);
if( aParameter.bXAxisWithValues )
@@ -268,7 +268,7 @@ rtl::OUString ChartTypeDialogController::getServiceNameForParameter( const Chart
return (*aIter).first;
}
}
- return ::rtl::OUString();
+ return OUString();
}
uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTemplate(
const ChartTypeParameter& rParameter
@@ -276,7 +276,7 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla
{
uno::Reference< XChartTypeTemplate > xTemplate(0);
- rtl::OUString aServiceName( this->getServiceNameForParameter( rParameter ) );
+ OUString aServiceName( this->getServiceNameForParameter( rParameter ) );
if(!aServiceName.isEmpty())
{
xTemplate.set( xTemplateManager->createInstance( aServiceName ), uno::UNO_QUERY );
@@ -287,9 +287,9 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla
{
try
{
- xTemplateProps->setPropertyValue( C2U( "CurveStyle" ), uno::makeAny(rParameter.eCurveStyle) );
- xTemplateProps->setPropertyValue( C2U( "CurveResolution" ), uno::makeAny(rParameter.nCurveResolution) );
- xTemplateProps->setPropertyValue( C2U( "SplineOrder" ), uno::makeAny(rParameter.nSplineOrder) );
+ xTemplateProps->setPropertyValue( "CurveStyle" , uno::makeAny(rParameter.eCurveStyle) );
+ xTemplateProps->setPropertyValue( "CurveResolution" , uno::makeAny(rParameter.nCurveResolution) );
+ xTemplateProps->setPropertyValue( "SplineOrder" , uno::makeAny(rParameter.nSplineOrder) );
}
catch( uno::Exception & ex )
{
@@ -298,7 +298,7 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla
}
try
{
- xTemplateProps->setPropertyValue( C2U( "Geometry3D" ), uno::makeAny(rParameter.nGeometry3D) );
+ xTemplateProps->setPropertyValue( "Geometry3D" , uno::makeAny(rParameter.nGeometry3D) );
}
catch( uno::Exception & ex )
{
@@ -345,7 +345,7 @@ bool ChartTypeDialogController::commitToModel( const ChartTypeParameter& rParame
{
uno::Reference< beans::XPropertySet > xDiaProp( xDiagram, uno::UNO_QUERY );
if( xDiaProp.is() )
- xDiaProp->setPropertyValue( C2U( "SortByXValues" ), uno::makeAny( rParameter.bSortByXValues ) );
+ xDiaProp->setPropertyValue( "SortByXValues" , uno::makeAny( rParameter.bSortByXValues ) );
}
}
return false;
@@ -440,13 +440,13 @@ const tTemplateServiceChartTypeParameterMap& ColumnChartDialogController::getTem
{
static tTemplateServiceChartTypeParameterMap m_aTemplateMap =
tTemplateServiceChartTypeParameterMap
- ( C2U( "com.sun.star.chart2.template.Column" ), ChartTypeParameter(1,false,false,GlobalStackMode_NONE) )
- ( C2U( "com.sun.star.chart2.template.StackedColumn" ), ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) )
- ( C2U( "com.sun.star.chart2.template.PercentStackedColumn" ), ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT) )
- ( C2U( "com.sun.star.chart2.template.ThreeDColumnFlat" ), ChartTypeParameter(1,false,true,GlobalStackMode_NONE) )
- ( C2U( "com.sun.star.chart2.template.StackedThreeDColumnFlat" ), ChartTypeParameter(2,false,true,GlobalStackMode_STACK_Y) )
- ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDColumnFlat" ), ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT) )
- ( C2U( "com.sun.star.chart2.template.ThreeDColumnDeep" ), ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z) )
+ ( "com.sun.star.chart2.template.Column" , ChartTypeParameter(1,false,false,GlobalStackMode_NONE) )
+ ( "com.sun.star.chart2.template.StackedColumn" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) )
+ ( "com.sun.star.chart2.template.PercentStackedColumn" , ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT) )
+ ( "com.sun.star.chart2.template.ThreeDColumnFlat" , ChartTypeParameter(1,false,true,GlobalStackMode_NONE) )
+ ( "com.sun.star.chart2.template.StackedThreeDColumnFlat" , ChartTypeParameter(2,false,true,GlobalStackMode_STACK_Y) )
+ ( "com.sun.star.chart2.template.PercentStackedThreeDColumnFlat" , ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT) )
+ ( "com.sun.star.chart2.template.ThreeDColumnDeep" , ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z) )
;
return m_aTemplateMap;
}
@@ -517,13 +517,13 @@ const tTemplateServiceChartTypeParameterMap& BarChartDialogController::getTempla
{
static tTemplateServiceChartTypeParameterMap m_aTemplateMap =
tTemplateServiceChartTypeParameterMap
- ( C2U( "com.sun.star.chart2.template.Bar" ), ChartTypeParameter(1,false,false,GlobalStackMode_NONE) )
- ( C2U( "com.sun.star.chart2.template.StackedBar" ), ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) )
- ( C2U( "com.sun.star.chart2.template.PercentStackedBar" ), ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT) )
- ( C2U( "com.sun.star.chart2.template.ThreeDBarFlat" ), ChartTypeParameter(1,false,true,GlobalStackMode_NONE) )
- ( C2U( "com.sun.star.chart2.template.StackedThreeDBarFlat" ), ChartTypeParameter(2,false,true,GlobalStackMode_STACK_Y) )
- ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDBarFlat" ), ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT) )
- ( C2U( "com.sun.star.chart2.template.ThreeDBarDeep" ), ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z) )
+ ( "com.sun.star.chart2.template.Bar" , ChartTypeParameter(1,false,false,GlobalStackMode_NONE) )
+ ( "com.sun.star.chart2.template.StackedBar" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) )
+ ( "com.sun.star.chart2.template.PercentStackedBar" , ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT) )
+ ( "com.sun.star.chart2.template.ThreeDBarFlat" , ChartTypeParameter(1,false,true,GlobalStackMode_NONE) )
+ ( "com.sun.star.chart2.template.StackedThreeDBarFlat" , ChartTypeParameter(2,false,true,GlobalStackMode_STACK_Y) )
+ ( "com.sun.star.chart2.template.PercentStackedThreeDBarFlat" , ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT) )
+ ( "com.sun.star.chart2.template.ThreeDBarDeep" , ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z) )
;
return m_aTemplateMap;
}
@@ -593,14 +593,14 @@ const tTemplateServiceChartTypeParameterMap& PieChartDialogController::getTempla
{
static tTemplateServiceChartTypeParameterMap m_aTemplateMap =
tTemplateServiceChartTypeParameterMap
- ( C2U( "com.sun.star.chart2.template.Pie" ), ChartTypeParameter(1,false,false) )
- ( C2U( "com.sun.star.chart2.template.PieAllExploded" ), ChartTypeParameter(2,false,false) )
- ( C2U( "com.sun.star.chart2.template.Donut" ), ChartTypeParameter(3,false,false) )
- ( C2U( "com.sun.star.chart2.template.DonutAllExploded" ), ChartTypeParameter(4,false,false) )
- ( C2U( "com.sun.star.chart2.template.ThreeDPie" ), ChartTypeParameter(1,false,true) )
- ( C2U( "com.sun.star.chart2.template.ThreeDPieAllExploded" ), ChartTypeParameter(2,false,true) )
- ( C2U( "com.sun.star.chart2.template.ThreeDDonut" ), ChartTypeParameter(3,false,true) )
- ( C2U( "com.sun.star.chart2.template.ThreeDDonutAllExploded" ), ChartTypeParameter(4,false,true) )
+ ( "com.sun.star.chart2.template.Pie" , ChartTypeParameter(1,false,false) )
+ ( "com.sun.star.chart2.template.PieAllExploded" , ChartTypeParameter(2,false,false) )
+ ( "com.sun.star.chart2.template.Donut" , ChartTypeParameter(3,false,false) )
+ ( "com.sun.star.chart2.template.DonutAllExploded" , ChartTypeParameter(4,false,false) )
+ ( "com.sun.star.chart2.template.ThreeDPie" , ChartTypeParameter(1,false,true) )
+ ( "com.sun.star.chart2.template.ThreeDPieAllExploded" , ChartTypeParameter(2,false,true) )
+ ( "com.sun.star.chart2.template.ThreeDDonut" , ChartTypeParameter(3,false,true) )
+ ( "com.sun.star.chart2.template.ThreeDDonutAllExploded" , ChartTypeParameter(4,false,true) )
;
return m_aTemplateMap;
}
@@ -657,19 +657,19 @@ const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTempl
static tTemplateServiceChartTypeParameterMap m_aTemplateMap =
tTemplateServiceChartTypeParameterMap
//-------------------------------------------------------
- ( C2U( "com.sun.star.chart2.template.Symbol" ), ChartTypeParameter(1,false,false,GlobalStackMode_NONE,true,false) )
- ( C2U( "com.sun.star.chart2.template.StackedSymbol" ), ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y,true,false) )
- ( C2U( "com.sun.star.chart2.template.PercentStackedSymbol" ), ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y_PERCENT,true,false) )
- ( C2U( "com.sun.star.chart2.template.LineSymbol" ), ChartTypeParameter(2,false,false,GlobalStackMode_NONE,true,true) )
- ( C2U( "com.sun.star.chart2.template.StackedLineSymbol" ), ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y,true,true) )
- ( C2U( "com.sun.star.chart2.template.PercentStackedLineSymbol" ), ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y_PERCENT,true,true) )
- ( C2U( "com.sun.star.chart2.template.Line" ), ChartTypeParameter(3,false,false,GlobalStackMode_NONE,false,true) )
- ( C2U( "com.sun.star.chart2.template.StackedLine" ), ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y,false,true) )
- ( C2U( "com.sun.star.chart2.template.PercentStackedLine" ), ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT,false,true) )
+ ( "com.sun.star.chart2.template.Symbol" , ChartTypeParameter(1,false,false,GlobalStackMode_NONE,true,false) )
+ ( "com.sun.star.chart2.template.StackedSymbol" , ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y,true,false) )
+ ( "com.sun.star.chart2.template.PercentStackedSymbol" , ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y_PERCENT,true,false) )
+ ( "com.sun.star.chart2.template.LineSymbol" , ChartTypeParameter(2,false,false,GlobalStackMode_NONE,true,true) )
+ ( "com.sun.star.chart2.template.StackedLineSymbol" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y,true,true) )
+ ( "com.sun.star.chart2.template.PercentStackedLineSymbol" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y_PERCENT,true,true) )
+ ( "com.sun.star.chart2.template.Line" , ChartTypeParameter(3,false,false,GlobalStackMode_NONE,false,true) )
+ ( "com.sun.star.chart2.template.StackedLine" , ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y,false,true) )
+ ( "com.sun.star.chart2.template.PercentStackedLine" , ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT,false,true) )
//-------------------------------------------------------
- ( C2U( "com.sun.star.chart2.template.StackedThreeDLine" ), ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Y,false,true) )
- ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDLine" ), ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Y_PERCENT,false,true) )
- ( C2U( "com.sun.star.chart2.template.ThreeDLineDeep" ), ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z,false,true) )
+ ( "com.sun.star.chart2.template.StackedThreeDLine" , ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Y,false,true) )
+ ( "com.sun.star.chart2.template.PercentStackedThreeDLine" , ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Y_PERCENT,false,true) )
+ ( "com.sun.star.chart2.template.ThreeDLineDeep" , ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z,false,true) )
//-------------------------------------------------------
;
return m_aTemplateMap;
@@ -789,10 +789,10 @@ const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplat
static tTemplateServiceChartTypeParameterMap m_aTemplateMap =
tTemplateServiceChartTypeParameterMap
//-------------------------------------------------------
- ( C2U( "com.sun.star.chart2.template.ScatterSymbol" ), ChartTypeParameter(1,true,false,GlobalStackMode_NONE,true,false) )
- ( C2U( "com.sun.star.chart2.template.ScatterLineSymbol" ), ChartTypeParameter(2,true,false,GlobalStackMode_NONE,true,true) )
- ( C2U( "com.sun.star.chart2.template.ScatterLine" ), ChartTypeParameter(3,true,false,GlobalStackMode_NONE,false,true) )
- ( C2U( "com.sun.star.chart2.template.ThreeDScatter" ), ChartTypeParameter(4,true,true,GlobalStackMode_NONE,false,true) )
+ ( "com.sun.star.chart2.template.ScatterSymbol" , ChartTypeParameter(1,true,false,GlobalStackMode_NONE,true,false) )
+ ( "com.sun.star.chart2.template.ScatterLineSymbol" , ChartTypeParameter(2,true,false,GlobalStackMode_NONE,true,true) )
+ ( "com.sun.star.chart2.template.ScatterLine" , ChartTypeParameter(3,true,false,GlobalStackMode_NONE,false,true) )
+ ( "com.sun.star.chart2.template.ThreeDScatter" , ChartTypeParameter(4,true,true,GlobalStackMode_NONE,false,true) )
;
return m_aTemplateMap;
}
@@ -879,12 +879,12 @@ const tTemplateServiceChartTypeParameterMap& AreaChartDialogController::getTempl
{
static tTemplateServiceChartTypeParameterMap m_aTemplateMap =
tTemplateServiceChartTypeParameterMap
- ( C2U( "com.sun.star.chart2.template.Area" ), ChartTypeParameter(1,false,false,GlobalStackMode_NONE) )
- ( C2U( "com.sun.star.chart2.template.ThreeDArea" ), ChartTypeParameter(1,false,true,GlobalStackMode_STACK_Z) )
- ( C2U( "com.sun.star.chart2.template.StackedArea" ), ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) )
- ( C2U( "com.sun.star.chart2.template.StackedThreeDArea" ), ChartTypeParameter(2,false,true,GlobalStackMode_STACK_Y) )
- ( C2U( "com.sun.star.chart2.template.PercentStackedArea" ), ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT) )
- ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDArea" ), ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT) )
+ ( "com.sun.star.chart2.template.Area" , ChartTypeParameter(1,false,false,GlobalStackMode_NONE) )
+ ( "com.sun.star.chart2.template.ThreeDArea" , ChartTypeParameter(1,false,true,GlobalStackMode_STACK_Z) )
+ ( "com.sun.star.chart2.template.StackedArea" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) )
+ ( "com.sun.star.chart2.template.StackedThreeDArea" , ChartTypeParameter(2,false,true,GlobalStackMode_STACK_Y) )
+ ( "com.sun.star.chart2.template.PercentStackedArea" , ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT) )
+ ( "com.sun.star.chart2.template.PercentStackedThreeDArea" , ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT) )
;
return m_aTemplateMap;
}
@@ -963,21 +963,21 @@ const tTemplateServiceChartTypeParameterMap& NetChartDialogController::getTempla
static tTemplateServiceChartTypeParameterMap m_aTemplateMap =
tTemplateServiceChartTypeParameterMap
//@todo need templates with symbols only
- ( C2U( "com.sun.star.chart2.template.NetSymbol" ), ChartTypeParameter(1,false,false,GlobalStackMode_NONE,true,false) )
- ( C2U( "com.sun.star.chart2.template.StackedNetSymbol" ), ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y,true,false) )
- ( C2U( "com.sun.star.chart2.template.PercentStackedNetSymbol" ),ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y_PERCENT,true,false) )
+ ( "com.sun.star.chart2.template.NetSymbol" , ChartTypeParameter(1,false,false,GlobalStackMode_NONE,true,false) )
+ ( "com.sun.star.chart2.template.StackedNetSymbol" , ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y,true,false) )
+ ( "com.sun.star.chart2.template.PercentStackedNetSymbol" ,ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y_PERCENT,true,false) )
- ( C2U( "com.sun.star.chart2.template.Net" ), ChartTypeParameter(2,false,false,GlobalStackMode_NONE,true,true) )
- ( C2U( "com.sun.star.chart2.template.StackedNet" ), ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y,true,true) )
- ( C2U( "com.sun.star.chart2.template.PercentStackedNet" ), ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y_PERCENT,true,true) )
+ ( "com.sun.star.chart2.template.Net" , ChartTypeParameter(2,false,false,GlobalStackMode_NONE,true,true) )
+ ( "com.sun.star.chart2.template.StackedNet" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y,true,true) )
+ ( "com.sun.star.chart2.template.PercentStackedNet" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y_PERCENT,true,true) )
- ( C2U( "com.sun.star.chart2.template.NetLine" ), ChartTypeParameter(3,false,false,GlobalStackMode_NONE,false,true) )
- ( C2U( "com.sun.star.chart2.template.StackedNetLine" ), ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y,false,true) )
- ( C2U( "com.sun.star.chart2.template.PercentStackedNetLine" ), ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT,false,true) )
+ ( "com.sun.star.chart2.template.NetLine" , ChartTypeParameter(3,false,false,GlobalStackMode_NONE,false,true) )
+ ( "com.sun.star.chart2.template.StackedNetLine" , ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y,false,true) )
+ ( "com.sun.star.chart2.template.PercentStackedNetLine" , ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT,false,true) )
- ( C2U( "com.sun.star.chart2.template.FilledNet" ), ChartTypeParameter(4,false,false,GlobalStackMode_NONE,false,false) )
- ( C2U( "com.sun.star.chart2.template.StackedFilledNet" ), ChartTypeParameter(4,false,false,GlobalStackMode_STACK_Y,false,false) )
- ( C2U( "com.sun.star.chart2.template.PercentStackedFilledNet" ),ChartTypeParameter(4,false,false,GlobalStackMode_STACK_Y_PERCENT,false,false) )
+ ( "com.sun.star.chart2.template.FilledNet" , ChartTypeParameter(4,false,false,GlobalStackMode_NONE,false,false) )
+ ( "com.sun.star.chart2.template.StackedFilledNet" , ChartTypeParameter(4,false,false,GlobalStackMode_STACK_Y,false,false) )
+ ( "com.sun.star.chart2.template.PercentStackedFilledNet" ,ChartTypeParameter(4,false,false,GlobalStackMode_STACK_Y_PERCENT,false,false) )
;
return m_aTemplateMap;
}
@@ -1054,10 +1054,10 @@ const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemp
{
static tTemplateServiceChartTypeParameterMap m_aTemplateMap =
tTemplateServiceChartTypeParameterMap
- ( C2U( "com.sun.star.chart2.template.StockLowHighClose" ), ChartTypeParameter(1) )
- ( C2U( "com.sun.star.chart2.template.StockOpenLowHighClose" ), ChartTypeParameter(2) )
- ( C2U( "com.sun.star.chart2.template.StockVolumeLowHighClose" ), ChartTypeParameter(3) )
- ( C2U( "com.sun.star.chart2.template.StockVolumeOpenLowHighClose" ),ChartTypeParameter(4) )
+ ( "com.sun.star.chart2.template.StockLowHighClose" , ChartTypeParameter(1) )
+ ( "com.sun.star.chart2.template.StockOpenLowHighClose" , ChartTypeParameter(2) )
+ ( "com.sun.star.chart2.template.StockVolumeLowHighClose" , ChartTypeParameter(3) )
+ ( "com.sun.star.chart2.template.StockVolumeOpenLowHighClose" ,ChartTypeParameter(4) )
;
return m_aTemplateMap;
}
@@ -1109,8 +1109,8 @@ const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogControlle
{
static tTemplateServiceChartTypeParameterMap m_aTemplateMap =
tTemplateServiceChartTypeParameterMap
- ( C2U( "com.sun.star.chart2.template.ColumnWithLine" ), ChartTypeParameter(1) )
- ( C2U( "com.sun.star.chart2.template.StackedColumnWithLine" ), ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) )
+ ( "com.sun.star.chart2.template.ColumnWithLine" , ChartTypeParameter(1) )
+ ( "com.sun.star.chart2.template.StackedColumnWithLine" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) )
;
return m_aTemplateMap;
}
@@ -1185,7 +1185,7 @@ void CombiColumnLineChartDialogController::fillExtraControls( const ChartTypePar
if(xTemplateProps.is())
try
{
- xTemplateProps->getPropertyValue( C2U("NumberOfLines") ) >>= nNumLines;
+ xTemplateProps->getPropertyValue( "NumberOfLines" ) >>= nNumLines;
}
catch( const uno::Exception & ex )
{
@@ -1206,7 +1206,7 @@ void CombiColumnLineChartDialogController::setTemplateProperties( const uno::Ref
if( xTemplateProps.is() )
{
sal_Int32 nNumLines = static_cast< sal_Int32 >( m_pMF_NumberOfLines->GetValue());
- xTemplateProps->setPropertyValue( C2U( "NumberOfLines" ), uno::makeAny(nNumLines) );
+ xTemplateProps->setPropertyValue( "NumberOfLines" , uno::makeAny(nNumLines) );
}
}
@@ -1251,7 +1251,7 @@ const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTem
{
static tTemplateServiceChartTypeParameterMap m_aTemplateMap =
tTemplateServiceChartTypeParameterMap
- ( C2U( "com.sun.star.chart2.template.Bubble" ), ChartTypeParameter(1,true) ) ;
+ ( "com.sun.star.chart2.template.Bubble" , ChartTypeParameter(1,true) ) ;
return m_aTemplateMap;
}
void BubbleChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ )
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
index 0904445788d7..43ee9d836df4 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
@@ -82,8 +82,8 @@ public:
sal_Int32 nGeometry3D;
- ThreeDLookScheme eThreeDLookScheme;
- sal_Bool bSortByXValues;
+ ThreeDLookScheme eThreeDLookScheme;
+ bool bSortByXValues;
};
typedef ::comphelper::MakeMap< ::rtl::OUString, ChartTypeParameter > tTemplateServiceChartTypeParameterMap;
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 2c9caa8c50dd..26eab789b849 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -75,7 +75,6 @@
using namespace ::com::sun::star;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
-using ::rtl::OUString;
using namespace ::svt;
@@ -580,7 +579,7 @@ void DataBrowser::RenewTable()
GetDataWindow().LogicToPixel( Size( 42, 0 )).getWidth() ));
OUString aDefaultSeriesName(SCH_RESSTR(STR_COLUMN_LABEL));
- replaceParamterInString( aDefaultSeriesName, C2U("%COLUMNNUMBER"), OUString::valueOf( sal_Int32(24) ) );
+ replaceParamterInString( aDefaultSeriesName, "%COLUMNNUMBER", OUString::valueOf( sal_Int32(24) ) );
sal_Int32 nColumnWidth = GetDataWindow().GetTextWidth( aDefaultSeriesName )
+ GetDataWindow().LogicToPixel( Point( 4 + impl::SeriesHeader::GetRelativeAppFontXPosForNameField(), 0 ), MAP_APPFONT ).X();
sal_Int32 nColumnCount = m_apDataBrowserModel->getColumnCount();
@@ -613,7 +612,7 @@ void DataBrowser::RenewTable()
sal_Int32 nColor = 0;
// @todo: Set "DraftColor", i.e. interpolated colors for gradients, bitmaps, etc.
if( xSeriesProp.is() &&
- ( xSeriesProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Color"))) >>= nColor ))
+ ( xSeriesProp->getPropertyValue( "Color" ) >>= nColor ))
spHeader->SetColor( Color( nColor ));
spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis );
spHeader->SetSeriesName(
@@ -621,7 +620,7 @@ void DataBrowser::RenewTable()
aIt->m_xDataSeries,
(aIt->m_xChartType.is() ?
aIt->m_xChartType->getRoleOfSequenceForSeriesLabel() :
- OUString( RTL_CONSTASCII_USTRINGPARAM("values-y"))))));
+ OUString("values-y")))));
// index is 1-based, as 0 is for the column that contains the row-numbers
spHeader->SetRange( aIt->m_nStartColumn + 1, aIt->m_nEndColumn + 1 );
spHeader->SetGetFocusHdl( aFocusLink );
@@ -646,7 +645,7 @@ String DataBrowser::GetColString( sal_Int32 nColumnId ) const
String DataBrowser::GetRowString( sal_Int32 nRow ) const
{
- return rtl::OUString::valueOf(nRow + 1);
+ return OUString::valueOf(nRow + 1);
}
String DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const
@@ -1119,7 +1118,7 @@ sal_uInt32 DataBrowser::GetNumberFormatKey( sal_Int32 nRow, sal_uInt16 nCol ) co
return m_apDataBrowserModel->getNumberFormatKey( lcl_getColumnInData( nCol ), lcl_getRowInData( nRow ));
}
-bool DataBrowser::isDateString( rtl::OUString aInputString, double& fOutDateValue )
+bool DataBrowser::isDateString( OUString aInputString, double& fOutDateValue )
{
sal_uInt32 nNumberFormat=0;
SvNumberFormatter* pSvNumberFormatter = m_spNumberFormatterWrapper.get() ? m_spNumberFormatterWrapper->getSvNumberFormatter() : 0;
@@ -1259,7 +1258,7 @@ void DataBrowser::RenewSeriesHeaders()
Reference< beans::XPropertySet > xSeriesProp( aIt->m_xDataSeries, uno::UNO_QUERY );
sal_Int32 nColor = 0;
if( xSeriesProp.is() &&
- ( xSeriesProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Color"))) >>= nColor ))
+ ( xSeriesProp->getPropertyValue( "Color" ) >>= nColor ))
spHeader->SetColor( Color( nColor ));
spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis );
spHeader->SetSeriesName(
@@ -1267,7 +1266,7 @@ void DataBrowser::RenewSeriesHeaders()
aIt->m_xDataSeries,
(aIt->m_xChartType.is() ?
aIt->m_xChartType->getRoleOfSequenceForSeriesLabel() :
- OUString( RTL_CONSTASCII_USTRINGPARAM("values-y"))))));
+ OUString( "values-y")))));
spHeader->SetRange( aIt->m_nStartColumn + 1, aIt->m_nEndColumn + 1 );
spHeader->SetGetFocusHdl( aFocusLink );
spHeader->SetEditChangedHdl( aSeriesHeaderChangedLink );
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 89f5aac9d349..e28259c5a007 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -57,7 +57,7 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
+
namespace
{
@@ -70,7 +70,7 @@ OUString lcl_getRole(
{
try
{
- xProp->getPropertyValue( C2U("Role")) >>= aResult;
+ xProp->getPropertyValue( "Role" ) >>= aResult;
}
catch( const uno::Exception & ex )
{
@@ -235,8 +235,8 @@ struct DataBrowserModel::tDataColumn
{
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDataSeries > m_xDataSeries;
- sal_Int32 m_nIndexInDataSeries;
- ::rtl::OUString m_aUIRoleName;
+ sal_Int32 m_nIndexInDataSeries;
+ OUString m_aUIRoleName;
::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XLabeledDataSequence > m_xLabeledDataSequence;
eCellType m_eCellType;
@@ -249,7 +249,7 @@ struct DataBrowserModel::tDataColumn
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDataSeries > & xDataSeries,
sal_Int32 nIndexInDataSeries,
- ::rtl::OUString aUIRoleName,
+ OUString aUIRoleName,
::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XLabeledDataSequence > xLabeledDataSequence,
eCellType aCellType,
@@ -336,7 +336,7 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex )
Reference< beans::XPropertySet > xSeriesProps( xSeries, uno::UNO_QUERY );
if( xSeriesProps.is() )
- xSeriesProps->getPropertyValue( C2U( "NumberFormat" )) >>= nSeriesNumberFormat;
+ xSeriesProps->getPropertyValue( "NumberFormat" ) >>= nSeriesNumberFormat;
}
else
{
@@ -394,7 +394,7 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex )
// labels
Reference< chart2::data::XDataSequence > xNewLabelSeq(
xDataProvider->createDataSequenceByRangeRepresentation(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "label " )) +
+ "label " +
OUString::valueOf( nIndex )));
lcl_copyDataSequenceProperties(
aLSequences[nSeqIdx]->getLabel(), xNewLabelSeq );
@@ -409,7 +409,7 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex )
//give the new series the same number format as the former series especially for bubble charts thus the bubble size values can be edited with same format immidiately
Reference< beans::XPropertySet > xNewSeriesProps( xNewSeries, uno::UNO_QUERY );
if( xNewSeriesProps.is() )
- xNewSeriesProps->setPropertyValue( C2U( "NumberFormat" ), uno::makeAny( nSeriesNumberFormat ) );
+ xNewSeriesProps->setPropertyValue( "NumberFormat" , uno::makeAny( nSeriesNumberFormat ) );
}
updateFromModel();
@@ -704,7 +704,7 @@ bool DataBrowserModel::setCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow, dou
setCellAny( nAtColumn, nAtRow, uno::makeAny( fValue ));
}
-bool DataBrowserModel::setCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow, const ::rtl::OUString & rText )
+bool DataBrowserModel::setCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow, const OUString & rText )
{
return (getCellType( nAtColumn, nAtRow ) == TEXT) &&
setCellAny( nAtColumn, nAtRow, uno::makeAny( rText ));
@@ -831,7 +831,7 @@ void DataBrowserModel::updateFromModel()
Reference< chart2::XDataSeriesContainer > xSeriesCnt( aChartTypes[nCTIdx], uno::UNO_QUERY );
if( xSeriesCnt.is())
{
- rtl::OUString aRoleForDataLabelNumberFormat = ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection( aChartTypes[nCTIdx] );
+ OUString aRoleForDataLabelNumberFormat = ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection( aChartTypes[nCTIdx] );
Sequence< Reference< chart2::XDataSeries > > aSeries( xSeriesCnt->getDataSeries());
lcl_tSharedSeqVec aSharedSequences( lcl_getSharedSequences( aSeries ));
@@ -877,7 +877,7 @@ void DataBrowserModel::updateFromModel()
nSequenceNumberFormatKey = ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel(
Reference< beans::XPropertySet >( xSeries, uno::UNO_QUERY ), xSeries, -1, xDiagram );
}
- else if( aRole.equals( C2U( "values-x" ) ) )
+ else if( aRole.equals( "values-x" ) )
nSequenceNumberFormatKey = nXAxisNumberFormat;
if( ::std::find_if( aSharedSequences.begin(), aSharedSequences.end(),
@@ -900,7 +900,7 @@ void DataBrowserModel::updateFromModel()
try
{
Reference< beans::XPropertySet > xProp( aCooSysSeq[nCooSysIdx], uno::UNO_QUERY );
- xProp->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("SwapXAndYAxis"))) >>= bSwapXAndYAxis;
+ xProp->getPropertyValue( "SwapXAndYAxis" ) >>= bSwapXAndYAxis;
}
catch( const beans::UnknownPropertyException & ex )
{
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index e1e445b74faf..161e3440b0ce 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -56,13 +56,12 @@ using namespace ::chart::ContainerHelper;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
// ----------------------------------------
namespace
{
-const OUString lcl_aLabelRole( RTL_CONSTASCII_USTRINGPARAM( "label" ));
+const OUString lcl_aLabelRole( "label" );
struct lcl_ChartTypeToSeriesCnt : ::std::unary_function<
Reference< XChartType >, Reference< XDataSeriesContainer > >
@@ -83,21 +82,21 @@ OUString lcl_ConvertRole( const OUString & rRoleString, bool bFromInternalToUI )
if( aTranslationMap.empty() )
{
- aTranslationMap[ C2U( "categories" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_CATEGORIES )));
- aTranslationMap[ C2U( "error-bars-x" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR )));
- aTranslationMap[ C2U( "error-bars-x-positive" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR_POSITIVE )));
- aTranslationMap[ C2U( "error-bars-x-negative" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR_NEGATIVE )));
- aTranslationMap[ C2U( "error-bars-y" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR )));
- aTranslationMap[ C2U( "error-bars-y-positive" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_POSITIVE )));
- aTranslationMap[ C2U( "error-bars-y-negative" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_NEGATIVE )));
- aTranslationMap[ C2U( "label" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_LABEL )));
- aTranslationMap[ C2U( "values-first" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_FIRST )));
- aTranslationMap[ C2U( "values-last" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_LAST )));
- aTranslationMap[ C2U( "values-max" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_MAX )));
- aTranslationMap[ C2U( "values-min" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_MIN )));
- aTranslationMap[ C2U( "values-x" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X )));
- aTranslationMap[ C2U( "values-y" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y )));
- aTranslationMap[ C2U( "values-size" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_SIZE )));
+ aTranslationMap[ "categories" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_CATEGORIES )));
+ aTranslationMap[ "error-bars-x" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR )));
+ aTranslationMap[ "error-bars-x-positive" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR_POSITIVE )));
+ aTranslationMap[ "error-bars-x-negative" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR_NEGATIVE )));
+ aTranslationMap[ "error-bars-y" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR )));
+ aTranslationMap[ "error-bars-y-positive" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_POSITIVE )));
+ aTranslationMap[ "error-bars-y-negative" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_NEGATIVE )));
+ aTranslationMap[ "label" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_LABEL )));
+ aTranslationMap[ "values-first" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_FIRST )));
+ aTranslationMap[ "values-last" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_LAST )));
+ aTranslationMap[ "values-max" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_MAX )));
+ aTranslationMap[ "values-min" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_MIN )));
+ aTranslationMap[ "values-x" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X )));
+ aTranslationMap[ "values-y" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y )));
+ aTranslationMap[ "values-size" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_SIZE )));
}
if( bFromInternalToUI )
@@ -124,28 +123,28 @@ OUString lcl_ConvertRole( const OUString & rRoleString, bool bFromInternalToUI )
return aResult;
}
-typedef ::std::map< ::rtl::OUString, sal_Int32 > lcl_tRoleIndexMap;
+typedef ::std::map< OUString, sal_Int32 > lcl_tRoleIndexMap;
void lcl_createRoleIndexMap( lcl_tRoleIndexMap & rOutMap )
{
rOutMap.clear();
sal_Int32 nIndex = 0;
- rOutMap[ C2U( "label" ) ] = ++nIndex;
- rOutMap[ C2U( "categories" ) ] = ++nIndex;
- rOutMap[ C2U( "values-x" ) ] = ++nIndex;
- rOutMap[ C2U( "values-y" ) ] = ++nIndex;
- rOutMap[ C2U( "error-bars-x" ) ] = ++nIndex;
- rOutMap[ C2U( "error-bars-x-positive" ) ] = ++nIndex;
- rOutMap[ C2U( "error-bars-x-negative" ) ] = ++nIndex;
- rOutMap[ C2U( "error-bars-y" ) ] = ++nIndex;
- rOutMap[ C2U( "error-bars-y-positive" ) ] = ++nIndex;
- rOutMap[ C2U( "error-bars-y-negative" ) ] = ++nIndex;
- rOutMap[ C2U( "values-first" ) ] = ++nIndex;
- rOutMap[ C2U( "values-min" ) ] = ++nIndex;
- rOutMap[ C2U( "values-max" ) ] = ++nIndex;
- rOutMap[ C2U( "values-last" ) ] = ++nIndex;
- rOutMap[ C2U( "values-size" ) ] = ++nIndex;
+ rOutMap[ "label" ] = ++nIndex;
+ rOutMap[ "categories" ] = ++nIndex;
+ rOutMap[ "values-x" ] = ++nIndex;
+ rOutMap[ "values-y" ] = ++nIndex;
+ rOutMap[ "error-bars-x" ] = ++nIndex;
+ rOutMap[ "error-bars-x-positive" ] = ++nIndex;
+ rOutMap[ "error-bars-x-negative" ] = ++nIndex;
+ rOutMap[ "error-bars-y" ] = ++nIndex;
+ rOutMap[ "error-bars-y-positive" ] = ++nIndex;
+ rOutMap[ "error-bars-y-negative" ] = ++nIndex;
+ rOutMap[ "values-first" ] = ++nIndex;
+ rOutMap[ "values-min" ] = ++nIndex;
+ rOutMap[ "values-max" ] = ++nIndex;
+ rOutMap[ "values-last" ] = ++nIndex;
+ rOutMap[ "values-size" ] = ++nIndex;
}
struct lcl_DataSeriesContainerAppend : public
@@ -164,7 +163,7 @@ struct lcl_DataSeriesContainerAppend : public
if( xVal.is())
{
Sequence< Reference< XDataSeries > > aSeq( xVal->getDataSeries());
- OUString aRole( RTL_CONSTASCII_USTRINGPARAM("values-y"));
+ OUString aRole( "values-y" );
Reference< XChartType > xCT( xVal, uno::UNO_QUERY );
if( xCT.is())
aRole = xCT->getRoleOfSequenceForSeriesLabel();
@@ -187,6 +186,7 @@ struct lcl_DataSeriesContainerAppend : public
lcl_DataSeriesContainerAppend & operator* () { return *this; }
lcl_DataSeriesContainerAppend & operator++ () { return *this; }
lcl_DataSeriesContainerAppend & operator++ (int) { return *this; }
+ lcl_DataSeriesContainerAppend & operator= ( lcl_DataSeriesContainerAppend& ) { return *this; }
private:
tContainerType & m_rDestCnt;
@@ -198,7 +198,7 @@ struct lcl_RolesWithRangeAppend : public
typedef ::chart::DialogModel::tRolesWithRanges tContainerType;
explicit lcl_RolesWithRangeAppend( tContainerType & rCnt,
- const ::rtl::OUString & aLabelRole )
+ const OUString & aLabelRole )
: m_rDestCnt( rCnt ),
m_aRoleForLabelSeq( aLabelRole )
{}
@@ -215,7 +215,7 @@ struct lcl_RolesWithRangeAppend : public
{
OUString aRole;
Reference< beans::XPropertySet > xProp( xSeq, uno::UNO_QUERY_THROW );
- if( xProp->getPropertyValue( C2U("Role")) >>= aRole )
+ if( xProp->getPropertyValue( "Role") >>= aRole )
{
m_rDestCnt.insert(
tContainerType::value_type(
@@ -245,6 +245,7 @@ struct lcl_RolesWithRangeAppend : public
lcl_RolesWithRangeAppend & operator* () { return *this; }
lcl_RolesWithRangeAppend & operator++ () { return *this; }
lcl_RolesWithRangeAppend & operator++ (int) { return *this; }
+ lcl_RolesWithRangeAppend & operator= ( lcl_RolesWithRangeAppend& ) { return *this; }
private:
tContainerType & m_rDestCnt;
@@ -257,7 +258,7 @@ void lcl_SetSequenceRole(
{
Reference< beans::XPropertySet > xProp( xSeq, uno::UNO_QUERY );
if( xProp.is())
- xProp->setPropertyValue( C2U("Role"), uno::makeAny( rRole ));
+ xProp->setPropertyValue( "Role" , uno::makeAny( rRole ));
}
Reference< XDataSeries > lcl_CreateNewSeries(
@@ -272,7 +273,7 @@ Reference< XDataSeries > lcl_CreateNewSeries(
// create plain series
Reference< XDataSeries > xResult(
xContext->getServiceManager()->createInstanceWithContext(
- C2U( "com.sun.star.chart2.DataSeries" ),
+ "com.sun.star.chart2.DataSeries" ,
xContext ), uno::UNO_QUERY );
if( xTemplate.is())
{
@@ -283,8 +284,7 @@ Reference< XDataSeries > lcl_CreateNewSeries(
// without setting it as hard attribute
Reference< XColorScheme > xColorScheme( xDiagram->getDefaultColorScheme());
if( xColorScheme.is())
- xResultProp->setPropertyValue(
- C2U("Color"), uno::makeAny( xColorScheme->getColorByIndex( nNewSeriesIndex )));
+ xResultProp->setPropertyValue( "Color" , uno::makeAny( xColorScheme->getColorByIndex( nNewSeriesIndex )));
}
sal_Int32 nGroupIndex=0;
if( xChartType.is())
@@ -456,7 +456,7 @@ Reference< data::XDataProvider > DialogModel::getDataProvider() const
DialogModel::tRolesWithRanges DialogModel::getRolesWithRanges(
const Reference< XDataSeries > & xSeries,
- const ::rtl::OUString & aRoleOfSequenceForLabel,
+ const OUString & aRoleOfSequenceForLabel,
const Reference< chart2::XChartType > & xChartType ) const
{
DialogModel::tRolesWithRanges aResult;
@@ -724,7 +724,7 @@ OUString DialogModel::GetRoleDataLabel()
return OUString( String( ::chart::SchResId( STR_OBJECT_DATALABELS )));
}
-sal_Int32 DialogModel::GetRoleIndexForSorting( const ::rtl::OUString & rInternalRoleString )
+sal_Int32 DialogModel::GetRoleIndexForSorting( const OUString & rInternalRoleString )
{
static lcl_tRoleIndexMap aRoleIndexMap;
@@ -776,8 +776,8 @@ void DialogModel::applyInterpretedData(
// without setting it as hard attribute
Reference< XColorScheme > xColorScheme( xDiagram->getDefaultColorScheme());
if( xColorScheme.is())
- xSeriesProp->setPropertyValue(
- C2U("Color"), uno::makeAny( xColorScheme->getColorByIndex( nSeriesCounter )));
+ xSeriesProp->setPropertyValue( "Color" ,
+ uno::makeAny( xColorScheme->getColorByIndex( nSeriesCounter )));
}
m_xTemplate->applyStyle( aSeries[nSeries], nGroup, nNewSeriesIndex++, nSeriesInGroup );
}
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 78def1fdd769..6ef7bd9684d3 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -47,12 +47,11 @@ using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Any;
-using rtl::OUString;
namespace
{
-OUString lcl_getDataSeriesName( const rtl::OUString& rObjectCID, const Reference< frame::XModel >& xChartModel )
+OUString lcl_getDataSeriesName( const OUString& rObjectCID, const Reference< frame::XModel >& xChartModel )
{
OUString aRet;
@@ -71,10 +70,10 @@ OUString lcl_getDataSeriesName( const rtl::OUString& rObjectCID, const Reference
return aRet;
}
-OUString lcl_getFullSeriesName( const rtl::OUString& rObjectCID, const Reference< frame::XModel >& xChartModel )
+OUString lcl_getFullSeriesName( const OUString& rObjectCID, const Reference< frame::XModel >& xChartModel )
{
OUString aRet = String(SchResId(STR_TIP_DATASERIES));
- OUString aWildcard( C2U("%SERIESNAME") );
+ OUString aWildcard( "%SERIESNAME" );
sal_Int32 nIndex = aRet.indexOf( aWildcard );
if( nIndex != -1 )
aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), lcl_getDataSeriesName( rObjectCID, xChartModel ) );
@@ -103,7 +102,7 @@ OUString lcl_getDataPointValueText( const Reference< XDataSeries >& xSeries, sal
Sequence< Reference< data::XLabeledDataSequence > > aDataSequences( xDataSource->getDataSequences() );
- rtl::OUString aX, aY, aY_Min, aY_Max, aY_First, aY_Last, a_Size;
+ OUString aX, aY, aY_Min, aY_Max, aY_First, aY_Last, a_Size;
double fValue = 0;
uno::Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier( xChartModel, uno::UNO_QUERY );
@@ -124,47 +123,47 @@ OUString lcl_getDataPointValueText( const Reference< XDataSeries >& xSeries, sal
{
try
{
- uno::Any aARole = xProp->getPropertyValue( C2U( "Role" ) );
- rtl::OUString aRole;
+ uno::Any aARole = xProp->getPropertyValue( "Role" );
+ OUString aRole;
aARole >>= aRole;
- if( aRole.equals(C2U("values-x")) )
+ if( aRole == "values-x" )
{
aData[nPointIndex]>>= fValue;
sal_Int32 nNumberFormatKey = xDataSequence->getNumberFormatKeyByIndex( nPointIndex );
aX = aNumberFormatterWrapper.getFormattedString( nNumberFormatKey, fValue, nLabelColor, bColorChanged );
}
- else if( aRole.equals(C2U("values-y")) )
+ else if( aRole == "values-y")
{
aData[nPointIndex]>>= fValue;
sal_Int32 nNumberFormatKey = xDataSequence->getNumberFormatKeyByIndex( nPointIndex );
aY = aNumberFormatterWrapper.getFormattedString( nNumberFormatKey, fValue, nLabelColor, bColorChanged );
}
- else if( aRole.equals(C2U("values-first")) )
+ else if( aRole == "values-first" )
{
aData[nPointIndex]>>= fValue;
sal_Int32 nNumberFormatKey = xDataSequence->getNumberFormatKeyByIndex( nPointIndex );
aY_First = aNumberFormatterWrapper.getFormattedString( nNumberFormatKey, fValue, nLabelColor, bColorChanged );
}
- else if( aRole.equals(C2U("values-min")) )
+ else if( aRole == "values-min" )
{
aData[nPointIndex]>>= fValue;
sal_Int32 nNumberFormatKey = xDataSequence->getNumberFormatKeyByIndex( nPointIndex );
aY_Min = aNumberFormatterWrapper.getFormattedString( nNumberFormatKey, fValue, nLabelColor, bColorChanged );
}
- else if( aRole.equals(C2U("values-max")) )
+ else if( aRole == "values-max" )
{
aData[nPointIndex]>>= fValue;
sal_Int32 nNumberFormatKey = xDataSequence->getNumberFormatKeyByIndex( nPointIndex );
aY_Max = aNumberFormatterWrapper.getFormattedString( nNumberFormatKey, fValue, nLabelColor, bColorChanged );
}
- else if( aRole.equals(C2U("values-last")) )
+ else if( aRole == "values-last" )
{
aData[nPointIndex]>>= fValue;
sal_Int32 nNumberFormatKey = xDataSequence->getNumberFormatKeyByIndex( nPointIndex );
aY_Last = aNumberFormatterWrapper.getFormattedString( nNumberFormatKey, fValue, nLabelColor, bColorChanged );
}
- else if( aRole.equals(C2U("values-size")) )
+ else if( aRole == "values-size" )
{
aData[nPointIndex]>>= fValue;
sal_Int32 nNumberFormatKey = xDataSequence->getNumberFormatKeyByIndex( nPointIndex );
@@ -187,7 +186,7 @@ OUString lcl_getDataPointValueText( const Reference< XDataSeries >& xSeries, sal
aRet = aX;
}
- OUString aSeparator(C2U(" "));
+ OUString aSeparator( " " );
lcl_addText( aRet, aSeparator, aY );
lcl_addText( aRet, aSeparator, aY_First );
@@ -201,9 +200,9 @@ OUString lcl_getDataPointValueText( const Reference< XDataSeries >& xSeries, sal
} //end anonymous namespace
-rtl::OUString ObjectNameProvider::getName( ObjectType eObjectType, bool bPlural )
+OUString ObjectNameProvider::getName( ObjectType eObjectType, bool bPlural )
{
- rtl::OUString aRet;
+ OUString aRet;
switch( eObjectType )
{
case OBJECTTYPE_PAGE:
@@ -311,10 +310,10 @@ rtl::OUString ObjectNameProvider::getName( ObjectType eObjectType, bool bPlural
return aRet;
}
-rtl::OUString ObjectNameProvider::getAxisName( const rtl::OUString& rObjectCID
+OUString ObjectNameProvider::getAxisName( const OUString& rObjectCID
, const uno::Reference< frame::XModel >& xChartModel )
{
- rtl::OUString aRet;
+ OUString aRet;
@@ -408,10 +407,10 @@ OUString ObjectNameProvider::getTitleName( const OUString& rObjectCID
return aRet;
}
-rtl::OUString ObjectNameProvider::getGridName( const rtl::OUString& rObjectCID
+OUString ObjectNameProvider::getGridName( const OUString& rObjectCID
, const uno::Reference< frame::XModel >& xChartModel )
{
- rtl::OUString aRet;
+ OUString aRet;
sal_Int32 nCooSysIndex = -1;
@@ -462,14 +461,14 @@ rtl::OUString ObjectNameProvider::getGridName( const rtl::OUString& rObjectCID
return aRet;
}
-rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, const Reference< chart2::XChartDocument >& xChartDocument, bool bVerbose )
+OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Reference< chart2::XChartDocument >& xChartDocument, bool bVerbose )
{
return getHelpText( rObjectCID, Reference< frame::XModel >( xChartDocument, uno::UNO_QUERY ), bVerbose );
}
-rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, const Reference< frame::XModel >& xChartModel, bool bVerbose )
+OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Reference< frame::XModel >& xChartModel, bool bVerbose )
{
- rtl::OUString aRet;
+ OUString aRet;
ObjectType eObjectType( ObjectIdentifier::getObjectType(rObjectCID) );
if( OBJECTTYPE_AXIS == eObjectType )
{
@@ -492,7 +491,7 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID,
{
if( bVerbose )
{
- OUString aNewLine(C2U("\n"));
+ OUString aNewLine( "\n" );
aRet=String(SchResId(STR_TIP_DATAPOINT_INDEX));
aRet+=aNewLine;
@@ -511,7 +510,7 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID,
//replace data point index
sal_Int32 nIndex = -1;
- OUString aWildcard( C2U("%POINTNUMBER") );
+ OUString aWildcard( "%POINTNUMBER" );
nIndex = aRet.indexOf( aWildcard );
if( nIndex != -1 )
{
@@ -519,7 +518,7 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID,
}
//replace data series index
- aWildcard = C2U("%SERIESNUMBER");
+ aWildcard = "%SERIESNUMBER";
nIndex = aRet.indexOf( aWildcard );
if( nIndex != -1 )
{
@@ -539,14 +538,14 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID,
}
//replace point values
- aWildcard = C2U("%POINTVALUES");
+ aWildcard = "%POINTVALUES";
nIndex = aRet.indexOf( aWildcard );
if( nIndex != -1 )
aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), lcl_getDataPointValueText(
xSeries,nPointIndex, DataSeriesHelper::getCoordinateSystemOfSeries(xSeries, xDiagram), xChartModel ) );
//replace series name
- aWildcard = C2U("%SERIESNAME");
+ aWildcard = "%SERIESNAME";
nIndex = aRet.indexOf( aWildcard );
if( nIndex != -1 )
aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), lcl_getDataSeriesName( rObjectCID, xChartModel ) );
@@ -571,13 +570,13 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID,
// replace formula
sal_Int32 nIndex = -1;
- OUString aWildcard( C2U("%FORMULA") );
+ OUString aWildcard( "%FORMULA" );
nIndex = aRet.indexOf( aWildcard );
if( nIndex != -1 )
aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), xCalculator->getRepresentation());
// replace r^2
- aWildcard = C2U("%RSQUARED");
+ aWildcard = "%RSQUARED";
nIndex = aRet.indexOf( aWildcard );
if( nIndex != -1 )
{
@@ -622,7 +621,7 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID,
sal_Unicode aDecimalSep( '.' );
sal_Int32 nIndex = -1;
- OUString aWildcard( C2U("%AVERAGE_VALUE") );
+ OUString aWildcard( "%AVERAGE_VALUE" );
nIndex = aRet.indexOf( aWildcard );
// as the curve is constant, the value at any x-value is ok
if( nIndex != -1 )
@@ -635,7 +634,7 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID,
}
// replace standard deviation
- aWildcard = C2U("%STD_DEVIATION");
+ aWildcard = "%STD_DEVIATION";
nIndex = aRet.indexOf( aWildcard );
if( nIndex != -1 )
{
@@ -666,9 +665,9 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID,
return aRet;
}
-rtl::OUString ObjectNameProvider::getSelectedObjectText( const rtl::OUString & rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument )
+OUString ObjectNameProvider::getSelectedObjectText( const OUString & rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument )
{
- rtl::OUString aRet;
+ OUString aRet;
ObjectType eObjectType( ObjectIdentifier::getObjectType(rObjectCID) );
Reference< frame::XModel > xChartModel( xChartDocument, uno::UNO_QUERY );
@@ -683,7 +682,7 @@ rtl::OUString ObjectNameProvider::getSelectedObjectText( const rtl::OUString & r
sal_Int32 nPointIndex( ObjectIdentifier::getParticleID(rObjectCID).toInt32() );
// replace data point index
- replaceParamterInString( aRet, C2U("%POINTNUMBER"), OUString::valueOf( nPointIndex + 1 ));
+ replaceParamterInString( aRet, "%POINTNUMBER", OUString::valueOf( nPointIndex + 1 ));
// replace data series index
{
@@ -695,11 +694,11 @@ rtl::OUString ObjectNameProvider::getSelectedObjectText( const rtl::OUString & r
if( aSeriesVector[nSeriesIndex] == xSeries )
break;
}
- replaceParamterInString( aRet, C2U("%SERIESNUMBER"), OUString::valueOf( nSeriesIndex + 1 ) );
+ replaceParamterInString( aRet, "%SERIESNUMBER", OUString::valueOf( nSeriesIndex + 1 ) );
}
// replace point value
- replaceParamterInString( aRet, C2U("%POINTVALUES"), lcl_getDataPointValueText(
+ replaceParamterInString( aRet, "%POINTVALUES", lcl_getDataPointValueText(
xSeries, nPointIndex, DataSeriesHelper::getCoordinateSystemOfSeries(xSeries, xDiagram), xChartModel ) );
}
}
@@ -711,7 +710,7 @@ rtl::OUString ObjectNameProvider::getSelectedObjectText( const rtl::OUString & r
if( !aHelpText.isEmpty())
{
aRet = String( SchResId( STR_STATUS_OBJECT_MARKED ));
- replaceParamterInString( aRet, C2U("%OBJECTNAME"), aHelpText );
+ replaceParamterInString( aRet, "%OBJECTNAME", aHelpText );
}
}
@@ -719,8 +718,8 @@ rtl::OUString ObjectNameProvider::getSelectedObjectText( const rtl::OUString & r
}
-rtl::OUString ObjectNameProvider::getNameForCID(
- const rtl::OUString& rObjectCID,
+OUString ObjectNameProvider::getNameForCID(
+ const OUString& rObjectCID,
const uno::Reference< chart2::XChartDocument >& xChartDocument )
{
ObjectType eType( ObjectIdentifier::getObjectType( rObjectCID ));
@@ -747,18 +746,18 @@ rtl::OUString ObjectNameProvider::getNameForCID(
case OBJECTTYPE_DATA_AVERAGE_LINE:
case OBJECTTYPE_DATA_CURVE_EQUATION:
{
- rtl::OUString aRet = lcl_getFullSeriesName( rObjectCID, xModel );
- aRet += C2U(" ");
+ OUString aRet = lcl_getFullSeriesName( rObjectCID, xModel );
+ aRet += " ";
if( eType == OBJECTTYPE_DATA_POINT || eType == OBJECTTYPE_DATA_LABEL )
{
aRet += getName( OBJECTTYPE_DATA_POINT );
sal_Int32 nPointIndex = ObjectIdentifier::getIndexFromParticleOrCID( rObjectCID );
- aRet += C2U(" ");
+ aRet += " ";
aRet += OUString::valueOf(nPointIndex+1);
if( eType == OBJECTTYPE_DATA_LABEL )
{
- aRet += C2U(" ");
+ aRet += " ";
aRet += getName( OBJECTTYPE_DATA_LABEL );
}
}
@@ -773,9 +772,9 @@ rtl::OUString ObjectNameProvider::getNameForCID(
return getName( eType );
}
-rtl::OUString ObjectNameProvider::getName_ObjectForSeries(
+OUString ObjectNameProvider::getName_ObjectForSeries(
ObjectType eObjectType,
- const rtl::OUString& rSeriesCID,
+ const OUString& rSeriesCID,
const uno::Reference< chart2::XChartDocument >& xChartDocument )
{
uno::Reference< frame::XModel> xChartModel( xChartDocument, uno::UNO_QUERY );
@@ -783,18 +782,18 @@ rtl::OUString ObjectNameProvider::getName_ObjectForSeries(
if( xSeries.is() )
{
OUString aRet = String(SchResId(STR_OBJECT_FOR_SERIES));
- replaceParamterInString( aRet, C2U("%OBJECTNAME"), getName( eObjectType, false /*bPlural*/ ) );
- replaceParamterInString( aRet, C2U("%SERIESNAME"), lcl_getDataSeriesName( rSeriesCID, xChartModel ) );
+ replaceParamterInString( aRet, "%OBJECTNAME", getName( eObjectType, false /*bPlural*/ ) );
+ replaceParamterInString( aRet, "%SERIESNAME", lcl_getDataSeriesName( rSeriesCID, xChartModel ) );
return aRet;
}
else
return ObjectNameProvider::getName_ObjectForAllSeries( eObjectType );
}
-rtl::OUString ObjectNameProvider::getName_ObjectForAllSeries( ObjectType eObjectType )
+OUString ObjectNameProvider::getName_ObjectForAllSeries( ObjectType eObjectType )
{
OUString aRet = String(SchResId(STR_OBJECT_FOR_ALL_SERIES));
- replaceParamterInString( aRet, C2U("%OBJECTNAME"), getName( eObjectType, true /*bPlural*/ ) );
+ replaceParamterInString( aRet, "%OBJECTNAME", getName( eObjectType, true /*bPlural*/ ) );
return aRet;
}
diff --git a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
index b9f607c48dc9..006f673a0c69 100644
--- a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
+++ b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
@@ -38,7 +38,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
// ----------------------------------------
@@ -124,17 +123,17 @@ bool RangeSelectionHelper::chooseRange(
{
Sequence< beans::PropertyValue > aArgs( 4 );
aArgs[0] = beans::PropertyValue(
- C2U("InitialValue"), -1, uno::makeAny( aCurrentRange ),
+ "InitialValue", -1, uno::makeAny( aCurrentRange ),
beans::PropertyState_DIRECT_VALUE );
aArgs[1] = beans::PropertyValue(
- C2U("Title"), -1,
+ "Title", -1,
uno::makeAny( aUIString ),
beans::PropertyState_DIRECT_VALUE );
aArgs[2] = beans::PropertyValue(
- C2U("CloseOnMouseRelease"), -1, uno::makeAny( true ),
+ "CloseOnMouseRelease", -1, uno::makeAny( true ),
beans::PropertyState_DIRECT_VALUE );
aArgs[3] = beans::PropertyValue(
- C2U("MultiSelectionMode"), -1, uno::makeAny( true ),
+ "MultiSelectionMode", -1, uno::makeAny( true ),
beans::PropertyState_DIRECT_VALUE );
if( m_xRangeSelectionListener.is() )
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 4584fcc23e5a..5d4e8a593b46 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -54,7 +54,7 @@ CreationWizardUnoDlg::CreationWizardUnoDlg( const uno::Reference< uno::XComponen
{
uno::Reference< frame::XDesktop > xDesktop(
m_xCC->getServiceManager()->createInstanceWithContext(
- C2U( "com.sun.star.frame.Desktop" ), m_xCC ), uno::UNO_QUERY );
+ "com.sun.star.frame.Desktop" , m_xCC ), uno::UNO_QUERY );
if( xDesktop.is() )
{
uno::Reference< frame::XTerminateListener > xListener( this );
@@ -74,10 +74,10 @@ CreationWizardUnoDlg::~CreationWizardUnoDlg()
// lang::XServiceInfo
APPHELPER_XSERVICEINFO_IMPL(CreationWizardUnoDlg,CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME)
- uno::Sequence< rtl::OUString > CreationWizardUnoDlg
+ uno::Sequence< OUString > CreationWizardUnoDlg
::getSupportedServiceNames_Static()
{
- uno::Sequence< rtl::OUString > aSNS( 1 );
+ uno::Sequence< OUString > aSNS( 1 );
aSNS.getArray()[ 0 ] = CHART_WIZARD_DIALOG_SERVICE_NAME;
return aSNS;
}
@@ -191,7 +191,7 @@ void SAL_CALL CreationWizardUnoDlg::disposing( const lang::EventObject& /*Source
}
//-------------------------------------------------------------------------
-void SAL_CALL CreationWizardUnoDlg::setTitle( const ::rtl::OUString& /*rTitle*/ ) throw(uno::RuntimeException)
+void SAL_CALL CreationWizardUnoDlg::setTitle( const OUString& /*rTitle*/ ) throw(uno::RuntimeException)
{
}
//-------------------------------------------------------------------------
@@ -292,7 +292,7 @@ void SAL_CALL CreationWizardUnoDlg::disposing()
{
uno::Reference< frame::XDesktop > xDesktop(
m_xCC->getServiceManager()->createInstanceWithContext(
- C2U( "com.sun.star.frame.Desktop" ), m_xCC ), uno::UNO_QUERY );
+ "com.sun.star.frame.Desktop" , m_xCC ), uno::UNO_QUERY );
if( xDesktop.is() )
{
uno::Reference< frame::XTerminateListener > xListener( this );
@@ -313,16 +313,16 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL CreationWizardUnoDlg::getProp
return 0;
}
-void SAL_CALL CreationWizardUnoDlg::setPropertyValue( const ::rtl::OUString& rPropertyName
+void SAL_CALL CreationWizardUnoDlg::setPropertyValue( const OUString& rPropertyName
, const uno::Any& rValue )
throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException
, lang::WrappedTargetException, uno::RuntimeException)
{
- if( rPropertyName.equals(C2U("Position")) )
+ if( rPropertyName == "Position" )
{
awt::Point aPos;
if( ! (rValue >>= aPos) )
- throw lang::IllegalArgumentException( C2U("Property 'Position' requires value of type awt::Point"), 0, 0 );
+ throw lang::IllegalArgumentException( "Property 'Position' requires value of type awt::Point", 0, 0 );
//set left upper outer corner relative to screen
//pixels, screen position
@@ -337,24 +337,24 @@ void SAL_CALL CreationWizardUnoDlg::setPropertyValue( const ::rtl::OUString& rPr
m_pDialog->SetPosPixel( aNewOuterPos );
}
}
- else if( rPropertyName.equals(C2U("Size")) )
+ else if( rPropertyName == "Size")
{
//read only property, do nothing
}
- else if( rPropertyName.equals(C2U("UnlockControllersOnExecute")) )
+ else if( rPropertyName == "UnlockControllersOnExecute" )
{
if( ! (rValue >>= m_bUnlockControllersOnExecute) )
- throw lang::IllegalArgumentException( C2U("Property 'UnlockControllers' requires value of type boolean"), 0, 0 );
+ throw lang::IllegalArgumentException( "Property 'UnlockControllers' requires value of type boolean" , 0, 0 );
}
else
- throw beans::UnknownPropertyException( C2U("unknown property was tried to set to chart wizard"), 0 );
+ throw beans::UnknownPropertyException( "unknown property was tried to set to chart wizard" , 0 );
}
-uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const ::rtl::OUString& rPropertyName )
+uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const OUString& rPropertyName )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
uno::Any aRet;
- if( rPropertyName.equals(C2U("Position")) )
+ if( rPropertyName == "Position" )
{
//get left upper outer corner relative to screen
//pixels, screen position
@@ -367,7 +367,7 @@ uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const ::rtl::OUString&
aRet = uno::makeAny( aPoint );
}
}
- else if( rPropertyName.equals(C2U("Size")) )
+ else if( rPropertyName == "Size" )
{
//get outer size inclusive decoration
//pixels, screen position
@@ -380,35 +380,35 @@ uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const ::rtl::OUString&
aRet = uno::makeAny( aSize );
}
}
- else if( rPropertyName.equals(C2U("UnlockControllersOnExecute")) )
+ else if( rPropertyName == "UnlockControllersOnExecute" )
{
aRet = uno::makeAny( m_bUnlockControllersOnExecute );
}
else
- throw beans::UnknownPropertyException( C2U("unknown property was tried to get from chart wizard"), 0 );
+ throw beans::UnknownPropertyException( "unknown property was tried to get from chart wizard" , 0 );
return aRet;
}
void SAL_CALL CreationWizardUnoDlg::addPropertyChangeListener(
- const ::rtl::OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* xListener */ )
+ const OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* xListener */ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
OSL_FAIL("not implemented");
}
void SAL_CALL CreationWizardUnoDlg::removePropertyChangeListener(
- const ::rtl::OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* aListener */ )
+ const OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* aListener */ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
OSL_FAIL("not implemented");
}
-void SAL_CALL CreationWizardUnoDlg::addVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ )
+void SAL_CALL CreationWizardUnoDlg::addVetoableChangeListener( const OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
OSL_FAIL("not implemented");
}
-void SAL_CALL CreationWizardUnoDlg::removeVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ )
+void SAL_CALL CreationWizardUnoDlg::removeVetoableChangeListener( const OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
OSL_FAIL("not implemented");
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 15f72a189c2e..de868dc390b9 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -79,7 +79,7 @@ using ::com::sun::star::uno::Reference;
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-ObjectPropertiesDialogParameter::ObjectPropertiesDialogParameter( const rtl::OUString& rObjectCID )
+ObjectPropertiesDialogParameter::ObjectPropertiesDialogParameter( const OUString& rObjectCID )
: m_aObjectCID( rObjectCID )
, m_eObjectType( ObjectIdentifier::getObjectType( m_aObjectCID ) )
, m_bAffectsMultipleObjects(false)
@@ -103,8 +103,8 @@ ObjectPropertiesDialogParameter::ObjectPropertiesDialogParameter( const rtl::OUS
, m_xChartDocument( 0 )
, m_bComplexCategoriesAxis( false )
{
- rtl::OUString aParticleID = ObjectIdentifier::getParticleID( m_aObjectCID );
- m_bAffectsMultipleObjects = aParticleID.equals(C2U("ALLELEMENTS"));
+ OUString aParticleID = ObjectIdentifier::getParticleID( m_aObjectCID );
+ m_bAffectsMultipleObjects = (aParticleID == "ALLELEMENTS");
}
ObjectPropertiesDialogParameter::~ObjectPropertiesDialogParameter()
{
@@ -113,7 +113,7 @@ ObjectType ObjectPropertiesDialogParameter::getObjectType() const
{
return m_eObjectType;
}
-rtl::OUString ObjectPropertiesDialogParameter::getLocalizedName() const
+OUString ObjectPropertiesDialogParameter::getLocalizedName() const
{
return m_aLocalizedName;
}
@@ -296,7 +296,7 @@ bool ObjectPropertiesDialogParameter::IsCrossingAxisIsCategoryAxis() const
{
return m_bIsCrossingAxisIsCategoryAxis;
}
-const uno::Sequence< rtl::OUString >& ObjectPropertiesDialogParameter::GetCategories() const
+const uno::Sequence< OUString >& ObjectPropertiesDialogParameter::GetCategories() const
{
return m_aCategories;
}
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 227b300d8887..9113d90250f1 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -128,9 +128,9 @@ DataLabelResources::DataLabelResources( Window* pWindow, const SfxItemSet& rInAt
m_pPool(rInAttrs.GetPool())
{
//fill label placement list
- std::map< sal_Int32, XubString > aPlacementToStringMap;
+ std::map< sal_Int32, OUString > aPlacementToStringMap;
for( sal_Int32 nEnum=0; nEnum<m_aLB_LabelPlacement.GetEntryCount(); ++nEnum )
- aPlacementToStringMap[nEnum]=m_aLB_LabelPlacement.GetEntry(static_cast<sal_uInt16>(nEnum));
+ aPlacementToStringMap[nEnum] = m_aLB_LabelPlacement.GetEntry(static_cast<sal_uInt16>(nEnum));
::com::sun::star::uno::Sequence < sal_Int32 > aAvailabelPlacementList;
const SfxPoolItem *pPoolItem = NULL;
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index ba613209d71c..377c7dd282af 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -191,7 +191,7 @@ void ErrorBarResources::SetChartDocumentForRangeChoosing(
{
try
{
- xProps->getPropertyValue( C2U( "DisableDataTableDialog" ) ) >>= m_bDisableDataTableDialog;
+ xProps->getPropertyValue( "DisableDataTableDialog" ) >>= m_bDisableDataTableDialog;
}
catch( const uno::Exception& e )
{
@@ -455,7 +455,7 @@ IMPL_LINK( ErrorBarResources, ChooseRange, RangeSelectionButton *, pButton )
return 0;
OSL_ASSERT( m_pCurrentRangeChoosingField == 0 );
- ::rtl::OUString aUIString;
+ OUString aUIString;
if( pButton == &m_aIbRangePositive )
{
m_pCurrentRangeChoosingField = &m_aEdRangePositive;
@@ -697,14 +697,14 @@ void ErrorBarResources::FillValueSets()
}
void ErrorBarResources::listeningFinished(
- const ::rtl::OUString & rNewRange )
+ const OUString & rNewRange )
{
OSL_ASSERT( m_apRangeSelectionHelper.get());
if( ! m_apRangeSelectionHelper.get())
return;
// rNewRange becomes invalid after removing the listener
- ::rtl::OUString aRange( rNewRange );
+ OUString aRange( rNewRange );
// stop listening
m_apRangeSelectionHelper->stopRangeListening();
@@ -740,7 +740,7 @@ void ErrorBarResources::disposingRangeSelection()
bool ErrorBarResources::isRangeFieldContentValid( Edit & rEdit )
{
- ::rtl::OUString aRange( rEdit.GetText());
+ OUString aRange( rEdit.GetText());
bool bIsValid = ( aRange.isEmpty() ) ||
( m_apRangeSelectionHelper.get() &&
m_apRangeSelectionHelper->verifyCellRange( aRange ));
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index c08bdd761eb1..0760a8bf01c5 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -95,13 +95,13 @@ void LegendPositionResources::writeToResources( const uno::Reference< frame::XMo
{
//show
sal_Bool bShowLegend = sal_False;
- xProp->getPropertyValue( C2U("Show") ) >>= bShowLegend;
+ xProp->getPropertyValue( "Show" ) >>= bShowLegend;
m_aCbxShow.Check( bShowLegend );
PositionEnableHdl(0);
//position
chart2::LegendPosition ePos;
- xProp->getPropertyValue( C2U( "AnchorPosition" )) >>= ePos;
+ xProp->getPropertyValue( "AnchorPosition" ) >>= ePos;
switch( ePos )
{
case chart2::LegendPosition_LINE_START:
@@ -139,7 +139,7 @@ void LegendPositionResources::writeToModel( const ::com::sun::star::uno::Referen
if( xProp.is() )
{
//show
- xProp->setPropertyValue( C2U("Show"), uno::makeAny( bShowLegend ));
+ xProp->setPropertyValue( "Show" , uno::makeAny( bShowLegend ));
//position
chart2::LegendPosition eNewPos;
@@ -162,9 +162,9 @@ void LegendPositionResources::writeToModel( const ::com::sun::star::uno::Referen
eExp = ::com::sun::star::chart::ChartLegendExpansion_WIDE;
}
- xProp->setPropertyValue( C2U( "AnchorPosition" ), uno::makeAny( eNewPos ));
- xProp->setPropertyValue( C2U( "Expansion" ), uno::makeAny( eExp ));
- xProp->setPropertyValue( C2U( "RelativePosition" ), uno::Any());
+ xProp->setPropertyValue( "AnchorPosition" , uno::makeAny( eNewPos ));
+ xProp->setPropertyValue( "Expansion" , uno::makeAny( eExp ));
+ xProp->setPropertyValue( "RelativePosition" , uno::Any());
}
}
catch( const uno::Exception & ex )
diff --git a/chart2/source/controller/dialogs/res_TextSeparator.cxx b/chart2/source/controller/dialogs/res_TextSeparator.cxx
index 5ebc89b76b40..9b7fc8ce3a65 100644
--- a/chart2/source/controller/dialogs/res_TextSeparator.cxx
+++ b/chart2/source/controller/dialogs/res_TextSeparator.cxx
@@ -43,10 +43,10 @@ TextSeparatorResources::TextSeparatorResources( Window* pWindow )
m_aLB_Separator.SetDropDownLineCount(m_aLB_Separator.GetEntryCount());
m_aLB_Separator.SetSizePixel( m_aLB_Separator.CalcMinimumSize() );
- m_aEntryMap[ C2U( " " ) ] = 0;
- m_aEntryMap[ C2U( ", " ) ] = 1;
- m_aEntryMap[ C2U( "; " ) ] = 2;
- m_aEntryMap[ C2U( "\n" ) ] = 3;
+ m_aEntryMap[ " " ] = 0;
+ m_aEntryMap[ ", " ] = 1;
+ m_aEntryMap[ "; " ] = 2;
+ m_aEntryMap[ "\n" ] = 3;
m_aLB_Separator.SetAccessibleName(m_aFT_Separator.GetText());
m_aLB_Separator.SetAccessibleRelationLabeledBy(&m_aFT_Separator);
@@ -113,9 +113,9 @@ Size TextSeparatorResources::GetCurrentListBoxSize() const
return m_aLB_Separator.GetSizePixel();
}
-void TextSeparatorResources::SetValue( const rtl::OUString& rSeparator )
+void TextSeparatorResources::SetValue( const OUString& rSeparator )
{
- ::std::map< ::rtl::OUString, sal_uInt16 >::iterator aIter( m_aEntryMap.find(rSeparator) );
+ ::std::map< OUString , sal_uInt16 >::iterator aIter( m_aEntryMap.find(rSeparator) );
if( aIter == m_aEntryMap.end() )
m_aLB_Separator.SelectEntryPos( m_nDefaultPos );
else
@@ -127,17 +127,17 @@ void TextSeparatorResources::SetDefault()
m_aLB_Separator.SelectEntryPos( m_nDefaultPos );
}
-rtl::OUString TextSeparatorResources::GetValue() const
+ OUString TextSeparatorResources::GetValue() const
{
sal_uInt16 nPos = m_aLB_Separator.GetSelectEntryPos();
- ::std::map< ::rtl::OUString, sal_uInt16 >::const_iterator aIter( m_aEntryMap.begin() );
+ ::std::map< OUString , sal_uInt16 >::const_iterator aIter( m_aEntryMap.begin() );
while( aIter != m_aEntryMap.end() )
{
if(aIter->second==nPos )
return aIter->first;
++aIter;
}
- return C2U( " " );
+ return OUString( " " );
}
//.............................................................................
diff --git a/chart2/source/controller/dialogs/res_TextSeparator.hxx b/chart2/source/controller/dialogs/res_TextSeparator.hxx
index 9d6121c07ef8..9f89dcca7927 100644
--- a/chart2/source/controller/dialogs/res_TextSeparator.hxx
+++ b/chart2/source/controller/dialogs/res_TextSeparator.hxx
@@ -47,15 +47,15 @@ public:
Point GetCurrentListBoxPosition() const;
Size GetCurrentListBoxSize() const;
- ::rtl::OUString GetValue() const;
- void SetValue( const ::rtl::OUString& rSeparator );
+ OUString GetValue() const;
+ void SetValue( const OUString& rSeparator );
void SetDefault();
private:
FixedText m_aFT_Separator;
ListBox m_aLB_Separator;
- ::std::map< ::rtl::OUString, sal_uInt16 > m_aEntryMap;
+ ::std::map< OUString, sal_uInt16 > m_aEntryMap;
const sal_uInt16 m_nDefaultPos;
};
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index 0e05e503f63c..4c3fd3c31c22 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -55,7 +55,7 @@ lcl_ModelProperties lcl_getPropertiesFromModel( uno::Reference< frame::XModel >
{
uno::Reference< chart2::XDiagram > xDiagram( ::chart::ChartModelHelper::findDiagram( xModel ) );
uno::Reference< beans::XPropertySet > xDiaProp( xDiagram, uno::UNO_QUERY_THROW );
- xDiaProp->getPropertyValue( C2U("D3DSceneShadeMode")) >>= aProps.m_aShadeMode;
+ xDiaProp->getPropertyValue( "D3DSceneShadeMode" ) >>= aProps.m_aShadeMode;
::chart::ThreeDHelper::getRoundedEdgesAndObjectLines( xDiagram, aProps.m_nRoundedEdges, aProps.m_nObjectLines );
aProps.m_eScheme = ::chart::ThreeDHelper::detectScheme( xDiagram );
}
@@ -72,7 +72,7 @@ void lcl_setShadeModeAtModel( uno::Reference< frame::XModel > & xModel, drawing:
{
uno::Reference< beans::XPropertySet > xDiaProp(
::chart::ChartModelHelper::findDiagram( xModel ), uno::UNO_QUERY_THROW );
- xDiaProp->setPropertyValue( C2U("D3DSceneShadeMode"), uno::makeAny( aShadeMode ));
+ xDiaProp->setPropertyValue( "D3DSceneShadeMode" , uno::makeAny( aShadeMode ));
}
catch( const uno::Exception & ex )
{
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index bcd4c1bf34be..0fe8ac881125 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -122,12 +122,12 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( Window* pWindow
m_aMFZRotation.SetModifyHdl( aAngleEditedLink );
drawing::ProjectionMode aProjectionMode = drawing::ProjectionMode_PERSPECTIVE;
- m_xSceneProperties->getPropertyValue( C2U("D3DScenePerspective")) >>= aProjectionMode;
+ m_xSceneProperties->getPropertyValue( "D3DScenePerspective" ) >>= aProjectionMode;
m_aCbxPerspective.Check( aProjectionMode == drawing::ProjectionMode_PERSPECTIVE );
m_aCbxPerspective.SetToggleHdl( LINK( this, ThreeD_SceneGeometry_TabPage, PerspectiveToggled ));
sal_Int32 nPerspectivePercentage = 20;
- m_xSceneProperties->getPropertyValue( C2U("Perspective")) >>= nPerspectivePercentage;
+ m_xSceneProperties->getPropertyValue( "Perspective" ) >>= nPerspectivePercentage;
m_aMFPerspective.SetValue( nPerspectivePercentage );
m_aMFPerspective.EnableUpdateData( nTimeout );
@@ -143,7 +143,7 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( Window* pWindow
if( ChartTypeHelper::isSupportingRightAngledAxes(
DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ) )
{
- m_xSceneProperties->getPropertyValue( C2U("RightAngledAxes")) >>= bRightAngledAxes;
+ m_xSceneProperties->getPropertyValue( "RightAngledAxes" ) >>= bRightAngledAxes;
m_aCbxRightAngledAxes.SetToggleHdl( LINK( this, ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled ));
m_aCbxRightAngledAxes.Check( bRightAngledAxes );
}
@@ -216,8 +216,8 @@ void ThreeD_SceneGeometry_TabPage::applyPerspectiveToModel()
try
{
- m_xSceneProperties->setPropertyValue( C2U("D3DScenePerspective"), uno::makeAny( aMode ));
- m_xSceneProperties->setPropertyValue( C2U("Perspective"), uno::makeAny( (sal_Int32)m_aMFPerspective.GetValue() ));
+ m_xSceneProperties->setPropertyValue( "D3DScenePerspective" , uno::makeAny( aMode ));
+ m_xSceneProperties->setPropertyValue( "Perspective" , uno::makeAny( (sal_Int32)m_aMFPerspective.GetValue() ));
}
catch( const uno::Exception & ex )
{
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 6884e67bb58c..7ab0e5444a7b 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -59,7 +59,7 @@ namespace
try
{
uno::Reference< beans::XPropertySet > xDiaProp( xChartDoc->getFirstDiagram(), uno::UNO_QUERY_THROW );
- xDiaProp->getPropertyValue( C2U( "SortByXValues" ) ) >>= bRet;
+ xDiaProp->getPropertyValue( "SortByXValues" ) >>= bRet;
}
catch( const uno::Exception & ex )
{
@@ -840,7 +840,7 @@ ChartTypeTabPage::ChartTypeTabPage( Window* pParent
{
try
{
- xProps->getPropertyValue( C2U( "DisableComplexChartTypes" ) ) >>= bDisableComplexChartTypes;
+ xProps->getPropertyValue( "DisableComplexChartTypes" ) >>= bDisableComplexChartTypes;
}
catch( const uno::Exception& e )
{
@@ -1089,7 +1089,7 @@ void ChartTypeTabPage::initializePage()
uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xModel ) );
DiagramHelper::tTemplateWithServiceName aTemplate =
DiagramHelper::getTemplateForDiagram( xDiagram, xTemplateManager );
- ::rtl::OUString aServiceName( aTemplate.second );
+ OUString aServiceName( aTemplate.second );
bool bFound = false;
diff --git a/chart2/source/controller/dialogs/tp_ChartType.src b/chart2/source/controller/dialogs/tp_ChartType.src
index 73438f8317fc..2e5e51e61f8c 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.src
+++ b/chart2/source/controller/dialogs/tp_ChartType.src
@@ -244,11 +244,11 @@ ModalDialog DLG_SPLINE_PROPERTIES
Repeat = TRUE ;
Spin = TRUE ;
Minimum = 1 ;
- Maximum = 100 ;
+ Maximum = 15 ;
StrictFormat = TRUE ;
Unit = FUNIT_CUSTOM ;
First = 1 ;
- Last = 100 ;
+ Last = 15 ;
SpinSize = 1 ;
};
FixedLine FL_SPLINE_DIALOGBUTTONS
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index e0fb150eda8e..080ad76c8f24 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -58,7 +58,7 @@ using ::rtl::OUStringBuffer;
namespace
{
-const OUString lcl_aLabelRole( RTL_CONSTASCII_USTRINGPARAM( "label" ));
+const OUString lcl_aLabelRole( "label" );
String lcl_GetRoleLBEntry(
const OUString & rRole, const OUString & rRange )
@@ -124,7 +124,7 @@ OUString lcl_GetSelectedRolesRange( const SvTabListBox & rRoleListBox )
OUString lcl_GetSequenceNameForLabel( ::chart::SeriesEntry * pEntry )
{
- OUString aResult( RTL_CONSTASCII_USTRINGPARAM("values-y"));
+ OUString aResult( "values-y" );
if( pEntry &&
pEntry->m_xChartType.is())
{
@@ -477,7 +477,7 @@ void DataSourceTabPage::fillSeriesListBox()
OUString aResString( String( ::chart::SchResId( STR_DATA_UNNAMED_SERIES_WITH_INDEX )));
// replace index of unnamed series
- const OUString aReplacementStr( RTL_CONSTASCII_USTRINGPARAM( "%NUMBER" ));
+ const OUString aReplacementStr( "%NUMBER" );
sal_Int32 nIndex = aResString.indexOf( aReplacementStr );
if( nIndex != -1 )
aLabel = String( aResString.replaceAt(
@@ -609,7 +609,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, RoleSelectionChangedHdl)
OUString aSelectedRange = lcl_GetSelectedRolesRange( m_aLB_ROLE );
// replace role in fixed text label
- const OUString aReplacementStr( RTL_CONSTASCII_USTRINGPARAM( "%VALUETYPE" ));
+ const OUString aReplacementStr( "%VALUETYPE" );
sal_Int32 nIndex = m_aFixedTextRange.indexOf( aReplacementStr );
if( nIndex != -1 )
{
@@ -644,7 +644,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl)
OUString aUIStr( aStr );
// replace role
- OUString aReplacement( RTL_CONSTASCII_USTRINGPARAM( "%VALUETYPE" ));
+ OUString aReplacement( "%VALUETYPE" );
sal_Int32 nIndex = aUIStr.indexOf( aReplacement );
if( nIndex != -1 )
{
@@ -652,7 +652,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl)
lcl_GetSelectedRole( m_aLB_ROLE, true ));
}
// replace series name
- aReplacement = C2U( "%SERIESNAME" );
+ aReplacement = "%SERIESNAME";
nIndex = aUIStr.indexOf( aReplacement );
if( nIndex != -1 )
{
@@ -936,7 +936,7 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
OUString aSelectedRole = lcl_GetSelectedRole( m_aLB_ROLE );
OUString aRange( m_aEDT_RANGE.GetText());
OUString aSequenceRole( aSelectedRole );
- bool bIsLabel = aSequenceRole.equals( lcl_aLabelRole );
+ bool bIsLabel = (aSequenceRole == lcl_aLabelRole );
OUString aSequenceNameForLabel( lcl_GetSequenceNameForLabel( pSeriesEntry ));
if( bIsLabel )
@@ -982,7 +982,7 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
// "$Sheet1.$A$1"
aRange = xNewSeq->getSourceRangeRepresentation();
Reference< beans::XPropertySet > xProp( xNewSeq, uno::UNO_QUERY_THROW );
- xProp->setPropertyValue( C2U("Role"), uno::makeAny( lcl_aLabelRole ));
+ xProp->setPropertyValue( "Role" , uno::makeAny( lcl_aLabelRole ));
xLabeledSeq->setLabel( xNewSeq );
}
}
@@ -1014,10 +1014,10 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
aRange = xNewSeq->getSourceRangeRepresentation();
Reference< beans::XPropertySet > xProp( xNewSeq, uno::UNO_QUERY_THROW );
- xProp->setPropertyValue( C2U("Role"), uno::makeAny( aSelectedRole ));
+ xProp->setPropertyValue( "Role" , uno::makeAny( aSelectedRole ));
if( !xLabeledSeq.is())
{
- if( aSelectedRole.equals( aSequenceNameForLabel ))
+ if( aSelectedRole == aSequenceNameForLabel )
xLabeledSeq.set( lcl_findLSequenceWithOnlyLabel( xSource ));
if( ! xLabeledSeq.is())
{
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx
index c7edca5550c3..8eed40cfe86d 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -35,7 +35,7 @@
// header for class SvTabListBox
#include <svtools/svtabbx.hxx>
// header for class SvTreeListBox
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/chart2/XDiagram.hpp>
#include <com/sun/star/chart2/data/XDataProvider.hpp>
diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
index 72f9697a53e2..c2f0b798aaf0 100644
--- a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
@@ -26,7 +26,7 @@
// header for class SvTabListBox
#include <svtools/svtabbx.hxx>
// header for class SvTreeListBox
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
namespace chart
{
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 59f1efd8d948..1ce4107c2e64 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -252,12 +252,12 @@ void RangeChooserTabPage::changeDialogModelAccordingToControls()
m_aRB_Columns.IsChecked(), bFirstCellAsLabel, bHasCategories ) );
// only if range is valid
- if( m_aLastValidRangeString.equals( m_aED_Range.GetText()))
+ if( m_aLastValidRangeString.equals(m_aED_Range.GetText()))
{
m_rDialogModel.setTemplate( m_xCurrentChartTypeTemplate );
aArguments.realloc( aArguments.getLength() + 1 );
aArguments[aArguments.getLength() - 1] =
- beans::PropertyValue( C2U("CellRangeRepresentation"), -1,
+ beans::PropertyValue( "CellRangeRepresentation" , -1,
uno::makeAny( m_aLastValidRangeString ),
beans::PropertyState_DIRECT_VALUE );
m_rDialogModel.setData( aArguments );
@@ -271,7 +271,7 @@ void RangeChooserTabPage::changeDialogModelAccordingToControls()
bool RangeChooserTabPage::isValid()
{
- ::rtl::OUString aRange( m_aED_Range.GetText());
+ OUString aRange( m_aED_Range.GetText());
sal_Bool bFirstCellAsLabel = ( m_aCB_FirstColumnAsLabel.IsChecked() && !m_aRB_Columns.IsChecked() )
|| ( m_aCB_FirstRowAsLabel.IsChecked() && !m_aRB_Rows.IsChecked() );
sal_Bool bHasCategories = ( m_aCB_FirstColumnAsLabel.IsChecked() && m_aRB_Columns.IsChecked() )
@@ -352,9 +352,9 @@ IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedHdl)
IMPL_LINK_NOARG(RangeChooserTabPage, ChooseRangeHdl)
{
- rtl::OUString aRange = m_aED_Range.GetText();
+ OUString aRange = m_aED_Range.GetText();
// using assignment for broken gcc 3.3
- rtl::OUString aTitle = String( SchResId( STR_PAGE_DATA_RANGE ) );
+ OUString aTitle = String( SchResId( STR_PAGE_DATA_RANGE ) );
lcl_enableRangeChoosing( true, m_pParentDialog );
m_rDialogModel.getRangeSelectionHelper()->chooseRange( aRange, aTitle, *this );
@@ -363,11 +363,11 @@ IMPL_LINK_NOARG(RangeChooserTabPage, ChooseRangeHdl)
}
-void RangeChooserTabPage::listeningFinished( const ::rtl::OUString & rNewRange )
+void RangeChooserTabPage::listeningFinished( const OUString & rNewRange )
{
//user has selected a new range
- rtl::OUString aRange( rNewRange );
+ OUString aRange( rNewRange );
m_rDialogModel.startControllerLockTimer();
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index bb03ff03a521..2f0bc8d683bf 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -100,7 +100,7 @@ protected: //member
::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XDataProvider > m_xDataProvider;
- rtl::OUString m_aLastValidRangeString;
+ OUString m_aLastValidRangeString;
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartTypeTemplate > m_xCurrentChartTypeTemplate;
ChartTypeTemplateProvider* m_pTemplateProvider;
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index dc0de9a8e507..37e7b0a20746 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -192,8 +192,8 @@ SdrObject* DrawViewWrapper::getHitObject( const Point& rPnt ) const
if( pRet )
{
//ignore some special shapes
- rtl::OUString aShapeName = pRet->GetName();
- if( aShapeName.match(C2U("PlotAreaIncludingAxes")) || aShapeName.match(C2U("PlotAreaExcludingAxes")) )
+ OUString aShapeName = pRet->GetName();
+ if( aShapeName.match("PlotAreaIncludingAxes") || aShapeName.match("PlotAreaExcludingAxes") )
{
pRet->SetMarkProtect( true );
return getHitObject( rPnt );
@@ -300,7 +300,7 @@ SfxItemSet DrawViewWrapper::getPositionAndSizeItemSetFromMarkedObject() const
return aFullSet;
}
-SdrObject* DrawViewWrapper::getNamedSdrObject( const rtl::OUString& rName ) const
+SdrObject* DrawViewWrapper::getNamedSdrObject( const OUString& rName ) const
{
if(rName.isEmpty())
return 0;
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index 78fc46e35edf..e06643667b5b 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -103,7 +103,7 @@ AxisItemConverter::AxisItemConverter(
xNamedPropertyContainerFactory,
GraphicPropertyItemConverter::LINE_PROPERTIES ));
m_aConverters.push_back( new CharacterPropertyItemConverter( rPropertySet, rItemPool, pRefSize,
- C2U( "ReferencePageSize" ) ));
+ "ReferencePageSize" ));
m_xAxis.set( Reference< chart2::XAxis >( rPropertySet, uno::UNO_QUERY ) );
OSL_ASSERT( m_xAxis.is());
@@ -348,7 +348,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI
case SCHATTR_AXIS_POSITION:
{
::com::sun::star::chart::ChartAxisPosition eAxisPos( ::com::sun::star::chart::ChartAxisPosition_ZERO );
- GetPropertySet()->getPropertyValue(C2U( "CrossoverPosition" )) >>= eAxisPos;
+ GetPropertySet()->getPropertyValue( "CrossoverPosition" ) >>= eAxisPos;
rOutItemSet.Put( SfxInt32Item( nWhichId, eAxisPos ) );
}
break;
@@ -356,7 +356,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI
case SCHATTR_AXIS_POSITION_VALUE:
{
double fValue = 0.0;
- if( GetPropertySet()->getPropertyValue(C2U( "CrossoverValue" )) >>= fValue )
+ if( GetPropertySet()->getPropertyValue( "CrossoverValue" ) >>= fValue )
rOutItemSet.Put( SvxDoubleItem( fValue, nWhichId ) );
}
break;
@@ -381,7 +381,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI
case SCHATTR_AXIS_LABEL_POSITION:
{
::com::sun::star::chart::ChartAxisLabelPosition ePos( ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS );
- GetPropertySet()->getPropertyValue(C2U( "LabelPosition" )) >>= ePos;
+ GetPropertySet()->getPropertyValue( "LabelPosition" ) >>= ePos;
rOutItemSet.Put( SfxInt32Item( nWhichId, ePos ) );
}
break;
@@ -389,7 +389,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI
case SCHATTR_AXIS_MARK_POSITION:
{
::com::sun::star::chart::ChartAxisMarkPosition ePos( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS );
- GetPropertySet()->getPropertyValue(C2U( "MarkPosition" )) >>= ePos;
+ GetPropertySet()->getPropertyValue( "MarkPosition" ) >>= ePos;
rOutItemSet.Put( SfxInt32Item( nWhichId, ePos ) );
}
break;
@@ -399,7 +399,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI
// convert double to int (times 100)
double fVal = 0;
- if( GetPropertySet()->getPropertyValue( C2U( "TextRotation" )) >>= fVal )
+ if( GetPropertySet()->getPropertyValue( "TextRotation" ) >>= fVal )
{
rOutItemSet.Put( SfxInt32Item( nWhichId, static_cast< sal_Int32 >(
::rtl::math::round( fVal * 100.0 ) ) ));
@@ -425,7 +425,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI
case SID_ATTR_NUMBERFORMAT_SOURCE:
{
- bool bNumberFormatIsSet = ( GetPropertySet()->getPropertyValue( C2U( "NumberFormat" )).hasValue());
+ bool bNumberFormatIsSet = ( GetPropertySet()->getPropertyValue( "NumberFormat" ).hasValue());
rOutItemSet.Put( SfxBoolItem( nWhichId, ! bNumberFormatIsSet ));
}
break;
@@ -744,11 +744,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
double fValue = 0.0;
if( aValue >>= fValue )
{
- xCrossingMainAxis->setPropertyValue( C2U( "CrossoverPosition" ), uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE ));
- xCrossingMainAxis->setPropertyValue( C2U( "CrossoverValue" ), uno::makeAny( fValue ));
+ xCrossingMainAxis->setPropertyValue( "CrossoverPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE ));
+ xCrossingMainAxis->setPropertyValue( "CrossoverValue" , uno::makeAny( fValue ));
}
else
- xCrossingMainAxis->setPropertyValue( C2U( "CrossoverPosition" ), uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START ));
+ xCrossingMainAxis->setPropertyValue( "CrossoverPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START ));
}
}
}
@@ -764,11 +764,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue();
::com::sun::star::chart::ChartAxisPosition eOldAxisPos( ::com::sun::star::chart::ChartAxisPosition_ZERO );
- bool bPropExisted = ( GetPropertySet()->getPropertyValue(C2U( "CrossoverPosition" )) >>= eOldAxisPos );
+ bool bPropExisted = ( GetPropertySet()->getPropertyValue( "CrossoverPosition" ) >>= eOldAxisPos );
if( !bPropExisted || ( eOldAxisPos != eAxisPos ))
{
- GetPropertySet()->setPropertyValue( C2U( "CrossoverPosition" ), uno::makeAny( eAxisPos ));
+ GetPropertySet()->setPropertyValue( "CrossoverPosition" , uno::makeAny( eAxisPos ));
bChangedOtherwise = true;
//move the parallel axes to the other side if necessary
@@ -778,7 +778,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
if( xParallelAxis.is() )
{
::com::sun::star::chart::ChartAxisPosition eOtherPos;
- if( xParallelAxis->getPropertyValue( C2U( "CrossoverPosition" ) ) >>= eOtherPos )
+ if( xParallelAxis->getPropertyValue( "CrossoverPosition" ) >>= eOtherPos )
{
if( eOtherPos == eAxisPos )
{
@@ -786,7 +786,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
(eAxisPos==::com::sun::star::chart::ChartAxisPosition_START)
? ::com::sun::star::chart::ChartAxisPosition_END
: ::com::sun::star::chart::ChartAxisPosition_START;
- xParallelAxis->setPropertyValue( C2U( "CrossoverPosition" ), uno::makeAny( eOppositePos ));
+ xParallelAxis->setPropertyValue( "CrossoverPosition" , uno::makeAny( eOppositePos ));
}
}
}
@@ -800,11 +800,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
double fValue = static_cast< const SvxDoubleItem & >( rItemSet.Get( nWhichId )).GetValue();
double fOldValue = 0.0;
- bool bPropExisted = ( GetPropertySet()->getPropertyValue(C2U( "CrossoverValue" )) >>= fOldValue );
+ bool bPropExisted = ( GetPropertySet()->getPropertyValue( "CrossoverValue" ) >>= fOldValue );
if( !bPropExisted || ( fOldValue != fValue ))
{
- GetPropertySet()->setPropertyValue( C2U( "CrossoverValue" ), uno::makeAny( fValue ));
+ GetPropertySet()->setPropertyValue( "CrossoverValue" , uno::makeAny( fValue ));
bChangedOtherwise = true;
//keep old and new settings for axis positioning in sync somehow
@@ -836,11 +836,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue();
::com::sun::star::chart::ChartAxisLabelPosition eOldPos( ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS );
- bool bPropExisted = ( GetPropertySet()->getPropertyValue(C2U( "LabelPosition" )) >>= eOldPos );
+ bool bPropExisted = ( GetPropertySet()->getPropertyValue( "LabelPosition" ) >>= eOldPos );
if( !bPropExisted || ( eOldPos != ePos ))
{
- GetPropertySet()->setPropertyValue( C2U( "LabelPosition" ), uno::makeAny( ePos ));
+ GetPropertySet()->setPropertyValue( "LabelPosition" , uno::makeAny( ePos ));
bChangedOtherwise = true;
//move the parallel axes to the other side if necessary
@@ -850,7 +850,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
if( xParallelAxis.is() )
{
::com::sun::star::chart::ChartAxisLabelPosition eOtherPos;
- if( xParallelAxis->getPropertyValue( C2U( "LabelPosition" ) ) >>= eOtherPos )
+ if( xParallelAxis->getPropertyValue( "LabelPosition" ) >>= eOtherPos )
{
if( eOtherPos == ePos )
{
@@ -858,7 +858,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
(ePos==::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START)
? ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END
: ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START;
- xParallelAxis->setPropertyValue( C2U( "LabelPosition" ), uno::makeAny( eOppositePos ));
+ xParallelAxis->setPropertyValue( "LabelPosition" , uno::makeAny( eOppositePos ));
}
}
}
@@ -874,11 +874,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue();
::com::sun::star::chart::ChartAxisMarkPosition eOldPos( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS );
- bool bPropExisted = ( GetPropertySet()->getPropertyValue(C2U( "MarkPosition" )) >>= eOldPos );
+ bool bPropExisted = ( GetPropertySet()->getPropertyValue( "MarkPosition" ) >>= eOldPos );
if( !bPropExisted || ( eOldPos != ePos ))
{
- GetPropertySet()->setPropertyValue( C2U( "MarkPosition" ), uno::makeAny( ePos ));
+ GetPropertySet()->setPropertyValue( "MarkPosition" , uno::makeAny( ePos ));
bChangedOtherwise = true;
}
}
@@ -892,12 +892,12 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
rItemSet.Get( nWhichId )).GetValue()) / 100.0;
double fOldVal = 0.0;
bool bPropExisted =
- ( GetPropertySet()->getPropertyValue( C2U( "TextRotation" )) >>= fOldVal );
+ ( GetPropertySet()->getPropertyValue( "TextRotation" ) >>= fOldVal );
if( ! bPropExisted ||
( bPropExisted && fOldVal != fVal ))
{
- GetPropertySet()->setPropertyValue( C2U( "TextRotation" ), uno::makeAny( fVal ));
+ GetPropertySet()->setPropertyValue( "TextRotation" , uno::makeAny( fVal ));
bChangedOtherwise = true;
}
}
@@ -918,9 +918,9 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
rItemSet.Get( nWhichId )).GetValue());
aValue = uno::makeAny(nFmt);
- if( GetPropertySet()->getPropertyValue( C2U( "NumberFormat" )) != aValue )
+ if( GetPropertySet()->getPropertyValue( "NumberFormat" ) != aValue )
{
- GetPropertySet()->setPropertyValue( C2U( "NumberFormat" ), aValue );
+ GetPropertySet()->setPropertyValue( "NumberFormat" , aValue );
bChangedOtherwise = true;
}
}
@@ -933,7 +933,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
bool bUseSourceFormat =
(static_cast< const SfxBoolItem & >(
rItemSet.Get( nWhichId )).GetValue() );
- bool bNumberFormatIsSet = ( GetPropertySet()->getPropertyValue( C2U( "NumberFormat" )).hasValue());
+ bool bNumberFormatIsSet = ( GetPropertySet()->getPropertyValue( "NumberFormat").hasValue());
bChangedOtherwise = (bUseSourceFormat == bNumberFormatIsSet);
if( bChangedOtherwise )
@@ -961,7 +961,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
}
}
// else set a void Any
- GetPropertySet()->setPropertyValue( C2U( "NumberFormat" ), aValue );
+ GetPropertySet()->setPropertyValue( "NumberFormat" , aValue );
}
}
break;
diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
index 97881cec2aee..1550998294ae 100644
--- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
@@ -82,7 +82,7 @@ CharacterPropertyItemConverter::CharacterPropertyItemConverter(
const uno::Reference< beans::XPropertySet > & rPropertySet,
SfxItemPool& rItemPool,
::std::auto_ptr< awt::Size > pRefSize,
- const ::rtl::OUString & rRefSizePropertyName,
+ const OUString & rRefSizePropertyName,
const uno::Reference< beans::XPropertySet > & rRefSizePropSet ) :
ItemConverter( rPropertySet, rItemPool ),
m_pRefSize( pRefSize ),
@@ -121,23 +121,23 @@ void CharacterPropertyItemConverter::FillSpecialItem(
case EE_CHAR_FONTINFO_CJK:
case EE_CHAR_FONTINFO_CTL:
{
- ::rtl::OUString aPostfix;
+ OUString aPostfix;
if( nWhichId == EE_CHAR_FONTINFO_CJK )
- aPostfix = C2U( "Asian" );
+ aPostfix = "Asian";
else if( nWhichId == EE_CHAR_FONTINFO_CTL )
- aPostfix = C2U( "Complex" );
+ aPostfix = "Complex";
SvxFontItem aItem( nWhichId );
- aItem.PutValue( GetPropertySet()->getPropertyValue( C2U( "CharFontName" ) + aPostfix),
+ aItem.PutValue( GetPropertySet()->getPropertyValue( "CharFontName" + aPostfix),
MID_FONT_FAMILY_NAME );
- aItem.PutValue( GetPropertySet()->getPropertyValue( C2U( "CharFontFamily" ) + aPostfix),
+ aItem.PutValue( GetPropertySet()->getPropertyValue( "CharFontFamily" + aPostfix),
MID_FONT_FAMILY );
- aItem.PutValue( GetPropertySet()->getPropertyValue( C2U( "CharFontStyleName" ) + aPostfix),
+ aItem.PutValue( GetPropertySet()->getPropertyValue( "CharFontStyleName" + aPostfix),
MID_FONT_STYLE_NAME );
- aItem.PutValue( GetPropertySet()->getPropertyValue( C2U( "CharFontCharSet" ) + aPostfix),
+ aItem.PutValue( GetPropertySet()->getPropertyValue( "CharFontCharSet" + aPostfix),
MID_FONT_CHAR_SET );
- aItem.PutValue( GetPropertySet()->getPropertyValue( C2U( "CharFontPitch" ) + aPostfix),
+ aItem.PutValue( GetPropertySet()->getPropertyValue( "CharFontPitch" + aPostfix),
MID_FONT_PITCH );
rOutItemSet.Put( aItem );
@@ -149,14 +149,14 @@ void CharacterPropertyItemConverter::FillSpecialItem(
SvxUnderlineItem aItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE);
bool bModified = false;
- uno::Any aValue( GetPropertySet()->getPropertyValue( C2U( "CharUnderline" )));
+ uno::Any aValue( GetPropertySet()->getPropertyValue( "CharUnderline" ));
if( aValue.hasValue())
{
aItem.PutValue( aValue, MID_TL_STYLE );
bModified = true;
}
- aValue = GetPropertySet()->getPropertyValue( C2U( "CharUnderlineHasColor" ));
+ aValue = GetPropertySet()->getPropertyValue( "CharUnderlineHasColor" );
if( aValue.hasValue() &&
( *reinterpret_cast< const sal_Bool * >( aValue.getValue()) != sal_False ))
{
@@ -164,7 +164,7 @@ void CharacterPropertyItemConverter::FillSpecialItem(
bModified = true;
}
- aValue = GetPropertySet()->getPropertyValue( C2U( "CharUnderlineColor" ));
+ aValue = GetPropertySet()->getPropertyValue( "CharUnderlineColor" );
if( aValue.hasValue())
{
aItem.PutValue( aValue, MID_TL_COLOR );
@@ -181,14 +181,14 @@ void CharacterPropertyItemConverter::FillSpecialItem(
SvxOverlineItem aItem( UNDERLINE_NONE, EE_CHAR_OVERLINE );
bool bModified = false;
- uno::Any aValue( GetPropertySet()->getPropertyValue( C2U( "CharOverline" ) ) );
+ uno::Any aValue( GetPropertySet()->getPropertyValue( "CharOverline" ) );
if ( aValue.hasValue() )
{
aItem.PutValue( aValue, MID_TL_STYLE );
bModified = true;
}
- aValue = GetPropertySet()->getPropertyValue( C2U( "CharOverlineHasColor" ) );
+ aValue = GetPropertySet()->getPropertyValue( "CharOverlineHasColor" );
if ( aValue.hasValue() &&
( *reinterpret_cast< const sal_Bool* >( aValue.getValue() ) != sal_False ) )
{
@@ -196,7 +196,7 @@ void CharacterPropertyItemConverter::FillSpecialItem(
bModified = true;
}
- aValue = GetPropertySet()->getPropertyValue( C2U( "CharOverlineColor" ) );
+ aValue = GetPropertySet()->getPropertyValue( "CharOverlineColor" );
if ( aValue.hasValue() )
{
aItem.PutValue( aValue, MID_TL_COLOR );
@@ -214,15 +214,15 @@ void CharacterPropertyItemConverter::FillSpecialItem(
case EE_CHAR_ITALIC_CJK:
case EE_CHAR_ITALIC_CTL:
{
- ::rtl::OUString aPostfix;
+ OUString aPostfix;
if( nWhichId == EE_CHAR_ITALIC_CJK )
- aPostfix = C2U( "Asian" );
+ aPostfix = "Asian";
else if( nWhichId == EE_CHAR_ITALIC_CTL )
- aPostfix = C2U( "Complex" );
+ aPostfix = "Complex";
SvxPostureItem aItem( ITALIC_NONE, nWhichId );
- uno::Any aValue( GetPropertySet()->getPropertyValue( C2U( "CharPosture" ) + aPostfix));
+ uno::Any aValue( GetPropertySet()->getPropertyValue( "CharPosture" + aPostfix));
if( aValue.hasValue())
{
aItem.PutValue( aValue, MID_POSTURE );
@@ -235,15 +235,15 @@ void CharacterPropertyItemConverter::FillSpecialItem(
case EE_CHAR_WEIGHT_CJK:
case EE_CHAR_WEIGHT_CTL:
{
- ::rtl::OUString aPostfix;
+ OUString aPostfix;
if( nWhichId == EE_CHAR_WEIGHT_CJK )
- aPostfix = C2U( "Asian" );
+ aPostfix = "Asian";
else if( nWhichId == EE_CHAR_WEIGHT_CTL )
- aPostfix = C2U( "Complex" );
+ aPostfix = "Complex";
SvxWeightItem aItem( WEIGHT_NORMAL, nWhichId );
- uno::Any aValue( GetPropertySet()->getPropertyValue( C2U( "CharWeight" ) + aPostfix));
+ uno::Any aValue( GetPropertySet()->getPropertyValue( "CharWeight" + aPostfix));
if( aValue.hasValue())
{
aItem.PutValue( aValue, MID_WEIGHT );
@@ -256,17 +256,17 @@ void CharacterPropertyItemConverter::FillSpecialItem(
case EE_CHAR_FONTHEIGHT_CJK:
case EE_CHAR_FONTHEIGHT_CTL:
{
- ::rtl::OUString aPostfix;
+ OUString aPostfix;
if( nWhichId == EE_CHAR_FONTHEIGHT_CJK )
- aPostfix = C2U( "Asian" );
+ aPostfix = "Asian";
else if( nWhichId == EE_CHAR_FONTHEIGHT_CTL )
- aPostfix = C2U( "Complex" );
+ aPostfix = "Complex";
SvxFontHeightItem aItem( 240, 100, nWhichId );
try
{
- uno::Any aValue( GetPropertySet()->getPropertyValue( C2U( "CharHeight" ) + aPostfix ));
+ uno::Any aValue( GetPropertySet()->getPropertyValue( "CharHeight" + aPostfix ));
float fHeight;
if( aValue >>= fHeight )
{
@@ -298,11 +298,11 @@ void CharacterPropertyItemConverter::FillSpecialItem(
uno::Reference< chart2::XFormattedString > xFormattedString( GetPropertySet(), uno::UNO_QUERY );
if( xFormattedString.is() )
{
- ::rtl::OUString aString = xFormattedString->getString();
+ OUString aString = xFormattedString->getString();
rOutItemSet.Put( SfxStringItem( nWhichId, aString ) );
}
else
- rOutItemSet.Put( SfxStringItem( nWhichId, C2U( "" ) ) );
+ rOutItemSet.Put( SfxStringItem( nWhichId, OUString("") ) );
}
break;
@@ -326,11 +326,11 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
case EE_CHAR_FONTINFO_CJK:
case EE_CHAR_FONTINFO_CTL:
{
- ::rtl::OUString aPostfix;
+ OUString aPostfix;
if( nWhichId == EE_CHAR_FONTINFO_CJK )
- aPostfix = C2U( "Asian" );
+ aPostfix = "Asian";
else if( nWhichId == EE_CHAR_FONTINFO_CTL )
- aPostfix = C2U( "Complex" );
+ aPostfix = "Complex";
const SvxFontItem & rItem =
static_cast< const SvxFontItem & >(
@@ -338,41 +338,41 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
if( rItem.QueryValue( aValue, MID_FONT_FAMILY_NAME ))
{
- if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharFontName" ) + aPostfix ))
+ if( aValue != GetPropertySet()->getPropertyValue( "CharFontName" + aPostfix ))
{
- GetPropertySet()->setPropertyValue( C2U( "CharFontName" ) + aPostfix, aValue );
+ GetPropertySet()->setPropertyValue( "CharFontName" + aPostfix, aValue );
bChanged = true;
}
}
if( rItem.QueryValue( aValue, MID_FONT_FAMILY ))
{
- if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharFontFamily" ) + aPostfix ))
+ if( aValue != GetPropertySet()->getPropertyValue( "CharFontFamily" + aPostfix ))
{
- GetPropertySet()->setPropertyValue( C2U( "CharFontFamily" ) + aPostfix, aValue );
+ GetPropertySet()->setPropertyValue( "CharFontFamily" + aPostfix, aValue );
bChanged = true;
}
}
if( rItem.QueryValue( aValue, MID_FONT_STYLE_NAME ))
{
- if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharFontStyleName" ) + aPostfix ))
+ if( aValue != GetPropertySet()->getPropertyValue( "CharFontStyleName" + aPostfix ))
{
- GetPropertySet()->setPropertyValue( C2U( "CharFontStyleName" ) + aPostfix, aValue );
+ GetPropertySet()->setPropertyValue( "CharFontStyleName" + aPostfix, aValue );
bChanged = true;
}
}
if( rItem.QueryValue( aValue, MID_FONT_CHAR_SET ))
{
- if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharFontCharSet" ) + aPostfix ))
+ if( aValue != GetPropertySet()->getPropertyValue( "CharFontCharSet" + aPostfix ))
{
- GetPropertySet()->setPropertyValue( C2U( "CharFontCharSet" ) + aPostfix, aValue );
+ GetPropertySet()->setPropertyValue( "CharFontCharSet" + aPostfix, aValue );
bChanged = true;
}
}
if( rItem.QueryValue( aValue, MID_FONT_PITCH ))
{
- if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharFontPitch" ) + aPostfix ))
+ if( aValue != GetPropertySet()->getPropertyValue( "CharFontPitch" + aPostfix ))
{
- GetPropertySet()->setPropertyValue( C2U( "CharFontPitch" ) + aPostfix, aValue );
+ GetPropertySet()->setPropertyValue( "CharFontPitch" + aPostfix, aValue );
bChanged = true;
}
}
@@ -387,27 +387,27 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
if( rItem.QueryValue( aValue, MID_TL_STYLE ))
{
- if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharUnderline" ) ))
+ if( aValue != GetPropertySet()->getPropertyValue( "CharUnderline" ))
{
- GetPropertySet()->setPropertyValue( C2U( "CharUnderline" ), aValue );
+ GetPropertySet()->setPropertyValue( "CharUnderline" , aValue );
bChanged = true;
}
}
if( rItem.QueryValue( aValue, MID_TL_COLOR ))
{
- if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharUnderlineColor" ) ))
+ if( aValue != GetPropertySet()->getPropertyValue( "CharUnderlineColor" ))
{
- GetPropertySet()->setPropertyValue( C2U( "CharUnderlineColor" ), aValue );
+ GetPropertySet()->setPropertyValue( "CharUnderlineColor" , aValue );
bChanged = true;
}
}
if( rItem.QueryValue( aValue, MID_TL_HASCOLOR ))
{
- if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharUnderlineHasColor" ) ))
+ if( aValue != GetPropertySet()->getPropertyValue( "CharUnderlineHasColor" ))
{
- GetPropertySet()->setPropertyValue( C2U( "CharUnderlineHasColor" ), aValue );
+ GetPropertySet()->setPropertyValue( "CharUnderlineHasColor" , aValue );
bChanged = true;
}
}
@@ -420,27 +420,27 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
if ( rItem.QueryValue( aValue, MID_TL_STYLE ) )
{
- if ( aValue != GetPropertySet()->getPropertyValue( C2U( "CharOverline" ) ) )
+ if ( aValue != GetPropertySet()->getPropertyValue( "CharOverline" ) )
{
- GetPropertySet()->setPropertyValue( C2U( "CharOverline" ), aValue );
+ GetPropertySet()->setPropertyValue( "CharOverline" , aValue );
bChanged = true;
}
}
if ( rItem.QueryValue( aValue, MID_TL_COLOR ) )
{
- if ( aValue != GetPropertySet()->getPropertyValue( C2U( "CharOverlineColor" ) ) )
+ if ( aValue != GetPropertySet()->getPropertyValue( "CharOverlineColor" ) )
{
- GetPropertySet()->setPropertyValue( C2U( "CharOverlineColor" ), aValue );
+ GetPropertySet()->setPropertyValue( "CharOverlineColor" , aValue );
bChanged = true;
}
}
if ( rItem.QueryValue( aValue, MID_TL_HASCOLOR ) )
{
- if ( aValue != GetPropertySet()->getPropertyValue( C2U( "CharOverlineHasColor" ) ) )
+ if ( aValue != GetPropertySet()->getPropertyValue( "CharOverlineHasColor" ) )
{
- GetPropertySet()->setPropertyValue( C2U( "CharOverlineHasColor" ), aValue );
+ GetPropertySet()->setPropertyValue( "CharOverlineHasColor" , aValue );
bChanged = true;
}
}
@@ -451,11 +451,11 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
case EE_CHAR_ITALIC_CJK:
case EE_CHAR_ITALIC_CTL:
{
- ::rtl::OUString aPostfix;
+ OUString aPostfix;
if( nWhichId == EE_CHAR_ITALIC_CJK )
- aPostfix = C2U( "Asian" );
+ aPostfix = "Asian";
else if( nWhichId == EE_CHAR_ITALIC_CTL )
- aPostfix = C2U( "Complex" );
+ aPostfix = "Complex";
const SvxPostureItem & rItem =
static_cast< const SvxPostureItem & >(
@@ -463,9 +463,9 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
if( rItem.QueryValue( aValue, MID_POSTURE ))
{
- if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharPosture" ) + aPostfix))
+ if( aValue != GetPropertySet()->getPropertyValue( "CharPosture" + aPostfix))
{
- GetPropertySet()->setPropertyValue( C2U( "CharPosture" ) + aPostfix, aValue );
+ GetPropertySet()->setPropertyValue( "CharPosture" + aPostfix, aValue );
bChanged = true;
}
}
@@ -476,11 +476,11 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
case EE_CHAR_WEIGHT_CJK:
case EE_CHAR_WEIGHT_CTL:
{
- ::rtl::OUString aPostfix;
+ OUString aPostfix;
if( nWhichId == EE_CHAR_WEIGHT_CJK )
- aPostfix = C2U( "Asian" );
+ aPostfix = "Asian" ;
else if( nWhichId == EE_CHAR_WEIGHT_CTL )
- aPostfix = C2U( "Complex" );
+ aPostfix = "Complex";
const SvxWeightItem & rItem =
static_cast< const SvxWeightItem & >(
@@ -488,9 +488,9 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
if( rItem.QueryValue( aValue, MID_WEIGHT ))
{
- if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharWeight" ) + aPostfix))
+ if( aValue != GetPropertySet()->getPropertyValue( "CharWeight" + aPostfix))
{
- GetPropertySet()->setPropertyValue( C2U( "CharWeight" ) + aPostfix, aValue );
+ GetPropertySet()->setPropertyValue( "CharWeight" + aPostfix, aValue );
bChanged = true;
}
}
@@ -501,11 +501,11 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
case EE_CHAR_FONTHEIGHT_CJK:
case EE_CHAR_FONTHEIGHT_CTL:
{
- ::rtl::OUString aPostfix;
+ OUString aPostfix;
if( nWhichId == EE_CHAR_FONTHEIGHT_CJK )
- aPostfix = C2U( "Asian" );
+ aPostfix = "Asian";
else if( nWhichId == EE_CHAR_FONTHEIGHT_CTL )
- aPostfix = C2U( "Complex" );
+ aPostfix = "Complex";
const SvxFontHeightItem & rItem =
static_cast< const SvxFontHeightItem & >(
@@ -516,7 +516,7 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
if( rItem.QueryValue( aValue, MID_FONTHEIGHT ) )
{
bool bSetValue = false;
- if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharHeight" ) + aPostfix ))
+ if( aValue != GetPropertySet()->getPropertyValue( "CharHeight" + aPostfix ))
bSetValue = true;
else
{
@@ -542,7 +542,7 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
uno::makeAny( *m_pRefSize ));
}
- GetPropertySet()->setPropertyValue( C2U( "CharHeight" ) + aPostfix, aValue );
+ GetPropertySet()->setPropertyValue( "CharHeight" + aPostfix, aValue );
bChanged = true;
}
}
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 325e15a3eab8..148743e16177 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -100,7 +100,7 @@ bool lcl_NumberFormatFromItemToPropertySet( sal_uInt16 nWhichId, const SfxItemSe
bool bChanged = false;
if( !xPropertySet.is() )
return bChanged;
- rtl::OUString aPropertyName = (SID_ATTR_NUMBERFORMAT_VALUE==nWhichId) ? C2U( "NumberFormat" ) : C2U( "PercentageNumberFormat" );
+ OUString aPropertyName = (SID_ATTR_NUMBERFORMAT_VALUE==nWhichId) ? OUString( "NumberFormat" ) : OUString( "PercentageNumberFormat" );
sal_uInt16 nSourceWhich = (SID_ATTR_NUMBERFORMAT_VALUE==nWhichId) ? SID_ATTR_NUMBERFORMAT_SOURCE : SCHATTR_PERCENT_NUMBERFORMAT_SOURCE;
if( SFX_ITEM_SET != rItemSet.GetItemState( nSourceWhich ) )
@@ -147,7 +147,7 @@ bool lcl_UseSourceFormatFromItemToPropertySet( sal_uInt16 nWhichId, const SfxIte
bool bChanged = false;
if( !xPropertySet.is() )
return bChanged;
- rtl::OUString aPropertyName = (SID_ATTR_NUMBERFORMAT_SOURCE==nWhichId) ? C2U( "NumberFormat" ) : C2U( "PercentageNumberFormat" );
+ OUString aPropertyName = (SID_ATTR_NUMBERFORMAT_SOURCE==nWhichId) ? OUString( "NumberFormat" ) : OUString( "PercentageNumberFormat" );
sal_uInt16 nFormatWhich = (SID_ATTR_NUMBERFORMAT_SOURCE==nWhichId) ? SID_ATTR_NUMBERFORMAT_VALUE : SCHATTR_PERCENT_NUMBERFORMAT_VALUE;
if( SFX_ITEM_SET != rItemSet.GetItemState( nWhichId ) )
@@ -227,8 +227,7 @@ DataPointItemConverter::DataPointItemConverter(
{
m_aConverters.push_back( new GraphicPropertyItemConverter(
rPropertySet, rItemPool, rDrawModel, xNamedPropertyContainerFactory, eMapTo ));
- m_aConverters.push_back( new CharacterPropertyItemConverter( rPropertySet, rItemPool, pRefSize,
- C2U( "ReferencePageSize" )));
+ m_aConverters.push_back( new CharacterPropertyItemConverter( rPropertySet, rItemPool, pRefSize, "ReferencePageSize"));
if( bDataSeries )
{
m_aConverters.push_back( new StatisticsItemConverter( xChartModel, rPropertySet, rItemPool ));
@@ -315,7 +314,7 @@ bool DataPointItemConverter::ApplySpecialItem(
{
const SfxBoolItem & rItem = static_cast< const SfxBoolItem & >( rItemSet.Get( nWhichId ));
- uno::Any aOldValue( GetPropertySet()->getPropertyValue( C2U( "Label" ) ));
+ uno::Any aOldValue( GetPropertySet()->getPropertyValue( "Label" ));
chart2::DataPointLabel aLabel;
if( aOldValue >>= aLabel )
{
@@ -328,15 +327,15 @@ bool DataPointItemConverter::ApplySpecialItem(
{
Reference< chart2::XDataSeries > xSeries( GetPropertySet(), uno::UNO_QUERY);
if( bOldValue != rValue ||
- DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, C2U( "Label" ), aOldValue ) )
+ DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, "Label" , aOldValue ) )
{
- DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "Label" ), uno::makeAny( aLabel ) );
+ DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "Label" , uno::makeAny( aLabel ) );
bChanged = true;
}
}
else if( bOldValue != rValue )
{
- GetPropertySet()->setPropertyValue( C2U( "Label" ), uno::makeAny( aLabel ));
+ GetPropertySet()->setPropertyValue( "Label" , uno::makeAny( aLabel ));
bChanged = true;
}
}
@@ -359,24 +358,24 @@ bool DataPointItemConverter::ApplySpecialItem(
case SCHATTR_DATADESCR_SEPARATOR:
{
- rtl::OUString aNewValue = static_cast< const SfxStringItem & >( rItemSet.Get( nWhichId )).GetValue();
- rtl::OUString aOldValue;
+ OUString aNewValue = static_cast< const SfxStringItem & >( rItemSet.Get( nWhichId )).GetValue();
+ OUString aOldValue;
try
{
- GetPropertySet()->getPropertyValue( C2U( "LabelSeparator" ) ) >>= aOldValue;
+ GetPropertySet()->getPropertyValue( "LabelSeparator" ) >>= aOldValue;
if( m_bOverwriteLabelsForAttributedDataPointsAlso )
{
Reference< chart2::XDataSeries > xSeries( GetPropertySet(), uno::UNO_QUERY);
if( !aOldValue.equals(aNewValue) ||
- DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, C2U( "LabelSeparator" ), uno::makeAny( aOldValue ) ) )
+ DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, "LabelSeparator" , uno::makeAny( aOldValue ) ) )
{
- DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "LabelSeparator" ), uno::makeAny( aNewValue ) );
+ DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "LabelSeparator" , uno::makeAny( aNewValue ) );
bChanged = true;
}
}
else if( !aOldValue.equals(aNewValue) )
{
- GetPropertySet()->setPropertyValue( C2U( "LabelSeparator" ), uno::makeAny( aNewValue ));
+ GetPropertySet()->setPropertyValue( "LabelSeparator" , uno::makeAny( aNewValue ));
bChanged = true;
}
}
@@ -394,7 +393,7 @@ bool DataPointItemConverter::ApplySpecialItem(
{
sal_Int32 nNew = static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue();
sal_Int32 nOld =0;
- if( !(GetPropertySet()->getPropertyValue( C2U( "LabelPlacement" ) ) >>= nOld) )
+ if( !(GetPropertySet()->getPropertyValue( "LabelPlacement" ) >>= nOld) )
{
if( m_aAvailableLabelPlacements.getLength() )
nOld = m_aAvailableLabelPlacements[0];
@@ -403,15 +402,15 @@ bool DataPointItemConverter::ApplySpecialItem(
{
Reference< chart2::XDataSeries > xSeries( GetPropertySet(), uno::UNO_QUERY);
if( nOld!=nNew ||
- DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, C2U( "LabelPlacement" ), uno::makeAny( nOld ) ) )
+ DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, "LabelPlacement" , uno::makeAny( nOld ) ) )
{
- DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "LabelPlacement" ), uno::makeAny( nNew ) );
+ DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "LabelPlacement" , uno::makeAny( nNew ) );
bChanged = true;
}
}
else if( nOld!=nNew )
{
- GetPropertySet()->setPropertyValue( C2U( "LabelPlacement" ), uno::makeAny( nNew ));
+ GetPropertySet()->setPropertyValue( "LabelPlacement" , uno::makeAny( nNew ));
bChanged = true;
}
}
@@ -429,7 +428,7 @@ bool DataPointItemConverter::ApplySpecialItem(
rItemSet.Get( nWhichId )).GetValue();
chart2::Symbol aSymbol;
- GetPropertySet()->getPropertyValue( C2U( "Symbol" )) >>= aSymbol;
+ GetPropertySet()->getPropertyValue( "Symbol" ) >>= aSymbol;
sal_Int32 nOldStyle = lcl_getSymbolStyleForSymbol( aSymbol );
if( nStyle != nOldStyle )
@@ -456,10 +455,9 @@ bool DataPointItemConverter::ApplySpecialItem(
}
if( bDeleteSymbol )
- GetPropertySet()->setPropertyValue( C2U( "Symbol" ), uno::Any());
+ GetPropertySet()->setPropertyValue( "Symbol" , uno::Any());
else
- GetPropertySet()->setPropertyValue( C2U( "Symbol" ),
- uno::makeAny( aSymbol ));
+ GetPropertySet()->setPropertyValue( "Symbol" , uno::makeAny( aSymbol ));
bChanged = true;
}
}
@@ -471,14 +469,14 @@ bool DataPointItemConverter::ApplySpecialItem(
rItemSet.Get( nWhichId )).GetSize();
chart2::Symbol aSymbol;
- GetPropertySet()->getPropertyValue( C2U( "Symbol" )) >>= aSymbol;
+ GetPropertySet()->getPropertyValue( "Symbol" ) >>= aSymbol;
if( aSize.getWidth() != aSymbol.Size.Width ||
aSize.getHeight() != aSymbol.Size.Height )
{
aSymbol.Size.Width = aSize.getWidth();
aSymbol.Size.Height = aSize.getHeight();
- GetPropertySet()->setPropertyValue( C2U( "Symbol" ), uno::makeAny( aSymbol ));
+ GetPropertySet()->setPropertyValue( "Symbol" , uno::makeAny( aSymbol ));
bChanged = true;
}
}
@@ -497,11 +495,11 @@ bool DataPointItemConverter::ApplySpecialItem(
{
aXGraphicAny <<= xGraphic;
chart2::Symbol aSymbol;
- GetPropertySet()->getPropertyValue( C2U( "Symbol" )) >>= aSymbol;
+ GetPropertySet()->getPropertyValue( "Symbol" ) >>= aSymbol;
if( aSymbol.Graphic != xGraphic )
{
aSymbol.Graphic = xGraphic;
- GetPropertySet()->setPropertyValue( C2U( "Symbol" ), uno::makeAny( aSymbol ));
+ GetPropertySet()->setPropertyValue( "Symbol" , uno::makeAny( aSymbol ));
bChanged = true;
}
}
@@ -516,12 +514,12 @@ bool DataPointItemConverter::ApplySpecialItem(
rItemSet.Get( nWhichId )).GetValue()) / 100.0;
double fOldValue = 0.0;
bool bPropExisted =
- ( GetPropertySet()->getPropertyValue( C2U( "TextRotation" )) >>= fOldValue );
+ ( GetPropertySet()->getPropertyValue( "TextRotation" ) >>= fOldValue );
if( ! bPropExisted ||
( bPropExisted && fOldValue != fValue ))
{
- GetPropertySet()->setPropertyValue( C2U( "TextRotation" ), uno::makeAny( fValue ));
+ GetPropertySet()->setPropertyValue( "TextRotation" , uno::makeAny( fValue ));
bChanged = true;
}
}
@@ -543,7 +541,7 @@ void DataPointItemConverter::FillSpecialItem(
case SCHATTR_DATADESCR_SHOW_SYMBOL:
{
chart2::DataPointLabel aLabel;
- if( GetPropertySet()->getPropertyValue( C2U( "Label" )) >>= aLabel )
+ if( GetPropertySet()->getPropertyValue( "Label" ) >>= aLabel )
{
sal_Bool bValue = (SCHATTR_DATADESCR_SHOW_NUMBER==nWhichId) ? aLabel.ShowNumber : (
(SCHATTR_DATADESCR_SHOW_PERCENTAGE==nWhichId) ? aLabel.ShowNumberInPercent : (
@@ -554,7 +552,7 @@ void DataPointItemConverter::FillSpecialItem(
if( m_bOverwriteLabelsForAttributedDataPointsAlso )
{
if( DataSeriesHelper::hasAttributedDataPointDifferentValue(
- Reference< chart2::XDataSeries >( GetPropertySet(), uno::UNO_QUERY), C2U( "Label" ), uno::makeAny(aLabel) ) )
+ Reference< chart2::XDataSeries >( GetPropertySet(), uno::UNO_QUERY), "Label" , uno::makeAny(aLabel) ) )
{
rOutItemSet.InvalidateItem(nWhichId);
}
@@ -566,7 +564,7 @@ void DataPointItemConverter::FillSpecialItem(
case SID_ATTR_NUMBERFORMAT_VALUE:
{
sal_Int32 nKey = 0;
- if( !(GetPropertySet()->getPropertyValue( C2U( "NumberFormat" )) >>= nKey) )
+ if( !(GetPropertySet()->getPropertyValue( "NumberFormat" ) >>= nKey) )
nKey = m_nNumberFormat;
rOutItemSet.Put( SfxUInt32Item( nWhichId, nKey ));
}
@@ -575,7 +573,7 @@ void DataPointItemConverter::FillSpecialItem(
case SCHATTR_PERCENT_NUMBERFORMAT_VALUE:
{
sal_Int32 nKey = 0;
- if( !(GetPropertySet()->getPropertyValue( C2U( "PercentageNumberFormat" )) >>= nKey) )
+ if( !(GetPropertySet()->getPropertyValue( "PercentageNumberFormat" ) >>= nKey) )
nKey = m_nPercentNumberFormat;
rOutItemSet.Put( SfxUInt32Item( nWhichId, nKey ));
}
@@ -583,23 +581,23 @@ void DataPointItemConverter::FillSpecialItem(
case SID_ATTR_NUMBERFORMAT_SOURCE:
{
- bool bNumberFormatIsSet = ( GetPropertySet()->getPropertyValue( C2U( "NumberFormat" )).hasValue());
+ bool bNumberFormatIsSet = ( GetPropertySet()->getPropertyValue( "NumberFormat" ).hasValue());
rOutItemSet.Put( SfxBoolItem( nWhichId, ! bNumberFormatIsSet ));
}
break;
case SCHATTR_PERCENT_NUMBERFORMAT_SOURCE:
{
- bool bNumberFormatIsSet = ( GetPropertySet()->getPropertyValue( C2U( "PercentageNumberFormat" )).hasValue());
+ bool bNumberFormatIsSet = ( GetPropertySet()->getPropertyValue( "PercentageNumberFormat" ).hasValue());
rOutItemSet.Put( SfxBoolItem( nWhichId, ! bNumberFormatIsSet ));
}
break;
case SCHATTR_DATADESCR_SEPARATOR:
{
- rtl::OUString aValue;
+ OUString aValue;
try
{
- GetPropertySet()->getPropertyValue( C2U( "LabelSeparator" ) ) >>= aValue;
+ GetPropertySet()->getPropertyValue( "LabelSeparator" ) >>= aValue;
rOutItemSet.Put( SfxStringItem( nWhichId, aValue ));
}
catch( const uno::Exception& e )
@@ -614,7 +612,7 @@ void DataPointItemConverter::FillSpecialItem(
try
{
sal_Int32 nPlacement=0;
- if( GetPropertySet()->getPropertyValue( C2U( "LabelPlacement" ) ) >>= nPlacement )
+ if( GetPropertySet()->getPropertyValue( "LabelPlacement" ) >>= nPlacement )
rOutItemSet.Put( SfxInt32Item( nWhichId, nPlacement ));
else if( m_aAvailableLabelPlacements.getLength() )
rOutItemSet.Put( SfxInt32Item( nWhichId, m_aAvailableLabelPlacements[0] ));
@@ -641,7 +639,7 @@ void DataPointItemConverter::FillSpecialItem(
case SCHATTR_STYLE_SYMBOL:
{
chart2::Symbol aSymbol;
- if( GetPropertySet()->getPropertyValue( C2U( "Symbol" )) >>= aSymbol )
+ if( GetPropertySet()->getPropertyValue( "Symbol" ) >>= aSymbol )
rOutItemSet.Put( SfxInt32Item( nWhichId, lcl_getSymbolStyleForSymbol( aSymbol ) ));
}
break;
@@ -649,7 +647,7 @@ void DataPointItemConverter::FillSpecialItem(
case SCHATTR_SYMBOL_SIZE:
{
chart2::Symbol aSymbol;
- if( GetPropertySet()->getPropertyValue( C2U( "Symbol" )) >>= aSymbol )
+ if( GetPropertySet()->getPropertyValue( "Symbol" ) >>= aSymbol )
rOutItemSet.Put(
SvxSizeItem( nWhichId, Size( aSymbol.Size.Width, aSymbol.Size.Height ) ));
}
@@ -658,7 +656,7 @@ void DataPointItemConverter::FillSpecialItem(
case SCHATTR_SYMBOL_BRUSH:
{
chart2::Symbol aSymbol;
- if(( GetPropertySet()->getPropertyValue( C2U( "Symbol" )) >>= aSymbol )
+ if(( GetPropertySet()->getPropertyValue( "Symbol" ) >>= aSymbol )
&& aSymbol.Graphic.is() )
{
rOutItemSet.Put( SvxBrushItem( Graphic( aSymbol.Graphic ), GPOS_MM, SCHATTR_SYMBOL_BRUSH ));
@@ -670,7 +668,7 @@ void DataPointItemConverter::FillSpecialItem(
{
double fValue = 0;
- if( GetPropertySet()->getPropertyValue( C2U( "TextRotation" )) >>= fValue )
+ if( GetPropertySet()->getPropertyValue( "TextRotation" ) >>= fValue )
{
rOutItemSet.Put( SfxInt32Item( nWhichId, static_cast< sal_Int32 >(
::rtl::math::round( fValue * 100.0 ) ) ));
diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
index bba573378a3d..1848f25f7bbd 100644
--- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
@@ -56,8 +56,8 @@ void lcl_getErrorValues( const uno::Reference< beans::XPropertySet > & xErrorBar
try
{
- xErrorBarProp->getPropertyValue( C2U( "PositiveError" )) >>= rOutPosError;
- xErrorBarProp->getPropertyValue( C2U( "NegativeError" )) >>= rOutNegError;
+ xErrorBarProp->getPropertyValue( "PositiveError" ) >>= rOutPosError;
+ xErrorBarProp->getPropertyValue( "NegativeError" ) >>= rOutNegError;
}
catch( const uno::Exception & ex )
{
@@ -74,8 +74,8 @@ void lcl_getErrorIndicatorValues(
try
{
- xErrorBarProp->getPropertyValue( C2U( "ShowPositiveError" )) >>= rOutShowPosError;
- xErrorBarProp->getPropertyValue( C2U( "ShowNegativeError" )) >>= rOutShowNegError;
+ xErrorBarProp->getPropertyValue( "ShowPositiveError" ) >>= rOutShowPosError;
+ xErrorBarProp->getPropertyValue( "ShowNegativeError" ) >>= rOutShowNegError;
}
catch( const uno::Exception & ex )
{
@@ -184,8 +184,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
nStyle = ::com::sun::star::chart::ErrorBarStyle::FROM_DATA; break;
}
- xErrorBarProp->setPropertyValue( C2U( "ErrorBarStyle" ),
- uno::makeAny( nStyle ));
+ xErrorBarProp->setPropertyValue( "ErrorBarStyle" , uno::makeAny( nStyle ));
bChanged = true;
}
}
@@ -194,7 +193,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
case SCHATTR_STAT_PERCENT:
case SCHATTR_STAT_BIGERROR:
{
- OSL_FAIL( "Deprectaed item" );
+ OSL_FAIL( "Deprecated item" );
uno::Reference< beans::XPropertySet > xErrorBarProp( GetPropertySet());
double fValue =
@@ -206,10 +205,8 @@ bool ErrorBarItemConverter::ApplySpecialItem(
if( ! ( ::rtl::math::approxEqual( fPos, fValue ) &&
::rtl::math::approxEqual( fNeg, fValue )))
{
- xErrorBarProp->setPropertyValue( C2U( "PositiveError" ),
- uno::makeAny( fValue ));
- xErrorBarProp->setPropertyValue( C2U( "NegativeError" ),
- uno::makeAny( fValue ));
+ xErrorBarProp->setPropertyValue( "PositiveError" , uno::makeAny( fValue ));
+ xErrorBarProp->setPropertyValue( "NegativeError" , uno::makeAny( fValue ));
bChanged = true;
}
}
@@ -225,7 +222,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
if( ! ::rtl::math::approxEqual( fPos, fValue ))
{
- GetPropertySet()->setPropertyValue( C2U( "PositiveError" ), uno::makeAny( fValue ));
+ GetPropertySet()->setPropertyValue( "PositiveError" , uno::makeAny( fValue ));
bChanged = true;
}
}
@@ -243,7 +240,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
if( ! ::rtl::math::approxEqual( fNeg, fValue ))
{
- xErrorBarProp->setPropertyValue( C2U( "NegativeError" ), uno::makeAny( fValue ));
+ xErrorBarProp->setPropertyValue( "NegativeError" , uno::makeAny( fValue ));
bChanged = true;
}
}
@@ -266,8 +263,8 @@ bool ErrorBarItemConverter::ApplySpecialItem(
if( ( bShowPos != bNewIndPos ||
bShowNeg != bNewIndNeg ))
{
- xErrorBarProp->setPropertyValue( C2U( "ShowPositiveError" ), uno::makeAny( bNewIndPos ));
- xErrorBarProp->setPropertyValue( C2U( "ShowNegativeError" ), uno::makeAny( bNewIndNeg ));
+ xErrorBarProp->setPropertyValue( "ShowPositiveError" , uno::makeAny( bNewIndPos ));
+ xErrorBarProp->setPropertyValue( "ShowNegativeError" , uno::makeAny( bNewIndNeg ));
bChanged = true;
}
}
@@ -288,7 +285,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
xDataProvider.set( xChartDoc->getDataProvider());
if( xErrorBarSource.is() && xDataProvider.is())
{
- ::rtl::OUString aNewRange( static_cast< const SfxStringItem & >( rItemSet.Get( nWhichId )).GetValue());
+ OUString aNewRange( static_cast< const SfxStringItem & >( rItemSet.Get( nWhichId )).GetValue());
bool bApplyNewRange = false;
bool bIsPositiveValue( nWhichId == SCHATTR_STAT_RANGE_POS );
@@ -307,7 +304,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
if( xIntDataProvider.is())
{
xIntDataProvider->appendSequence();
- aNewRange = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("last"));
+ aNewRange = "last";
bApplyNewRange = true;
}
}
@@ -319,7 +316,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
StatisticsHelper::getErrorDataSequenceFromDataSource(
xErrorBarSource, bIsPositiveValue, bYError ));
bApplyNewRange =
- ! ( xSeq.is() && aNewRange.equals( xSeq->getSourceRangeRepresentation()));
+ ! ( xSeq.is() && (aNewRange == xSeq->getSourceRangeRepresentation()));
}
if( bApplyNewRange )
@@ -345,7 +342,7 @@ void ErrorBarItemConverter::FillSpecialItem(
uno::Reference< beans::XPropertySet > xErrorBarProp( GetPropertySet());
sal_Int32 nStyle = 0;
- if( xErrorBarProp->getPropertyValue( C2U( "ErrorBarStyle" )) >>= nStyle )
+ if( xErrorBarProp->getPropertyValue( "ErrorBarStyle" ) >>= nStyle )
{
switch( nStyle )
{
diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index 99c42341066c..e87f6d482898 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -128,13 +128,13 @@ bool lcl_supportsLineProperties( ::chart::wrapper::GraphicPropertyItemConverter:
bool lcl_SetContentForNamedProperty(
const uno::Reference< lang::XMultiServiceFactory > & xFactory,
- const ::rtl::OUString & rTableName,
+ const OUString & rTableName,
NameOrIndex & rItem, sal_uInt8 nMemberId )
{
bool bResult = false;
if( xFactory.is())
{
- ::rtl::OUString aPropertyValue( rItem.GetName());
+ OUString aPropertyValue( rItem.GetName());
uno::Reference< container::XNameAccess > xNameAcc(
xFactory->createInstance( rTableName ),
uno::UNO_QUERY );
@@ -250,7 +250,7 @@ void GraphicPropertyItemConverter::FillSpecialItem(
case XATTR_FILLBMP_STRETCH:
{
drawing::BitmapMode aMode = drawing::BitmapMode_REPEAT;
- if( GetPropertySet()->getPropertyValue( C2U("FillBitmapMode")) >>= aMode )
+ if( GetPropertySet()->getPropertyValue( "FillBitmapMode" ) >>= aMode )
{
rOutItemSet.Put( XFillBmpTileItem( aMode == drawing::BitmapMode_REPEAT ));
rOutItemSet.Put( XFillBmpStretchItem( aMode == drawing::BitmapMode_STRETCH ));
@@ -263,10 +263,10 @@ void GraphicPropertyItemConverter::FillSpecialItem(
{
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "TransparencyGradientName" )
- : C2U( "FillTransparenceGradientName" );
+ ? OUString( "TransparencyGradientName" )
+ : OUString( "FillTransparenceGradientName" );
uno::Any aValue( GetPropertySet()->getPropertyValue( aPropName ));
if( aValue.hasValue())
@@ -275,11 +275,11 @@ void GraphicPropertyItemConverter::FillSpecialItem(
aItem.PutValue( aValue, MID_NAME );
lcl_SetContentForNamedProperty(
- m_xNamedPropertyTableFactory, C2U("com.sun.star.drawing.TransparencyGradientTable"),
+ m_xNamedPropertyTableFactory, "com.sun.star.drawing.TransparencyGradientTable" ,
aItem, MID_FILLGRADIENT );
// this is important to enable the item
- ::rtl::OUString aName;
+ OUString aName;
if( (aValue >>= aName) &&
!aName.isEmpty())
{
@@ -298,10 +298,10 @@ void GraphicPropertyItemConverter::FillSpecialItem(
case XATTR_GRADIENTSTEPCOUNT:
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "GradientStepCount" )
- : C2U( "FillGradientStepCount" );
+ ? OUString( "GradientStepCount" )
+ : OUString( "FillGradientStepCount" );
uno::Any aValue( GetPropertySet()->getPropertyValue( aPropName ) );
if( hasLongOrShortValue(aValue) )
@@ -315,16 +315,16 @@ void GraphicPropertyItemConverter::FillSpecialItem(
case XATTR_LINEDASH:
if( lcl_supportsLineProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "BorderDashName" )
- : C2U( "LineDashName" );
+ ? OUString( "BorderDashName" )
+ : OUString( "LineDashName" );
XLineDashItem aItem;
aItem.PutValue( GetPropertySet()->getPropertyValue( aPropName ), MID_NAME );
lcl_SetContentForNamedProperty(
- m_xNamedPropertyTableFactory, C2U("com.sun.star.drawing.DashTable"),
+ m_xNamedPropertyTableFactory, "com.sun.star.drawing.DashTable" ,
aItem, MID_LINEDASH );
// translate model name to UI-name for predefined entries, so
@@ -339,16 +339,16 @@ void GraphicPropertyItemConverter::FillSpecialItem(
case XATTR_FILLGRADIENT:
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "GradientName" )
- : C2U( "FillGradientName" );
+ ? OUString( "GradientName" )
+ : OUString( "FillGradientName" );
XFillGradientItem aItem;
aItem.PutValue( GetPropertySet()->getPropertyValue( aPropName ), MID_NAME );
lcl_SetContentForNamedProperty(
- m_xNamedPropertyTableFactory, C2U("com.sun.star.drawing.GradientTable"),
+ m_xNamedPropertyTableFactory, "com.sun.star.drawing.GradientTable" ,
aItem, MID_FILLGRADIENT );
// translate model name to UI-name for predefined entries, so
@@ -363,16 +363,16 @@ void GraphicPropertyItemConverter::FillSpecialItem(
case XATTR_FILLHATCH:
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "HatchName" )
- : C2U( "FillHatchName" );
+ ? OUString( "HatchName" )
+ : OUString( "FillHatchName" );
XFillHatchItem aItem;
aItem.PutValue( GetPropertySet()->getPropertyValue( aPropName ), MID_NAME );
lcl_SetContentForNamedProperty(
- m_xNamedPropertyTableFactory, C2U("com.sun.star.drawing.HatchTable"),
+ m_xNamedPropertyTableFactory, "com.sun.star.drawing.HatchTable" ,
aItem, MID_FILLHATCH );
// translate model name to UI-name for predefined entries, so
@@ -388,10 +388,10 @@ void GraphicPropertyItemConverter::FillSpecialItem(
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
XFillBitmapItem aItem;
- aItem.PutValue( GetPropertySet()->getPropertyValue( C2U( "FillBitmapName" ) ), MID_NAME );
+ aItem.PutValue( GetPropertySet()->getPropertyValue( "FillBitmapName" ), MID_NAME );
lcl_SetContentForNamedProperty(
- m_xNamedPropertyTableFactory, C2U("com.sun.star.drawing.BitmapTable"),
+ m_xNamedPropertyTableFactory, "com.sun.star.drawing.BitmapTable" ,
aItem, MID_GRAFURL );
// translate model name to UI-name for predefined entries, so
@@ -408,12 +408,12 @@ void GraphicPropertyItemConverter::FillSpecialItem(
case XATTR_LINETRANSPARENCE:
if( lcl_supportsLineProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "BorderTransparency" )
+ ? OUString( "BorderTransparency" )
: (m_eGraphicObjectType == LINE_DATA_POINT)
- ? C2U( "Transparency" )
- : C2U( "LineTransparence" );
+ ? OUString( "Transparency" )
+ : OUString( "LineTransparence" );
XLineTransparenceItem aItem;
aItem.PutValue( GetPropertySet()->getPropertyValue( aPropName ) );
@@ -427,10 +427,10 @@ void GraphicPropertyItemConverter::FillSpecialItem(
case XATTR_FILLTRANSPARENCE:
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "Transparency" )
- : C2U( "FillTransparence" );
+ ? OUString( "Transparency" )
+ : OUString( "FillTransparence" );
XFillTransparenceItem aItem;
aItem.PutValue( GetPropertySet()->getPropertyValue( aPropName ) );
@@ -454,7 +454,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
case XATTR_FILLBMP_STRETCH:
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
- const ::rtl::OUString aModePropName = C2U("FillBitmapMode");
+ const OUString aModePropName("FillBitmapMode");
bool bStretched = static_cast< const XFillBmpStretchItem & >(
rItemSet.Get( XATTR_FILLBMP_STRETCH )).GetValue();
drawing::BitmapMode aMode =
@@ -472,7 +472,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
case XATTR_FILLBMP_TILE:
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
- const ::rtl::OUString aModePropName = C2U("FillBitmapMode");
+ const OUString aModePropName("FillBitmapMode");
bool bTiled = static_cast< const XFillBmpTileItem & >(
rItemSet.Get( XATTR_FILLBMP_TILE )).GetValue();
drawing::BitmapMode aMode =
@@ -492,10 +492,10 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
{
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "TransparencyGradientName" )
- : C2U( "FillTransparenceGradientName" );
+ ? OUString( "TransparencyGradientName" )
+ : OUString( "FillTransparenceGradientName" );
const XFillFloatTransparenceItem & rItem =
static_cast< const XFillFloatTransparenceItem & >(
@@ -508,7 +508,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
rItem.QueryValue( aGradient, MID_FILLGRADIENT );
// add TransparencyGradient to list if it does not already exist
- ::rtl::OUString aPreferredName;
+ OUString aPreferredName;
aValue >>= aPreferredName;
aValue <<= PropertyHelper::addTransparencyGradientUniqueNameToTable(
aGradient, m_xNamedPropertyTableFactory, aPreferredName );
@@ -521,7 +521,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
}
else
{
- ::rtl::OUString aName;
+ OUString aName;
if( ( GetPropertySet()->getPropertyValue( aPropName ) >>= aName )
&& !aName.isEmpty() )
{
@@ -543,10 +543,10 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
{
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "GradientStepCount" )
- : C2U( "FillGradientStepCount" );
+ ? OUString( "GradientStepCount" )
+ : OUString( "FillGradientStepCount" );
sal_Int16 nStepCount = ( static_cast< const XGradientStepCountItem & >(
rItemSet.Get( nWhichId ))).GetValue();
@@ -566,10 +566,10 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
if( lcl_supportsLineProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "BorderDashName" )
- : C2U( "LineDashName" );
+ ? OUString( "BorderDashName" )
+ : OUString( "LineDashName" );
const XLineDashItem & rItem =
static_cast< const XLineDashItem & >(
@@ -582,7 +582,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
// add LineDash to list
uno::Any aLineDash;
rItem.QueryValue( aLineDash, MID_LINEDASH );
- ::rtl::OUString aPreferredName;
+ OUString aPreferredName;
aValue >>= aPreferredName;
aValue <<= PropertyHelper::addLineDashUniqueNameToTable(
aLineDash, m_xNamedPropertyTableFactory, aPreferredName );
@@ -599,10 +599,10 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
{
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "GradientName" )
- : C2U( "FillGradientName" );
+ ? OUString( "GradientName" )
+ : OUString( "FillGradientName" );
const XFillGradientItem & rItem =
static_cast< const XFillGradientItem & >(
@@ -615,7 +615,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
// add Gradient to list
uno::Any aGradient;
rItem.QueryValue( aGradient, MID_FILLGRADIENT );
- ::rtl::OUString aPreferredName;
+ OUString aPreferredName;
aValue >>= aPreferredName;
aValue <<= PropertyHelper::addGradientUniqueNameToTable(
aGradient, m_xNamedPropertyTableFactory, aPreferredName );
@@ -632,10 +632,10 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
{
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "HatchName" )
- : C2U( "FillHatchName" );
+ ? OUString( "HatchName" )
+ : OUString( "FillHatchName" );
const XFillHatchItem & rItem =
static_cast< const XFillHatchItem & >(
@@ -648,7 +648,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
// add Hatch to list
uno::Any aHatch;
rItem.QueryValue( aHatch, MID_FILLHATCH );
- ::rtl::OUString aPreferredName;
+ OUString aPreferredName;
aValue >>= aPreferredName;
aValue <<= PropertyHelper::addHatchUniqueNameToTable(
aHatch, m_xNamedPropertyTableFactory, aPreferredName );
@@ -671,17 +671,17 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
if( rItem.QueryValue( aValue, MID_NAME ))
{
- if( aValue != GetPropertySet()->getPropertyValue( C2U( "FillBitmapName" )))
+ if( aValue != GetPropertySet()->getPropertyValue( "FillBitmapName" ))
{
// add Bitmap to list
uno::Any aBitmap;
rItem.QueryValue( aBitmap, MID_GRAFURL );
- ::rtl::OUString aPreferredName;
+ OUString aPreferredName;
aValue >>= aPreferredName;
aValue <<= PropertyHelper::addBitmapUniqueNameToTable(
aBitmap, m_xNamedPropertyTableFactory, aPreferredName );
- GetPropertySet()->setPropertyValue( C2U( "FillBitmapName" ), aValue );
+ GetPropertySet()->setPropertyValue( "FillBitmapName" , aValue );
bChanged = true;
}
}
@@ -694,12 +694,12 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
case XATTR_LINETRANSPARENCE:
if( lcl_supportsLineProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "BorderTransparency" )
+ ? OUString( "BorderTransparency" )
: (m_eGraphicObjectType == LINE_DATA_POINT)
- ? C2U( "Transparency" )
- : C2U( "LineTransparence" );
+ ? OUString( "Transparency" )
+ : OUString( "LineTransparence" );
const XLineTransparenceItem & rItem =
static_cast< const XLineTransparenceItem & >(
@@ -733,10 +733,10 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
case XATTR_FILLTRANSPARENCE:
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "Transparency" )
- : C2U( "FillTransparence" );
+ ? OUString( "Transparency" )
+ : OUString( "FillTransparence" );
const XFillTransparenceItem & rItem =
static_cast< const XFillTransparenceItem & >(
@@ -756,12 +756,12 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
GetPropertySet()->setPropertyValue( aPropName, aValue );
// if linear or no transparence is set, delete the gradient
- ::rtl::OUString aTransGradPropName =
+ OUString aTransGradPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "TransparencyGradientName" )
- : C2U( "FillTransparenceGradientName" );
+ ? OUString( "TransparencyGradientName" )
+ : OUString( "FillTransparenceGradientName" );
GetPropertySet()->setPropertyValue(
- aTransGradPropName, uno::makeAny( ::rtl::OUString() ));
+ aTransGradPropName, uno::makeAny( OUString() ));
bChanged = true;
}
diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
index 14eb7e060ff8..03d947736c0d 100644
--- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
@@ -55,7 +55,7 @@ LegendItemConverter::LegendItemConverter(
GraphicPropertyItemConverter::LINE_AND_FILL_PROPERTIES ));
m_aConverters.push_back( new CharacterPropertyItemConverter(
rPropertySet, rItemPool, pRefSize,
- C2U( "ReferencePageSize" ) ));
+ "ReferencePageSize" ));
}
SAL_WNODEPRECATED_DECLARATIONS_POP
@@ -112,10 +112,10 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSe
{
sal_Bool bShow = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
sal_Bool bWasShown = sal_True;
- if( ! (GetPropertySet()->getPropertyValue( C2U("Show")) >>= bWasShown) ||
+ if( ! (GetPropertySet()->getPropertyValue( "Show" ) >>= bWasShown) ||
( bWasShown != bShow ))
{
- GetPropertySet()->setPropertyValue( C2U("Show"), uno::makeAny( bShow ));
+ GetPropertySet()->setPropertyValue( "Show" , uno::makeAny( bShow ));
bChanged = true;
}
}
@@ -147,12 +147,12 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSe
try
{
chart2::LegendPosition eOldPos;
- if( ! ( GetPropertySet()->getPropertyValue( C2U( "AnchorPosition" )) >>= eOldPos ) ||
+ if( ! ( GetPropertySet()->getPropertyValue( "AnchorPosition" ) >>= eOldPos ) ||
( eOldPos != eNewPos ))
{
- GetPropertySet()->setPropertyValue( C2U( "AnchorPosition" ), uno::makeAny( eNewPos ));
- GetPropertySet()->setPropertyValue( C2U( "Expansion" ), uno::makeAny( eExpansion ));
- GetPropertySet()->setPropertyValue( C2U( "RelativePosition" ), uno::Any());
+ GetPropertySet()->setPropertyValue( "AnchorPosition" , uno::makeAny( eNewPos ));
+ GetPropertySet()->setPropertyValue( "Expansion" , uno::makeAny( eExpansion ));
+ GetPropertySet()->setPropertyValue( "RelativePosition" , uno::Any());
bChanged = true;
}
}
@@ -177,14 +177,14 @@ void LegendItemConverter::FillSpecialItem(
case SCHATTR_LEGEND_SHOW:
{
sal_Bool bShow = sal_True;
- GetPropertySet()->getPropertyValue( C2U( "Show" )) >>= bShow;
+ GetPropertySet()->getPropertyValue( "Show" ) >>= bShow;
rOutItemSet.Put( SfxBoolItem(SCHATTR_LEGEND_SHOW, bShow) );
}
break;
case SCHATTR_LEGEND_POS:
{
chart2::LegendPosition eLegendPos( chart2::LegendPosition_LINE_END );
- GetPropertySet()->getPropertyValue( C2U( "AnchorPosition" )) >>= eLegendPos;
+ GetPropertySet()->getPropertyValue( "AnchorPosition" ) >>= eLegendPos;
rOutItemSet.Put( SfxInt32Item(SCHATTR_LEGEND_POS, eLegendPos ) );
}
break;
diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
index 970330c64b4e..fcf49d925ec2 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
@@ -169,10 +169,10 @@ bool RegressionCurveItemConverter::ApplySpecialItem(
OSL_ASSERT( xEqProp.is());
bool bOldShow = false;
if( xEqProp.is() &&
- (xEqProp->getPropertyValue( C2U( "ShowEquation" )) >>= bOldShow) &&
+ (xEqProp->getPropertyValue( "ShowEquation" ) >>= bOldShow) &&
bOldShow != bNewShow )
{
- xEqProp->setPropertyValue( C2U( "ShowEquation" ), uno::makeAny( bNewShow ));
+ xEqProp->setPropertyValue( "ShowEquation" , uno::makeAny( bNewShow ));
bChanged = true;
}
}
@@ -192,10 +192,10 @@ bool RegressionCurveItemConverter::ApplySpecialItem(
OSL_ASSERT( xEqProp.is());
bool bOldShow = false;
if( xEqProp.is() &&
- (xEqProp->getPropertyValue( C2U( "ShowCorrelationCoefficient" )) >>= bOldShow) &&
+ (xEqProp->getPropertyValue( "ShowCorrelationCoefficient" ) >>= bOldShow) &&
bOldShow != bNewShow )
{
- xEqProp->setPropertyValue( C2U( "ShowCorrelationCoefficient" ), uno::makeAny( bNewShow ));
+ xEqProp->setPropertyValue( "ShowCorrelationCoefficient" , uno::makeAny( bNewShow ));
bChanged = true;
}
}
@@ -235,7 +235,7 @@ void RegressionCurveItemConverter::FillSpecialItem(
OSL_ASSERT( xEqProp.is());
bool bShow = false;
if( xEqProp.is() &&
- (xEqProp->getPropertyValue( C2U( "ShowEquation" )) >>= bShow))
+ (xEqProp->getPropertyValue( "ShowEquation" ) >>= bShow))
{
rOutItemSet.Put( SfxBoolItem( nWhichId, bShow ));
}
@@ -252,7 +252,7 @@ void RegressionCurveItemConverter::FillSpecialItem(
OSL_ASSERT( xEqProp.is());
bool bShow = false;
if( xEqProp.is() &&
- (xEqProp->getPropertyValue( C2U( "ShowCorrelationCoefficient" )) >>= bShow))
+ (xEqProp->getPropertyValue( "ShowCorrelationCoefficient" ) >>= bShow))
{
rOutItemSet.Put( SfxBoolItem( nWhichId, bShow ));
}
diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
index 04b2e458c252..15fe0a816b50 100644
--- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
@@ -111,12 +111,12 @@ SeriesOptionsItemConverter::SeriesOptionsItemConverter(
uno::Reference< beans::XPropertySet > xChartTypeProps( xChartType, uno::UNO_QUERY );
if( xChartTypeProps.is() )
{
- if( xChartTypeProps->getPropertyValue( C2U( "OverlapSequence" ) ) >>= m_aBarPositionSequence )
+ if( xChartTypeProps->getPropertyValue( "OverlapSequence" ) >>= m_aBarPositionSequence )
{
if( nAxisIndex >= 0 && nAxisIndex < m_aBarPositionSequence.getLength() )
m_nBarOverlap = m_aBarPositionSequence[nAxisIndex];
}
- if( xChartTypeProps->getPropertyValue( C2U( "GapwidthSequence" ) ) >>= m_aBarPositionSequence )
+ if( xChartTypeProps->getPropertyValue( "GapwidthSequence" ) >>= m_aBarPositionSequence )
{
if( nAxisIndex >= 0 && nAxisIndex < m_aBarPositionSequence.getLength() )
m_nGapWidth = m_aBarPositionSequence[nAxisIndex];
@@ -127,20 +127,20 @@ SeriesOptionsItemConverter::SeriesOptionsItemConverter(
m_bSupportingBarConnectors = ChartTypeHelper::isSupportingBarConnectors( xChartType, nDimensionCount );
if( m_bSupportingBarConnectors && xDiagramProperties.is() )
{
- xDiagramProperties->getPropertyValue( C2U("ConnectBars")) >>= m_bConnectBars;
+ xDiagramProperties->getPropertyValue( "ConnectBars" ) >>= m_bConnectBars;
}
m_bSupportingAxisSideBySide = ChartTypeHelper::isSupportingAxisSideBySide( xChartType, nDimensionCount );
if( m_bSupportingAxisSideBySide && xDiagramProperties.is() )
{
- xDiagramProperties->getPropertyValue( C2U("GroupBarsPerAxis")) >>= m_bGroupBarsPerAxis;
+ xDiagramProperties->getPropertyValue( "GroupBarsPerAxis" ) >>= m_bGroupBarsPerAxis;
m_bAllSeriesAttachedToSameAxis = DataSeriesHelper::areAllSeriesAttachedToSameAxis( xChartType, m_nAllSeriesAxisIndex );
}
m_bSupportingStartingAngle = ChartTypeHelper::isSupportingStartingAngle( xChartType );
if( m_bSupportingStartingAngle )
{
- xDiagramProperties->getPropertyValue( C2U( "StartingAngle" ) ) >>= m_nStartingAngle;
+ xDiagramProperties->getPropertyValue( "StartingAngle" ) >>= m_nStartingAngle;
}
m_aSupportedMissingValueTreatments = ChartTypeHelper::getSupportedMissingValueTreatments( xChartType );
@@ -154,10 +154,10 @@ SeriesOptionsItemConverter::SeriesOptionsItemConverter(
try
{
//test whether the data provider offers this property
- xProp->getPropertyValue(C2U("IncludeHiddenCells"));
+ xProp->getPropertyValue( "IncludeHiddenCells" );
//if not exception is thrown the property is offered
m_bSupportingPlottingOfHiddenCells = true;
- xDiagramProperties->getPropertyValue( C2U("IncludeHiddenCells") ) >>= m_bIncludeHiddenCells;
+ xDiagramProperties->getPropertyValue( "IncludeHiddenCells" ) >>= m_bIncludeHiddenCells;
}
catch( const beans::UnknownPropertyException& )
{
@@ -216,9 +216,9 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf
sal_Int32& rBarPosition = ( SCHATTR_BAR_OVERLAP == nWhichId ) ? m_nBarOverlap : m_nGapWidth;
rBarPosition = static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue();
- rtl::OUString aPropName( C2U( "GapwidthSequence" ) );
+ OUString aPropName("GapwidthSequence" );
if( SCHATTR_BAR_OVERLAP == nWhichId )
- aPropName = C2U( "OverlapSequence" );
+ aPropName = "OverlapSequence";
uno::Reference< XDataSeries > xDataSeries( GetPropertySet(), uno::UNO_QUERY );
uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram(m_xChartModel) );
@@ -259,10 +259,10 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf
{
uno::Reference< beans::XPropertySet > xDiagramProperties( ChartModelHelper::findDiagram(m_xChartModel), uno::UNO_QUERY );
if( xDiagramProperties.is() &&
- (xDiagramProperties->getPropertyValue( C2U("ConnectBars")) >>= bOldConnectBars) &&
+ (xDiagramProperties->getPropertyValue( "ConnectBars" ) >>= bOldConnectBars) &&
bOldConnectBars != m_bConnectBars )
{
- xDiagramProperties->setPropertyValue( C2U("ConnectBars"), uno::makeAny(m_bConnectBars) );
+ xDiagramProperties->setPropertyValue( "ConnectBars" , uno::makeAny(m_bConnectBars) );
bChanged = true;
}
}
@@ -278,10 +278,10 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf
{
uno::Reference< beans::XPropertySet > xDiagramProperties( ChartModelHelper::findDiagram(m_xChartModel), uno::UNO_QUERY );
if( xDiagramProperties.is() &&
- (xDiagramProperties->getPropertyValue( C2U("GroupBarsPerAxis")) >>= bOldGroupBarsPerAxis) &&
+ (xDiagramProperties->getPropertyValue( "GroupBarsPerAxis" ) >>= bOldGroupBarsPerAxis) &&
bOldGroupBarsPerAxis != m_bGroupBarsPerAxis )
{
- xDiagramProperties->setPropertyValue( C2U("GroupBarsPerAxis"), uno::makeAny(m_bGroupBarsPerAxis) );
+ xDiagramProperties->setPropertyValue( "GroupBarsPerAxis" , uno::makeAny(m_bGroupBarsPerAxis) );
bChanged = true;
}
}
@@ -296,7 +296,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf
uno::Reference< beans::XPropertySet > xDiagramProperties( ChartModelHelper::findDiagram(m_xChartModel), uno::UNO_QUERY );
if( xDiagramProperties.is() )
{
- xDiagramProperties->setPropertyValue( C2U("StartingAngle"), uno::makeAny(m_nStartingAngle) );
+ xDiagramProperties->setPropertyValue( "StartingAngle" , uno::makeAny(m_nStartingAngle) );
bChanged = true;
}
}
@@ -333,7 +333,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf
uno::Reference< beans::XPropertySet > xDiagramProperties( ChartModelHelper::findDiagram(m_xChartModel), uno::UNO_QUERY );
if( xDiagramProperties.is() )
{
- xDiagramProperties->setPropertyValue( C2U( "MissingValueTreatment" ), uno::makeAny( nNew ));
+ xDiagramProperties->setPropertyValue( "MissingValueTreatment" , uno::makeAny( nNew ));
bChanged = true;
}
}
diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index 0acc974f3e38..6cddc4e5cf10 100644
--- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -57,7 +57,7 @@ uno::Reference< beans::XPropertySet > lcl_GetErrorBar(
if( xProp.is())
try
{
- ( xProp->getPropertyValue( bYError ? C2U( "ErrorBarY" ) : C2U("ErrorBarX") ) >>= xResult );
+ ( xProp->getPropertyValue( bYError ? OUString( "ErrorBarY" ) : OUString("ErrorBarX") ) >>= xResult );
}
catch( const uno::Exception & ex )
{
@@ -106,8 +106,8 @@ void lcl_getErrorValues( const uno::Reference< beans::XPropertySet > & xErrorBar
try
{
- xErrorBarProp->getPropertyValue( C2U( "PositiveError" )) >>= rOutPosError;
- xErrorBarProp->getPropertyValue( C2U( "NegativeError" )) >>= rOutNegError;
+ xErrorBarProp->getPropertyValue( "PositiveError" ) >>= rOutPosError;
+ xErrorBarProp->getPropertyValue( "NegativeError" ) >>= rOutNegError;
}
catch( const uno::Exception & ex )
{
@@ -124,8 +124,8 @@ void lcl_getErrorIndicatorValues(
try
{
- xErrorBarProp->getPropertyValue( C2U( "ShowPositiveError" )) >>= rOutShowPosError;
- xErrorBarProp->getPropertyValue( C2U( "ShowNegativeError" )) >>= rOutShowNegError;
+ xErrorBarProp->getPropertyValue( "ShowPositiveError" ) >>= rOutShowPosError;
+ xErrorBarProp->getPropertyValue( "ShowNegativeError" ) >>= rOutShowNegError;
}
catch( const uno::Exception & ex )
{
@@ -282,12 +282,11 @@ bool StatisticsItemConverter::ApplySpecialItem(
if( !xErrorBarProp.is() )
{
xErrorBarProp = lcl_GetDefaultErrorBar();
- GetPropertySet()->setPropertyValue( bYError ? C2U( "ErrorBarY" ) : C2U("ErrorBarX"),
+ GetPropertySet()->setPropertyValue( bYError ? OUString( "ErrorBarY" ) : OUString("ErrorBarX"),
uno::makeAny( xErrorBarProp ));
}
- xErrorBarProp->setPropertyValue( C2U( "ErrorBarStyle" ),
- uno::makeAny( nStyle ));
+ xErrorBarProp->setPropertyValue( "ErrorBarStyle" , uno::makeAny( nStyle ));
bChanged = true;
}
}
@@ -296,7 +295,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
case SCHATTR_STAT_PERCENT:
case SCHATTR_STAT_BIGERROR:
{
- OSL_FAIL( "Deprectaed item" );
+ OSL_FAIL( "Deprecated item" );
bool bYError =
static_cast<const SfxBoolItem&>(rItemSet.Get(SCHATTR_STAT_ERRORBAR_TYPE)).GetValue();
@@ -314,10 +313,8 @@ bool StatisticsItemConverter::ApplySpecialItem(
! ( ::rtl::math::approxEqual( fPos, fValue ) &&
::rtl::math::approxEqual( fNeg, fValue )))
{
- xErrorBarProp->setPropertyValue( C2U( "PositiveError" ),
- uno::makeAny( fValue ));
- xErrorBarProp->setPropertyValue( C2U( "NegativeError" ),
- uno::makeAny( fValue ));
+ xErrorBarProp->setPropertyValue( "PositiveError" , uno::makeAny( fValue ));
+ xErrorBarProp->setPropertyValue( "NegativeError" , uno::makeAny( fValue ));
bChanged = true;
}
}
@@ -341,7 +338,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
if( bOldHasErrorBar &&
! ::rtl::math::approxEqual( fPos, fValue ))
{
- xErrorBarProp->setPropertyValue( C2U( "PositiveError" ), uno::makeAny( fValue ));
+ xErrorBarProp->setPropertyValue( "PositiveError" , uno::makeAny( fValue ));
bChanged = true;
}
}
@@ -364,7 +361,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
if( bOldHasErrorBar &&
! ::rtl::math::approxEqual( fNeg, fValue ))
{
- xErrorBarProp->setPropertyValue( C2U( "NegativeError" ), uno::makeAny( fValue ));
+ xErrorBarProp->setPropertyValue( "NegativeError" , uno::makeAny( fValue ));
bChanged = true;
}
}
@@ -406,12 +403,12 @@ bool StatisticsItemConverter::ApplySpecialItem(
if( xEqProp.is())
{
bool bShowEq = false;
- xEqProp->getPropertyValue( C2U("ShowEquation")) >>= bShowEq;
+ xEqProp->getPropertyValue( "ShowEquation" ) >>= bShowEq;
bool bNewShowEq =
static_cast< const SfxBoolItem & >( rItemSet.Get( nWhichId )).GetValue();
if( bShowEq != bNewShowEq )
{
- xEqProp->setPropertyValue( C2U("ShowEquation"), uno::makeAny( bNewShowEq ));
+ xEqProp->setPropertyValue( "ShowEquation" , uno::makeAny( bNewShowEq ));
bChanged = true;
}
}
@@ -424,12 +421,12 @@ bool StatisticsItemConverter::ApplySpecialItem(
if( xEqProp.is())
{
bool bShowCoeff = false;
- xEqProp->getPropertyValue( C2U("ShowCorrelationCoefficient")) >>= bShowCoeff;
+ xEqProp->getPropertyValue( "ShowCorrelationCoefficient" ) >>= bShowCoeff;
bool bNewShowCoeff =
static_cast< const SfxBoolItem & >( rItemSet.Get( nWhichId )).GetValue();
if( bShowCoeff != bNewShowCoeff )
{
- xEqProp->setPropertyValue( C2U("ShowCorrelationCoefficient"), uno::makeAny( bNewShowCoeff ));
+ xEqProp->setPropertyValue( "ShowCorrelationCoefficient" , uno::makeAny( bNewShowCoeff ));
bChanged = true;
}
}
@@ -458,8 +455,8 @@ bool StatisticsItemConverter::ApplySpecialItem(
( bShowPos != bNewIndPos ||
bShowNeg != bNewIndNeg ))
{
- xErrorBarProp->setPropertyValue( C2U( "ShowPositiveError" ), uno::makeAny( bNewIndPos ));
- xErrorBarProp->setPropertyValue( C2U( "ShowNegativeError" ), uno::makeAny( bNewIndNeg ));
+ xErrorBarProp->setPropertyValue( "ShowPositiveError" , uno::makeAny( bNewIndPos ));
+ xErrorBarProp->setPropertyValue( "ShowNegativeError" , uno::makeAny( bNewIndNeg ));
bChanged = true;
}
}
@@ -479,7 +476,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
xDataProvider.set( xChartDoc->getDataProvider());
if( xErrorBarSource.is() && xDataProvider.is())
{
- ::rtl::OUString aNewRange( static_cast< const SfxStringItem & >( rItemSet.Get( nWhichId )).GetValue());
+ OUString aNewRange( static_cast< const SfxStringItem & >( rItemSet.Get( nWhichId )).GetValue());
bool bApplyNewRange = false;
bool bIsPositiveValue( nWhichId == SCHATTR_STAT_RANGE_POS );
@@ -498,7 +495,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
if( xIntDataProvider.is())
{
xIntDataProvider->appendSequence();
- aNewRange = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("last"));
+ aNewRange = "last";
bApplyNewRange = true;
}
}
@@ -510,7 +507,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
StatisticsHelper::getErrorDataSequenceFromDataSource(
xErrorBarSource, bIsPositiveValue, bYError ));
bApplyNewRange =
- ! ( xSeq.is() && aNewRange.equals( xSeq->getSourceRangeRepresentation()));
+ ! ( xSeq.is() && (aNewRange == xSeq->getSourceRangeRepresentation()));
}
if( bApplyNewRange )
@@ -548,7 +545,7 @@ void StatisticsItemConverter::FillSpecialItem(
if( xErrorBarProp.is() )
{
sal_Int32 nStyle = 0;
- if( xErrorBarProp->getPropertyValue( C2U( "ErrorBarStyle" )) >>= nStyle )
+ if( xErrorBarProp->getPropertyValue( "ErrorBarStyle" ) >>= nStyle )
{
switch( nStyle )
{
@@ -647,7 +644,7 @@ void StatisticsItemConverter::FillSpecialItem(
bool bShowEq = false;
uno::Reference< beans::XPropertySet > xEqProp( lcl_getEquationProperties( GetPropertySet(), 0 ));
if( xEqProp.is())
- xEqProp->getPropertyValue( C2U("ShowEquation")) >>= bShowEq;
+ xEqProp->getPropertyValue( "ShowEquation" ) >>= bShowEq;
rOutItemSet.Put( SfxBoolItem( nWhichId, bShowEq ));
}
break;
@@ -657,7 +654,7 @@ void StatisticsItemConverter::FillSpecialItem(
bool bShowCoeff = false;
uno::Reference< beans::XPropertySet > xEqProp( lcl_getEquationProperties( GetPropertySet(), 0 ));
if( xEqProp.is())
- xEqProp->getPropertyValue( C2U("ShowCorrelationCoefficient")) >>= bShowCoeff;
+ xEqProp->getPropertyValue( "ShowCorrelationCoefficient" ) >>= bShowCoeff;
rOutItemSet.Put( SfxBoolItem( nWhichId, bShowCoeff ));
}
break;
diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
index f4ec1ad601ae..981b8dc55c70 100644
--- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
@@ -90,7 +90,7 @@ FormattedStringsConverter::FormattedStringsConverter(
m_aConverters.push_back( new CharacterPropertyItemConverter(
xProp, rItemPool,
::std::auto_ptr< awt::Size >( new awt::Size( *pRefSize )),
- C2U( "ReferencePageSize" ),
+ "ReferencePageSize" ,
xParentProp ));
else
m_aConverters.push_back( new CharacterPropertyItemConverter( xProp, rItemPool ));
@@ -201,12 +201,12 @@ bool TitleItemConverter::ApplySpecialItem(
rItemSet.Get( nWhichId )).GetValue()) / 100.0;
double fOldVal = 0.0;
bool bPropExisted =
- ( GetPropertySet()->getPropertyValue( C2U( "TextRotation" )) >>= fOldVal );
+ ( GetPropertySet()->getPropertyValue( "TextRotation" ) >>= fOldVal );
if( ! bPropExisted ||
( bPropExisted && fOldVal != fVal ))
{
- GetPropertySet()->setPropertyValue( C2U( "TextRotation" ), uno::makeAny( fVal ));
+ GetPropertySet()->setPropertyValue( "TextRotation" , uno::makeAny( fVal ));
bChanged = true;
}
}
@@ -227,7 +227,7 @@ void TitleItemConverter::FillSpecialItem(
// convert double to int (times 100)
double fVal = 0;
- if( GetPropertySet()->getPropertyValue( C2U( "TextRotation" )) >>= fVal )
+ if( GetPropertySet()->getPropertyValue( "TextRotation" ) >>= fVal )
{
rOutItemSet.Put( SfxInt32Item( nWhichId, static_cast< sal_Int32 >(
::rtl::math::round( fVal * 100.0 ) ) ));
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index e1cd60acc4bb..6eb90ae805ec 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -249,8 +249,8 @@ void ChartController::TheModel::tryTermination()
catch(const uno::Exception& ex)
{
(void)(ex); // no warning in non-debug builds
- OSL_FAIL( ( rtl::OString("Termination of model failed: ")
- + rtl::OUStringToOString( ex.Message, RTL_TEXTENCODING_ASCII_US ) ).getStr() );
+ OSL_FAIL( ( OString("Termination of model failed: ")
+ + OUStringToOString( ex.Message, RTL_TEXTENCODING_ASCII_US ) ).getStr() );
}
}
@@ -332,12 +332,12 @@ sal_Bool ChartController::TheModelRef::is() const
APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME)
- uno::Sequence< rtl::OUString > ChartController
+ uno::Sequence< OUString > ChartController
::getSupportedServiceNames_Static()
{
- uno::Sequence< rtl::OUString > aSNS( 2 );
+ uno::Sequence< OUString > aSNS( 2 );
aSNS.getArray()[ 0 ] = CHART_CONTROLLER_SERVICE_NAME;
- aSNS.getArray()[ 1 ] = ::rtl::OUString( "com.sun.star.frame.Controller" );
+ aSNS.getArray()[ 1 ] = "com.sun.star.frame.Controller";
//// @todo : add additional services if you support any further
return aSNS;
}
@@ -417,23 +417,23 @@ APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTAT
try
{
uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager;
- xPropSet->getPropertyValue( C2U( "LayoutManager" ) ) >>= xLayoutManager;
+ xPropSet->getPropertyValue( "LayoutManager" ) >>= xLayoutManager;
if ( xLayoutManager.is() )
{
xLayoutManager->lock();
- xLayoutManager->requestElement( C2U( "private:resource/menubar/menubar" ) );
+ xLayoutManager->requestElement( "private:resource/menubar/menubar" );
//@todo: createElement should become unnecessary, remove when #i79198# is fixed
- xLayoutManager->createElement( C2U( "private:resource/toolbar/standardbar" ) );
- xLayoutManager->requestElement( C2U( "private:resource/toolbar/standardbar" ) );
+ xLayoutManager->createElement( "private:resource/toolbar/standardbar" );
+ xLayoutManager->requestElement( "private:resource/toolbar/standardbar" );
//@todo: createElement should become unnecessary, remove when #i79198# is fixed
- xLayoutManager->createElement( C2U( "private:resource/toolbar/toolbar" ) );
- xLayoutManager->requestElement( C2U( "private:resource/toolbar/toolbar" ) );
+ xLayoutManager->createElement( "private:resource/toolbar/toolbar" );
+ xLayoutManager->requestElement( "private:resource/toolbar/toolbar" );
// #i12587# support for shapes in chart
- xLayoutManager->createElement( C2U( "private:resource/toolbar/drawbar" ) );
- xLayoutManager->requestElement( C2U( "private:resource/toolbar/drawbar" ) );
+ xLayoutManager->createElement( "private:resource/toolbar/drawbar" );
+ xLayoutManager->requestElement( "private:resource/toolbar/drawbar" );
- xLayoutManager->requestElement( C2U( "private:resource/statusbar/statusbar" ) );
+ xLayoutManager->requestElement( "private:resource/statusbar/statusbar" );
xLayoutManager->unlock();
// add as listener to get notified when
@@ -456,14 +456,14 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
{
//adjust controller to view status changes
- if( rEvent.NewMode.equals(C2U("dirty")) )
+ if( rEvent.NewMode == "dirty" )
{
//the view has become dirty, we should repaint it if we have a window
SolarMutexGuard aGuard;
if( m_pChartWindow )
m_pChartWindow->ForceInvalidate();
}
- else if( rEvent.NewMode.equals(C2U("invalid")) )
+ else if( rEvent.NewMode == "invalid" )
{
//the view is about to become invalid so end all actions on it
impl_invalidateAccessible();
@@ -582,7 +582,7 @@ sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XMo
#endif
//select chart area per default:
- select( uno::makeAny( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, rtl::OUString() ) ) );
+ select( uno::makeAny( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) ) );
uno::Reference< lang::XMultiServiceFactory > xFact( getModel(), uno::UNO_QUERY );
if( xFact.is())
@@ -953,8 +953,8 @@ void SAL_CALL ChartController::layoutEvent( const lang::EventObject& aSource, ::
Reference< frame::XLayoutManager > xLM( aSource.Source, uno::UNO_QUERY );
if( xLM.is())
{
- xLM->createElement( C2U("private:resource/statusbar/statusbar"));
- xLM->requestElement( C2U("private:resource/statusbar/statusbar"));
+ xLM->createElement( "private:resource/statusbar/statusbar" );
+ xLM->requestElement( "private:resource/statusbar/statusbar" );
}
}
}
@@ -966,55 +966,55 @@ void SAL_CALL ChartController::layoutEvent( const lang::EventObject& aSource, ::
namespace
{
-bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
+bool lcl_isFormatObjectCommand( const OString& aCommand )
{
- if( aCommand.equals("MainTitle")
- || aCommand.equals("SubTitle")
- || aCommand.equals("XTitle")
- || aCommand.equals("YTitle")
- || aCommand.equals("ZTitle")
- || aCommand.equals("SecondaryXTitle")
- || aCommand.equals("SecondaryYTitle")
- || aCommand.equals("AllTitles")
- || aCommand.equals("DiagramAxisX")
- || aCommand.equals("DiagramAxisY")
- || aCommand.equals("DiagramAxisZ")
- || aCommand.equals("DiagramAxisA")
- || aCommand.equals("DiagramAxisB")
- || aCommand.equals("DiagramAxisAll")
- || aCommand.equals("DiagramGridXMain")
- || aCommand.equals("DiagramGridYMain")
- || aCommand.equals("DiagramGridZMain")
- || aCommand.equals("DiagramGridXHelp")
- || aCommand.equals("DiagramGridYHelp")
- || aCommand.equals("DiagramGridZHelp")
- || aCommand.equals("DiagramGridAll")
-
- || aCommand.equals("DiagramWall")
- || aCommand.equals("DiagramFloor")
- || aCommand.equals("DiagramArea")
- || aCommand.equals("Legend")
-
- || aCommand.equals("FormatWall")
- || aCommand.equals("FormatFloor")
- || aCommand.equals("FormatChartArea")
- || aCommand.equals("FormatLegend")
-
- || aCommand.equals("FormatTitle")
- || aCommand.equals("FormatAxis")
- || aCommand.equals("FormatDataSeries")
- || aCommand.equals("FormatDataPoint")
- || aCommand.equals("FormatDataLabels")
- || aCommand.equals("FormatDataLabel")
- || aCommand.equals("FormatXErrorBars")
- || aCommand.equals("FormatYErrorBars")
- || aCommand.equals("FormatMeanValue")
- || aCommand.equals("FormatTrendline")
- || aCommand.equals("FormatTrendlineEquation")
- || aCommand.equals("FormatStockLoss")
- || aCommand.equals("FormatStockGain")
- || aCommand.equals("FormatMajorGrid")
- || aCommand.equals("FormatMinorGrid")
+ if( aCommand == "MainTitle"
+ || aCommand == "SubTitle"
+ || aCommand == "XTitle"
+ || aCommand == "YTitle"
+ || aCommand == "ZTitle"
+ || aCommand == "SecondaryXTitle"
+ || aCommand == "SecondaryYTitle"
+ || aCommand == "AllTitles"
+ || aCommand == "DiagramAxisX"
+ || aCommand == "DiagramAxisY"
+ || aCommand == "DiagramAxisZ"
+ || aCommand == "DiagramAxisA"
+ || aCommand == "DiagramAxisB"
+ || aCommand == "DiagramAxisAll"
+ || aCommand == "DiagramGridXMain"
+ || aCommand == "DiagramGridYMain"
+ || aCommand == "DiagramGridZMain"
+ || aCommand == "DiagramGridXHelp"
+ || aCommand == "DiagramGridYHelp"
+ || aCommand == "DiagramGridZHelp"
+ || aCommand == "DiagramGridAll"
+
+ || aCommand == "DiagramWall"
+ || aCommand == "DiagramFloor"
+ || aCommand == "DiagramArea"
+ || aCommand == "Legend"
+
+ || aCommand == "FormatWall"
+ || aCommand == "FormatFloor"
+ || aCommand == "FormatChartArea"
+ || aCommand == "FormatLegend"
+
+ || aCommand == "FormatTitle"
+ || aCommand == "FormatAxis"
+ || aCommand == "FormatDataSeries"
+ || aCommand == "FormatDataPoint"
+ || aCommand == "FormatDataLabels"
+ || aCommand == "FormatDataLabel"
+ || aCommand == "FormatXErrorBars"
+ || aCommand == "FormatYErrorBars"
+ || aCommand == "FormatMeanValue"
+ || aCommand == "FormatTrendline"
+ || aCommand == "FormatTrendlineEquation"
+ || aCommand == "FormatStockLoss"
+ || aCommand == "FormatStockGain"
+ || aCommand == "FormatMajorGrid"
+ || aCommand == "FormatMinorGrid"
)
return true;
@@ -1025,7 +1025,7 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
uno::Reference<frame::XDispatch> SAL_CALL ChartController
::queryDispatch( const util::URL& rURL
- , const rtl::OUString& rTargetFrameName
+ , const OUString& rTargetFrameName
, sal_Int32 /* nSearchFlags */)
throw(uno::RuntimeException)
{
@@ -1059,109 +1059,109 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
throw (uno::RuntimeException)
{
//@todo avoid OString
- rtl::OString aCommand( rtl::OUStringToOString( rURL.Path, RTL_TEXTENCODING_ASCII_US ) );
+ OString aCommand( OUStringToOString( rURL.Path, RTL_TEXTENCODING_ASCII_US ) );
- if(aCommand.equals("Paste"))
+ if(aCommand == "Paste")
this->executeDispatch_Paste();
- else if(aCommand.equals("Copy"))
+ else if(aCommand == "Copy" )
this->executeDispatch_Copy();
- else if(aCommand.equals("Cut"))
+ else if(aCommand == "Cut" )
this->executeDispatch_Cut();
- else if(aCommand.equals("DataRanges"))
+ else if(aCommand == "DataRanges" )
this->executeDispatch_SourceData();
//----------------------------------
- else if(aCommand.equals("Update")) //Update Chart
+ else if(aCommand == "Update" ) //Update Chart
{
ChartViewHelper::setViewToDirtyState( getModel() );
SolarMutexGuard aGuard;
if( m_pChartWindow )
m_pChartWindow->Invalidate();
}
- else if(aCommand.equals("DiagramData"))
+ else if(aCommand == "DiagramData" )
this->executeDispatch_EditData();
//insert objects
- else if( aCommand.equals("InsertTitles")
- || aCommand.equals("InsertMenuTitles") )
+ else if( aCommand == "InsertTitles"
+ || aCommand == "InsertMenuTitles")
this->executeDispatch_InsertTitles();
- else if( aCommand.equals("InsertMenuLegend") )
+ else if( aCommand == "InsertMenuLegend" )
this->executeDispatch_OpenLegendDialog();
- else if( aCommand.equals("InsertLegend") )
+ else if( aCommand == "InsertLegend" )
this->executeDispatch_InsertLegend();
- else if( aCommand.equals("DeleteLegend") )
+ else if( aCommand == "DeleteLegend" )
this->executeDispatch_DeleteLegend();
- else if( aCommand.equals("InsertMenuDataLabels"))
+ else if( aCommand == "InsertMenuDataLabels" )
this->executeDispatch_InsertMenu_DataLabels();
- else if( aCommand.equals("InsertMenuAxes")
- || aCommand.equals("InsertRemoveAxes") )
+ else if( aCommand == "InsertMenuAxes"
+ || aCommand == "InsertRemoveAxes" )
this->executeDispatch_InsertAxes();
- else if( aCommand.equals("InsertMenuGrids"))
+ else if( aCommand == "InsertMenuGrids" )
this->executeDispatch_InsertGrid();
- else if( aCommand.equals("InsertMenuTrendlines"))
+ else if( aCommand == "InsertMenuTrendlines" )
this->executeDispatch_InsertMenu_Trendlines();
- else if( aCommand.equals("InsertMenuMeanValues"))
+ else if( aCommand == "InsertMenuMeanValues" )
this->executeDispatch_InsertMenu_MeanValues();
- else if( aCommand.equals("InsertMenuXErrorBars"))
+ else if( aCommand == "InsertMenuXErrorBars" )
this->executeDispatch_InsertErrorBars(false);
- else if( aCommand.equals("InsertMenuYErrorBars"))
+ else if( aCommand == "InsertMenuYErrorBars" )
this->executeDispatch_InsertErrorBars(true);
- else if( aCommand.equals("InsertSymbol"))
+ else if( aCommand == "InsertSymbol" )
this->executeDispatch_InsertSpecialCharacter();
- else if( aCommand.equals("InsertTrendline"))
+ else if( aCommand == "InsertTrendline" )
this->executeDispatch_InsertTrendline();
- else if( aCommand.equals("DeleteTrendline"))
+ else if( aCommand == "DeleteTrendline" )
this->executeDispatch_DeleteTrendline();
- else if( aCommand.equals("InsertMeanValue"))
+ else if( aCommand == "InsertMeanValue" )
this->executeDispatch_InsertMeanValue();
- else if( aCommand.equals("DeleteMeanValue"))
+ else if( aCommand == "DeleteMeanValue" )
this->executeDispatch_DeleteMeanValue();
- else if( aCommand.equals("InsertXErrorBars"))
+ else if( aCommand == "InsertXErrorBars" )
this->executeDispatch_InsertErrorBars(false);
- else if( aCommand.equals("InsertYErrorBars"))
+ else if( aCommand == "InsertYErrorBars" )
this->executeDispatch_InsertErrorBars(true);
- else if( aCommand.equals("DeleteXErrorBars"))
+ else if( aCommand == "DeleteXErrorBars" )
this->executeDispatch_DeleteErrorBars(false);
- else if( aCommand.equals("DeleteYErrorBars"))
+ else if( aCommand == "DeleteYErrorBars" )
this->executeDispatch_DeleteErrorBars(true);
- else if( aCommand.equals("InsertTrendlineEquation"))
+ else if( aCommand == "InsertTrendlineEquation" )
this->executeDispatch_InsertTrendlineEquation();
- else if( aCommand.equals("DeleteTrendlineEquation"))
+ else if( aCommand == "DeleteTrendlineEquation" )
this->executeDispatch_DeleteTrendlineEquation();
- else if( aCommand.equals("InsertTrendlineEquationAndR2"))
+ else if( aCommand == "InsertTrendlineEquationAndR2" )
this->executeDispatch_InsertTrendlineEquation( true );
- else if( aCommand.equals("InsertR2Value"))
+ else if( aCommand == "InsertR2Value" )
this->executeDispatch_InsertR2Value();
- else if( aCommand.equals("DeleteR2Value"))
+ else if( aCommand == "DeleteR2Value")
this->executeDispatch_DeleteR2Value();
- else if( aCommand.equals("InsertDataLabels") )
+ else if( aCommand == "InsertDataLabels" )
this->executeDispatch_InsertDataLabels();
- else if( aCommand.equals("InsertDataLabel") )
+ else if( aCommand == "InsertDataLabel" )
this->executeDispatch_InsertDataLabel();
- else if( aCommand.equals("DeleteDataLabels") )
+ else if( aCommand == "DeleteDataLabels")
this->executeDispatch_DeleteDataLabels();
- else if( aCommand.equals("DeleteDataLabel") )
+ else if( aCommand == "DeleteDataLabel" )
this->executeDispatch_DeleteDataLabel();
- else if( aCommand.equals("ResetAllDataPoints") )
+ else if( aCommand == "ResetAllDataPoints" )
this->executeDispatch_ResetAllDataPoints();
- else if( aCommand.equals("ResetDataPoint") )
+ else if( aCommand == "ResetDataPoint" )
this->executeDispatch_ResetDataPoint();
- else if( aCommand.equals("InsertAxis") )
+ else if( aCommand == "InsertAxis" )
this->executeDispatch_InsertAxis();
- else if( aCommand.equals("InsertMajorGrid") )
+ else if( aCommand == "InsertMajorGrid" )
this->executeDispatch_InsertMajorGrid();
- else if( aCommand.equals("InsertMinorGrid") )
+ else if( aCommand == "InsertMinorGrid" )
this->executeDispatch_InsertMinorGrid();
- else if( aCommand.equals("InsertAxisTitle") )
+ else if( aCommand == "InsertAxisTitle" )
this->executeDispatch_InsertAxisTitle();
- else if( aCommand.equals("DeleteAxis") )
+ else if( aCommand == "DeleteAxis" )
this->executeDispatch_DeleteAxis();
- else if( aCommand.equals("DeleteMajorGrid") )
+ else if( aCommand == "DeleteMajorGrid")
this->executeDispatch_DeleteMajorGrid();
- else if( aCommand.equals("DeleteMinorGrid") )
+ else if( aCommand == "DeleteMinorGrid" )
this->executeDispatch_DeleteMinorGrid();
//format objects
- else if( aCommand.equals("FormatSelection") )
+ else if( aCommand == "FormatSelection" )
this->executeDispatch_ObjectProperties();
- else if( aCommand.equals("TransformDialog"))
+ else if( aCommand == "TransformDialog" )
{
if ( isShapeContext() )
{
@@ -1175,11 +1175,11 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
else if( lcl_isFormatObjectCommand(aCommand) )
this->executeDispatch_FormatObject(rURL.Path);
//more format
- else if( aCommand.equals("DiagramType"))
+ else if( aCommand == "DiagramType" )
this->executeDispatch_ChartType();
- else if( aCommand.equals("View3D"))
+ else if( aCommand == "View3D" )
this->executeDispatch_View3D();
- else if ( aCommand.equals( "Forward" ) )
+ else if ( aCommand == "Forward" )
{
if ( isShapeContext() )
{
@@ -1190,7 +1190,7 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
this->executeDispatch_MoveSeries( sal_True );
}
}
- else if ( aCommand.equals( "Backward" ) )
+ else if ( aCommand == "Backward" )
{
if ( isShapeContext() )
{
@@ -1201,34 +1201,34 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
this->executeDispatch_MoveSeries( sal_False );
}
}
- else if( aCommand.equals("NewArrangement"))
+ else if( aCommand == "NewArrangement")
this->executeDispatch_NewArrangement();
- else if( aCommand.equals("ToggleLegend"))
+ else if( aCommand == "ToggleLegend" )
this->executeDispatch_ToggleLegend();
- else if( aCommand.equals("ToggleGridHorizontal"))
+ else if( aCommand == "ToggleGridHorizontal" )
this->executeDispatch_ToggleGridHorizontal();
- else if( aCommand.equals("ScaleText"))
+ else if( aCommand == "ScaleText" )
this->executeDispatch_ScaleText();
- else if( aCommand.equals("StatusBarVisible"))
+ else if( aCommand == "StatusBarVisible" )
{
// workaround: this should not be necessary.
uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY );
if( xPropSet.is() )
{
uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager;
- xPropSet->getPropertyValue( C2U( "LayoutManager" ) ) >>= xLayoutManager;
+ xPropSet->getPropertyValue( "LayoutManager" ) >>= xLayoutManager;
if ( xLayoutManager.is() )
{
- bool bIsVisible( xLayoutManager->isElementVisible( C2U("private:resource/statusbar/statusbar")));
+ bool bIsVisible( xLayoutManager->isElementVisible( "private:resource/statusbar/statusbar" ));
if( bIsVisible )
{
- xLayoutManager->hideElement( C2U( "private:resource/statusbar/statusbar"));
- xLayoutManager->destroyElement( C2U( "private:resource/statusbar/statusbar"));
+ xLayoutManager->hideElement( "private:resource/statusbar/statusbar" );
+ xLayoutManager->destroyElement( "private:resource/statusbar/statusbar" );
}
else
{
- xLayoutManager->createElement( C2U( "private:resource/statusbar/statusbar"));
- xLayoutManager->showElement( C2U( "private:resource/statusbar/statusbar"));
+ xLayoutManager->createElement( "private:resource/statusbar/statusbar" );
+ xLayoutManager->showElement( "private:resource/statusbar/statusbar" );
}
// @todo: update menu state (checkmark next to "Statusbar").
}
@@ -1323,7 +1323,7 @@ void SAL_CALL ChartController::executeDispatch_MoveSeries( sal_Bool bForward )
ControllerLockGuard aCLGuard( getModel() );
//get selected series
- ::rtl::OUString aObjectCID(m_aSelection.getSelectedCID());
+ OUString aObjectCID(m_aSelection.getSelectedCID());
uno::Reference< XDataSeries > xGivenDataSeries( ObjectIdentifier::getDataSeriesForCID( //yyy todo also legendentries and labels?
aObjectCID, getModel() ) );
@@ -1343,19 +1343,19 @@ void SAL_CALL ChartController::executeDispatch_MoveSeries( sal_Bool bForward )
// ____ XMultiServiceFactory ____
uno::Reference< uno::XInterface > SAL_CALL
- ChartController::createInstance( const ::rtl::OUString& aServiceSpecifier )
+ ChartController::createInstance( const OUString& aServiceSpecifier )
throw (uno::Exception,
uno::RuntimeException)
{
uno::Reference< uno::XInterface > xResult;
- if( aServiceSpecifier.equals( CHART_ACCESSIBLE_TEXT_SERVICE_NAME ))
+ if( aServiceSpecifier == CHART_ACCESSIBLE_TEXT_SERVICE_NAME )
xResult.set( impl_createAccessibleTextContext());
return xResult;
}
uno::Reference< uno::XInterface > SAL_CALL
- ChartController::createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier,
+ ChartController::createInstanceWithArguments( const OUString& ServiceSpecifier,
const uno::Sequence< uno::Any >& /* Arguments */ )
throw (uno::Exception,
uno::RuntimeException)
@@ -1364,11 +1364,11 @@ uno::Reference< uno::XInterface > SAL_CALL
return createInstance( ServiceSpecifier );
}
-uno::Sequence< ::rtl::OUString > SAL_CALL
+uno::Sequence< OUString > SAL_CALL
ChartController::getAvailableServiceNames()
throw (uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aServiceNames(1);
+ uno::Sequence< OUString > aServiceNames(1);
aServiceNames[0] = CHART_ACCESSIBLE_TEXT_SERVICE_NAME;
return aServiceNames;
}
@@ -1388,7 +1388,7 @@ IMPL_LINK( ChartController, NotifyUndoActionHdl, SdrUndoAction*, pUndoAction )
{
ENSURE_OR_RETURN( pUndoAction, "invalid Undo action", 1L );
- ::rtl::OUString aObjectCID = m_aSelection.getSelectedCID();
+ OUString aObjectCID = m_aSelection.getSelectedCID();
if ( aObjectCID.isEmpty() )
{
try
@@ -1483,9 +1483,9 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn
}
}
-::std::set< ::rtl::OUString > ChartController::impl_getAvailableCommands()
+::std::set< OUString > ChartController::impl_getAvailableCommands()
{
- return ::comphelper::MakeSet< ::rtl::OUString >
+ return ::comphelper::MakeSet< OUString >
// commands for container forward
( "AddDirect" ) ( "NewDoc" ) ( "Open" )
( "Save" ) ( "SaveAs" ) ( "SendMail" )
diff --git a/chart2/source/controller/main/ChartRenderer.cxx b/chart2/source/controller/main/ChartRenderer.cxx
index 74869c26353b..93d66e9c3121 100644
--- a/chart2/source/controller/main/ChartRenderer.cxx
+++ b/chart2/source/controller/main/ChartRenderer.cxx
@@ -140,7 +140,7 @@ bool ChartRenderer::DoPaint(OutputDevice* pOutDev, const Rectangle& rLogicObject
::sal_Int64 SAL_CALL ChartRenderer::getSomething( const Sequence< ::sal_Int8 >& aIdentifier )
throw( uno::RuntimeException)
{
- if( aIdentifier.getLength() == 16 && 0 == rtl_compareMemory(
+ if( aIdentifier.getLength() == 16 && 0 == memcmp(
ChartPrettyPainter::getUnoTunnelId().getConstArray(),
aIdentifier.getConstArray(), 16 ) )
{
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 56f34076cca4..5f72dde8dcf5 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -45,7 +45,7 @@
#include <com/sun/star/embed/XTransactedObject.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <com/sun/star/xml/sax/XParser.hpp>
+#include <com/sun/star/xml/sax/Parser.hpp>
#include <com/sun/star/xml/sax/SAXParseException.hpp>
#include <com/sun/star/packages/zip/ZipIOException.hpp>
#include <com/sun/star/document/XGraphicObjectResolver.hpp>
@@ -332,9 +332,7 @@ sal_Int32 XMLFilter::impl_Import(
return ERRCODE_SFX_GENERAL;
// create a sax parser
- Reference< xml::sax::XParser > xSaxParser(
- xFactory->createInstanceWithContext( C2U( "com.sun.star.xml.sax.Parser" ), m_xContext ),
- uno::UNO_QUERY_THROW );
+ Reference< xml::sax::XParser > xSaxParser = xml::sax::Parser::create(m_xContext);
bool bOasis = true;
isOasisFormat( rMediaDescriptor, bOasis );
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index ff09525040b5..053bf079df4a 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -1286,7 +1286,7 @@ Reference< util::XNumberFormatsSupplier > ChartModel::impl_getNumberFormatsSuppl
::sal_Int64 SAL_CALL ChartModel::getSomething( const Sequence< ::sal_Int8 >& aIdentifier )
throw( uno::RuntimeException)
{
- if( aIdentifier.getLength() == 16 && 0 == rtl_compareMemory( SvNumberFormatsSupplierObj::getUnoTunnelId().getConstArray(),
+ if( aIdentifier.getLength() == 16 && 0 == memcmp( SvNumberFormatsSupplierObj::getUnoTunnelId().getConstArray(),
aIdentifier.getConstArray(), 16 ) )
{
Reference< lang::XUnoTunnel > xTunnel( impl_getNumberFormatsSupplier(), uno::UNO_QUERY );
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index 049d0e9d08e1..86ec8f2ac6b9 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -430,11 +430,9 @@ void AxisLabelProperties::init( const uno::Reference< XAxis >& xAxisModel )
}
}
-sal_Bool AxisLabelProperties::getIsStaggered() const
+bool AxisLabelProperties::getIsStaggered() const
{
- if( STAGGER_ODD == eStaggering || STAGGER_EVEN == eStaggering )
- return sal_True;
- return sal_False;
+ return ( STAGGER_ODD == eStaggering || STAGGER_EVEN == eStaggering );
}
//.............................................................................
diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx
index 573173cbf859..eda2862bb2ee 100644
--- a/chart2/source/view/axes/VAxisProperties.hxx
+++ b/chart2/source/view/axes/VAxisProperties.hxx
@@ -70,10 +70,10 @@ struct AxisLabelProperties
AxisLabelStaggering eStaggering;
- sal_Bool bLineBreakAllowed;
- sal_Bool bOverlapAllowed;
+ bool bLineBreakAllowed;
+ bool bOverlapAllowed;
- sal_Bool bStackCharacters;
+ bool bStackCharacters;
double fRotationAngleDegree;
sal_Int32 nRhythm; //show only each nth label with n==nRhythm
@@ -83,7 +83,7 @@ struct AxisLabelProperties
void init( const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XAxis >& xAxisModel );
- sal_Bool getIsStaggered() const;
+ bool getIsStaggered() const;
};
struct AxisProperties
@@ -109,7 +109,7 @@ struct AxisProperties
//this direction is used to indicate in which direction inner tickmarks are to be drawn
double m_fInnerDirectionSign;
LabelAlignment m_aLabelAlignment;
- sal_Bool m_bDisplayLabels;
+ bool m_bDisplayLabels;
sal_Int32 m_nNumberFormatKey;
diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx
index 7129d4450837..8cb7fcb2d7aa 100644
--- a/chart2/source/view/charttypes/Splines.cxx
+++ b/chart2/source/view/charttypes/Splines.cxx
@@ -24,6 +24,8 @@
#include <algorithm>
#include <functional>
+#define MAX_BSPLINE_DEGREE 15
+
//.............................................................................
namespace chart
{
@@ -691,7 +693,9 @@ void SplineCalculater::CalculateBSplines(
// ODF1.2 spec variable p
OSL_ASSERT( nResolution > 1 );
OSL_ASSERT( nDegree >= 1 );
- sal_uInt32 p = nDegree;
+
+ // limit the b-spline degree to prevent insanely large sets of points
+ sal_uInt32 p = std::min<sal_uInt32>(nDegree, MAX_BSPLINE_DEGREE);
rResult.SequenceX.realloc(0);
rResult.SequenceY.realloc(0);
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 763994e1a131..ab2ea1ca1d97 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -359,7 +359,7 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFla
::sal_Int64 SAL_CALL ChartView::getSomething( const uno::Sequence< ::sal_Int8 >& aIdentifier )
throw( uno::RuntimeException)
{
- if( aIdentifier.getLength() == 16 && 0 == rtl_compareMemory( ExplicitValueProvider::getUnoTunnelId().getConstArray(),
+ if( aIdentifier.getLength() == 16 && 0 == memcmp( ExplicitValueProvider::getUnoTunnelId().getConstArray(),
aIdentifier.getConstArray(), 16 ) )
{
ExplicitValueProvider* pProvider = this;