diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-12 11:09:57 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-12 11:10:10 +0100 |
| commit | 83e191e25da8a508a2dafad339c0ee58e97c5c8b (patch) | |
| tree | 41ffadeda7fcf325b0d0bdd5764fe4bd7282319e /comphelper | |
| parent | 7bf2f528ef22f50aa167ba57f2e25d4452977060 (diff) | |
Do not use C++-UNO internal static_type functions in client code
...use cppu::UnoType instead.
Change-Id: I507914b30ef8acda910ee4ecc0589fd328eb6f31
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/misc/weak.cxx | 2 | ||||
| -rw-r--r-- | comphelper/source/property/TypeGeneration.cxx | 2 | ||||
| -rw-r--r-- | comphelper/source/property/propstate.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/comphelper/source/misc/weak.cxx b/comphelper/source/misc/weak.cxx index 69163ab13bfb..f3117e6566f9 100644 --- a/comphelper/source/misc/weak.cxx +++ b/comphelper/source/misc/weak.cxx @@ -36,7 +36,7 @@ OWeakTypeObject::~OWeakTypeObject() Any SAL_CALL OWeakTypeObject::queryInterface(const Type & rType ) throw (RuntimeException) { - if( rType == XTypeProvider::static_type() ) + if( rType == cppu::UnoType<XTypeProvider>::get() ) return Any( Reference< XTypeProvider >(this) ); else return ::cppu::OWeakObject::queryInterface( rType ); diff --git a/comphelper/source/property/TypeGeneration.cxx b/comphelper/source/property/TypeGeneration.cxx index a5b27bc66d87..47c42b138837 100644 --- a/comphelper/source/property/TypeGeneration.cxx +++ b/comphelper/source/property/TypeGeneration.cxx @@ -218,7 +218,7 @@ namespace comphelper case CPPUTYPE_SEQNAMEDVALUE: pType = &::getCppuType( (Sequence<beans::NamedValue>*)0 ); break; case CPPUTYPE_REFXGRAPHIC: pType = &::getCppuType( (Reference< graphic::XGraphic >*)0); break; case CPPUTYPE_TABLEBORDERDISTANCES: pType = &::getCppuType( (table::TableBorderDistances*)0 ); break; - case CPPUTPYE_REFEMBEDDEDOBJECT: pType = &embed::XEmbeddedObject::static_type(); break; + case CPPUTPYE_REFEMBEDDEDOBJECT: pType = &cppu::UnoType<embed::XEmbeddedObject>::get(); break; case CPPUTYPE_LINESTYLE: pType = &::getCppuType( (drawing::LineStyle*)0 ); break; case CPPUTYPE_FILLSTYLE: pType = &::getCppuType( (drawing::FillStyle*)0 ); break; case CPPUTYPE_GRADIENT: pType = &::getCppuType( (awt::Gradient*)0 ); break; diff --git a/comphelper/source/property/propstate.cxx b/comphelper/source/property/propstate.cxx index 1b4e1324936a..e596bc158c0d 100644 --- a/comphelper/source/property/propstate.cxx +++ b/comphelper/source/property/propstate.cxx @@ -194,8 +194,8 @@ namespace comphelper Sequence< Type > SAL_CALL OStatefulPropertySet::getTypes() throw(RuntimeException) { Sequence< Type > aOwnTypes( 2 ); - aOwnTypes[0] = XWeak::static_type(); - aOwnTypes[1] = XTypeProvider::static_type(); + aOwnTypes[0] = cppu::UnoType<XWeak>::get(); + aOwnTypes[1] = cppu::UnoType<XTypeProvider>::get(); return concatSequences( aOwnTypes, |