diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2014-05-10 00:14:44 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2014-05-10 06:19:42 +0200 |
| commit | 5ec7a589bed7991ffe8ad9a2f544a6699d159765 (patch) | |
| tree | f9020375a29477fe7e4d22970a4040c36abadbdf | |
| parent | 83a88b942134314e86ac612d0ef70a8e4919e4af (diff) | |
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part8
Change-Id: Ie16923d17541e84e0d7424fffe37caf410786abf
70 files changed, 504 insertions, 504 deletions
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 296e70683b27..102fe6c52a4d 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -848,30 +848,30 @@ Type getUnoTypeForSbxBaseType( SbxDataType eType ) switch( eType ) { case SbxNULL: aRetType = ::getCppuType( (const Reference< XInterface > *)0 ); break; - case SbxINTEGER: aRetType = ::getCppuType( (sal_Int16*)0 ); break; - case SbxLONG: aRetType = ::getCppuType( (sal_Int32*)0 ); break; - case SbxSINGLE: aRetType = ::getCppuType( (float*)0 ); break; - case SbxDOUBLE: aRetType = ::getCppuType( (double*)0 ); break; + case SbxINTEGER: aRetType = ::cppu::UnoType<sal_Int16>::get(); break; + case SbxLONG: aRetType = ::cppu::UnoType<sal_Int32>::get(); break; + case SbxSINGLE: aRetType = ::cppu::UnoType<float>::get(); break; + case SbxDOUBLE: aRetType = ::cppu::UnoType<double>::get(); break; case SbxCURRENCY: aRetType = ::getCppuType( (oleautomation::Currency*)0 ); break; case SbxDECIMAL: aRetType = ::getCppuType( (oleautomation::Decimal*)0 ); break; case SbxDATE: { SbiInstance* pInst = GetSbData()->pInst; if( pInst && pInst->IsCompatibility() ) - aRetType = ::getCppuType( (double*)0 ); + aRetType = ::cppu::UnoType<double>::get(); else aRetType = ::getCppuType( (oleautomation::Date*)0 ); } break; - case SbxSTRING: aRetType = ::getCppuType( (OUString*)0 ); break; + case SbxSTRING: aRetType = ::cppu::UnoType<OUString>::get(); break; case SbxBOOL: aRetType = ::getCppuType( (sal_Bool*)0 ); break; case SbxVARIANT: aRetType = ::getCppuType( (Any*)0 ); break; case SbxCHAR: aRetType = ::getCppuType( (sal_Unicode*)0 ); break; - case SbxBYTE: aRetType = ::getCppuType( (sal_Int8*)0 ); break; + case SbxBYTE: aRetType = ::cppu::UnoType<sal_Int8>::get(); break; case SbxUSHORT: aRetType = ::getCppuType( (sal_uInt16*)0 ); break; - case SbxULONG: aRetType = ::getCppuType( (sal_uInt32*)0 ); break; + case SbxULONG: aRetType = ::cppu::UnoType<sal_uInt32>::get(); break; // map machine-dependent ones to long for consistency - case SbxINT: aRetType = ::getCppuType( (sal_Int32*)0 ); break; - case SbxUINT: aRetType = ::getCppuType( (sal_uInt32*)0 ); break; + case SbxINT: aRetType = ::cppu::UnoType<sal_Int32>::get(); break; + case SbxUINT: aRetType = ::cppu::UnoType<sal_uInt32>::get(); break; default: break; } return aRetType; @@ -1059,11 +1059,11 @@ Any sbxToUnoValueImpl( const SbxValue* pVar, bool bBlockConversionToSmallestType if( d == floor( d ) ) { if( d >= -128 && d <= 127 ) - aType = ::getCppuType( (sal_Int8*)0 ); + aType = ::cppu::UnoType<sal_Int8>::get(); else if( d >= SbxMININT && d <= SbxMAXINT ) - aType = ::getCppuType( (sal_Int16*)0 ); + aType = ::cppu::UnoType<sal_Int16>::get(); else if( d >= -SbxMAXLNG && d <= SbxMAXLNG ) - aType = ::getCppuType( (sal_Int32*)0 ); + aType = ::cppu::UnoType<sal_Int32>::get(); } break; } @@ -1071,16 +1071,16 @@ Any sbxToUnoValueImpl( const SbxValue* pVar, bool bBlockConversionToSmallestType { sal_Int16 n = pVar->GetInteger(); if( n >= -128 && n <= 127 ) - aType = ::getCppuType( (sal_Int8*)0 ); + aType = ::cppu::UnoType<sal_Int8>::get(); break; } case TypeClass_LONG: { sal_Int32 n = pVar->GetLong(); if( n >= -128 && n <= 127 ) - aType = ::getCppuType( (sal_Int8*)0 ); + aType = ::cppu::UnoType<sal_Int8>::get(); else if( n >= SbxMININT && n <= SbxMAXINT ) - aType = ::getCppuType( (sal_Int16*)0 ); + aType = ::cppu::UnoType<sal_Int16>::get(); break; } case TypeClass_UNSIGNED_SHORT: diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index 486eb96652c1..574af686555d 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -1240,7 +1240,7 @@ Reference< XInterface > SAL_CALL SfxScriptLibraryContainer::Create( const Refere SfxScriptLibrary::SfxScriptLibrary( ModifiableHelper& _rModifiable, const Reference< XComponentContext >& xContext, const Reference< XSimpleFileAccess3 >& xSFI ) - : SfxLibrary( _rModifiable, getCppuType( (const OUString *)0 ), xContext, xSFI ) + : SfxLibrary( _rModifiable, cppu::UnoType<OUString>::get(), xContext, xSFI ) , mbLoadedSource( false ) , mbLoadedBinary( false ) { @@ -1252,7 +1252,7 @@ SfxScriptLibrary::SfxScriptLibrary( ModifiableHelper& _rModifiable, const OUString& aLibInfoFileURL, const OUString& aStorageURL, bool ReadOnly ) - : SfxLibrary( _rModifiable, getCppuType( (const OUString *)0 ), xContext, xSFI, + : SfxLibrary( _rModifiable, cppu::UnoType<OUString>::get(), xContext, xSFI, aLibInfoFileURL, aStorageURL, ReadOnly) , mbLoadedSource( false ) , mbLoadedBinary( false ) diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx index af91f6fe7af6..02e6fa268a59 100644 --- a/connectivity/source/drivers/ado/Aolevariant.cxx +++ b/connectivity/source/drivers/ado/Aolevariant.cxx @@ -699,16 +699,16 @@ SAFEARRAY* OLEVariant::getUI1SAFEARRAYPtr() const aValue.setValue(NULL, Type()); break; case VT_I2: - aValue.setValue( & iVal, getCppuType( (sal_Int16*)0)); + aValue.setValue( & iVal, cppu::UnoType<sal_Int16>::get()); break; case VT_I4: - aValue.setValue( & lVal, getCppuType( (sal_Int32*)0)); + aValue.setValue( & lVal, cppu::UnoType<sal_Int32>::get()); break; case VT_R4: - aValue.setValue( & fltVal, getCppuType( (float*)0)); + aValue.setValue( & fltVal, cppu::UnoType<float>::get()); break; case VT_R8: - aValue.setValue(& dblVal, getCppuType( (double*)0)); + aValue.setValue(& dblVal, cppu::UnoType<double>::get()); break; case VT_CY: { @@ -746,7 +746,7 @@ SAFEARRAY* OLEVariant::getUI1SAFEARRAYPtr() const aValue.setValue( & ulVal, getCppuType( (sal_uInt32*)0)); break; case VT_INT: - aValue.setValue( & intVal, getCppuType( (sal_Int32*)0)); + aValue.setValue( & intVal, cppu::UnoType<sal_Int32>::get()); break; case VT_UINT: aValue.setValue( & uintVal, getCppuType( (sal_uInt32*)0)); diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx index 5b4a03066cb0..a8af6d40eb74 100644 --- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx @@ -104,25 +104,25 @@ static ::cppu::IPropertyArrayHelper & getResultSetPropertyArrayHelper() // At least use for the handles the #define'd values in .hxx file... Property( OUString("CursorName"), 0, - ::getCppuType( (OUString *)0) , 0 ), + ::cppu::UnoType<OUString>::get() , 0 ), Property( OUString("EscapeProcessing"), 1, ::getBooleanCppuType() , 0 ), Property( OUString("FetchDirection"), 2, - ::getCppuType( (sal_Int32 *)0) , 0 ), + ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( OUString("FetchSize"), 3, - ::getCppuType( (sal_Int32 *)0) , 0 ), + ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( OUString("IsBookmarkable"), 4, ::getBooleanCppuType() , 0 ), Property( OUString("ResultSetConcurrency"), 5, - ::getCppuType( (sal_Int32 *)0) , 0 ), + ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( OUString("ResultSetType"), 6, - ::getCppuType( (sal_Int32 *)0) , 0 ) + ::cppu::UnoType<sal_Int32>::get() , 0 ) }; OSL_ASSERT( sizeof(aTable) / sizeof(Property) == BASERESULTSET_SIZE ); static ::cppu::OPropertyArrayHelper arrayHelper( aTable, BASERESULTSET_SIZE, sal_True ); diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx index 83dbdbf9d3d8..55c0175e48fa 100644 --- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx +++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx @@ -107,31 +107,31 @@ static ::cppu::IPropertyArrayHelper & getPreparedStatementPropertyArrayHelper() { Property( OUString("CursorName"), 0, - ::getCppuType( (OUString *)0) , 0 ), + ::cppu::UnoType<OUString>::get() , 0 ), Property( OUString("EscapeProcessing"), 1, ::getBooleanCppuType() , 0 ), Property( OUString("FetchDirection"), 2, - ::getCppuType( (sal_Int32 *)0) , 0 ), + ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( OUString("FetchSize"), 3, - ::getCppuType( (sal_Int32 *)0) , 0 ), + ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( OUString("MaxFieldSize"), 4, - ::getCppuType( (sal_Int32 *)0) , 0 ), + ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( OUString("MaxRows"), 5, - ::getCppuType( (sal_Int32 *)0) , 0 ), + ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( OUString("QueryTimeOut"), 6, - ::getCppuType( (sal_Int32 *)0) , 0 ), + ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( OUString("ResultSetConcurrency"), 7, - ::getCppuType( (sal_Int32 *)0) , 0 ), + ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( OUString("ResultSetType"), 8, - ::getCppuType( (sal_Int32 *)0) , 0 ) + ::cppu::UnoType<sal_Int32>::get() , 0 ) }; OSL_ASSERT( sizeof(aTable)/ sizeof(Property) == PREPARED_STATEMENT_SIZE ); static ::cppu::OPropertyArrayHelper arrayHelper( aTable, PREPARED_STATEMENT_SIZE, sal_True ); diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx index e002067039a2..23727dbf126a 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.cxx +++ b/connectivity/source/drivers/postgresql/pq_statement.cxx @@ -120,31 +120,31 @@ static ::cppu::IPropertyArrayHelper & getStatementPropertyArrayHelper() { Property( OUString("CursorName"), 0, - ::getCppuType( (OUString *)0) , 0 ), + ::cppu::UnoType<OUString>::get() , 0 ), Property( OUString("EscapeProcessing"), 1, ::getBooleanCppuType() , 0 ), Property( OUString("FetchDirection"), 2, - ::getCppuType( (sal_Int32 *)0) , 0 ), + ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( OUString("FetchSize"), 3, - ::getCppuType( (sal_Int32 *)0) , 0 ), + ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( OUString("MaxFieldSize"), 4, - ::getCppuType( (sal_Int32 *)0) , 0 ), + ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( OUString("MaxRows"), 5, - ::getCppuType( (sal_Int32 *)0) , 0 ), + ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( OUString("QueryTimeOut"), 6, - ::getCppuType( (sal_Int32 *)0) , 0 ), + ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( OUString("ResultSetConcurrency"), 7, - ::getCppuType( (sal_Int32 *)0) , 0 ), + ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( OUString("ResultSetType"), 8, - ::getCppuType( (sal_Int32 *)0) , 0 ) + ::cppu::UnoType<sal_Int32>::get() , 0 ) }; OSL_ASSERT( sizeof(aTable)/ sizeof(Property) == STATEMENT_SIZE ); static ::cppu::OPropertyArrayHelper arrayHelper( aTable, STATEMENT_SIZE, sal_True ); diff --git a/connectivity/source/drivers/postgresql/pq_statics.cxx b/connectivity/source/drivers/postgresql/pq_statics.cxx index 0b6a15ca1d92..0d349a896289 100644 --- a/connectivity/source/drivers/postgresql/pq_statics.cxx +++ b/connectivity/source/drivers/postgresql/pq_statics.cxx @@ -197,8 +197,8 @@ Statics & getStatics() statics.CATALOG = "Catalog"; - Type tString = getCppuType( (OUString *) 0 ); - Type tInt = getCppuType( (sal_Int32 * ) 0 ); + Type tString = cppu::UnoType<OUString>::get(); + Type tInt = cppu::UnoType<sal_Int32>::get(); Type tBool = getBooleanCppuType(); Type tStringSequence = getCppuType( (com::sun::star::uno::Sequence< OUString > *) 0); diff --git a/dtrans/source/generic/generic_clipboard.cxx b/dtrans/source/generic/generic_clipboard.cxx index 98953bf60b79..fee760708b90 100644 --- a/dtrans/source/generic/generic_clipboard.cxx +++ b/dtrans/source/generic/generic_clipboard.cxx @@ -47,7 +47,7 @@ void SAL_CALL GenericClipboard::initialize( const Sequence< Any >& aArguments ) if (!m_bInitialized) { for (sal_Int32 n = 0, nmax = aArguments.getLength(); n < nmax; n++) - if (aArguments[n].getValueType() == getCppuType((OUString *) 0)) + if (aArguments[n].getValueType() == cppu::UnoType<OUString>::get()) { aArguments[0] >>= m_aName; break; diff --git a/dtrans/source/test/test_dtrans.cxx b/dtrans/source/test/test_dtrans.cxx index a8503a61811e..3e5c0a7dbea3 100644 --- a/dtrans/source/test/test_dtrans.cxx +++ b/dtrans/source/test/test_dtrans.cxx @@ -187,7 +187,7 @@ StringTransferable::StringTransferable( ) : /* df.MimeType = L"text/plain; charset=unicode"; - df.DataType = getCppuType( ( OUString* )0 ); + df.DataType = cppu::UnoType<OUString>::get(); m_seqDFlv[0] = df; */ diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx index 475ecadac7d3..a88b32bc2534 100644 --- a/dtrans/source/win32/dtobj/DOTransferable.cxx +++ b/dtrans/source/win32/dtobj/DOTransferable.cxx @@ -45,7 +45,7 @@ using namespace com::sun::star::container; namespace { const Type CPPUTYPE_SEQINT8 = getCppuType( ( Sequence< sal_Int8 >* )0 ); - const Type CPPUTYPE_OUSTRING = getCppuType( (OUString*)0 ); + const Type CPPUTYPE_OUSTRING = cppu::UnoType<OUString>::get(); inline sal_Bool isValidFlavor( const DataFlavor& aFlavor ) @@ -536,7 +536,7 @@ sal_Bool SAL_CALL CDOTransferable::cmpAllContentTypeParameter( { IDataObject* pObj= m_rDataObject.get(); pObj->AddRef(); - retVal.setValue( &pObj, getCppuType((sal_uInt32*)0)); + retVal.setValue( &pObj, cppu::UnoType<sal_uInt32>::get()); } } return retVal; diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx index d1109ec69cc8..37c8dd86e746 100644 --- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx +++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx @@ -46,9 +46,9 @@ using namespace com::sun::star::uno; using namespace com::sun::star::datatransfer; using namespace com::sun::star::lang; -const Type CPPUTYPE_SALINT32 = getCppuType((sal_Int32*)0); -const Type CPPUTYPE_SALINT8 = getCppuType((sal_Int8*)0); -const Type CPPUTYPE_OUSTRING = getCppuType((OUString*)0); +const Type CPPUTYPE_SALINT32 = cppu::UnoType<sal_Int32>::get(); +const Type CPPUTYPE_SALINT8 = cppu::UnoType<sal_Int8>::get(); +const Type CPPUTYPE_OUSTRING = cppu::UnoType<OUString>::get(); const Type CPPUTYPE_SEQSALINT8 = getCppuType((Sequence< sal_Int8>*)0); const sal_Int32 MAX_CLIPFORMAT_NAME = 256; diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx index 4348a7058085..156f4fac96f4 100644 --- a/dtrans/source/win32/ftransl/ftransl.cxx +++ b/dtrans/source/win32/ftransl/ftransl.cxx @@ -40,13 +40,13 @@ #define MODULE_PRIVATE #define CPPUTYPE_SEQSALINT8 getCppuType( (const Sequence< sal_Int8 >*) 0 ) #define CPPUTYPE_DEFAULT CPPUTYPE_SEQSALINT8 -#define CPPUTYPE_OUSTR getCppuType( (const OUString*) 0 ) -#define CPPUTYPE_SALINT32 getCppuType( ( sal_Int32 * ) 0 ) +#define CPPUTYPE_OUSTR cppu::UnoType<OUString>::get() +#define CPPUTYPE_SALINT32 cppu::UnoType<sal_Int32>::get() #define EMPTY_OUSTR OUString() const OUString Windows_FormatName ("windows_formatname"); const com::sun::star::uno::Type CppuType_ByteSequence = ::getCppuType((const com::sun::star::uno::Sequence<sal_Int8>*)0); -const com::sun::star::uno::Type CppuType_String = ::getCppuType((const OUString*)0); +const com::sun::star::uno::Type CppuType_String = ::cppu::UnoType<OUString>::get(); // namespace directives diff --git a/dtrans/source/win32/workbench/test_wincb.cxx b/dtrans/source/win32/workbench/test_wincb.cxx index a065dc002b0b..0527ae4facce 100644 --- a/dtrans/source/win32/workbench/test_wincb.cxx +++ b/dtrans/source/win32/workbench/test_wincb.cxx @@ -130,7 +130,7 @@ CTransferable::CTransferable( ) : DataFlavor df; //df.MimeType = L"text/plain;charset=utf-16"; - //df.DataType = getCppuType( ( OUString* )0 ); + //df.DataType = cppu::UnoType<OUString>::get(); df.MimeType = L"text/plain;charset=Windows1252"; df.DataType = getCppuType( (Sequence< sal_Int8 >*)0 ); diff --git a/dtrans/test/win32/dnd/transferable.cxx b/dtrans/test/win32/dnd/transferable.cxx index 87dbc79ef13f..b9bd35f82928 100644 --- a/dtrans/test/win32/dnd/transferable.cxx +++ b/dtrans/test/win32/dnd/transferable.cxx @@ -29,7 +29,7 @@ CTransferable::CTransferable( wchar_t* dataString ) : /* df.MimeType = L"text/plain; charset=unicode"; - df.DataType = getCppuType( ( OUString* )0 ); + df.DataType = cppu::UnoType<OUString>::get(); m_seqDFlv[0] = df; */ diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 55f642c3a3c0..6fca87b723d1 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -3731,7 +3731,7 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) case MID_GRAPHIC_URL: { - if ( rVal.getValueType() == ::getCppuType( (OUString*)0 ) ) + if ( rVal.getValueType() == ::cppu::UnoType<OUString>::get() ) { OUString sLink; rVal >>= sLink; @@ -3763,7 +3763,7 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) case MID_GRAPHIC_FILTER: { - if( rVal.getValueType() == ::getCppuType( (OUString*)0 ) ) + if( rVal.getValueType() == ::cppu::UnoType<OUString>::get() ) { OUString sLink; rVal >>= sLink; diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index 6e14f3c496d2..fd44829e1a56 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -71,10 +71,10 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId ) { static const SfxItemPropertyMapEntry aExDateTimeFieldPropertyMap_Impl[] = { - { OUString(UNO_TC_PROP_DATE_TIME), WID_DATE, ::getCppuType((const util::DateTime*)0), 0, 0 }, + { OUString(UNO_TC_PROP_DATE_TIME), WID_DATE, ::cppu::UnoType<util::DateTime>::get(), 0, 0 }, { OUString(UNO_TC_PROP_IS_FIXED), WID_BOOL1, ::getBooleanCppuType(), 0, 0 }, { OUString(UNO_TC_PROP_IS_DATE), WID_BOOL2, ::getBooleanCppuType(), 0, 0 }, - { OUString(UNO_TC_PROP_NUMFORMAT), WID_INT32, ::getCppuType((const sal_Int32*)0), 0, 0 }, + { OUString(UNO_TC_PROP_NUMFORMAT), WID_INT32, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; static const SfxItemPropertySet aExDateTimeFieldPropertySet_Impl(aExDateTimeFieldPropertyMap_Impl); @@ -89,10 +89,10 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId ) static const SfxItemPropertyMapEntry aUrlFieldPropertyMap_Impl[] = { - { OUString(UNO_TC_PROP_URL_FORMAT), WID_INT16, ::getCppuType((const sal_Int16*)0), 0, 0 }, - { OUString(UNO_TC_PROP_URL_REPRESENTATION), WID_STRING1, ::getCppuType((const OUString*)0), 0, 0 }, - { OUString(UNO_TC_PROP_URL_TARGET), WID_STRING2, ::getCppuType((const OUString*)0), 0, 0 }, - { OUString(UNO_TC_PROP_URL), WID_STRING3, ::getCppuType((const OUString*)0), 0, 0 }, + { OUString(UNO_TC_PROP_URL_FORMAT), WID_INT16, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { OUString(UNO_TC_PROP_URL_REPRESENTATION), WID_STRING1, ::cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString(UNO_TC_PROP_URL_TARGET), WID_STRING2, ::cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString(UNO_TC_PROP_URL), WID_STRING3, ::cppu::UnoType<OUString>::get(), 0, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; static const SfxItemPropertySet aUrlFieldPropertySet_Impl(aUrlFieldPropertyMap_Impl); @@ -106,8 +106,8 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId ) static const SfxItemPropertyMapEntry aExtFileFieldPropertyMap_Impl[] = { { OUString(UNO_TC_PROP_IS_FIXED), WID_BOOL1, ::getBooleanCppuType(), 0, 0 }, - { OUString(UNO_TC_PROP_FILE_FORMAT), WID_INT16, ::getCppuType((const sal_Int16*)0), 0, 0 }, - { OUString(UNO_TC_PROP_CURRENT_PRESENTATION), WID_STRING1, ::getCppuType((const OUString*)0), 0, 0 }, + { OUString(UNO_TC_PROP_FILE_FORMAT), WID_INT16, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { OUString(UNO_TC_PROP_CURRENT_PRESENTATION), WID_STRING1, ::cppu::UnoType<OUString>::get(), 0, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; static const SfxItemPropertySet aExtFileFieldPropertySet_Impl(aExtFileFieldPropertyMap_Impl); @@ -115,9 +115,9 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId ) static const SfxItemPropertyMapEntry aAuthorFieldPropertyMap_Impl[] = { { OUString(UNO_TC_PROP_IS_FIXED), WID_BOOL1, ::getBooleanCppuType(), 0, 0 }, - { OUString(UNO_TC_PROP_CURRENT_PRESENTATION), WID_STRING1,::getCppuType((const OUString*)0), 0, 0 }, - { OUString(UNO_TC_PROP_AUTHOR_CONTENT), WID_STRING2,::getCppuType((const OUString*)0), 0, 0 }, - { OUString(UNO_TC_PROP_AUTHOR_FORMAT), WID_INT16, ::getCppuType((const sal_Int16*)0), 0, 0 }, + { OUString(UNO_TC_PROP_CURRENT_PRESENTATION), WID_STRING1,::cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString(UNO_TC_PROP_AUTHOR_CONTENT), WID_STRING2,::cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString(UNO_TC_PROP_AUTHOR_FORMAT), WID_INT16, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, { OUString(UNO_TC_PROP_AUTHOR_FULLNAME), WID_BOOL2, ::getBooleanCppuType(), 0, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -125,7 +125,7 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId ) static const SfxItemPropertyMapEntry aMeasureFieldPropertyMap_Impl[] = { - { OUString(UNO_TC_PROP_MEASURE_KIND), WID_INT16, ::getCppuType((const sal_Int16*)0), 0, 0 }, + { OUString(UNO_TC_PROP_MEASURE_KIND), WID_INT16, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; static const SfxItemPropertySet aMeasureFieldPropertySet_Impl(aMeasureFieldPropertyMap_Impl); diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index 84915f0b59f7..e0b66fce0d0d 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -125,7 +125,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* } } else if ( pMap->aType.getTypeClass() == uno::TypeClass_ENUM && - aVal.getValueType() == ::getCppuType((const sal_Int32*)0) ) + aVal.getValueType() == ::cppu::UnoType<sal_Int32>::get() ) { // convert typeless SfxEnumItem to enum type sal_Int32 nEnum; @@ -237,7 +237,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* } if ( pMap->aType.getTypeClass() == uno::TypeClass_ENUM && - aVal.getValueType() == ::getCppuType((const sal_Int32*)0) ) + aVal.getValueType() == ::cppu::UnoType<sal_Int32>::get() ) { sal_Int32 nEnum; aVal >>= nEnum; diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index 3b3f24246253..971b55b4b0e3 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -217,7 +217,7 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex( sa { awt::FontDescriptor aDesc; SvxUnoFontDescriptor::ConvertFromFont( *rFmt.GetBulletFont(), aDesc ); - aVal.setValue(&aDesc, ::getCppuType((const awt::FontDescriptor*)0)); + aVal.setValue(&aDesc, ::cppu::UnoType<awt::FontDescriptor>::get()); pArray[nIdx++] = beans::PropertyValue( OUString(UNO_NAME_NRULE_BULLET_FONT), -1, aVal, beans::PropertyState_DIRECT_VALUE); } diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 659baec88cf4..e2c4b7a7cccb 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -89,7 +89,7 @@ const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap() SVX_UNOEDIT_OUTLINER_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, {OUString("TextField"), EE_FEATURE_FIELD, ::getCppuType((const uno::Reference< text::XTextField >*)0), beans::PropertyAttribute::READONLY, 0 }, - {OUString("TextPortionType"), WID_PORTIONTYPE, ::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {OUString("TextPortionType"), WID_PORTIONTYPE, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 }, {OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, ::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(), 0, css::uno::Type(), 0, 0 } diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index 6e5b01b58460..65bb17a8533e 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -385,7 +385,7 @@ SvxXMLTextExportComponent::SvxXMLTextExportComponent( // SVX_UNOEDIT_OUTLINER_PROPERTIES, {OUString(UNO_NAME_NUMBERING_RULES), EE_PARA_NUMBULLET, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace>*)0), 0, 0 }, {OUString(UNO_NAME_NUMBERING), EE_PARA_BULLETSTATE,::getBooleanCppuType(), 0, 0 }, - {OUString(UNO_NAME_NUMBERING_LEVEL), EE_PARA_OUTLLEVEL, ::getCppuType((const sal_Int16*)0), 0, 0 }, + {OUString(UNO_NAME_NUMBERING_LEVEL), EE_PARA_OUTLLEVEL, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, SVX_UNOEDIT_PARA_PROPERTIES, { OUString(), 0, css::uno::Type(), 0, 0 } }; diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index bd27749e7dcb..2babb133beb3 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -490,7 +490,7 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl( aAny <<= (sal_Int16)1; xPropSet->setPropertyValue("BoundColumn", aAny); ListSourceType eSet = ListSourceType_VALUELIST; - aAny.setValue( &eSet, ::getCppuType((const ListSourceType*)0) ); + aAny.setValue( &eSet, ::cppu::UnoType<ListSourceType>::get() ); xPropSet->setPropertyValue("ListSourceType", aAny); uno::Sequence<OUString> aListSource(TYPE_COUNT); diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index f7070bfe6eb1..ca0c8156be96 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -774,7 +774,7 @@ Any SAL_CALL IUnknownWrapper_Impl::createBridge( const Any& modelDepObject, pVariant->punkVal->AddRef(); } - ret.setValue((void*)&pVariant, getCppuType( (sal_uInt32*) 0)); + ret.setValue((void*)&pVariant, cppu::UnoType<sal_uInt32>::get()); } } @@ -1354,7 +1354,7 @@ uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const OUString& aName, con // Determine the number of named arguments for ( sal_Int32 nInd = 0; nInd < aParams.getLength(); nInd++ ) - if ( aParams[nInd].getValueType() == getCppuType((NamedArgument*) 0) ) + if ( aParams[nInd].getValueType() == cppu::UnoType<NamedArgument>::get() ) dispparams.cNamedArgs ++; // fill the named arguments @@ -1372,7 +1372,7 @@ uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const OUString& aName, con int cNamedArg = 0; for ( size_t nInd = 0; nInd < dispparams.cArgs; nInd++ ) { - if ( aParams[nInd].getValueType() == getCppuType((NamedArgument*) 0)) + if ( aParams[nInd].getValueType() == cppu::UnoType<NamedArgument>::get()) { const NamedArgument& arg = *(NamedArgument const*)aParams[nInd].getValue(); @@ -1435,14 +1435,14 @@ uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const OUString& aName, con anyArg = aParams.getConstArray()[nInd]; // Property Put arguments - if ( anyArg.getValueType() == getCppuType((PropertyPutArgument*)0) ) + if ( anyArg.getValueType() == cppu::UnoType<PropertyPutArgument>::get() ) { PropertyPutArgument arg; anyArg >>= arg; anyArg <<= arg.Value; } // named argument - if (anyArg.getValueType() == getCppuType((NamedArgument*) 0)) + if (anyArg.getValueType() == cppu::UnoType<NamedArgument>::get()) { NamedArgument aNamedArgument; anyArg >>= aNamedArgument; @@ -1751,7 +1751,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc, for (int iParam = 0; iParam < nUnoArgs; iParam ++) { const Any & curArg = Params[iParam]; - if (curArg.getValueType() == getCppuType((NamedArgument*) 0)) + if (curArg.getValueType() == cppu::UnoType<NamedArgument>::get()) dispparams.cNamedArgs ++; } //In a property put operation a property value is a named argument (DISPID_PROPERTYPUT). @@ -1817,7 +1817,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc, for (size_t iParams = 0; iParams < dispparams.cArgs; iParams ++) { const Any & curArg = Params[iParams]; - if (curArg.getValueType() == getCppuType((NamedArgument*) 0)) + if (curArg.getValueType() == cppu::UnoType<NamedArgument>::get()) { const NamedArgument& arg = *(NamedArgument const*) curArg.getValue(); //We put the parameter names in reverse order into the array, @@ -1910,14 +1910,14 @@ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc, } // Property Put arguments - if (anyArg.getValueType() == getCppuType((PropertyPutArgument*)0)) + if (anyArg.getValueType() == cppu::UnoType<PropertyPutArgument>::get()) { PropertyPutArgument arg; anyArg >>= arg; anyArg <<= arg.Value; } // named argument - if (anyArg.getValueType() == getCppuType((NamedArgument*) 0)) + if (anyArg.getValueType() == cppu::UnoType<NamedArgument>::get()) { NamedArgument aNamedArgument; anyArg >>= aNamedArgument; @@ -2080,7 +2080,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc, int realParamIndex = paramIndex; int revParamIndex = dispparams.cArgs - paramIndex - 1; if (Params[paramIndex].getValueType() - == getCppuType((NamedArgument*) 0)) + == cppu::UnoType<NamedArgument>::get()) { //dispparams.rgdispidNamedArgs contains the mapping from index //of named args list to index of parameter list @@ -2206,7 +2206,7 @@ void IUnknownWrapper_Impl::getFuncDescForInvoke(const OUString & sFuncName, //or in a list of named arguments. A PropertyPutArgument is actually a named argument //hence it must not be put in an extra NamedArgument structure if (nUnoArgs > 0 && - arArgs[nUnoArgs - 1].getValueType() == getCppuType((PropertyPutArgument*) 0)) + arArgs[nUnoArgs - 1].getValueType() == cppu::UnoType<PropertyPutArgument>::get()) { // DISPATCH_PROPERTYPUT FuncDesc aDescGet(pInfo); diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx index e650b2ed7c36..77006bf6432c 100644 --- a/extensions/source/ole/servprov.cxx +++ b/extensions/source/ole/servprov.cxx @@ -159,7 +159,7 @@ STDMETHODIMP ProviderOleWrapper_Impl::CreateInstance(IUnknown FAR* punkOuter, OLE); - if (oleAny.getValueTypeClass() == getCppuType( (sal_uInt32 *)0).getTypeClass()) + if (oleAny.getValueTypeClass() == cppu::UnoType<sal_uInt32>::get().getTypeClass()) { VARIANT* pVariant = *(VARIANT**)oleAny.getValue(); @@ -374,14 +374,14 @@ Any SAL_CALL OleConverter_Impl2::createBridge(const Any& modelDepObject, CoTaskMemFree(pVariant); throw IllegalArgumentException(); } - ret.setValue((void*) &pVariant, getCppuType((sal_uInt32*)0)); + ret.setValue((void*) &pVariant, cppu::UnoType<sal_uInt32>::get()); } else throw IllegalArgumentException(); } else if (sourceModelType == OLE) { - if (modelDepObject.getValueType() != getCppuType((sal_uInt32*)0)) + if (modelDepObject.getValueType() != cppu::UnoType<sal_uInt32>::get()) { throw IllegalArgumentException(); } @@ -397,7 +397,7 @@ Any SAL_CALL OleConverter_Impl2::createBridge(const Any& modelDepObject, } else { - ret.setValue((void*) &pVariant, getCppuType((sal_uInt32*)0)); + ret.setValue((void*) &pVariant, cppu::UnoType<sal_uInt32>::get()); } } else if (destModelType == UNO) diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx index 4d3059dbb220..bdbe761c15b6 100644 --- a/extensions/source/ole/unoconversionutilities.hxx +++ b/extensions/source/ole/unoconversionutilities.hxx @@ -423,13 +423,13 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny, if (var.decVal.sign == 0) { // positive value - variantToAny( & var, rAny, getCppuType( (sal_uInt64*) 0), + variantToAny( & var, rAny, cppu::UnoType<sal_uInt64>::get(), bReduceValueRange); } else { //negative value - variantToAny( & var, rAny, getCppuType( (sal_Int64*) 0), + variantToAny( & var, rAny, cppu::UnoType<sal_Int64>::get(), bReduceValueRange); } } @@ -719,7 +719,7 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny) bIllegal = true; } } - else if(rAny.getValueType() == getCppuType((Decimal*)0)) + else if(rAny.getValueType() == cppu::UnoType<Decimal>::get()) { Decimal d; if (rAny >>= d) @@ -736,7 +736,7 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny) bIllegal = true; } } - else if (rAny.getValueType() == getCppuType((Currency*)0)) + else if (rAny.getValueType() == cppu::UnoType<Currency>::get()) { Currency c; if (rAny >>= c) @@ -749,7 +749,7 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny) bIllegal = true; } } - else if(rAny.getValueType() == getCppuType((SCode*)0)) + else if(rAny.getValueType() == cppu::UnoType<SCode>::get()) { SCode s; if (rAny >>= s) @@ -1491,16 +1491,16 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny rAny.setValue( & var.iVal, getCppuType( (sal_Int16*)0)); break; case VT_I4: - rAny.setValue( & var.lVal, getCppuType( (sal_Int32*)0)); + rAny.setValue( & var.lVal, cppu::UnoType<sal_Int32>::get()); // necessary for use in JavaScript ( see "reduceRange") if( bReduceValueRange) reduceRange(rAny); break; case VT_R4: - rAny.setValue( & var.fltVal, getCppuType( (float*)0)); + rAny.setValue( & var.fltVal, cppu::UnoType<float>::get()); break; case VT_R8: - rAny.setValue(& var.dblVal, getCppuType( (double*)0)); + rAny.setValue(& var.dblVal, cppu::UnoType<double>::get()); break; case VT_CY: { @@ -1566,22 +1566,22 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny break; } case VT_I1: - rAny.setValue( & var.cVal, getCppuType((sal_Int8*)0)); + rAny.setValue( & var.cVal, cppu::UnoType<sal_Int8>::get()); break; case VT_UI1: // there is no unsigned char in UNO - rAny.setValue( & var.bVal, getCppuType( (sal_Int8*)0)); + rAny.setValue( & var.bVal, cppu::UnoType<sal_Int8>::get()); break; case VT_UI2: rAny.setValue( & var.uiVal, getCppuType( (sal_uInt16*)0)); break; case VT_UI4: - rAny.setValue( & var.ulVal, getCppuType( (sal_uInt32*)0)); + rAny.setValue( & var.ulVal, cppu::UnoType<sal_uInt32>::get()); break; case VT_INT: - rAny.setValue( & var.intVal, getCppuType( (sal_Int32*)0)); + rAny.setValue( & var.intVal, cppu::UnoType<sal_Int32>::get()); break; case VT_UINT: - rAny.setValue( & var.uintVal, getCppuType( (sal_uInt32*)0)); + rAny.setValue( & var.uintVal, cppu::UnoType<sal_uInt32>::get()); break; case VT_VOID: rAny.setValue( NULL, Type()); @@ -2398,7 +2398,7 @@ inline void reduceRange( Any& any) if( value <= 0x7f && value >= -0x80) {// -128 bis 127 sal_Int8 charVal= static_cast<sal_Int8>( value); - any.setValue( &charVal, getCppuType( (sal_Int8*)0)); + any.setValue( &charVal, cppu::UnoType<sal_Int8>::get()); } else if( value <= 0x7fff && value >= -0x8000) {// -32768 bis 32767 diff --git a/extensions/test/ole/OleClient/funcs.cxx b/extensions/test/ole/OleClient/funcs.cxx index c4846440bac3..68c3700c81f0 100644 --- a/extensions/test/ole/OleClient/funcs.cxx +++ b/extensions/test/ole/OleClient/funcs.cxx @@ -146,7 +146,7 @@ bool checkOutArgs(const Sequence<Any> & outArgs, NamedArgument naOut; value >>= naVal; out >>= naOut; - if (values[i].getValueType() == getCppuType((NamedArgument *) 0)) + if (values[i].getValueType() == cppu::UnoType<NamedArgument>::get()) { NamedArgument inNamed; values[i] >>= inNamed; diff --git a/extensions/test/ole/OleConverterVar1/convTest.cxx b/extensions/test/ole/OleConverterVar1/convTest.cxx index 726a17c78c8d..1b949cee8e08 100644 --- a/extensions/test/ole/OleConverterVar1/convTest.cxx +++ b/extensions/test/ole/OleConverterVar1/convTest.cxx @@ -131,7 +131,7 @@ HRESULT doTest() rtl_getGlobalProcessId( arId); Any target= xSuppl->createBridge( any, Sequence<sal_Int8>( (sal_Int8*)arId, 16), UNO, OLE); CComDispatchDriver oletest; - if (target.getValueTypeClass() == getCppuType((sal_uInt32*) 0).getTypeClass()) + if (target.getValueTypeClass() == cppu::UnoType<sal_uInt32>::get().getTypeClass()) { VARIANT* pVariant = *(VARIANT**)target.getValue(); diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx index 43ff94099cec..8db2cc36cda1 100644 --- a/filter/source/graphicfilter/icgm/actimpr.cxx +++ b/filter/source/graphicfilter/icgm/actimpr.cxx @@ -481,7 +481,7 @@ void CGMImpressOutAct::DrawEllipse( FloatPoint& rCenter, FloatPoint& rSize, doub if ( ImplCreateShape( "com.sun.star.drawing.EllipseShape" ) ) { drawing::CircleKind eCircleKind = drawing::CircleKind_FULL; - uno::Any aAny( &eCircleKind, ::getCppuType((const drawing::CircleKind*)0) ); + uno::Any aAny( &eCircleKind, ::cppu::UnoType<drawing::CircleKind>::get() ); maXPropSet->setPropertyValue( "CircleKind", aAny ); long nXSize = (long)( rSize.X * 2.0 ); // strange behaviour with a awt::Size of 0 @@ -540,11 +540,11 @@ void CGMImpressOutAct::DrawEllipticalArc( FloatPoint& rCenter, FloatPoint& rSize if ( (long)fStartAngle == (long)fEndAngle ) { eCircleKind = drawing::CircleKind_FULL; - aAny.setValue( &eCircleKind, ::getCppuType((const drawing::CircleKind*)0) ); + aAny.setValue( &eCircleKind, ::cppu::UnoType<drawing::CircleKind>::get() ); } else { - aAny.setValue( &eCircleKind, ::getCppuType((const drawing::CircleKind*)0) ); + aAny.setValue( &eCircleKind, ::cppu::UnoType<drawing::CircleKind>::get() ); maXPropSet->setPropertyValue( "CircleKind", aAny ); aAny <<= (sal_Int32)( (long)( fStartAngle * 100 ) ); maXPropSet->setPropertyValue( "CircleStartAngle", aAny ); diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx index 5706df0b8562..fbb419d415a5 100644 --- a/filter/source/msfilter/msocximex.cxx +++ b/filter/source/msfilter/msocximex.cxx @@ -126,7 +126,7 @@ const uno::Reference< container::XIndexContainer >& uno::Reference< beans::XPropertySet > xFormPropSet( xCreate, uno::UNO_QUERY ); - uno::Any aTmp(&sName,getCppuType((OUString *)0)); + uno::Any aTmp(&sName,cppu::UnoType<OUString>::get()); xFormPropSet->setPropertyValue( "Name", aTmp ); uno::Reference< form::XForm > xForm( xCreate, uno::UNO_QUERY ); diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index ced9df142994..7703264eab13 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -96,7 +96,7 @@ bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star::be // create an XProperty set to configure the exporter for pretty printing PropertyMapEntry aImportInfoMap[] = { - { OUString("BaseURI"), 0, ::getCppuType((const OUString*)0), PropertyAttribute::MAYBEVOID, 0}, + { OUString("BaseURI"), 0, ::cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -256,7 +256,7 @@ bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star::be { { OUString("UsePrettyPrinting"), 0, ::getCppuType((const sal_Bool*)0), PropertyAttribute::MAYBEVOID, 0}, { OUString("ExportTextNumberElement"), 0, ::getCppuType((const sal_Bool*)0), PropertyAttribute::MAYBEVOID, 0}, - { OUString("BaseURI"), 0, ::getCppuType((const OUString*)0), PropertyAttribute::MAYBEVOID, 0}, + { OUString("BaseURI"), 0, ::cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm index 6c2aa35f427d..7c4858aa27fa 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.mm +++ b/fpicker/source/aqua/SalAquaFilePicker.mm @@ -531,8 +531,8 @@ throw( uno::Exception, uno::RuntimeException ) aAny = aArguments[0]; - if( ( aAny.getValueType() != ::getCppuType( ( sal_Int16* )0 ) ) && - (aAny.getValueType() != ::getCppuType( ( sal_Int8* )0 ) ) ) + if( ( aAny.getValueType() != ::cppu::UnoType<sal_Int16>::get() ) && + (aAny.getValueType() != ::cppu::UnoType<sal_Int8>::get() ) ) throw lang::IllegalArgumentException(rtl::OUString( "invalid argument type" ), static_cast<XFilePicker*>( static_cast<XFilePicker3*>(this) ), 1 ); diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx index 2d91c3396c11..a8bb989091cf 100644 --- a/fpicker/source/win32/filepicker/FilePicker.cxx +++ b/fpicker/source/win32/filepicker/FilePicker.cxx @@ -606,8 +606,8 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments) aAny = aArguments[0]; - if ( (aAny.getValueType() != ::getCppuType((sal_Int16*)0)) && - (aAny.getValueType() != ::getCppuType((sal_Int8*)0)) ) + if ( (aAny.getValueType() != ::cppu::UnoType<sal_Int16>::get()) && + (aAny.getValueType() != ::cppu::UnoType<sal_Int8>::get()) ) throw lang::IllegalArgumentException( OUString("invalid argument type"), static_cast<XFilePicker2*>(this), 1); diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx index bc42e736328d..6011bcf18694 100644 --- a/fpicker/source/win32/misc/WinImplHelper.cxx +++ b/fpicker/source/win32/misc/WinImplHelper.cxx @@ -136,7 +136,7 @@ void SAL_CALL ListboxAddItem( HWND hwnd, const Any& aItem, const Reference< XInt OSL_ASSERT( IsWindow( hwnd ) ); if ( !aItem.hasValue( ) || - aItem.getValueType( ) != getCppuType((OUString*)0) ) + aItem.getValueType( ) != cppu::UnoType<OUString>::get() ) throw IllegalArgumentException( OUString( "invalid value type or any has no value" ), rXInterface, @@ -184,9 +184,9 @@ void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Referenc OSL_ASSERT( IsWindow( hwnd ) ); if ( !aPosition.hasValue( ) || - ( (aPosition.getValueType( ) != getCppuType((sal_Int32*)0)) && - (aPosition.getValueType( ) != getCppuType((sal_Int16*)0)) && - (aPosition.getValueType( ) != getCppuType((sal_Int8*)0)) ) ) + ( (aPosition.getValueType( ) != cppu::UnoType<sal_Int32>::get()) && + (aPosition.getValueType( ) != cppu::UnoType<sal_Int16>::get()) && + (aPosition.getValueType( ) != cppu::UnoType<sal_Int8>::get()) ) ) throw IllegalArgumentException( OUString( "invalid value type or any has no value" ), rXInterface, @@ -236,9 +236,9 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref OSL_ASSERT( IsWindow( hwnd ) ); if ( !aPosition.hasValue( ) || - ( (aPosition.getValueType( ) != getCppuType((sal_Int32*)0)) && - (aPosition.getValueType( ) != getCppuType((sal_Int16*)0)) && - (aPosition.getValueType( ) != getCppuType((sal_Int8*)0)) ) ) + ( (aPosition.getValueType( ) != cppu::UnoType<sal_Int32>::get()) && + (aPosition.getValueType( ) != cppu::UnoType<sal_Int16>::get()) && + (aPosition.getValueType( ) != cppu::UnoType<sal_Int8>::get()) ) ) throw IllegalArgumentException( OUString( "invalid value type or any has no value" ), rXInterface, diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index 90a2961d98f4..528eb5024429 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -74,58 +74,58 @@ class SvxItemPropertySet; #define SVX_UNOEDIT_OUTLINER_PROPERTIES \ SVX_UNOEDIT_NUMBERING_PROPERTIE, \ - {OUString(UNO_NAME_NUMBERING_LEVEL), WID_NUMLEVEL, ::getCppuType((const sal_Int16*)0), 0, 0 }, \ - {OUString("NumberingStartValue"), WID_NUMBERINGSTARTVALUE, ::getCppuType((const sal_Int16*)0), 0, 0 }, \ + {OUString(UNO_NAME_NUMBERING_LEVEL), WID_NUMLEVEL, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, \ + {OUString("NumberingStartValue"), WID_NUMBERINGSTARTVALUE, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, \ {OUString("ParaIsNumberingRestart"), WID_PARAISNUMBERINGRESTART, ::getBooleanCppuType(), 0, 0 } #define SVX_UNOEDIT_CHAR_PROPERTIES \ { OUString(UNO_NAME_EDIT_CHAR_HEIGHT), EE_CHAR_FONTHEIGHT, ::getCppuType((const float*)0), 0, MID_FONTHEIGHT|CONVERT_TWIPS }, \ - { OUString("CharScaleWidth"), EE_CHAR_FONTWIDTH, ::getCppuType((const sal_Int16*)0), 0, 0 }, \ - { OUString(UNO_NAME_EDIT_CHAR_FONTNAME), EE_CHAR_FONTINFO, ::getCppuType((const OUString*)0), 0, MID_FONT_FAMILY_NAME },\ - { OUString(UNO_NAME_EDIT_CHAR_FONTSTYLENAME),EE_CHAR_FONTINFO, ::getCppuType((const OUString*)0), 0, MID_FONT_STYLE_NAME }, \ - { OUString(UNO_NAME_EDIT_CHAR_FONTFAMILY), EE_CHAR_FONTINFO, ::getCppuType((const sal_Int16*)0), 0, MID_FONT_FAMILY }, \ - { OUString(UNO_NAME_EDIT_CHAR_FONTCHARSET), EE_CHAR_FONTINFO, ::getCppuType((const sal_Int16*)0), 0, MID_FONT_CHAR_SET }, \ - { OUString(UNO_NAME_EDIT_CHAR_FONTPITCH), EE_CHAR_FONTINFO, ::getCppuType((const sal_Int16*)0), 0, MID_FONT_PITCH }, \ - { OUString(UNO_NAME_EDIT_CHAR_POSTURE), EE_CHAR_ITALIC, ::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, MID_POSTURE }, \ + { OUString("CharScaleWidth"), EE_CHAR_FONTWIDTH, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, \ + { OUString(UNO_NAME_EDIT_CHAR_FONTNAME), EE_CHAR_FONTINFO, ::cppu::UnoType<OUString>::get(), 0, MID_FONT_FAMILY_NAME },\ + { OUString(UNO_NAME_EDIT_CHAR_FONTSTYLENAME),EE_CHAR_FONTINFO, ::cppu::UnoType<OUString>::get(), 0, MID_FONT_STYLE_NAME }, \ + { OUString(UNO_NAME_EDIT_CHAR_FONTFAMILY), EE_CHAR_FONTINFO, ::cppu::UnoType<sal_Int16>::get(), 0, MID_FONT_FAMILY }, \ + { OUString(UNO_NAME_EDIT_CHAR_FONTCHARSET), EE_CHAR_FONTINFO, ::cppu::UnoType<sal_Int16>::get(), 0, MID_FONT_CHAR_SET }, \ + { OUString(UNO_NAME_EDIT_CHAR_FONTPITCH), EE_CHAR_FONTINFO, ::cppu::UnoType<sal_Int16>::get(), 0, MID_FONT_PITCH }, \ + { OUString(UNO_NAME_EDIT_CHAR_POSTURE), EE_CHAR_ITALIC, ::cppu::UnoType<com::sun::star::awt::FontSlant>::get(),0, MID_POSTURE }, \ { OUString(UNO_NAME_EDIT_CHAR_WEIGHT), EE_CHAR_WEIGHT, ::getCppuType((const float*)0), 0, MID_WEIGHT }, \ - { OUString(UNO_NAME_EDIT_CHAR_LOCALE), EE_CHAR_LANGUAGE, ::getCppuType((const ::com::sun::star::lang::Locale*)0),0, MID_LANG_LOCALE }, \ - { OUString(UNO_NAME_EDIT_CHAR_COLOR), EE_CHAR_COLOR, ::getCppuType((const sal_Int32*)0), 0, 0 }, \ - { OUString(UNO_NAME_EDIT_CHAR_ESCAPEMENT), EE_CHAR_ESCAPEMENT, ::getCppuType((const sal_Int16*)0), 0, MID_ESC }, \ - { OUString(UNO_NAME_EDIT_CHAR_UNDERLINE), EE_CHAR_UNDERLINE, ::getCppuType((const sal_Int16*)0), 0, MID_TL_STYLE }, \ - { OUString("CharUnderlineColor"), EE_CHAR_UNDERLINE, ::getCppuType((const sal_Int32*)0), 0, MID_TL_COLOR }, \ + { OUString(UNO_NAME_EDIT_CHAR_LOCALE), EE_CHAR_LANGUAGE, ::cppu::UnoType<com::sun::star::lang::Locale>::get(),0, MID_LANG_LOCALE }, \ + { OUString(UNO_NAME_EDIT_CHAR_COLOR), EE_CHAR_COLOR, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, \ + { OUString(UNO_NAME_EDIT_CHAR_ESCAPEMENT), EE_CHAR_ESCAPEMENT, ::cppu::UnoType<sal_Int16>::get(), 0, MID_ESC }, \ + { OUString(UNO_NAME_EDIT_CHAR_UNDERLINE), EE_CHAR_UNDERLINE, ::cppu::UnoType<sal_Int16>::get(), 0, MID_TL_STYLE }, \ + { OUString("CharUnderlineColor"), EE_CHAR_UNDERLINE, ::cppu::UnoType<sal_Int32>::get(), 0, MID_TL_COLOR }, \ { OUString("CharUnderlineHasColor"), EE_CHAR_UNDERLINE, ::getBooleanCppuType(), 0, MID_TL_HASCOLOR } , \ - { OUString(UNO_NAME_EDIT_CHAR_OVERLINE), EE_CHAR_OVERLINE, ::getCppuType((const sal_Int16*)0), 0, MID_TL_STYLE }, \ - { OUString("CharOverlineColor"), EE_CHAR_OVERLINE, ::getCppuType((const sal_Int32*)0), 0, MID_TL_COLOR }, \ + { OUString(UNO_NAME_EDIT_CHAR_OVERLINE), EE_CHAR_OVERLINE, ::cppu::UnoType<sal_Int16>::get(), 0, MID_TL_STYLE }, \ + { OUString("CharOverlineColor"), EE_CHAR_OVERLINE, ::cppu::UnoType<sal_Int32>::get(), 0, MID_TL_COLOR }, \ { OUString("CharOverlineHasColor"), EE_CHAR_OVERLINE, ::getBooleanCppuType(), 0, MID_TL_HASCOLOR } , \ { OUString(UNO_NAME_EDIT_CHAR_CROSSEDOUT), EE_CHAR_STRIKEOUT, ::getBooleanCppuType(), 0, MID_CROSSED_OUT }, \ - { OUString(UNO_NAME_EDIT_CHAR_STRIKEOUT), EE_CHAR_STRIKEOUT, ::getCppuType((const sal_Int16*)0), 0, MID_CROSS_OUT}, \ - { OUString(UNO_NAME_EDIT_CHAR_CASEMAP), EE_CHAR_CASEMAP, ::getCppuType((const sal_Int16*)0), 0, 0 }, \ + { OUString(UNO_NAME_EDIT_CHAR_STRIKEOUT), EE_CHAR_STRIKEOUT, ::cppu::UnoType<sal_Int16>::get(), 0, MID_CROSS_OUT}, \ + { OUString(UNO_NAME_EDIT_CHAR_CASEMAP), EE_CHAR_CASEMAP, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, \ { OUString(UNO_NAME_EDIT_CHAR_SHADOWED), EE_CHAR_SHADOW, ::getBooleanCppuType(), 0, 0 }, \ { OUString("CharContoured"), EE_CHAR_OUTLINE, ::getBooleanCppuType(), 0, 0 }, \ { OUString("CharEscapementHeight"), EE_CHAR_ESCAPEMENT, ::getCppuType((const sal_Int8*)0), 0, MID_ESC_HEIGHT },\ { OUString("CharAutoKerning"), EE_CHAR_PAIRKERNING,::getBooleanCppuType(), 0, 0 } , \ - { OUString("CharKerning"), EE_CHAR_KERNING, ::getCppuType((const sal_Int16*)0) , 0, 0 }, \ + { OUString("CharKerning"), EE_CHAR_KERNING, ::cppu::UnoType<sal_Int16>::get() , 0, 0 }, \ { OUString("CharWordMode"), EE_CHAR_WLM, ::getBooleanCppuType(), 0, 0 }, \ - { OUString("CharEmphasis"), EE_CHAR_EMPHASISMARK, ::getCppuType((const sal_Int16*)0), 0, MID_EMPHASIS},\ + { OUString("CharEmphasis"), EE_CHAR_EMPHASISMARK, ::cppu::UnoType<sal_Int16>::get(), 0, MID_EMPHASIS},\ { OUString(UNO_NAME_EDIT_CHAR_HEIGHT_ASIAN), EE_CHAR_FONTHEIGHT_CJK, ::getCppuType((const float*)0), 0, MID_FONTHEIGHT|CONVERT_TWIPS }, \ - { OUString(UNO_NAME_EDIT_CHAR_FONTNAME_ASIAN), EE_CHAR_FONTINFO_CJK, ::getCppuType((const OUString*)0), 0, MID_FONT_FAMILY_NAME },\ - { OUString(UNO_NAME_EDIT_CHAR_FONTSTYLENAME_ASIAN), EE_CHAR_FONTINFO_CJK, ::getCppuType((const OUString*)0), 0, MID_FONT_STYLE_NAME }, \ - { OUString(UNO_NAME_EDIT_CHAR_FONTFAMILY_ASIAN), EE_CHAR_FONTINFO_CJK, ::getCppuType((const sal_Int16*)0), 0, MID_FONT_FAMILY }, \ - { OUString(UNO_NAME_EDIT_CHAR_FONTCHARSET_ASIAN), EE_CHAR_FONTINFO_CJK, ::getCppuType((const sal_Int16*)0), 0, MID_FONT_CHAR_SET }, \ - { OUString(UNO_NAME_EDIT_CHAR_FONTPITCH_ASIAN), EE_CHAR_FONTINFO_CJK, ::getCppuType((const sal_Int16*)0), 0, MID_FONT_PITCH }, \ - { OUString(UNO_NAME_EDIT_CHAR_POSTURE_ASIAN), EE_CHAR_ITALIC_CJK, ::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, MID_POSTURE }, \ + { OUString(UNO_NAME_EDIT_CHAR_FONTNAME_ASIAN), EE_CHAR_FONTINFO_CJK, ::cppu::UnoType<OUString>::get(), 0, MID_FONT_FAMILY_NAME },\ + { OUString(UNO_NAME_EDIT_CHAR_FONTSTYLENAME_ASIAN), EE_CHAR_FONTINFO_CJK, ::cppu::UnoType<OUString>::get(), 0, MID_FONT_STYLE_NAME }, \ + { OUString(UNO_NAME_EDIT_CHAR_FONTFAMILY_ASIAN), EE_CHAR_FONTINFO_CJK, ::cppu::UnoType<sal_Int16>::get(), 0, MID_FONT_FAMILY }, \ + { OUString(UNO_NAME_EDIT_CHAR_FONTCHARSET_ASIAN), EE_CHAR_FONTINFO_CJK, ::cppu::UnoType<sal_Int16>::get(), 0, MID_FONT_CHAR_SET }, \ + { OUString(UNO_NAME_EDIT_CHAR_FONTPITCH_ASIAN), EE_CHAR_FONTINFO_CJK, ::cppu::UnoType<sal_Int16>::get(), 0, MID_FONT_PITCH }, \ + { OUString(UNO_NAME_EDIT_CHAR_POSTURE_ASIAN), EE_CHAR_ITALIC_CJK, ::cppu::UnoType<com::sun::star::awt::FontSlant>::get(),0, MID_POSTURE }, \ { OUString(UNO_NAME_EDIT_CHAR_WEIGHT_ASIAN), EE_CHAR_WEIGHT_CJK, ::getCppuType((const float*)0), 0, MID_WEIGHT }, \ - { OUString(UNO_NAME_EDIT_CHAR_LOCALE_ASIAN), EE_CHAR_LANGUAGE_CJK, ::getCppuType((const ::com::sun::star::lang::Locale*)0),0, MID_LANG_LOCALE }, \ + { OUString(UNO_NAME_EDIT_CHAR_LOCALE_ASIAN), EE_CHAR_LANGUAGE_CJK, ::cppu::UnoType<com::sun::star::lang::Locale>::get(),0, MID_LANG_LOCALE }, \ { OUString(UNO_NAME_EDIT_CHAR_HEIGHT_COMPLEX), EE_CHAR_FONTHEIGHT_CTL, ::getCppuType((const float*)0), 0, MID_FONTHEIGHT|CONVERT_TWIPS }, \ - { OUString(UNO_NAME_EDIT_CHAR_FONTNAME_COMPLEX), EE_CHAR_FONTINFO_CTL, ::getCppuType((const OUString*)0), 0, MID_FONT_FAMILY_NAME },\ - { OUString(UNO_NAME_EDIT_CHAR_FONTSTYLENAME_COMPLEX),EE_CHAR_FONTINFO_CTL, ::getCppuType((const OUString*)0), 0, MID_FONT_STYLE_NAME }, \ - { OUString(UNO_NAME_EDIT_CHAR_FONTFAMILY_COMPLEX), EE_CHAR_FONTINFO_CTL, ::getCppuType((const sal_Int16*)0), 0, MID_FONT_FAMILY }, \ - { OUString(UNO_NAME_EDIT_CHAR_FONTCHARSET_COMPLEX), EE_CHAR_FONTINFO_CTL, ::getCppuType((const sal_Int16*)0), 0, MID_FONT_CHAR_SET }, \ - { OUString(UNO_NAME_EDIT_CHAR_FONTPITCH_COMPLEX), EE_CHAR_FONTINFO_CTL, ::getCppuType((const sal_Int16*)0), 0, MID_FONT_PITCH }, \ - { OUString(UNO_NAME_EDIT_CHAR_POSTURE_COMPLEX), EE_CHAR_ITALIC_CTL, ::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, MID_POSTURE }, \ + { OUString(UNO_NAME_EDIT_CHAR_FONTNAME_COMPLEX), EE_CHAR_FONTINFO_CTL, ::cppu::UnoType<OUString>::get(), 0, MID_FONT_FAMILY_NAME },\ + { OUString(UNO_NAME_EDIT_CHAR_FONTSTYLENAME_COMPLEX),EE_CHAR_FONTINFO_CTL, ::cppu::UnoType<OUString>::get(), 0, MID_FONT_STYLE_NAME }, \ + { OUString(UNO_NAME_EDIT_CHAR_FONTFAMILY_COMPLEX), EE_CHAR_FONTINFO_CTL, ::cppu::UnoType<sal_Int16>::get(), 0, MID_FONT_FAMILY }, \ + { OUString(UNO_NAME_EDIT_CHAR_FONTCHARSET_COMPLEX), EE_CHAR_FONTINFO_CTL, ::cppu::UnoType<sal_Int16>::get(), 0, MID_FONT_CHAR_SET }, \ + { OUString(UNO_NAME_EDIT_CHAR_FONTPITCH_COMPLEX), EE_CHAR_FONTINFO_CTL, ::cppu::UnoType<sal_Int16>::get(), 0, MID_FONT_PITCH }, \ + { OUString(UNO_NAME_EDIT_CHAR_POSTURE_COMPLEX), EE_CHAR_ITALIC_CTL, ::cppu::UnoType<com::sun::star::awt::FontSlant>::get(),0, MID_POSTURE }, \ { OUString(UNO_NAME_EDIT_CHAR_WEIGHT_COMPLEX), EE_CHAR_WEIGHT_CTL, ::getCppuType((const float*)0), 0, MID_WEIGHT }, \ - { OUString(UNO_NAME_EDIT_CHAR_LOCALE_COMPLEX), EE_CHAR_LANGUAGE_CTL, ::getCppuType((const ::com::sun::star::lang::Locale*)0),0, MID_LANG_LOCALE }, \ - { OUString("CharRelief"), EE_CHAR_RELIEF, ::getCppuType((const sal_Int16*)0), 0, MID_RELIEF }, \ + { OUString(UNO_NAME_EDIT_CHAR_LOCALE_COMPLEX), EE_CHAR_LANGUAGE_CTL, ::cppu::UnoType<com::sun::star::lang::Locale>::get(),0, MID_LANG_LOCALE }, \ + { OUString("CharRelief"), EE_CHAR_RELIEF, ::cppu::UnoType<sal_Int16>::get(), 0, MID_RELIEF }, \ { OUString("CharInteropGrabBag"), EE_CHAR_GRABBAG, ::getCppuType((css::uno::Sequence<css::beans::PropertyValue >*)0), 0, 0} @@ -133,20 +133,20 @@ class SvxItemPropertySet; {OUString(UNO_NAME_EDIT_FONT_DESCRIPTOR), WID_FONTDESC, ::getCppuType((const ::com::sun::star::awt::FontDescriptor*)0), 0, MID_FONT_FAMILY_NAME } #define SVX_UNOEDIT_PARA_PROPERTIES \ - {OUString(UNO_NAME_EDIT_PARA_ADJUST), EE_PARA_JUST, ::getCppuType((const sal_Int16*)0), 0, MID_PARA_ADJUST }, \ - {OUString(UNO_NAME_EDIT_PARA_BMARGIN), EE_PARA_ULSPACE, ::getCppuType((const sal_Int32*)0), 0, MID_LO_MARGIN|SFX_METRIC_ITEM }, \ + {OUString(UNO_NAME_EDIT_PARA_ADJUST), EE_PARA_JUST, ::cppu::UnoType<sal_Int16>::get(), 0, MID_PARA_ADJUST }, \ + {OUString(UNO_NAME_EDIT_PARA_BMARGIN), EE_PARA_ULSPACE, ::cppu::UnoType<sal_Int32>::get(), 0, MID_LO_MARGIN|SFX_METRIC_ITEM }, \ {OUString(UNO_NAME_EDIT_PARA_IS_HYPHEN), EE_PARA_HYPHENATE, ::getBooleanCppuType(), 0, 0 }, \ - {OUString(UNO_NAME_EDIT_PARA_LASTLINEADJ), EE_PARA_JUST, ::getCppuType((const sal_Int16*)0), 0, MID_LAST_LINE_ADJUST }, \ - {OUString(UNO_NAME_EDIT_PARA_LMARGIN), EE_PARA_LRSPACE, ::getCppuType((const sal_Int32*)0), 0, MID_TXT_LMARGIN|SFX_METRIC_ITEM }, \ + {OUString(UNO_NAME_EDIT_PARA_LASTLINEADJ), EE_PARA_JUST, ::cppu::UnoType<sal_Int16>::get(), 0, MID_LAST_LINE_ADJUST }, \ + {OUString(UNO_NAME_EDIT_PARA_LMARGIN), EE_PARA_LRSPACE, ::cppu::UnoType<sal_Int32>::get(), 0, MID_TXT_LMARGIN|SFX_METRIC_ITEM }, \ {OUString(UNO_NAME_EDIT_PARA_LINESPACING), EE_PARA_SBL, ::getCppuType((const ::com::sun::star::style::LineSpacing*)0), 0, CONVERT_TWIPS}, \ - {OUString(UNO_NAME_EDIT_PARA_RMARGIN), EE_PARA_LRSPACE, ::getCppuType((const sal_Int32*)0), 0, MID_R_MARGIN|SFX_METRIC_ITEM }, \ + {OUString(UNO_NAME_EDIT_PARA_RMARGIN), EE_PARA_LRSPACE, ::cppu::UnoType<sal_Int32>::get(), 0, MID_R_MARGIN|SFX_METRIC_ITEM }, \ {OUString(UNO_NAME_EDIT_PARA_TAPSTOPS), EE_PARA_TABS, ::getCppuType((const ::com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop >*)0), 0, 0 }, \ - {OUString(UNO_NAME_EDIT_PARA_TMARGIN), EE_PARA_ULSPACE, ::getCppuType((const sal_Int32*)0), 0, MID_UP_MARGIN|SFX_METRIC_ITEM },\ - {OUString(UNO_NAME_EDIT_PARA_FIRST_LINE_INDENT), EE_PARA_LRSPACE, ::getCppuType((const sal_Int32*)0), 0, MID_FIRST_LINE_INDENT|SFX_METRIC_ITEM}, \ + {OUString(UNO_NAME_EDIT_PARA_TMARGIN), EE_PARA_ULSPACE, ::cppu::UnoType<sal_Int32>::get(), 0, MID_UP_MARGIN|SFX_METRIC_ITEM },\ + {OUString(UNO_NAME_EDIT_PARA_FIRST_LINE_INDENT), EE_PARA_LRSPACE, ::cppu::UnoType<sal_Int32>::get(), 0, MID_FIRST_LINE_INDENT|SFX_METRIC_ITEM}, \ {OUString(UNO_NAME_EDIT_PARA_IS_HANGING_PUNCTUATION),EE_PARA_HANGINGPUNCTUATION, ::getBooleanCppuType(), 0 ,0 }, \ {OUString(UNO_NAME_EDIT_PARA_IS_CHARACTER_DISTANCE), EE_PARA_ASIANCJKSPACING, ::getBooleanCppuType(), 0 ,0 }, \ {OUString(UNO_NAME_EDIT_PARA_IS_FORBIDDEN_RULES), EE_PARA_FORBIDDENRULES, ::getBooleanCppuType(), 0 ,0 },\ - {OUString("WritingMode"), EE_PARA_WRITINGDIR, ::getCppuType((const sal_Int16*)0), 0, 0 } + {OUString("WritingMode"), EE_PARA_WRITINGDIR, ::cppu::UnoType<sal_Int16>::get(), 0, 0 } class SvxEditSource; class SvxTextForwarder; diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx index 40b4f64c6b80..3b263fde02a7 100644 --- a/include/svx/unoshprp.hxx +++ b/include/svx/unoshprp.hxx @@ -184,92 +184,92 @@ // #FontWork# #define FONTWORK_PROPERTIES \ - { OUString("FontWorkStyle"), XATTR_FORMTXTSTYLE, /*ENUM*/::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString("FontWorkAdjust"), XATTR_FORMTXTADJUST, /*ENUM*/::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString("FontWorkDistance"), XATTR_FORMTXTDISTANCE, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString("FontWorkStart"), XATTR_FORMTXTSTART, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ + { OUString("FontWorkStyle"), XATTR_FORMTXTSTYLE, /*ENUM*/::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString("FontWorkAdjust"), XATTR_FORMTXTADJUST, /*ENUM*/::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString("FontWorkDistance"), XATTR_FORMTXTDISTANCE, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ + { OUString("FontWorkStart"), XATTR_FORMTXTSTART, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ { OUString("FontWorkMirror"), XATTR_FORMTXTMIRROR, ::getBooleanCppuType(), 0, 0}, \ { OUString("FontWorkOutline"), XATTR_FORMTXTOUTLINE, ::getBooleanCppuType(), 0, 0}, \ - { OUString("FontWorkShadow"), XATTR_FORMTXTSHADOW, /*ENUM*/::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString("FontWorkShadowColor"), XATTR_FORMTXTSHDWCOLOR, ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString("FontWorkShadowOffsetX"), XATTR_FORMTXTSHDWXVAL, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString("FontWorkShadowOffsetY"), XATTR_FORMTXTSHDWYVAL, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ + { OUString("FontWorkShadow"), XATTR_FORMTXTSHADOW, /*ENUM*/::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString("FontWorkShadowColor"), XATTR_FORMTXTSHDWCOLOR, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString("FontWorkShadowOffsetX"), XATTR_FORMTXTSHDWXVAL, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ + { OUString("FontWorkShadowOffsetY"), XATTR_FORMTXTSHDWYVAL, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ { OUString("FontWorkHideForm"), XATTR_FORMTXTHIDEFORM, ::getBooleanCppuType(), 0, 0}, \ - { OUString("FontWorkShadowTransparence"),XATTR_FORMTXTSHDWTRANSP, ::getCppuType((const sal_Int16*)0), 0, 0}, + { OUString("FontWorkShadowTransparence"),XATTR_FORMTXTSHDWTRANSP, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, #define SHADOW_PROPERTIES \ { OUString(UNO_NAME_SHADOW), SDRATTR_SHADOW, ::getBooleanCppuType(), 0, 0}, \ - { OUString(UNO_NAME_SHADOWCOLOR), SDRATTR_SHADOWCOLOR, ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString(UNO_NAME_SHADOWTRANSPARENCE),SDRATTR_SHADOWTRANSPARENCE, ::getCppuType((const sal_Int16*)0), 0, 0}, \ - { OUString(UNO_NAME_SHADOWXDIST), SDRATTR_SHADOWXDIST, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_SHADOWYDIST), SDRATTR_SHADOWYDIST, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, + { OUString(UNO_NAME_SHADOWCOLOR), SDRATTR_SHADOWCOLOR, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_SHADOWTRANSPARENCE),SDRATTR_SHADOWTRANSPARENCE, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ + { OUString(UNO_NAME_SHADOWXDIST), SDRATTR_SHADOWXDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_SHADOWYDIST), SDRATTR_SHADOWYDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, #define LINE_PROPERTIES_DEFAULTS\ - { OUString(UNO_NAME_LINECAP), XATTR_LINECAP, ::getCppuType((const ::com::sun::star::drawing::LineCap*)0), 0, 0}, \ - { OUString(UNO_NAME_LINECOLOR), XATTR_LINECOLOR, ::getCppuType((const sal_Int32*)0) , 0, 0}, \ + { OUString(UNO_NAME_LINECAP), XATTR_LINECAP, ::cppu::UnoType<com::sun::star::drawing::LineCap>::get(), 0, 0}, \ + { OUString(UNO_NAME_LINECOLOR), XATTR_LINECOLOR, ::cppu::UnoType<sal_Int32>::get() , 0, 0}, \ { OUString(UNO_NAME_LINEENDCENTER), XATTR_LINEENDCENTER, ::getBooleanCppuType() , 0, 0}, \ - { OUString(UNO_NAME_LINEENDWIDTH), XATTR_LINEENDWIDTH, ::getCppuType((const sal_Int32*)0) , 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_LINEJOINT), XATTR_LINEJOINT, ::getCppuType((const ::com::sun::star::drawing::LineJoint*)0), 0, 0}, \ + { OUString(UNO_NAME_LINEENDWIDTH), XATTR_LINEENDWIDTH, ::cppu::UnoType<sal_Int32>::get() , 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_LINEJOINT), XATTR_LINEJOINT, ::cppu::UnoType<com::sun::star::drawing::LineJoint>::get(), 0, 0}, \ { OUString(UNO_NAME_LINESTARTCENTER), XATTR_LINESTARTCENTER, ::getBooleanCppuType() , 0, 0}, \ - { OUString(UNO_NAME_LINESTARTWIDTH), XATTR_LINESTARTWIDTH, ::getCppuType((const sal_Int32*)0) , 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_LINESTARTWIDTH), XATTR_LINESTARTWIDTH, ::cppu::UnoType<sal_Int32>::get() , 0, SFX_METRIC_ITEM}, \ { OUString(UNO_NAME_LINESTYLE), XATTR_LINESTYLE, ::getCppuType((const ::com::sun::star::drawing::LineStyle*)0) , 0, 0}, \ - { OUString(UNO_NAME_LINETRANSPARENCE), XATTR_LINETRANSPARENCE, ::getCppuType((const sal_Int16*)0) , 0, 0}, \ - { OUString(UNO_NAME_LINEWIDTH), XATTR_LINEWIDTH, ::getCppuType((const sal_Int32*)0) , 0, SFX_METRIC_ITEM}, + { OUString(UNO_NAME_LINETRANSPARENCE), XATTR_LINETRANSPARENCE, ::cppu::UnoType<sal_Int16>::get() , 0, 0}, \ + { OUString(UNO_NAME_LINEWIDTH), XATTR_LINEWIDTH, ::cppu::UnoType<sal_Int32>::get() , 0, SFX_METRIC_ITEM}, #define LINE_PROPERTIES \ - { OUString(UNO_NAME_LINEDASH), XATTR_LINEDASH, ::getCppuType((const ::com::sun::star::drawing::LineDash*)0) , 0, MID_LINEDASH}, \ - { OUString("LineDashName"), XATTR_LINEDASH, ::getCppuType((const OUString*)0) , 0, MID_NAME}, \ + { OUString(UNO_NAME_LINEDASH), XATTR_LINEDASH, ::cppu::UnoType<com::sun::star::drawing::LineDash>::get() , 0, MID_LINEDASH}, \ + { OUString("LineDashName"), XATTR_LINEDASH, ::cppu::UnoType<OUString>::get() , 0, MID_NAME}, \ LINE_PROPERTIES_DEFAULTS #define LINE_PROPERTIES_START_END \ - { OUString(UNO_NAME_LINEEND), XATTR_LINEEND, ::getCppuType((const ::com::sun::star::drawing::PolyPolygonBezierCoords*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \ - { OUString("LineEndName"), XATTR_LINEEND, ::getCppuType((const OUString*)0), 0, MID_NAME }, \ - { OUString(UNO_NAME_LINESTART), XATTR_LINESTART, ::getCppuType((const ::com::sun::star::drawing::PolyPolygonBezierCoords*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \ - { OUString("LineStartName"), XATTR_LINESTART, ::getCppuType((const OUString*)0), 0, MID_NAME }, + { OUString(UNO_NAME_LINEEND), XATTR_LINEEND, ::cppu::UnoType<com::sun::star::drawing::PolyPolygonBezierCoords>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \ + { OUString("LineEndName"), XATTR_LINEEND, ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \ + { OUString(UNO_NAME_LINESTART), XATTR_LINESTART, ::cppu::UnoType<com::sun::star::drawing::PolyPolygonBezierCoords>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \ + { OUString("LineStartName"), XATTR_LINESTART, ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, #define FILL_PROPERTIES_BMP \ { OUString(UNO_NAME_FILLBMP_LOGICAL_SIZE), XATTR_FILLBMP_SIZELOG, ::getBooleanCppuType() , 0, 0}, \ - { OUString(UNO_NAME_FILLBMP_OFFSET_X), XATTR_FILLBMP_TILEOFFSETX, ::getCppuType((const sal_Int32*)0) , 0, 0}, \ - { OUString(UNO_NAME_FILLBMP_OFFSET_Y), XATTR_FILLBMP_TILEOFFSETY, ::getCppuType((const sal_Int32*)0) , 0, 0}, \ - { OUString(UNO_NAME_FILLBMP_POSITION_OFFSET_X), XATTR_FILLBMP_POSOFFSETX, ::getCppuType((const sal_Int32*)0) , 0, 0}, \ - { OUString(UNO_NAME_FILLBMP_POSITION_OFFSET_Y), XATTR_FILLBMP_POSOFFSETY, ::getCppuType((const sal_Int32*)0) , 0, 0}, \ - { OUString(UNO_NAME_FILLBMP_RECTANGLE_POINT), XATTR_FILLBMP_POS, ::getCppuType((const ::com::sun::star::drawing::RectanglePoint*)0) , 0, 0}, \ - { OUString(UNO_NAME_FILLBMP_SIZE_X), XATTR_FILLBMP_SIZEX, ::getCppuType((const sal_Int32*)0) , 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_FILLBMP_SIZE_Y), XATTR_FILLBMP_SIZEY, ::getCppuType((const sal_Int32*)0) , 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_FILLBMP_OFFSET_X), XATTR_FILLBMP_TILEOFFSETX, ::cppu::UnoType<sal_Int32>::get() , 0, 0}, \ + { OUString(UNO_NAME_FILLBMP_OFFSET_Y), XATTR_FILLBMP_TILEOFFSETY, ::cppu::UnoType<sal_Int32>::get() , 0, 0}, \ + { OUString(UNO_NAME_FILLBMP_POSITION_OFFSET_X), XATTR_FILLBMP_POSOFFSETX, ::cppu::UnoType<sal_Int32>::get() , 0, 0}, \ + { OUString(UNO_NAME_FILLBMP_POSITION_OFFSET_Y), XATTR_FILLBMP_POSOFFSETY, ::cppu::UnoType<sal_Int32>::get() , 0, 0}, \ + { OUString(UNO_NAME_FILLBMP_RECTANGLE_POINT), XATTR_FILLBMP_POS, ::cppu::UnoType<com::sun::star::drawing::RectanglePoint>::get() , 0, 0}, \ + { OUString(UNO_NAME_FILLBMP_SIZE_X), XATTR_FILLBMP_SIZEX, ::cppu::UnoType<sal_Int32>::get() , 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_FILLBMP_SIZE_Y), XATTR_FILLBMP_SIZEY, ::cppu::UnoType<sal_Int32>::get() , 0, SFX_METRIC_ITEM}, \ { OUString(UNO_NAME_FILLBMP_STRETCH), XATTR_FILLBMP_STRETCH, ::getBooleanCppuType() , 0, 0}, \ { OUString(UNO_NAME_FILLBMP_TILE), XATTR_FILLBMP_TILE, ::getBooleanCppuType() , 0, 0},\ - { OUString(UNO_NAME_FILLBMP_MODE), OWN_ATTR_FILLBMP_MODE, ::getCppuType((const ::com::sun::star::drawing::BitmapMode*)0), 0, 0}, + { OUString(UNO_NAME_FILLBMP_MODE), OWN_ATTR_FILLBMP_MODE, ::cppu::UnoType<com::sun::star::drawing::BitmapMode>::get(), 0, 0}, #define FILL_PROPERTIES_DEFAULTS \ - { OUString(UNO_NAME_FILLCOLOR), XATTR_FILLCOLOR, ::getCppuType((const sal_Int32*)0), 0, 0}, \ + { OUString(UNO_NAME_FILLCOLOR), XATTR_FILLCOLOR, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ #define FILL_PROPERTIES \ FILL_PROPERTIES_BMP \ FILL_PROPERTIES_DEFAULTS \ { OUString(UNO_NAME_FILLBACKGROUND), XATTR_FILLBACKGROUND , ::getBooleanCppuType(), 0, 0}, \ { OUString(UNO_NAME_FILLBITMAP), XATTR_FILLBITMAP , ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0) , 0, MID_BITMAP}, \ - { OUString(UNO_NAME_FILLBITMAPNAME), XATTR_FILLBITMAP , ::getCppuType((const OUString*)0), 0, MID_NAME }, \ - { OUString(UNO_NAME_FILLBITMAPURL), XATTR_FILLBITMAP , ::getCppuType((const OUString*)0), 0, MID_GRAFURL }, \ - { OUString(UNO_NAME_FILLGRADIENTSTEPCOUNT), XATTR_GRADIENTSTEPCOUNT , ::getCppuType((const sal_Int16*)0), 0, 0}, \ - { OUString(UNO_NAME_FILLGRADIENT), XATTR_FILLGRADIENT , ::getCppuType((const ::com::sun::star::awt::Gradient*)0), 0, MID_FILLGRADIENT}, \ - { OUString(UNO_NAME_FILLGRADIENTNAME), XATTR_FILLGRADIENT , ::getCppuType((const OUString*)0), 0, MID_NAME }, \ - { OUString(UNO_NAME_FILLHATCH), XATTR_FILLHATCH , ::getCppuType((const ::com::sun::star::drawing::Hatch*)0), 0, MID_FILLHATCH}, \ - { OUString(UNO_NAME_FILLHATCHNAME), XATTR_FILLHATCH , ::getCppuType((const OUString*)0), 0, MID_NAME }, \ - { OUString(UNO_NAME_FILLSTYLE), XATTR_FILLSTYLE , ::getCppuType((const ::com::sun::star::drawing::FillStyle*)0) , 0, 0}, \ - { OUString(UNO_NAME_FILL_TRANSPARENCE), XATTR_FILLTRANSPARENCE, ::getCppuType((const sal_Int16*)0) , 0, 0}, \ - { OUString(UNO_NAME_FILLTRANSPARENCEGRADIENT), XATTR_FILLFLOATTRANSPARENCE, ::getCppuType((const ::com::sun::star::awt::Gradient*)0), 0, MID_FILLGRADIENT}, \ - { OUString(UNO_NAME_FILLTRANSPARENCEGRADIENTNAME), XATTR_FILLFLOATTRANSPARENCE, ::getCppuType((const OUString*)0), 0, MID_NAME }, \ - { OUString(UNO_NAME_FILLCOLOR_2), XATTR_SECONDARYFILLCOLOR, ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString(UNO_NAME_GRAPHIC_GRAPHICCROP), SDRATTR_GRAFCROP , ::getCppuType((const ::com::sun::star::text::GraphicCrop*)0), 0, 0 }, + { OUString(UNO_NAME_FILLBITMAPNAME), XATTR_FILLBITMAP , ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \ + { OUString(UNO_NAME_FILLBITMAPURL), XATTR_FILLBITMAP , ::cppu::UnoType<OUString>::get(), 0, MID_GRAFURL }, \ + { OUString(UNO_NAME_FILLGRADIENTSTEPCOUNT), XATTR_GRADIENTSTEPCOUNT , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ + { OUString(UNO_NAME_FILLGRADIENT), XATTR_FILLGRADIENT , ::cppu::UnoType<com::sun::star::awt::Gradient>::get(), 0, MID_FILLGRADIENT}, \ + { OUString(UNO_NAME_FILLGRADIENTNAME), XATTR_FILLGRADIENT , ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \ + { OUString(UNO_NAME_FILLHATCH), XATTR_FILLHATCH , ::cppu::UnoType<com::sun::star::drawing::Hatch>::get(), 0, MID_FILLHATCH}, \ + { OUString(UNO_NAME_FILLHATCHNAME), XATTR_FILLHATCH , ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \ + { OUString(UNO_NAME_FILLSTYLE), XATTR_FILLSTYLE , ::cppu::UnoType<com::sun::star::drawing::FillStyle>::get() , 0, 0}, \ + { OUString(UNO_NAME_FILL_TRANSPARENCE), XATTR_FILLTRANSPARENCE, ::cppu::UnoType<sal_Int16>::get() , 0, 0}, \ + { OUString(UNO_NAME_FILLTRANSPARENCEGRADIENT), XATTR_FILLFLOATTRANSPARENCE, ::cppu::UnoType<com::sun::star::awt::Gradient>::get(), 0, MID_FILLGRADIENT}, \ + { OUString(UNO_NAME_FILLTRANSPARENCEGRADIENTNAME), XATTR_FILLFLOATTRANSPARENCE, ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \ + { OUString(UNO_NAME_FILLCOLOR_2), XATTR_SECONDARYFILLCOLOR, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_GRAPHIC_GRAPHICCROP), SDRATTR_GRAFCROP , ::cppu::UnoType<com::sun::star::text::GraphicCrop>::get(), 0, 0 }, #define EDGERADIUS_PROPERTIES \ - { OUString(UNO_NAME_EDGERADIUS), SDRATTR_ECKENRADIUS , ::getCppuType((const sal_Int32*)0) , 0, SFX_METRIC_ITEM}, + { OUString(UNO_NAME_EDGERADIUS), SDRATTR_ECKENRADIUS , ::cppu::UnoType<sal_Int32>::get() , 0, SFX_METRIC_ITEM}, #define TEXT_PROPERTIES_DEFAULTS\ - { OUString(UNO_NAME_TEXT_WRITINGMODE), SDRATTR_TEXTDIRECTION, ::getCppuType((const ::com::sun::star::text::WritingMode*)0), 0, 0},\ - { OUString(UNO_NAME_TEXT_ANIAMOUNT), SDRATTR_TEXT_ANIAMOUNT, ::getCppuType((const sal_Int16*)0), 0, 0}, \ - { OUString(UNO_NAME_TEXT_ANICOUNT), SDRATTR_TEXT_ANICOUNT, ::getCppuType((const sal_Int16*)0), 0, 0}, \ - { OUString(UNO_NAME_TEXT_ANIDELAY), SDRATTR_TEXT_ANIDELAY, ::getCppuType((const sal_Int16*)0), 0, 0}, \ + { OUString(UNO_NAME_TEXT_WRITINGMODE), SDRATTR_TEXTDIRECTION, ::cppu::UnoType<com::sun::star::text::WritingMode>::get(), 0, 0},\ + { OUString(UNO_NAME_TEXT_ANIAMOUNT), SDRATTR_TEXT_ANIAMOUNT, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ + { OUString(UNO_NAME_TEXT_ANICOUNT), SDRATTR_TEXT_ANICOUNT, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ + { OUString(UNO_NAME_TEXT_ANIDELAY), SDRATTR_TEXT_ANIDELAY, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ { OUString(UNO_NAME_TEXT_ANIDIRECTION), SDRATTR_TEXT_ANIDIRECTION, ::getCppuType((const ::com::sun::star::drawing::TextAnimationDirection*)0), 0, 0}, \ { OUString(UNO_NAME_TEXT_ANIKIND), SDRATTR_TEXT_ANIKIND, ::getCppuType((const ::com::sun::star::drawing::TextAnimationKind*)0), 0, 0}, \ { OUString(UNO_NAME_TEXT_ANISTARTINSIDE), SDRATTR_TEXT_ANISTARTINSIDE, ::getBooleanCppuType(), 0, 0}, \ @@ -279,14 +279,14 @@ { OUString(UNO_NAME_TEXT_CONTOURFRAME), SDRATTR_TEXT_CONTOURFRAME, ::getBooleanCppuType(), 0, 0}, \ { OUString(UNO_NAME_TEXT_FITTOSIZE), SDRATTR_TEXT_FITTOSIZE, ::getCppuType((const ::com::sun::star::drawing::TextFitToSizeType*)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}, \ - { OUString(UNO_NAME_TEXT_LOWERDIST), SDRATTR_TEXT_LOWERDIST, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_TEXT_MAXFRAMEHEIGHT), SDRATTR_TEXT_MAXFRAMEHEIGHT, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_TEXT_MAXFRAMEWIDTH), SDRATTR_TEXT_MAXFRAMEWIDTH, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_TEXT_MINFRAMEHEIGHT), SDRATTR_TEXT_MINFRAMEHEIGHT, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_TEXT_MINFRAMEWIDTH), SDRATTR_TEXT_MINFRAMEWIDTH, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_TEXT_RIGHTDIST), SDRATTR_TEXT_RIGHTDIST, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_TEXT_UPPERDIST), SDRATTR_TEXT_UPPERDIST, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_TEXT_LEFTDIST), SDRATTR_TEXT_LEFTDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_TEXT_LOWERDIST), SDRATTR_TEXT_LOWERDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_TEXT_MAXFRAMEHEIGHT), SDRATTR_TEXT_MAXFRAMEHEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_TEXT_MAXFRAMEWIDTH), SDRATTR_TEXT_MAXFRAMEWIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_TEXT_MINFRAMEHEIGHT), SDRATTR_TEXT_MINFRAMEHEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_TEXT_MINFRAMEWIDTH), SDRATTR_TEXT_MINFRAMEWIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_TEXT_RIGHTDIST), SDRATTR_TEXT_RIGHTDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_TEXT_UPPERDIST), SDRATTR_TEXT_UPPERDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ { OUString(UNO_NAME_TEXT_FONTINDEPENDENTLINESPACING),SDRATTR_TEXT_USEFIXEDCELLHEIGHT,::getBooleanCppuType(), 0, 0}, \ { OUString(UNO_NAME_TEXT_VERTADJUST), SDRATTR_TEXT_VERTADJUST, ::getCppuType((const ::com::sun::star::drawing::TextVerticalAdjust*)0), 0, 0},\ { OUString(UNO_NAME_TEXT_WORDWRAP), SDRATTR_TEXT_WORDWRAP, ::getBooleanCppuType(), 0, 0}, \ @@ -301,9 +301,9 @@ #define MISC_OBJ_PROPERTIES_NO_SHEAR \ { OUString("Transformation"), OWN_ATTR_TRANSFORMATION, ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, \ - { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER, ::getCppuType((const sal_Int32*)0), 0, 0}, \ + { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ { OUString(UNO_NAME_MISC_OBJ_FRAMERECT), OWN_ATTR_FRAMERECT, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0 }, \ - { OUString(UNO_NAME_MISC_OBJ_ROTATEANGLE), SDRATTR_ROTATEANGLE, ::getCppuType((const sal_Int32*)0), 0, 0}, \ + { OUString(UNO_NAME_MISC_OBJ_ROTATEANGLE), SDRATTR_ROTATEANGLE, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ { OUString(UNO_NAME_BITMAP), OWN_ATTR_BITMAP, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ { OUString(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ { OUString("IsFontwork"), OWN_ATTR_ISFONTWORK, ::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ @@ -312,137 +312,137 @@ #define MISC_OBJ_PROPERTIES \ { OUString(UNO_NAME_MISC_OBJ_INTEROPGRABBAG), OWN_ATTR_INTEROPGRABBAG, ::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), 0, 0}, \ MISC_OBJ_PROPERTIES_NO_SHEAR \ - { OUString(UNO_NAME_MISC_OBJ_SHEARANGLE), SDRATTR_SHEARANGLE, ::getCppuType((const sal_Int32*)0), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_SHEARANGLE), SDRATTR_SHEARANGLE, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, #define SHAPE_DESCRIPTOR_PROPERTIES \ - { 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_MISC_OBJ_LAYERID), SDRATTR_LAYERID , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ + { OUString(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME , ::cppu::UnoType<OUString>::get(), 0, 0}, \ { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT , ::getBooleanCppuType(), 0, 0}, \ - { OUString(UNO_NAME_MISC_OBJ_NAME), SDRATTR_OBJECTNAME , ::getCppuType((const OUString*)0), 0, 0}, \ + { OUString(UNO_NAME_MISC_OBJ_NAME), SDRATTR_OBJECTNAME , ::cppu::UnoType<OUString>::get(), 0, 0}, \ { OUString(UNO_NAME_MISC_OBJ_PRINTABLE), SDRATTR_OBJPRINTABLE , ::getBooleanCppuType(), 0, 0}, \ { OUString("Visible"), SDRATTR_OBJVISIBLE , ::getBooleanCppuType(), 0, 0}, \ { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT , ::getBooleanCppuType(), 0, 0},\ - { OUString("UINameSingular"), OWN_ATTR_UINAME_SINGULAR , ::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ - { OUString("UINamePlural"), OWN_ATTR_UINAME_PLURAL , ::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ + { OUString("UINameSingular"), OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ + { OUString("UINamePlural"), OWN_ATTR_UINAME_PLURAL , ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ /* #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(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::cppu::UnoType<OUString>::get(), 0, 0}, \ + { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::cppu::UnoType<OUString>::get(), 0, 0}, #define LINKTARGET_PROPERTIES \ - { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , ::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ + { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, #define CONNECTOR_PROPERTIES \ - { OUString(UNO_NAME_EDGEKIND), SDRATTR_EDGEKIND, ::getCppuType((const ::com::sun::star::drawing::ConnectorType*)0), 0, 0}, \ - { OUString(UNO_NAME_EDGENODE1HORZDIST), SDRATTR_EDGENODE1HORZDIST, ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString(UNO_NAME_EDGENODE1VERTDIST), SDRATTR_EDGENODE1VERTDIST, ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString(UNO_NAME_EDGENODE2HORZDIST), SDRATTR_EDGENODE2HORZDIST, ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString(UNO_NAME_EDGENODE2VERTDIST), SDRATTR_EDGENODE2VERTDIST, ::getCppuType((const sal_Int32*)0), 0, 0}, + { OUString(UNO_NAME_EDGEKIND), SDRATTR_EDGEKIND, ::cppu::UnoType<com::sun::star::drawing::ConnectorType>::get(), 0, 0}, \ + { OUString(UNO_NAME_EDGENODE1HORZDIST), SDRATTR_EDGENODE1HORZDIST, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_EDGENODE1VERTDIST), SDRATTR_EDGENODE1VERTDIST, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_EDGENODE2HORZDIST), SDRATTR_EDGENODE2HORZDIST, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_EDGENODE2VERTDIST), SDRATTR_EDGENODE2VERTDIST, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, #define SPECIAL_CONNECTOR_PROPERTIES \ CONNECTOR_PROPERTIES \ - { OUString(UNO_NAME_EDGELINE1DELTA), SDRATTR_EDGELINE1DELTA, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_EDGELINE2DELTA), SDRATTR_EDGELINE2DELTA, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_EDGELINE3DELTA), SDRATTR_EDGELINE3DELTA, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_EDGELINE1DELTA), SDRATTR_EDGELINE1DELTA, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_EDGELINE2DELTA), SDRATTR_EDGELINE2DELTA, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_EDGELINE3DELTA), SDRATTR_EDGELINE3DELTA, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ { OUString("StartShape"), OWN_ATTR_EDGE_START_OBJ, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \ - { OUString("StartGluePointIndex"), OWN_ATTR_GLUEID_HEAD, ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString("StartPosition"), OWN_ATTR_EDGE_START_POS, ::getCppuType((const ::com::sun::star::awt::Point*)0), 0, 0}, \ + { OUString("StartGluePointIndex"), OWN_ATTR_GLUEID_HEAD, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString("StartPosition"), OWN_ATTR_EDGE_START_POS, ::cppu::UnoType<com::sun::star::awt::Point>::get(), 0, 0}, \ { OUString("EndShape"), OWN_ATTR_EDGE_END_OBJ, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \ - { OUString("EndPosition"), OWN_ATTR_EDGE_END_POS, ::getCppuType((const ::com::sun::star::awt::Point*)0), 0, 0},\ - { OUString("EndGluePointIndex"), OWN_ATTR_GLUEID_TAIL, ::getCppuType((const sal_Int32*)0), 0, 0}, \ + { OUString("EndPosition"), OWN_ATTR_EDGE_END_POS, ::cppu::UnoType<com::sun::star::awt::Point>::get(), 0, 0},\ + { OUString("EndGluePointIndex"), OWN_ATTR_GLUEID_TAIL, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ \ { OUString("EdgeStartConnection"), OWN_ATTR_EDGE_START_OBJ, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \ - { OUString("EdgeStartPoint"), OWN_ATTR_EDGE_START_POS, ::getCppuType((const ::com::sun::star::awt::Point*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ + { OUString("EdgeStartPoint"), OWN_ATTR_EDGE_START_POS, ::cppu::UnoType<com::sun::star::awt::Point>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ { OUString("EdgeEndConnection"), OWN_ATTR_EDGE_END_OBJ, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \ - { OUString("EdgeEndPoint"), OWN_ATTR_EDGE_END_POS, ::getCppuType((const ::com::sun::star::awt::Point*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ + { OUString("EdgeEndPoint"), OWN_ATTR_EDGE_END_POS, ::cppu::UnoType<com::sun::star::awt::Point>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ \ - { OUString(UNO_NAME_POLYPOLYGONBEZIER), OWN_ATTR_EDGE_POLYPOLYGONBEZIER, ::getCppuType((const ::com::sun::star::drawing::PolyPolygonBezierCoords*)0), 0, 0}, + { OUString(UNO_NAME_POLYPOLYGONBEZIER), OWN_ATTR_EDGE_POLYPOLYGONBEZIER, ::cppu::UnoType<com::sun::star::drawing::PolyPolygonBezierCoords>::get(), 0, 0}, #define SPECIAL_DIMENSIONING_PROPERTIES_DEFAULTS \ { OUString(UNO_NAME_MEASUREBELOWREFEDGE), SDRATTR_MEASUREBELOWREFEDGE, ::getBooleanCppuType(), 0, 0}, \ - { OUString(UNO_NAME_MEASUREFORMATSTRING), SDRATTR_MEASUREFORMATSTRING, ::getCppuType((const OUString*)0), 0, 0}, \ - { OUString(UNO_NAME_MEASUREHELPLINE1LEN), SDRATTR_MEASUREHELPLINE1LEN, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_MEASUREHELPLINE2LEN), SDRATTR_MEASUREHELPLINE2LEN, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_MEASUREHELPLINEDIST), SDRATTR_MEASUREHELPLINEDIST, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_MEASUREHELPLINEOVERHANG), SDRATTR_MEASUREHELPLINEOVERHANG, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_MEASUREKIND), SDRATTR_MEASUREKIND, ::getCppuType((const ::com::sun::star::drawing::MeasureKind*)0), 0, 0}, \ - { OUString(UNO_NAME_MEASURELINEDIST), SDRATTR_MEASURELINEDIST, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_MEASUREOVERHANG), SDRATTR_MEASUREOVERHANG, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_MEASUREUNIT), SDRATTR_MEASUREUNIT, ::getCppuType((const sal_Int32*)0), 0, 0},\ + { OUString(UNO_NAME_MEASUREFORMATSTRING), SDRATTR_MEASUREFORMATSTRING, ::cppu::UnoType<OUString>::get(), 0, 0}, \ + { OUString(UNO_NAME_MEASUREHELPLINE1LEN), SDRATTR_MEASUREHELPLINE1LEN, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_MEASUREHELPLINE2LEN), SDRATTR_MEASUREHELPLINE2LEN, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_MEASUREHELPLINEDIST), SDRATTR_MEASUREHELPLINEDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_MEASUREHELPLINEOVERHANG), SDRATTR_MEASUREHELPLINEOVERHANG, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_MEASUREKIND), SDRATTR_MEASUREKIND, ::cppu::UnoType<com::sun::star::drawing::MeasureKind>::get(), 0, 0}, \ + { OUString(UNO_NAME_MEASURELINEDIST), SDRATTR_MEASURELINEDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_MEASUREOVERHANG), SDRATTR_MEASUREOVERHANG, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_MEASUREUNIT), SDRATTR_MEASUREUNIT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},\ { OUString(UNO_NAME_MEASURESHOWUNIT), SDRATTR_MEASURESHOWUNIT, ::getBooleanCppuType(), 0, 0}, \ { OUString(UNO_NAME_MEASURETEXTAUTOANGLE), SDRATTR_MEASURETEXTAUTOANGLE, ::getBooleanCppuType(), 0, 0}, \ - { OUString(UNO_NAME_MEASURETEXTAUTOANGLEVIEW), SDRATTR_MEASURETEXTAUTOANGLEVIEW, ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString(UNO_NAME_MEASURETEXTFIXEDANGLE), SDRATTR_MEASURETEXTFIXEDANGLE, ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString(UNO_NAME_MEASURETEXTHPOS), SDRATTR_MEASURETEXTHPOS, ::getCppuType((const ::com::sun::star::drawing::MeasureTextHorzPos*)0), 0, 0}, \ + { OUString(UNO_NAME_MEASURETEXTAUTOANGLEVIEW), SDRATTR_MEASURETEXTAUTOANGLEVIEW, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_MEASURETEXTFIXEDANGLE), SDRATTR_MEASURETEXTFIXEDANGLE, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_MEASURETEXTHPOS), SDRATTR_MEASURETEXTHPOS, ::cppu::UnoType<com::sun::star::drawing::MeasureTextHorzPos>::get(), 0, 0}, \ { OUString(UNO_NAME_MEASURETEXTISFIXEDANGLE), SDRATTR_MEASURETEXTISFIXEDANGLE, ::getBooleanCppuType(), 0, 0}, \ { OUString(UNO_NAME_MEASURETEXTROTA90), SDRATTR_MEASURETEXTROTA90, ::getBooleanCppuType(), 0, 0}, \ { OUString(UNO_NAME_MEASURETEXTUPSIDEDOWN), SDRATTR_MEASURETEXTUPSIDEDOWN, ::getBooleanCppuType(), 0, 0}, \ - { OUString(UNO_NAME_MEASURETEXTVPOS), SDRATTR_MEASURETEXTVPOS, ::getCppuType((const ::com::sun::star::drawing::MeasureTextVertPos*)0), 0, 0}, \ - { OUString("MeasureDecimalPlaces"), SDRATTR_MEASUREDECIMALPLACES, ::getCppuType((const sal_Int16*)0), 0, 0}, + { OUString(UNO_NAME_MEASURETEXTVPOS), SDRATTR_MEASURETEXTVPOS, ::cppu::UnoType<com::sun::star::drawing::MeasureTextVertPos>::get(), 0, 0}, \ + { OUString("MeasureDecimalPlaces"), SDRATTR_MEASUREDECIMALPLACES, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, #define SPECIAL_DIMENSIONING_PROPERTIES \ SPECIAL_DIMENSIONING_PROPERTIES_DEFAULTS \ - { OUString("StartPosition"), OWN_ATTR_MEASURE_START_POS, ::getCppuType((const ::com::sun::star::awt::Point*)0), 0, 0},\ - { OUString("EndPosition"), OWN_ATTR_MEASURE_END_POS, ::getCppuType((const ::com::sun::star::awt::Point*)0), 0, 0}, + { OUString("StartPosition"), OWN_ATTR_MEASURE_START_POS, ::cppu::UnoType<com::sun::star::awt::Point>::get(), 0, 0},\ + { OUString("EndPosition"), OWN_ATTR_MEASURE_END_POS, ::cppu::UnoType<com::sun::star::awt::Point>::get(), 0, 0}, #define SPECIAL_CIRCLE_PROPERTIES \ - { OUString(UNO_NAME_CIRCENDANGLE), SDRATTR_CIRCENDANGLE, ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString(UNO_NAME_CIRCKIND), SDRATTR_CIRCKIND, ::getCppuType((const ::com::sun::star::drawing::CircleKind*)0), 0, 0}, \ - { OUString(UNO_NAME_CIRCSTARTANGLE),SDRATTR_CIRCSTARTANGLE, ::getCppuType((const sal_Int32*)0), 0, 0}, + { OUString(UNO_NAME_CIRCENDANGLE), SDRATTR_CIRCENDANGLE, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_CIRCKIND), SDRATTR_CIRCKIND, ::cppu::UnoType<com::sun::star::drawing::CircleKind>::get(), 0, 0}, \ + { OUString(UNO_NAME_CIRCSTARTANGLE),SDRATTR_CIRCSTARTANGLE, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, #define SPECIAL_POLYGON_PROPERTIES \ - { OUString(UNO_NAME_POLYGONKIND), OWN_ATTR_VALUE_POLYGONKIND, ::getCppuType((const ::com::sun::star::drawing::PolygonKind*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_POLYGONKIND), OWN_ATTR_VALUE_POLYGONKIND, ::cppu::UnoType<com::sun::star::drawing::PolygonKind>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, #define SPECIAL_POLYPOLYGON_PROPERTIES \ - { OUString(UNO_NAME_POLYPOLYGON), OWN_ATTR_VALUE_POLYPOLYGON, ::getCppuType((const ::com::sun::star::drawing::PointSequenceSequence*)0), 0, 0}, \ - { OUString(UNO_NAME_POLYGON), OWN_ATTR_VALUE_POLYGON, ::getCppuType((const ::com::sun::star::drawing::PointSequence*)0), 0, 0}, + { OUString(UNO_NAME_POLYPOLYGON), OWN_ATTR_VALUE_POLYPOLYGON, ::cppu::UnoType<com::sun::star::drawing::PointSequenceSequence>::get(), 0, 0}, \ + { OUString(UNO_NAME_POLYGON), OWN_ATTR_VALUE_POLYGON, ::cppu::UnoType<com::sun::star::drawing::PointSequence>::get(), 0, 0}, #define SPECIAL_POLYPOLYGONBEZIER_PROPERTIES \ - { OUString(UNO_NAME_POLYPOLYGONBEZIER), OWN_ATTR_VALUE_POLYPOLYGONBEZIER, ::getCppuType((const ::com::sun::star::drawing::PolyPolygonBezierCoords*)0), 0, 0}, + { OUString(UNO_NAME_POLYPOLYGONBEZIER), OWN_ATTR_VALUE_POLYPOLYGONBEZIER, ::cppu::UnoType<com::sun::star::drawing::PolyPolygonBezierCoords>::get(), 0, 0}, #define SPECIAL_GRAPHOBJ_PROPERTIES_DEFAULTS \ - { OUString(UNO_NAME_GRAPHIC_LUMINANCE), SDRATTR_GRAFLUMINANCE , ::getCppuType((const sal_Int16*)0), 0, 0}, \ - { OUString(UNO_NAME_GRAPHIC_CONTRAST), SDRATTR_GRAFCONTRAST , ::getCppuType((const sal_Int16*)0), 0, 0}, \ - { OUString(UNO_NAME_GRAPHIC_RED), SDRATTR_GRAFRED , ::getCppuType((const sal_Int16*)0), 0, 0}, \ - { OUString(UNO_NAME_GRAPHIC_GREEN), SDRATTR_GRAFGREEN , ::getCppuType((const sal_Int16*)0), 0, 0}, \ - { OUString(UNO_NAME_GRAPHIC_BLUE), SDRATTR_GRAFBLUE , ::getCppuType((const sal_Int16*)0), 0, 0}, \ + { OUString(UNO_NAME_GRAPHIC_LUMINANCE), SDRATTR_GRAFLUMINANCE , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ + { OUString(UNO_NAME_GRAPHIC_CONTRAST), SDRATTR_GRAFCONTRAST , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ + { OUString(UNO_NAME_GRAPHIC_RED), SDRATTR_GRAFRED , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ + { OUString(UNO_NAME_GRAPHIC_GREEN), SDRATTR_GRAFGREEN , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ + { OUString(UNO_NAME_GRAPHIC_BLUE), SDRATTR_GRAFBLUE , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ { OUString(UNO_NAME_GRAPHIC_GAMMA), SDRATTR_GRAFGAMMA , ::getCppuType((const double*)0), 0, 0}, \ - { OUString(UNO_NAME_GRAPHIC_TRANSPARENCY), SDRATTR_GRAFTRANSPARENCE , ::getCppuType((const sal_Int16*)0), 0, 0}, \ - { OUString(UNO_NAME_GRAPHIC_COLOR_MODE), SDRATTR_GRAFMODE , ::getCppuType((const ::com::sun::star::drawing::ColorMode*)0), 0, 0}, + { OUString(UNO_NAME_GRAPHIC_TRANSPARENCY), SDRATTR_GRAFTRANSPARENCE , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ + { OUString(UNO_NAME_GRAPHIC_COLOR_MODE), SDRATTR_GRAFMODE , ::cppu::UnoType<com::sun::star::drawing::ColorMode>::get(), 0, 0}, #define SPECIAL_GRAPHOBJ_PROPERTIES \ SPECIAL_GRAPHOBJ_PROPERTIES_DEFAULTS \ - { OUString(UNO_NAME_GRAPHIC_GRAPHICCROP), SDRATTR_GRAFCROP , ::getCppuType((const ::com::sun::star::text::GraphicCrop*)0), 0, 0 }, \ - { OUString(UNO_NAME_GRAPHOBJ_GRAFURL), OWN_ATTR_GRAFURL , ::getCppuType((const OUString*)0), 0, 0 }, \ - { OUString(UNO_NAME_GRAPHOBJ_REPLACEMENTGRAFURL), OWN_ATTR_REPLACEMENTGRAFURL , ::getCppuType((const OUString*)0), 0, 0 }, \ - { OUString(UNO_NAME_GRAPHOBJ_GRAFSTREAMURL), OWN_ATTR_GRAFSTREAMURL , ::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, \ + { OUString(UNO_NAME_GRAPHIC_GRAPHICCROP), SDRATTR_GRAFCROP , ::cppu::UnoType<com::sun::star::text::GraphicCrop>::get(), 0, 0 }, \ + { OUString(UNO_NAME_GRAPHOBJ_GRAFURL), OWN_ATTR_GRAFURL , ::cppu::UnoType<OUString>::get(), 0, 0 }, \ + { OUString(UNO_NAME_GRAPHOBJ_REPLACEMENTGRAFURL), OWN_ATTR_REPLACEMENTGRAFURL , ::cppu::UnoType<OUString>::get(), 0, 0 }, \ + { OUString(UNO_NAME_GRAPHOBJ_GRAFSTREAMURL), OWN_ATTR_GRAFSTREAMURL , ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, \ { OUString(UNO_NAME_GRAPHOBJ_FILLBITMAP), OWN_ATTR_VALUE_FILLBITMAP , ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap>*)0) , 0, 0}, \ { OUString(UNO_NAME_GRAPHOBJ_GRAPHIC), OWN_ATTR_VALUE_GRAPHIC , ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic>*)0) , 0, 0}, #define SPECIAL_3DSCENEOBJECT_PROPERTIES_DEFAULTS \ - { OUString(UNO_NAME_3D_SCENE_AMBIENTCOLOR), SDRATTR_3DSCENE_AMBIENTCOLOR , ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_DISTANCE), SDRATTR_3DSCENE_DISTANCE , ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_3D_SCENE_FOCAL_LENGTH), SDRATTR_3DSCENE_FOCAL_LENGTH , ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_3D_SCENE_LIGHTCOLOR_1), SDRATTR_3DSCENE_LIGHTCOLOR_1 , ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_LIGHTCOLOR_2), SDRATTR_3DSCENE_LIGHTCOLOR_2 , ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_LIGHTCOLOR_3), SDRATTR_3DSCENE_LIGHTCOLOR_3 , ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_LIGHTCOLOR_4), SDRATTR_3DSCENE_LIGHTCOLOR_4 , ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_LIGHTCOLOR_5), SDRATTR_3DSCENE_LIGHTCOLOR_5 , ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_LIGHTCOLOR_6), SDRATTR_3DSCENE_LIGHTCOLOR_6 , ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_LIGHTCOLOR_7), SDRATTR_3DSCENE_LIGHTCOLOR_7 , ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_LIGHTCOLOR_8), SDRATTR_3DSCENE_LIGHTCOLOR_8 , ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_1), SDRATTR_3DSCENE_LIGHTDIRECTION_1 , ::getCppuType((const ::com::sun::star::drawing::Direction3D*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_2), SDRATTR_3DSCENE_LIGHTDIRECTION_2 , ::getCppuType((const ::com::sun::star::drawing::Direction3D*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_3), SDRATTR_3DSCENE_LIGHTDIRECTION_3 , ::getCppuType((const ::com::sun::star::drawing::Direction3D*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_4), SDRATTR_3DSCENE_LIGHTDIRECTION_4 , ::getCppuType((const ::com::sun::star::drawing::Direction3D*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_5), SDRATTR_3DSCENE_LIGHTDIRECTION_5 , ::getCppuType((const ::com::sun::star::drawing::Direction3D*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_6), SDRATTR_3DSCENE_LIGHTDIRECTION_6 , ::getCppuType((const ::com::sun::star::drawing::Direction3D*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_7), SDRATTR_3DSCENE_LIGHTDIRECTION_7 , ::getCppuType((const ::com::sun::star::drawing::Direction3D*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_8), SDRATTR_3DSCENE_LIGHTDIRECTION_8 , ::getCppuType((const ::com::sun::star::drawing::Direction3D*)0), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_AMBIENTCOLOR), SDRATTR_3DSCENE_AMBIENTCOLOR , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_DISTANCE), SDRATTR_3DSCENE_DISTANCE , ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_3D_SCENE_FOCAL_LENGTH), SDRATTR_3DSCENE_FOCAL_LENGTH , ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_3D_SCENE_LIGHTCOLOR_1), SDRATTR_3DSCENE_LIGHTCOLOR_1 , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_LIGHTCOLOR_2), SDRATTR_3DSCENE_LIGHTCOLOR_2 , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_LIGHTCOLOR_3), SDRATTR_3DSCENE_LIGHTCOLOR_3 , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_LIGHTCOLOR_4), SDRATTR_3DSCENE_LIGHTCOLOR_4 , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_LIGHTCOLOR_5), SDRATTR_3DSCENE_LIGHTCOLOR_5 , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_LIGHTCOLOR_6), SDRATTR_3DSCENE_LIGHTCOLOR_6 , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_LIGHTCOLOR_7), SDRATTR_3DSCENE_LIGHTCOLOR_7 , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_LIGHTCOLOR_8), SDRATTR_3DSCENE_LIGHTCOLOR_8 , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_1), SDRATTR_3DSCENE_LIGHTDIRECTION_1 , ::cppu::UnoType<com::sun::star::drawing::Direction3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_2), SDRATTR_3DSCENE_LIGHTDIRECTION_2 , ::cppu::UnoType<com::sun::star::drawing::Direction3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_3), SDRATTR_3DSCENE_LIGHTDIRECTION_3 , ::cppu::UnoType<com::sun::star::drawing::Direction3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_4), SDRATTR_3DSCENE_LIGHTDIRECTION_4 , ::cppu::UnoType<com::sun::star::drawing::Direction3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_5), SDRATTR_3DSCENE_LIGHTDIRECTION_5 , ::cppu::UnoType<com::sun::star::drawing::Direction3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_6), SDRATTR_3DSCENE_LIGHTDIRECTION_6 , ::cppu::UnoType<com::sun::star::drawing::Direction3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_7), SDRATTR_3DSCENE_LIGHTDIRECTION_7 , ::cppu::UnoType<com::sun::star::drawing::Direction3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_8), SDRATTR_3DSCENE_LIGHTDIRECTION_8 , ::cppu::UnoType<com::sun::star::drawing::Direction3D>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_SCENE_LIGHTON_1), SDRATTR_3DSCENE_LIGHTON_1 , ::getBooleanCppuType(), 0, 0}, \ { OUString(UNO_NAME_3D_SCENE_LIGHTON_2), SDRATTR_3DSCENE_LIGHTON_2 , ::getBooleanCppuType(), 0, 0}, \ { OUString(UNO_NAME_3D_SCENE_LIGHTON_3), SDRATTR_3DSCENE_LIGHTON_3 , ::getBooleanCppuType(), 0, 0}, \ @@ -452,45 +452,45 @@ { OUString(UNO_NAME_3D_SCENE_LIGHTON_7), SDRATTR_3DSCENE_LIGHTON_7 , ::getBooleanCppuType(), 0, 0}, \ { OUString(UNO_NAME_3D_SCENE_LIGHTON_8), SDRATTR_3DSCENE_LIGHTON_8 , ::getBooleanCppuType(), 0, 0}, \ { OUString(UNO_NAME_3D_SCENE_PERSPECTIVE), SDRATTR_3DSCENE_PERSPECTIVE , ::getCppuType((const ::com::sun::star::drawing::ProjectionMode*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_SHADOW_SLANT), SDRATTR_3DSCENE_SHADOW_SLANT , ::getCppuType((const sal_Int16*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_SHADE_MODE), SDRATTR_3DSCENE_SHADE_MODE , ::getCppuType((const ::com::sun::star::drawing::ShadeMode*)0), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_SHADOW_SLANT), SDRATTR_3DSCENE_SHADOW_SLANT , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_SHADE_MODE), SDRATTR_3DSCENE_SHADE_MODE , ::cppu::UnoType<com::sun::star::drawing::ShadeMode>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_SCENE_TWO_SIDED_LIGHTING),SDRATTR_3DSCENE_TWO_SIDED_LIGHTING, ::getBooleanCppuType(), 0, 0}, #define SPECIAL_3DSCENEOBJECT_PROPERTIES \ SPECIAL_3DSCENEOBJECT_PROPERTIES_DEFAULTS \ - { OUString(UNO_NAME_3D_TRANSFORM_MATRIX), OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX , ::getCppuType((const ::com::sun::star::drawing::HomogenMatrix*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_CAMERA_GEOMETRY), OWN_ATTR_3D_VALUE_CAMERA_GEOMETRY , ::getCppuType((const ::com::sun::star::drawing::CameraGeometry*)0), 0, 0}, + { OUString(UNO_NAME_3D_TRANSFORM_MATRIX), OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX , ::cppu::UnoType<com::sun::star::drawing::HomogenMatrix>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_CAMERA_GEOMETRY), OWN_ATTR_3D_VALUE_CAMERA_GEOMETRY , ::cppu::UnoType<com::sun::star::drawing::CameraGeometry>::get(), 0, 0}, // #i28528# // Added extra Item (Bool) for chart2 to be able to show reduced line geometry (SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY) #define MISC_3D_OBJ_PROPERTIES \ { OUString(UNO_NAME_3D_DOUBLE_SIDED) ,SDRATTR_3DOBJ_DOUBLE_SIDED , ::getBooleanCppuType(), 0, 0}, \ - { OUString(UNO_NAME_3D_MAT_COLOR) ,SDRATTR_3DOBJ_MAT_COLOR , ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_MAT_EMISSION) ,SDRATTR_3DOBJ_MAT_EMISSION , ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_MAT_SPECULAR) ,SDRATTR_3DOBJ_MAT_SPECULAR , ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_MAT_SPECULAR_INTENSITY) ,SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY , ::getCppuType((const sal_Int16*)0), 0, 0}, \ + { OUString(UNO_NAME_3D_MAT_COLOR) ,SDRATTR_3DOBJ_MAT_COLOR , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_MAT_EMISSION) ,SDRATTR_3DOBJ_MAT_EMISSION , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_MAT_SPECULAR) ,SDRATTR_3DOBJ_MAT_SPECULAR , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_MAT_SPECULAR_INTENSITY) ,SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_NORMALS_INVERT) ,SDRATTR_3DOBJ_NORMALS_INVERT , ::getBooleanCppuType(), 0, 0}, \ - { OUString(UNO_NAME_3D_NORMALS_KIND) ,SDRATTR_3DOBJ_NORMALS_KIND , ::getCppuType((const ::com::sun::star::drawing::NormalsKind*)0), 0, 0}, \ + { OUString(UNO_NAME_3D_NORMALS_KIND) ,SDRATTR_3DOBJ_NORMALS_KIND , ::cppu::UnoType<com::sun::star::drawing::NormalsKind>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_SHADOW_3D) ,SDRATTR_3DOBJ_SHADOW_3D , ::getBooleanCppuType(), 0, 0}, \ { OUString(UNO_NAME_3D_TEXTURE_FILTER) ,SDRATTR_3DOBJ_TEXTURE_FILTER , ::getBooleanCppuType(), 0, 0}, \ - { OUString(UNO_NAME_3D_TEXTURE_KIND) ,SDRATTR_3DOBJ_TEXTURE_KIND , ::getCppuType((const ::com::sun::star::drawing::TextureKind*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_TEXTURE_MODE) ,SDRATTR_3DOBJ_TEXTURE_MODE , ::getCppuType((const ::com::sun::star::drawing::TextureMode*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_TEXTURE_PROJ_X) ,SDRATTR_3DOBJ_TEXTURE_PROJ_X , ::getCppuType((const ::com::sun::star::drawing::TextureProjectionMode*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_TEXTURE_PROJ_Y) ,SDRATTR_3DOBJ_TEXTURE_PROJ_Y , ::getCppuType((const ::com::sun::star::drawing::TextureProjectionMode*)0), 0, 0}, \ + { OUString(UNO_NAME_3D_TEXTURE_KIND) ,SDRATTR_3DOBJ_TEXTURE_KIND , ::cppu::UnoType<com::sun::star::drawing::TextureKind>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_TEXTURE_MODE) ,SDRATTR_3DOBJ_TEXTURE_MODE , ::cppu::UnoType<com::sun::star::drawing::TextureMode>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_TEXTURE_PROJ_X) ,SDRATTR_3DOBJ_TEXTURE_PROJ_X , ::cppu::UnoType<com::sun::star::drawing::TextureProjectionMode>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_TEXTURE_PROJ_Y) ,SDRATTR_3DOBJ_TEXTURE_PROJ_Y , ::cppu::UnoType<com::sun::star::drawing::TextureProjectionMode>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_REDUCED_LINE_GEOMETRY) ,SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY , ::getBooleanCppuType(), 0, 0}, #define SPECIAL_3DCUBEOBJECT_PROPERTIES \ - { OUString(UNO_NAME_3D_TRANSFORM_MATRIX) ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX , ::getCppuType((const ::com::sun::star::drawing::HomogenMatrix*)0), 0, 0}, \ + { OUString(UNO_NAME_3D_TRANSFORM_MATRIX) ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX , ::cppu::UnoType<com::sun::star::drawing::HomogenMatrix>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_POS) ,OWN_ATTR_3D_VALUE_POSITION , ::getCppuType((const ::com::sun::star::drawing::Position3D*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_SIZE) ,OWN_ATTR_3D_VALUE_SIZE , ::getCppuType((const ::com::sun::star::drawing::Direction3D*)0), 0, 0}, \ + { OUString(UNO_NAME_3D_SIZE) ,OWN_ATTR_3D_VALUE_SIZE , ::cppu::UnoType<com::sun::star::drawing::Direction3D>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_POS_IS_CENTER) ,OWN_ATTR_3D_VALUE_POS_IS_CENTER , ::getBooleanCppuType(), 0, 0}, #define SPECIAL_3DSPHEREOBJECT_PROPERTIES \ - { OUString(UNO_NAME_3D_TRANSFORM_MATRIX) ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX , ::getCppuType((const ::com::sun::star::drawing::HomogenMatrix*)0), 0, 0}, \ + { OUString(UNO_NAME_3D_TRANSFORM_MATRIX) ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX , ::cppu::UnoType<com::sun::star::drawing::HomogenMatrix>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_POS) ,OWN_ATTR_3D_VALUE_POSITION , ::getCppuType((const ::com::sun::star::drawing::Position3D*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_SIZE) ,OWN_ATTR_3D_VALUE_SIZE , ::getCppuType((const ::com::sun::star::drawing::Direction3D*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_HORZ_SEGS) ,SDRATTR_3DOBJ_HORZ_SEGS, ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_VERT_SEGS) ,SDRATTR_3DOBJ_VERT_SEGS, ::getCppuType((const sal_Int32*)0), 0, 0}, + { OUString(UNO_NAME_3D_SIZE) ,OWN_ATTR_3D_VALUE_SIZE , ::cppu::UnoType<com::sun::star::drawing::Direction3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_HORZ_SEGS) ,SDRATTR_3DOBJ_HORZ_SEGS, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_VERT_SEGS) ,SDRATTR_3DOBJ_VERT_SEGS, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, // #107245# New 3D properties which are possible for lathe and extrude 3d objects #define SPECIAL_3DLATHEANDEXTRUDEOBJ_PROPERTIES \ @@ -501,28 +501,28 @@ { OUString(UNO_NAME_3D_CLOSE_BACK) , SDRATTR_3DOBJ_CLOSE_BACK, ::getBooleanCppuType(), 0, 0}, #define SPECIAL_3DLATHEOBJECT_PROPERTIES \ - { OUString(UNO_NAME_3D_TRANSFORM_MATRIX) ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX,::getCppuType((const ::com::sun::star::drawing::HomogenMatrix*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_POLYPOLYGON3D) ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D ,::getCppuType((const ::com::sun::star::drawing::PolyPolygonShape3D*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_LATHE_END_ANGLE) ,SDRATTR_3DOBJ_END_ANGLE ,::getCppuType((const sal_Int16*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_HORZ_SEGS) ,SDRATTR_3DOBJ_HORZ_SEGS ,::getCppuType((const sal_Int32*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_PERCENT_DIAGONAL) ,SDRATTR_3DOBJ_PERCENT_DIAGONAL ,::getCppuType((const sal_Int16*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_VERT_SEGS) ,SDRATTR_3DOBJ_VERT_SEGS ,::getCppuType((const sal_Int32*)0), 0, 0}, + { OUString(UNO_NAME_3D_TRANSFORM_MATRIX) ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX,::cppu::UnoType<com::sun::star::drawing::HomogenMatrix>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_POLYPOLYGON3D) ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D ,::cppu::UnoType<com::sun::star::drawing::PolyPolygonShape3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_LATHE_END_ANGLE) ,SDRATTR_3DOBJ_END_ANGLE ,::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_HORZ_SEGS) ,SDRATTR_3DOBJ_HORZ_SEGS ,::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_PERCENT_DIAGONAL) ,SDRATTR_3DOBJ_PERCENT_DIAGONAL ,::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_VERT_SEGS) ,SDRATTR_3DOBJ_VERT_SEGS ,::cppu::UnoType<sal_Int32>::get(), 0, 0}, #define SPECIAL_3DEXTRUDEOBJECT_PROPERTIES \ - { OUString(UNO_NAME_3D_TRANSFORM_MATRIX) ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX,::getCppuType((const ::com::sun::star::drawing::HomogenMatrix*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_POLYPOLYGON3D) ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D ,::getCppuType((const ::com::sun::star::drawing::PolyPolygonShape3D*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_EXTRUDE_DEPTH) ,SDRATTR_3DOBJ_DEPTH ,::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_3D_PERCENT_DIAGONAL) ,SDRATTR_3DOBJ_PERCENT_DIAGONAL ,::getCppuType((const sal_Int16*)0), 0, 0}, + { OUString(UNO_NAME_3D_TRANSFORM_MATRIX) ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX,::cppu::UnoType<com::sun::star::drawing::HomogenMatrix>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_POLYPOLYGON3D) ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D ,::cppu::UnoType<com::sun::star::drawing::PolyPolygonShape3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_EXTRUDE_DEPTH) ,SDRATTR_3DOBJ_DEPTH ,::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_3D_PERCENT_DIAGONAL) ,SDRATTR_3DOBJ_PERCENT_DIAGONAL ,::cppu::UnoType<sal_Int16>::get(), 0, 0}, #define SPECIAL_3DPOLYGONOBJECT_PROPERTIES \ - { OUString(UNO_NAME_3D_TRANSFORM_MATRIX) ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX, ::getCppuType((const ::com::sun::star::drawing::HomogenMatrix*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_POLYPOLYGON3D) ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D , ::getCppuType((const ::com::sun::star::drawing::PolyPolygonShape3D*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_NORMALSPOLYGON3D) ,OWN_ATTR_3D_VALUE_NORMALSPOLYGON3D, ::getCppuType((const ::com::sun::star::drawing::PolyPolygonShape3D*)0), 0, 0}, \ - { OUString(UNO_NAME_3D_TEXTUREPOLYGON3D) ,OWN_ATTR_3D_VALUE_TEXTUREPOLYGON3D, ::getCppuType((const ::com::sun::star::drawing::PolyPolygonShape3D*)0), 0, 0}, \ + { OUString(UNO_NAME_3D_TRANSFORM_MATRIX) ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX, ::cppu::UnoType<com::sun::star::drawing::HomogenMatrix>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_POLYPOLYGON3D) ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D , ::cppu::UnoType<com::sun::star::drawing::PolyPolygonShape3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_NORMALSPOLYGON3D) ,OWN_ATTR_3D_VALUE_NORMALSPOLYGON3D, ::cppu::UnoType<com::sun::star::drawing::PolyPolygonShape3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_TEXTUREPOLYGON3D) ,OWN_ATTR_3D_VALUE_TEXTUREPOLYGON3D, ::cppu::UnoType<com::sun::star::drawing::PolyPolygonShape3D>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_LINEONLY) ,OWN_ATTR_3D_VALUE_LINEONLY , ::getBooleanCppuType(), 0, 0}, #define SPECIAL_3DBACKSCALE_PROPERTIES \ - { OUString(UNO_NAME_3D_BACKSCALE) ,SDRATTR_3DOBJ_BACKSCALE , ::getCppuType((const sal_Int16*)0), 0, 0}, \ + { OUString(UNO_NAME_3D_BACKSCALE) ,SDRATTR_3DOBJ_BACKSCALE , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ #define CUSTOMSHAPE_PROPERTIES \ { OUString(UNO_NAME_CUSTOMSHAPE_ADJUSTMENT),SDRATTR_CUSTOMSHAPE_ADJUSTMENT, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int32>*)0), 0, 0}, \ diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 5176c38115d4..07b2026502b5 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -147,19 +147,19 @@ static const SfxItemPropertyMapEntry* lcl_GetLinguProps() static const SfxItemPropertyMapEntry aLinguProps[] = { { OUString(UPN_DEFAULT_LANGUAGE), WID_DEFAULT_LANGUAGE, - ::getCppuType( (sal_Int16*)0 ), 0, 0 }, + ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, { OUString(UPN_DEFAULT_LOCALE), WID_DEFAULT_LOCALE, - ::getCppuType( (Locale* )0), 0, 0 }, + ::cppu::UnoType<Locale>::get(), 0, 0 }, { OUString(UPN_DEFAULT_LOCALE_CJK), WID_DEFAULT_LOCALE_CJK, - ::getCppuType( (Locale* )0), 0, 0 }, + ::cppu::UnoType<Locale>::get(), 0, 0 }, { OUString(UPN_DEFAULT_LOCALE_CTL), WID_DEFAULT_LOCALE_CTL, - ::getCppuType( (Locale* )0), 0, 0 }, + ::cppu::UnoType<Locale>::get(), 0, 0 }, { OUString(UPN_HYPH_MIN_LEADING), WID_HYPH_MIN_LEADING, - ::getCppuType( (sal_Int16*)0 ), 0, 0 }, + ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, { OUString(UPN_HYPH_MIN_TRAILING), WID_HYPH_MIN_TRAILING, - ::getCppuType( (sal_Int16*)0 ), 0, 0 }, + ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, { OUString(UPN_HYPH_MIN_WORD_LENGTH), WID_HYPH_MIN_WORD_LENGTH, - ::getCppuType( (sal_Int16*)0 ), 0, 0 }, + ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, { OUString(UPN_IS_GERMAN_PRE_REFORM), WID_IS_GERMAN_PRE_REFORM, /*! deprecated !*/ ::getBooleanCppuType(), 0, 0 }, { OUString(UPN_IS_HYPH_AUTO), WID_IS_HYPH_AUTO, diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx index 1e5af51263b5..8eb755fcf633 100644 --- a/oox/source/helper/propertymap.cxx +++ b/oox/source/helper/propertymap.cxx @@ -442,7 +442,7 @@ static void lclDumpAnyValue( Any value) fprintf (stderr, "%s\n", s); } else if( value >>= spacing ) { fprintf (stderr, "mode: %d value: %d\n", spacing.Mode, spacing.Height); - } else if( value.isExtractableTo(::getCppuType((const sal_Int32*)0))) { + } else if( value.isExtractableTo(::cppu::UnoType<sal_Int32>::get())) { fprintf (stderr,"is extractable to int32\n"); } // else if( value >>= pointValue ) @@ -893,7 +893,7 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0) fprintf (stderr, "aSize.Height = %" SAL_PRIdINT32 ";\n", size.Height); return "aSize"; } - else if( value.isExtractableTo(::getCppuType((const sal_Int32*)0))) { + else if( value.isExtractableTo(::cppu::UnoType<sal_Int32>::get())) { fprintf (stderr,"is extractable to int32\n"); } else diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 53356febc11f..8cbbce000650 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -538,7 +538,7 @@ bool CustomAnimationEffect::checkForText() Reference< XText > xText; - if( maTarget.getValueType() == ::getCppuType((const ParagraphTarget*)0) ) + if( maTarget.getValueType() == ::cppu::UnoType<ParagraphTarget>::get() ) { // calc para depth ParagraphTarget aParaTarget; @@ -1740,7 +1740,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPres Any aTarget( rTarget ); sal_Int16 nSubItem = ShapeAnimationSubType::AS_WHOLE; - if( aTarget.getValueType() == ::getCppuType((const ParagraphTarget*)0) ) + if( aTarget.getValueType() == ::cppu::UnoType<ParagraphTarget>::get() ) { nSubItem = ShapeAnimationSubType::ONLY_TEXT; } @@ -1792,7 +1792,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const SdrPathObj& rPathOb sal_Int16 nSubItem = ShapeAnimationSubType::AS_WHOLE; - if( rTarget.getValueType() == ::getCppuType((const ParagraphTarget*)0) ) + if( rTarget.getValueType() == ::cppu::UnoType<ParagraphTarget>::get() ) nSubItem = ShapeAnimationSubType::ONLY_TEXT; pEffect.reset( new CustomAnimationEffect( xEffectContainer ) ); @@ -2245,7 +2245,7 @@ void EffectSequenceHelper::disposeTextRange( const com::sun::star::uno::Any& aTa while( aIter != maEffects.end() ) { Any aIterTarget( (*aIter)->getTarget() ); - if( aIterTarget.getValueType() == ::getCppuType((const ParagraphTarget*)0) ) + if( aIterTarget.getValueType() == ::cppu::UnoType<ParagraphTarget>::get() ) { ParagraphTarget aIterParaTarget; if( (aIterTarget >>= aIterParaTarget) && (aIterParaTarget.Shape == aParaTarget.Shape) ) @@ -2312,7 +2312,7 @@ void CustomAnimationTextGroup::addEffect( CustomAnimationEffectPtr& pEffect ) maEffects.push_back( pEffect ); Any aTarget( pEffect->getTarget() ); - if( aTarget.getValueType() == ::getCppuType((const ParagraphTarget*)0) ) + if( aTarget.getValueType() == ::cppu::UnoType<ParagraphTarget>::get() ) { // now look at the paragraph ParagraphTarget aParaTarget; @@ -2572,7 +2572,7 @@ void EffectSequenceHelper::setTextGrouping( CustomAnimationTextGroupPtr pTextGro { CustomAnimationEffectPtr pEffect( (*aIter++) ); - if( pEffect->getTarget().getValueType() == ::getCppuType((const ParagraphTarget*)0) ) + if( pEffect->getTarget().getValueType() == ::cppu::UnoType<ParagraphTarget>::get() ) remove( pEffect ); else pTextGroup->addEffect( pEffect ); @@ -2593,7 +2593,7 @@ void EffectSequenceHelper::setTextGrouping( CustomAnimationTextGroupPtr pTextGro { CustomAnimationEffectPtr pEffect( (*aIter++) ); - if( pEffect->getTarget().getValueType() == ::getCppuType((const ParagraphTarget*)0) ) + if( pEffect->getTarget().getValueType() == ::cppu::UnoType<ParagraphTarget>::get() ) { // set correct node type if( pEffect->getParaDepth() < nTextGrouping ) @@ -2648,7 +2648,7 @@ void EffectSequenceHelper::setAnimateForm( CustomAnimationTextGroupPtr pTextGrou EffectSequence::iterator aInsertIter( find( (*aIter) ) ); CustomAnimationEffectPtr pEffect; - if( (aEffects.size() == 1) && ((*aIter)->getTarget().getValueType() != ::getCppuType((const ParagraphTarget*)0) ) ) + if( (aEffects.size() == 1) && ((*aIter)->getTarget().getValueType() != ::cppu::UnoType<ParagraphTarget>::get() ) ) { // special case, only one effect and that targets whole text, // convert this to target whole shape @@ -2680,7 +2680,7 @@ void EffectSequenceHelper::setAnimateForm( CustomAnimationTextGroupPtr pTextGrou { CustomAnimationEffectPtr pEffect( (*aIter++) ); - if( pEffect->getTarget().getValueType() == ::getCppuType((const ParagraphTarget*)0) ) + if( pEffect->getTarget().getValueType() == ::cppu::UnoType<ParagraphTarget>::get() ) { pTextGroup->addEffect( pEffect ); } @@ -2708,7 +2708,7 @@ void EffectSequenceHelper::setTextGroupingAuto( CustomAnimationTextGroupPtr pTex { CustomAnimationEffectPtr pEffect( (*aIter++) ); - if( pEffect->getTarget().getValueType() == ::getCppuType((const ParagraphTarget*)0) ) + if( pEffect->getTarget().getValueType() == ::cppu::UnoType<ParagraphTarget>::get() ) { // set correct node type if( pEffect->getParaDepth() < nTextGrouping ) @@ -2748,7 +2748,7 @@ struct ImplStlTextGroupSortHelper sal_Int32 ImplStlTextGroupSortHelper::getTargetParagraph( const CustomAnimationEffectPtr& p1 ) { const Any aTarget(p1->getTarget()); - if( aTarget.hasValue() && aTarget.getValueType() == ::getCppuType((const ParagraphTarget*)0) ) + if( aTarget.hasValue() && aTarget.getValueType() == ::cppu::UnoType<ParagraphTarget>::get() ) { ParagraphTarget aParaTarget; aTarget >>= aParaTarget; diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx index 7c04a0b31f37..d031618c5d19 100644 --- a/sd/source/core/EffectMigration.cxx +++ b/sd/source/core/EffectMigration.cxx @@ -691,7 +691,7 @@ void EffectMigration::SetTextAnimationEffect( SvxShape* pShape, AnimationEffect for( aIter = rEffects.begin(); aIter != rEffects.end(); ++aIter ) { // only work on paragraph targets - if( (*aIter)->getTarget().getValueType() == ::getCppuType((const ParagraphTarget*)0) ) + if( (*aIter)->getTarget().getValueType() == ::cppu::UnoType<ParagraphTarget>::get() ) { if( ((*aIter)->getPresetId() != aPresetId) || ((*aIter)->getPresetSubType() != aPresetSubType) ) diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 5f4a7ebf881c..215c7ec92604 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -92,10 +92,10 @@ static SvxItemPropertySet& GetStylePropertySet() TEXT_PROPERTIES_DEFAULTS CONNECTOR_PROPERTIES SPECIAL_DIMENSIONING_PROPERTIES_DEFAULTS - { OUString("TopBorder"), SDRATTR_TABLE_BORDER, ::getCppuType((const BorderLine*)0), 0, TOP_BORDER }, \ - { OUString("BottomBorder"), SDRATTR_TABLE_BORDER, ::getCppuType((const BorderLine*)0), 0, BOTTOM_BORDER }, \ - { OUString("LeftBorder"), SDRATTR_TABLE_BORDER, ::getCppuType((const BorderLine*)0), 0, LEFT_BORDER }, \ - { OUString("RightBorder"), SDRATTR_TABLE_BORDER, ::getCppuType((const BorderLine*)0), 0, RIGHT_BORDER }, \ + { OUString("TopBorder"), SDRATTR_TABLE_BORDER, ::cppu::UnoType<BorderLine>::get(), 0, TOP_BORDER }, \ + { OUString("BottomBorder"), SDRATTR_TABLE_BORDER, ::cppu::UnoType<BorderLine>::get(), 0, BOTTOM_BORDER }, \ + { OUString("LeftBorder"), SDRATTR_TABLE_BORDER, ::cppu::UnoType<BorderLine>::get(), 0, LEFT_BORDER }, \ + { OUString("RightBorder"), SDRATTR_TABLE_BORDER, ::cppu::UnoType<BorderLine>::get(), 0, RIGHT_BORDER }, \ { OUString(), 0, css::uno::Type(), 0, 0 } }; diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 401b902531dd..26c3aebc0c61 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -450,16 +450,16 @@ bool SdXMLFilter::Import( ErrCode& nError ) ::getCppuType( (Reference<XInterface> *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("BaseURI"), 0, - ::getCppuType( (OUString *)0 ), + ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StreamRelPath"), 0, - ::getCppuType( (OUString *)0 ), + ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StreamName"), 0, - ::getCppuType( (OUString *)0 ), + ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("BuildId"), 0, - ::getCppuType( (OUString *)0 ), + ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("OrganizerMode"), 0, ::getBooleanCppuType(), @@ -826,13 +826,13 @@ bool SdXMLFilter::Export() { OUString("PageLayoutNames"), 0, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("BaseURI"), 0, - ::getCppuType( (OUString *)0 ), + ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StreamRelPath"), 0, - ::getCppuType( (OUString *)0 ), + ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StreamName"), 0, - ::getCppuType( (OUString *)0 ), + ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StyleNames"), 0, ::getCppuType( (Sequence<OUString>*)0 ), diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 3335a1728c99..99a5220c8923 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -1826,7 +1826,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent, else mpCBRepeat->SetText(OUString::number(fRepeat)); } - else if( aRepeatCount.getValueType() == ::getCppuType((const Timing*)0) ) + else if( aRepeatCount.getValueType() == ::cppu::UnoType<Timing>::get() ) { Any aEnd; if( pSet->getPropertyState( nHandleEnd ) != STLPropertyState_AMBIGUOUS ) diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 3635306ac32d..69eebe20abef 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -161,7 +161,7 @@ static OUString getDescription( const Any& rTarget, bool bWithText = true ) { OUString aDescription; - if( rTarget.getValueType() == ::getCppuType((const ParagraphTarget*)0) ) + if( rTarget.getValueType() == ::cppu::UnoType<ParagraphTarget>::get() ) { ParagraphTarget aParaTarget; rTarget >>= aParaTarget; diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 78f7bb5b6eaa..f5ed766c5f91 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -700,7 +700,7 @@ void DrawController::FillPropertyTable ( rProperties.push_back( beans::Property("VisibleArea", PROPERTY_WORKAREA, - ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), + ::cppu::UnoType< ::com::sun::star::awt::Rectangle>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY)); rProperties.push_back( beans::Property( @@ -742,12 +742,12 @@ void DrawController::FillPropertyTable ( rProperties.push_back( beans::Property("ViewOffset", PROPERTY_VIEWOFFSET, - ::getCppuType((const ::com::sun::star::awt::Point*)0), + ::cppu::UnoType< ::com::sun::star::awt::Point>::get(), beans::PropertyAttribute::BOUND )); rProperties.push_back( beans::Property("DrawViewMode", PROPERTY_DRAWVIEWMODE, - ::getCppuType((const ::com::sun::star::awt::Point*)0), + ::cppu::UnoType< ::com::sun::star::awt::Point>::get(), beans::PropertyAttribute::BOUND|beans::PropertyAttribute::READONLY|beans::PropertyAttribute::MAYBEVOID )); // add new property to update current page's acc information rProperties.push_back( diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx index 46b0098f0902..b9c84b99a163 100644 --- a/sd/source/ui/unoidl/randomnode.cxx +++ b/sd/source/ui/unoidl/randomnode.cxx @@ -246,7 +246,7 @@ void SAL_CALL RandomAnimationNode::initialize( const Sequence< Any >& aArguments { aArguments[0] >>= mnPresetClass; } - else if( aArguments[0].getValueType() != ::getCppuType((const ParagraphTarget*)0) ) + else if( aArguments[0].getValueType() != ::cppu::UnoType<ParagraphTarget>::get() ) { Reference< XShape > xShape; aArguments[0] >>= xShape; diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index c0e45a4a8737..68a916125306 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -183,9 +183,9 @@ const SvxItemPropertySet* ImplGetDrawModelPropertySet() const static SfxItemPropertyMapEntry aDrawModelPropertyMap_Impl[] = { { OUString("BuildId"), WID_MODEL_BUILDID, ::getCppuType(static_cast< const OUString * >(0)), 0, 0}, - { OUString(sUNO_Prop_CharLocale), WID_MODEL_LANGUAGE, ::getCppuType((const lang::Locale*)0), 0, 0}, + { OUString(sUNO_Prop_CharLocale), WID_MODEL_LANGUAGE, ::cppu::UnoType<lang::Locale>::get(), 0, 0}, { OUString(sUNO_Prop_TabStop), WID_MODEL_TABSTOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { OUString(sUNO_Prop_VisibleArea), WID_MODEL_VISAREA, ::getCppuType((const awt::Rectangle*)0), 0, 0}, + { OUString(sUNO_Prop_VisibleArea), WID_MODEL_VISAREA, ::cppu::UnoType<awt::Rectangle>::get(), 0, 0}, { OUString(sUNO_Prop_MapUnit), WID_MODEL_MAPUNIT, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, { OUString(sUNO_Prop_ForbiddenCharacters), WID_MODEL_FORBCHARS, ::getCppuType((const uno::Reference< i18n::XForbiddenCharacters > *)0), beans::PropertyAttribute::READONLY, 0}, { OUString(sUNO_Prop_AutomContFocus), WID_MODEL_CONTFOCUS, ::getBooleanCppuType(), 0, 0}, diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 3a01a03801dd..5de5206d110b 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -136,18 +136,18 @@ static SdTypesCache gImplTypesCache; { OUString(UNO_NAME_OBJ_DIMCOLOR), WID_DIMCOLOR, ::cppu::UnoType<sal_Int32>::get(), 0, 0},\ { OUString(UNO_NAME_OBJ_DIMHIDE), WID_DIMHIDE, ::getBooleanCppuType(), 0, 0},\ { OUString(UNO_NAME_OBJ_DIMPREV), WID_DIMPREV, ::getBooleanCppuType(), 0, 0},\ - { OUString(UNO_NAME_OBJ_EFFECT), WID_EFFECT, ::getCppuType((const presentation::AnimationEffect*)0), 0, 0},\ + { OUString(UNO_NAME_OBJ_EFFECT), WID_EFFECT, ::cppu::UnoType<presentation::AnimationEffect>::get(), 0, 0},\ { OUString(UNO_NAME_OBJ_ISEMPTYPRESOBJ),WID_ISEMPTYPRESOBJ, ::getBooleanCppuType(), 0, 0},\ { OUString(UNO_NAME_OBJ_ISPRESOBJ), WID_ISPRESOBJ, ::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},\ { OUString(UNO_NAME_OBJ_MASTERDEPENDENT),WID_MASTERDEPEND, ::getBooleanCppuType(), 0, 0},\ - { OUString(UNO_NAME_OBJ_CLICKACTION), WID_CLICKACTION, ::getCppuType((const presentation::ClickAction*)0), 0, 0},\ + { OUString(UNO_NAME_OBJ_CLICKACTION), WID_CLICKACTION, ::cppu::UnoType<presentation::ClickAction>::get(), 0, 0},\ { OUString(UNO_NAME_OBJ_PLAYFULL), WID_PLAYFULL, ::getBooleanCppuType(), 0, 0},\ { OUString(UNO_NAME_OBJ_PRESORDER), WID_PRESORDER, ::cppu::UnoType<sal_Int32>::get(), 0, 0},\ { OUString(UNO_NAME_OBJ_STYLE), WID_STYLE, cppu::UnoType<style::XStyle>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},\ { OUString(UNO_NAME_OBJ_SOUNDFILE), WID_SOUNDFILE, ::cppu::UnoType<OUString>::get(), 0, 0},\ { OUString(UNO_NAME_OBJ_SOUNDON), WID_SOUNDON, ::getBooleanCppuType(), 0, 0},\ - { OUString(UNO_NAME_OBJ_SPEED), WID_SPEED, ::getCppuType((const presentation::AnimationSpeed*)0), 0, 0},\ - { OUString(UNO_NAME_OBJ_TEXTEFFECT), WID_TEXTEFFECT, ::getCppuType((const presentation::AnimationEffect*)0), 0, 0},\ + { OUString(UNO_NAME_OBJ_SPEED), WID_SPEED, ::cppu::UnoType<presentation::AnimationSpeed>::get(), 0, 0},\ + { OUString(UNO_NAME_OBJ_TEXTEFFECT), WID_TEXTEFFECT, ::cppu::UnoType<presentation::AnimationEffect>::get(), 0, 0},\ { OUString(UNO_NAME_OBJ_BLUESCREEN), WID_BLUESCREEN, ::cppu::UnoType<sal_Int32>::get(), 0, 0},\ { OUString(UNO_NAME_OBJ_VERB), WID_VERB, ::cppu::UnoType<sal_Int32>::get(), 0, 0},\ { OUString("IsAnimation"), WID_ISANIMATION, ::getBooleanCppuType(), 0, 0},\ @@ -179,7 +179,7 @@ static SdTypesCache gImplTypesCache; #define DRAW_MAP_ENTRIES\ { OUString(UNO_NAME_OBJ_BOOKMARK), WID_BOOKMARK, ::cppu::UnoType<OUString>::get(), 0, 0},\ - { OUString(UNO_NAME_OBJ_CLICKACTION), WID_CLICKACTION, ::getCppuType((const presentation::ClickAction*)0),0, 0},\ + { OUString(UNO_NAME_OBJ_CLICKACTION), WID_CLICKACTION, ::cppu::UnoType<presentation::ClickAction>::get(),0, 0},\ { OUString(UNO_NAME_OBJ_STYLE), WID_STYLE, cppu::UnoType<style::XStyle>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},\ { OUString("NavigationOrder"), WID_NAVORDER, ::cppu::UnoType<sal_Int32>::get(), 0, 0},\ { OUString(), 0, css::uno::Type(), 0, 0 } diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index be10c835a3dc..ac36ad2d3778 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -112,14 +112,14 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind eP { OUString(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString(UNO_NAME_PAGE_CHANGE), WID_PAGE_CHANGE, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString(UNO_NAME_PAGE_DURATION), WID_PAGE_DURATION, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { OUString(UNO_NAME_PAGE_EFFECT), WID_PAGE_EFFECT, ::getCppuType((const presentation::FadeEffect*)0), 0, 0}, + { OUString(UNO_NAME_PAGE_EFFECT), WID_PAGE_EFFECT, ::cppu::UnoType<presentation::FadeEffect>::get(), 0, 0}, { OUString(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, { OUString(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0}, { OUString(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0}, { OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::getCppuType((const view::PaperOrientation*)0),0, 0}, - { OUString(UNO_NAME_PAGE_SPEED), WID_PAGE_SPEED, ::getCppuType((const presentation::AnimationSpeed*)0), 0, 0}, + { OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0}, + { OUString(UNO_NAME_PAGE_SPEED), WID_PAGE_SPEED, ::cppu::UnoType<presentation::AnimationSpeed>::get(), 0, 0}, { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString(UNO_NAME_PAGE_PREVIEW), WID_PAGE_PREVIEW, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { OUString(UNO_NAME_PAGE_PREVIEWBITMAP), WID_PAGE_PREVIEWBITMAP, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, @@ -158,7 +158,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind eP { OUString(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0}, \ { OUString(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0}, \ { OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, \ - { OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::getCppuType((const view::PaperOrientation*)0),0, 0}, \ + { OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0}, \ { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},\ { OUString("IsHeaderVisible"), WID_PAGE_HEADERVISIBLE, ::getBooleanCppuType(), 0, 0}, \ @@ -194,7 +194,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind eP { OUString(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0}, \ { OUString(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0}, \ { OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, \ - { OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::getCppuType((const view::PaperOrientation*)0),0, 0}, \ + { OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0}, \ { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ { OUString(UNO_NAME_PAGE_PREVIEW), WID_PAGE_PREVIEW, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ { OUString(UNO_NAME_PAGE_PREVIEWBITMAP), WID_PAGE_PREVIEWBITMAP, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},\ @@ -268,7 +268,7 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind ) { OUString(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0}, { OUString(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0}, { OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::getCppuType((const view::PaperOrientation*)0),0, 0}, + { OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0}, { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString("BackgroundFullSize"), WID_PAGE_BACKFULL, ::getBooleanCppuType(), 0, 0}, { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, @@ -283,7 +283,7 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind ) { OUString(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::getCppuType((const view::PaperOrientation*)0),0, 0}, + { OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0}, { OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, @@ -1004,10 +1004,10 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) aAny <<= (sal_Int32)( GetPage()->GetSize().getHeight() ); break; case WID_PAGE_ORIENT: - aAny = ::cppu::int2enum( (sal_Int32)((GetPage()->GetOrientation() == ORIENTATION_PORTRAIT)? view::PaperOrientation_PORTRAIT: view::PaperOrientation_LANDSCAPE), ::getCppuType((const view::PaperOrientation*)0) ); + aAny = ::cppu::int2enum( (sal_Int32)((GetPage()->GetOrientation() == ORIENTATION_PORTRAIT)? view::PaperOrientation_PORTRAIT: view::PaperOrientation_LANDSCAPE), ::cppu::UnoType<view::PaperOrientation>::get() ); break; case WID_PAGE_EFFECT: - aAny = ::cppu::int2enum( (sal_Int32)GetPage()->GetFadeEffect(), ::getCppuType((const presentation::FadeEffect*)0) ); + aAny = ::cppu::int2enum( (sal_Int32)GetPage()->GetFadeEffect(), ::cppu::UnoType<presentation::FadeEffect>::get() ); break; case WID_PAGE_CHANGE: aAny <<= (sal_Int32)( GetPage()->GetPresChange() ); @@ -1015,7 +1015,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) case WID_PAGE_SPEED: { const double fDuration = GetPage()->getTransitionDuration(); - aAny = ::cppu::int2enum( fDuration < 2.0 ? 2 : (fDuration > 2.0 ? 0 : 1), ::getCppuType((const presentation::AnimationSpeed*)0) ); + aAny = ::cppu::int2enum( fDuration < 2.0 ? 2 : (fDuration > 2.0 ? 0 : 1), ::cppu::UnoType<presentation::AnimationSpeed>::get() ); } break; case WID_PAGE_LAYOUT: diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index 9db6ca3bf30a..d8702759a6ce 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -124,7 +124,7 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) case XATTR_FILLFLOATTRANSPARENCE : case XATTR_FILLGRADIENT : { - if ( ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::awt::Gradient*)0) ) + if ( ( pAny->getValueType() == ::cppu::UnoType< ::com::sun::star::awt::Gradient>::get() ) && ( aIt->nMemberId == MID_FILLGRADIENT ) ) { setPropertyValue( aPropertyName, *pAny ); @@ -138,7 +138,7 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) break; case XATTR_FILLHATCH : { - if ( ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::drawing::Hatch*)0) ) + if ( ( pAny->getValueType() == ::cppu::UnoType< ::com::sun::star::drawing::Hatch>::get() ) && ( aIt->nMemberId == MID_FILLHATCH ) ) { setPropertyValue( aPropertyName, *pAny ); diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx index 57547dd49c7c..6308de33f974 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/source/mathmlexport.cxx @@ -148,13 +148,13 @@ bool SmXMLExportWrapper::Export(SfxMedium &rMedium) ::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("BaseURI"), 0, - ::getCppuType( (OUString *)0 ), + ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StreamRelPath"), 0, - ::getCppuType( (OUString *)0 ), + ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StreamName"), 0, - ::getCppuType( (OUString *)0 ), + ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index 94ac10ffc993..5e1f74357e15 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -139,13 +139,13 @@ sal_uLong SmXMLImportWrapper::Import(SfxMedium &rMedium) ::getCppuType( (Reference<XInterface> *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("BaseURI"), 0, - ::getCppuType( (OUString *)0 ), + ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StreamRelPath"), 0, - ::getCppuType( (OUString *)0 ), + ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StreamName"), 0, - ::getCppuType( (OUString *)0 ), + ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index b5948a6c9cea..8cf201c08bee 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -233,22 +233,22 @@ static PropertySetInfo * lcl_createModelPropertyInfo () { static PropertyMapEntry aModelPropertyInfoMap[] = { - { OUString("Alignment") , HANDLE_ALIGNMENT , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0 }, - { OUString("BaseFontHeight") , HANDLE_BASE_FONT_HEIGHT , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0 }, + { OUString("Alignment") , HANDLE_ALIGNMENT , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 }, + { OUString("BaseFontHeight") , HANDLE_BASE_FONT_HEIGHT , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 }, { OUString("BasicLibraries") , HANDLE_BASIC_LIBRARIES , ::getCppuType((const uno::Reference< script::XLibraryContainer > *)0), PropertyAttribute::READONLY, 0 }, - { OUString("BottomMargin") , HANDLE_BOTTOM_MARGIN , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_BOTTOMSPACE }, - { OUString("CustomFontNameFixed") , HANDLE_CUSTOM_FONT_NAME_FIXED , ::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_FIXED }, - { OUString("CustomFontNameSans") , HANDLE_CUSTOM_FONT_NAME_SANS , ::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_SANS }, - { OUString("CustomFontNameSerif") , HANDLE_CUSTOM_FONT_NAME_SERIF , ::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_SERIF }, + { OUString("BottomMargin") , HANDLE_BOTTOM_MARGIN , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, DIS_BOTTOMSPACE }, + { OUString("CustomFontNameFixed") , HANDLE_CUSTOM_FONT_NAME_FIXED , ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, FNT_FIXED }, + { OUString("CustomFontNameSans") , HANDLE_CUSTOM_FONT_NAME_SANS , ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, FNT_SANS }, + { OUString("CustomFontNameSerif") , HANDLE_CUSTOM_FONT_NAME_SERIF , ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, FNT_SERIF }, { OUString("DialogLibraries") , HANDLE_DIALOG_LIBRARIES , ::getCppuType((const uno::Reference< script::XLibraryContainer > *)0), PropertyAttribute::READONLY, 0 }, { OUString("FontFixedIsBold") , HANDLE_CUSTOM_FONT_FIXED_WEIGHT , ::getBooleanCppuType(), PROPERTY_NONE, FNT_FIXED }, { OUString("FontFixedIsItalic") , HANDLE_CUSTOM_FONT_FIXED_POSTURE , ::getBooleanCppuType(), PROPERTY_NONE, FNT_FIXED }, { OUString("FontFunctionsIsBold") , HANDLE_FONT_FUNCTIONS_WEIGHT , ::getBooleanCppuType(), PROPERTY_NONE, FNT_FUNCTION }, { OUString("FontFunctionsIsItalic") , HANDLE_FONT_FUNCTIONS_POSTURE , ::getBooleanCppuType(), PROPERTY_NONE, FNT_FUNCTION }, - { OUString("FontNameFunctions") , HANDLE_FONT_NAME_FUNCTIONS , ::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_FUNCTION }, - { OUString("FontNameNumbers") , HANDLE_FONT_NAME_NUMBERS , ::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_NUMBER }, - { OUString("FontNameText") , HANDLE_FONT_NAME_TEXT , ::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_TEXT }, - { OUString("FontNameVariables") , HANDLE_FONT_NAME_VARIABLES , ::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_VARIABLE }, + { OUString("FontNameFunctions") , HANDLE_FONT_NAME_FUNCTIONS , ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, FNT_FUNCTION }, + { OUString("FontNameNumbers") , HANDLE_FONT_NAME_NUMBERS , ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, FNT_NUMBER }, + { OUString("FontNameText") , HANDLE_FONT_NAME_TEXT , ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, FNT_TEXT }, + { OUString("FontNameVariables") , HANDLE_FONT_NAME_VARIABLES , ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, FNT_VARIABLE }, { OUString("FontNumbersIsBold") , HANDLE_FONT_NUMBERS_WEIGHT , ::getBooleanCppuType(), PROPERTY_NONE, FNT_NUMBER }, { OUString("FontNumbersIsItalic") , HANDLE_FONT_NUMBERS_POSTURE , ::getBooleanCppuType(), PROPERTY_NONE, FNT_NUMBER }, { OUString("FontSansIsBold") , HANDLE_CUSTOM_FONT_SANS_WEIGHT , ::getBooleanCppuType(), PROPERTY_NONE, FNT_SANS }, @@ -259,47 +259,47 @@ static PropertySetInfo * lcl_createModelPropertyInfo () { OUString("FontTextIsItalic") , HANDLE_FONT_TEXT_POSTURE , ::getBooleanCppuType(), PROPERTY_NONE, FNT_TEXT }, { OUString("FontVariablesIsBold") , HANDLE_FONT_VARIABLES_WEIGHT , ::getBooleanCppuType(), PROPERTY_NONE, FNT_VARIABLE }, { OUString("FontVariablesIsItalic") , HANDLE_FONT_VARIABLES_POSTURE , ::getBooleanCppuType(), PROPERTY_NONE, FNT_VARIABLE }, - { OUString("Formula") , HANDLE_FORMULA , ::getCppuType((const OUString*)0), PROPERTY_NONE, 0 }, + { OUString("Formula") , HANDLE_FORMULA , ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 }, { OUString("IsScaleAllBrackets") , HANDLE_IS_SCALE_ALL_BRACKETS , ::getBooleanCppuType(), PROPERTY_NONE, 0 }, { OUString("IsTextMode") , HANDLE_IS_TEXT_MODE , ::getBooleanCppuType(), PROPERTY_NONE, 0 }, - { OUString("GreekCharStyle") , HANDLE_GREEK_CHAR_STYLE , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0 }, - { OUString("LeftMargin") , HANDLE_LEFT_MARGIN , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_LEFTSPACE }, - { OUString("PrinterName") , HANDLE_PRINTER_NAME , ::getCppuType((const OUString*)0), PROPERTY_NONE, 0 }, + { OUString("GreekCharStyle") , HANDLE_GREEK_CHAR_STYLE , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 }, + { OUString("LeftMargin") , HANDLE_LEFT_MARGIN , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, DIS_LEFTSPACE }, + { OUString("PrinterName") , HANDLE_PRINTER_NAME , ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 }, { OUString("PrinterSetup") , HANDLE_PRINTER_SETUP , ::getCppuType((const Sequence < sal_Int8 >*)0), PROPERTY_NONE, 0 }, - { OUString("RelativeBracketDistance") , HANDLE_RELATIVE_BRACKET_DISTANCE , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_BRACKETSPACE }, - { OUString("RelativeBracketExcessSize") , HANDLE_RELATIVE_BRACKET_EXCESS_SIZE , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_BRACKETSIZE }, - { OUString("RelativeFontHeightFunctions") , HANDLE_RELATIVE_FONT_HEIGHT_FUNCTIONS , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, SIZ_FUNCTION }, - { OUString("RelativeFontHeightIndices") , HANDLE_RELATIVE_FONT_HEIGHT_INDICES , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, SIZ_INDEX }, - { OUString("RelativeFontHeightLimits") , HANDLE_RELATIVE_FONT_HEIGHT_LIMITS , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, SIZ_LIMITS }, - { OUString("RelativeFontHeightOperators") , HANDLE_RELATIVE_FONT_HEIGHT_OPERATORS , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, SIZ_OPERATOR }, - { OUString("RelativeFontHeightText") , HANDLE_RELATIVE_FONT_HEIGHT_TEXT , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, SIZ_TEXT }, - { OUString("RelativeFractionBarExcessLength") , HANDLE_RELATIVE_FRACTION_BAR_EXCESS_LENGTH, ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_FRACTION }, - { OUString("RelativeFractionBarLineWeight") , HANDLE_RELATIVE_FRACTION_BAR_LINE_WEIGHT , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_STROKEWIDTH }, - { OUString("RelativeFractionDenominatorDepth") , HANDLE_RELATIVE_FRACTION_DENOMINATOR_DEPTH, ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_DENOMINATOR }, - { OUString("RelativeFractionNumeratorHeight") , HANDLE_RELATIVE_FRACTION_NUMERATOR_HEIGHT , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_NUMERATOR }, - { OUString("RelativeIndexSubscript") , HANDLE_RELATIVE_INDEX_SUBSCRIPT , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_SUBSCRIPT }, - { OUString("RelativeIndexSuperscript") , HANDLE_RELATIVE_INDEX_SUPERSCRIPT , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_SUPERSCRIPT }, - { OUString("RelativeLineSpacing") , HANDLE_RELATIVE_LINE_SPACING , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_VERTICAL }, - { OUString("RelativeLowerLimitDistance") , HANDLE_RELATIVE_LOWER_LIMIT_DISTANCE , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_LOWERLIMIT }, - { OUString("RelativeMatrixColumnSpacing") , HANDLE_RELATIVE_MATRIX_COLUMN_SPACING , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_MATRIXCOL }, - { OUString("RelativeMatrixLineSpacing") , HANDLE_RELATIVE_MATRIX_LINE_SPACING , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_MATRIXROW }, - { OUString("RelativeOperatorExcessSize") , HANDLE_RELATIVE_OPERATOR_EXCESS_SIZE , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_OPERATORSIZE }, - { OUString("RelativeOperatorSpacing") , HANDLE_RELATIVE_OPERATOR_SPACING , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_OPERATORSPACE }, - { OUString("RelativeRootSpacing") , HANDLE_RELATIVE_ROOT_SPACING , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_ROOT }, - { OUString("RelativeScaleBracketExcessSize") , HANDLE_RELATIVE_SCALE_BRACKET_EXCESS_SIZE , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_NORMALBRACKETSIZE }, - { OUString("RelativeSpacing") , HANDLE_RELATIVE_SPACING , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_HORIZONTAL }, - { OUString("RelativeSymbolMinimumHeight") , HANDLE_RELATIVE_SYMBOL_MINIMUM_HEIGHT , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_ORNAMENTSPACE }, - { OUString("RelativeSymbolPrimaryHeight") , HANDLE_RELATIVE_SYMBOL_PRIMARY_HEIGHT , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_ORNAMENTSIZE }, - { OUString("RelativeUpperLimitDistance") , HANDLE_RELATIVE_UPPER_LIMIT_DISTANCE , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_UPPERLIMIT }, - { OUString("RightMargin") , HANDLE_RIGHT_MARGIN , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_RIGHTSPACE }, + { OUString("RelativeBracketDistance") , HANDLE_RELATIVE_BRACKET_DISTANCE , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, DIS_BRACKETSPACE }, + { OUString("RelativeBracketExcessSize") , HANDLE_RELATIVE_BRACKET_EXCESS_SIZE , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, DIS_BRACKETSIZE }, + { OUString("RelativeFontHeightFunctions") , HANDLE_RELATIVE_FONT_HEIGHT_FUNCTIONS , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, SIZ_FUNCTION }, + { OUString("RelativeFontHeightIndices") , HANDLE_RELATIVE_FONT_HEIGHT_INDICES , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, SIZ_INDEX }, + { OUString("RelativeFontHeightLimits") , HANDLE_RELATIVE_FONT_HEIGHT_LIMITS , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, SIZ_LIMITS }, + { OUString("RelativeFontHeightOperators") , HANDLE_RELATIVE_FONT_HEIGHT_OPERATORS , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, SIZ_OPERATOR }, + { OUString("RelativeFontHeightText") , HANDLE_RELATIVE_FONT_HEIGHT_TEXT , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, SIZ_TEXT }, + { OUString("RelativeFractionBarExcessLength") , HANDLE_RELATIVE_FRACTION_BAR_EXCESS_LENGTH, ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, DIS_FRACTION }, + { OUString("RelativeFractionBarLineWeight") , HANDLE_RELATIVE_FRACTION_BAR_LINE_WEIGHT , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, DIS_STROKEWIDTH }, + { OUString("RelativeFractionDenominatorDepth") , HANDLE_RELATIVE_FRACTION_DENOMINATOR_DEPTH, ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, DIS_DENOMINATOR }, + { OUString("RelativeFractionNumeratorHeight") , HANDLE_RELATIVE_FRACTION_NUMERATOR_HEIGHT , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, DIS_NUMERATOR }, + { OUString("RelativeIndexSubscript") , HANDLE_RELATIVE_INDEX_SUBSCRIPT , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, DIS_SUBSCRIPT }, + { OUString("RelativeIndexSuperscript") , HANDLE_RELATIVE_INDEX_SUPERSCRIPT , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, DIS_SUPERSCRIPT }, + { OUString("RelativeLineSpacing") , HANDLE_RELATIVE_LINE_SPACING , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, DIS_VERTICAL }, + { OUString("RelativeLowerLimitDistance") , HANDLE_RELATIVE_LOWER_LIMIT_DISTANCE , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, DIS_LOWERLIMIT }, + { OUString("RelativeMatrixColumnSpacing") , HANDLE_RELATIVE_MATRIX_COLUMN_SPACING , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, DIS_MATRIXCOL }, + { OUString("RelativeMatrixLineSpacing") , HANDLE_RELATIVE_MATRIX_LINE_SPACING , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, DIS_MATRIXROW }, + { OUString("RelativeOperatorExcessSize") , HANDLE_RELATIVE_OPERATOR_EXCESS_SIZE , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, DIS_OPERATORSIZE }, + { OUString("RelativeOperatorSpacing") , HANDLE_RELATIVE_OPERATOR_SPACING , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, DIS_OPERATORSPACE }, + { OUString("RelativeRootSpacing") , HANDLE_RELATIVE_ROOT_SPACING , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, DIS_ROOT }, + { OUString("RelativeScaleBracketExcessSize") , HANDLE_RELATIVE_SCALE_BRACKET_EXCESS_SIZE , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, DIS_NORMALBRACKETSIZE }, + { OUString("RelativeSpacing") , HANDLE_RELATIVE_SPACING , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, DIS_HORIZONTAL }, + { OUString("RelativeSymbolMinimumHeight") , HANDLE_RELATIVE_SYMBOL_MINIMUM_HEIGHT , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, DIS_ORNAMENTSPACE }, + { OUString("RelativeSymbolPrimaryHeight") , HANDLE_RELATIVE_SYMBOL_PRIMARY_HEIGHT , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, DIS_ORNAMENTSIZE }, + { OUString("RelativeUpperLimitDistance") , HANDLE_RELATIVE_UPPER_LIMIT_DISTANCE , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, DIS_UPPERLIMIT }, + { OUString("RightMargin") , HANDLE_RIGHT_MARGIN , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, DIS_RIGHTSPACE }, { OUString("RuntimeUID") , HANDLE_RUNTIME_UID , ::getCppuType(static_cast< const OUString * >(0)), PropertyAttribute::READONLY, 0 }, { OUString("Symbols") , HANDLE_SYMBOLS , ::getCppuType((const Sequence < SymbolDescriptor > *)0), PROPERTY_NONE, 0 }, { OUString("UserDefinedSymbolsInUse") , HANDLE_USED_SYMBOLS , ::getCppuType((const Sequence < SymbolDescriptor > *)0), PropertyAttribute::READONLY, 0 }, - { OUString("TopMargin") , HANDLE_TOP_MARGIN , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_TOPSPACE }, + { OUString("TopMargin") , HANDLE_TOP_MARGIN , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, DIS_TOPSPACE }, // #i33095# Security Options { OUString("LoadReadonly") , HANDLE_LOAD_READONLY , ::getBooleanCppuType(), PROPERTY_NONE, 0 }, // #i972# - { OUString("BaseLine") , HANDLE_BASELINE , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0 }, + { OUString("BaseLine") , HANDLE_BASELINE , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 }, { OUString("InteropGrabBag") , HANDLE_INTEROP_GRAB_BAG , ::getCppuType((uno::Sequence< beans::PropertyValue >*)0), PROPERTY_NONE, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx index e13faaa489b6..92f0759a4345 100644 --- a/svl/source/numbers/numfmuno.cxx +++ b/svl/source/numbers/numfmuno.cxx @@ -61,19 +61,19 @@ static const SfxItemPropertyMapEntry* lcl_GetNumberFormatPropertyMap() { static const SfxItemPropertyMapEntry aNumberFormatPropertyMap_Impl[] = { - {OUString(PROPERTYNAME_FMTSTR), 0, getCppuType((OUString*)0), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {OUString(PROPERTYNAME_LOCALE), 0, getCppuType((lang::Locale*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {OUString(PROPERTYNAME_TYPE), 0, getCppuType((sal_Int16*)0), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {OUString(PROPERTYNAME_COMMENT), 0, getCppuType((OUString*)0), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {OUString(PROPERTYNAME_CURREXT), 0, getCppuType((OUString*)0), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {OUString(PROPERTYNAME_CURRSYM), 0, getCppuType((OUString*)0), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {OUString(PROPERTYNAME_DECIMALS), 0, getCppuType((sal_Int16*)0), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {OUString(PROPERTYNAME_LEADING), 0, getCppuType((sal_Int16*)0), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {OUString(PROPERTYNAME_FMTSTR), 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {OUString(PROPERTYNAME_LOCALE), 0, cppu::UnoType<lang::Locale>::get(),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {OUString(PROPERTYNAME_TYPE), 0, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {OUString(PROPERTYNAME_COMMENT), 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {OUString(PROPERTYNAME_CURREXT), 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {OUString(PROPERTYNAME_CURRSYM), 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {OUString(PROPERTYNAME_DECIMALS), 0, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {OUString(PROPERTYNAME_LEADING), 0, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, {OUString(PROPERTYNAME_NEGRED), 0, getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, {OUString(PROPERTYNAME_STDFORM), 0, getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, {OUString(PROPERTYNAME_THOUS), 0, getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, {OUString(PROPERTYNAME_USERDEF), 0, getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {OUString(PROPERTYNAME_CURRABB), 0, getCppuType((OUString*)0), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {OUString(PROPERTYNAME_CURRABB), 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; return aNumberFormatPropertyMap_Impl; @@ -84,9 +84,9 @@ static const SfxItemPropertyMapEntry* lcl_GetNumberSettingsPropertyMap() static const SfxItemPropertyMapEntry aNumberSettingsPropertyMap_Impl[] = { {OUString(PROPERTYNAME_NOZERO), 0, getBooleanCppuType(), beans::PropertyAttribute::BOUND, 0}, - {OUString(PROPERTYNAME_NULLDATE), 0, getCppuType((util::Date*)0), beans::PropertyAttribute::BOUND, 0}, - {OUString(PROPERTYNAME_STDDEC), 0, getCppuType((sal_Int16*)0), beans::PropertyAttribute::BOUND, 0}, - {OUString(PROPERTYNAME_TWODIGIT), 0, getCppuType((sal_Int16*)0), beans::PropertyAttribute::BOUND, 0}, + {OUString(PROPERTYNAME_NULLDATE), 0, cppu::UnoType<util::Date>::get(), beans::PropertyAttribute::BOUND, 0}, + {OUString(PROPERTYNAME_STDDEC), 0, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND, 0}, + {OUString(PROPERTYNAME_TWODIGIT), 0, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; return aNumberSettingsPropertyMap_Impl; diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 4bbd021c18f3..c3c47bc6895a 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -1820,7 +1820,7 @@ bool SwPostItField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const aSetDate.Day = aDateTime.GetDay(); aSetDate.Month = aDateTime.GetMonth(); aSetDate.Year = aDateTime.GetYear(); - rAny.setValue(&aSetDate, ::getCppuType((util::Date*)0)); + rAny.setValue(&aSetDate, ::cppu::UnoType<util::Date>::get()); } break; case FIELD_PROP_DATE_TIME: @@ -1868,7 +1868,7 @@ bool SwPostItField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) OSL_FAIL("Not implemented!"); break; case FIELD_PROP_DATE: - if( rAny.getValueType() == ::getCppuType((util::Date*)0) ) + if( rAny.getValueType() == ::cppu::UnoType<util::Date>::get() ) { util::Date aSetDate = *(util::Date*)rAny.getValue(); aDateTime = Date(aSetDate.Day, aSetDate.Month, aSetDate.Year); diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 4b38b4f7f06e..baaabf736bfb 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -223,7 +223,7 @@ bool SwFmtFrmSize::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const awt::Size aTmp; aTmp.Height = convertTwipToMm100(m_aSize.Height()); aTmp.Width = convertTwipToMm100(m_aSize.Width()); - rVal.setValue(&aTmp, ::getCppuType((const awt::Size*)0)); + rVal.setValue(&aTmp, ::cppu::UnoType<awt::Size>::get()); } break; case MID_FRMSIZE_REL_HEIGHT: diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx index 02fb48327617..88ec5406e816 100644 --- a/sw/source/core/para/paratr.cxx +++ b/sw/source/core/para/paratr.cxx @@ -135,7 +135,7 @@ bool SwFmtDrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const aDrop.Lines = nLines ; aDrop.Count = nChars ; aDrop.Distance = convertTwipToMm100(nDistance); - rVal.setValue(&aDrop, ::getCppuType((const style::DropCapFormat*)0)); + rVal.setValue(&aDrop, ::cppu::UnoType<style::DropCapFormat>::get()); } break; case MID_DROPCAP_WHOLE_WORD: @@ -185,7 +185,7 @@ bool SwFmtDrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } case MID_DROPCAP_FORMAT: { - if(rVal.getValueType() == ::getCppuType((const style::DropCapFormat*)0)) + if(rVal.getValueType() == ::cppu::UnoType<style::DropCapFormat>::get()) { const style::DropCapFormat* pDrop = (const style::DropCapFormat*)rVal.getValue(); nLines = pDrop->Lines; diff --git a/sw/source/core/uibase/shells/drformsh.cxx b/sw/source/core/uibase/shells/drformsh.cxx index 1c39b6837c20..3892d620ce83 100644 --- a/sw/source/core/uibase/shells/drformsh.cxx +++ b/sw/source/core/uibase/shells/drformsh.cxx @@ -143,7 +143,7 @@ void SwDrawFormShell::Execute(SfxRequest &rReq) } form::FormButtonType eButtonType = form::FormButtonType_URL; - aTmp.setValue( &eButtonType, ::getCppuType((const form::FormButtonType*)0)); + aTmp.setValue( &eButtonType, ::cppu::UnoType<form::FormButtonType>::get()); xPropSet->setPropertyValue( "ButtonType", aTmp ); } } diff --git a/sw/source/core/uibase/shells/textdrw.cxx b/sw/source/core/uibase/shells/textdrw.cxx index d6931e32e151..ec30e19d1545 100644 --- a/sw/source/core/uibase/shells/textdrw.cxx +++ b/sw/source/core/uibase/shells/textdrw.cxx @@ -101,7 +101,7 @@ void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget, } form::FormButtonType eButtonType = form::FormButtonType_URL; - aTmp.setValue( &eButtonType, ::getCppuType((const form::FormButtonType*)0)); + aTmp.setValue( &eButtonType, ::cppu::UnoType<form::FormButtonType>::get()); xPropSet->setPropertyValue( "ButtonType", aTmp ); #if HAVE_FEATURE_AVMEDIA diff --git a/sw/source/core/uibase/utlui/unotools.cxx b/sw/source/core/uibase/utlui/unotools.cxx index 363017fd7fc2..8875d35b73a3 100644 --- a/sw/source/core/uibase/utlui/unotools.cxx +++ b/sw/source/core/uibase/utlui/unotools.cxx @@ -355,7 +355,7 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer ) aSize >>= aPSize; //TODO: set page width to card width aPSize.Width = 10000; - aSize.setValue(&aPSize, ::getCppuType((awt::Size*)0)); + aSize.setValue(&aPSize, ::cppu::UnoType<awt::Size>::get()); xPProp->setPropertyValue(UNO_NAME_SIZE, aSize); uno::Any aZero; aZero <<= (sal_Int32)0; diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 790b4eaaf753..96cc9b7134d5 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -1513,7 +1513,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex( // #i101131# // adjust conversion due to type mismatch between <Size> and <awt::Size> awt::Size aAwtSize(convertTwipToMm100(aSize.Width()), convertTwipToMm100(aSize.Height())); - pData = new PropValData((void*)&aAwtSize, UNO_NAME_GRAPHIC_SIZE, ::getCppuType((const awt::Size*)0)); + pData = new PropValData((void*)&aAwtSize, UNO_NAME_GRAPHIC_SIZE, ::cppu::UnoType<awt::Size>::get()); aPropertyValues.push_back(pData); const SwFmtVertOrient* pOrient = rFmt.GetGraphicOrientation(); @@ -2013,7 +2013,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( assert( !pDocShell ); if(!pSetSize) pSetSize = new Size; - if(pData->aVal.getValueType() == ::getCppuType((awt::Size*)0)) + if(pData->aVal.getValueType() == ::cppu::UnoType<awt::Size>::get()) { awt::Size* pSize = (awt::Size*)pData->aVal.getValue(); pSize->Width = convertMm100ToTwip(pSize->Width); diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index 3efec76032f9..fd90d1e0b16b 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -781,7 +781,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, aTmp = xPropSet->getPropertyValue( OUString("ButtonType") ); if( aTmp.getValueType() == - ::getCppuType((const form::FormButtonType*)0) ) + ::cppu::UnoType<form::FormButtonType>::get() ) eButtonType = *( form::FormButtonType*)aTmp.getValue(); switch( eButtonType ) diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index be5926c5bc2d..0a19a7f226a2 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -561,13 +561,13 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c ::getCppuType( (uno::Reference<XInterface> *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("BaseURI"), 0, - ::getCppuType( (OUString *)0 ), + ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StreamRelPath"), 0, - ::getCppuType( (OUString *)0 ), + ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StreamName"), 0, - ::getCppuType( (OUString *)0 ), + ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, // properties for insert modes { OUString("StyleInsertModeFamilies"), 0, @@ -594,7 +594,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("BuildId"), 0, - ::getCppuType( (OUString *)0 ), + ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, // Add property, which indicates, if a text document in OpenOffice.org diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 4ee2f71728f0..9fa3e9178a11 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -126,13 +126,13 @@ sal_uInt32 SwXMLWriter::_Write( const uno::Reference < task::XStatusIndicator >& ::getCppuType((Sequence<sal_Int8>*)0), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("BaseURI"), 0, - ::getCppuType( (OUString *)0 ), + ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StreamRelPath"), 0, - ::getCppuType( (OUString *)0 ), + ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StreamName"), 0, - ::getCppuType( (OUString *)0 ), + ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("AutoTextMode"), 0, ::getBooleanCppuType(), diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 08564a5960f2..5e18019f02e4 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -251,15 +251,15 @@ IMPL_LINK_NOARG(SwFldDokInfPage, SubTypeHdl) { uno::Any aVal = xCustomPropertySet->getPropertyValue( sName ); const uno::Type& rValueType = aVal.getValueType(); - if( rValueType == ::getCppuType( (util::DateTime*)0 )) + if( rValueType == ::cppu::UnoType<util::DateTime>::get()) { nNewType = NUMBERFORMAT_DATETIME; } - else if( rValueType == ::getCppuType( (util::Date*)0 )) + else if( rValueType == ::cppu::UnoType<util::Date>::get()) { nNewType = NUMBERFORMAT_DATE; } - else if( rValueType == ::getCppuType( (util::Time*)0 )) + else if( rValueType == ::cppu::UnoType<util::Time>::get()) { nNewType = NUMBERFORMAT_TIME; } diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx index 3d19b020c69a..a95a392705d3 100644 --- a/xmloff/source/chart/PropertyMaps.cxx +++ b/xmloff/source/chart/PropertyMaps.cxx @@ -110,7 +110,7 @@ const XMLPropertyHandler* XMLChartPropHdlFactory::GetPropertyHandler( sal_Int32 case XML_SCH_TYPE_ERROR_BAR_STYLE: // here we have a constant rather than an enum pHdl = new XMLErrorBarStylePropertyHdl( aXMLChartErrorBarStyleEnumMap, - ::getCppuType((const sal_Int32*)0) ); + ::cppu::UnoType<sal_Int32>::get() ); break; case XML_SCH_TYPE_ERROR_INDICATOR_LOWER: @@ -123,12 +123,12 @@ const XMLPropertyHandler* XMLChartPropHdlFactory::GetPropertyHandler( sal_Int32 case XML_SCH_TYPE_SOLID_TYPE: // here we have a constant rather than an enum pHdl = new XMLEnumPropertyHdl( aXMLChartSolidTypeEnumMap, - ::getCppuType((const sal_Int32*)0) ); + ::cppu::UnoType<sal_Int32>::get() ); break; case XML_SCH_TYPE_LABEL_PLACEMENT_TYPE: // here we have a constant rather than an enum pHdl = new XMLEnumPropertyHdl( aXMLChartDataLabelPlacementEnumMap, - ::getCppuType((const sal_Int32*)0) ); + ::cppu::UnoType<sal_Int32>::get() ); break; case XML_SCH_TYPE_DATAROWSOURCE: pHdl = new XMLEnumPropertyHdl( aXMLChartDataRowSourceTypeEnumMap, @@ -140,7 +140,7 @@ const XMLPropertyHandler* XMLChartPropHdlFactory::GetPropertyHandler( sal_Int32 case XML_SCH_TYPE_INTERPOLATION: pHdl = new XMLEnumPropertyHdl( aXMLChartInterpolationTypeEnumMap, - ::getCppuType((const sal_Int32*)0) ); + ::cppu::UnoType<sal_Int32>::get() ); break; case XML_SCH_TYPE_SYMBOL_TYPE: pHdl = new XMLSymbolTypePropertyHdl( false ); @@ -152,7 +152,7 @@ const XMLPropertyHandler* XMLChartPropHdlFactory::GetPropertyHandler( sal_Int32 case XML_SCH_TYPE_MISSING_VALUE_TREATMENT: pHdl = new XMLEnumPropertyHdl( aXMLChartMissingValueTreatmentEnumMap, - ::getCppuType((const sal_Int32*)0) ); + ::cppu::UnoType<sal_Int32>::get() ); break; } if( pHdl ) diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 9f82ac441980..5f4d9b9622fe 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -1334,7 +1334,7 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) ::comphelper::PropertyMapEntry const aInfoMap[] = { { OUString("Class"), 0, - ::getCppuType((OUString*)0), + ::cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 9b5354d2bfb9..a13f50bd0620 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -1445,7 +1445,7 @@ ProgressBarHelper* SvXMLImport::GetProgressBarHelper() void SvXMLImport::AddNumberStyle(sal_Int32 nKey, const OUString& rName) { if (!mxNumberStyles.is()) - mxNumberStyles = uno::Reference< container::XNameContainer >( comphelper::NameContainer_createInstance( ::getCppuType((const sal_Int32*)0)) ); + mxNumberStyles = uno::Reference< container::XNameContainer >( comphelper::NameContainer_createInstance( ::cppu::UnoType<sal_Int32>::get()) ); if (mxNumberStyles.is()) { uno::Any aAny; diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 99841899651a..e8089caa61d3 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -886,7 +886,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy } case XML_SD_TYPE_LINECAP : { - pHdl = new XMLEnumPropertyHdl( aXML_LineCap_EnumMap, ::getCppuType((const drawing::LineCap*)0) ); + pHdl = new XMLEnumPropertyHdl( aXML_LineCap_EnumMap, ::cppu::UnoType<drawing::LineCap>::get() ); break; } case XML_SD_TYPE_FILLSTYLE : @@ -896,7 +896,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy } case XML_SD_TYPE_PRESPAGE_TYPE : { - pHdl = new XMLEnumPropertyHdl( aXML_PresChange_EnumMap, ::getCppuType((const sal_Int32*)0) ); + pHdl = new XMLEnumPropertyHdl( aXML_PresChange_EnumMap, ::cppu::UnoType<sal_Int32>::get() ); break; } case XML_SD_TYPE_SHADOW : @@ -911,7 +911,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy } case XML_SD_TYPE_PRESPAGE_STYLE : { - pHdl = new XMLEnumPropertyHdl( aXML_FadeEffect_EnumMap, ::getCppuType((const presentation::FadeEffect*)0) ); + pHdl = new XMLEnumPropertyHdl( aXML_FadeEffect_EnumMap, ::cppu::UnoType<presentation::FadeEffect>::get() ); break; } case XML_SD_TYPE_PRESPAGE_SPEED : @@ -1061,7 +1061,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy } break; case XML_SD_TYPE_MEASURE_UNIT: - pHdl = new XMLEnumPropertyHdl( pXML_MeasureUnit_Enum, ::getCppuType((const sal_Int32*)0) ); + pHdl = new XMLEnumPropertyHdl( pXML_MeasureUnit_Enum, ::cppu::UnoType<sal_Int32>::get() ); break; case XML_SD_TYPE_MEASURE_HALIGN: pHdl = new XMLEnumPropertyHdl( pXML_Measure_HAlign_Enum, ::getCppuType((const com::sun::star::drawing::MeasureTextHorzPos*)0) ); @@ -1083,16 +1083,16 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy // #FontWork# case XML_SD_TYPE_FONTWORK_STYLE : - pHdl = new XMLEnumPropertyHdl( pXML_Fontwork_Style_Enum , ::getCppuType((const sal_Int32*)0)); + pHdl = new XMLEnumPropertyHdl( pXML_Fontwork_Style_Enum , ::cppu::UnoType<sal_Int32>::get()); break; case XML_SD_TYPE_FONTWORK_ADJUST : - pHdl = new XMLEnumPropertyHdl( pXML_Fontwork_Adjust_Enum , ::getCppuType((const sal_Int32*)0)); + pHdl = new XMLEnumPropertyHdl( pXML_Fontwork_Adjust_Enum , ::cppu::UnoType<sal_Int32>::get()); break; case XML_SD_TYPE_FONTWORK_SHADOW : - pHdl = new XMLEnumPropertyHdl( pXML_Fontwork_Shadow_Enum , ::getCppuType((const sal_Int32*)0)); + pHdl = new XMLEnumPropertyHdl( pXML_Fontwork_Shadow_Enum , ::cppu::UnoType<sal_Int32>::get()); break; case XML_SD_TYPE_FONTWORK_FORM : - pHdl = new XMLEnumPropertyHdl( pXML_Fontwork_Form_Enum , ::getCppuType((const sal_Int32*)0)); + pHdl = new XMLEnumPropertyHdl( pXML_Fontwork_Form_Enum , ::cppu::UnoType<sal_Int32>::get()); break; case XML_SD_TYPE_CONTROL_BORDER: @@ -1123,10 +1123,10 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy pHdl = new XMLPercentOrMeasurePropertyHandler( false ); break; case XML_SD_TYPE_CAPTION_ESC_DIR: - pHdl = new XMLEnumPropertyHdl( pXML_Caption_Esc_Dir_Enum , ::getCppuType((const sal_Int32*)0)); + pHdl = new XMLEnumPropertyHdl( pXML_Caption_Esc_Dir_Enum , ::cppu::UnoType<sal_Int32>::get()); break; case XML_SD_TYPE_CAPTION_TYPE: - pHdl = new XMLEnumPropertyHdl( pXML_Caption_Type_Enum , ::getCppuType((const sal_Int32*)0)); + pHdl = new XMLEnumPropertyHdl( pXML_Caption_Type_Enum , ::cppu::UnoType<sal_Int32>::get()); break; case XML_SD_TYPE_DATETIMEUPDATE: pHdl = new XMLNamedBoolPropertyHdl( GetXMLToken(XML_FIXED), GetXMLToken(XML_VARIABLE) ); @@ -1135,10 +1135,10 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy pHdl = new XMLDateTimeFormatHdl( mpExport ); break; case XML_SD_TYPE_TRANSITION_TYPE: - pHdl = new XMLEnumPropertyHdl( xmloff::getAnimationsEnumMap(xmloff::Animations_EnumMap_TransitionType) , ::getCppuType((const sal_Int16*)0)); + pHdl = new XMLEnumPropertyHdl( xmloff::getAnimationsEnumMap(xmloff::Animations_EnumMap_TransitionType) , ::cppu::UnoType<sal_Int16>::get()); break; case XML_SD_TYPE_TRANSTIION_SUBTYPE: - pHdl = new XMLEnumPropertyHdl( xmloff::getAnimationsEnumMap(xmloff::Animations_EnumMap_TransitionSubType) , ::getCppuType((const sal_Int16*)0)); + pHdl = new XMLEnumPropertyHdl( xmloff::getAnimationsEnumMap(xmloff::Animations_EnumMap_TransitionSubType) , ::cppu::UnoType<sal_Int16>::get()); break; case XML_SD_TYPE_TRANSTIION_DIRECTION: pHdl = new XMLNamedBoolPropertyHdl( GetXMLToken(XML_FORWARD), GetXMLToken(XML_REVERSE) ); diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index 5bb4e1dc27d3..d26b0b5e0164 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -1461,7 +1461,7 @@ void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAc uno::Reference< container::XNameAccess > SdXMLStylesContext::getPageLayouts() const { - uno::Reference< container::XNameContainer > xLayouts( comphelper::NameContainer_createInstance( ::getCppuType((const sal_Int32*)0)) ); + uno::Reference< container::XNameContainer > xLayouts( comphelper::NameContainer_createInstance( ::cppu::UnoType<sal_Int32>::get()) ); for(sal_uInt32 a(0L); a < GetStyleCount(); a++) { diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx index 915fa558bc5a..f4117f84f52e 100644 --- a/xmloff/source/meta/MetaExportComponent.cxx +++ b/xmloff/source/meta/MetaExportComponent.cxx @@ -82,7 +82,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum ) ::comphelper::PropertyMapEntry const aInfoMap[] = { { OUString("Class"), 0, - ::getCppuType((OUString*)0), + ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 5b7f503970d4..b4ad80d53374 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -376,10 +376,10 @@ BoundFrameSets::BoundFrameSets(const Reference<XInterface> xModel) void FieldParamExporter::Export() { - const Type aStringType = ::getCppuType((OUString*)0); + const Type aStringType = ::cppu::UnoType<OUString>::get(); const Type aBoolType = ::getCppuType((sal_Bool*)0); const Type aSeqType = ::getCppuType((Sequence<OUString>*)0); - const Type aIntType = ::getCppuType((sal_Int32*)0); + const Type aIntType = ::cppu::UnoType<sal_Int32>::get(); Sequence<OUString> vParameters(m_xFieldParams->getElementNames()); for(const OUString* pCurrent = vParameters.begin(); pCurrent != vParameters.end(); ++pCurrent) { |