Do not use C++-UNO internal static_type functions in client code

...use cppu::UnoType instead.

Change-Id: I507914b30ef8acda910ee4ecc0589fd328eb6f31

8 files changed, 32 insertions, 32 deletions

diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 71b6ebd5296e..aea7ea3632b9 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -72,7 +72,7 @@ static const SvxItemPropertySet* ImplGetSvxCellPropertySet()
     {
         FILL_PROPERTIES
 //      { "HasLevels",                    OWN_ATTR_HASLEVELS,             ::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::READONLY,      0},
-        { OUString("Style"),                        OWN_ATTR_STYLE,                 ::com::sun::star::style::XStyle::static_type(),                                    ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+        { OUString("Style"),                        OWN_ATTR_STYLE,                 cppu::UnoType<::com::sun::star::style::XStyle>::get(),                                    ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
         { OUString(UNO_NAME_TEXT_WRITINGMODE),      SDRATTR_TEXTDIRECTION,          ::getCppuType( (::com::sun::star::text::WritingMode*) 0 ),                         0,      0},
         { OUString(UNO_NAME_TEXT_HORZADJUST),       SDRATTR_TEXT_HORZADJUST,        ::getCppuType((const ::com::sun::star::drawing::TextHorizontalAdjust*)0),  0,      0}, \
         { OUString(UNO_NAME_TEXT_LEFTDIST),         SDRATTR_TEXT_LEFTDIST,          ::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
@@ -801,16 +801,16 @@ sdr::properties::TextProperties* Cell::CloneProperties( SdrObject& rNewObj, Cell
 
 Any SAL_CALL Cell::queryInterface( const Type & rType ) throw(RuntimeException)
 {
-    if( rType == XMergeableCell::static_type() )
+    if( rType == cppu::UnoType<XMergeableCell>::get() )
         return Any( Reference< XMergeableCell >( this ) );
 
-    if( rType == XCell::static_type() )
+    if( rType == cppu::UnoType<XCell>::get() )
         return Any( Reference< XCell >( this ) );
 
-    if( rType == XLayoutConstrains::static_type() )
+    if( rType == cppu::UnoType<XLayoutConstrains>::get() )
         return Any( Reference< XLayoutConstrains >( this ) );
 
-    if( rType == XEventListener::static_type() )
+    if( rType == cppu::UnoType<XEventListener>::get() )
         return Any( Reference< XEventListener >( this ) );
 
     Any aRet( SvxUnoTextBase::queryAggregation( rType ) );
@@ -844,8 +844,8 @@ Sequence< Type > SAL_CALL Cell::getTypes(  ) throw (RuntimeException)
 
     sal_Int32 nLen = aTypes.getLength();
     aTypes.realloc(nLen + 2);
-    aTypes[nLen++] = XMergeableCell::static_type();
-    aTypes[nLen++] = XLayoutConstrains::static_type();
+    aTypes[nLen++] = cppu::UnoType<XMergeableCell>::get();
+    aTypes[nLen++] = cppu::UnoType<XLayoutConstrains>::get();
 
     return aTypes;
 }
diff --git a/svx/source/table/tablecolumns.cxx b/svx/source/table/tablecolumns.cxx
index 77428a8373b6..0dc240f6c9c5 100644
--- a/svx/source/table/tablecolumns.cxx
+++ b/svx/source/table/tablecolumns.cxx
@@ -113,7 +113,7 @@ Type SAL_CALL TableColumns::getElementType() throw (RuntimeException)
 {
     throwIfDisposed();
 
-    return XCellRange::static_type();
+    return cppu::UnoType<XCellRange>::get();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx
index 904c0daef9d0..00e857bf459d 100644
--- a/svx/source/table/tabledesign.cxx
+++ b/svx/source/table/tabledesign.cxx
@@ -236,7 +236,7 @@ sal_Bool SAL_CALL TableDesignStyle::isUserDefined() throw (RuntimeException)
 sal_Bool SAL_CALL TableDesignStyle::isInUse() throw (RuntimeException)
 {
     ClearableMutexGuard aGuard( rBHelper.rMutex );
-    OInterfaceContainerHelper * pContainer = rBHelper.getContainer( XModifyListener::static_type() );
+    OInterfaceContainerHelper * pContainer = rBHelper.getContainer( cppu::UnoType<XModifyListener>::get() );
     if( pContainer )
     {
         Sequence< Reference< XInterface > > aListener( pContainer->getElements() );
@@ -334,7 +334,7 @@ sal_Bool SAL_CALL TableDesignStyle::hasByName( const OUString& rName )  throw(Ru
 
 Type SAL_CALL TableDesignStyle::getElementType() throw(RuntimeException)
 {
-    return XStyle::static_type();
+    return cppu::UnoType<XStyle>::get();
 }
 
 // ----------------------------------------------------------
@@ -430,7 +430,7 @@ void SAL_CALL TableDesignStyle::addModifyListener( const Reference< XModifyListe
     }
     else
     {
-        rBHelper.addListener( XModifyListener::static_type(), xListener );
+        rBHelper.addListener( cppu::UnoType<XModifyListener>::get(), xListener );
     }
 }
 
@@ -438,7 +438,7 @@ void SAL_CALL TableDesignStyle::addModifyListener( const Reference< XModifyListe
 
 void SAL_CALL TableDesignStyle::removeModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException)
 {
-    rBHelper.removeListener( XModifyListener::static_type(), xListener );
+    rBHelper.removeListener( cppu::UnoType<XModifyListener>::get(), xListener );
 }
 
 //------------------------------------------------------------------------
@@ -447,7 +447,7 @@ void TableDesignStyle::notifyModifyListener()
 {
     MutexGuard aGuard( rBHelper.rMutex );
 
-    OInterfaceContainerHelper * pContainer = rBHelper.getContainer( XModifyListener::static_type() );
+    OInterfaceContainerHelper * pContainer = rBHelper.getContainer( cppu::UnoType<XModifyListener>::get() );
     if( pContainer )
     {
         EventObject aEvt( static_cast< OWeakObject * >( this ) );
@@ -558,7 +558,7 @@ sal_Bool SAL_CALL TableDesignFamily::hasByName( const OUString& aName ) throw(Ru
 
 Type SAL_CALL TableDesignFamily::getElementType() throw(RuntimeException)
 {
-    return XStyle::static_type();
+    return cppu::UnoType<XStyle>::get();
 }
 
 // ----------------------------------------------------------
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 62d20c204302..0bbb63d78131 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -390,14 +390,14 @@ void SAL_CALL TableModel::setModified( sal_Bool bModified ) throw (PropertyVetoE
 
 void SAL_CALL TableModel::addModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException)
 {
-    rBHelper.addListener( XModifyListener::static_type() , xListener );
+    rBHelper.addListener( cppu::UnoType<XModifyListener>::get() , xListener );
 }
 
 // -----------------------------------------------------------------------------
 
 void SAL_CALL TableModel::removeModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException)
 {
-    rBHelper.removeListener( XModifyListener::static_type() , xListener );
+    rBHelper.removeListener( cppu::UnoType<XModifyListener>::get() , xListener );
 }
 
 // -----------------------------------------------------------------------------
@@ -606,7 +606,7 @@ void TableModel::notifyModification()
     {
         mbNotifyPending = false;
 
-        ::cppu::OInterfaceContainerHelper * pModifyListeners = rBHelper.getContainer( XModifyListener::static_type() );
+        ::cppu::OInterfaceContainerHelper * pModifyListeners = rBHelper.getContainer( cppu::UnoType<XModifyListener>::get() );
         if( pModifyListeners )
         {
             EventObject aSource;
diff --git a/svx/source/table/tablerows.cxx b/svx/source/table/tablerows.cxx
index 6bba9e6d8ddc..6bc90ed81f53 100644
--- a/svx/source/table/tablerows.cxx
+++ b/svx/source/table/tablerows.cxx
@@ -109,7 +109,7 @@ Any SAL_CALL TableRows::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsExc
 Type SAL_CALL TableRows::getElementType() throw (RuntimeException)
 {
     throwIfDisposed();
-    return XCellRange::static_type();
+    return cppu::UnoType<XCellRange>::get();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index ec8120a27252..0ec21af44650 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -245,7 +245,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxGraphicObjectPropertyMap()
         { OUString("IsMirrored"), OWN_ATTR_MIRRORED, ::getCppuBooleanType(), 0, 0},
         { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
         { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
-        { OUString("GraphicStream"), OWN_ATTR_GRAPHIC_STREAM, ::com::sun::star::io::XInputStream::static_type(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { OUString("GraphicStream"), OWN_ATTR_GRAPHIC_STREAM, cppu::UnoType<::com::sun::star::io::XInputStream>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
 
@@ -726,7 +726,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxMediaShapePropertyMap()
         // #i68101#
         { OUString(UNO_NAME_MISC_OBJ_TITLE),        OWN_ATTR_MISC_OBJ_TITLE         , ::getCppuType((const OUString*)0),    0,  0},
         { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION),  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::getCppuType((const OUString*)0),    0,  0},
-        {OUString("PrivateStream"), OWN_ATTR_MEDIA_STREAM, ::com::sun::star::io::XInputStream::static_type(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        {OUString("PrivateStream"), OWN_ATTR_MEDIA_STREAM, cppu::UnoType<::com::sun::star::io::XInputStream>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         {OUString("PrivateTempFileURL"), OWN_ATTR_MEDIA_TEMPFILEURL, ::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
@@ -741,7 +741,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxTableShapePropertyMap()
         { OUString(UNO_NAME_MISC_OBJ_ZORDER),       OWN_ATTR_ZORDER, ::getCppuType((const sal_Int32*)0), 0, 0},
         { OUString(UNO_NAME_MISC_OBJ_LAYERID),      SDRATTR_LAYERID, ::getCppuType((const sal_Int16*)0), 0,    0},
         { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),    SDRATTR_LAYERNAME, ::getCppuType((const OUString*)0), 0, 0},
-        { OUString(UNO_NAME_LINKDISPLAYBITMAP),     OWN_ATTR_LDBITMAP, ::com::sun::star::awt::XBitmap::static_type(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { OUString(UNO_NAME_LINKDISPLAYBITMAP),     OWN_ATTR_LDBITMAP, cppu::UnoType<::com::sun::star::awt::XBitmap>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         { OUString(UNO_NAME_LINKDISPLAYNAME),       OWN_ATTR_LDNAME, ::getCppuType(( const OUString*)0),    ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         { OUString("Transformation"),               OWN_ATTR_TRANSFORMATION, ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 },
         { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT),  SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
@@ -750,15 +750,15 @@ SfxItemPropertyMapEntry const * ImplGetSvxTableShapePropertyMap()
         { OUString(UNO_NAME_MISC_OBJ_NAME),         SDRATTR_OBJECTNAME, ::getCppuType((const ::rtl::OUString*)0),    0,      0},
         { OUString(UNO_NAME_MISC_OBJ_TITLE),        OWN_ATTR_MISC_OBJ_TITLE         , ::getCppuType((const OUString*)0),    0,  0},
         { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION),  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::getCppuType((const OUString*)0),    0,  0},
-        { OUString("Model"),                        OWN_ATTR_OLEMODEL               , ::com::sun::star::table::XTable::static_type(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { OUString("TableTemplate"),                OWN_ATTR_TABLETEMPLATE          , ::com::sun::star::container::XIndexAccess::static_type(), 0, 0},
+        { OUString("Model"),                        OWN_ATTR_OLEMODEL               , cppu::UnoType<::com::sun::star::table::XTable>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { OUString("TableTemplate"),                OWN_ATTR_TABLETEMPLATE          , cppu::UnoType<::com::sun::star::container::XIndexAccess>::get(), 0, 0},
         { OUString("UseFirstRowStyle"),             OWN_ATTR_TABLETEMPLATE_FIRSTROW, ::getBooleanCppuType(),0, 0},
         { OUString("UseLastRowStyle"),              OWN_ATTR_TABLETEMPLATE_LASTROW, ::getBooleanCppuType(),0, 0},
         { OUString("UseFirstColumnStyle"),          OWN_ATTR_TABLETEMPLATE_FIRSTCOLUMN, ::getBooleanCppuType(),0, 0},
         { OUString("UseLastColumnStyle"),           OWN_ATTR_TABLETEMPLATE_LASTCOLUMN, ::getBooleanCppuType(),0, 0},
         { OUString("UseBandingRowStyle"),           OWN_ATTR_TABLETEMPLATE_BANDINGROWS, ::getBooleanCppuType(),0, 0},
         { OUString("UseBandingColumnStyle"),        OWN_ATTR_TABLETEMPLATE_BANDINGCOULUMNS, ::getBooleanCppuType(),0, 0},
-        { OUString("ReplacementGraphic"),           OWN_ATTR_BITMAP, ::com::sun::star::graphic::XGraphic::static_type(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { OUString("ReplacementGraphic"),           OWN_ATTR_BITMAP, cppu::UnoType<::com::sun::star::graphic::XGraphic>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
 
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 3d8370fabb0e..a58b91d1b076 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1479,7 +1479,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte
                 }
             }
         }
-        else if( (rValue.getValueType() == awt::XBitmap::static_type()) || (rValue.getValueType() == graphic::XGraphic::static_type()))
+        else if( (rValue.getValueType() == cppu::UnoType<awt::XBitmap>::get()) || (rValue.getValueType() == cppu::UnoType<graphic::XGraphic>::get()))
         {
             Reference< graphic::XGraphic> xGraphic( rValue, UNO_QUERY );
             if( xGraphic.is() )
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 2a97b18a6a69..8c64c3a4c780 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -782,7 +782,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes()
                     *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertySet >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< beans::XMultiPropertySet >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertyState >*)0);
-                    *pTypes++ = beans::XMultiPropertyStates::static_type();
+                    *pTypes++ = cppu::UnoType<beans::XMultiPropertyStates>::get();
                     *pTypes++ = ::getCppuType((const uno::Reference< drawing::XGluePointsSupplier >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< container::XChild >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo >*)0);
@@ -814,7 +814,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes()
                     *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertySet >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< beans::XMultiPropertySet >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertyState >*)0);
-                    *pTypes++ = beans::XMultiPropertyStates::static_type();
+                    *pTypes++ = cppu::UnoType<beans::XMultiPropertyStates>::get();
                     *pTypes++ = ::getCppuType((const uno::Reference< drawing::XGluePointsSupplier >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< container::XChild >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo >*)0);
@@ -848,7 +848,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes()
                     *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertySet >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< beans::XMultiPropertySet >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertyState >*)0);
-                    *pTypes++ = beans::XMultiPropertyStates::static_type();
+                    *pTypes++ = cppu::UnoType<beans::XMultiPropertyStates>::get();
                     *pTypes++ = ::getCppuType((const uno::Reference< drawing::XGluePointsSupplier >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< container::XChild >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo >*)0);
@@ -886,7 +886,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes()
                     *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertySet >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< beans::XMultiPropertySet >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertyState >*)0);
-                    *pTypes++ = beans::XMultiPropertyStates::static_type();
+                    *pTypes++ = cppu::UnoType<beans::XMultiPropertyStates>::get();
                     *pTypes++ = ::getCppuType((const uno::Reference< drawing::XGluePointsSupplier >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< container::XChild >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo >*)0);
@@ -919,7 +919,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes()
                     *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertySet >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< beans::XMultiPropertySet >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertyState >*)0);
-                    *pTypes++ = beans::XMultiPropertyStates::static_type();
+                    *pTypes++ = cppu::UnoType<beans::XMultiPropertyStates>::get();
                     *pTypes++ = ::getCppuType((const uno::Reference< drawing::XGluePointsSupplier >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< container::XChild >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo >*)0);
@@ -951,7 +951,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes()
                     *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertySet >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< beans::XMultiPropertySet >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertyState >*)0);
-                    *pTypes++ = beans::XMultiPropertyStates::static_type();
+                    *pTypes++ = cppu::UnoType<beans::XMultiPropertyStates>::get();
                     *pTypes++ = ::getCppuType((const uno::Reference< drawing::XGluePointsSupplier >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< container::XChild >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo >*)0);
@@ -1005,7 +1005,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes()
                     *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertySet >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< beans::XMultiPropertySet >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertyState >*)0);
-                    *pTypes++ = beans::XMultiPropertyStates::static_type();
+                    *pTypes++ = cppu::UnoType<beans::XMultiPropertyStates>::get();
                     *pTypes++ = ::getCppuType((const uno::Reference< drawing::XGluePointsSupplier >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< container::XChild >*)0);
                     *pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo >*)0);