diff options
Diffstat (limited to 'chart2/source/tools')
53 files changed, 173 insertions, 227 deletions
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx index 614236dff6d7..a91d05ace485 100644 --- a/chart2/source/tools/AxisHelper.cxx +++ b/chart2/source/tools/AxisHelper.cxx @@ -232,7 +232,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis( Reference< XChartTypeContainer > xCTCnt( xCorrespondingCoordinateSystem, uno::UNO_QUERY_THROW ); if( xCTCnt.is() ) { - ::rtl::OUString aRoleToMatch; + OUString aRoleToMatch; if( nDimensionIndex == 0 ) aRoleToMatch = "values-x"; Sequence< Reference< XChartType > > aChartTypes( xCTCnt->getChartTypes()); diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index 898699d50f19..deada2065cb3 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -37,7 +37,6 @@ using namespace ::chart::ContainerHelper; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -using ::rtl::OUString; using ::osl::MutexGuard; // necessary for MS compiler diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx index 241f08add123..40c79a3cb55d 100644 --- a/chart2/source/tools/CharacterProperties.cxx +++ b/chart2/source/tools/CharacterProperties.cxx @@ -52,7 +52,6 @@ using namespace ::com::sun::star; using ::com::sun::star::beans::Property; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/tools/ChartDebugTrace.cxx b/chart2/source/tools/ChartDebugTrace.cxx index c4f621e62098..a1817b0313a9 100644 --- a/chart2/source/tools/ChartDebugTrace.cxx +++ b/chart2/source/tools/ChartDebugTrace.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx index 51b760de355d..658b6b03ea91 100644 --- a/chart2/source/tools/ChartTypeHelper.cxx +++ b/chart2/source/tools/ChartTypeHelper.cxx @@ -50,7 +50,7 @@ bool ChartTypeHelper::isSupportingAxisSideBySide( StackMode eStackMode = DiagramHelper::getStackModeFromChartType( xChartType, bFound, bAmbiguous, 0 ); if( eStackMode == StackMode_NONE && !bAmbiguous ) { - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); bResult = ( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) ); } @@ -68,7 +68,7 @@ sal_Bool ChartTypeHelper::isSupportingGeometryProperties( const uno::Reference< { if(nDimensionCount==3) { - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.equals(CHART2_SERVICE_NAME_CHARTTYPE_BAR) ) return sal_True; if( aChartTypeName.equals(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) ) @@ -88,7 +88,7 @@ sal_Bool ChartTypeHelper::isSupportingStatisticProperties( const uno::Reference< if(nDimensionCount==3) return sal_False; - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) return sal_False; if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_NET) ) @@ -118,7 +118,7 @@ sal_Bool ChartTypeHelper::isSupportingAreaProperties( const uno::Reference< XCha { if(nDimensionCount==2) { - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_LINE) ) return sal_False; if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_SCATTER) ) @@ -142,7 +142,7 @@ sal_Bool ChartTypeHelper::isSupportingSymbolProperties( const uno::Reference< XC if(nDimensionCount==3) return sal_False; - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_LINE) ) return sal_True; if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_SCATTER) ) @@ -161,7 +161,7 @@ sal_Bool ChartTypeHelper::isSupportingMainAxis( const uno::Reference< XChartType //@todo ask charttype itself --> need model change first if(xChartType.is()) { - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) return sal_False; @@ -181,7 +181,7 @@ sal_Bool ChartTypeHelper::isSupportingSecondaryAxis( const uno::Reference< XChar if(nDimensionCount==3) return sal_False; - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) return sal_False; if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_NET) ) @@ -203,7 +203,7 @@ sal_Bool ChartTypeHelper::isSupportingOverlapAndGapWidthProperties( if(nDimensionCount==3) return sal_False; - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) ) return sal_True; if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) ) @@ -229,7 +229,7 @@ sal_Bool ChartTypeHelper::isSupportingBarConnectors( if( eStackMode != StackMode_Y_STACKED || bAmbiguous ) return sal_False; - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) ) return sal_True; if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) ) @@ -248,7 +248,7 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedLabelPlacements( const if( !xChartType.is() ) return aRet; - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) { bool bDonut = false; @@ -359,7 +359,7 @@ sal_Bool ChartTypeHelper::isSupportingRightAngledAxes( const uno::Reference< cha { if(xChartType.is()) { - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) return sal_False; } @@ -370,7 +370,7 @@ bool ChartTypeHelper::isSupportingStartingAngle( const uno::Reference< chart2::X { if(xChartType.is()) { - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) return true; } @@ -380,7 +380,7 @@ bool ChartTypeHelper::isSupportingBaseValue( const uno::Reference< chart2::XChar { if(xChartType.is()) { - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_AREA) @@ -394,7 +394,7 @@ bool ChartTypeHelper::isSupportingAxisPositioning( const uno::Reference< chart2: { if(xChartType.is()) { - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_NET) ) return false; if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET) ) @@ -414,7 +414,7 @@ bool ChartTypeHelper::isSupportingDateAxis( const uno::Reference< chart2::XChart sal_Int32 nType = ChartTypeHelper::getAxisType( xChartType, nDimensionIndex ); if( nType != AxisType::CATEGORY ) return false; - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) return false; if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_NET) ) @@ -429,7 +429,7 @@ bool ChartTypeHelper::shiftCategoryPosAtXAxisPerDefault( const uno::Reference< c { if(xChartType.is()) { - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK) ) @@ -442,7 +442,7 @@ bool ChartTypeHelper::noBordersForSimpleScheme( const uno::Reference< chart2::XC { if(xChartType.is()) { - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) return sal_True; } @@ -454,7 +454,7 @@ sal_Int32 ChartTypeHelper::getDefaultDirectLightColor( bool bSimple, const uno:: sal_Int32 nRet = static_cast< sal_Int32 >( 0x808080 ); // grey if( xChartType .is() ) { - rtl::OUString aChartType = xChartType->getChartType(); + OUString aChartType = xChartType->getChartType(); if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) { if( bSimple ) @@ -474,7 +474,7 @@ sal_Int32 ChartTypeHelper::getDefaultAmbientLightColor( bool bSimple, const uno: sal_Int32 nRet = static_cast< sal_Int32 >( 0x999999 ); // grey40 if( xChartType .is() ) { - rtl::OUString aChartType = xChartType->getChartType(); + OUString aChartType = xChartType->getChartType(); if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) { if( bSimple ) @@ -491,7 +491,7 @@ drawing::Direction3D ChartTypeHelper::getDefaultSimpleLightDirection( const uno: drawing::Direction3D aRet(0.0, 0.0, 1.0); if( xChartType .is() ) { - rtl::OUString aChartType = xChartType->getChartType(); + OUString aChartType = xChartType->getChartType(); if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) aRet = drawing::Direction3D(0.0, 0.8, 0.5); else if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_LINE) @@ -506,7 +506,7 @@ drawing::Direction3D ChartTypeHelper::getDefaultRealisticLightDirection( const u drawing::Direction3D aRet(0.0, 0.0, 1.0); if( xChartType .is() ) { - rtl::OUString aChartType = xChartType->getChartType(); + OUString aChartType = xChartType->getChartType(); if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) aRet = drawing::Direction3D(0.6, 0.6, 0.6); else if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_LINE) @@ -525,7 +525,7 @@ sal_Int32 ChartTypeHelper::getAxisType( const uno::Reference< if(!xChartType.is()) return AxisType::CATEGORY; - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if(2==nDimensionIndex)//z-axis return AxisType::SERIES; if(1==nDimensionIndex)//y-axis @@ -548,7 +548,7 @@ sal_Int32 ChartTypeHelper::getNumberOfDisplayedSeries( { try { - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.equals(CHART2_SERVICE_NAME_CHARTTYPE_PIE)) { uno::Reference< beans::XPropertySet > xChartTypeProp( xChartType, uno::UNO_QUERY_THROW ); @@ -580,7 +580,7 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedMissingValueTreatments( StackMode eStackMode = DiagramHelper::getStackModeFromChartType( xChartType, bFound, bAmbiguous, 0 ); bStacked = bFound && (StackMode_Y_STACKED == eStackMode); - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE) ) @@ -634,30 +634,30 @@ bool ChartTypeHelper::isSeriesInFrontOfAxisLine( const uno::Reference< XChartTyp { if( xChartType.is() ) { - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match( CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET ) ) return false; } return true; } -rtl::OUString ChartTypeHelper::getRoleOfSequenceForYAxisNumberFormatDetection( const uno::Reference< XChartType >& xChartType ) +OUString ChartTypeHelper::getRoleOfSequenceForYAxisNumberFormatDetection( const uno::Reference< XChartType >& xChartType ) { - rtl::OUString aRet( "values-y" ); + OUString aRet( "values-y" ); if( !xChartType.is() ) return aRet; - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK) ) aRet = xChartType->getRoleOfSequenceForSeriesLabel(); return aRet; } -rtl::OUString ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection( const uno::Reference< XChartType >& xChartType ) +OUString ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection( const uno::Reference< XChartType >& xChartType ) { - rtl::OUString aRet( "values-y" ); + OUString aRet( "values-y" ); if( !xChartType.is() ) return aRet; - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE) ) aRet = xChartType->getRoleOfSequenceForSeriesLabel(); @@ -667,7 +667,7 @@ rtl::OUString ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetectio bool ChartTypeHelper::shouldLabelNumberFormatKeyBeDetectedFromYAxis( const uno::Reference< XChartType >& xChartType ) { bool bRet = true; - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE) ) bRet = false; return bRet; @@ -679,7 +679,7 @@ bool ChartTypeHelper::isSupportingOnlyDeepStackingFor3D( const uno::Reference< X if( !xChartType.is() ) return bRet; - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_LINE) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_SCATTER) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_AREA) ) diff --git a/chart2/source/tools/CommonConverters.cxx b/chart2/source/tools/CommonConverters.cxx index f9c986225893..829780d02519 100644 --- a/chart2/source/tools/CommonConverters.cxx +++ b/chart2/source/tools/CommonConverters.cxx @@ -459,10 +459,10 @@ uno::Sequence< double > DataSequenceToDoubleSequence( return aResult; } -uno::Sequence< rtl::OUString > DataSequenceToStringSequence( +uno::Sequence< OUString > DataSequenceToStringSequence( const uno::Reference< data::XDataSequence >& xDataSequence ) { - uno::Sequence< rtl::OUString > aResult; + uno::Sequence< OUString > aResult; if(!xDataSequence.is()) return aResult; @@ -519,9 +519,9 @@ sal_Int16 getShortForLongAlso( const uno::Any& rAny ) return nRet; } -bool replaceParamterInString( rtl::OUString & rInOutResourceString, - const rtl::OUString & rParamToReplace, - const rtl::OUString & rReplaceWith ) +bool replaceParamterInString( OUString & rInOutResourceString, + const OUString & rParamToReplace, + const OUString & rReplaceWith ) { sal_Int32 nPos = rInOutResourceString.indexOf( rParamToReplace ); if( nPos == -1 ) diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx index f56ce504d80d..d1425e9c8dd7 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { diff --git a/chart2/source/tools/ControllerLockGuard.cxx b/chart2/source/tools/ControllerLockGuard.cxx index 727eef634f53..ce57ac442428 100644 --- a/chart2/source/tools/ControllerLockGuard.cxx +++ b/chart2/source/tools/ControllerLockGuard.cxx @@ -24,7 +24,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx index f9a8b64dc792..d7ec4ac688db 100644 --- a/chart2/source/tools/DataSeriesHelper.cxx +++ b/chart2/source/tools/DataSeriesHelper.cxx @@ -49,8 +49,6 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ---------------------------------------- namespace diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx index 262e6fe2e11e..71b6a5cb40fe 100644 --- a/chart2/source/tools/DataSource.cxx +++ b/chart2/source/tools/DataSource.cxx @@ -21,7 +21,6 @@ #include "DataSource.hxx" #include "LabeledDataSequence.hxx" -using ::rtl::OUString; using ::osl::MutexGuard; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx index cef1dc179d89..fab7b55011b8 100644 --- a/chart2/source/tools/DataSourceHelper.cxx +++ b/chart2/source/tools/DataSourceHelper.cxx @@ -45,11 +45,10 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { -void lcl_addRanges( ::std::vector< ::rtl::OUString > & rOutResult, +void lcl_addRanges( ::std::vector< OUString > & rOutResult, const uno::Reference< data::XLabeledDataSequence > & xLabeledSeq ) { if( ! xLabeledSeq.is()) @@ -63,7 +62,7 @@ void lcl_addRanges( ::std::vector< ::rtl::OUString > & rOutResult, } void lcl_addDataSourceRanges( - ::std::vector< ::rtl::OUString > & rOutResult, + ::std::vector< OUString > & rOutResult, const uno::Reference< data::XDataSource > & xDataSource ) { if( xDataSource.is() ) @@ -75,7 +74,7 @@ void lcl_addDataSourceRanges( } void lcl_addErrorBarRanges( - ::std::vector< ::rtl::OUString > & rOutResult, + ::std::vector< OUString > & rOutResult, const uno::Reference< XDataSeries > & xDataSeries ) { uno::Reference< beans::XPropertySet > xSeriesProp( xDataSeries, uno::UNO_QUERY ); @@ -129,7 +128,7 @@ Reference< chart2::data::XDataSequence > DataSourceHelper::createCachedDataSeque return new ::chart::CachedDataSequence(); } -Reference< chart2::data::XDataSequence > DataSourceHelper::createCachedDataSequence( const ::rtl::OUString& rSingleText ) +Reference< chart2::data::XDataSequence > DataSourceHelper::createCachedDataSequence( const OUString& rSingleText ) { return new ::chart::CachedDataSequence( rSingleText ); } @@ -175,7 +174,7 @@ uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments( } uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments( - const ::rtl::OUString & rRangeRepresentation, + const OUString & rRangeRepresentation, const uno::Sequence< sal_Int32 >& rSequenceMapping, bool bUseColumns, bool bFirstCellAsLabel, bool bHasCategories ) { @@ -197,7 +196,7 @@ uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments( } void DataSourceHelper::readArguments( const uno::Sequence< beans::PropertyValue >& rArguments - , ::rtl::OUString & rRangeRepresentation, uno::Sequence< sal_Int32 >& rSequenceMapping + , OUString & rRangeRepresentation, uno::Sequence< sal_Int32 >& rSequenceMapping , bool& bUseColumns, bool& bFirstCellAsLabel, bool& bHasCategories ) { const beans::PropertyValue* pArguments = rArguments.getConstArray(); @@ -269,10 +268,10 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::pressUsedDataIntoR return new DataSource( aResultSequence ); } -uno::Sequence< ::rtl::OUString > DataSourceHelper::getUsedDataRanges( +uno::Sequence< OUString > DataSourceHelper::getUsedDataRanges( const uno::Reference< chart2::XDiagram > & xDiagram ) { - ::std::vector< ::rtl::OUString > aResult; + ::std::vector< OUString > aResult; if( xDiagram.is()) { @@ -293,7 +292,7 @@ uno::Sequence< ::rtl::OUString > DataSourceHelper::getUsedDataRanges( return ContainerHelper::ContainerToSequence( aResult ); } -uno::Sequence< ::rtl::OUString > DataSourceHelper::getUsedDataRanges( const uno::Reference< frame::XModel > & xChartModel ) +uno::Sequence< OUString > DataSourceHelper::getUsedDataRanges( const uno::Reference< frame::XModel > & xChartModel ) { uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); return getUsedDataRanges( xDiagram ); @@ -334,7 +333,7 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData( bool DataSourceHelper::detectRangeSegmentation( const uno::Reference< frame::XModel >& xChartModel - , ::rtl::OUString& rOutRangeString + , OUString& rOutRangeString , ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping , bool& rOutUseColumns , bool& rOutFirstCellAsLabel @@ -400,7 +399,7 @@ bool DataSourceHelper::allArgumentsForRectRangeDetected( } else if ( aProperty.Name == "CellRangeRepresentation" ) { - ::rtl::OUString aRange; + OUString aRange; bHasCellRangeRepresentation = (aProperty.Value.hasValue() && (aProperty.Value >>= aRange) && !aRange.isEmpty()); } @@ -435,7 +434,7 @@ void DataSourceHelper::setRangeSegmentation( if( !xTemplateFactory.is() ) return; - ::rtl::OUString aRangeString; + OUString aRangeString; bool bDummy; uno::Sequence< sal_Int32 > aDummy; readArguments( xDataProvider->detectArguments( pressUsedDataIntoRectangularFormat( xChartDocument )), diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx index 1b54b355edbe..1356237d5515 100644 --- a/chart2/source/tools/DiagramHelper.cxx +++ b/chart2/source/tools/DiagramHelper.cxx @@ -65,7 +65,6 @@ using namespace ::std; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; -using ::rtl::OUString; using ::com::sun::star::chart2::XAnyDescriptionAccess; namespace chart @@ -955,12 +954,12 @@ Reference< data::XLabeledDataSequence > } void lcl_generateAutomaticCategoriesFromChartType( - Sequence< rtl::OUString >& rRet, + Sequence< OUString >& rRet, const Reference< XChartType >& xChartType ) { if(!xChartType.is()) return; - rtl::OUString aMainSeq( xChartType->getRoleOfSequenceForSeriesLabel() ); + OUString aMainSeq( xChartType->getRoleOfSequenceForSeriesLabel() ); Reference< XDataSeriesContainer > xSeriesCnt( xChartType, uno::UNO_QUERY ); if( xSeriesCnt.is() ) { @@ -984,9 +983,9 @@ void lcl_generateAutomaticCategoriesFromChartType( } } -Sequence< rtl::OUString > DiagramHelper::generateAutomaticCategoriesFromCooSys( const Reference< XCoordinateSystem > & xCooSys ) +Sequence< OUString > DiagramHelper::generateAutomaticCategoriesFromCooSys( const Reference< XCoordinateSystem > & xCooSys ) { - Sequence< rtl::OUString > aRet; + Sequence< OUString > aRet; Reference< XChartTypeContainer > xTypeCntr( xCooSys, uno::UNO_QUERY ); if( xTypeCntr.is() ) @@ -1002,10 +1001,10 @@ Sequence< rtl::OUString > DiagramHelper::generateAutomaticCategoriesFromCooSys( return aRet; } -Sequence< rtl::OUString > DiagramHelper::getExplicitSimpleCategories( +Sequence< OUString > DiagramHelper::getExplicitSimpleCategories( const Reference< XChartDocument >& xChartDoc ) { - Sequence< rtl::OUString > aRet; + Sequence< OUString > aRet; uno::Reference< frame::XModel > xChartModel( xChartDoc, uno::UNO_QUERY ); if(xChartModel.is()) { @@ -1251,8 +1250,8 @@ bool DiagramHelper::areChartTypesCompatible( const Reference< ::chart2::XChartTy if( !xFirstType.is() || !xSecondType.is() ) return false; - ::std::vector< ::rtl::OUString > aFirstRoles( ContainerHelper::SequenceToVector( xFirstType->getSupportedMandatoryRoles() ) ); - ::std::vector< ::rtl::OUString > aSecondRoles( ContainerHelper::SequenceToVector( xSecondType->getSupportedMandatoryRoles() ) ); + ::std::vector< OUString > aFirstRoles( ContainerHelper::SequenceToVector( xFirstType->getSupportedMandatoryRoles() ) ); + ::std::vector< OUString > aSecondRoles( ContainerHelper::SequenceToVector( xSecondType->getSupportedMandatoryRoles() ) ); ::std::sort( aFirstRoles.begin(), aFirstRoles.end() ); ::std::sort( aSecondRoles.begin(), aSecondRoles.end() ); return ( aFirstRoles == aSecondRoles ); @@ -1497,7 +1496,7 @@ bool DiagramHelper::isPieOrDonutChart( const ::com::sun::star::uno::Reference< if( xChartType .is() ) { - rtl::OUString aChartType = xChartType->getChartType(); + OUString aChartType = xChartType->getChartType(); if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) return true; } diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index 3e9a3d7c5e38..29f40e8c9925 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -33,8 +33,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::beans::Property; using ::osl::MutexGuard; @@ -327,9 +325,9 @@ void ErrorBar::fireModifyEvent() // ================================================================================ -uno::Sequence< ::rtl::OUString > ErrorBar::getSupportedServiceNames_Static() +uno::Sequence< OUString > ErrorBar::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; aServices[ 1 ] = "com.sun.star.chart2.ErrorBar"; return aServices; diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx index 538a9d0dad80..949e18990ade 100644 --- a/chart2/source/tools/ExplicitCategoriesProvider.cxx +++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::std::vector; @@ -109,7 +108,7 @@ ExplicitCategoriesProvider::ExplicitCategoriesProvider( const Reference< chart2: if( !aSeries.empty() ) { uno::Reference< data::XDataSource > xSeriesSource( aSeries.front(), uno::UNO_QUERY ); - ::rtl::OUString aStringDummy; + OUString aStringDummy; bool bDummy; uno::Sequence< sal_Int32 > aSeqDummy; DataSourceHelper::readArguments( xDataProvider->detectArguments( xSeriesSource), @@ -180,7 +179,7 @@ std::vector<sal_Int32> lcl_getLimitingBorders( const std::vector< ComplexCategor return aLimitingBorders; } -void ExplicitCategoriesProvider::convertCategoryAnysToText( uno::Sequence< rtl::OUString >& rOutTexts, const uno::Sequence< uno::Any >& rInAnys, Reference< frame::XModel > xChartModel ) +void ExplicitCategoriesProvider::convertCategoryAnysToText( uno::Sequence< OUString >& rOutTexts, const uno::Sequence< uno::Any >& rInAnys, Reference< frame::XModel > xChartModel ) { sal_Int32 nCount = rInAnys.getLength(); if(!nCount) @@ -207,7 +206,7 @@ void ExplicitCategoriesProvider::convertCategoryAnysToText( uno::Sequence< rtl:: for(sal_Int32 nN=0;nN<nCount;nN++) { - rtl::OUString aText; + OUString aText; uno::Any aAny = rInAnys[nN]; if( aAny.hasValue() ) { @@ -247,7 +246,7 @@ public: {} virtual sal_Int32 getLevelCount() const; - virtual uno::Sequence< rtl::OUString > getStringsForLevel( sal_Int32 nIndex ) const; + virtual uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const; private: const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< @@ -260,9 +259,9 @@ sal_Int32 SplitCategoriesProvider_ForLabeledDataSequences::getLevelCount() const { return m_rSplitCategoriesList.getLength(); } -uno::Sequence< rtl::OUString > SplitCategoriesProvider_ForLabeledDataSequences::getStringsForLevel( sal_Int32 nLevel ) const +uno::Sequence< OUString > SplitCategoriesProvider_ForLabeledDataSequences::getStringsForLevel( sal_Int32 nLevel ) const { - uno::Sequence< rtl::OUString > aRet; + uno::Sequence< OUString > aRet; Reference< data::XLabeledDataSequence > xLabeledDataSequence( m_rSplitCategoriesList[nLevel] ); if( xLabeledDataSequence.is() ) { @@ -274,7 +273,7 @@ uno::Sequence< rtl::OUString > SplitCategoriesProvider_ForLabeledDataSequences:: } std::vector< ComplexCategory > lcl_DataSequenceToComplexCategoryVector( - const uno::Sequence< rtl::OUString >& rStrings + const uno::Sequence< OUString >& rStrings , const std::vector<sal_Int32>& rLimitingBorders, bool bCreateSingleCategories ) { std::vector< ComplexCategory > aResult; @@ -535,7 +534,7 @@ void ExplicitCategoriesProvider::init() } -Sequence< ::rtl::OUString > ExplicitCategoriesProvider::getSimpleCategories() +Sequence< OUString > ExplicitCategoriesProvider::getSimpleCategories() { if( !m_bIsExplicitCategoriesInited ) { diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx index 75e66ce52a32..c76138ac809f 100644 --- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx @@ -26,8 +26,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace chart { diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx index 64b822edd314..f70332535489 100644 --- a/chart2/source/tools/FillProperties.cxx +++ b/chart2/source/tools/FillProperties.cxx @@ -61,7 +61,7 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s rOutProperties.push_back( Property( "FillTransparenceGradientName", FillProperties::PROP_FILL_TRANSPARENCE_GRADIENT_NAME, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -69,7 +69,7 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s rOutProperties.push_back( Property( "FillGradientName", FillProperties::PROP_FILL_GRADIENT_NAME, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -84,7 +84,7 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s rOutProperties.push_back( Property( "FillHatchName", FillProperties::PROP_FILL_HATCH_NAME, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -104,7 +104,7 @@ void lcl_AddPropertiesToVector_only_BitmapProperties( ::std::vector< ::com::sun: rOutProperties.push_back( Property( "FillBitmapName", FillProperties::PROP_FILL_BITMAP_NAME, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); diff --git a/chart2/source/tools/FormattedStringHelper.cxx b/chart2/source/tools/FormattedStringHelper.cxx index 43593bcd49f7..82ad2392bf69 100644 --- a/chart2/source/tools/FormattedStringHelper.cxx +++ b/chart2/source/tools/FormattedStringHelper.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using rtl::OUString; Sequence< Reference< chart2::XFormattedString > > FormattedStringHelper::createFormattedStringSequence( diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx index db2031d52918..27632e1d070d 100644 --- a/chart2/source/tools/ImplOPropertySet.cxx +++ b/chart2/source/tools/ImplOPropertySet.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx index e8d4def8f24d..61dfaa96598f 100644 --- a/chart2/source/tools/InternalData.cxx +++ b/chart2/source/tools/InternalData.cxx @@ -27,7 +27,6 @@ #include <iterator> using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::std; diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index 3a4303b08528..147afc8a2935 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -52,8 +52,6 @@ using namespace ::std; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace chart { @@ -329,7 +327,7 @@ InternalDataProvider::InternalDataProvider( const Reference< chart2::XChartDocum //data in columns? { - ::rtl::OUString aRangeString; + OUString aRangeString; bool bFirstCellAsLabel = true; bool bHasCategories = true; uno::Sequence< sal_Int32 > aSequenceMapping; @@ -1269,7 +1267,7 @@ public: {} virtual sal_Int32 getLevelCount() const; - virtual uno::Sequence< rtl::OUString > getStringsForLevel( sal_Int32 nIndex ) const; + virtual uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const; private: const ::std::vector< ::std::vector< uno::Any > >& m_rComplexDescriptions; @@ -1279,9 +1277,9 @@ sal_Int32 SplitCategoriesProvider_ForComplexDescriptions::getLevelCount() const { return lcl_getInnerLevelCount( m_rComplexDescriptions ); } -uno::Sequence< rtl::OUString > SplitCategoriesProvider_ForComplexDescriptions::getStringsForLevel( sal_Int32 nLevel ) const +uno::Sequence< OUString > SplitCategoriesProvider_ForComplexDescriptions::getStringsForLevel( sal_Int32 nLevel ) const { - uno::Sequence< rtl::OUString > aResult; + uno::Sequence< OUString > aResult; if( nLevel < lcl_getInnerLevelCount( m_rComplexDescriptions ) ) { aResult.realloc( m_rComplexDescriptions.size() ); @@ -1354,15 +1352,15 @@ Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexRowDes { return lcl_convertComplexAnyVectorToStringSequence( m_aInternalData.getComplexRowLabels() ); } -void SAL_CALL InternalDataProvider::setComplexRowDescriptions( const Sequence< Sequence< ::rtl::OUString > >& aRowDescriptions ) throw (uno::RuntimeException) +void SAL_CALL InternalDataProvider::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& aRowDescriptions ) throw (uno::RuntimeException) { m_aInternalData.setComplexRowLabels( lcl_convertComplexStringSequenceToAnyVector(aRowDescriptions) ); } -Sequence< Sequence< ::rtl::OUString > > SAL_CALL InternalDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException) +Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException) { return lcl_convertComplexAnyVectorToStringSequence( m_aInternalData.getComplexColumnLabels() ); } -void SAL_CALL InternalDataProvider::setComplexColumnDescriptions( const Sequence< Sequence< ::rtl::OUString > >& aColumnDescriptions ) throw (uno::RuntimeException) +void SAL_CALL InternalDataProvider::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& aColumnDescriptions ) throw (uno::RuntimeException) { m_aInternalData.setComplexColumnLabels( lcl_convertComplexStringSequenceToAnyVector(aColumnDescriptions) ); } diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx index a7ac13fb9b15..8b8785d5d353 100644 --- a/chart2/source/tools/LabeledDataSequence.cxx +++ b/chart2/source/tools/LabeledDataSequence.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/tools/LineProperties.cxx b/chart2/source/tools/LineProperties.cxx index 54de032cf02c..e3c88d9860c3 100644 --- a/chart2/source/tools/LineProperties.cxx +++ b/chart2/source/tools/LineProperties.cxx @@ -54,7 +54,7 @@ void LineProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "LineDashName", PROP_LINE_DASH_NAME, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT | beans::PropertyAttribute::MAYBEVOID )); diff --git a/chart2/source/tools/LinearRegressionCurveCalculator.cxx b/chart2/source/tools/LinearRegressionCurveCalculator.cxx index f168f63429d3..5b388ee4139e 100644 --- a/chart2/source/tools/LinearRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LinearRegressionCurveCalculator.cxx @@ -26,8 +26,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace chart { diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx index 29ea58f996ff..af56a64e19c6 100644 --- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx @@ -26,8 +26,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace chart { diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx index 0551cbdbb901..10bebac3c077 100644 --- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx @@ -25,8 +25,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace chart { diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx index 3cb8953f0c3a..359017940244 100644 --- a/chart2/source/tools/ModifyListenerHelper.cxx +++ b/chart2/source/tools/ModifyListenerHelper.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { diff --git a/chart2/source/tools/NameContainer.cxx b/chart2/source/tools/NameContainer.cxx index fe181d360dbd..130d277329f6 100644 --- a/chart2/source/tools/NameContainer.cxx +++ b/chart2/source/tools/NameContainer.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; -using ::rtl::OUString; //............................................................................. @@ -34,7 +33,7 @@ namespace chart //............................................................................. uno::Reference< container::XNameContainer > createNameContainer( - const ::com::sun::star::uno::Type& rType, const rtl::OUString& rServicename, const rtl::OUString& rImplementationName ) + const ::com::sun::star::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName ) { return new NameContainer( rType, rServicename, rImplementationName ); } diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx index 508e2716f489..a1080b34c792 100644 --- a/chart2/source/tools/NumberFormatterWrapper.cxx +++ b/chart2/source/tools/NumberFormatterWrapper.cxx @@ -46,7 +46,7 @@ FixedNumberFormatter::~FixedNumberFormatter() { } -rtl::OUString FixedNumberFormatter::getFormattedString( double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const +OUString FixedNumberFormatter::getFormattedString( double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const { return m_aNumberFormatterWrapper.getFormattedString( m_nNumberFormatKey, fValue, rLabelColor, rbColorChanged ); @@ -62,7 +62,7 @@ NumberFormatterWrapper::NumberFormatterWrapper( const uno::Reference< util::XNum { uno::Reference<beans::XPropertySet> xProp(m_xNumberFormatsSupplier,uno::UNO_QUERY); - rtl::OUString sNullDate( "NullDate" ); + OUString sNullDate( "NullDate" ); if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName(sNullDate) ) m_aNullDate = xProp->getPropertyValue(sNullDate); SvNumberFormatsSupplierObj* pSupplierObj = SvNumberFormatsSupplierObj::getImplementation( xSupplier ); @@ -99,7 +99,7 @@ Date NumberFormatterWrapper::getNullDate() const return aRet; } -rtl::OUString NumberFormatterWrapper::getFormattedString( +OUString NumberFormatterWrapper::getFormattedString( sal_Int32 nNumberFormatKey, double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const { String aText; @@ -130,7 +130,7 @@ rtl::OUString NumberFormatterWrapper::getFormattedString( { m_pNumberFormatter->ChangeNullDate(nDay,nMonth,nYear); } - rtl::OUString aRet( aText ); + OUString aRet( aText ); if(pTextColor) { diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx index a6f437686add..f244f955a894 100644 --- a/chart2/source/tools/OPropertySet.cxx +++ b/chart2/source/tools/OPropertySet.cxx @@ -33,7 +33,6 @@ using ::com::sun::star::style::XStyleSupplier; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; -using ::rtl::OUString; using ::osl::MutexGuard; // needed for MS compiler diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index 8779f1dd9942..1097984274e3 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -46,8 +46,6 @@ namespace chart using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -using rtl::OUString; -using rtl::OUStringBuffer; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; @@ -366,11 +364,11 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject( if( xAxis.is() ) { Reference< XCoordinateSystem > xCooSys( AxisHelper::getCoordinateSystemOfAxis( xAxis, ChartModelHelper::findDiagram( xChartModel ) ) ); - rtl::OUString aCooSysParticle( createParticleForCoordinateSystem( xCooSys, xChartModel ) ); + OUString aCooSysParticle( createParticleForCoordinateSystem( xCooSys, xChartModel ) ); sal_Int32 nDimensionIndex=-1; sal_Int32 nAxisIndex=-1; AxisHelper::getIndicesForAxis( xAxis, xCooSys, nDimensionIndex, nAxisIndex ); - rtl::OUString aAxisParticle( createParticleForAxis( nDimensionIndex, nAxisIndex ) ); + OUString aAxisParticle( createParticleForAxis( nDimensionIndex, nAxisIndex ) ); return createClassifiedIdentifierForParticles( aCooSysParticle, aAxisParticle ); } @@ -515,8 +513,8 @@ OUString ObjectIdentifier::createClassifiedIdentifierForGrid( { //-1: main grid, 0: first subgrid etc - rtl::OUString aAxisCID( createClassifiedIdentifierForObject( xAxis, xChartModel ) ); - rtl::OUString aGridCID( addChildParticle( aAxisCID + OUString aAxisCID( createClassifiedIdentifierForObject( xAxis, xChartModel ) ); + OUString aGridCID( addChildParticle( aAxisCID , createChildParticleWithIndex( OBJECTTYPE_GRID, 0 ) ) ); if( nSubGridIndex >= 0 ) { @@ -1004,7 +1002,7 @@ OUString ObjectIdentifier::createDataCurveEquationCID( return createClassifiedIdentifierWithParent( OBJECTTYPE_DATA_CURVE_EQUATION, aParticleID, rSeriesParticle ); } -OUString ObjectIdentifier::addChildParticle( const rtl::OUString& rParticle, const rtl::OUString& rChildParticle ) +OUString ObjectIdentifier::addChildParticle( const OUString& rParticle, const OUString& rChildParticle ) { OUStringBuffer aRet(rParticle); @@ -1016,7 +1014,7 @@ OUString ObjectIdentifier::addChildParticle( const rtl::OUString& rParticle, con return aRet.makeStringAndClear(); } -rtl::OUString ObjectIdentifier::createChildParticleWithIndex( ObjectType eObjectType, sal_Int32 nIndex ) +OUString ObjectIdentifier::createChildParticleWithIndex( ObjectType eObjectType, sal_Int32 nIndex ) { OUStringBuffer aRet( getStringForType( eObjectType ) ); if( aRet.getLength() ) @@ -1027,7 +1025,7 @@ rtl::OUString ObjectIdentifier::createChildParticleWithIndex( ObjectType eObject return aRet.makeStringAndClear(); } -sal_Int32 ObjectIdentifier::getIndexFromParticleOrCID( const rtl::OUString& rParticleOrCID ) +sal_Int32 ObjectIdentifier::getIndexFromParticleOrCID( const OUString& rParticleOrCID ) { sal_Int32 nRet = -1; @@ -1039,9 +1037,9 @@ sal_Int32 ObjectIdentifier::getIndexFromParticleOrCID( const rtl::OUString& rPar } OUString ObjectIdentifier::createSeriesSubObjectStub( ObjectType eSubObjectType - , const rtl::OUString& rSeriesParticle - , const rtl::OUString& rDragMethodServiceName - , const rtl::OUString& rDragParameterString ) + , const OUString& rSeriesParticle + , const OUString& rDragMethodServiceName + , const OUString& rDragParameterString ) { OUString aChildParticle( getStringForType( eSubObjectType ) ); aChildParticle+=("="); @@ -1084,7 +1082,7 @@ OUString ObjectIdentifier::getFullParentParticle( const OUString& rCID ) return aRet; } -OUString ObjectIdentifier::getObjectID( const rtl::OUString& rCID ) +OUString ObjectIdentifier::getObjectID( const OUString& rCID ) { OUString aRet; @@ -1341,7 +1339,7 @@ Reference< XDataSeries > ObjectIdentifier::getDataSeriesForCID( } Reference< XDiagram > ObjectIdentifier::getDiagramForCID( - const rtl::OUString& rObjectCID + const OUString& rObjectCID , const uno::Reference< frame::XModel >& xChartModel ) { Reference< XDiagram > xDiagram; @@ -1385,7 +1383,7 @@ OUString ObjectIdentifier::getSeriesParticleFromCID( const OUString& rCID ) return ObjectIdentifier::createParticleForSeries( nDiagramIndex, nCooSysIndex, nChartTypeIndex, nSeriesIndex ); } -OUString ObjectIdentifier::getMovedSeriesCID( const ::rtl::OUString& rObjectCID, sal_Bool bForward ) +OUString ObjectIdentifier::getMovedSeriesCID( const OUString& rObjectCID, sal_Bool bForward ) { sal_Int32 nDiagramIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rObjectCID, "CID/D=" ) ); sal_Int32 nCooSysIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rObjectCID, "CS=" ) ); diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx index b84032790e06..ef53b5dc4a55 100644 --- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx @@ -26,8 +26,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace chart { diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx index 746cf6a1a35b..fb6b0bfadd84 100644 --- a/chart2/source/tools/PropertyHelper.cxx +++ b/chart2/source/tools/PropertyHelper.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans; -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx index 545e4e697626..1d1a1d22edf8 100644 --- a/chart2/source/tools/RangeHighlighter.cxx +++ b/chart2/source/tools/RangeHighlighter.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx index f039aa67f7ce..9e41285f2afc 100644 --- a/chart2/source/tools/ReferenceSizeProvider.cxx +++ b/chart2/source/tools/ReferenceSizeProvider.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; // ================================================================================ diff --git a/chart2/source/tools/RegressionCalculationHelper.hxx b/chart2/source/tools/RegressionCalculationHelper.hxx index da1c0ca9c5d0..4cf49663e678 100644 --- a/chart2/source/tools/RegressionCalculationHelper.hxx +++ b/chart2/source/tools/RegressionCalculationHelper.hxx @@ -25,7 +25,7 @@ #include <functional> #include <vector> -#define NUMBER_TO_STR(number) (::rtl::OStringToOUString(::rtl::math::doubleToString( \ +#define NUMBER_TO_STR(number) (OStringToOUString(::rtl::math::doubleToString( \ number, rtl_math_StringFormat_G, 4, '.', true ),RTL_TEXTENCODING_ASCII_US )) #define UC_SPACE (sal_Unicode(' ')) diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx index 8d811aef8f7d..b2f6b52f6db0 100644 --- a/chart2/source/tools/RegressionCurveCalculator.cxx +++ b/chart2/source/tools/RegressionCurveCalculator.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx index 4c346c6f6938..08228bc0961f 100644 --- a/chart2/source/tools/RegressionCurveHelper.cxx +++ b/chart2/source/tools/RegressionCurveHelper.cxx @@ -43,7 +43,6 @@ using ::com::sun::star::uno::XComponentContext; using ::com::sun::star::lang::XServiceName; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Exception; -using ::rtl::OUString; namespace { @@ -87,7 +86,7 @@ Reference< XRegressionCurve > RegressionCurveHelper::createMeanValueLine( Reference< XRegressionCurve > RegressionCurveHelper::createRegressionCurveByServiceName( const Reference< XComponentContext > & xContext, - ::rtl::OUString aServiceName ) + OUString aServiceName ) { Reference< XRegressionCurve > xResult; @@ -115,7 +114,7 @@ Reference< XRegressionCurve > RegressionCurveHelper::createRegressionCurveByServ // ------------------------------------------------------------ Reference< XRegressionCurveCalculator > RegressionCurveHelper::createRegressionCurveCalculatorByServiceName( - ::rtl::OUString aServiceName ) + OUString aServiceName ) { Reference< XRegressionCurveCalculator > xResult; @@ -166,7 +165,7 @@ void RegressionCurveHelper::initializeCurveCalculator( { Reference< data::XDataSequence > xSeq( aDataSeqs[i]->getValues()); Reference< XPropertySet > xProp( xSeq, uno::UNO_QUERY_THROW ); - ::rtl::OUString aRole; + OUString aRole; if( xProp->getPropertyValue( "Role" ) >>= aRole ) { if( bUseXValuesIfAvailable && !bXValuesFound && aRole == "values-x" ) @@ -349,7 +348,7 @@ void RegressionCurveHelper::addRegressionCurve( } uno::Reference< chart2::XRegressionCurve > xCurve; - ::rtl::OUString aServiceName( lcl_getServiceNameForType( eType )); + OUString aServiceName( lcl_getServiceNameForType( eType )); if( !aServiceName.isEmpty()) { @@ -508,7 +507,7 @@ RegressionCurveHelper::tRegressionType RegressionCurveHelper::getRegressionType( Reference< lang::XServiceName > xServName( xCurve, uno::UNO_QUERY ); if( xServName.is()) { - ::rtl::OUString aServiceName( xServName->getServiceName() ); + OUString aServiceName( xServName->getServiceName() ); if( aServiceName == "com.sun.star.chart2.LinearRegressionCurve" ) { diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index 7312081755be..0522af8b4cc5 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -32,8 +32,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::beans::Property; using ::osl::MutexGuard; @@ -176,7 +174,7 @@ void SAL_CALL RegressionCurveModel::setEquationProperties( const uno::Reference< } // ____ XServiceName ____ -::rtl::OUString SAL_CALL RegressionCurveModel::getServiceName() +OUString SAL_CALL RegressionCurveModel::getServiceName() throw (uno::RuntimeException) { switch( m_eRegressionCurveType ) @@ -193,7 +191,7 @@ void SAL_CALL RegressionCurveModel::setEquationProperties( const uno::Reference< return OUString("com.sun.star.chart2.PotentialRegressionCurve"); } - return ::rtl::OUString(); + return OUString(); } // ____ XModifyBroadcaster ____ @@ -299,9 +297,9 @@ MeanValueRegressionCurve::MeanValueRegressionCurve( {} MeanValueRegressionCurve::~MeanValueRegressionCurve() {} -uno::Sequence< ::rtl::OUString > MeanValueRegressionCurve::getSupportedServiceNames_Static() +uno::Sequence< OUString > MeanValueRegressionCurve::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; aServices[ 1 ] = "com.sun.star.chart2.MeanValueRegressionCurve"; return aServices; @@ -327,9 +325,9 @@ LinearRegressionCurve::LinearRegressionCurve( {} LinearRegressionCurve::~LinearRegressionCurve() {} -uno::Sequence< ::rtl::OUString > LinearRegressionCurve::getSupportedServiceNames_Static() +uno::Sequence< OUString > LinearRegressionCurve::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; aServices[ 1 ] = "com.sun.star.chart2.LinearRegressionCurve"; return aServices; @@ -355,9 +353,9 @@ LogarithmicRegressionCurve::LogarithmicRegressionCurve( {} LogarithmicRegressionCurve::~LogarithmicRegressionCurve() {} -uno::Sequence< ::rtl::OUString > LogarithmicRegressionCurve::getSupportedServiceNames_Static() +uno::Sequence< OUString > LogarithmicRegressionCurve::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; aServices[ 1 ] = "com.sun.star.chart2.LogarithmicRegressionCurve"; return aServices; @@ -383,9 +381,9 @@ ExponentialRegressionCurve::ExponentialRegressionCurve( {} ExponentialRegressionCurve::~ExponentialRegressionCurve() {} -uno::Sequence< ::rtl::OUString > ExponentialRegressionCurve::getSupportedServiceNames_Static() +uno::Sequence< OUString > ExponentialRegressionCurve::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; aServices[ 1 ] = "com.sun.star.chart2.ExponentialRegressionCurve"; return aServices; @@ -411,9 +409,9 @@ PotentialRegressionCurve::PotentialRegressionCurve( {} PotentialRegressionCurve::~PotentialRegressionCurve() {} -uno::Sequence< ::rtl::OUString > PotentialRegressionCurve::getSupportedServiceNames_Static() +uno::Sequence< OUString > PotentialRegressionCurve::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; aServices[ 1 ] = "com.sun.star.chart2.PotentialRegressionCurve"; return aServices; diff --git a/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx index 1670316defdf..8434d21731de 100644 --- a/chart2/source/tools/RegressionCurveModel.hxx +++ b/chart2/source/tools/RegressionCurveModel.hxx @@ -99,7 +99,7 @@ protected: throw (::com::sun::star::uno::RuntimeException); // ____ XServiceName ____ - virtual ::rtl::OUString SAL_CALL getServiceName() + virtual OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException); // ____ XCloneable ____ diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index ef2c4934d93c..16f771a16729 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -115,7 +115,7 @@ private: ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SHOW, false ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SHOW_CORRELATION_COEFF, false ); - //::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SEPARATOR, ::rtl::OUString( sal_Unicode( '\n' ))); + //::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SEPARATOR, OUString( sal_Unicode( '\n' ))); // override other defaults ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::FillProperties::PROP_FILL_STYLE, drawing::FillStyle_NONE ); @@ -309,11 +309,11 @@ void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference< // ================================================================================ -uno::Sequence< ::rtl::OUString > RegressionEquation::getSupportedServiceNames_Static() +uno::Sequence< OUString > RegressionEquation::getSupportedServiceNames_Static() { const sal_Int32 nNumServices( 5 ); sal_Int32 nI = 0; - uno::Sequence< ::rtl::OUString > aServices( nNumServices ); + uno::Sequence< OUString > aServices( nNumServices ); aServices[ nI++ ] = lcl_aServiceName; aServices[ nI++ ] = "com.sun.star.beans.PropertySet"; aServices[ nI++ ] = "com.sun.star.drawing.FillProperties"; diff --git a/chart2/source/tools/RelativeSizeHelper.cxx b/chart2/source/tools/RelativeSizeHelper.cxx index 53883ae0c1f7..bc4dca1bf67a 100644 --- a/chart2/source/tools/RelativeSizeHelper.cxx +++ b/chart2/source/tools/RelativeSizeHelper.cxx @@ -30,7 +30,6 @@ using namespace ::std; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::makeAny; using ::com::sun::star::uno::Exception; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx index 04ce78c5fcb8..5dc408359749 100644 --- a/chart2/source/tools/Scaling.cxx +++ b/chart2/source/tools/Scaling.cxx @@ -74,16 +74,16 @@ LogarithmicScaling::getInverseScaling() return new ExponentialScaling( m_fBase ); } - ::rtl::OUString SAL_CALL + OUString SAL_CALL LogarithmicScaling::getServiceName() throw (uno::RuntimeException) { return lcl_aServiceName_Logarithmic; } -uno::Sequence< ::rtl::OUString > LogarithmicScaling::getSupportedServiceNames_Static() +uno::Sequence< OUString > LogarithmicScaling::getSupportedServiceNames_Static() { - return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_Logarithmic, 1 ); + return uno::Sequence< OUString >( & lcl_aServiceName_Logarithmic, 1 ); } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static @@ -125,16 +125,16 @@ ExponentialScaling::getInverseScaling() return new LogarithmicScaling( m_fBase ); } - ::rtl::OUString SAL_CALL + OUString SAL_CALL ExponentialScaling::getServiceName() throw (uno::RuntimeException) { return lcl_aServiceName_Exponential; } -uno::Sequence< ::rtl::OUString > ExponentialScaling::getSupportedServiceNames_Static() +uno::Sequence< OUString > ExponentialScaling::getSupportedServiceNames_Static() { - return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_Exponential, 1 ); + return uno::Sequence< OUString >( & lcl_aServiceName_Exponential, 1 ); } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static @@ -178,16 +178,16 @@ uno::Reference< XScaling > SAL_CALL return new LinearScaling( 1.0 / m_fSlope, m_fOffset / m_fSlope ); } - ::rtl::OUString SAL_CALL + OUString SAL_CALL LinearScaling::getServiceName() throw (uno::RuntimeException) { return lcl_aServiceName_Linear; } -uno::Sequence< ::rtl::OUString > LinearScaling::getSupportedServiceNames_Static() +uno::Sequence< OUString > LinearScaling::getSupportedServiceNames_Static() { - return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_Linear, 1 ); + return uno::Sequence< OUString >( & lcl_aServiceName_Linear, 1 ); } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static @@ -229,16 +229,16 @@ uno::Reference< XScaling > SAL_CALL return new PowerScaling( 1.0 / m_fExponent ); } - ::rtl::OUString SAL_CALL + OUString SAL_CALL PowerScaling::getServiceName() throw (uno::RuntimeException) { return lcl_aServiceName_Power; } -uno::Sequence< ::rtl::OUString > PowerScaling::getSupportedServiceNames_Static() +uno::Sequence< OUString > PowerScaling::getSupportedServiceNames_Static() { - return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_Power, 1 ); + return uno::Sequence< OUString >( & lcl_aServiceName_Power, 1 ); } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx index 81f47e0c2da9..99d9e4267835 100644 --- a/chart2/source/tools/StatisticsHelper.cxx +++ b/chart2/source/tools/StatisticsHelper.cxx @@ -33,8 +33,6 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; namespace diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx index 4805390c4b8c..32406a57770b 100644 --- a/chart2/source/tools/ThreeDHelper.cxx +++ b/chart2/source/tools/ThreeDHelper.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::rtl::math::cos; using ::rtl::math::sin; using ::rtl::math::tan; @@ -1339,8 +1338,8 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); sal_Int32 nSeriesCount = static_cast<sal_Int32>( aSeriesList.size() ); - rtl::OUString aPercentDiagonalPropertyName( "PercentDiagonal" ); - rtl::OUString aBorderStylePropertyName( "BorderStyle" ); + OUString aPercentDiagonalPropertyName( "PercentDiagonal" ); + OUString aBorderStylePropertyName( "BorderStyle" ); for( sal_Int32 nS = 0; nS < nSeriesCount; ++nS ) { diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx index f618780e8876..c5b74b54fcd9 100644 --- a/chart2/source/tools/TitleHelper.cxx +++ b/chart2/source/tools/TitleHelper.cxx @@ -132,7 +132,7 @@ uno::Reference< XTitle > TitleHelper::getTitle( TitleHelper::eTitleType nTitleIn uno::Reference< XTitle > TitleHelper::createTitle( TitleHelper::eTitleType eTitleType - , const rtl::OUString& rTitleText + , const OUString& rTitleText , const uno::Reference< frame::XModel >& xModel , const uno::Reference< uno::XComponentContext > & xContext , ReferenceSizeProvider * pRefSizeProvider ) @@ -239,9 +239,9 @@ uno::Reference< XTitle > TitleHelper::createTitle( } -rtl::OUString TitleHelper::getCompleteString( const uno::Reference< XTitle >& xTitle ) +OUString TitleHelper::getCompleteString( const uno::Reference< XTitle >& xTitle ) { - rtl::OUString aRet; + OUString aRet; if(!xTitle.is()) return aRet; uno::Sequence< uno::Reference< XFormattedString > > aStringList = xTitle->getText(); @@ -250,7 +250,7 @@ rtl::OUString TitleHelper::getCompleteString( const uno::Reference< XTitle >& xT return aRet; } -void TitleHelper::setCompleteString( const rtl::OUString& rNewText +void TitleHelper::setCompleteString( const OUString& rNewText , const uno::Reference< XTitle >& xTitle , const uno::Reference< uno::XComponentContext > & xContext , float * pDefaultCharHeight /* = 0 */ ) @@ -259,7 +259,7 @@ void TitleHelper::setCompleteString( const rtl::OUString& rNewText if(!xTitle.is()) return; - rtl::OUString aNewText = rNewText; + OUString aNewText = rNewText; bool bStacked = false; uno::Reference< beans::XPropertySet > xTitleProperties( xTitle, uno::UNO_QUERY ); @@ -269,8 +269,8 @@ void TitleHelper::setCompleteString( const rtl::OUString& rNewText if( bStacked ) { //#i99841# remove linebreaks that were added for vertical stacking - rtl::OUStringBuffer aUnstackedStr; - rtl::OUStringBuffer aSource(rNewText); + OUStringBuffer aUnstackedStr; + OUStringBuffer aSource(rNewText); bool bBreakIgnored = false; sal_Int32 nLen = rNewText.getLength(); diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx index 59c26759add0..33c99e554f2c 100644 --- a/chart2/source/tools/UncachedDataSequence.cxx +++ b/chart2/source/tools/UncachedDataSequence.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -using ::rtl::OUString; using ::osl::MutexGuard; // necessary for MS compiler @@ -282,7 +281,7 @@ uno::Type SAL_CALL UncachedDataSequence::getElementType() } // ____ XNamed ____ -::rtl::OUString SAL_CALL UncachedDataSequence::getName() +OUString SAL_CALL UncachedDataSequence::getName() throw (uno::RuntimeException) { return m_aSourceRepresentation; diff --git a/chart2/source/tools/WeakListenerAdapter.cxx b/chart2/source/tools/WeakListenerAdapter.cxx index 899e28dd7bb2..0c8b9736c6aa 100644 --- a/chart2/source/tools/WeakListenerAdapter.cxx +++ b/chart2/source/tools/WeakListenerAdapter.cxx @@ -24,7 +24,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/tools/WrappedDefaultProperty.cxx b/chart2/source/tools/WrappedDefaultProperty.cxx index f75c62b4d657..6304660930e2 100644 --- a/chart2/source/tools/WrappedDefaultProperty.cxx +++ b/chart2/source/tools/WrappedDefaultProperty.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/tools/WrappedDirectStateProperty.cxx b/chart2/source/tools/WrappedDirectStateProperty.cxx index f98c029d8b07..7ba667b355bf 100644 --- a/chart2/source/tools/WrappedDirectStateProperty.cxx +++ b/chart2/source/tools/WrappedDirectStateProperty.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx index 069d18ab2b00..101fd03bd3fe 100644 --- a/chart2/source/tools/WrappedIgnoreProperty.cxx +++ b/chart2/source/tools/WrappedIgnoreProperty.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; //............................................................................. namespace chart @@ -85,7 +84,7 @@ beans::PropertyState WrappedIgnoreProperty::getPropertyState( const Reference< b void WrappedIgnoreProperties::addIgnoreLineProperties( std::vector< WrappedProperty* >& rList ) { rList.push_back( new WrappedIgnoreProperty( "LineStyle", uno::makeAny( drawing::LineStyle_SOLID ) ) ); - rList.push_back( new WrappedIgnoreProperty( "LineDashName", uno::makeAny( rtl::OUString() ) ) ); + rList.push_back( new WrappedIgnoreProperty( "LineDashName", uno::makeAny( OUString() ) ) ); rList.push_back( new WrappedIgnoreProperty( "LineColor", uno::makeAny( sal_Int32(0) ) ) ); rList.push_back( new WrappedIgnoreProperty( "LineTransparence", uno::makeAny( sal_Int16(0) ) ) ); rList.push_back( new WrappedIgnoreProperty( "LineWidth", uno::makeAny( sal_Int32(0) ) ) ); @@ -103,20 +102,20 @@ void WrappedIgnoreProperties::addIgnoreFillProperties_without_BitmapProperties( rList.push_back( new WrappedIgnoreProperty( "FillStyle", uno::makeAny( drawing::FillStyle_SOLID ) ) ); rList.push_back( new WrappedIgnoreProperty( "FillColor", uno::makeAny( sal_Int32(-1) ) ) ); rList.push_back( new WrappedIgnoreProperty( "FillTransparence", uno::makeAny( sal_Int16(0) ) ) ); - rList.push_back( new WrappedIgnoreProperty( "FillTransparenceGradientName", uno::makeAny( ::rtl::OUString() ) ) ); + rList.push_back( new WrappedIgnoreProperty( "FillTransparenceGradientName", uno::makeAny( OUString() ) ) ); // rList.push_back( new WrappedIgnoreProperty( "FillTransparenceGradient", uno::makeAny( awt::Gradient() ) ) ); - rList.push_back( new WrappedIgnoreProperty( "FillGradientName", uno::makeAny( ::rtl::OUString() ) ) ); + rList.push_back( new WrappedIgnoreProperty( "FillGradientName", uno::makeAny( OUString() ) ) ); // rList.push_back( new WrappedIgnoreProperty( "FillGradient", uno::makeAny( awt::Gradient() ) ) ); - rList.push_back( new WrappedIgnoreProperty( "FillHatchName", uno::makeAny( ::rtl::OUString() ) ) ); + rList.push_back( new WrappedIgnoreProperty( "FillHatchName", uno::makeAny( OUString() ) ) ); // rList.push_back( new WrappedIgnoreProperty( "FillHatch", uno::makeAny( drawing::Hatch() ) ) ); rList.push_back( new WrappedIgnoreProperty( "FillBackground", uno::makeAny( sal_Bool(sal_False) ) ) ); } void WrappedIgnoreProperties::addIgnoreFillProperties_only_BitmapProperties( ::std::vector< WrappedProperty* >& rList ) { -// rList.push_back( new WrappedIgnoreProperty( "FillBitmapName", uno::makeAny( ::rtl::OUString() ) ) ); +// rList.push_back( new WrappedIgnoreProperty( "FillBitmapName", uno::makeAny( OUString() ) ) ); // rList.push_back( new WrappedIgnoreProperty( "FillBitmap", uno::makeAny( uno::Reference< awt::XBitmap > (0) ) ) ); -// rList.push_back( new WrappedIgnoreProperty( "FillBitmapURL", uno::makeAny( ::rtl::OUString() ) ) ); +// rList.push_back( new WrappedIgnoreProperty( "FillBitmapURL", uno::makeAny( OUString() ) ) ); rList.push_back( new WrappedIgnoreProperty( "FillBitmapOffsetX", uno::makeAny( sal_Int16(0) ) ) ); rList.push_back( new WrappedIgnoreProperty( "FillBitmapOffsetY", uno::makeAny( sal_Int16(0) ) ) ); rList.push_back( new WrappedIgnoreProperty( "FillBitmapPositionOffsetX", uno::makeAny( sal_Int16(0) ) ) ); diff --git a/chart2/source/tools/WrappedProperty.cxx b/chart2/source/tools/WrappedProperty.cxx index c4156a4efff7..dd4d6e93a5ec 100644 --- a/chart2/source/tools/WrappedProperty.cxx +++ b/chart2/source/tools/WrappedProperty.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; //............................................................................. @@ -47,7 +46,7 @@ const OUString& WrappedProperty::getOuterName() const return m_aOuterName; } -::rtl::OUString WrappedProperty::getInnerName() const +OUString WrappedProperty::getInnerName() const { return m_aInnerName; } @@ -108,7 +107,7 @@ beans::PropertyState WrappedProperty::getPropertyState( const Reference< beans:: throw (beans::UnknownPropertyException, uno::RuntimeException) { beans::PropertyState aState = beans::PropertyState_DIRECT_VALUE; - rtl::OUString aInnerName( this->getInnerName() ); + OUString aInnerName( this->getInnerName() ); if( xInnerPropertyState.is() && !aInnerName.isEmpty() ) aState = xInnerPropertyState->getPropertyState( aInnerName ); else diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx index 5b82509d70d1..07a0cdfc6147 100644 --- a/chart2/source/tools/WrappedPropertySet.cxx +++ b/chart2/source/tools/WrappedPropertySet.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; -using ::rtl::OUString; WrappedPropertySet::WrappedPropertySet() : MutexContainer() @@ -248,7 +247,7 @@ void SAL_CALL WrappedPropertySet::setPropertyValues( const Sequence< OUString >& sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() ); for(sal_Int32 nN=0; nN<nMinCount; nN++) { - ::rtl::OUString aPropertyName( rNameSeq[nN] ); + OUString aPropertyName( rNameSeq[nN] ); try { this->setPropertyValue( aPropertyName, rValueSeq[nN] ); @@ -276,7 +275,7 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyValues( const Sequence< { try { - ::rtl::OUString aPropertyName( rNameSeq[nN] ); + OUString aPropertyName( rNameSeq[nN] ); aRetSeq[nN] = this->getPropertyValue( aPropertyName ); } catch( const beans::UnknownPropertyException& ex ) @@ -328,7 +327,7 @@ beans::PropertyState SAL_CALL WrappedPropertySet::getPropertyState( const OUStri return aState; } -const WrappedProperty* WrappedPropertySet::getWrappedProperty( const ::rtl::OUString& rOuterName ) +const WrappedProperty* WrappedPropertySet::getWrappedProperty( const OUString& rOuterName ) { sal_Int32 nHandle = getInfoHelper().getHandleByName( rOuterName ); return getWrappedProperty( nHandle ); @@ -351,7 +350,7 @@ Sequence< beans::PropertyState > SAL_CALL WrappedPropertySet::getPropertyStates( aRetSeq.realloc( rNameSeq.getLength() ); for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++) { - ::rtl::OUString aPropertyName( rNameSeq[nN] ); + OUString aPropertyName( rNameSeq[nN] ); aRetSeq[nN] = this->getPropertyState( aPropertyName ); } } @@ -394,7 +393,7 @@ void SAL_CALL WrappedPropertySet::setAllPropertiesToDefault( ) const Sequence< beans::Property >& rPropSeq = getPropertySequence(); for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++) { - ::rtl::OUString aPropertyName( rPropSeq[nN].Name ); + OUString aPropertyName( rPropSeq[nN].Name ); this->setPropertyToDefault( aPropertyName ); } } @@ -403,7 +402,7 @@ void SAL_CALL WrappedPropertySet::setPropertiesToDefault( const Sequence< OUStri { for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++) { - ::rtl::OUString aPropertyName( rNameSeq[nN] ); + OUString aPropertyName( rNameSeq[nN] ); this->setPropertyToDefault( aPropertyName ); } } @@ -416,7 +415,7 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyDefaults( const Sequence aRetSeq.realloc( rNameSeq.getLength() ); for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++) { - ::rtl::OUString aPropertyName( rNameSeq[nN] ); + OUString aPropertyName( rNameSeq[nN] ); aRetSeq[nN] = this->getPropertyDefault( aPropertyName ); } } diff --git a/chart2/source/tools/XMLRangeHelper.cxx b/chart2/source/tools/XMLRangeHelper.cxx index 77b79820d552..387bfd0fa4c1 100644 --- a/chart2/source/tools/XMLRangeHelper.cxx +++ b/chart2/source/tools/XMLRangeHelper.cxx @@ -25,8 +25,6 @@ #include <algorithm> #include <functional> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ================================================================================ @@ -39,7 +37,7 @@ namespace class lcl_Escape : public ::std::unary_function< sal_Unicode, void > { public: - lcl_Escape( ::rtl::OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {} + lcl_Escape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {} void operator() ( sal_Unicode aChar ) { static const sal_Unicode m_aQuote( '\'' ); @@ -52,7 +50,7 @@ public: } private: - ::rtl::OUStringBuffer & m_aResultBuffer; + OUStringBuffer & m_aResultBuffer; }; // ---------------------------------------- @@ -64,7 +62,7 @@ private: class lcl_UnEscape : public ::std::unary_function< sal_Unicode, void > { public: - lcl_UnEscape( ::rtl::OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {} + lcl_UnEscape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {} void operator() ( sal_Unicode aChar ) { static const sal_Unicode m_aBackslash( '\\' ); @@ -74,12 +72,12 @@ public: } private: - ::rtl::OUStringBuffer & m_aResultBuffer; + OUStringBuffer & m_aResultBuffer; }; // ---------------------------------------- -void lcl_getXMLStringForCell( const ::chart::XMLRangeHelper::Cell & rCell, rtl::OUStringBuffer * output ) +void lcl_getXMLStringForCell( const ::chart::XMLRangeHelper::Cell & rCell, OUStringBuffer * output ) { OSL_ASSERT(output != 0); @@ -113,7 +111,7 @@ void lcl_getXMLStringForCell( const ::chart::XMLRangeHelper::Cell & rCell, rtl:: } void lcl_getSingleCellAddressFromXMLString( - const ::rtl::OUString& rXMLString, + const OUString& rXMLString, sal_Int32 nStartPos, sal_Int32 nEndPos, ::chart::XMLRangeHelper::Cell & rOutCell ) { @@ -121,7 +119,7 @@ void lcl_getSingleCellAddressFromXMLString( static const sal_Unicode aDollar( '$' ); static const sal_Unicode aLetterA( 'A' ); - ::rtl::OUString aCellStr = rXMLString.copy( nStartPos, nEndPos - nStartPos + 1 ).toAsciiUpperCase(); + OUString aCellStr = rXMLString.copy( nStartPos, nEndPos - nStartPos + 1 ).toAsciiUpperCase(); const sal_Unicode* pStrArray = aCellStr.getStr(); sal_Int32 nLength = aCellStr.getLength(); sal_Int32 i = nLength - 1, nColumn = 0; @@ -157,10 +155,10 @@ void lcl_getSingleCellAddressFromXMLString( } bool lcl_getCellAddressFromXMLString( - const ::rtl::OUString& rXMLString, + const OUString& rXMLString, sal_Int32 nStartPos, sal_Int32 nEndPos, ::chart::XMLRangeHelper::Cell & rOutCell, - ::rtl::OUString& rOutTableName ) + OUString& rOutTableName ) { static const sal_Unicode aDot( '.' ); static const sal_Unicode aQuote( '\'' ); @@ -191,7 +189,7 @@ bool lcl_getCellAddressFromXMLString( { // there is a table name before the address - ::rtl::OUStringBuffer aTableNameBuffer; + OUStringBuffer aTableNameBuffer; const sal_Unicode * pTableName = rXMLString.getStr(); // remove escapes from table name @@ -204,7 +202,7 @@ bool lcl_getCellAddressFromXMLString( if( pBuf[ 0 ] == aQuote && pBuf[ aTableNameBuffer.getLength() - 1 ] == aQuote ) { - ::rtl::OUString aName = aTableNameBuffer.makeStringAndClear(); + OUString aName = aTableNameBuffer.makeStringAndClear(); rOutTableName = aName.copy( 1, aName.getLength() - 2 ); } else @@ -232,7 +230,7 @@ bool lcl_getCellAddressFromXMLString( } bool lcl_getCellRangeAddressFromXMLString( - const ::rtl::OUString& rXMLString, + const OUString& rXMLString, sal_Int32 nStartPos, sal_Int32 nEndPos, ::chart::XMLRangeHelper::CellRange & rOutRange ) { @@ -275,7 +273,7 @@ bool lcl_getCellRangeAddressFromXMLString( if( rOutRange.aTableName.isEmpty() ) bResult = false; - ::rtl::OUString sTableSecondName; + OUString sTableSecondName; if( bResult ) { bResult = lcl_getCellAddressFromXMLString( rXMLString, nDelimiterPos + 1, nEndPos, @@ -359,7 +357,7 @@ OUString getXMLStringFromCellRange( const CellRange & rRange ) static const sal_Unicode aSpace( ' ' ); static const sal_Unicode aQuote( '\'' ); - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; if( !(rRange.aTableName).isEmpty()) { |