diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:39:07 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:39:07 +0200 |
commit | 23116414bd9ea84e3bcdb69b5001c082c9bbb6cc (patch) | |
tree | b6c94ec712480232623eb5635fcd8fff90193b72 /extensions | |
parent | e78a3bfdc815210145e717db459a90f50f218ea8 (diff) |
Replace remaining getCppuType et al with cppu::UnoType
Change-Id: Iee8db4ae259f0d2181140cb3f7ce859bad7cd33d
Diffstat (limited to 'extensions')
18 files changed, 38 insertions, 38 deletions
diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx index 063bac1f8846..dd24e0c5cd54 100644 --- a/extensions/source/abpilot/unodialogabp.cxx +++ b/extensions/source/abpilot/unodialogabp.cxx @@ -49,7 +49,7 @@ namespace abp :OGenericUnoDialog(_rxORB) { registerProperty( OUString("DataSourceName"), PROPERTY_ID_DATASOURCENAME, PropertyAttribute::READONLY , - &m_sDataSourceName, ::getCppuType( &m_sDataSourceName ) ); + &m_sDataSourceName, cppu::UnoType<decltype(m_sDataSourceName)>::get() ); } diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx index 5071767b6e07..255035617c1d 100644 --- a/extensions/source/bibliography/bibconfig.cxx +++ b/extensions/source/bibliography/bibconfig.cxx @@ -235,7 +235,7 @@ void BibConfig::ImplCommit() case 5: pValues[nProp] <<= sQueryText; break; case 6: pValues[nProp] <<= sQueryField; break; case 7: - pValues[nProp].setValue(&bShowColumnAssignmentWarning, ::getBooleanCppuType()); + pValues[nProp].setValue(&bShowColumnAssignmentWarning, cppu::UnoType<bool>::get()); break; } } diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index e7e01a8a0d79..98016ca29009 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -483,7 +483,7 @@ Any BibliographyLoader::getByName(const OUString& rName) throw pValues[nEntry].Name = sColName; pValues[nEntry].Value <<= lcl_AddProperty(xColumns, pMapping, sColName); } - aRet.setValue(&aPropSequ, ::getCppuType((Sequence<PropertyValue>*)0)); + aRet.setValue(&aPropSequ, cppu::UnoType<Sequence<PropertyValue>>::get()); break; } @@ -564,7 +564,7 @@ sal_Bool BibliographyLoader::hasByName(const OUString& rName) throw ( RuntimeExc Type BibliographyLoader::getElementType(void) throw ( RuntimeException, std::exception ) { - return ::getCppuType((Sequence<PropertyValue>*)0); + return cppu::UnoType<Sequence<PropertyValue>>::get(); } sal_Bool BibliographyLoader::hasElements(void) throw ( RuntimeException, std::exception ) @@ -579,7 +579,7 @@ Reference< XPropertySetInfo > BibliographyLoader::getPropertySetInfo(void) thro { static const SfxItemPropertyMapEntry aBibProps_Impl[] = { - { OUString("BibliographyDataFieldNames"), 0, ::getCppuType((Sequence<PropertyValue>*)0), PropertyAttribute::READONLY, 0}, + { OUString("BibliographyDataFieldNames"), 0, cppu::UnoType<Sequence<PropertyValue>>::get(), PropertyAttribute::READONLY, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; static Reference< XPropertySetInfo > xRet = @@ -644,7 +644,7 @@ Any BibliographyLoader::getPropertyValue(const OUString& rPropertyName) pArray[i].Name = pConfig->GetDefColumnName(aInternalMapping[i]); pArray[i].Value <<= (sal_Int16) i; } - aRet.setValue(&aSeq, ::getCppuType((Sequence<PropertyValue>*)0)); + aRet.setValue(&aSeq, cppu::UnoType<Sequence<PropertyValue>>::get()); } else throw UnknownPropertyException(); diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 604aeae748a7..f28936d540f1 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -674,7 +674,7 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid) { OUString sFormatKey("FormatKey"); xCurrentCol->setPropertyValue(sFormatKey, xField->getPropertyValue(sFormatKey)); - Any aFormatted(&bFormattedIsNumeric, ::getBooleanCppuType()); + Any aFormatted(&bFormattedIsNumeric, cppu::UnoType<bool>::get()); xCurrentCol->setPropertyValue("TreatAsNumber", aFormatted); } Any aColName = makeAny( *pFields ); diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 662bf4c641fa..a586fe69aa4c 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -667,7 +667,7 @@ void BibFrameController_Impl::addStatusListener( aEvent.FeatureDescriptor=pDatMan->getQueryField(); uno::Sequence<OUString> aStringSeq=pDatMan->getQueryFields(); - aEvent.State.setValue(&aStringSeq,::getCppuType((uno::Sequence<OUString>*)0)); + aEvent.State.setValue(&aStringSeq,cppu::UnoType<uno::Sequence<OUString>>::get()); } else if ( aURL.Path == "Bib/source") @@ -676,7 +676,7 @@ void BibFrameController_Impl::addStatusListener( aEvent.FeatureDescriptor=pDatMan->getActiveDataTable(); uno::Sequence<OUString> aStringSeq=pDatMan->getDataSources(); - aEvent.State.setValue(&aStringSeq,::getCppuType((uno::Sequence<OUString>*)0)); + aEvent.State.setValue(&aStringSeq,cppu::UnoType<uno::Sequence<OUString>>::get()); } else if( aURL.Path == "Bib/sdbsource" || aURL.Path == "Bib/Mapping" || diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 91e09ae9df3d..f6cbfee4023a 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -150,7 +150,7 @@ void BibPosListener::cursorMoved(const lang::EventObject& /*aEvent*/) throw( uno uno::Sequence<sal_Int16> aSelSeq(1); sal_Int16* pArr = aSelSeq.getArray(); pArr[0] = TYPE_COUNT; - aSel.setValue(&aSelSeq, ::getCppuType((Sequence<sal_Int16>*)0)); + aSel.setValue(&aSelSeq, cppu::UnoType<Sequence<sal_Int16>>::get()); xPropSet->setPropertyValue("SelectedItems", aSel); } } @@ -467,7 +467,7 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl( //pListSourceArr[0] = "select TypeName, TypeIndex from TypeNms"; for(sal_Int32 i = 0; i < TYPE_COUNT; ++i) pListSourceArr[i] = OUString::number(i); - aAny.setValue(&aListSource, ::getCppuType((uno::Sequence<OUString>*)0)); + aAny.setValue(&aListSource, cppu::UnoType<uno::Sequence<OUString>>::get()); xPropSet->setPropertyValue("ListSource", aAny); @@ -478,12 +478,12 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl( // empty string if an invalid value no values is set pValuesArr[TYPE_COUNT].clear(); - aAny.setValue(&aValues, ::getCppuType((uno::Sequence<OUString>*)0)); + aAny.setValue(&aValues, cppu::UnoType<uno::Sequence<OUString>>::get()); xPropSet->setPropertyValue("StringItemList", aAny); sal_Bool bTrue = sal_True; - aAny.setValue( &bTrue, ::getBooleanCppuType() ); + aAny.setValue( &bTrue, cppu::UnoType<bool>::get() ); xPropSet->setPropertyValue( "Dropdown", aAny ); aControlName = "com.sun.star.form.control.ListBox"; diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 1fe85ad14702..66ed1ca4bea9 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -64,7 +64,7 @@ void BibToolBarListener::statusChanged(const ::com::sun::star::frame::FeatureSta pToolBar->EnableItem(nIndex,rEvt.IsEnabled); ::com::sun::star::uno::Any aState=rEvt.State; - if(aState.getValueType()==::getBooleanCppuType()) + if(aState.getValueType()==cppu::UnoType<bool>::get()) { bool bChecked= *static_cast<sal_Bool const *>(aState.getValue()); pToolBar->CheckItem(nIndex, bChecked); @@ -91,7 +91,7 @@ void BibTBListBoxListener::statusChanged(const ::com::sun::star::frame::FeatureS pToolBar->EnableSourceList(rEvt.IsEnabled); Any aState = rEvt.State; - if(aState.getValueType() == ::getCppuType((Sequence<OUString>*)0)) + if(aState.getValueType() == cppu::UnoType<Sequence<OUString>>::get()) { pToolBar->UpdateSourceList(false); pToolBar->ClearSourceList(); @@ -130,7 +130,7 @@ void BibTBQueryMenuListener::statusChanged(const frame::FeatureStateEvent& rEvt) pToolBar->EnableSourceList(rEvt.IsEnabled); uno::Any aState=rEvt.State; - if(aState.getValueType()==::getCppuType((Sequence<OUString>*)0)) + if(aState.getValueType()==cppu::UnoType<Sequence<OUString>>::get()) { pToolBar->ClearFilterMenu(); diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx index d49414d0bc9a..2467850649be 100644 --- a/extensions/source/ole/servprov.cxx +++ b/extensions/source/ole/servprov.cxx @@ -150,7 +150,7 @@ STDMETHODIMP ProviderOleWrapper_Impl::CreateInstance(IUnknown FAR* punkOuter, if (xInstance.is()) { - Any usrAny(&xInstance, getCppuType( & xInstance)); + Any usrAny(&xInstance, cppu::UnoType<decltype(xInstance)>::get()); sal_uInt8 arId[16]; rtl_getGlobalProcessId( arId ); @@ -282,7 +282,7 @@ STDMETHODIMP OneInstanceOleWrapper_Impl::CreateInstance(IUnknown FAR* punkOuter, if (m_xInst.is()) { - Any usrAny(&m_xInst, getCppuType( &m_xInst)); + Any usrAny(&m_xInst, cppu::UnoType<decltype(m_xInst)>::get()); sal_uInt8 arId[16]; rtl_getGlobalProcessId( arId); Any oleAny = m_bridgeSupplier->createBridge(usrAny, diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx index 84feeedb43bd..4b648692c318 100644 --- a/extensions/source/ole/unoconversionutilities.hxx +++ b/extensions/source/ole/unoconversionutilities.hxx @@ -412,7 +412,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny, if( pArg->vt == VT_DISPATCH && isJScriptArray( pArg)) { dispatchExObject2Sequence( pArg, rAny, - getCppuType((Sequence<Any>*) 0)); + cppu::UnoType<Sequence<Any>>::get()); } else if (pArg->vt == VT_DECIMAL) { @@ -1475,7 +1475,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny VARTYPE oleTypeFlags = ::sal::static_int_cast< VARTYPE, int >( var.vt ^ VT_ARRAY ); Sequence<Any> unoSeq = createOleArrayWrapper(var.parray, oleTypeFlags); - rAny.setValue( &unoSeq, getCppuType( &unoSeq)); + rAny.setValue( &unoSeq, cppu::UnoType<decltype(unoSeq)>::get()); } else { @@ -1517,7 +1517,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny case VT_BSTR: { OUString b(reinterpret_cast<const sal_Unicode*>(var.bstrVal)); - rAny.setValue( &b, getCppuType( &b)); + rAny.setValue( &b, cppu::UnoType<decltype(b)>::get()); break; } case VT_UNKNOWN: @@ -1562,7 +1562,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny case VT_BOOL: { sal_Bool b= var.boolVal == VARIANT_TRUE; - rAny.setValue( &b, getCppuType( &b)); + rAny.setValue( &b, cppu::UnoType<decltype(b)>::get()); break; } case VT_I1: @@ -1834,7 +1834,7 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type& params[0] <<= (sal_uInt32) spUnknown.p; #endif sal_Bool bDisp = pVar->vt == VT_DISPATCH ? sal_True : sal_False; - params[1].setValue( & bDisp, getBooleanCppuType()); + params[1].setValue( & bDisp, cppu::UnoType<bool>::get()); params[2] <<= seqTypes; xInit->initialize( Sequence<Any>( params, 3)); @@ -2138,7 +2138,7 @@ Sequence<Any> UnoConversionUtilities<T>::createOleArrayWrapperOfDim(SAFEARRAY* p Sequence<Any> element = createOleArrayWrapperOfDim(pArray, dimCount, actDim - 1, index, type, getElementTypeOfSequence(unotype)); - pUnoArray[index[actDim - 1] - lBound].setValue(&element, getCppuType(&element)); + pUnoArray[index[actDim - 1] - lBound].setValue(&element, cppu::UnoType<decltype(element)>::get()); } else { @@ -2337,7 +2337,7 @@ Sequence<Type> UnoConversionUtilities<T>::getImplementedInterfaces(IUnknown* pUn { // we exspect an array( SafeArray or IDispatch) of Strings. Any anyNames; - variantToAny( &var, anyNames, getCppuType( (Sequence<Any>*) 0)); + variantToAny( &var, anyNames, cppu::UnoType<Sequence<Any>>::get()); Sequence<Any> seqAny; if( anyNames >>= seqAny) { diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx index 5be7ba9215e0..66718f0d081d 100644 --- a/extensions/source/propctrlr/controlfontdialog.cxx +++ b/extensions/source/propctrlr/controlfontdialog.cxx @@ -51,7 +51,7 @@ namespace pcr { registerProperty(PROPERTY_INTROSPECTEDOBJECT, OWN_PROPERTY_ID_INTROSPECTEDOBJECT, PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT, - &m_xControlModel, ::getCppuType(&m_xControlModel)); + &m_xControlModel, cppu::UnoType<decltype(m_xControlModel)>::get()); } diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 10c485cca2a8..f275230a301b 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -446,7 +446,7 @@ namespace pcr Type SAL_CALL EventHolder::getElementType( ) throw (RuntimeException, std::exception) { - return ::getCppuType( static_cast< Sequence< PropertyValue >* >( NULL ) ); + return cppu::UnoType<Sequence< PropertyValue >>::get(); } sal_Bool SAL_CALL EventHolder::hasElements( ) throw (RuntimeException, std::exception) diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index ca270ce04d18..ae7a46c86dec 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -151,7 +151,7 @@ namespace pcr ,m_bHaveCommand( false ) ,m_nClassId( 0 ) { - registerProperty(PROPERTY_ROWSET,PROPERTY_ID_ROWSET,0,&m_xRowSet,::getCppuType(&m_xRowSet)); + registerProperty(PROPERTY_ROWSET,PROPERTY_ID_ROWSET,0,&m_xRowSet,cppu::UnoType<decltype(m_xRowSet)>::get()); } diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx b/extensions/source/propctrlr/inspectormodelbase.cxx index 8dd806a574a2..343da359c1bb 100644 --- a/extensions/source/propctrlr/inspectormodelbase.cxx +++ b/extensions/source/propctrlr/inspectormodelbase.cxx @@ -102,25 +102,25 @@ namespace pcr OUString( "HasHelpSection" ), MODEL_PROPERTY_ID_HAS_HELP_SECTION, PropertyAttribute::READONLY, - &m_bHasHelpSection, ::getCppuType( &m_bHasHelpSection ) + &m_bHasHelpSection, cppu::UnoType<decltype(m_bHasHelpSection)>::get() ); registerProperty( OUString( "MinHelpTextLines" ), MODEL_PROPERTY_ID_MIN_HELP_TEXT_LINES, PropertyAttribute::READONLY, - &m_nMinHelpTextLines, ::getCppuType( &m_nMinHelpTextLines ) + &m_nMinHelpTextLines, cppu::UnoType<decltype(m_nMinHelpTextLines)>::get() ); registerProperty( OUString( "MaxHelpTextLines" ), MODEL_PROPERTY_ID_MAX_HELP_TEXT_LINES, PropertyAttribute::READONLY, - &m_nMaxHelpTextLines, ::getCppuType( &m_nMaxHelpTextLines ) + &m_nMaxHelpTextLines, cppu::UnoType<decltype(m_nMaxHelpTextLines)>::get() ); registerProperty( OUString( "IsReadOnly" ), MODEL_PROPERTY_ID_IS_READ_ONLY, PropertyAttribute::BOUND, - &m_bIsReadOnly, ::getCppuType( &m_bIsReadOnly ) + &m_bIsReadOnly, cppu::UnoType<decltype(m_bIsReadOnly)>::get() ); } diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx index 6b1c71c45e4a..9c26eb5465d6 100644 --- a/extensions/source/propctrlr/pcrunodialogs.cxx +++ b/extensions/source/propctrlr/pcrunodialogs.cxx @@ -51,11 +51,11 @@ namespace pcr { registerProperty( PROPERTY_CONTROLCONTEXT, OWN_PROPERTY_ID_CONTROLCONTEXT, PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT, - &m_xControlContext, ::getCppuType( &m_xControlContext ) ); + &m_xControlContext, cppu::UnoType<decltype(m_xControlContext)>::get() ); registerProperty( PROPERTY_TABBINGMODEL, OWN_PROPERTY_ID_TABBINGMODEL, PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT, - &m_xTabbingModel, ::getCppuType( &m_xTabbingModel ) ); + &m_xTabbingModel, cppu::UnoType<decltype(m_xTabbingModel)>::get() ); } diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index bac8e56187f4..af4d001dc784 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -1411,7 +1411,7 @@ namespace pcr { if ( getTypedControlWindow()->getOperationMode() == eMultiLineText ) return ::cppu::UnoType<OUString>::get(); - return ::getCppuType( static_cast< Sequence< OUString >* >( NULL ) ); + return cppu::UnoType<Sequence< OUString >>::get(); } diff --git a/extensions/source/resource/ResourceIndexAccess.cxx b/extensions/source/resource/ResourceIndexAccess.cxx index 0d1a69d81b12..77cdc21d5e6d 100644 --- a/extensions/source/resource/ResourceIndexAccess.cxx +++ b/extensions/source/resource/ResourceIndexAccess.cxx @@ -78,7 +78,7 @@ namespace virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccessBase virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return ::getCppuType(static_cast<Sequence<PropertyValue> * >(0)); }; + { return cppu::UnoType<Sequence<PropertyValue>>::get(); }; }; } diff --git a/extensions/test/ole/OleClient/clientTest.cxx b/extensions/test/ole/OleClient/clientTest.cxx index 1177ebd33525..5759baa24428 100644 --- a/extensions/test/ole/OleClient/clientTest.cxx +++ b/extensions/test/ole/OleClient/clientTest.cxx @@ -646,7 +646,7 @@ bool doSimpleTest(const Reference<XInvocation> & inv) // in and out parameter sal_Bool aBool = sal_True; - inBool.setValue(&aBool, getCppuBooleanType()); + inBool.setValue(&aBool, cppu::UnoType<bool>::get()); inv->invoke(OUString(L"inBool"), Sequence< Any > ( &inBool, 1), seqIndices, seqOut); seqIndices.realloc(0); seqOut.realloc(0); diff --git a/extensions/test/ole/OleClient/funcs.cxx b/extensions/test/ole/OleClient/funcs.cxx index 68c3700c81f0..58cf6e7c01aa 100644 --- a/extensions/test/ole/OleClient/funcs.cxx +++ b/extensions/test/ole/OleClient/funcs.cxx @@ -122,7 +122,7 @@ bool checkOutArgs(const Sequence<Any> & outArgs, //iterate over all parameters. i represents the parameter index for (int i = 0; i < values.getLength(); i++) { - if (values[i].getValueType() == getVoidCppuType()) + if (values[i].getValueType() == cppu::UnoType<cppu::UnoVoidType>::get()) continue; //out parameter //Based on the parameter index find the correspondent out value |