summaryrefslogtreecommitdiff
path: root/chart2/source/view/axes
diff options
context:
space:
mode:
Diffstat (limited to 'chart2/source/view/axes')
-rw-r--r--chart2/source/view/axes/DateScaling.cxx12
-rw-r--r--chart2/source/view/axes/DateScaling.hxx4
-rw-r--r--chart2/source/view/axes/Tickmarks.hxx2
-rw-r--r--chart2/source/view/axes/VAxisBase.cxx2
-rw-r--r--chart2/source/view/axes/VAxisBase.hxx4
-rw-r--r--chart2/source/view/axes/VCartesianAxis.cxx12
-rw-r--r--chart2/source/view/axes/VCartesianCoordinateSystem.cxx6
-rw-r--r--chart2/source/view/axes/VCoordinateSystem.cxx14
-rw-r--r--chart2/source/view/axes/VPolarAngleAxis.cxx6
-rw-r--r--chart2/source/view/axes/VPolarRadiusAxis.cxx2
-rw-r--r--chart2/source/view/axes/VPolarRadiusAxis.hxx2
11 files changed, 33 insertions, 33 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 );
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 03:29:15 +0000