diff options
Diffstat (limited to 'chart2/source/view')
35 files changed, 198 insertions, 204 deletions
diff --git a/chart2/source/view/axes/DateScaling.cxx b/chart2/source/view/axes/DateScaling.cxx index 2839c4d51bcf..934a01f85e60 100644 --- a/chart2/source/view/axes/DateScaling.cxx +++ b/chart2/source/view/axes/DateScaling.cxx @@ -99,15 +99,15 @@ uno::Reference< XScaling > SAL_CALL DateScaling::getInverseScaling() return new InverseDateScaling( m_aNullDate, m_nTimeUnit, m_bShifted ); } -::rtl::OUString SAL_CALL DateScaling::getServiceName() +OUString SAL_CALL DateScaling::getServiceName() throw (uno::RuntimeException) { return lcl_aServiceName_DateScaling; } -uno::Sequence< ::rtl::OUString > DateScaling::getSupportedServiceNames_Static() +uno::Sequence< OUString > DateScaling::getSupportedServiceNames_Static() { - return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_DateScaling, 1 ); + return uno::Sequence< OUString >( & lcl_aServiceName_DateScaling, 1 ); } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static @@ -180,15 +180,15 @@ uno::Reference< XScaling > SAL_CALL InverseDateScaling::getInverseScaling() return new DateScaling( m_aNullDate, m_nTimeUnit, m_bShifted ); } -::rtl::OUString SAL_CALL InverseDateScaling::getServiceName() +OUString SAL_CALL InverseDateScaling::getServiceName() throw (uno::RuntimeException) { return lcl_aServiceName_InverseDateScaling; } -uno::Sequence< ::rtl::OUString > InverseDateScaling::getSupportedServiceNames_Static() +uno::Sequence< OUString > InverseDateScaling::getSupportedServiceNames_Static() { - return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_InverseDateScaling, 1 ); + return uno::Sequence< OUString >( & lcl_aServiceName_InverseDateScaling, 1 ); } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static diff --git a/chart2/source/view/axes/DateScaling.hxx b/chart2/source/view/axes/DateScaling.hxx index 67a92bff985d..1ef6b448ca55 100644 --- a/chart2/source/view/axes/DateScaling.hxx +++ b/chart2/source/view/axes/DateScaling.hxx @@ -58,7 +58,7 @@ public: getInverseScaling() throw (::com::sun::star::uno::RuntimeException); // ____ XServiceName ____ - virtual ::rtl::OUString SAL_CALL getServiceName() + virtual OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException); private: @@ -90,7 +90,7 @@ public: getInverseScaling() throw (::com::sun::star::uno::RuntimeException); // ____ XServiceName ____ - virtual ::rtl::OUString SAL_CALL getServiceName() + virtual OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException); private: diff --git a/chart2/source/view/axes/Tickmarks.hxx b/chart2/source/view/axes/Tickmarks.hxx index 1fd4e42378e7..ae9a15228601 100644 --- a/chart2/source/view/axes/Tickmarks.hxx +++ b/chart2/source/view/axes/Tickmarks.hxx @@ -51,7 +51,7 @@ struct TickInfo ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xTextShape; - rtl::OUString aText;//used only for complex categories so far + OUString aText;//used only for complex categories so far sal_Int32 nFactorForLimitedTextWidth;//categories in higher levels of complex categories can have more place than a single simple category //methods: diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx index c2a12a6bcb7a..48b4f6698004 100644 --- a/chart2/source/view/axes/VAxisBase.cxx +++ b/chart2/source/view/axes/VAxisBase.cxx @@ -195,7 +195,7 @@ bool VAxisBase::prepareShapeCreation() return true; } -sal_Int32 VAxisBase::getIndexOfLongestLabel( const uno::Sequence< rtl::OUString >& rLabels ) +sal_Int32 VAxisBase::getIndexOfLongestLabel( const uno::Sequence< OUString >& rLabels ) { sal_Int32 nRet = 0; sal_Int32 nLength = 0; diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx index fa609241a785..c037ff5cf67b 100644 --- a/chart2/source/view/axes/VAxisBase.hxx +++ b/chart2/source/view/axes/VAxisBase.hxx @@ -66,7 +66,7 @@ public: //------------------------------------------------------------------------- //------------------------------------------------------------------------- protected: //methods - sal_Int32 getIndexOfLongestLabel( const ::com::sun::star::uno::Sequence< rtl::OUString >& rLabels ); + sal_Int32 getIndexOfLongestLabel( const ::com::sun::star::uno::Sequence< OUString >& rLabels ); void removeTextShapesFromTicks(); void updateUnscaledValuesAtTicks( TickIter& rIter ); @@ -82,7 +82,7 @@ protected: //member ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormatsSupplier; AxisProperties m_aAxisProperties; AxisLabelProperties m_aAxisLabelProperties; - ::com::sun::star::uno::Sequence< rtl::OUString > m_aTextLabels; + ::com::sun::star::uno::Sequence< OUString > m_aTextLabels; bool m_bUseTextLabels; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xGroupShape_Shapes; diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index fee4c6b8878c..9d62fac1b35c 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -79,7 +79,7 @@ Reference< drawing::XShape > createSingleLabel( const Reference< lang::XMultiServiceFactory>& xShapeFactory , const Reference< drawing::XShapes >& xTarget , const awt::Point& rAnchorScreenPosition2D - , const rtl::OUString& rLabel + , const OUString& rLabel , const AxisLabelProperties& rAxisLabelProperties , const AxisProperties& rAxisProperties , const tNameSequence& rPropNames @@ -92,7 +92,7 @@ Reference< drawing::XShape > createSingleLabel( // #i78696# use mathematically correct rotation now const double fRotationAnglePi(rAxisLabelProperties.fRotationAngleDegree * (F_PI / -180.0)); uno::Any aATransformation = ShapeFactory::makeTransformation( rAnchorScreenPosition2D, fRotationAnglePi ); - rtl::OUString aLabel = ShapeFactory::getStackedString( rLabel, rAxisLabelProperties.bStackCharacters ); + OUString aLabel = ShapeFactory::getStackedString( rLabel, rAxisLabelProperties.bStackCharacters ); Reference< drawing::XShape > xShape2DText = ShapeFactory(xShapeFactory) .createText( xTarget, aLabel, rPropNames, rPropValues, aATransformation ); @@ -447,11 +447,11 @@ bool VCartesianAxis::isAutoStaggeringOfLabelsAllowed( const AxisLabelProperties& struct ComplexCategoryPlacement { - rtl::OUString Text; + OUString Text; sal_Int32 Count; double TickValue; - ComplexCategoryPlacement( const rtl::OUString& rText, sal_Int32 nCount, double fTickValue ) + ComplexCategoryPlacement( const OUString& rText, sal_Int32 nCount, double fTickValue ) : Text(rText), Count(nCount), TickValue(fTickValue) {} }; @@ -629,7 +629,7 @@ bool VCartesianAxis::createTextShapes( } } - uno::Sequence< rtl::OUString >* pCategories = 0; + uno::Sequence< OUString >* pCategories = 0; if( m_bUseTextLabels && !m_aAxisProperties.m_bComplexCategories ) pCategories = &m_aTextLabels; @@ -712,7 +712,7 @@ bool VCartesianAxis::createTextShapes( bool bHasExtraColor=false; sal_Int32 nExtraColor=0; - rtl::OUString aLabel; + OUString aLabel; if(pCategories) { sal_Int32 nIndex = static_cast< sal_Int32 >(pTickInfo->getUnscaledTickValue()) - 1; //first category (index 0) matches with real number 1.0 diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx index 031d3cc9571f..c79a1a16b3ad 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx @@ -43,7 +43,7 @@ class TextualDataProvider : public ::cppu::WeakImplHelper1< > { public: - TextualDataProvider( const uno::Sequence< ::rtl::OUString >& rTextSequence ) + TextualDataProvider( const uno::Sequence< OUString >& rTextSequence ) : m_aTextSequence( rTextSequence ) { } @@ -52,14 +52,14 @@ public: } //XTextualDataSequence - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getTextualData() + virtual uno::Sequence< OUString > SAL_CALL getTextualData() throw ( uno::RuntimeException) { return m_aTextSequence; } private: //member - uno::Sequence< ::rtl::OUString > m_aTextSequence; + uno::Sequence< OUString > m_aTextSequence; }; //............................................................................. diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index 90343690ee59..314d8121e4ef 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -56,7 +56,7 @@ VCoordinateSystem* VCoordinateSystem::createCoordinateSystem( if( !xCooSysModel.is() ) return 0; - rtl::OUString aViewServiceName = xCooSysModel->getViewServiceName(); + OUString aViewServiceName = xCooSysModel->getViewServiceName(); //@todo: in future the coordinatesystems should be instanciated via service factory VCoordinateSystem* pRet=NULL; @@ -125,7 +125,7 @@ void VCoordinateSystem::initPlottingTargets( const Reference< drawing::XShapes m_xShapeFactory = xShapeFactory; } -void VCoordinateSystem::setParticle( const rtl::OUString& rCooSysParticle ) +void VCoordinateSystem::setParticle( const OUString& rCooSysParticle ) { m_aCooSysParticle = rCooSysParticle; } @@ -325,14 +325,14 @@ ExplicitIncrementData VCoordinateSystem::getExplicitIncrement( sal_Int32 nDimens return aRet; } -rtl::OUString VCoordinateSystem::createCIDForAxis( const Reference< chart2::XAxis >& /* xAxis */, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) +OUString VCoordinateSystem::createCIDForAxis( const Reference< chart2::XAxis >& /* xAxis */, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) { - rtl::OUString aAxisParticle( ObjectIdentifier::createParticleForAxis( nDimensionIndex, nAxisIndex ) ); + OUString aAxisParticle( ObjectIdentifier::createParticleForAxis( nDimensionIndex, nAxisIndex ) ); return ObjectIdentifier::createClassifiedIdentifierForParticles( m_aCooSysParticle, aAxisParticle ); } -rtl::OUString VCoordinateSystem::createCIDForGrid( const Reference< chart2::XAxis >& /* xAxis */, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) +OUString VCoordinateSystem::createCIDForGrid( const Reference< chart2::XAxis >& /* xAxis */, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) { - rtl::OUString aGridParticle( ObjectIdentifier::createParticleForGrid( nDimensionIndex, nAxisIndex ) ); + OUString aGridParticle( ObjectIdentifier::createParticleForGrid( nDimensionIndex, nAxisIndex ) ); return ObjectIdentifier::createClassifiedIdentifierForParticles( m_aCooSysParticle, aGridParticle ); } @@ -574,7 +574,7 @@ bool VCoordinateSystem::needSeriesNamesForAxis() const { return ( m_xCooSysModel.is() && m_xCooSysModel->getDimension() == 3 ); } -void VCoordinateSystem::setSeriesNamesForAxis( const Sequence< rtl::OUString >& rSeriesNames ) +void VCoordinateSystem::setSeriesNamesForAxis( const Sequence< OUString >& rSeriesNames ) { m_aSeriesNamesForZAxis = rSeriesNames; } diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx index 8d65bc74f392..981a9b6311d7 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.cxx +++ b/chart2/source/view/axes/VPolarAngleAxis.cxx @@ -78,7 +78,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis( if(pColorAny) *pColorAny >>= nColor; - const uno::Sequence< rtl::OUString >* pLabels = m_bUseTextLabels? &m_aTextLabels : 0; + const uno::Sequence< OUString >* pLabels = m_bUseTextLabels? &m_aTextLabels : 0; //------------------------------------------------ @@ -107,7 +107,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis( bool bHasExtraColor=false; sal_Int32 nExtraColor=0; - rtl::OUString aLabel; + OUString aLabel; if(pLabels) { sal_Int32 nIndex = static_cast< sal_Int32 >(pTickInfo->getUnscaledTickValue()) - 1; //first category (index 0) matches with real number 1.0 @@ -133,7 +133,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis( const double fRotationAnglePi(rAxisLabelProperties.fRotationAngleDegree * (F_PI / -180.0)); uno::Any aATransformation = ShapeFactory::makeTransformation( aAnchorScreenPosition2D, fRotationAnglePi ); - rtl::OUString aStackedLabel = ShapeFactory::getStackedString( aLabel, rAxisLabelProperties.bStackCharacters ); + OUString aStackedLabel = ShapeFactory::getStackedString( aLabel, rAxisLabelProperties.bStackCharacters ); pTickInfo->xTextShape = aShapeFactory.createText( xTarget, aStackedLabel, aPropNames, aPropValues, aATransformation ); } diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx index af151e2fede6..67f2dc5715dd 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.cxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx @@ -73,7 +73,7 @@ void VPolarRadiusAxis::setExplicitScaleAndIncrement( void VPolarRadiusAxis::initPlotter( const uno::Reference< drawing::XShapes >& xLogicTarget , const uno::Reference< drawing::XShapes >& xFinalTarget , const uno::Reference< lang::XMultiServiceFactory >& xShapeFactory - , const rtl::OUString& rCID ) + , const OUString& rCID ) throw (uno::RuntimeException) { VPolarAxis::initPlotter( xLogicTarget, xFinalTarget, xShapeFactory, rCID ); diff --git a/chart2/source/view/axes/VPolarRadiusAxis.hxx b/chart2/source/view/axes/VPolarRadiusAxis.hxx index cf10f167739c..6114a46f3689 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.hxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.hxx @@ -49,7 +49,7 @@ public: ::com::sun::star::drawing::XShapes >& xFinalTarget , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory - , const rtl::OUString& rCID + , const OUString& rCID ) throw (::com::sun::star::uno::RuntimeException ); virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ); diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index 03f13b17db62..b4b3940a8b73 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -719,13 +719,13 @@ void AreaChart::createShapes() //therefore create an own group for the texts and the error bars to move them to front //(because the text group is created after the series group the texts are displayed on top) - m_xSeriesTarget = createGroupShape( m_xLogicTarget,rtl::OUString() ); + m_xSeriesTarget = createGroupShape( m_xLogicTarget,OUString() ); if( m_bArea ) - m_xErrorBarTarget = createGroupShape( m_xLogicTarget,rtl::OUString() ); + m_xErrorBarTarget = createGroupShape( m_xLogicTarget,OUString() ); else m_xErrorBarTarget = m_xSeriesTarget; - m_xTextTarget = m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() ); - m_xRegressionCurveEquationTarget = m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() ); + m_xTextTarget = m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() ); + m_xRegressionCurveEquationTarget = m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() ); //--------------------------------------------- //check necessary here that different Y axis can not be stacked in the same group? ... hm? @@ -979,7 +979,7 @@ void AreaChart::createShapes() continue; //create a group shape for this point and add to the series shape: - rtl::OUString aPointCID = ObjectIdentifier::createPointCID( + OUString aPointCID = ObjectIdentifier::createPointCID( (*aSeriesIter)->getPointCID_Stub(), nIndex ); uno::Reference< drawing::XShapes > xPointGroupShape_Shapes( createGroupShape(xSeriesGroupShape_Shapes,aPointCID) ); diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index c78a495506d3..c8942b6049bb 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -419,16 +419,16 @@ void BarChart::createShapes() //to achieve this the regression curve target is created after the series target and before the text target uno::Reference< drawing::XShapes > xSeriesTarget( - createGroupShape( m_xLogicTarget,rtl::OUString() )); + createGroupShape( m_xLogicTarget,OUString() )); uno::Reference< drawing::XShapes > xRegressionCurveTarget( - createGroupShape( m_xLogicTarget,rtl::OUString() )); + createGroupShape( m_xLogicTarget,OUString() )); uno::Reference< drawing::XShapes > xTextTarget( - m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() )); + m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() )); //--------------------------------------------- uno::Reference< drawing::XShapes > xRegressionCurveEquationTarget( - m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() )); + m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() )); //check necessary here that different Y axis can not be stacked in the same group? ... hm? double fLogicZ = 1.0;//as defined diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx index 0352621b3ca4..c06ebd5e7bcf 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -207,9 +207,9 @@ void BubbleChart::createShapes() //therefore create an own group for the texts and the error bars to move them to front //(because the text group is created after the series group the texts are displayed on top) uno::Reference< drawing::XShapes > xSeriesTarget( - createGroupShape( m_xLogicTarget,rtl::OUString() )); + createGroupShape( m_xLogicTarget,OUString() )); uno::Reference< drawing::XShapes > xTextTarget( - m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() )); + m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() )); //update/create information for current group double fLogicZ = 1.0;//as defined @@ -311,7 +311,7 @@ void BubbleChart::createShapes() continue; //create a group shape for this point and add to the series shape: - rtl::OUString aPointCID = ObjectIdentifier::createPointCID( + OUString aPointCID = ObjectIdentifier::createPointCID( pSeries->getPointCID_Stub(), nIndex ); uno::Reference< drawing::XShapes > xPointGroupShape_Shapes( createGroupShape(xSeriesGroupShape_Shapes,aPointCID) ); diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index 98ad906708e9..1860b39c1874 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star; using namespace ::rtl::math; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -106,15 +105,15 @@ void CandleStickChart::createShapes() //(because the text group is created after the series group the texts are displayed on top) uno::Reference< drawing::XShapes > xSeriesTarget( - createGroupShape( m_xLogicTarget,rtl::OUString() )); + createGroupShape( m_xLogicTarget,OUString() )); uno::Reference< drawing::XShapes > xLossTarget( createGroupShape( m_xLogicTarget, ObjectIdentifier::createClassifiedIdentifier( - OBJECTTYPE_DATA_STOCK_LOSS, rtl::OUString() ))); + OBJECTTYPE_DATA_STOCK_LOSS, OUString() ))); uno::Reference< drawing::XShapes > xGainTarget( createGroupShape( m_xLogicTarget, ObjectIdentifier::createClassifiedIdentifier( - OBJECTTYPE_DATA_STOCK_GAIN, rtl::OUString() ))); + OBJECTTYPE_DATA_STOCK_GAIN, OUString() ))); uno::Reference< drawing::XShapes > xTextTarget( - m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() )); + m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() )); //--------------------------------------------- //check necessary here that different Y axis can not be stacked in the same group? ... hm? @@ -242,7 +241,7 @@ void CandleStickChart::createShapes() uno::Reference< beans::XPropertySet > xPointProp( (*aSeriesIter)->getPropertiesOfPoint( nIndex )); uno::Reference< drawing::XShapes > xPointGroupShape_Shapes(0); { - rtl::OUString aPointCID = ObjectIdentifier::createPointCID( (*aSeriesIter)->getPointCID_Stub(), nIndex ); + OUString aPointCID = ObjectIdentifier::createPointCID( (*aSeriesIter)->getPointCID_Stub(), nIndex ); uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes( getSeriesGroupShape(*aSeriesIter, xSeriesTarget) ); xPointGroupShape_Shapes = createGroupShape(xSeriesGroupShape_Shapes,aPointCID); } diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index 80ec134a94d3..06be798a46e1 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -324,9 +324,9 @@ void PieChart::createShapes() //therefore create an own group for the texts to move them to front //(because the text group is created after the series group the texts are displayed on top) uno::Reference< drawing::XShapes > xSeriesTarget( - createGroupShape( m_xLogicTarget,rtl::OUString() )); + createGroupShape( m_xLogicTarget,OUString() )); uno::Reference< drawing::XShapes > xTextTarget( - m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() )); + m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() )); //--------------------------------------------- //check necessary here that different Y axis can not be stacked in the same group? ... hm? @@ -531,7 +531,7 @@ void PieChart::createShapes() aNewOrigin, m_xLogicTarget, m_pShapeFactory, m_nDimension ) ); //enable draging of piesegments - rtl::OUString aPointCIDStub( ObjectIdentifier::createSeriesSubObjectStub( OBJECTTYPE_DATA_POINT + OUString aPointCIDStub( ObjectIdentifier::createSeriesSubObjectStub( OBJECTTYPE_DATA_POINT , pSeries->getSeriesParticle() , ObjectIdentifier::getPieSegmentDragMethodServiceName() , ObjectIdentifier::createPieSegmentDragParameterString( diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 884df9a6dcd5..a49fed9edddb 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -79,7 +79,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; //----------------------------------------------------------------------------- @@ -477,8 +476,8 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re } //prepare text - ::rtl::OUStringBuffer aText; - ::rtl::OUString aSeparator(sal_Unicode(' ')); + OUStringBuffer aText; + OUString aSeparator(sal_Unicode(' ')); double fRotationDegrees = 0.0; try { @@ -1088,7 +1087,7 @@ void VSeriesPlotter::createRegressionCurveEquationShapes( if( ! (bShowEquation || bShowCorrCoeff)) return; - ::rtl::OUStringBuffer aFormula; + OUStringBuffer aFormula; sal_Int32 nNumberFormatKey = 0; xEquationProperties->getPropertyValue( "NumberFormat") >>= nNumberFormatKey; @@ -1895,11 +1894,11 @@ VDataSeries* VSeriesPlotter::getFirstSeries() const return 0; } -uno::Sequence< rtl::OUString > VSeriesPlotter::getSeriesNames() const +uno::Sequence< OUString > VSeriesPlotter::getSeriesNames() const { - ::std::vector< rtl::OUString > aRetVector; + ::std::vector< OUString > aRetVector; - rtl::OUString aRole; + OUString aRole; if( m_xChartTypeModel.is() ) aRole = m_xChartTypeModel->getRoleOfSequenceForSeriesLabel(); @@ -1919,7 +1918,7 @@ uno::Sequence< rtl::OUString > VSeriesPlotter::getSeriesNames() const uno::Reference< XDataSeries > xSeries( pSeries ? pSeries->getModel() : 0 ); if( xSeries.is() ) { - rtl::OUString aSeriesName( DataSeriesHelper::getDataSeriesLabel( xSeries, aRole ) ); + OUString aSeriesName( DataSeriesHelper::getDataSeriesLabel( xSeries, aRole ) ); aRetVector.push_back( aSeriesName ); } } @@ -2385,7 +2384,7 @@ VSeriesPlotter* VSeriesPlotter::createSeriesPlotter( , sal_Int32 nDimensionCount , bool bExcludingPositioning ) { - rtl::OUString aChartType = xChartTypeModel->getChartType(); + OUString aChartType = xChartTypeModel->getChartType(); //@todo: in future the plotter should be instanciated via service factory VSeriesPlotter* pRet=NULL; diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx index 4c26350b802f..5b018c5235c8 100644 --- a/chart2/source/view/diagram/VDiagram.cxx +++ b/chart2/source/view/diagram/VDiagram.cxx @@ -206,7 +206,7 @@ void VDiagram::createShapes_2d() else { //CID for selection handling - rtl::OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) );//@todo read CID from model + OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model xProp->setPropertyValue( UNO_NAME_MISC_OBJ_NAME, uno::makeAny( aWallCID ) ); } } @@ -499,7 +499,7 @@ void VDiagram::createShapes_3d() //------------------------------------------------------------------------- //create additional group to manipulate the aspect ratio of the whole diagram: - xOuterGroup_Shapes = m_pShapeFactory->createGroup3D( xOuterGroup_Shapes, rtl::OUString() ); + xOuterGroup_Shapes = m_pShapeFactory->createGroup3D( xOuterGroup_Shapes, OUString() ); m_xAspectRatio3D = uno::Reference< beans::XPropertySet >( xOuterGroup_Shapes, uno::UNO_QUERY ); @@ -516,9 +516,9 @@ void VDiagram::createShapes_3d() if( m_xDiagram.is() ) xWallProp=uno::Reference< beans::XPropertySet >( m_xDiagram->getWall()); - rtl::OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) );//@todo read CID from model + OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model if( !bAddFloorAndWall ) - aWallCID = rtl::OUString(); + aWallCID = OUString(); uno::Reference< drawing::XShapes > xWallGroup_Shapes( m_pShapeFactory->createGroup3D( xOuterGroup_Shapes, aWallCID ) ); CuboidPlanePosition eLeftWallPos( ThreeDHelper::getAutomaticCuboidPlanePositionForStandardLeftWall( uno::Reference< beans::XPropertySet >( m_xDiagram, uno::UNO_QUERY ) ) ); @@ -657,7 +657,7 @@ void VDiagram::createShapes_3d() } else { - rtl::OUString aFloorCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_FLOOR, rtl::OUString() ) );//@todo read CID from model + OUString aFloorCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_FLOOR, OUString() ) );//@todo read CID from model ShapeFactory::setShapeName( xShape, aFloorCID ); } } diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx index 25d0989420da..cb04561deac1 100644 --- a/chart2/source/view/inc/PlotterBase.hxx +++ b/chart2/source/view/inc/PlotterBase.hxx @@ -53,7 +53,7 @@ public: ::com::sun::star::drawing::XShapes >& xFinalTarget , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory - , const rtl::OUString& rCID + , const OUString& rCID ) throw (::com::sun::star::uno::RuntimeException ); virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ); @@ -72,7 +72,7 @@ protected: //methods ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > createGroupShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , ::rtl::OUString rName=::rtl::OUString() ); + , OUString rName=OUString() ); protected: //member ::com::sun::star::uno::Reference< @@ -82,7 +82,7 @@ protected: //member ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; ShapeFactory* m_pShapeFactory; - rtl::OUString m_aCID; + OUString m_aCID; sal_Int32 m_nDimension; // needs to be created and deleted by the derived class diff --git a/chart2/source/view/inc/PropertyMapper.hxx b/chart2/source/view/inc/PropertyMapper.hxx index 60982bc98004..04159ed9b588 100644 --- a/chart2/source/view/inc/PropertyMapper.hxx +++ b/chart2/source/view/inc/PropertyMapper.hxx @@ -32,14 +32,14 @@ namespace chart /** */ -typedef ::std::map< ::rtl::OUString, ::rtl::OUString > tPropertyNameMap; -typedef ::comphelper::MakeMap< ::rtl::OUString, ::rtl::OUString > tMakePropertyNameMap; +typedef ::std::map< OUString, OUString > tPropertyNameMap; +typedef ::comphelper::MakeMap< OUString, OUString > tMakePropertyNameMap; -typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Any > tPropertyNameValueMap; -typedef ::comphelper::MakeMap< ::rtl::OUString, ::com::sun::star::uno::Any > tMakePropertyNameValueMap; +typedef ::std::map< OUString, ::com::sun::star::uno::Any > tPropertyNameValueMap; +typedef ::comphelper::MakeMap< OUString, ::com::sun::star::uno::Any > tMakePropertyNameValueMap; -typedef ::com::sun::star::uno::Sequence< rtl::OUString > tNameSequence; -typedef ::comphelper::MakeSequence< rtl::OUString > tMakeNameSequence; +typedef ::com::sun::star::uno::Sequence< OUString > tNameSequence; +typedef ::comphelper::MakeSequence< OUString > tMakeNameSequence; typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > tAnySequence; typedef ::comphelper::MakeSequence< ::com::sun::star::uno::Any > tMakeAnySequence; @@ -78,7 +78,7 @@ public: static ::com::sun::star::uno::Any* getValuePointer( tAnySequence& rPropValues , const tNameSequence& rPropNames - , const rtl::OUString& rPropName ); + , const OUString& rPropName ); static ::com::sun::star::uno::Any* getValuePointerForLimitedSpace( tAnySequence& rPropValues diff --git a/chart2/source/view/inc/ShapeFactory.hxx b/chart2/source/view/inc/ShapeFactory.hxx index 7401edd09b2c..83ee1a89ca45 100644 --- a/chart2/source/view/inc/ShapeFactory.hxx +++ b/chart2/source/view/inc/ShapeFactory.hxx @@ -49,14 +49,14 @@ public: createGroup2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , ::rtl::OUString aName = ::rtl::OUString() ); + , OUString aName = OUString() ); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > createGroup3D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , ::rtl::OUString aName = ::rtl::OUString() ); + , OUString aName = OUString() ); //------ @@ -163,7 +163,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createText( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget2D - , const ::rtl::OUString& rText + , const OUString& rText , const tNameSequence& rPropNames , const tAnySequence& rPropValues , const ::com::sun::star::uno::Any& rATransformation @@ -189,14 +189,14 @@ public: static void setShapeName( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape - , const rtl::OUString& rName ); + , const OUString& rName ); - static rtl::OUString getShapeName( const ::com::sun::star::uno::Reference< + static OUString getShapeName( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ); static ::com::sun::star::uno::Any makeTransformation( const ::com::sun::star::awt::Point& rScreenPosition2D, double fRotationAnglePi=0.0 ); - static rtl::OUString getStackedString( const rtl::OUString& rString, bool bStacked=true ); + static OUString getStackedString( const OUString& rString, bool bStacked=true ); static bool hasPolygonAnyLines( ::com::sun::star::drawing::PolyPolygonShape3D& rPoly ); static bool isPolygonEmptyOrSinglePoint( ::com::sun::star::drawing::PolyPolygonShape3D& rPoly ); diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index b6c199d66947..6c33b3719015 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -66,7 +66,7 @@ public: ::com::sun::star::drawing::XShapes >& xLogicTargetForSeriesBehindAxis ) throw (::com::sun::star::uno::RuntimeException); - void setParticle( const rtl::OUString& rCooSysParticle ); + void setParticle( const OUString& rCooSysParticle ); virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ); ::com::sun::star::drawing::HomogenMatrix getTransformationSceneToScreen(); @@ -122,7 +122,7 @@ public: sal_Int32 getMaximumAxisIndexByDimension( sal_Int32 nDimensionIndex ) const; virtual bool needSeriesNamesForAxis() const; - void setSeriesNamesForAxis( const ::com::sun::star::uno::Sequence< rtl::OUString >& rSeriesNames ); + void setSeriesNamesForAxis( const ::com::sun::star::uno::Sequence< OUString >& rSeriesNames ); protected: //methods VCoordinateSystem( const ::com::sun::star::uno::Reference< @@ -135,10 +135,10 @@ protected: //methods VAxisBase* getVAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); - rtl::OUString createCIDForAxis( const ::com::sun::star::uno::Reference< + OUString createCIDForAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis , sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); - rtl::OUString createCIDForGrid( const ::com::sun::star::uno::Reference< + OUString createCIDForGrid( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis , sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); @@ -155,7 +155,7 @@ protected: //member ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > m_xCooSysModel; - rtl::OUString m_aCooSysParticle; + OUString m_aCooSysParticle; typedef std::pair< sal_Int32, sal_Int32 > tFullAxisIndex; //first index is the dimension, second index is the axis index that indicates whether this is a main or secondary axis @@ -177,7 +177,7 @@ protected: //member // MergedMinimumAndMaximumSupplier m_aMergedMinimumAndMaximumSupplier; //this is used only for autoscaling purpose - ::com::sun::star::uno::Sequence< rtl::OUString > m_aSeriesNamesForZAxis; + ::com::sun::star::uno::Sequence< OUString > m_aSeriesNamesForZAxis; typedef std::map< tFullAxisIndex, ::boost::shared_ptr< VAxisBase > > tVAxisMap; diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx index 56aff51b4371..38c7929bc3e7 100644 --- a/chart2/source/view/inc/VDataSeries.hxx +++ b/chart2/source/view/inc/VDataSeries.hxx @@ -73,7 +73,7 @@ public: ::com::sun::star::chart2::data::XDataSequence >& xValues ); void setXValuesIfNone( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xValues ); - void setParticle( const rtl::OUString& rSeriesParticle ); + void setParticle( const OUString& rSeriesParticle ); void setGlobalSeriesIndex( sal_Int32 nGlobalSeriesIndex ); void setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize ); @@ -137,7 +137,7 @@ public: void setStartingAngle( sal_Int32 nStartingAngle ); sal_Int32 getStartingAngle() const; - void setRoleOfSequenceForDataLabelNumberFormatDetection( const rtl::OUString& rRole ); + void setRoleOfSequenceForDataLabelNumberFormatDetection( const OUString& rRole ); //this is only temporarily here for area chart: ::com::sun::star::drawing::PolyPolygonShape3D m_aPolyPolygonShape3D; @@ -148,19 +148,19 @@ public: //this is here for deep stacking: double m_fLogicZPos;//from 0 to series count -1 - rtl::OUString getCID() const; - rtl::OUString getSeriesParticle() const; - rtl::OUString getPointCID_Stub() const; - rtl::OUString getErrorBarsCID( bool bYError ) const; - rtl::OUString getLabelsCID() const; - rtl::OUString getLabelCID_Stub() const; - rtl::OUString getDataCurveCID( sal_Int32 nCurveIndex, bool bAverageLine ) const; + OUString getCID() const; + OUString getSeriesParticle() const; + OUString getPointCID_Stub() const; + OUString getErrorBarsCID( bool bYError ) const; + OUString getLabelsCID() const; + OUString getLabelCID_Stub() const; + OUString getDataCurveCID( sal_Int32 nCurveIndex, bool bAverageLine ) const; ::com::sun::star::chart2::DataPointLabel* getDataPointLabelIfLabel( sal_Int32 index ) const; bool getTextLabelMultiPropertyLists( sal_Int32 index, tNameSequence*& pPropNames, tAnySequence*& pPropValues ) const; - rtl::OUString getDataCurveEquationCID( sal_Int32 nCurveIndex ) const; + OUString getDataCurveEquationCID( sal_Int32 nCurveIndex ) const; bool isAttributedDataPoint( sal_Int32 index ) const; bool isVaryColorsByPoint() const; @@ -224,10 +224,10 @@ private: //member sal_Int32 m_nStartingAngle; - rtl::OUString m_aSeriesParticle; - rtl::OUString m_aCID; - rtl::OUString m_aPointCID_Stub; - rtl::OUString m_aLabelCID_Stub; + OUString m_aSeriesParticle; + OUString m_aCID; + OUString m_aPointCID_Stub; + OUString m_aLabelCID_Stub; sal_Int32 m_nGlobalSeriesIndex; diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index c3bba76ad5aa..ce6596aa0f63 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -251,7 +251,7 @@ public: void setExplicitCategoriesProvider( ExplicitCategoriesProvider* pExplicitCategoriesProvider ); //get series names for the z axis labels - ::com::sun::star::uno::Sequence< rtl::OUString > getSeriesNames() const; + ::com::sun::star::uno::Sequence< OUString > getSeriesNames() const; void setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize ); //better performance for big data @@ -317,7 +317,7 @@ protected: , LabelAlignment eAlignment=LABEL_ALIGN_CENTER , sal_Int32 nOffset=0 ); - ::rtl::OUString getLabelTextForValue( VDataSeries& rDataSeries + OUString getLabelTextForValue( VDataSeries& rDataSeries , sal_Int32 nPointIndex , double fValue , bool bAsPercentage ); @@ -370,7 +370,7 @@ protected: ::com::sun::star::drawing::XShapes >& xEquationTarget , bool bMaySkipPointsInRegressionCalculation ); - virtual void createRegressionCurveEquationShapes( const ::rtl::OUString & rEquationCID + virtual void createRegressionCurveEquationShapes( const OUString & rEquationCID , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xEquationProperties , const ::com::sun::star::uno::Reference< diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 0a55a7ff2c82..620558b06357 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -116,7 +116,6 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; -using rtl::OUString; namespace { @@ -366,10 +365,10 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFla APPHELPER_XSERVICEINFO_IMPL(ChartView,CHART_VIEW_SERVICE_IMPLEMENTATION_NAME) - uno::Sequence< rtl::OUString > ChartView + uno::Sequence< OUString > ChartView ::getSupportedServiceNames_Static() { - uno::Sequence< rtl::OUString > aSNS( 1 ); + uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] = CHART_VIEW_SERVICE_NAME; return aSNS; } @@ -410,7 +409,7 @@ VCoordinateSystem* addCooSysToList( std::vector< VCoordinateSystem* >& rVCooSysL pVCooSys = VCoordinateSystem::createCoordinateSystem(xCooSys ); if(pVCooSys) { - rtl::OUString aCooSysParticle( ObjectIdentifier::createParticleForCoordinateSystem( xCooSys, xChartModel ) ); + OUString aCooSysParticle( ObjectIdentifier::createParticleForCoordinateSystem( xCooSys, xChartModel ) ); pVCooSys->setParticle(aCooSysParticle); pVCooSys->setExplicitCategoriesProvider( new ExplicitCategoriesProvider(xCooSys,xChartModel) ); @@ -726,7 +725,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter( pSeries->setMissingValueTreatment( nMissingValueTreatment ); - rtl::OUString aSeriesParticle( ObjectIdentifier::createParticleForSeries( nDiagramIndex, nCS, nT, nS ) ); + OUString aSeriesParticle( ObjectIdentifier::createParticleForSeries( nDiagramIndex, nCS, nT, nS ) ); pSeries->setParticle(aSeriesParticle); OUString aRole( ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection( xChartType ) ); @@ -769,7 +768,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter( //transport seriesnames to the coordinatesystems if needed if( !m_aSeriesPlotterList.empty() ) { - uno::Sequence< rtl::OUString > aSeriesNames; + uno::Sequence< OUString > aSeriesNames; bool bSeriesNamesInitialized = false; for( size_t nC=0; nC < m_rVCooSysList.size(); nC++) { @@ -1224,7 +1223,7 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod uno::Reference< container::XNameAccess > xPageStyles( xStylesFamilies->getByName( "PageStyles" ), uno::UNO_QUERY ); if( xPageStyles.is() ) { - rtl::OUString aPageStyle; + OUString aPageStyle; uno::Reference< text::XTextDocument > xTextDocument( xParentProps, uno::UNO_QUERY ); if( xTextDocument.is() ) @@ -1238,7 +1237,7 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod uno::Reference< container::XNameAccess > xEmbeddedObjects( xTextEmbeddedObjectsSupplier->getEmbeddedObjects() ); if( xEmbeddedObjects.is() ) { - uno::Sequence< rtl::OUString > aNames( xEmbeddedObjects->getElementNames() ); + uno::Sequence< OUString > aNames( xEmbeddedObjects->getElementNames() ); sal_Int32 nCount = aNames.getLength(); for( sal_Int32 nN=0; nN<nCount; nN++ ) @@ -1246,8 +1245,8 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod uno::Reference< beans::XPropertySet > xEmbeddedProps( xEmbeddedObjects->getByName( aNames[nN] ), uno::UNO_QUERY ); if( xEmbeddedProps.is() ) { - static rtl::OUString aChartCLSID = rtl::OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName()); - rtl::OUString aCLSID; + static OUString aChartCLSID = OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName()); + OUString aCLSID; xEmbeddedProps->getPropertyValue( "CLSID" ) >>= aCLSID; if( aCLSID.equals(aChartCLSID) ) { @@ -1500,7 +1499,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& { //------------ set transformation to plotter / create series VSeriesPlotter* pSeriesPlotter = *aPlotterIter; - rtl::OUString aCID; //III + OUString aCID; //III uno::Reference< drawing::XShapes > xSeriesTarget(0); if( pSeriesPlotter->WantToPlotInFrontOfAxisLine() ) xSeriesTarget = xSeriesTargetInFrontOfAxis; @@ -1701,7 +1700,7 @@ SdrPage* ChartView::getSdrPage() return pPage; } -uno::Reference< drawing::XShape > ChartView::getShapeForCID( const rtl::OUString& rObjectCID ) +uno::Reference< drawing::XShape > ChartView::getShapeForCID( const OUString& rObjectCID ) { SolarMutexGuard aSolarGuard; SdrObject* pObj = DrawModelWrapper::getNamedSdrObject( rObjectCID, this->getSdrPage() ); @@ -1716,7 +1715,7 @@ awt::Rectangle ChartView::getDiagramRectangleExcludingAxes() return m_aResultingDiagramRectangleExcludingAxes; } -awt::Rectangle ChartView::getRectangleOfObject( const rtl::OUString& rObjectCID, bool bSnapRect ) +awt::Rectangle ChartView::getRectangleOfObject( const OUString& rObjectCID, bool bSnapRect ) { impl_updateView(); @@ -1828,7 +1827,7 @@ sal_Int32 ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel( if( !xSeriesOrPointProp.is() ) return nFormat; - rtl::OUString aPropName( "NumberFormat" ); + OUString aPropName( "NumberFormat" ); if( !(xSeriesOrPointProp->getPropertyValue(aPropName) >>= nFormat) ) { uno::Reference< chart2::XChartType > xChartType( DataSeriesHelper::getChartTypeOfSeries( xSeries, xDiagram ) ); @@ -1907,28 +1906,28 @@ awt::Rectangle ExplicitValueProvider::addAxisTitleSizes( if( xTitle_Height.is() ) { - rtl::OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Height, xChartModel ) ); + OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Height, xChartModel ) ); nTitleSpaceHeight = pExplicitValueProvider->getRectangleOfObject( aCID_X, true ).Height; if( nTitleSpaceHeight ) nTitleSpaceHeight+=lcl_getDiagramTitleSpace(); } if( xTitle_Width.is() ) { - rtl::OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Width, xChartModel ) ); + OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Width, xChartModel ) ); nTitleSpaceWidth = pExplicitValueProvider->getRectangleOfObject( aCID_Y, true ).Width; if(nTitleSpaceWidth) nTitleSpaceWidth+=lcl_getDiagramTitleSpace(); } if( xSecondTitle_Height.is() ) { - rtl::OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Height, xChartModel ) ); + OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Height, xChartModel ) ); nSecondTitleSpaceHeight = pExplicitValueProvider->getRectangleOfObject( aCID_X, true ).Height; if( nSecondTitleSpaceHeight ) nSecondTitleSpaceHeight+=lcl_getDiagramTitleSpace(); } if( xSecondTitle_Width.is() ) { - rtl::OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Width, xChartModel ) ); + OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Width, xChartModel ) ); nSecondTitleSpaceWidth += pExplicitValueProvider->getRectangleOfObject( aCID_Y, true ).Width; if( nSecondTitleSpaceWidth ) nSecondTitleSpaceWidth+=lcl_getDiagramTitleSpace(); @@ -1974,28 +1973,28 @@ awt::Rectangle ExplicitValueProvider::substractAxisTitleSizes( if( xTitle_Height.is() ) { - rtl::OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Height, xChartModel ) ); + OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Height, xChartModel ) ); nTitleSpaceHeight = pExplicitValueProvider->getRectangleOfObject( aCID_X, true ).Height; if( nTitleSpaceHeight ) nTitleSpaceHeight+=lcl_getDiagramTitleSpace(); } if( xTitle_Width.is() ) { - rtl::OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Width, xChartModel ) ); + OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Width, xChartModel ) ); nTitleSpaceWidth = pExplicitValueProvider->getRectangleOfObject( aCID_Y, true ).Width; if(nTitleSpaceWidth) nTitleSpaceWidth+=lcl_getDiagramTitleSpace(); } if( xSecondTitle_Height.is() ) { - rtl::OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Height, xChartModel ) ); + OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Height, xChartModel ) ); nSecondTitleSpaceHeight = pExplicitValueProvider->getRectangleOfObject( aCID_X, true ).Height; if( nSecondTitleSpaceHeight ) nSecondTitleSpaceHeight+=lcl_getDiagramTitleSpace(); } if( xSecondTitle_Width.is() ) { - rtl::OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Width, xChartModel ) ); + OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Width, xChartModel ) ); nSecondTitleSpaceWidth += pExplicitValueProvider->getRectangleOfObject( aCID_Y, true ).Width; if( nSecondTitleSpaceWidth ) nSecondTitleSpaceWidth+=lcl_getDiagramTitleSpace(); @@ -2169,12 +2168,12 @@ boost::shared_ptr<VTitle> lcl_createTitle( TitleHelper::eTitleType eType } uno::Reference< XTitle > xTitle( TitleHelper::getTitle( eType, xChartModel ) ); - rtl::OUString aCompleteString( TitleHelper::getCompleteString( xTitle ) ); + OUString aCompleteString( TitleHelper::getCompleteString( xTitle ) ); if( !aCompleteString.isEmpty() ) { //create title apVTitle.reset(new VTitle(xTitle)); - rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, xChartModel ) ); + OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, xChartModel ) ); apVTitle->init(xPageShapes,xShapeFactory,aCID); apVTitle->createShapes( awt::Point(0,0), rPageSize ); awt::Size aTitleUnrotatedSize = apVTitle->getUnrotatedSize(); @@ -2349,8 +2348,8 @@ void formatPage( tPropertyNameValueMap aNameValueMap; PropertyMapper::getValueMap( aNameValueMap, PropertyMapper::getPropertyNameMapForFillAndLineProperties(), xModelPage ); - rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, rtl::OUString() ) ); - aNameValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( aCID ) ) ); //CID rtl::OUString + OUString aCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) ); + aNameValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( aCID ) ) ); //CID OUString tNameSequence aNames; tAnySequence aValues; @@ -2473,7 +2472,7 @@ void ChartView::createShapes() //create the group shape for diagram and axes first to have title and legends on top of it uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( m_xChartModel ) ); - rtl::OUString aDiagramCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) ) );//todo: other index if more than one diagram is possible + OUString aDiagramCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) ) );//todo: other index if more than one diagram is possible uno::Reference< drawing::XShapes > xDiagramPlusAxesPlusMarkHandlesGroup_Shapes( ShapeFactory(m_xShapeFactory).createGroup2D(xPageShapes,aDiagramCID) ); uno::Reference< drawing::XShape > xDiagram_MarkHandles( ShapeFactory(m_xShapeFactory).createInvisibleRectangle( @@ -2713,7 +2712,7 @@ void ChartView::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) uno::Reference< view::XSelectionSupplier > xSelectionSupplier( m_xChartModel->getCurrentController(), uno::UNO_QUERY ); if ( xSelectionSupplier.is() ) { - ::rtl::OUString aSelObjCID; + OUString aSelObjCID; uno::Any aSelObj( xSelectionSupplier->getSelection() ); aSelObj >>= aSelObjCID; if ( !aSelObjCID.isEmpty() ) @@ -2764,7 +2763,7 @@ void ChartView::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) xModifiable->setModified( sal_True ); } -void ChartView::impl_notifyModeChangeListener( const rtl::OUString& rNewMode ) +void ChartView::impl_notifyModeChangeListener( const OUString& rNewMode ) { try { @@ -2835,7 +2834,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL ChartView::getPropertySetInfo() return 0; } -void SAL_CALL ChartView::setPropertyValue( const ::rtl::OUString& rPropertyName +void SAL_CALL ChartView::setPropertyValue( const OUString& rPropertyName , const Any& rValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException , lang::WrappedTargetException, uno::RuntimeException) @@ -2890,7 +2889,7 @@ void SAL_CALL ChartView::setPropertyValue( const ::rtl::OUString& rPropertyName throw beans::UnknownPropertyException( "unknown property was tried to set to chart wizard", 0 ); } -Any SAL_CALL ChartView::getPropertyValue( const ::rtl::OUString& rPropertyName ) +Any SAL_CALL ChartView::getPropertyValue( const OUString& rPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; @@ -2904,25 +2903,25 @@ Any SAL_CALL ChartView::getPropertyValue( const ::rtl::OUString& rPropertyName ) } void SAL_CALL ChartView::addPropertyChangeListener( - const ::rtl::OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* xListener */ ) + const OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* xListener */ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL("not implemented"); } void SAL_CALL ChartView::removePropertyChangeListener( - const ::rtl::OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* aListener */ ) + const OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* aListener */ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL("not implemented"); } -void SAL_CALL ChartView::addVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ ) +void SAL_CALL ChartView::addVetoableChangeListener( const OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL("not implemented"); } -void SAL_CALL ChartView::removeVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ ) +void SAL_CALL ChartView::removeVetoableChangeListener( const OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL("not implemented"); @@ -2930,7 +2929,7 @@ void SAL_CALL ChartView::removeVetoableChangeListener( const ::rtl::OUString& /* // ____ XMultiServiceFactory ____ -Reference< uno::XInterface > ChartView::createInstance( const ::rtl::OUString& aServiceSpecifier ) +Reference< uno::XInterface > ChartView::createInstance( const OUString& aServiceSpecifier ) throw (uno::Exception, uno::RuntimeException) { SdrModel* pModel = ( m_pDrawModelWrapper ? &m_pDrawModelWrapper->getSdrModel() : NULL ); @@ -2989,7 +2988,7 @@ Reference< uno::XInterface > ChartView::createInstance( const ::rtl::OUString& a return 0; } -Reference< uno::XInterface > ChartView::createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& Arguments ) +Reference< uno::XInterface > ChartView::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& Arguments ) throw (uno::Exception, uno::RuntimeException) { OSL_ENSURE( Arguments.getLength(), "ChartView::createInstanceWithArguments: arguments are ignored" ); @@ -2997,9 +2996,9 @@ Reference< uno::XInterface > ChartView::createInstanceWithArguments( const ::rtl return createInstance( ServiceSpecifier ); } -uno::Sequence< ::rtl::OUString > ChartView::getAvailableServiceNames() throw (uno::RuntimeException) +uno::Sequence< OUString > ChartView::getAvailableServiceNames() throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aServiceNames( 6 ); + uno::Sequence< OUString > aServiceNames( 6 ); aServiceNames[0] = "com.sun.star.drawing.DashTable"; aServiceNames[1] = "com.sun.star.drawing.GradientTable"; @@ -3011,14 +3010,14 @@ uno::Sequence< ::rtl::OUString > ChartView::getAvailableServiceNames() throw (un return aServiceNames; } -rtl::OUString ChartView::dump() throw (uno::RuntimeException) +OUString ChartView::dump() throw (uno::RuntimeException) { impl_updateView(); uno::Reference<drawing::XShapes> xPageShapes( ShapeFactory(m_xShapeFactory) .getOrCreateChartRootShape( m_xDrawPage ) ); if (!xPageShapes.is()) - return rtl::OUString(); + return OUString(); else { XShapeDumper dumper; diff --git a/chart2/source/view/main/ChartView.hxx b/chart2/source/view/main/ChartView.hxx index 5b58d5d3c746..a6e9e916807c 100644 --- a/chart2/source/view/main/ChartView.hxx +++ b/chart2/source/view/main/ChartView.hxx @@ -94,9 +94,9 @@ public: , ExplicitScaleData& rExplicitScale , ExplicitIncrementData& rExplicitIncrement ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - getShapeForCID( const rtl::OUString& rObjectCID ); + getShapeForCID( const OUString& rObjectCID ); - virtual ::com::sun::star::awt::Rectangle getRectangleOfObject( const rtl::OUString& rObjectCID, bool bSnapRect=false ); + virtual ::com::sun::star::awt::Rectangle getRectangleOfObject( const OUString& rObjectCID, bool bSnapRect=false ); virtual ::com::sun::star::awt::Rectangle getDiagramRectangleExcludingAxes(); @@ -147,22 +147,22 @@ public: // ::com::sun::star::beans::XPropertySet //----------------------------------------------------------------- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //----------------------------------------------------------------- // ::com::sun::star::lang::XMultiServiceFactory //----------------------------------------------------------------- - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( - const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) + const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); // for ExplicitValueProvider // ____ XUnoTunnel ___ @@ -170,7 +170,7 @@ public: throw (::com::sun::star::uno::RuntimeException); // XDumper - virtual rtl::OUString SAL_CALL dump() + virtual OUString SAL_CALL dump() throw(::com::sun::star::uno::RuntimeException); private: //methods @@ -183,7 +183,7 @@ private: //methods void impl_setChartModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); void impl_deleteCoordinateSystems(); - void impl_notifyModeChangeListener( const rtl::OUString& rNewMode ); + void impl_notifyModeChangeListener( const OUString& rNewMode ); void impl_refreshAddIn(); bool impl_AddInDrawsAllByItself(); diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx index ff2a6c8e56ea..2a2bc1838db1 100644 --- a/chart2/source/view/main/DrawModelWrapper.cxx +++ b/chart2/source/view/main/DrawModelWrapper.cxx @@ -353,7 +353,7 @@ XBitmapListRef DrawModelWrapper::GetBitmapList() const return this->SdrModel::GetBitmapList(); } -SdrObject* DrawModelWrapper::getNamedSdrObject( const rtl::OUString& rName ) +SdrObject* DrawModelWrapper::getNamedSdrObject( const OUString& rName ) { if( rName.isEmpty() ) return 0; diff --git a/chart2/source/view/main/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx index 709f22fd4b76..0067632842b8 100644 --- a/chart2/source/view/main/PlotterBase.cxx +++ b/chart2/source/view/main/PlotterBase.cxx @@ -48,7 +48,7 @@ PlotterBase::PlotterBase( sal_Int32 nDimensionCount ) void PlotterBase::initPlotter( const uno::Reference< drawing::XShapes >& xLogicTarget , const uno::Reference< drawing::XShapes >& xFinalTarget , const uno::Reference< lang::XMultiServiceFactory >& xShapeFactory - , const rtl::OUString& rCID ) + , const OUString& rCID ) throw (uno::RuntimeException) { OSL_PRECOND(xLogicTarget.is()&&xFinalTarget.is()&&xShapeFactory.is(),"no proper initialization parameters"); @@ -82,7 +82,7 @@ void PlotterBase::setTransformationSceneToScreen( const drawing::HomogenMatrix& uno::Reference< drawing::XShapes > PlotterBase::createGroupShape( const uno::Reference< drawing::XShapes >& xTarget - , ::rtl::OUString rName ) + , OUString rName ) { if(!m_xShapeFactory.is()) return NULL; diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx index 08bc546fe16d..811a7de04a2d 100644 --- a/chart2/source/view/main/PropertyMapper.cxx +++ b/chart2/source/view/main/PropertyMapper.cxx @@ -84,8 +84,8 @@ void PropertyMapper::getValueMap( for( ; aIt != aEnd; ++aIt ) { - rtl::OUString aTarget = aIt->first; - rtl::OUString aSource = aIt->second; + OUString aTarget = aIt->first; + OUString aSource = aIt->second; try { uno::Any aAny( xSourceProp->getPropertyValue(aSource) ); @@ -143,7 +143,7 @@ void PropertyMapper::getMultiPropertyListsFromValueMap( uno::Any* PropertyMapper::getValuePointer( tAnySequence& rPropValues , const tNameSequence& rPropNames - , const rtl::OUString& rPropName ) + , const OUString& rPropName ) { sal_Int32 nCount = rPropNames.getLength(); for( sal_Int32 nN = 0; nN < nCount; nN++ ) @@ -373,7 +373,7 @@ void PropertyMapper::setMultiProperties( try { sal_Int32 nCount = std::max( rNames.getLength(), rValues.getLength() ); - rtl::OUString aPropName; + OUString aPropName; uno::Any aValue; for( sal_Int32 nN = 0; nN < nCount; nN++ ) { @@ -416,7 +416,7 @@ void PropertyMapper::getTextLabelMultiPropertyLists( aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::makeAny(sal_True) ) ); // sal_Bool aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::makeAny(sal_True) ) ); // sal_Bool if( bName ) - aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( rtl::OUString() ) ) ); //CID rtl::OUString - needs to be overwritten for each point + aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( OUString() ) ) ); //CID OUString - needs to be overwritten for each point if( nLimitedSpace > 0 ) { diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index e83445fe8e58..5ce6f7290597 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -67,7 +67,7 @@ namespace chart //----------------------------------------------------------------------------- void ShapeFactory::setShapeName( const uno::Reference< drawing::XShape >& xShape - , const rtl::OUString& rName ) + , const OUString& rName ) { if(!xShape.is()) return; @@ -89,9 +89,9 @@ void ShapeFactory::setShapeName( const uno::Reference< drawing::XShape >& xShape //----------------------------------------------------------------------------- -rtl::OUString ShapeFactory::getShapeName( const uno::Reference< drawing::XShape >& xShape ) +OUString ShapeFactory::getShapeName( const uno::Reference< drawing::XShape >& xShape ) { - rtl::OUString aRet; + OUString aRet; uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY ); OSL_ENSURE(xProp.is(), "shape offers no XPropertySet"); @@ -540,7 +540,7 @@ uno::Reference<drawing::XShape> if( !xTarget.is() ) return 0; - Reference< drawing::XShapes > xGroup( ShapeFactory::createGroup3D( xTarget, rtl::OUString() ) ); + Reference< drawing::XShapes > xGroup( ShapeFactory::createGroup3D( xTarget, OUString() ) ); sal_Bool bDoubleSided = false; short nRotatedTexture = 0; @@ -1872,7 +1872,7 @@ uno::Reference< drawing::XShape > uno::Reference< drawing::XShapes > ShapeFactory::createGroup2D( const uno::Reference< drawing::XShapes >& xTarget - , ::rtl::OUString aName ) + , OUString aName ) { if( !xTarget.is() ) return 0; @@ -1907,7 +1907,7 @@ uno::Reference< drawing::XShapes > uno::Reference< drawing::XShapes > ShapeFactory::createGroup3D( const uno::Reference< drawing::XShapes >& xTarget - , ::rtl::OUString aName ) + , OUString aName ) { if( !xTarget.is() ) return 0; @@ -2188,7 +2188,7 @@ uno::Reference< drawing::XShape > ShapeFactory::createInvisibleRectangle( uno::Reference< drawing::XShape > ShapeFactory::createText( const uno::Reference< drawing::XShapes >& xTarget - , const ::rtl::OUString& rText + , const OUString& rText , const tNameSequence& rPropNames , const tAnySequence& rPropValues , const uno::Any& rATransformation ) @@ -2230,13 +2230,13 @@ uno::Reference< drawing::XShape > return xShape; } -rtl::OUString ShapeFactory::getStackedString( const rtl::OUString& rString, bool bStacked ) +OUString ShapeFactory::getStackedString( const OUString& rString, bool bStacked ) { sal_Int32 nLen = rString.getLength(); if(!bStacked || !nLen) return rString; - rtl::OUStringBuffer aStackStr; + OUStringBuffer aStackStr; //add a newline after each letter //as we do not no letters here add a newline after each char diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index a5059dcec222..ac6da72da1d2 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -118,7 +118,7 @@ void lcl_clearIfNoValuesButTextIsContained( VDataSequence& rData, const uno::Ref } //no double value is countained //is there any text? - uno::Sequence< rtl::OUString > aStrings( DataSequenceToStringSequence( xDataSequence ) ); + uno::Sequence< OUString > aStrings( DataSequenceToStringSequence( xDataSequence ) ); sal_Int32 nTextCount = aStrings.getLength(); for( sal_Int32 j = 0; j < nTextCount; ++j ) { @@ -216,7 +216,7 @@ VDataSeries::VDataSeries( const uno::Reference< XDataSeries >& xDataSeries ) try { uno::Any aARole = xProp->getPropertyValue("Role"); - rtl::OUString aRole; + OUString aRole; aARole >>= aRole; if (aRole == "values-x") @@ -363,7 +363,7 @@ void VDataSeries::setGlobalSeriesIndex( sal_Int32 nGlobalSeriesIndex ) m_nGlobalSeriesIndex = nGlobalSeriesIndex; } -void VDataSeries::setParticle( const rtl::OUString& rSeriesParticle ) +void VDataSeries::setParticle( const OUString& rSeriesParticle ) { m_aSeriesParticle = rSeriesParticle; @@ -372,51 +372,51 @@ void VDataSeries::setParticle( const rtl::OUString& rSeriesParticle ) m_aPointCID_Stub = ObjectIdentifier::createSeriesSubObjectStub( OBJECTTYPE_DATA_POINT, m_aSeriesParticle ); m_aLabelCID_Stub = ObjectIdentifier::createClassifiedIdentifierWithParent( - OBJECTTYPE_DATA_LABEL, ::rtl::OUString(), getLabelsCID() ); + OBJECTTYPE_DATA_LABEL, OUString(), getLabelsCID() ); } -rtl::OUString VDataSeries::getSeriesParticle() const +OUString VDataSeries::getSeriesParticle() const { return m_aSeriesParticle; } -rtl::OUString VDataSeries::getCID() const +OUString VDataSeries::getCID() const { return m_aCID; } -rtl::OUString VDataSeries::getPointCID_Stub() const +OUString VDataSeries::getPointCID_Stub() const { return m_aPointCID_Stub; } -rtl::OUString VDataSeries::getErrorBarsCID(bool bYError) const +OUString VDataSeries::getErrorBarsCID(bool bYError) const { - rtl::OUString aChildParticle( ObjectIdentifier::getStringForType( + OUString aChildParticle( ObjectIdentifier::getStringForType( bYError ? OBJECTTYPE_DATA_ERRORS_Y : OBJECTTYPE_DATA_ERRORS_X ) ); aChildParticle += "="; return ObjectIdentifier::createClassifiedIdentifierForParticles( m_aSeriesParticle, aChildParticle ); } -rtl::OUString VDataSeries::getLabelsCID() const +OUString VDataSeries::getLabelsCID() const { - rtl::OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) ); + OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) ); aChildParticle += "="; return ObjectIdentifier::createClassifiedIdentifierForParticles( m_aSeriesParticle, aChildParticle ); } -rtl::OUString VDataSeries::getLabelCID_Stub() const +OUString VDataSeries::getLabelCID_Stub() const { return m_aLabelCID_Stub; } -rtl::OUString VDataSeries::getDataCurveCID( sal_Int32 nCurveIndex, bool bAverageLine ) const +OUString VDataSeries::getDataCurveCID( sal_Int32 nCurveIndex, bool bAverageLine ) const { - rtl::OUString aRet; + OUString aRet; aRet = ObjectIdentifier::createDataCurveCID( m_aSeriesParticle, nCurveIndex, bAverageLine ); return aRet; } -rtl::OUString VDataSeries::getDataCurveEquationCID( sal_Int32 nCurveIndex ) const +OUString VDataSeries::getDataCurveEquationCID( sal_Int32 nCurveIndex ) const { - rtl::OUString aRet; + OUString aRet; aRet = ObjectIdentifier::createDataCurveEquationCID( m_aSeriesParticle, nCurveIndex ); return aRet; } @@ -555,7 +555,7 @@ sal_Int32 VDataSeries::getExplicitNumberFormat( sal_Int32 nPointIndex, bool bFor xPointProp->getPropertyValue(aPropName) >>= nNumberFormat; return nNumberFormat; } -void VDataSeries::setRoleOfSequenceForDataLabelNumberFormatDetection( const rtl::OUString& rRole ) +void VDataSeries::setRoleOfSequenceForDataLabelNumberFormatDetection( const OUString& rRole ) { if (rRole == "values-y") m_pValueSequenceForDataLabelNumberFormatDetection = &m_aValues_Y; diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx index 764274883e74..4b7d699d9ab0 100644 --- a/chart2/source/view/main/VLegend.cxx +++ b/chart2/source/view/main/VLegend.cxx @@ -47,8 +47,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 chart @@ -300,7 +298,7 @@ awt::Size lcl_placeLegendEntries( const sal_Int32 nSymbolToTextDistance = static_cast< sal_Int32 >( std::max( 100.0, fViewFontSize * 0.22 ) );//minimum 1mm const sal_Int32 nSymbolPlusDistanceWidth = rMaxSymbolExtent.Width + nSymbolToTextDistance; sal_Int32 nMaxTextWidth = rAvailableSpace.Width - (2 * nXPadding) - nSymbolPlusDistanceWidth; - rtl::OUString aPropNameTextMaximumFrameWidth( "TextMaximumFrameWidth" ); + OUString aPropNameTextMaximumFrameWidth( "TextMaximumFrameWidth" ); uno::Any* pFrameWidthAny = PropertyMapper::getValuePointer( rTextProperties.second, rTextProperties.first, aPropNameTextMaximumFrameWidth); if(pFrameWidthAny) { diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx index a22cd9cffeb2..b3b1a1580cd0 100644 --- a/chart2/source/view/main/VLegendSymbolFactory.cxx +++ b/chart2/source/view/main/VLegendSymbolFactory.cxx @@ -28,7 +28,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/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx index 9fcd762d6fff..0fb341b1ef18 100644 --- a/chart2/source/view/main/VTitle.cxx +++ b/chart2/source/view/main/VTitle.cxx @@ -58,7 +58,7 @@ VTitle::~VTitle() void VTitle::init( const uno::Reference< drawing::XShapes >& xTargetPage , const uno::Reference< lang::XMultiServiceFactory >& xFactory - , const rtl::OUString& rCID ) + , const OUString& rCID ) { m_xTarget = xTargetPage; m_xShapeFactory = xFactory; @@ -159,7 +159,7 @@ void VTitle::createShapes( //set name/classified ObjectID (CID) if( !m_aCID.isEmpty() ) - aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( m_aCID ) ) ); //CID rtl::OUString + aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( m_aCID ) ) ); //CID OUString } //set global title properties @@ -184,7 +184,7 @@ void VTitle::createShapes( //if the characters should be stacked we use only the first character properties for code simplicity if( aStringList.getLength()>0 ) { - rtl::OUString aLabel; + OUString aLabel; for( sal_Int32 nN=0; nN<aStringList.getLength();nN++ ) aLabel += aStringList[nN]->getString(); aLabel = ShapeFactory::getStackedString( aLabel, bStackCharacters ); diff --git a/chart2/source/view/main/VTitle.hxx b/chart2/source/view/main/VTitle.hxx index f9e9bb9f7645..f9699cd85548 100644 --- a/chart2/source/view/main/VTitle.hxx +++ b/chart2/source/view/main/VTitle.hxx @@ -42,7 +42,7 @@ public: void init( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTargetPage , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory - , const rtl::OUString& rCID ); + , const OUString& rCID ); void createShapes( const ::com::sun::star::awt::Point& rPos , const ::com::sun::star::awt::Size& rReferenceSize ); @@ -61,7 +61,7 @@ private: ::com::sun::star::chart2::XTitle > m_xTitle; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xShape; - rtl::OUString m_aCID; + OUString m_aCID; double m_fRotationAngleDegree; sal_Int32 m_nXPos; |