mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
...use cppu::UnoType instead.

Change-Id: I507914b30ef8acda910ee4ecc0589fd328eb6f31
This commit is contained in:
Stephan Bergmann 2013-12-12 11:09:57 +01:00
parent 7bf2f528ef
commit 83e191e25d
130 changed files with 296 additions and 296 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basic/source/classes/sbxmod.cxx
View File

@ -217,7 +217,7 @@ Sequence< Type > SAL_CALL DocObjectWrapper::getTypes()
{
if ( i == 0 )
{
*pPtr = XInvocation::static_type( NULL );
*pPtr = cppu::UnoType<XInvocation>::get();
}
else
{

2
comphelper/source/misc/weak.cxx
View File

@ -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 );

2
comphelper/source/property/TypeGeneration.cxx
View File

@ -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;

4
comphelper/source/property/propstate.cxx
View File

@ -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,

12
dbaccess/source/core/dataaccess/connection.cxx
View File

@ -434,11 +434,11 @@ Sequence< Type > OConnection::getTypes() throw (RuntimeException)
lcl_copyTypes( aNormalizedTypes, ::connectivity::OConnectionWrapper::getTypes() );
if ( !m_bSupportsViews )
aNormalizedTypes.erase( XViewsSupplier::static_type() );
aNormalizedTypes.erase( cppu::UnoType<XViewsSupplier>::get() );
if ( !m_bSupportsUsers )
aNormalizedTypes.erase( XUsersSupplier::static_type() );
aNormalizedTypes.erase( cppu::UnoType<XUsersSupplier>::get() );
if ( !m_bSupportsGroups )
aNormalizedTypes.erase( XGroupsSupplier::static_type() );
aNormalizedTypes.erase( cppu::UnoType<XGroupsSupplier>::get() );
Sequence< Type > aSupportedTypes( aNormalizedTypes.size() );
::std::copy( aNormalizedTypes.begin(), aNormalizedTypes.end(), aSupportedTypes.getArray() );
@ -454,11 +454,11 @@ Sequence< sal_Int8 > OConnection::getImplementationId() throw (RuntimeException)
// com::sun::star::uno::XInterface
Any OConnection::queryInterface( const Type & rType ) throw (RuntimeException)
{
if ( !m_bSupportsViews && rType.equals( XViewsSupplier::static_type() ) )
if ( !m_bSupportsViews && rType.equals( cppu::UnoType<XViewsSupplier>::get() ) )
return Any();
else if ( !m_bSupportsUsers && rType.equals( XUsersSupplier::static_type() ) )
else if ( !m_bSupportsUsers && rType.equals( cppu::UnoType<XUsersSupplier>::get() ) )
return Any();
else if ( !m_bSupportsGroups && rType.equals( XGroupsSupplier::static_type() ) )
else if ( !m_bSupportsGroups && rType.equals( cppu::UnoType<XGroupsSupplier>::get() ) )
return Any();
Any aReturn = OSubComponent::queryInterface( rType );
if (!aReturn.hasValue())

8
dbaccess/source/core/dataaccess/databasedocument.cxx
View File

@ -221,8 +221,8 @@ Any SAL_CALL ODatabaseDocument::queryInterface( const Type& _rType ) throw (Runt
// which already contains macros. In this case, the database document itself is not
// allowed to contain macros, too.
if ( !m_bAllowDocumentScripting
&& ( _rType.equals( XEmbeddedScripts::static_type() )
|| _rType.equals( XScriptInvocationContext::static_type() )
&& ( _rType.equals( cppu::UnoType<XEmbeddedScripts>::get() )
|| _rType.equals( cppu::UnoType<XScriptInvocationContext>::get() )
)
)
return Any();
@ -265,7 +265,7 @@ Sequence< Type > SAL_CALL ODatabaseDocument::getTypes( ) throw (RuntimeExceptio
aTypes.getConstArray(),
aTypes.getConstArray() + aTypes.getLength(),
pStripTo,
::std::bind2nd( ::std::equal_to< Type >(), XEmbeddedScripts::static_type() )
::std::bind2nd( ::std::equal_to< Type >(), cppu::UnoType<XEmbeddedScripts>::get() )
) - pStripTo
);
@ -276,7 +276,7 @@ Sequence< Type > SAL_CALL ODatabaseDocument::getTypes( ) throw (RuntimeExceptio
aTypes.getConstArray(),
aTypes.getConstArray() + aTypes.getLength(),
pStripTo,
::std::bind2nd( ::std::equal_to< Type >(), XScriptInvocationContext::static_type() )
::std::bind2nd( ::std::equal_to< Type >(), cppu::UnoType<XScriptInvocationContext>::get() )
) - pStripTo
);
}

4
dbaccess/source/ui/browser/brwctrlr.cxx
View File

@ -597,7 +597,7 @@ void SbaXDataBrowserController::startFrameListening( const Reference< XFrame >&
Reference< XFrameActionListener > xAggListener;
if ( m_xFormControllerImpl.is() )
m_xFormControllerImpl->queryAggregation( XFrameActionListener::static_type() ) >>= xAggListener;
m_xFormControllerImpl->queryAggregation( cppu::UnoType<XFrameActionListener>::get() ) >>= xAggListener;
if ( _rxFrame.is() && xAggListener.is() )
_rxFrame->addFrameActionListener( xAggListener );
@ -610,7 +610,7 @@ void SbaXDataBrowserController::stopFrameListening( const Reference< XFrame >& _
Reference< XFrameActionListener > xAggListener;
if ( m_xFormControllerImpl.is() )
m_xFormControllerImpl->queryAggregation( XFrameActionListener::static_type() ) >>= xAggListener;
m_xFormControllerImpl->queryAggregation( cppu::UnoType<XFrameActionListener>::get() ) >>= xAggListener;
if ( _rxFrame.is() && xAggListener.is() )
_rxFrame->removeFrameActionListener( xAggListener );

4
dbaccess/source/ui/browser/unodatbr.cxx
View File

@ -240,7 +240,7 @@ SbaTableQueryBrowser::~SbaTableQueryBrowser()
Any SAL_CALL SbaTableQueryBrowser::queryInterface(const Type& _rType) throw (RuntimeException)
{
if ( _rType.equals( XScriptInvocationContext::static_type() ) )
if ( _rType.equals( cppu::UnoType<XScriptInvocationContext>::get() ) )
{
OSL_PRECOND( !!m_aDocScriptSupport, "SbaTableQueryBrowser::queryInterface: did not initialize this, yet!" );
if ( !!m_aDocScriptSupport && *m_aDocScriptSupport )
@ -269,7 +269,7 @@ Sequence< Type > SAL_CALL SbaTableQueryBrowser::getTypes( ) throw (RuntimeExcep
aTypes.getConstArray(),
aTypes.getConstArray() + aTypes.getLength(),
aStrippedTypes.getArray(),
::std::bind2nd( ::std::equal_to< Type >(), XScriptInvocationContext::static_type() )
::std::bind2nd( ::std::equal_to< Type >(), cppu::UnoType<XScriptInvocationContext>::get() )
);
aTypes = aStrippedTypes;
}

4
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
View File

@ -211,7 +211,7 @@ namespace dbaui
Any SAL_CALL DBSubComponentController::queryInterface(const Type& _rType) throw (RuntimeException)
{
if ( _rType.equals( XScriptInvocationContext::static_type() ) )
if ( _rType.equals( cppu::UnoType<XScriptInvocationContext>::get() ) )
{
if ( m_pImpl->documentHasScriptSupport() )
return makeAny( Reference< XScriptInvocationContext >( this ) );
@ -231,7 +231,7 @@ namespace dbaui
aTypes.getConstArray(),
aTypes.getConstArray() + aTypes.getLength(),
aStrippedTypes.getArray(),
::std::bind2nd( ::std::equal_to< Type >(), XScriptInvocationContext::static_type() )
::std::bind2nd( ::std::equal_to< Type >(), cppu::UnoType<XScriptInvocationContext>::get() )
);
aTypes = aStrippedTypes;
}

6
desktop/source/deployment/manager/dp_extensionmanager.cxx
View File

@ -1386,7 +1386,7 @@ void ExtensionManager::checkInstall(
static_cast<OWeakObject *>(this), displayName));
bool approve = false, abort = false;
if (! dp_misc::interactContinuation(
request, task::XInteractionApprove::static_type(),
request, cppu::UnoType<task::XInteractionApprove>::get(),
cmdEnv, &approve, &abort ))
{
OSL_ASSERT( !approve && !abort );
@ -1419,7 +1419,7 @@ void ExtensionManager::checkUpdate(
oldExtension ) ) );
bool replace = false, abort = false;
if (! dp_misc::interactContinuation(
request, task::XInteractionApprove::static_type(),
request, cppu::UnoType<task::XInteractionApprove>::get(),
xCmdEnv, &replace, &abort )) {
OSL_ASSERT( !replace && !abort );
throw css::deployment::DeploymentException(
@ -1494,7 +1494,7 @@ void ExtensionManager::check()
void ExtensionManager::fireModified()
{
::cppu::OInterfaceContainerHelper * pContainer = rBHelper.getContainer(
util::XModifyListener::static_type() );
cppu::UnoType<util::XModifyListener>::get() );
if (pContainer != 0) {
pContainer->forEach<util::XModifyListener>(
boost::bind(&util::XModifyListener::modified, _1,

2
desktop/source/deployment/manager/dp_manager.cxx
View File

@ -439,7 +439,7 @@ PackageManagerImpl::~PackageManagerImpl()
void PackageManagerImpl::fireModified()
{
::cppu::OInterfaceContainerHelper * pContainer = rBHelper.getContainer(
util::XModifyListener::static_type() );
cppu::UnoType<util::XModifyListener>::get() );
if (pContainer != 0) {
pContainer->forEach<util::XModifyListener>(
boost::bind(&util::XModifyListener::modified, _1,

4
desktop/source/deployment/misc/dp_interact.cxx
View File

@ -134,7 +134,7 @@ bool interactContinuation( Any const & request,
bool * pcont, bool * pabort )
{
OSL_ASSERT(
task::XInteractionContinuation::static_type().isAssignableFrom(
cppu::UnoType<task::XInteractionContinuation>::get().isAssignableFrom(
continuation ) );
if (xCmdEnv.is()) {
Reference<task::XInteractionHandler> xInteractionHandler(
@ -146,7 +146,7 @@ bool interactContinuation( Any const & request,
conts[ 0 ] = new InteractionContinuationImpl(
continuation, &cont );
conts[ 1 ] = new InteractionContinuationImpl(
task::XInteractionAbort::static_type(), &abort );
cppu::UnoType<task::XInteractionAbort>::get(), &abort );
xInteractionHandler->handle(
new InteractionRequest( request, conts ) );
if (cont || abort) {

10
desktop/source/deployment/registry/package/dp_package.cxx
View File

@ -697,7 +697,7 @@ bool BackendImpl::PackageImpl::checkDependencies(
bool approve = false;
bool abort = false;
if (! interactContinuation(
Any(licExc), task::XInteractionApprove::static_type(), xCmdEnv, &approve, &abort ))
Any(licExc), cppu::UnoType<task::XInteractionApprove>::get(), xCmdEnv, &approve, &abort ))
throw css::deployment::DeploymentException(
"Could not interact with user.", 0, Any());
@ -871,7 +871,7 @@ void BackendImpl::PackageImpl::processPackage_(
Any( lang::WrappedTargetException(
"bundle item registration error!",
static_cast<OWeakObject *>(this), exc ) ),
task::XInteractionApprove::static_type(), xCmdEnv,
cppu::UnoType<task::XInteractionApprove>::get(), xCmdEnv,
&approve, &abort )) {
OSL_ASSERT( !approve && !abort );
if (m_legacyBundle) // default for legacy packages: ignore
@ -950,7 +950,7 @@ void BackendImpl::PackageImpl::processPackage_(
Any( lang::WrappedTargetException(
"bundle item revocation error!",
static_cast<OWeakObject *>(this), exc ) ),
task::XInteractionApprove::static_type(), xCmdEnv,
cppu::UnoType<task::XInteractionApprove>::get(), xCmdEnv,
&approve, &abort )) {
OSL_ASSERT( !approve && !abort );
if (m_legacyBundle) // default for legacy packages: ignore
@ -1053,7 +1053,7 @@ void BackendImpl::PackageImpl::exportTo(
static_cast<OWeakObject *>(this),
task::InteractionClassification_QUERY,
destFolderURL, title, OUString() ) ),
ucb::XInteractionReplaceExistingData::static_type(), xCmdEnv,
cppu::UnoType<ucb::XInteractionReplaceExistingData>::get(), xCmdEnv,
&replace, &abort ) || !replace) {
return;
}
@ -1383,7 +1383,7 @@ Reference<deployment::XPackage> BackendImpl::PackageImpl::bindBundleItem(
interactContinuation(
Any( lang::WrappedTargetException("bundle item error!",
static_cast<OWeakObject *>(this), exc ) ),
task::XInteractionApprove::static_type(), xCmdEnv, 0, 0 );
cppu::UnoType<task::XInteractionApprove>::get(), xCmdEnv, 0, 0 );
}
}

2
extensions/source/propctrlr/formcontroller.cxx
View File

@ -175,7 +175,7 @@ namespace pcr
aProps[1] = Property(
PROPERTY_INTROSPECTEDOBJECT,
OWN_PROPERTY_ID_INTROSPECTEDOBJECT,
XPropertySet::static_type(),
cppu::UnoType<XPropertySet>::get(),
PropertyAttribute::TRANSIENT | PropertyAttribute::CONSTRAINED
);
return new ::cppu::OPropertyArrayHelper( aProps );

2
extensions/source/propctrlr/genericpropertyhandler.cxx
View File

@ -382,7 +382,7 @@ namespace pcr
if ( !xIntrospectionAccess.is() )
throw RuntimeException("The introspection service could not handle the given component.", *this );
m_xComponent = Reference< XPropertySet >( xIntrospectionAccess->queryAdapter( XPropertySet::static_type() ), UNO_QUERY_THROW );
m_xComponent = Reference< XPropertySet >( xIntrospectionAccess->queryAdapter( cppu::UnoType<XPropertySet>::get() ), UNO_QUERY_THROW );
// now that we survived so far, remember m_xComponentIntrospectionAccess
m_xComponentIntrospectionAccess = xIntrospectionAccess;
m_xPropertyState = m_xPropertyState.query( m_xComponent );

16
forms/source/component/Columns.cxx
View File

@ -155,21 +155,21 @@ Sequence<Type> SAL_CALL OGridColumn::getTypes() throw(RuntimeException)
{
TypeBag aTypes( OGridColumn_BASE::getTypes() );
// erase the types which we do not support
aTypes.removeType( XFormComponent::static_type() );
aTypes.removeType( XServiceInfo::static_type() );
aTypes.removeType( XBindableValue::static_type() );
aTypes.removeType( XPropertyContainer::static_type() );
aTypes.removeType( cppu::UnoType<XFormComponent>::get() );
aTypes.removeType( cppu::UnoType<XServiceInfo>::get() );
aTypes.removeType( cppu::UnoType<XBindableValue>::get() );
aTypes.removeType( cppu::UnoType<XPropertyContainer>::get() );
// but re-add their base class(es)
aTypes.addType( XChild::static_type() );
aTypes.addType( cppu::UnoType<XChild>::get() );
Reference< XTypeProvider > xProv;
if ( query_aggregation( m_xAggregate, xProv ))
aTypes.addTypes( xProv->getTypes() );
aTypes.removeType( XTextRange::static_type() );
aTypes.removeType( XSimpleText::static_type() );
aTypes.removeType( XText::static_type() );
aTypes.removeType( cppu::UnoType<XTextRange>::get() );
aTypes.removeType( cppu::UnoType<XSimpleText>::get() );
aTypes.removeType( cppu::UnoType<XText>::get() );
return aTypes.getTypes();
}

2
forms/source/component/DatabaseForm.cxx
View File

@ -370,7 +370,7 @@ ODatabaseForm::ODatabaseForm( const ODatabaseForm& _cloneSource )
try
{
Reference< XPropertySet > xSourceProps( const_cast< ODatabaseForm& >( _cloneSource ).queryAggregation(
XPropertySet::static_type() ), UNO_QUERY_THROW );
cppu::UnoType<XPropertySet>::get() ), UNO_QUERY_THROW );
Reference< XPropertySetInfo > xSourcePSI( xSourceProps->getPropertySetInfo(), UNO_SET_THROW );
Reference< XPropertyState > xSourcePropState( xSourceProps, UNO_QUERY );

2
forms/source/component/FormsCollection.cxx
View File

@ -65,7 +65,7 @@ Sequence<Type> SAL_CALL OFormsCollection::getTypes() throw(RuntimeException)
//------------------------------------------------------------------
OFormsCollection::OFormsCollection(const Reference<XComponentContext>& _rxFactory)
:FormsCollectionComponentBase( m_aMutex )
,OInterfaceContainer( _rxFactory, m_aMutex, XForm::static_type() )
,OInterfaceContainer( _rxFactory, m_aMutex, cppu::UnoType<XForm>::get() )
,OFormsCollection_BASE()
{
DBG_CTOR(OFormsCollection, NULL);

2
forms/source/component/ListBox.cxx
View File

@ -1749,7 +1749,7 @@ namespace frm
Any aReturn = OListBoxControl_BASE::queryInterface( _rType );
if ( !aReturn.hasValue()
|| _rType.equals( XTypeProvider::static_type() )
|| _rType.equals( cppu::UnoType<XTypeProvider>::get() )
)
aReturn = OBoundControl::queryAggregation( _rType );

2
forms/source/misc/InterfaceContainer.cxx
View File

@ -1304,7 +1304,7 @@ Sequence<Type> SAL_CALL OFormComponents::getTypes() throw(RuntimeException)
//------------------------------------------------------------------------------
OFormComponents::OFormComponents(const Reference<XComponentContext>& _rxFactory)
:FormComponentsBase( m_aMutex )
,OInterfaceContainer( _rxFactory, m_aMutex, XFormComponent::static_type() )
,OInterfaceContainer( _rxFactory, m_aMutex, cppu::UnoType<XFormComponent>::get() )
,OFormComponents_BASE()
{
}

2
framework/source/fwe/interaction/preventduplicateinteraction.cxx
View File

@ -70,7 +70,7 @@ void PreventDuplicateInteraction::useDefaultUUIHandler()
css::uno::Any SAL_CALL PreventDuplicateInteraction::queryInterface( const css::uno::Type& aType )
throw (css::uno::RuntimeException)
{
if ( aType.equals( XInteractionHandler2::static_type() ) )
if ( aType.equals( cppu::UnoType<XInteractionHandler2>::get() ) )
{
::osl::ResettableMutexGuard aLock(m_aLock);
css::uno::Reference< css::task::XInteractionHandler2 > xHandler( m_xHandler, css::uno::UNO_QUERY );

4
include/comphelper/uno3.hxx
View File

@ -236,7 +236,7 @@ namespace comphelper
if (_rxAggregate.is())
{
::com::sun::star::uno::Any aCheck = _rxAggregate->queryAggregation(
iface::static_type());
cppu::UnoType<iface>::get());
if (aCheck.hasValue())
_rxOut = *(::com::sun::star::uno::Reference<iface>*)aCheck.getValue();
}
@ -256,7 +256,7 @@ namespace comphelper
if (_rxObject.is())
{
::com::sun::star::uno::Any aCheck = _rxObject->queryInterface(
iface::static_type());
cppu::UnoType<iface>::get());
if(aCheck.hasValue())
{
_rxOut = *(::com::sun::star::uno::Reference<iface>*)aCheck.getValue();

2
include/vbahelper/vbacollectionimpl.hxx
View File

@ -174,7 +174,7 @@ protected:
public:
XNamedObjectCollectionHelper( const XNamedVec& sMap ) : mXNamedVec( sMap ), cachePos(mXNamedVec.begin()) {}
// XElementAccess
virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException) { return Ifc1::static_type(0); }
virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException) { return cppu::UnoType<Ifc1>::get(); }
virtual ::sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException) { return ( mXNamedVec.size() > 0 ); }
// XNameAcess
virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException)

2
reportdesign/source/core/sdr/UndoEnv.cxx
View File

@ -282,7 +282,7 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv
m_pImpl->m_xIntrospection->inspect( makeAny( _rEvent.Source ) ),
UNO_SET_THROW
);
rObjectInfo.xPropertyIntrospection.set( xIntrospection->queryAdapter( XPropertySet::static_type() ), UNO_QUERY_THROW );
rObjectInfo.xPropertyIntrospection.set( xIntrospection->queryAdapter( cppu::UnoType<XPropertySet>::get() ), UNO_QUERY_THROW );
}
if ( rObjectInfo.xPropertyIntrospection.is() )
{

2
sc/source/filter/excel/excimp8.cxx
View File

@ -120,7 +120,7 @@ private:
::osl::Mutex m_aMutex;
public:
// XElementAccess
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return container::XIndexContainer::static_type(0); }
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return cppu::UnoType<container::XIndexContainer>::get(); }
virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );

4
sc/source/filter/xml/xmlwrap.cxx
View File

@ -341,7 +341,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError)
{ OUString("ScriptConfiguration"), 0, ::getCppuType((uno::Reference<container::XNameAccess> *)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("OrganizerMode"), 0, ::getBooleanCppuType(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("SourceStorage"), 0, embed::XStorage::static_type(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("SourceStorage"), 0, cppu::UnoType<embed::XStorage>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aImportInfoMap ) ) );
@ -785,7 +785,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly)
{ OUString("StreamName"), 0, ::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("StyleNames"), 0, ::getCppuType( (uno::Sequence<OUString>*)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("StyleFamilies"), 0, ::getCppuType( (uno::Sequence<sal_Int32>*)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("TargetStorage"), 0, embed::XStorage::static_type(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("TargetStorage"), 0, cppu::UnoType<embed::XStorage>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ) );

2
sc/source/ui/unoobj/shapeuno.cxx
View File

@ -1532,7 +1532,7 @@ uno::Sequence< OUString > SAL_CALL ScShapeObj::getSupportedServiceNames( ) thro
{
uno::Reference<lang::XServiceInfo> xSI;
if ( mxShapeAgg.is() )
mxShapeAgg->queryAggregation( lang::XServiceInfo::static_type() ) >>= xSI;
mxShapeAgg->queryAggregation( cppu::UnoType<lang::XServiceInfo>::get() ) >>= xSI;
uno::Sequence< OUString > aSupported;
if ( xSI.is() )

4
sc/source/ui/vba/vbaaxes.cxx
View File

@ -121,7 +121,7 @@ public:
// XElementAccess
virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException)
{
return excel::XAxis::static_type(0);
return cppu::UnoType<excel::XAxis>::get();
}
virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
{
@ -142,7 +142,7 @@ ScVbaAxes::ScVbaAxes( const uno::Reference< XHelperInterface >& xParent,const un
uno::Type SAL_CALL
ScVbaAxes::getElementType() throw (css::uno::RuntimeException)
{
return excel::XAxes::static_type(0);
return cppu::UnoType<excel::XAxes>::get();
}
uno::Reference< container::XEnumeration > SAL_CALL

4
sc/source/ui/vba/vbaborders.cxx
View File

@ -339,7 +339,7 @@ public:
}
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
{
return excel::XBorder::static_type(0);
return cppu::UnoType<excel::XBorder>::get();
}
virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
{
@ -395,7 +395,7 @@ ScVbaBorders::createCollectionObject( const css::uno::Any& aSource )
uno::Type
ScVbaBorders::getElementType() throw (uno::RuntimeException)
{
return excel::XBorders::static_type(0);
return cppu::UnoType<excel::XBorders>::get();
}
uno::Any

2
sc/source/ui/vba/vbachartobjects.cxx
View File

@ -153,7 +153,7 @@ ScVbaChartObjects::createEnumeration() throw (uno::RuntimeException)
uno::Type
ScVbaChartObjects::getElementType() throw (uno::RuntimeException)
{
return excel::XChartObject::static_type(0);
return cppu::UnoType<excel::XChartObject>::get();
}
// ScVbaCollectionBaseImpl

2
sc/source/ui/vba/vbacomments.cxx
View File

@ -85,7 +85,7 @@ ScVbaComments::createCollectionObject( const css::uno::Any& aSource )
uno::Type
ScVbaComments::getElementType() throw (uno::RuntimeException)
{
return excel::XComment::static_type(0);
return cppu::UnoType<excel::XComment>::get();
}
OUString

2
sc/source/ui/vba/vbaformatconditions.cxx
View File

@ -63,7 +63,7 @@ ScVbaFormatConditions::Delete( ) throw (script::BasicErrorException, uno::Runti
uno::Type SAL_CALL
ScVbaFormatConditions::getElementType() throw (css::uno::RuntimeException)
{
return excel::XFormatCondition::static_type(0);
return cppu::UnoType<excel::XFormatCondition>::get();
}

4
sc/source/ui/vba/vbahyperlinks.cxx
View File

@ -177,7 +177,7 @@ uno::Any SAL_CALL ScVbaHlinkContainer::getByIndex( sal_Int32 nIndex )
uno::Type SAL_CALL ScVbaHlinkContainer::getElementType() throw (uno::RuntimeException)
{
return excel::XHyperlink::static_type( 0 );
return cppu::UnoType<excel::XHyperlink>::get();
}
sal_Bool SAL_CALL ScVbaHlinkContainer::hasElements() throw (uno::RuntimeException)
@ -266,7 +266,7 @@ uno::Reference< container::XEnumeration > SAL_CALL ScVbaHyperlinks::createEnumer
uno::Type SAL_CALL ScVbaHyperlinks::getElementType() throw (uno::RuntimeException)
{
return excel::XHyperlink::static_type( 0 );
return cppu::UnoType<excel::XHyperlink>::get();
}
// ScVbaCollectionBase --------------------------------------------------------

2
sc/source/ui/vba/vbamenubars.cxx
View File

@ -55,7 +55,7 @@ ScVbaMenuBars::~ScVbaMenuBars()
uno::Type SAL_CALL
ScVbaMenuBars::getElementType() throw ( uno::RuntimeException )
{
return excel::XMenuBar::static_type( 0 );
return cppu::UnoType<excel::XMenuBar>::get();
}
uno::Reference< container::XEnumeration >

2
sc/source/ui/vba/vbamenuitems.cxx
View File

@ -62,7 +62,7 @@ ScVbaMenuItems::ScVbaMenuItems( const uno::Reference< XHelperInterface >& xParen
uno::Type SAL_CALL
ScVbaMenuItems::getElementType() throw ( uno::RuntimeException )
{
return excel::XMenuItem::static_type( 0 );
return cppu::UnoType<excel::XMenuItem>::get();
}
uno::Reference< container::XEnumeration >

2
sc/source/ui/vba/vbamenus.cxx
View File

@ -56,7 +56,7 @@ ScVbaMenus::ScVbaMenus( const uno::Reference< XHelperInterface >& xParent, const
uno::Type SAL_CALL
ScVbaMenus::getElementType() throw ( uno::RuntimeException )
{
return excel::XMenu::static_type( 0 );
return cppu::UnoType<excel::XMenu>::get();
}
uno::Reference< container::XEnumeration >

2
sc/source/ui/vba/vbanames.cxx
View File

@ -235,7 +235,7 @@ ScVbaNames::Add( const css::uno::Any& Name ,
css::uno::Type
ScVbaNames::getElementType() throw( css::uno::RuntimeException )
{
return ov::excel::XName::static_type(0);
return cppu::UnoType<ov::excel::XName>::get();
}
uno::Reference< container::XEnumeration >

4
sc/source/ui/vba/vbaoleobjects.cxx
View File

@ -61,7 +61,7 @@ public:
// Methods XElementAcess
virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException)
{
return drawing::XControlShape::static_type(0);
return cppu::UnoType<drawing::XControlShape>::get();
}
virtual ::sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException)
@ -155,7 +155,7 @@ ScVbaOLEObjects::getItemByStringIndex( const OUString& sIndex ) throw (uno::Runt
uno::Type
ScVbaOLEObjects::getElementType() throw (uno::RuntimeException)
{
return ooo::vba::excel::XOLEObject::static_type(0);
return cppu::UnoType<ooo::vba::excel::XOLEObject>::get();
}
OUString

8
sc/source/ui/vba/vbapagebreaks.cxx
View File

@ -80,8 +80,8 @@ public:
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
{
if( m_bColumn )
return excel::XVPageBreak::static_type(0);
return excel::XHPageBreak::static_type(0);
return cppu::UnoType<excel::XVPageBreak>::get();
return cppu::UnoType<excel::XHPageBreak>::get();
}
virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
{
@ -232,7 +232,7 @@ ScVbaHPageBreaks::createCollectionObject( const css::uno::Any& aSource )
uno::Type
ScVbaHPageBreaks::getElementType() throw (uno::RuntimeException)
{
return excel::XHPageBreak::static_type(0);
return cppu::UnoType<excel::XHPageBreak>::get();
}
OUString
@ -292,7 +292,7 @@ ScVbaVPageBreaks::createCollectionObject( const css::uno::Any& aSource )
uno::Type
ScVbaVPageBreaks::getElementType() throw ( uno::RuntimeException )
{
return excel::XVPageBreak::static_type( 0 );
return cppu::UnoType<excel::XVPageBreak>::get();
}
OUString

2
sc/source/ui/vba/vbapivottables.cxx
View File

@ -63,7 +63,7 @@ ScVbaPivotTables::createCollectionObject( const css::uno::Any& aSource )
uno::Type
ScVbaPivotTables::getElementType() throw (uno::RuntimeException)
{
return excel::XPivotTable::static_type(0);
return cppu::UnoType<excel::XPivotTable>::get();
}
OUString

6
sc/source/ui/vba/vbarange.cxx
View File

@ -330,7 +330,7 @@ public:
return uno::makeAny( m_xRange );
}
// XElementAccess
virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException){ return table::XCellRange::static_type(0); }
virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException){ return cppu::UnoType<table::XCellRange>::get(); }
virtual ::sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException) { return sal_True; }
// XEnumerationAccess
@ -365,7 +365,7 @@ public:
virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() throw (uno::RuntimeException);
// XElementAccess
virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException){ return excel::XRange::static_type(0); }
virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException){ return cppu::UnoType<excel::XRange>::get(); }
virtual uno::Any createCollectionObject( const uno::Any& aSource );
@ -3321,7 +3321,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L
uno::Reference< table::XCellRange > processKey( const uno::Any& Key, uno::Reference< uno::XComponentContext >& xContext, ScDocShell* pDocSh )
{
uno::Reference< excel::XRange > xKeyRange;
if ( Key.getValueType() == excel::XRange::static_type() )
if ( Key.getValueType() == cppu::UnoType<excel::XRange>::get() )
{
xKeyRange.set( Key, uno::UNO_QUERY_THROW );
}

2
sc/source/ui/vba/vbarange.hxx
View File

@ -268,7 +268,7 @@ public:
// XElementAccess
virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException)
{
return ov::excel::XRange::static_type(0);
return cppu::UnoType<ov::excel::XRange>::get();
}
virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException);

4
sc/source/ui/vba/vbasheetobjects.cxx
View File

@ -219,7 +219,7 @@ uno::Any SAL_CALL ScVbaObjectContainer::getByIndex( sal_Int32 nIndex )
uno::Type SAL_CALL ScVbaObjectContainer::getElementType() throw (uno::RuntimeException)
{
return drawing::XShape::static_type( 0 );
return cppu::UnoType<drawing::XShape>::get();
}
sal_Bool SAL_CALL ScVbaObjectContainer::hasElements() throw (uno::RuntimeException)
@ -482,7 +482,7 @@ ScVbaButtonContainer::ScVbaButtonContainer(
const uno::Reference< sheet::XSpreadsheet >& rxSheet ) throw (uno::RuntimeException) :
ScVbaControlContainer(
rxParent, rxContext, rxModel, rxSheet,
excel::XButton::static_type( 0 ),
cppu::UnoType<excel::XButton>::get(),
"com.sun.star.form.component.CommandButton",
form::FormComponentType::COMMANDBUTTON )
{

2
sc/source/ui/vba/vbastyles.cxx
View File

@ -62,7 +62,7 @@ ScVbaStyles::createCollectionObject(const uno::Any& aObject)
uno::Type SAL_CALL
ScVbaStyles::getElementType() throw (uno::RuntimeException)
{
return excel::XStyle::static_type(0);
return cppu::UnoType<excel::XStyle>::get();
}
class EnumWrapper : public EnumerationHelper_BASE

2
sc/source/ui/vba/vbawindow.cxx
View File

@ -150,7 +150,7 @@ public:
//XElementAccess
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
{
return excel::XWorksheet::static_type(0);
return cppu::UnoType<excel::XWorksheet>::get();
}
virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)

4
sc/source/ui/vba/vbawindows.cxx
View File

@ -159,7 +159,7 @@ public:
//XElementAccess
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
{
return sheet::XSpreadsheetDocument::static_type(0);
return cppu::UnoType<sheet::XSpreadsheetDocument>::get();
}
virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
@ -214,7 +214,7 @@ ScVbaWindows::createCollectionObject( const css::uno::Any& aSource )
uno::Type
ScVbaWindows::getElementType() throw (uno::RuntimeException)
{
return excel::XWindows::static_type(0);
return cppu::UnoType<excel::XWindows>::get();
}

2
sc/source/ui/vba/vbaworkbooks.cxx
View File

@ -169,7 +169,7 @@ ScVbaWorkbooks::ScVbaWorkbooks( const uno::Reference< XHelperInterface >& xParen
uno::Type
ScVbaWorkbooks::getElementType() throw (uno::RuntimeException)
{
return excel::XWorkbook::static_type(0);
return cppu::UnoType<excel::XWorkbook>::get();
}
uno::Reference< container::XEnumeration >
ScVbaWorkbooks::createEnumeration() throw (uno::RuntimeException)

4
sc/source/ui/vba/vbaworksheets.cxx
View File

@ -89,7 +89,7 @@ class SheetCollectionHelper : public SheetCollectionHelper_BASE
public:
SheetCollectionHelper( const SheetMap& sMap ) : mSheetMap( sMap ), cachePos(mSheetMap.begin()) {}
// XElementAccess
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return sheet::XSpreadsheet::static_type(0); }
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return cppu::UnoType<sheet::XSpreadsheet>::get(); }
virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return ( !mSheetMap.empty() ); }
// XNameAcess
virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
@ -179,7 +179,7 @@ ScVbaWorksheets::ScVbaWorksheets( const uno::Reference< XHelperInterface >& xPar
uno::Type
ScVbaWorksheets::getElementType() throw (uno::RuntimeException)
{
return excel::XWorksheet::static_type(0);
return cppu::UnoType<excel::XWorksheet>::get();
}
uno::Reference< container::XEnumeration >

2
sd/source/core/stlfamily.cxx
View File

@ -305,7 +305,7 @@ sal_Bool SAL_CALL SdStyleFamily::hasByName( const OUString& aName ) throw(Runtim
Type SAL_CALL SdStyleFamily::getElementType() throw(RuntimeException)
{
return XStyle::static_type();
return cppu::UnoType<XStyle>::get();
}
// ----------------------------------------------------------

2
sd/source/core/stlpool.cxx
View File

@ -1211,7 +1211,7 @@ Type SAL_CALL SdStyleSheetPool::getElementType() throw(RuntimeException)
{
throwIfDisposed();
return XNameAccess::static_type();
return cppu::UnoType<XNameAccess>::get();
}
// --------------------------------------------------------------------

10
sd/source/core/stlsheet.cxx
View File

@ -78,7 +78,7 @@ static SvxItemPropertySet& GetStylePropertySet()
static const SfxItemPropertyMapEntry aFullPropertyMap_Impl[] =
{
{ OUString("Family"), WID_STYLE_FAMILY, ::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0},
{ OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, XNameContainer::static_type(), 0, 0},
{ OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<XNameContainer>::get(), 0, 0},
{ OUString("DisplayName"), WID_STYLE_DISPNAME, ::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0},
{ OUString("Hidden"), WID_STYLE_HIDDEN, ::getCppuType((bool*)0), 0, 0},
@ -349,7 +349,7 @@ bool SdStyleSheet::IsUsed() const
{
MutexGuard aGuard( mrBHelper.rMutex );
OInterfaceContainerHelper * pContainer = mrBHelper.getContainer( XModifyListener::static_type() );
OInterfaceContainerHelper * pContainer = mrBHelper.getContainer( cppu::UnoType<XModifyListener>::get() );
if( pContainer )
{
Sequence< Reference< XInterface > > aModifyListeners( pContainer->getElements() );
@ -848,7 +848,7 @@ void SAL_CALL SdStyleSheet::addModifyListener( const Reference< XModifyListener
{
if( !mpModifyListenerForewarder.get() )
mpModifyListenerForewarder.reset( new ModifyListenerForewarder( this ) );
mrBHelper.addListener( XModifyListener::static_type(), xListener );
mrBHelper.addListener( cppu::UnoType<XModifyListener>::get(), xListener );
}
}
@ -856,7 +856,7 @@ void SAL_CALL SdStyleSheet::addModifyListener( const Reference< XModifyListener
void SAL_CALL SdStyleSheet::removeModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException)
{
mrBHelper.removeListener( XModifyListener::static_type(), xListener );
mrBHelper.removeListener( cppu::UnoType<XModifyListener>::get(), xListener );
}
//------------------------------------------------------------------------
@ -865,7 +865,7 @@ void SdStyleSheet::notifyModifyListener()
{
MutexGuard aGuard( mrBHelper.rMutex );
OInterfaceContainerHelper * pContainer = mrBHelper.getContainer( XModifyListener::static_type() );
OInterfaceContainerHelper * pContainer = mrBHelper.getContainer( cppu::UnoType<XModifyListener>::get() );
if( pContainer )
{
EventObject aEvt( static_cast< OWeakObject * >( this ) );

4
sd/source/filter/xml/sdxmlwrp.cxx
View File

@ -465,7 +465,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
{ OUString("OrganizerMode"), 0,
::getBooleanCppuType(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("SourceStorage"), 0, embed::XStorage::static_type(),
{ OUString("SourceStorage"), 0, cppu::UnoType<embed::XStorage>::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@ -841,7 +841,7 @@ sal_Bool SdXMLFilter::Export()
{ OUString("StyleFamilies"), 0,
::getCppuType( (Sequence<sal_Int32>*)0 ),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("TargetStorage"), 0, embed::XStorage::static_type(),
{ OUString("TargetStorage"), 0, cppu::UnoType<embed::XStorage>::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};

6
sd/source/ui/animations/motionpathtag.cxx
View File

@ -1279,11 +1279,11 @@ void SAL_CALL MotionPathTag::disposing( const EventObject& /*Source*/ ) throw (R
Any SAL_CALL MotionPathTag::queryInterface( const ::com::sun::star::uno::Type& aType ) throw (RuntimeException)
{
if( aType == XChangesListener::static_type() )
if( aType == cppu::UnoType<XChangesListener>::get() )
return Any( Reference< XChangesListener >( this ) );
if( aType == XEventListener::static_type() )
if( aType == cppu::UnoType<XEventListener>::get() )
return Any( Reference< XEventListener >( this ) );
if( aType == XInterface::static_type() )
if( aType == cppu::UnoType<XInterface>::get() )
return Any( Reference< XInterface >( this ) );
return Any();

2
sd/source/ui/framework/factories/BasicViewFactory.cxx
View File

@ -372,7 +372,7 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments)
}
}
pDescriptor->mxView.set( pDescriptor->mpWrapper->queryInterface( XResource::static_type() ), UNO_QUERY_THROW );
pDescriptor->mxView.set( pDescriptor->mpWrapper->queryInterface( cppu::UnoType<XResource>::get() ), UNO_QUERY_THROW );
}
return pDescriptor;

2
sd/source/ui/slideshow/slideshowimpl.cxx
View File

@ -3486,7 +3486,7 @@ void SAL_CALL SlideshowImpl::stopSound( ) throw (RuntimeException)
::com::sun::star::uno::Type SAL_CALL SlideshowImpl::getElementType( ) throw (::com::sun::star::uno::RuntimeException)
{
return XDrawPage::static_type();
return cppu::UnoType<XDrawPage>::get();
}
// --------------------------------------------------------------------

8
sd/source/ui/unoidl/unopage.cxx
View File

@ -147,7 +147,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin
{ OUString("TransitionFadeColor"), WID_TRANSITION_FADE_COLOR, ::getCppuType((const sal_Int32*)0), 0, 0},
{ OUString("TransitionDuration"), WID_TRANSITION_DURATION, ::getCppuType((const double*)0), 0, 0},
{ OUString("LoopSound"), WID_LOOP_SOUND, ::getBooleanCppuType(), 0, 0},
{ OUString("NavigationOrder"), WID_NAVORDER, ::com::sun::star::container::XIndexAccess::static_type(),0, 0},
{ OUString("NavigationOrder"), WID_NAVORDER, cppu::UnoType<::com::sun::star::container::XIndexAccess>::get(),0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@ -174,7 +174,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin
{ OUString("IsDateTimeFixed"), WID_PAGE_DATETIMEFIXED, ::getBooleanCppuType(), 0, 0}, \
{ OUString("DateTimeText"), WID_PAGE_DATETIMETEXT, ::getCppuType((const OUString*)0), 0, 0}, \
{ OUString("DateTimeFormat"), WID_PAGE_DATETIMEFORMAT, ::getCppuType((const sal_Int32*)0), 0, 0}, \
{ OUString("NavigationOrder"), WID_NAVORDER, ::com::sun::star::container::XIndexAccess::static_type(),0, 0}, \
{ OUString("NavigationOrder"), WID_NAVORDER, cppu::UnoType<::com::sun::star::container::XIndexAccess>::get(),0, 0}, \
{ OUString(), 0, css::uno::Type(), 0, 0 }
static const SfxItemPropertyMapEntry aDrawPageNotesHandoutPropertyMap_Impl[] =
@ -204,7 +204,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin
{ OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, \
{ OUString(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, ::getCppuType((const OUString*)0), 0, 0}, \
{ OUString("IsBackgroundDark"), WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, \
{ OUString("NavigationOrder"), WID_NAVORDER, ::com::sun::star::container::XIndexAccess::static_type(),0, 0}, \
{ OUString("NavigationOrder"), WID_NAVORDER, cppu::UnoType<::com::sun::star::container::XIndexAccess>::get(),0, 0}, \
{ OUString(), 0, css::uno::Type(), 0, 0 }
static const SfxItemPropertyMapEntry aGraphicPagePropertyMap_Impl[] =
@ -2646,7 +2646,7 @@ Any SAL_CALL SdNavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (Index
// XElementAccess
Type SAL_CALL SdNavigationOrderAccess::getElementType( ) throw (RuntimeException)
{
return XShape::static_type();
return cppu::UnoType<XShape>::get();
}
sal_Bool SAL_CALL SdNavigationOrderAccess::hasElements( ) throw (RuntimeException)

8
sfx2/source/doc/sfxbasemodel.cxx
View File

@ -545,8 +545,8 @@ SfxBaseModel::~SfxBaseModel()
Any SAL_CALL SfxBaseModel::queryInterface( const uno::Type& rType ) throw( RuntimeException )
{
if ( ( !m_bSupportEmbeddedScripts && rType.equals( document::XEmbeddedScripts::static_type() ) )
|| ( !m_bSupportDocRecovery && rType.equals( XDocumentRecovery::static_type() ) )
if ( ( !m_bSupportEmbeddedScripts && rType.equals( cppu::UnoType<document::XEmbeddedScripts>::get() ) )
|| ( !m_bSupportDocRecovery && rType.equals( cppu::UnoType<XDocumentRecovery>::get() ) )
)
return Any();
@ -603,10 +603,10 @@ Sequence< uno::Type > SAL_CALL SfxBaseModel::getTypes() throw( RuntimeException
Sequence< uno::Type > aTypes( SfxBaseModel_Base::getTypes() );
if ( !m_bSupportEmbeddedScripts )
lcl_stripType( aTypes, document::XEmbeddedScripts::static_type() );
lcl_stripType( aTypes, cppu::UnoType<document::XEmbeddedScripts>::get() );
if ( !m_bSupportDocRecovery )
lcl_stripType( aTypes, XDocumentRecovery::static_type() );
lcl_stripType( aTypes, cppu::UnoType<XDocumentRecovery>::get() );
return aTypes;
}

14
svx/source/table/cell.cxx
View File

@ -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;
}

2
svx/source/table/tablecolumns.cxx
View File

@ -113,7 +113,7 @@ Type SAL_CALL TableColumns::getElementType() throw (RuntimeException)
{
throwIfDisposed();
return XCellRange::static_type();
return cppu::UnoType<XCellRange>::get();
}
// -----------------------------------------------------------------------------

12
svx/source/table/tabledesign.cxx
View File

@ -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();
}
// ----------------------------------------------------------

6
svx/source/table/tablemodel.cxx
View File

@ -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;

2
svx/source/table/tablerows.cxx
View File

@ -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();
}
// -----------------------------------------------------------------------------

12
svx/source/unodraw/unoprov.cxx
View File

@ -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 }
};

2
svx/source/unodraw/unoshap2.cxx
View File

@ -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() )

14
svx/source/unodraw/unoshape.cxx
View File

@ -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);

4
sw/source/core/unocore/unodraw.cxx
View File

@ -1928,7 +1928,7 @@ void SwXShape::addPropertyChangeListener(
// must be handled by the aggregate
uno::Reference< beans::XPropertySet > xShapeProps;
if ( xShapeAgg->queryAggregation( beans::XPropertySet::static_type() ) >>= xShapeProps )
if ( xShapeAgg->queryAggregation( cppu::UnoType<beans::XPropertySet>::get() ) >>= xShapeProps )
xShapeProps->addPropertyChangeListener( _propertyName, _listener );
}
@ -1943,7 +1943,7 @@ void SwXShape::removePropertyChangeListener(
// must be handled by the aggregate
uno::Reference< beans::XPropertySet > xShapeProps;
if ( xShapeAgg->queryAggregation( beans::XPropertySet::static_type() ) >>= xShapeProps )
if ( xShapeAgg->queryAggregation( cppu::UnoType<beans::XPropertySet>::get() ) >>= xShapeProps )
xShapeProps->removePropertyChangeListener( _propertyName, _listener );
}

2
sw/source/core/unocore/unoftn.cxx
View File

@ -500,7 +500,7 @@ SwXFootnote::createEnumeration() throw (uno::RuntimeException)
uno::Type SAL_CALL SwXFootnote::getElementType() throw (uno::RuntimeException)
{
return text::XTextRange::static_type();
return cppu::UnoType<text::XTextRange>::get();
}
sal_Bool SAL_CALL SwXFootnote::hasElements() throw (uno::RuntimeException)

12
sw/source/core/unocore/unoidx.cxx
View File

@ -1252,7 +1252,7 @@ void SAL_CALL SwXDocumentIndex::refresh() throw (uno::RuntimeException)
::cppu::OInterfaceContainerHelper *const pContainer(
m_pImpl->m_Listeners.getContainer(
util::XRefreshListener::static_type()));
cppu::UnoType<util::XRefreshListener>::get()));
if (pContainer)
{
lang::EventObject const event(static_cast< ::cppu::OWeakObject*>(this));
@ -1266,7 +1266,7 @@ throw (uno::RuntimeException)
{
// no need to lock here as m_pImpl is const and container threadsafe
m_pImpl->m_Listeners.addInterface(
util::XRefreshListener::static_type(), xListener);
cppu::UnoType<util::XRefreshListener>::get(), xListener);
}
void SAL_CALL SwXDocumentIndex::removeRefreshListener(
@ -1275,7 +1275,7 @@ throw (uno::RuntimeException)
{
// no need to lock here as m_pImpl is const and container threadsafe
m_pImpl->m_Listeners.removeInterface(
util::XRefreshListener::static_type(), xListener);
cppu::UnoType<util::XRefreshListener>::get(), xListener);
}
void SAL_CALL
@ -1386,7 +1386,7 @@ throw (uno::RuntimeException)
{
// no need to lock here as m_pImpl is const and container threadsafe
m_pImpl->m_Listeners.addInterface(
lang::XEventListener::static_type(), xListener);
cppu::UnoType<lang::XEventListener>::get(), xListener);
}
void SAL_CALL
@ -1396,7 +1396,7 @@ throw (uno::RuntimeException)
{
// no need to lock here as m_pImpl is const and container threadsafe
m_pImpl->m_Listeners.removeInterface(
lang::XEventListener::static_type(), xListener);
cppu::UnoType<lang::XEventListener>::get(), xListener);
}
OUString SAL_CALL SwXDocumentIndex::getName() throw (uno::RuntimeException)
@ -2518,7 +2518,7 @@ throw (uno::RuntimeException)
uno::Type SAL_CALL
SwXDocumentIndexes::getElementType() throw (uno::RuntimeException)
{
return text::XDocumentIndex::static_type();
return cppu::UnoType<text::XDocumentIndex>::get();
}
sal_Bool SAL_CALL

4
sw/source/core/unocore/unoobj.cxx
View File

@ -3050,7 +3050,7 @@ SwXTextCursor::createEnumeration() throw (uno::RuntimeException)
uno::Type SAL_CALL
SwXTextCursor::getElementType() throw (uno::RuntimeException)
{
return text::XTextRange::static_type();
return cppu::UnoType<text::XTextRange>::get();
}
sal_Bool SAL_CALL SwXTextCursor::hasElements() throw (uno::RuntimeException)
@ -3073,7 +3073,7 @@ uno::Any SAL_CALL
SwXTextCursor::queryInterface(const uno::Type& rType)
throw (uno::RuntimeException)
{
return (rType == lang::XUnoTunnel::static_type())
return (rType == cppu::UnoType<lang::XUnoTunnel>::get())
? OTextCursorHelper::queryInterface(rType)
: SwXTextCursor_Base::queryInterface(rType);
}

4
sw/source/core/unocore/unoobj2.cxx
View File

@ -1328,7 +1328,7 @@ SwXTextRange::createEnumeration() throw (uno::RuntimeException)
uno::Type SAL_CALL SwXTextRange::getElementType() throw (uno::RuntimeException)
{
return text::XTextRange::static_type();
return cppu::UnoType<text::XTextRange>::get();
}
sal_Bool SAL_CALL SwXTextRange::hasElements() throw (uno::RuntimeException)
@ -1665,7 +1665,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
uno::Type SAL_CALL
SwXTextRanges::getElementType() throw (uno::RuntimeException)
{
return text::XTextRange::static_type();
return cppu::UnoType<text::XTextRange>::get();
}
sal_Bool SAL_CALL SwXTextRanges::hasElements() throw (uno::RuntimeException)

2
sw/source/core/unocore/unoparagraph.cxx
View File

@ -1161,7 +1161,7 @@ SwXParagraph::createEnumeration() throw (uno::RuntimeException)
uno::Type SAL_CALL SwXParagraph::getElementType() throw (uno::RuntimeException)
{
return text::XTextRange::static_type();
return cppu::UnoType<text::XTextRange>::get();
}
sal_Bool SAL_CALL SwXParagraph::hasElements() throw (uno::RuntimeException)

2
sw/source/core/unocore/unorefmk.cxx
View File

@ -1231,7 +1231,7 @@ SwXMeta::setParent(uno::Reference< uno::XInterface > const& /*xParent*/)
uno::Type SAL_CALL
SwXMeta::getElementType() throw (uno::RuntimeException)
{
return text::XTextRange::static_type();
return cppu::UnoType<text::XTextRange>::get();
}
sal_Bool SAL_CALL

10
sw/source/core/unocore/unotbl.cxx
View File

@ -123,7 +123,7 @@ static void lcl_SendChartEvent(::cppu::OWeakObject & rSource,
::cppu::OMultiTypeInterfaceContainerHelper & rListeners)
{
::cppu::OInterfaceContainerHelper *const pContainer(rListeners.getContainer(
chart::XChartDataChangeEventListener::static_type()));
cppu::UnoType<chart::XChartDataChangeEventListener>::get()));
if (pContainer)
{
lcl_SendChartEvent(rSource, *pContainer);
@ -2414,7 +2414,7 @@ throw (uno::RuntimeException)
{
// no need to lock here as m_pImpl is const and container threadsafe
m_pImpl->m_Listeners.addInterface(
lang::XEventListener::static_type(), xListener);
cppu::UnoType<lang::XEventListener>::get(), xListener);
}
void SAL_CALL SwXTextTable::removeEventListener(
@ -2423,7 +2423,7 @@ throw (uno::RuntimeException)
{
// no need to lock here as m_pImpl is const and container threadsafe
m_pImpl->m_Listeners.removeInterface(
lang::XEventListener::static_type(), xListener);
cppu::UnoType<lang::XEventListener>::get(), xListener);
}
uno::Reference< table::XCell > SwXTextTable::getCellByPosition(sal_Int32 nColumn, sal_Int32 nRow)
@ -2924,7 +2924,7 @@ throw (uno::RuntimeException)
{
// no need to lock here as m_pImpl is const and container threadsafe
m_pImpl->m_Listeners.addInterface(
chart::XChartDataChangeEventListener::static_type(), xListener);
cppu::UnoType<chart::XChartDataChangeEventListener>::get(), xListener);
}
void SAL_CALL SwXTextTable::removeChartDataChangeEventListener(
@ -2933,7 +2933,7 @@ throw (uno::RuntimeException)
{
// no need to lock here as m_pImpl is const and container threadsafe
m_pImpl->m_Listeners.removeInterface(
chart::XChartDataChangeEventListener::static_type(), xListener);
cppu::UnoType<chart::XChartDataChangeEventListener>::get(), xListener);
}
sal_Bool SwXTextTable::isNotANumber(double nNumber) throw( uno::RuntimeException )

66
sw/source/core/unocore/unotext.cxx
View File

@ -195,67 +195,67 @@ uno::Any SAL_CALL
SwXText::queryInterface(const uno::Type& rType) throw (uno::RuntimeException)
{
uno::Any aRet;
if (rType == text::XText::static_type())
if (rType == cppu::UnoType<text::XText>::get())
{
aRet <<= uno::Reference< text::XText >(this);
}
else if (rType == text::XSimpleText::static_type())
else if (rType == cppu::UnoType<text::XSimpleText>::get())
{
aRet <<= uno::Reference< text::XSimpleText >(this);
}
else if (rType == text::XTextRange::static_type())
else if (rType == cppu::UnoType<text::XTextRange>::get())
{
aRet <<= uno::Reference< text::XTextRange>(this);
}
else if (rType == text::XTextRangeCompare::static_type())
else if (rType == cppu::UnoType<text::XTextRangeCompare>::get())
{
aRet <<= uno::Reference< text::XTextRangeCompare >(this);
}
else if (rType == lang::XTypeProvider::static_type())
else if (rType == cppu::UnoType<lang::XTypeProvider>::get())
{
aRet <<= uno::Reference< lang::XTypeProvider >(this);
}
else if (rType == text::XRelativeTextContentInsert::static_type())
else if (rType == cppu::UnoType<text::XRelativeTextContentInsert>::get())
{
aRet <<= uno::Reference< text::XRelativeTextContentInsert >(this);
}
else if (rType == text::XRelativeTextContentRemove::static_type())
else if (rType == cppu::UnoType<text::XRelativeTextContentRemove>::get())
{
aRet <<= uno::Reference< text::XRelativeTextContentRemove >(this);
}
else if (rType == beans::XPropertySet::static_type())
else if (rType == cppu::UnoType<beans::XPropertySet>::get())
{
aRet <<= uno::Reference< beans::XPropertySet >(this);
}
else if (rType == lang::XUnoTunnel::static_type())
else if (rType == cppu::UnoType<lang::XUnoTunnel>::get())
{
aRet <<= uno::Reference< lang::XUnoTunnel >(this);
}
else if (rType == text::XTextAppendAndConvert::static_type())
else if (rType == cppu::UnoType<text::XTextAppendAndConvert>::get())
{
aRet <<= uno::Reference< text::XTextAppendAndConvert >(this);
}
else if (rType == text::XTextAppend::static_type())
else if (rType == cppu::UnoType<text::XTextAppend>::get())
{
aRet <<= uno::Reference< text::XTextAppend >(this);
}
else if (rType == text::XTextPortionAppend::static_type())
else if (rType == cppu::UnoType<text::XTextPortionAppend>::get())
{
aRet <<= uno::Reference< text::XTextPortionAppend >(this);
}
else if (rType == text::XParagraphAppend::static_type())
else if (rType == cppu::UnoType<text::XParagraphAppend>::get())
{
aRet <<= uno::Reference< text::XParagraphAppend >(this);
}
else if (rType == text::XTextConvert::static_type() )
else if (rType == cppu::UnoType<text::XTextConvert>::get() )
{
aRet <<= uno::Reference< text::XTextConvert >(this);
}
else if (rType == text::XTextContentAppend::static_type())
else if (rType == cppu::UnoType<text::XTextContentAppend>::get())
{
aRet <<= uno::Reference< text::XTextContentAppend >(this);
}
else if(rType == text::XTextCopy::static_type())
else if(rType == cppu::UnoType<text::XTextCopy>::get())
{
aRet <<= uno::Reference< text::XTextCopy >( this );
}
@ -267,18 +267,18 @@ SwXText::getTypes() throw (uno::RuntimeException)
{
uno::Sequence< uno::Type > aRet(12);
uno::Type* pTypes = aRet.getArray();
pTypes[0] = text::XText::static_type();
pTypes[1] = text::XTextRangeCompare::static_type();
pTypes[2] = text::XRelativeTextContentInsert::static_type();
pTypes[3] = text::XRelativeTextContentRemove::static_type();
pTypes[4] = lang::XUnoTunnel::static_type();
pTypes[5] = beans::XPropertySet::static_type();
pTypes[6] = text::XTextPortionAppend::static_type();
pTypes[7] = text::XParagraphAppend::static_type();
pTypes[8] = text::XTextContentAppend::static_type();
pTypes[9] = text::XTextConvert::static_type();
pTypes[10] = text::XTextAppend::static_type();
pTypes[11] = text::XTextAppendAndConvert::static_type();
pTypes[0] = cppu::UnoType<text::XText>::get();
pTypes[1] = cppu::UnoType<text::XTextRangeCompare>::get();
pTypes[2] = cppu::UnoType<text::XRelativeTextContentInsert>::get();
pTypes[3] = cppu::UnoType<text::XRelativeTextContentRemove>::get();
pTypes[4] = cppu::UnoType<lang::XUnoTunnel>::get();
pTypes[5] = cppu::UnoType<beans::XPropertySet>::get();
pTypes[6] = cppu::UnoType<text::XTextPortionAppend>::get();
pTypes[7] = cppu::UnoType<text::XParagraphAppend>::get();
pTypes[8] = cppu::UnoType<text::XTextContentAppend>::get();
pTypes[9] = cppu::UnoType<text::XTextConvert>::get();
pTypes[10] = cppu::UnoType<text::XTextAppend>::get();
pTypes[11] = cppu::UnoType<text::XTextAppendAndConvert>::get();
return aRet;
}
@ -2386,15 +2386,15 @@ SwXBodyText::queryAggregation(const uno::Type& rType)
throw (uno::RuntimeException)
{
uno::Any aRet;
if (rType == container::XEnumerationAccess::static_type())
if (rType == cppu::UnoType<container::XEnumerationAccess>::get())
{
aRet <<= uno::Reference< container::XEnumerationAccess >(this);
}
else if (rType == container::XElementAccess::static_type())
else if (rType == cppu::UnoType<container::XElementAccess>::get())
{
aRet <<= uno::Reference< container::XElementAccess >(this);
}
else if (rType == lang::XServiceInfo::static_type())
else if (rType == cppu::UnoType<lang::XServiceInfo>::get())
{
aRet <<= uno::Reference< lang::XServiceInfo >(this);
}
@ -2556,7 +2556,7 @@ throw (uno::RuntimeException)
uno::Type SAL_CALL
SwXBodyText::getElementType() throw (uno::RuntimeException)
{
return text::XTextRange::static_type();
return cppu::UnoType<text::XTextRange>::get();
}
sal_Bool SAL_CALL
@ -2833,7 +2833,7 @@ throw (uno::RuntimeException)
uno::Type SAL_CALL
SwXHeadFootText::getElementType() throw (uno::RuntimeException)
{
return text::XTextRange::static_type();
return cppu::UnoType<text::XTextRange>::get();
}
sal_Bool SAL_CALL SwXHeadFootText::hasElements() throw (uno::RuntimeException)

2
sw/source/filter/xml/swxml.cxx
View File

@ -608,7 +608,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
{ OUString("TextDocInOOoFileFormat"), 0,
::getBooleanCppuType(),
beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("SourceStorage"), 0, embed::XStorage::static_type(),
{ OUString("SourceStorage"), 0, cppu::UnoType<embed::XStorage>::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};

2
sw/source/filter/xml/wrtxml.cxx
View File

@ -150,7 +150,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
{ OUString("OutlineStyleAsNormalListStyle"), 0,
::getBooleanCppuType(),
beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("TargetStorage"),0, embed::XStorage::static_type(),
{ OUString("TargetStorage"),0, cppu::UnoType<embed::XStorage>::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};

2
sw/source/ui/vba/vbaaddins.cxx
View File

@ -64,7 +64,7 @@ SwVbaAddins::SwVbaAddins( const uno::Reference< XHelperInterface >& xParent, con
uno::Type
SwVbaAddins::getElementType() throw (uno::RuntimeException)
{
return word::XAddin::static_type(0);
return cppu::UnoType<word::XAddin>::get();
}
uno::Reference< container::XEnumeration >
SwVbaAddins::createEnumeration() throw (uno::RuntimeException)

2
sw/source/ui/vba/vbaautotextentry.cxx
View File

@ -102,7 +102,7 @@ SwVbaAutoTextEntries::SwVbaAutoTextEntries( const uno::Reference< XHelperInterfa
uno::Type
SwVbaAutoTextEntries::getElementType() throw (uno::RuntimeException)
{
return word::XAutoTextEntry::static_type(0);
return cppu::UnoType<word::XAutoTextEntry>::get();
}
uno::Reference< container::XEnumeration >
SwVbaAutoTextEntries::createEnumeration() throw (uno::RuntimeException)

2
sw/source/ui/vba/vbabookmarks.cxx
View File

@ -114,7 +114,7 @@ SwVbaBookmarks::SwVbaBookmarks( const uno::Reference< XHelperInterface >& xParen
uno::Type
SwVbaBookmarks::getElementType() throw (uno::RuntimeException)
{
return word::XBookmark::static_type(0);
return cppu::UnoType<word::XBookmark>::get();
}
uno::Reference< container::XEnumeration >
SwVbaBookmarks::createEnumeration() throw (uno::RuntimeException)

4
sw/source/ui/vba/vbaborders.cxx
View File

@ -273,7 +273,7 @@ public:
}
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
{
return word::XBorder::static_type(0);
return cppu::UnoType<word::XBorder>::get();
}
virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
{
@ -327,7 +327,7 @@ SwVbaBorders::createCollectionObject( const css::uno::Any& aSource )
uno::Type
SwVbaBorders::getElementType() throw (uno::RuntimeException)
{
return word::XBorders::static_type(0);
return cppu::UnoType<word::XBorders>::get();
}
uno::Any

4
sw/source/ui/vba/vbacells.cxx
View File

@ -90,7 +90,7 @@ public:
}
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
{
return word::XCell::static_type(0);
return cppu::UnoType<word::XCell>::get();
}
virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
{
@ -176,7 +176,7 @@ void SAL_CALL SwVbaCells::SetHeight( float height, sal_Int32 heightrule ) throw
uno::Type
SwVbaCells::getElementType() throw (uno::RuntimeException)
{
return word::XCell::static_type(0);
return cppu::UnoType<word::XCell>::get();
}
uno::Reference< container::XEnumeration >

2
sw/source/ui/vba/vbacolumns.cxx
View File

@ -115,7 +115,7 @@ uno::Any SAL_CALL SwVbaColumns::Item( const uno::Any& Index1, const uno::Any& /*
uno::Type
SwVbaColumns::getElementType() throw (uno::RuntimeException)
{
return word::XColumn::static_type(0);
return cppu::UnoType<word::XColumn>::get();
}
uno::Reference< container::XEnumeration >
SwVbaColumns::createEnumeration() throw (uno::RuntimeException)

6
sw/source/ui/vba/vbadocumentproperties.cxx
View File

@ -727,7 +727,7 @@ protected:
// XElementAccess
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
{
return XDocumentProperty::static_type(0);
return cppu::UnoType<XDocumentProperty>::get();
}
virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
{
@ -754,7 +754,7 @@ SwVbaBuiltinDocumentProperties::Add( const OUString& /*Name*/, ::sal_Bool /*Link
uno::Type SAL_CALL
SwVbaBuiltinDocumentProperties::getElementType() throw (uno::RuntimeException)
{
return XDocumentProperty::static_type(0);
return cppu::UnoType<XDocumentProperty>::get();
}
uno::Reference< container::XEnumeration > SAL_CALL
@ -852,7 +852,7 @@ public:
// XElementAccess
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
{
return XDocumentProperty::static_type(0);
return cppu::UnoType<XDocumentProperty>::get();
}
virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)

2
sw/source/ui/vba/vbadocuments.cxx
View File

@ -84,7 +84,7 @@ SwVbaDocuments::SwVbaDocuments( const uno::Reference< XHelperInterface >& xParen
uno::Type
SwVbaDocuments::getElementType() throw (uno::RuntimeException)
{
return word::XDocument::static_type(0);
return cppu::UnoType<word::XDocument>::get();
}
uno::Reference< container::XEnumeration >
SwVbaDocuments::createEnumeration() throw (uno::RuntimeException)

2
sw/source/ui/vba/vbafield.cxx
View File

@ -520,7 +520,7 @@ SwVbaFields::getServiceImplName()
uno::Type SAL_CALL
SwVbaFields::getElementType() throw (uno::RuntimeException)
{
return word::XField::static_type(0);
return cppu::UnoType<word::XField>::get();
}
uno::Sequence<OUString>

4
sw/source/ui/vba/vbaformfields.cxx
View File

@ -98,7 +98,7 @@ public:
cachePos = mxFormFields.begin();
}
// XElementAccess
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return word::XFormField::static_type(0); }
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return cppu::UnoType<word::XFormField>::get(); }
virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return getCount() > 0 ; }
// XNameAcess
virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
@ -159,7 +159,7 @@ SwVbaFormFields::SwVbaFormFields( const uno::Reference< XHelperInterface >& xPar
uno::Type
SwVbaFormFields::getElementType() throw (uno::RuntimeException)
{
return word::XFormField::static_type(0);
return cppu::UnoType<word::XFormField>::get();
}
uno::Reference< container::XEnumeration >
SwVbaFormFields::createEnumeration() throw (uno::RuntimeException)

2
sw/source/ui/vba/vbaframes.cxx
View File

@ -62,7 +62,7 @@ SwVbaFrames::SwVbaFrames( const uno::Reference< XHelperInterface >& xParent, con
uno::Type
SwVbaFrames::getElementType() throw (uno::RuntimeException)
{
return word::XFrame::static_type(0);
return cppu::UnoType<word::XFrame>::get();
}
uno::Reference< container::XEnumeration >

4
sw/source/ui/vba/vbaheadersfooters.cxx
View File

@ -52,7 +52,7 @@ public:
}
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
{
return word::XHeaderFooter::static_type(0);
return cppu::UnoType<word::XHeaderFooter>::get();
}
virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
{
@ -104,7 +104,7 @@ uno::Any SAL_CALL SwVbaHeadersFooters::Item( const uno::Any& Index1, const uno::
uno::Type
SwVbaHeadersFooters::getElementType() throw (uno::RuntimeException)
{
return word::XHeaderFooter::static_type(0);
return cppu::UnoType<word::XHeaderFooter>::get();
}
uno::Reference< container::XEnumeration >

2
sw/source/ui/vba/vbalistgalleries.cxx
View File

@ -69,7 +69,7 @@ uno::Any SAL_CALL SwVbaListGalleries::Item( const uno::Any& Index1, const uno::A
uno::Type
SwVbaListGalleries::getElementType() throw (uno::RuntimeException)
{
return word::XListGallery::static_type(0);
return cppu::UnoType<word::XListGallery>::get();
}
uno::Reference< container::XEnumeration >

2
sw/source/ui/vba/vbalistlevels.cxx
View File

@ -72,7 +72,7 @@ uno::Any SAL_CALL SwVbaListLevels::Item( const uno::Any& Index1, const uno::Any&
uno::Type
SwVbaListLevels::getElementType() throw (uno::RuntimeException)
{
return word::XListLevel::static_type(0);
return cppu::UnoType<word::XListLevel>::get();
}
uno::Reference< container::XEnumeration >

2
sw/source/ui/vba/vbalisttemplates.cxx
View File

@ -66,7 +66,7 @@ uno::Any SAL_CALL SwVbaListTemplates::Item( const uno::Any& Index1, const uno::A
uno::Type
SwVbaListTemplates::getElementType() throw (uno::RuntimeException)
{
return word::XListTemplate::static_type(0);
return cppu::UnoType<word::XListTemplate>::get();
}
uno::Reference< container::XEnumeration >

4
sw/source/ui/vba/vbapanes.cxx
View File

@ -48,7 +48,7 @@ public:
}
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
{
return word::XPane::static_type(0);
return cppu::UnoType<word::XPane>::get();
}
virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
{
@ -82,7 +82,7 @@ SwVbaPanes::SwVbaPanes( const uno::Reference< XHelperInterface >& xParent, const
uno::Type
SwVbaPanes::getElementType() throw (uno::RuntimeException)
{
return word::XPane::static_type(0);
return cppu::UnoType<word::XPane>::get();
}
uno::Reference< container::XEnumeration >
SwVbaPanes::createEnumeration() throw (uno::RuntimeException)

4
sw/source/ui/vba/vbaparagraph.cxx
View File

@ -90,7 +90,7 @@ public:
{
}
// XElementAccess
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return text::XTextRange::static_type(0); }
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return cppu::UnoType<text::XTextRange>::get(); }
virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return sal_True; }
// XIndexAccess
virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException)
@ -141,7 +141,7 @@ SwVbaParagraphs::SwVbaParagraphs( const uno::Reference< XHelperInterface >& xPar
uno::Type
SwVbaParagraphs::getElementType() throw (uno::RuntimeException)
{
return word::XParagraph::static_type(0);
return cppu::UnoType<word::XParagraph>::get();
}
uno::Reference< container::XEnumeration >
SwVbaParagraphs::createEnumeration() throw (uno::RuntimeException)

4
sw/source/ui/vba/vbarevisions.cxx
View File

@ -55,7 +55,7 @@ public:
RevisionCollectionHelper( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextRange >& xTextRange ) throw (uno::RuntimeException);
// XElementAccess
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return beans::XPropertySet::static_type(0); }
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return cppu::UnoType<beans::XPropertySet>::get(); }
virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return ( !mRevisionMap.empty() ); }
// XIndexAccess
virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException) { return mRevisionMap.size(); }
@ -116,7 +116,7 @@ SwVbaRevisions::SwVbaRevisions( const uno::Reference< XHelperInterface >& xParen
uno::Type
SwVbaRevisions::getElementType() throw (uno::RuntimeException)
{
return word::XRevision::static_type(0);
return cppu::UnoType<word::XRevision>::get();
}
uno::Reference< container::XEnumeration >
SwVbaRevisions::createEnumeration() throw (uno::RuntimeException)

2
sw/source/ui/vba/vbarows.cxx
View File

@ -334,7 +334,7 @@ uno::Any SAL_CALL SwVbaRows::Item( const uno::Any& Index1, const uno::Any& /*not
uno::Type
SwVbaRows::getElementType() throw (uno::RuntimeException)
{
return word::XRow::static_type(0);
return cppu::UnoType<word::XRow>::get();
}
uno::Reference< container::XEnumeration >
SwVbaRows::createEnumeration() throw (uno::RuntimeException)

4
sw/source/ui/vba/vbasections.cxx
View File

@ -105,7 +105,7 @@ public:
}
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
{
return word::XSection::static_type(0);
return cppu::UnoType<word::XSection>::get();
}
virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
{
@ -155,7 +155,7 @@ SwVbaSections::PageSetup( ) throw (uno::RuntimeException)
uno::Type SAL_CALL
SwVbaSections::getElementType() throw (uno::RuntimeException)
{
return word::XSection::static_type(0);
return cppu::UnoType<word::XSection>::get();
}
uno::Reference< container::XEnumeration > SAL_CALL

4
sw/source/ui/vba/vbastyles.cxx
View File

@ -174,7 +174,7 @@ public:
mxParaStyles.set( xStyleFamilies->getByName("ParagraphStyles"), uno::UNO_QUERY_THROW );
}
// XElementAccess
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return style::XStyle::static_type(0); }
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return cppu::UnoType<style::XStyle>::get(); }
virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return getCount() > 0; }
// XNameAcess
virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
@ -281,7 +281,7 @@ SwVbaStyles::createCollectionObject(const uno::Any& aObject)
uno::Type SAL_CALL
SwVbaStyles::getElementType() throw (uno::RuntimeException)
{
return word::XStyle::static_type(0);
return cppu::UnoType<word::XStyle>::get();
}
uno::Reference< container::XEnumeration > SAL_CALL

4
sw/source/ui/vba/vbatables.cxx
View File

@ -94,7 +94,7 @@ public:
return uno::makeAny( xTable );
}
// XElementAccess
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return text::XTextTable::static_type(0); }
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return cppu::UnoType<text::XTextTable>::get(); }
virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return getCount() > 0 ; }
// XNameAcess
virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
@ -218,7 +218,7 @@ SwVbaTables::getServiceImplName()
uno::Type SAL_CALL
SwVbaTables::getElementType() throw (uno::RuntimeException)
{
return word::XTable::static_type(0);
return cppu::UnoType<word::XTable>::get();
}
uno::Sequence<OUString>

4
sw/source/ui/vba/vbatablesofcontents.cxx
View File

@ -91,7 +91,7 @@ public:
}
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
{
return word::XTableOfContents::static_type(0);
return cppu::UnoType<word::XTableOfContents>::get();
}
virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
{
@ -150,7 +150,7 @@ SwVbaTablesOfContents::Add( const uno::Reference< word::XRange >& Range, const u
uno::Type
SwVbaTablesOfContents::getElementType() throw (uno::RuntimeException)
{
return word::XTableOfContents::static_type(0);
return cppu::UnoType<word::XTableOfContents>::get();
}
uno::Reference< container::XEnumeration >
SwVbaTablesOfContents::createEnumeration() throw (uno::RuntimeException)

4
sw/source/ui/vba/vbatabstops.cxx
View File

@ -93,7 +93,7 @@ public:
}
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
{
return word::XTabStop::static_type(0);
return cppu::UnoType<word::XTabStop>::get();
}
virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
{
@ -235,7 +235,7 @@ void SAL_CALL SwVbaTabStops::ClearAll() throw (uno::RuntimeException)
uno::Type
SwVbaTabStops::getElementType() throw (uno::RuntimeException)
{
return word::XTabStop::static_type(0);
return cppu::UnoType<word::XTabStop>::get();
}
uno::Reference< container::XEnumeration >
SwVbaTabStops::createEnumeration() throw (uno::RuntimeException)

Some files were not shown because too many files have changed in this diff Show More