diff options
| author | Jean-Noël Rouvignac <jn.rouvignac@gmail.com> | 2013-01-30 11:44:23 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-01-30 12:54:40 +0000 |
| commit | 97eb8a6e0eb830f37dcba64a51d725aab4c5ff53 (patch) | |
| tree | a1a95b8249052d846a997ad1729758168d6a3b24 /chart2/source/controller/main/ObjectHierarchy.cxx | |
| parent | f8569cd9a28a3a8856dba4ad53218aa6cc073521 (diff) | |
Removed several useless macros: A2OU, A2S, C2U, C2S, OUSTR, OUSTRING
Change-Id: Ie859cb2dfdc7103c379fce56be88eef8fe390afd
Reviewed-on: https://gerrit.libreoffice.org/1924
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'chart2/source/controller/main/ObjectHierarchy.cxx')
| -rw-r--r-- | chart2/source/controller/main/ObjectHierarchy.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index 3a38de79c430..6ed11f9f64fd 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -85,8 +85,8 @@ void lcl_getChildOIDs( Reference< beans::XPropertySetInfo > xInfo( xShapeProp->getPropertySetInfo()); OUString aName; if( xInfo.is() && - xInfo->hasPropertyByName( C2U("Name")) && - (xShapeProp->getPropertyValue( C2U("Name")) >>= aName ) && + xInfo->hasPropertyByName( "Name") && + (xShapeProp->getPropertyValue( "Name") >>= aName ) && !aName.isEmpty() && ::chart::ObjectIdentifier::isCID( aName )) { @@ -444,7 +444,7 @@ void ImplObjectHierarchy::createDataSeriesTree( if( DataSeriesHelper::hasDataLabelsAtSeries( xSeries ) ) { rtl::OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) ); - aChildParticle+=(C2U("=")); + aChildParticle+=("="); aSeriesSubContainer.push_back( ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifierForParticles( aSeriesParticle, aChildParticle ) ) ); } @@ -470,11 +470,11 @@ void ImplObjectHierarchy::createDataSeriesTree( Reference< beans::XPropertySet > xSeriesProp( xSeries, uno::UNO_QUERY ); Reference< beans::XPropertySet > xErrorBarProp; if( xSeriesProp.is() && - (xSeriesProp->getPropertyValue( C2U("ErrorBarY")) >>= xErrorBarProp) && + (xSeriesProp->getPropertyValue( "ErrorBarY") >>= xErrorBarProp) && xErrorBarProp.is()) { sal_Int32 nStyle = ::com::sun::star::chart::ErrorBarStyle::NONE; - if( ( xErrorBarProp->getPropertyValue( C2U("ErrorBarStyle")) >>= nStyle ) && + if( ( xErrorBarProp->getPropertyValue( "ErrorBarStyle") >>= nStyle ) && ( nStyle != ::com::sun::star::chart::ErrorBarStyle::NONE ) ) { aSeriesSubContainer.push_back( @@ -484,11 +484,11 @@ void ImplObjectHierarchy::createDataSeriesTree( } if( xSeriesProp.is() && - (xSeriesProp->getPropertyValue( C2U("ErrorBarX")) >>= xErrorBarProp) && + (xSeriesProp->getPropertyValue( "ErrorBarX") >>= xErrorBarProp) && xErrorBarProp.is()) { sal_Int32 nStyle = ::com::sun::star::chart::ErrorBarStyle::NONE; - if( ( xErrorBarProp->getPropertyValue( C2U("ErrorBarStyle")) >>= nStyle ) && + if( ( xErrorBarProp->getPropertyValue( "ErrorBarStyle") >>= nStyle ) && ( nStyle != ::com::sun::star::chart::ErrorBarStyle::NONE ) ) { aSeriesSubContainer.push_back( @@ -636,7 +636,7 @@ ObjectHierarchy::~ObjectHierarchy() ObjectHierarchy::tOID ObjectHierarchy::getRootNodeOID() { - return ObjectIdentifier( C2U( "ROOT" ) ); + return ObjectIdentifier( "ROOT" ); } bool ObjectHierarchy::isRootNode( const ObjectHierarchy::tOID& rOID ) |