From b93b23fe10917881e185750d294fc42fe2c92424 Mon Sep 17 00:00:00 2001 From: Ádám Csaba Király Date: Thu, 28 Feb 2013 19:28:03 +0100 Subject: Replace rtl::O(U)String with O(U)String Other changes include: in bridges/test/testcomp.cxx duplicate 'using namespace ::test' removed, 'using namespace ::rtl' replaced with 'using ::rtl::OUString' and 'using ::rtl::OUStringToOString' Change-Id: I67a5952afd305adeb07f728c9074620ecba8e9fc Reviewed-on: https://gerrit.libreoffice.org/2475 Reviewed-by: Andras Timar Tested-by: Andras Timar --- .../chartapiwrapper/ChartDocumentWrapper.cxx | 36 +++++++-------- .../controller/chartapiwrapper/DiagramWrapper.cxx | 30 ++++++------- .../controller/chartapiwrapper/LegendWrapper.cxx | 11 ++--- .../controller/chartapiwrapper/TitleWrapper.cxx | 8 ++-- .../chartapiwrapper/UpDownBarWrapper.cxx | 52 +++++++++++----------- .../chartapiwrapper/WrappedGapwidthProperty.cxx | 6 +-- .../WrappedSeriesAreaOrLineProperty.cxx | 10 ++--- .../chartapiwrapper/WrappedSplineProperties.cxx | 2 +- .../chartapiwrapper/WrappedStatisticProperties.cxx | 14 +++--- .../chartapiwrapper/WrappedStockProperties.cxx | 16 +++---- .../controller/dialogs/RangeSelectionListener.cxx | 2 +- .../controller/dialogs/dlg_ChartType_UNO.cxx | 8 ++-- chart2/source/controller/dialogs/tp_DataSource.cxx | 8 ++-- .../controller/main/ChartController_Insert.cxx | 4 +- .../controller/main/ChartController_Properties.cxx | 48 ++++++++++---------- 15 files changed, 128 insertions(+), 127 deletions(-) (limited to 'chart2') diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 556f95af0282..af34ef0dc924 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -102,8 +102,8 @@ enum eServiceType SERVICE_NAME_IMPORT_GRAPHIC_RESOLVER }; -typedef ::std::map< ::rtl::OUString, enum eServiceType > tServiceNameMap; -typedef ::comphelper::MakeMap< ::rtl::OUString, enum eServiceType > tMakeServiceNameMap; +typedef ::std::map< OUString, enum eServiceType > tServiceNameMap; +typedef ::comphelper::MakeMap< OUString, enum eServiceType > tMakeServiceNameMap; tServiceNameMap & lcl_getStaticServiceNameMap() { @@ -197,7 +197,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "BaseDiagram", PROP_DOCUMENT_BASEDIAGRAM, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( @@ -312,7 +312,7 @@ void WrappedDataSourceLabelsInFirstRowProperty::setPropertyValue( const Any& rOu m_aOuterValue = rOuterValue; bool bNewValue = bLabelsInFirstRow; - ::rtl::OUString aRangeString; + OUString aRangeString; bool bUseColumns = true; bool bFirstCellAsLabel = true; bool bHasCategories = true; @@ -338,7 +338,7 @@ void WrappedDataSourceLabelsInFirstRowProperty::setPropertyValue( const Any& rOu Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ::rtl::OUString aRangeString; + OUString aRangeString; bool bUseColumns = true; bool bFirstCellAsLabel = true; bool bHasCategories = true; @@ -413,7 +413,7 @@ void WrappedDataSourceLabelsInFirstColumnProperty::setPropertyValue( const Any& m_aOuterValue = rOuterValue; bool bNewValue = bLabelsInFirstRow; - ::rtl::OUString aRangeString; + OUString aRangeString; bool bUseColumns = true; bool bFirstCellAsLabel = true; bool bHasCategories = true; @@ -439,7 +439,7 @@ void WrappedDataSourceLabelsInFirstColumnProperty::setPropertyValue( const Any& Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ::rtl::OUString aRangeString; + OUString aRangeString; bool bUseColumns = true; bool bFirstCellAsLabel = true; bool bHasCategories = true; @@ -858,7 +858,7 @@ void SAL_CALL ChartDocumentWrapper::attachData( const Reference< XChartData >& x // ____ XModel ____ sal_Bool SAL_CALL ChartDocumentWrapper::attachResource( - const ::rtl::OUString& URL, + const OUString& URL, const Sequence< beans::PropertyValue >& Arguments ) throw (uno::RuntimeException) { @@ -868,13 +868,13 @@ sal_Bool SAL_CALL ChartDocumentWrapper::attachResource( return sal_False; } -::rtl::OUString SAL_CALL ChartDocumentWrapper::getURL() +OUString SAL_CALL ChartDocumentWrapper::getURL() throw (uno::RuntimeException) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) return xModel->getURL(); - return ::rtl::OUString(); + return OUString(); } Sequence< beans::PropertyValue > SAL_CALL ChartDocumentWrapper::getArgs() @@ -1039,7 +1039,7 @@ void ChartDocumentWrapper::impl_resetAddIn() } } -void ChartDocumentWrapper::setBaseDiagram( const rtl::OUString& rBaseDiagram ) +void ChartDocumentWrapper::setBaseDiagram( const OUString& rBaseDiagram ) { ControllerLockGuard aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); m_aBaseDiagram = rBaseDiagram; @@ -1049,7 +1049,7 @@ void ChartDocumentWrapper::setBaseDiagram( const rtl::OUString& rBaseDiagram ) this->setDiagram( xDiagram ); } -rtl::OUString ChartDocumentWrapper::getBaseDiagram() const +OUString ChartDocumentWrapper::getBaseDiagram() const { return m_aBaseDiagram; } @@ -1162,7 +1162,7 @@ uno::Reference< drawing::XDrawPage > ChartDocumentWrapper::impl_getDrawPage() co // ____ XMultiServiceFactory ____ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( - const ::rtl::OUString& aServiceSpecifier ) + const OUString& aServiceSpecifier ) throw (uno::Exception, uno::RuntimeException) { @@ -1438,7 +1438,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( } uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstanceWithArguments( - const ::rtl::OUString& ServiceSpecifier, + const OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& Arguments ) throw (uno::Exception, uno::RuntimeException) @@ -1449,11 +1449,11 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstanceW return createInstance( ServiceSpecifier ); } -uno::Sequence< ::rtl::OUString > SAL_CALL ChartDocumentWrapper::getAvailableServiceNames() +uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getAvailableServiceNames() throw (uno::RuntimeException) { tServiceNameMap & rMap = lcl_getStaticServiceNameMap(); - uno::Sequence< ::rtl::OUString > aResult( rMap.size()); + uno::Sequence< OUString > aResult( rMap.size()); ::std::transform( rMap.begin(), rMap.end(), aResult.getArray(), @@ -1556,9 +1556,9 @@ const std::vector< WrappedProperty* > ChartDocumentWrapper::createWrappedPropert // ================================================================================ -uno::Sequence< ::rtl::OUString > ChartDocumentWrapper::getSupportedServiceNames_Static() +uno::Sequence< OUString > ChartDocumentWrapper::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 4 ); + uno::Sequence< OUString > aServices( 4 ); aServices[ 0 ] = "com.sun.star.chart.ChartDocument"; aServices[ 1 ] = CHART_CHARTAPIWRAPPER_SERVICE_NAME; aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributesSupplier"; diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 97d49ee05c1e..d7013539cdc6 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -459,7 +459,7 @@ bool lcl_isXYChart( const Reference< chart2::XDiagram > xDiagram ) Reference< chart2::XChartType > xChartType( ::chart::DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ); if( xChartType.is() ) { - rtl::OUString aChartType( xChartType->getChartType() ); + OUString aChartType( xChartType->getChartType() ); if( aChartType.equalsIgnoreAsciiCase(CHART2_SERVICE_NAME_CHARTTYPE_SCATTER) ) bRet = true; } @@ -497,11 +497,11 @@ OUString lcl_getDiagramType( const OUString & rTemplateServiceName ) // "Area" "StackedArea" "PercentStackedArea" "ThreeDArea" // "StackedThreeDArea" "PercentStackedThreeDArea" if( aName.indexOf( "Area" ) != -1 ) - return rtl::OUString("com.sun.star.chart.AreaDiagram"); + return OUString("com.sun.star.chart.AreaDiagram"); // "Pie" "PieAllExploded" "ThreeDPie" "ThreeDPieAllExploded" if( aName.indexOf( "Pie" ) != -1 ) - return rtl::OUString("com.sun.star.chart.PieDiagram"); + return OUString("com.sun.star.chart.PieDiagram"); // "Column" "StackedColumn" "PercentStackedColumn" "ThreeDColumnDeep" // "ThreeDColumnFlat" "StackedThreeDColumnFlat" @@ -510,33 +510,33 @@ OUString lcl_getDiagramType( const OUString & rTemplateServiceName ) // "StackedThreeDBarFlat" "PercentStackedThreeDBarFlat" "ColumnWithLine" // "StackedColumnWithLine" if( aName.indexOf( "Column" ) != -1 || aName.indexOf( "Bar" ) != -1 ) - return rtl::OUString( "com.sun.star.chart.BarDiagram" ); + return OUString( "com.sun.star.chart.BarDiagram" ); // "Donut" "DonutAllExploded" "ThreeDDonut" "ThreeDDonutAllExploded" if( aName.indexOf( "Donut" ) != -1 ) - return rtl::OUString( "com.sun.star.chart.DonutDiagram" ); + return OUString( "com.sun.star.chart.DonutDiagram" ); // "ScatterLineSymbol" "ScatterLine" "ScatterSymbol" "ThreeDScatter" if( aName.indexOf( "Scatter" ) != -1 ) - return rtl::OUString( "com.sun.star.chart.XYDiagram" ); + return OUString( "com.sun.star.chart.XYDiagram" ); // "FilledNet" "StackedFilledNet" "PercentStackedFilledNet" if( aName.indexOf( "FilledNet" ) != -1 ) - return rtl::OUString( "com.sun.star.chart.FilledNetDiagram" ); + return OUString( "com.sun.star.chart.FilledNetDiagram" ); // "Net" "NetSymbol" "NetLine" "StackedNet" "StackedNetSymbol" // "StackedNetLine" "PercentStackedNet" "PercentStackedNetSymbol" // "PercentStackedNetLine" if( aName.indexOf( "Net" ) != -1 ) - return rtl::OUString( "com.sun.star.chart.NetDiagram" ); + return OUString( "com.sun.star.chart.NetDiagram" ); // "StockLowHighClose" "StockOpenLowHighClose" "StockVolumeLowHighClose" // "StockVolumeOpenLowHighClose" if( aName.indexOf( "Stock" ) != -1 ) - return rtl::OUString( "com.sun.star.chart.StockDiagram" ); + return OUString( "com.sun.star.chart.StockDiagram" ); if( aName.indexOf( "Bubble" ) != -1 ) - return rtl::OUString( "com.sun.star.chart.BubbleDiagram" ); + return OUString( "com.sun.star.chart.BubbleDiagram" ); // Note: this must be checked after Bar, Net and Scatter @@ -545,7 +545,7 @@ OUString lcl_getDiagramType( const OUString & rTemplateServiceName ) // "PercentStackedLineSymbol" "ThreeDLine" "StackedThreeDLine" // "PercentStackedThreeDLine" "ThreeDLineDeep" if( aName.indexOf( "Line" ) != -1 || aName.indexOf( "Symbol" ) != -1 ) - return rtl::OUString( "com.sun.star.chart.LineDiagram" ); + return OUString( "com.sun.star.chart.LineDiagram" ); OSL_FAIL( "unknown template" ); } @@ -553,7 +553,7 @@ OUString lcl_getDiagramType( const OUString & rTemplateServiceName ) return OUString(); } -typedef ::comphelper::MakeMap< ::rtl::OUString, ::rtl::OUString > tMakeStringStringMap; +typedef ::comphelper::MakeMap< OUString, OUString > tMakeStringStringMap; const tMakeStringStringMap& lcl_getChartTypeNameMap() { @@ -769,7 +769,7 @@ void SAL_CALL DiagramWrapper::setSize( const awt::Size& aSize ) OUString SAL_CALL DiagramWrapper::getShapeType() throw (uno::RuntimeException) { - return rtl::OUString( "com.sun.star.chart.Diagram" ); + return OUString( "com.sun.star.chart.Diagram" ); } // ____ XDiagramPositioning ____ @@ -1221,7 +1221,7 @@ void WrappedDataRowSourceProperty::setPropertyValue( const Any& rOuterValue, con bool bNewUseColumns = eChartDataRowSource == ::com::sun::star::chart::ChartDataRowSource_COLUMNS; - ::rtl::OUString aRangeString; + OUString aRangeString; bool bUseColumns = true; bool bFirstCellAsLabel = true; bool bHasCategories = true; @@ -1243,7 +1243,7 @@ void WrappedDataRowSourceProperty::setPropertyValue( const Any& rOuterValue, con Any WrappedDataRowSourceProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ::rtl::OUString aRangeString; + OUString aRangeString; bool bUseColumns = true; bool bFirstCellAsLabel = true; bool bHasCategories = true; diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index eec61f2aa83e..96ccd65e3edf 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -50,6 +50,7 @@ using ::osl::MutexGuard; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; +using ::rtl::OUString; //----------------------------------------------------------------------------- @@ -213,7 +214,7 @@ Any WrappedLegendAlignmentProperty::convertOuterToInnerValue( const Any& rOuterV namespace { -static const ::rtl::OUString lcl_aServiceName("com.sun.star.comp.chart.Legend"); +static const OUString lcl_aServiceName("com.sun.star.comp.chart.Legend"); enum { @@ -337,10 +338,10 @@ void SAL_CALL LegendWrapper::setSize( const awt::Size& aSize ) } // ____ XShapeDescriptor (base of XShape) ____ -::rtl::OUString SAL_CALL LegendWrapper::getShapeType() +OUString SAL_CALL LegendWrapper::getShapeType() throw (uno::RuntimeException) { - return rtl::OUString( "com.sun.star.chart.ChartLegend" ); + return OUString( "com.sun.star.chart.ChartLegend" ); } // ____ XComponent ____ @@ -431,9 +432,9 @@ const std::vector< WrappedProperty* > LegendWrapper::createWrappedProperties() // ================================================================================ -Sequence< ::rtl::OUString > LegendWrapper::getSupportedServiceNames_Static() +Sequence< OUString > LegendWrapper::getSupportedServiceNames_Static() { - Sequence< ::rtl::OUString > aServices( 4 ); + Sequence< OUString > aServices( 4 ); aServices[ 0 ] = "com.sun.star.chart.ChartLegend"; aServices[ 1 ] = "com.sun.star.drawing.Shape"; aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributesSupplier"; diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index fd25e332e026..9c3d4a23f5a7 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -95,7 +95,7 @@ Any WrappedTitleStringProperty::getPropertyValue( const Reference< beans::XPrope { Sequence< Reference< chart2::XFormattedString > > aStrings( xTitle->getText()); - ::rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; for( sal_Int32 i = 0; i < aStrings.getLength(); ++i ) { aBuf.append( aStrings[ i ]->getString()); @@ -107,7 +107,7 @@ Any WrappedTitleStringProperty::getPropertyValue( const Reference< beans::XPrope Any WrappedTitleStringProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - return uno::makeAny( rtl::OUString() );//default title is a empty String + return uno::makeAny( OUString() );//default title is a empty String } //----------------------------------------------------------------------------- @@ -148,7 +148,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "String", PROP_TITLE_STRING, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); @@ -261,7 +261,7 @@ void SAL_CALL TitleWrapper::setSize( const awt::Size& /*aSize*/ ) OUString SAL_CALL TitleWrapper::getShapeType() throw (uno::RuntimeException) { - return rtl::OUString( "com.sun.star.chart.ChartTitle" ); + return OUString( "com.sun.star.chart.ChartTitle" ); } // ____ XComponent ____ diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index 937cb83aeef2..d80169a0a3c6 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -174,7 +174,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL UpDownBarWrapper::getProperty { return *StaticUpDownBarWrapperInfo::get(); } -void SAL_CALL UpDownBarWrapper::setPropertyValue( const ::rtl::OUString& rPropertyName, const uno::Any& rValue ) +void SAL_CALL UpDownBarWrapper::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { Reference< beans::XPropertySet > xPropSet(0); @@ -196,7 +196,7 @@ void SAL_CALL UpDownBarWrapper::setPropertyValue( const ::rtl::OUString& rProper if(xPropSet.is()) xPropSet->setPropertyValue( rPropertyName, rValue ); } -uno::Any SAL_CALL UpDownBarWrapper::getPropertyValue( const ::rtl::OUString& rPropertyName ) +uno::Any SAL_CALL UpDownBarWrapper::getPropertyValue( const OUString& rPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; @@ -222,22 +222,22 @@ uno::Any SAL_CALL UpDownBarWrapper::getPropertyValue( const ::rtl::OUString& rPr return aRet; } -void SAL_CALL UpDownBarWrapper::addPropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) +void SAL_CALL UpDownBarWrapper::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL("not implemented"); } -void SAL_CALL UpDownBarWrapper::removePropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) +void SAL_CALL UpDownBarWrapper::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL("not implemented"); } -void SAL_CALL UpDownBarWrapper::addVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) +void SAL_CALL UpDownBarWrapper::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL("not implemented"); } -void SAL_CALL UpDownBarWrapper::removeVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) +void SAL_CALL UpDownBarWrapper::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL("not implemented"); @@ -245,13 +245,13 @@ void SAL_CALL UpDownBarWrapper::removeVetoableChangeListener( const ::rtl::OUStr //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet -void SAL_CALL UpDownBarWrapper::setPropertyValues( const uno::Sequence< ::rtl::OUString >& rNameSeq, const uno::Sequence< uno::Any >& rValueSeq ) +void SAL_CALL UpDownBarWrapper::setPropertyValues( const uno::Sequence< OUString >& rNameSeq, const uno::Sequence< uno::Any >& rValueSeq ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() ); for(sal_Int32 nN=0; nNsetPropertyValue( aPropertyName, rValueSeq[nN] ); @@ -263,7 +263,7 @@ void SAL_CALL UpDownBarWrapper::setPropertyValues( const uno::Sequence< ::rtl::O } //todo: store unknown properties elsewhere } -uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyValues( const uno::Sequence< ::rtl::OUString >& rNameSeq ) +uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyValues( const uno::Sequence< OUString >& rNameSeq ) throw (uno::RuntimeException) { Sequence< Any > aRetSeq; @@ -272,13 +272,13 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyValues( const un aRetSeq.realloc( rNameSeq.getLength() ); for(sal_Int32 nN=0; nNgetPropertyValue( aPropertyName ); } } return aRetSeq; } -void SAL_CALL UpDownBarWrapper::addPropertiesChangeListener( const uno::Sequence< ::rtl::OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) +void SAL_CALL UpDownBarWrapper::addPropertiesChangeListener( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) throw (uno::RuntimeException) { OSL_FAIL("not implemented"); @@ -288,14 +288,14 @@ void SAL_CALL UpDownBarWrapper::removePropertiesChangeListener( const uno::Refer { OSL_FAIL("not implemented"); } -void SAL_CALL UpDownBarWrapper::firePropertiesChangeEvent( const uno::Sequence< ::rtl::OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) +void SAL_CALL UpDownBarWrapper::firePropertiesChangeEvent( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) throw (uno::RuntimeException) { OSL_FAIL("not implemented"); } //XPropertyState -beans::PropertyState SAL_CALL UpDownBarWrapper::getPropertyState( const ::rtl::OUString& rPropertyName ) +beans::PropertyState SAL_CALL UpDownBarWrapper::getPropertyState( const OUString& rPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException) { uno::Any aDefault( this->getPropertyDefault( rPropertyName ) ); @@ -306,7 +306,7 @@ beans::PropertyState SAL_CALL UpDownBarWrapper::getPropertyState( const ::rtl::O return beans::PropertyState_DIRECT_VALUE; } -uno::Sequence< beans::PropertyState > SAL_CALL UpDownBarWrapper::getPropertyStates( const uno::Sequence< ::rtl::OUString >& rNameSeq ) +uno::Sequence< beans::PropertyState > SAL_CALL UpDownBarWrapper::getPropertyStates( const uno::Sequence< OUString >& rNameSeq ) throw (beans::UnknownPropertyException, uno::RuntimeException) { Sequence< beans::PropertyState > aRetSeq; @@ -315,19 +315,19 @@ uno::Sequence< beans::PropertyState > SAL_CALL UpDownBarWrapper::getPropertyStat aRetSeq.realloc( rNameSeq.getLength() ); for(sal_Int32 nN=0; nNgetPropertyState( aPropertyName ); } } return aRetSeq; } -void SAL_CALL UpDownBarWrapper::setPropertyToDefault( const ::rtl::OUString& rPropertyName ) +void SAL_CALL UpDownBarWrapper::setPropertyToDefault( const OUString& rPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException) { this->setPropertyValue( rPropertyName, this->getPropertyDefault(rPropertyName) ); } -uno::Any SAL_CALL UpDownBarWrapper::getPropertyDefault( const ::rtl::OUString& rPropertyName ) +uno::Any SAL_CALL UpDownBarWrapper::getPropertyDefault( const OUString& rPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { const tPropertyValueMap& rStaticDefaults = *StaticUpDownBarWrapperDefaults::get(); @@ -345,20 +345,20 @@ void SAL_CALL UpDownBarWrapper::setAllPropertiesToDefault( ) const Sequence< beans::Property >& rPropSeq = *StaticUpDownBarWrapperPropertyArray::get(); for(sal_Int32 nN=0; nNsetPropertyToDefault( aPropertyName ); } } -void SAL_CALL UpDownBarWrapper::setPropertiesToDefault( const uno::Sequence< ::rtl::OUString >& rNameSeq ) +void SAL_CALL UpDownBarWrapper::setPropertiesToDefault( const uno::Sequence< OUString >& rNameSeq ) throw (beans::UnknownPropertyException, uno::RuntimeException) { for(sal_Int32 nN=0; nNsetPropertyToDefault( aPropertyName ); } } -uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const uno::Sequence< ::rtl::OUString >& rNameSeq ) +uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const uno::Sequence< OUString >& rNameSeq ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Sequence< Any > aRetSeq; @@ -367,7 +367,7 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const aRetSeq.realloc( rNameSeq.getLength() ); for(sal_Int32 nN=0; nNgetPropertyDefault( aPropertyName ); } } @@ -380,10 +380,10 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const Sequence< OUString > UpDownBarWrapper::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 4 ); - aServices[ 0 ] = ::rtl::OUString("com.sun.star.chart.ChartArea"); - aServices[ 1 ] = ::rtl::OUString("com.sun.star.drawing.LineProperties"); - aServices[ 2 ] = ::rtl::OUString("com.sun.star.drawing.FillProperties"); - aServices[ 3 ] = ::rtl::OUString("com.sun.star.xml.UserDefinedAttributesSupplier"); + aServices[ 0 ] = OUString("com.sun.star.chart.ChartArea"); + aServices[ 1 ] = OUString("com.sun.star.drawing.LineProperties"); + aServices[ 2 ] = OUString("com.sun.star.drawing.FillProperties"); + aServices[ 3 ] = OUString("com.sun.star.xml.UserDefinedAttributesSupplier"); return aServices; } diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx index 9b5b7f2da7b6..67c8f31558fe 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx @@ -41,11 +41,11 @@ const sal_Int32 DEFAULT_OVERLAP = 0; //----------------------------------------------------------------------------- WrappedBarPositionProperty_Base::WrappedBarPositionProperty_Base( - const ::rtl::OUString& rOuterName - , const ::rtl::OUString& rInnerSequencePropertyName + const OUString& rOuterName + , const OUString& rInnerSequencePropertyName , sal_Int32 nDefaultValue , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) - : WrappedDefaultProperty( rOuterName, rtl::OUString(), uno::makeAny( nDefaultValue ) ) + : WrappedDefaultProperty( rOuterName, OUString(), uno::makeAny( nDefaultValue ) ) , m_nDimensionIndex(0) , m_nAxisIndex(0) , m_spChart2ModelContact( spChart2ModelContact ) diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx index f06c278988c6..327cc7ce3cd7 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx @@ -33,11 +33,11 @@ namespace wrapper { WrappedSeriesAreaOrLineProperty::WrappedSeriesAreaOrLineProperty( - const rtl::OUString& rOuterName - , const rtl::OUString& rInnerAreaTypeName - , const rtl::OUString& rInnerLineTypeName + const OUString& rOuterName + , const OUString& rInnerAreaTypeName + , const OUString& rInnerLineTypeName , DataSeriesPointWrapper* pDataSeriesPointWrapper ) - : WrappedProperty( rOuterName, rtl::OUString() ) + : WrappedProperty( rOuterName, OUString() ) , m_pDataSeriesPointWrapper( pDataSeriesPointWrapper ) , m_aInnerAreaTypeName( rInnerAreaTypeName ) , m_aInnerLineTypeName( rInnerLineTypeName ) @@ -48,7 +48,7 @@ WrappedSeriesAreaOrLineProperty::~WrappedSeriesAreaOrLineProperty() } //virtual -::rtl::OUString WrappedSeriesAreaOrLineProperty::getInnerName() const +OUString WrappedSeriesAreaOrLineProperty::getInnerName() const { if( m_pDataSeriesPointWrapper && !m_pDataSeriesPointWrapper->isSupportingAreaProperties() ) return m_aInnerLineTypeName; diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx index d68bdc545c6e..53dff54d906a 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx @@ -45,7 +45,7 @@ template< typename PROPERTYTYPE > class WrappedSplineProperty : public WrappedProperty { public: - explicit WrappedSplineProperty( const ::rtl::OUString& rOuterName, const ::rtl::OUString& rInnerName + explicit WrappedSplineProperty( const OUString& rOuterName, const OUString& rInnerName , const ::com::sun::star::uno::Any& rDefaulValue , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) : WrappedProperty(rOuterName,OUString()) diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx index 0e57ea40e490..88dc00d6cfd3 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx @@ -134,7 +134,7 @@ uno::Reference< chart2::data::XDataProvider > lcl_getDataProviderFromContact( } void lcl_ConvertRangeFromXML( - ::rtl::OUString & rInOutRange, + OUString & rInOutRange, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) { if( !rInOutRange.isEmpty()) @@ -143,14 +143,14 @@ void lcl_ConvertRangeFromXML( lcl_getDataProviderFromContact( spChart2ModelContact ), uno::UNO_QUERY ); if( xConverter.is()) { - ::rtl::OUString aResult = xConverter->convertRangeFromXML( rInOutRange ); + OUString aResult = xConverter->convertRangeFromXML( rInOutRange ); rInOutRange = aResult; } } } void lcl_ConvertRangeToXML( - ::rtl::OUString & rInOutRange, + OUString & rInOutRange, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) { if( !rInOutRange.isEmpty()) @@ -159,7 +159,7 @@ void lcl_ConvertRangeToXML( lcl_getDataProviderFromContact( spChart2ModelContact ), uno::UNO_QUERY ); if( xConverter.is()) { - ::rtl::OUString aResult = xConverter->convertRangeToXML( rInOutRange ); + OUString aResult = xConverter->convertRangeToXML( rInOutRange ); rInOutRange = aResult; } } @@ -904,10 +904,10 @@ WrappedStatisticPropertySetProperty::WrappedStatisticPropertySetProperty( , tSeriesOrDiagramPropertyType ePropertyType ) : WrappedStatisticProperty< Reference< beans::XPropertySet > >( (ePropertySetType == PROPERTY_SET_TYPE_REGRESSION) - ? rtl::OUString("DataRegressionProperties") + ? OUString("DataRegressionProperties") : (ePropertySetType == PROPERTY_SET_TYPE_ERROR_BAR) - ? rtl::OUString("DataErrorProperties") - : rtl::OUString("DataMeanValueProperties") + ? OUString("DataErrorProperties") + : OUString("DataMeanValueProperties") , uno::Any(), spChart2ModelContact, ePropertyType ) , m_eType( ePropertySetType ) { diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx index 7757d16ba81c..76a461a3d14e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx @@ -45,7 +45,7 @@ namespace wrapper class WrappedStockProperty : public WrappedProperty { public: - explicit WrappedStockProperty( const ::rtl::OUString& rOuterName + explicit WrappedStockProperty( const OUString& rOuterName , const ::com::sun::star::uno::Any& rDefaulValue , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedStockProperty(); @@ -56,7 +56,7 @@ public: ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( sal_Bool bNewValue, const rtl::OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const = 0; + virtual uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( sal_Bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const = 0; protected: ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -64,10 +64,10 @@ protected: ::com::sun::star::uno::Any m_aDefaultValue; }; -WrappedStockProperty::WrappedStockProperty( const ::rtl::OUString& rOuterName +WrappedStockProperty::WrappedStockProperty( const OUString& rOuterName , const ::com::sun::star::uno::Any& rDefaulValue , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) - : WrappedProperty(rOuterName,rtl::OUString()) + : WrappedProperty(rOuterName,OUString()) , m_spChart2ModelContact(spChart2ModelContact) , m_aOuterValue() , m_aDefaultValue(rDefaulValue) @@ -131,7 +131,7 @@ public: ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( sal_Bool bNewValue, const rtl::OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const; + uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( sal_Bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const; }; WrappedVolumeProperty::WrappedVolumeProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) @@ -169,7 +169,7 @@ WrappedVolumeProperty::~WrappedVolumeProperty() return m_aOuterValue; } -uno::Reference< chart2::XChartTypeTemplate > WrappedVolumeProperty::getNewTemplate( sal_Bool bNewValue, const rtl::OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const +uno::Reference< chart2::XChartTypeTemplate > WrappedVolumeProperty::getNewTemplate( sal_Bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const { uno::Reference< chart2::XChartTypeTemplate > xTemplate(0); @@ -204,7 +204,7 @@ public: ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( sal_Bool bNewValue, const rtl::OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const; + uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( sal_Bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const; }; WrappedUpDownProperty::WrappedUpDownProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) : WrappedStockProperty( "UpDown", uno::makeAny(sal_False) , spChart2ModelContact ) @@ -239,7 +239,7 @@ WrappedUpDownProperty::~WrappedUpDownProperty() } return m_aOuterValue; } -uno::Reference< chart2::XChartTypeTemplate > WrappedUpDownProperty::getNewTemplate( sal_Bool bNewValue, const rtl::OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const +uno::Reference< chart2::XChartTypeTemplate > WrappedUpDownProperty::getNewTemplate( sal_Bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const { uno::Reference< chart2::XChartTypeTemplate > xTemplate(0); if( bNewValue ) //add open series diff --git a/chart2/source/controller/dialogs/RangeSelectionListener.cxx b/chart2/source/controller/dialogs/RangeSelectionListener.cxx index ff88b75fba64..032f0b528760 100644 --- a/chart2/source/controller/dialogs/RangeSelectionListener.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionListener.cxx @@ -31,7 +31,7 @@ namespace chart RangeSelectionListener::RangeSelectionListener( RangeSelectionListenerParent & rParent, - const ::rtl::OUString & rInitialRange, + const OUString & rInitialRange, const Reference< frame::XModel >& xModelToLockController ) : m_rParent( rParent ), m_aRange( rInitialRange ), diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx index 509af56ef917..a218633e0352 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx @@ -53,13 +53,13 @@ ChartTypeUnoDlg::~ChartTypeUnoDlg() //------------------------------------------------------------------------- // lang::XServiceInfo //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ChartTypeUnoDlg::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ChartTypeUnoDlg::getImplementationName() throw(uno::RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------------- -::rtl::OUString ChartTypeUnoDlg::getImplementationName_Static() throw(uno::RuntimeException) +OUString ChartTypeUnoDlg::getImplementationName_Static() throw(uno::RuntimeException) { return CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME; } @@ -72,9 +72,9 @@ ChartTypeUnoDlg::~ChartTypeUnoDlg() //------------------------------------------------------------------------- -uno::Sequence< rtl::OUString > ChartTypeUnoDlg::getSupportedServiceNames_Static() +uno::Sequence< OUString > ChartTypeUnoDlg::getSupportedServiceNames_Static() { - uno::Sequence< rtl::OUString > aSNS( 1 ); + uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] = CHART_TYPE_DIALOG_SERVICE_NAME; return aSNS; } diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index af14ac42fae5..a13c6779fba9 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -336,8 +336,8 @@ DataSourceTabPage::DataSourceTabPage( // set button text sal_Unicode cBlackUpPointingTriangle( 0x25b2 ); sal_Unicode cBlackDownPointingTriangle( 0x25bc ); - m_aBTN_UP.SetText( rtl::OUString( cBlackUpPointingTriangle )); - m_aBTN_DOWN.SetText( rtl::OUString( cBlackDownPointingTriangle )); + m_aBTN_UP.SetText( OUString( cBlackUpPointingTriangle )); + m_aBTN_DOWN.SetText( OUString( cBlackDownPointingTriangle )); // init controls m_aLB_ROLE.SetTabs( lcl_pRoleListBoxTabs, MAP_APPFONT ); @@ -482,7 +482,7 @@ void DataSourceTabPage::fillSeriesListBox() if( nIndex != -1 ) aLabel = String( aResString.replaceAt( nIndex, aReplacementStr.getLength(), - rtl::OUString::valueOf(nUnnamedSeriesIndex))); + OUString::valueOf(nUnnamedSeriesIndex))); } if( aLabel.Len() == 0 ) aLabel = String( ::chart::SchResId( STR_DATA_UNNAMED_SERIES )); @@ -834,7 +834,7 @@ IMPL_LINK( DataSourceTabPage, RangeUpdateDataHdl, Edit*, pEdit ) } void DataSourceTabPage::listeningFinished( - const ::rtl::OUString & rNewRange ) + const OUString & rNewRange ) { // rNewRange becomes invalid after removing the listener OUString aRange( rNewRange ); diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index cd42430c3c73..8c7c733ff59b 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -496,7 +496,7 @@ void ChartController::executeDispatch_InsertErrorBars( bool bYError ) aItemConverter.FillItemSet( aItemSet ); ObjectPropertiesDialogParameter aDialogParameter = ObjectPropertiesDialogParameter( ObjectIdentifier::createClassifiedIdentifierWithParent( - objType, ::rtl::OUString(), m_aSelection.getSelectedCID())); + objType, OUString(), m_aSelection.getSelectedCID())); aDialogParameter.init( getModel() ); ViewElementListProvider aViewElementListProvider( m_pDrawModelWrapper.get()); SolarMutexGuard aGuard; @@ -543,7 +543,7 @@ void ChartController::executeDispatch_InsertErrorBars( bool bYError ) bYError ? ErrorBarResources::ERROR_BAR_Y : ErrorBarResources::ERROR_BAR_X); aDlg.SetAxisMinorStepWidthForErrorBarDecimals( - InsertErrorBarsDialog::getAxisMinorStepWidthForErrorBarDecimals( getModel(), m_xChartView, rtl::OUString() ) ); + InsertErrorBarsDialog::getAxisMinorStepWidthForErrorBarDecimals( getModel(), m_xChartView, OUString() ) ); if( aDlg.Execute() == RET_OK ) { diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index d78a5d719ae1..145e7e34ca8a 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -76,7 +76,7 @@ namespace SAL_WNODEPRECATED_DECLARATIONS_PUSH ::comphelper::ItemConverter* createItemConverter( - const ::rtl::OUString & aObjectCID + const OUString & aObjectCID , const uno::Reference< frame::XModel > & xChartModel , const uno::Reference< uno::XComponentContext > & xContext , SdrModel & rDrawModel @@ -96,7 +96,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH return NULL; } - rtl::OUString aParticleID = ObjectIdentifier::getParticleID( aObjectCID ); + OUString aParticleID = ObjectIdentifier::getParticleID( aObjectCID ); bool bAffectsMultipleObjects = aParticleID == "ALLELEMENTS"; //------------------------------------------------------------- if( !bAffectsMultipleObjects ) @@ -317,7 +317,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH } SAL_WNODEPRECATED_DECLARATIONS_POP -rtl::OUString lcl_getTitleCIDForCommand( const ::rtl::OString& rDispatchCommand, const uno::Reference< frame::XModel > & xChartModel ) +OUString lcl_getTitleCIDForCommand( const OString& rDispatchCommand, const uno::Reference< frame::XModel > & xChartModel ) { if( rDispatchCommand.equals("AllTitles")) return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_TITLE, "ALLELEMENTS" ); @@ -340,7 +340,7 @@ rtl::OUString lcl_getTitleCIDForCommand( const ::rtl::OString& rDispatchCommand, return ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, xChartModel ); } -rtl::OUString lcl_getAxisCIDForCommand( const ::rtl::OString& rDispatchCommand, const uno::Reference< frame::XModel >& xChartModel ) +OUString lcl_getAxisCIDForCommand( const OString& rDispatchCommand, const uno::Reference< frame::XModel >& xChartModel ) { if( rDispatchCommand.equals("DiagramAxisAll")) return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_AXIS, "ALLELEMENTS" ); @@ -373,7 +373,7 @@ rtl::OUString lcl_getAxisCIDForCommand( const ::rtl::OString& rDispatchCommand, return ObjectIdentifier::createClassifiedIdentifierForObject( xAxis, xChartModel ); } -rtl::OUString lcl_getGridCIDForCommand( const ::rtl::OString& rDispatchCommand, const uno::Reference< frame::XModel >& xChartModel ) +OUString lcl_getGridCIDForCommand( const OString& rDispatchCommand, const uno::Reference< frame::XModel >& xChartModel ) { uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); @@ -414,22 +414,22 @@ rtl::OUString lcl_getGridCIDForCommand( const ::rtl::OString& rDispatchCommand, uno::Reference< XAxis > xAxis( AxisHelper::getAxis( nDimensionIndex, bMainAxis, xDiagram ) ); sal_Int32 nSubGridIndex= bMainGrid ? (-1) : 0; - rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForGrid( xAxis, xChartModel, nSubGridIndex ) ); + OUString aCID( ObjectIdentifier::createClassifiedIdentifierForGrid( xAxis, xChartModel, nSubGridIndex ) ); return aCID; } -rtl::OUString lcl_getErrorCIDForCommand( const ObjectType eDispatchType, const ObjectType &eSelectedType, const ::rtl::OUString &rSelectedCID) +OUString lcl_getErrorCIDForCommand( const ObjectType eDispatchType, const ObjectType &eSelectedType, const OUString &rSelectedCID) { if( eSelectedType == eDispatchType ) return rSelectedCID; - return ObjectIdentifier::createClassifiedIdentifierWithParent( eDispatchType, ::rtl::OUString(), rSelectedCID ); + return ObjectIdentifier::createClassifiedIdentifierWithParent( eDispatchType, OUString(), rSelectedCID ); } -rtl::OUString lcl_getObjectCIDForCommand( const ::rtl::OString& rDispatchCommand, const uno::Reference< XChartDocument > & xChartDocument, const rtl::OUString& rSelectedCID ) +OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno::Reference< XChartDocument > & xChartDocument, const OUString& rSelectedCID ) { ObjectType eObjectType = OBJECTTYPE_UNKNOWN; - rtl::OUString aParticleID; + OUString aParticleID; uno::Reference< frame::XModel > xChartModel( xChartDocument, uno::UNO_QUERY ); const ObjectType eSelectedType = ObjectIdentifier::getObjectType( rSelectedCID ); @@ -523,7 +523,7 @@ rtl::OUString lcl_getObjectCIDForCommand( const ::rtl::OString& rDispatchCommand return rSelectedCID; else return ObjectIdentifier::createClassifiedIdentifierWithParent( - OBJECTTYPE_DATA_LABELS, ::rtl::OUString(), rSelectedCID ); + OBJECTTYPE_DATA_LABELS, OUString(), rSelectedCID ); } //------------------------------------------------------------------------- //data labels @@ -540,7 +540,7 @@ rtl::OUString lcl_getObjectCIDForCommand( const ::rtl::OString& rDispatchCommand OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) + "=" ); OUString aLabelsCID = ObjectIdentifier::createClassifiedIdentifierForParticles( aSeriesParticle, aChildParticle ); OUString aLabelCID_Stub = ObjectIdentifier::createClassifiedIdentifierWithParent( - OBJECTTYPE_DATA_LABEL, ::rtl::OUString(), aLabelsCID ); + OBJECTTYPE_DATA_LABEL, OUString(), aLabelsCID ); return ObjectIdentifier::createPointCID( aLabelCID_Stub, nPointIndex ); } @@ -645,7 +645,7 @@ rtl::OUString lcl_getObjectCIDForCommand( const ::rtl::OString& rDispatchCommand if( eSelectedType == OBJECTTYPE_DATA_STOCK_LOSS ) return rSelectedCID; else - return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DATA_STOCK_LOSS, rtl::OUString()); + return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DATA_STOCK_LOSS, OUString()); } //------------------------------------------------------------------------- // stock gain @@ -654,7 +654,7 @@ rtl::OUString lcl_getObjectCIDForCommand( const ::rtl::OString& rDispatchCommand if( eSelectedType == OBJECTTYPE_DATA_STOCK_GAIN ) return rSelectedCID; else - return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DATA_STOCK_GAIN, rtl::OUString() ); + return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DATA_STOCK_GAIN, OUString() ); } return ObjectIdentifier::createClassifiedIdentifier( @@ -664,11 +664,11 @@ rtl::OUString lcl_getObjectCIDForCommand( const ::rtl::OString& rDispatchCommand } // anonymous namespace -void SAL_CALL ChartController::executeDispatch_FormatObject(const ::rtl::OUString& rDispatchCommand) +void SAL_CALL ChartController::executeDispatch_FormatObject(const OUString& rDispatchCommand) { uno::Reference< XChartDocument > xChartDocument( getModel(), uno::UNO_QUERY ); - rtl::OString aCommand( rtl::OUStringToOString( rDispatchCommand, RTL_TEXTENCODING_ASCII_US ) ); - rtl::OUString rObjectCID = lcl_getObjectCIDForCommand( aCommand, xChartDocument, m_aSelection.getSelectedCID() ); + OString aCommand( OUStringToOString( rDispatchCommand, RTL_TEXTENCODING_ASCII_US ) ); + OUString rObjectCID = lcl_getObjectCIDForCommand( aCommand, xChartDocument, m_aSelection.getSelectedCID() ); executeDlg_ObjectProperties( rObjectCID ); } @@ -680,9 +680,9 @@ void SAL_CALL ChartController::executeDispatch_ObjectProperties() namespace { -rtl::OUString lcl_getFormatCIDforSelectedCID( const ::rtl::OUString& rSelectedCID ) +OUString lcl_getFormatCIDforSelectedCID( const OUString& rSelectedCID ) { - ::rtl::OUString aFormatCID(rSelectedCID); + OUString aFormatCID(rSelectedCID); //get type of selected object ObjectType eObjectType = ObjectIdentifier::getObjectType( aFormatCID ); @@ -690,22 +690,22 @@ rtl::OUString lcl_getFormatCIDforSelectedCID( const ::rtl::OUString& rSelectedCI // some legend entries are handled as if they were data series if( OBJECTTYPE_LEGEND_ENTRY==eObjectType ) { - rtl::OUString aParentParticle( ObjectIdentifier::getFullParentParticle( rSelectedCID ) ); + OUString aParentParticle( ObjectIdentifier::getFullParentParticle( rSelectedCID ) ); aFormatCID = ObjectIdentifier::createClassifiedIdentifierForParticle( aParentParticle ); } // treat diagram as wall if( OBJECTTYPE_DIAGRAM==eObjectType ) - aFormatCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ); + aFormatCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ); return aFormatCID; } }//end anonymous namespace -void SAL_CALL ChartController::executeDlg_ObjectProperties( const ::rtl::OUString& rSelectedObjectCID ) +void SAL_CALL ChartController::executeDlg_ObjectProperties( const OUString& rSelectedObjectCID ) { - rtl::OUString aObjectCID = lcl_getFormatCIDforSelectedCID( rSelectedObjectCID ); + OUString aObjectCID = lcl_getFormatCIDforSelectedCID( rSelectedObjectCID ); UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::FORMAT, @@ -717,7 +717,7 @@ void SAL_CALL ChartController::executeDlg_ObjectProperties( const ::rtl::OUStrin aUndoGuard.commit(); } -bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const ::rtl::OUString& rObjectCID, bool bOkClickOnUnchangedDialogSouldBeRatedAsSuccessAlso ) +bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const OUString& rObjectCID, bool bOkClickOnUnchangedDialogSouldBeRatedAsSuccessAlso ) { //return true if the properties were changed successfully bool bRet = false; -- cgit