summaryrefslogtreecommitdiff
path: root/chart2/source/view
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2014-05-18 00:35:50 +0200
committerJulien Nabet <serval2412@yahoo.fr>2014-05-18 00:36:10 +0200
commit0d8908b35999795ba1ffe2d3530aa9711918840a (patch)
tree92a84fad59387a092838d75398ed473c3784ad29 /chart2/source/view
parent980dabdbc636d4a639b7227caf7c82fdc81b77c4 (diff)
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part16
Change-Id: I78b3a0151397d4e69521e6b2451e93ea6e463376
Diffstat (limited to 'chart2/source/view')
-rw-r--r--chart2/source/view/main/ChartView.cxx6
-rw-r--r--chart2/source/view/main/DummyXShape.cxx2
-rw-r--r--chart2/source/view/main/ShapeFactory.cxx6
-rw-r--r--chart2/source/view/main/Stripe.cxx6
4 files changed, 10 insertions, 10 deletions
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index ff07ecd84974..3ad0db6e288b 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2821,7 +2821,7 @@ void ChartView::impl_notifyModeChangeListener( const OUString& rNewMode )
try
{
::cppu::OInterfaceContainerHelper* pIC = m_aListenerContainer
- .getContainer( ::getCppuType((const uno::Reference< util::XModeChangeListener >*)0) );
+ .getContainer( cppu::UnoType<util::XModeChangeListener>::get());
if( pIC )
{
util::ModeChangeEvent aEvent( static_cast< uno::XWeak* >( this ), rNewMode );
@@ -2846,13 +2846,13 @@ void SAL_CALL ChartView::addModeChangeListener( const uno::Reference< util::XMod
throw (uno::RuntimeException, std::exception)
{
m_aListenerContainer.addInterface(
- ::getCppuType((const uno::Reference< util::XModeChangeListener >*)0), xListener );
+ cppu::UnoType<util::XModeChangeListener>::get(), xListener );
}
void SAL_CALL ChartView::removeModeChangeListener( const uno::Reference< util::XModeChangeListener >& xListener )
throw (uno::RuntimeException, std::exception)
{
m_aListenerContainer.removeInterface(
- ::getCppuType((const uno::Reference< util::XModeChangeListener >*)0), xListener );
+ cppu::UnoType<util::XModeChangeListener>::get(), xListener );
}
void SAL_CALL ChartView::addModeChangeApproveListener( const uno::Reference< util::XModeChangeApproveListener >& /* _rxListener */ )
throw (lang::NoSupportException, uno::RuntimeException, std::exception)
diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index 327e0bef2d79..a0c78b36540a 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -1111,7 +1111,7 @@ void SAL_CALL DummyXShapes::remove( const uno::Reference< drawing::XShape>& xSha
uno::Type SAL_CALL DummyXShapes::getElementType()
throw(uno::RuntimeException, std::exception)
{
- return ::getCppuType(( const uno::Reference< drawing::XShape >*)0);
+ return cppu::UnoType<drawing::XShape>::get();
}
sal_Bool SAL_CALL SAL_CALL DummyXShapes::hasElements()
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index 892c4b3d155f..a50175a83165 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -171,7 +171,7 @@ uno::Any createPolyPolygon_Cube(
*pInnerSequenceX++ = -fWidthH;
*pInnerSequenceX++ = -fWidthH + fOffset;
}
- return uno::Any( &aPP, ::getCppuType((const drawing::PolyPolygonShape3D*)0) );
+ return uno::Any( &aPP, cppu::UnoType<drawing::PolyPolygonShape3D>::get());
}
uno::Any createPolyPolygon_Cylinder(
@@ -253,7 +253,7 @@ uno::Any createPolyPolygon_Cylinder(
*pInnerSequenceX++ = 0.0;
*pInnerSequenceY++ = fY2;
- return uno::Any( &aPP, ::getCppuType((const drawing::PolyPolygonShape3D*)0) );
+ return uno::Any( &aPP, cppu::UnoType<drawing::PolyPolygonShape3D>::get());
}
uno::Any createPolyPolygon_Cone( double fHeight, double fRadius, double fTopHeight
@@ -330,7 +330,7 @@ uno::Any createPolyPolygon_Cone( double fHeight, double fRadius, double fTopHeig
*pInnerSequenceY++ = fY3;
*pInnerSequenceX++ = fX3;
- return uno::Any( &aPP, ::getCppuType((const drawing::PolyPolygonShape3D*)0) );
+ return uno::Any( &aPP, cppu::UnoType<drawing::PolyPolygonShape3D>::get());
}
// methods for 3D shape creation
diff --git a/chart2/source/view/main/Stripe.cxx b/chart2/source/view/main/Stripe.cxx
index 2d99143152b0..6d4bb9074f0d 100644
--- a/chart2/source/view/main/Stripe.cxx
+++ b/chart2/source/view/main/Stripe.cxx
@@ -115,7 +115,7 @@ uno::Any Stripe::getPolyPolygonShape3D() const
*pInnerSequenceY++ = m_aPoint4.PositionY;
*pInnerSequenceZ++ = m_aPoint4.PositionZ;
- return uno::Any( &aPP, ::getCppuType((const drawing::PolyPolygonShape3D*)0) );
+ return uno::Any( &aPP, cppu::UnoType<drawing::PolyPolygonShape3D>::get());
}
drawing::Direction3D Stripe::getNormal() const
@@ -172,7 +172,7 @@ uno::Any Stripe::getNormalsPolygon() const
*pInnerSequenceY++ = aNormal.DirectionY;
*pInnerSequenceZ++ = aNormal.DirectionZ;
}
- return uno::Any( &aPP, ::getCppuType((const drawing::PolyPolygonShape3D*)0) );
+ return uno::Any( &aPP, cppu::UnoType<drawing::PolyPolygonShape3D>::get());
}
uno::Any Stripe::getTexturePolygon( short nRotatedTexture ) const
@@ -340,7 +340,7 @@ uno::Any Stripe::getTexturePolygon( short nRotatedTexture ) const
*pInnerSequenceZ++ = 0.0;
}
- return uno::Any( &aPP, ::getCppuType((const drawing::PolyPolygonShape3D*)0) );
+ return uno::Any( &aPP, cppu::UnoType<drawing::PolyPolygonShape3D>::get());
}
} //namespace chart