[Libreoffice-commits] core.git: basic/source connectivity/source dtrans/source dtrans/test editeng/source extensions/source extensions/test filter/source fpicker/source include/editeng include/svx linguistic/source oox/source sd/source starmath/source svl/source sw/source xmloff/source
Julien Nabet
serval2412 at yahoo.fr
Fri May 9 21:20:27 PDT 2014
basic/source/classes/sbunoobj.cxx | 32
basic/source/uno/scriptcont.cxx | 4
connectivity/source/drivers/ado/Aolevariant.cxx | 10
connectivity/source/drivers/postgresql/pq_baseresultset.cxx | 10
connectivity/source/drivers/postgresql/pq_preparedstatement.cxx | 16
connectivity/source/drivers/postgresql/pq_statement.cxx | 16
connectivity/source/drivers/postgresql/pq_statics.cxx | 4
dtrans/source/generic/generic_clipboard.cxx | 2
dtrans/source/test/test_dtrans.cxx | 2
dtrans/source/win32/dtobj/DOTransferable.cxx | 4
dtrans/source/win32/dtobj/DataFmtTransl.cxx | 6
dtrans/source/win32/ftransl/ftransl.cxx | 6
dtrans/source/win32/workbench/test_wincb.cxx | 2
dtrans/test/win32/dnd/transferable.cxx | 2
editeng/source/items/frmitems.cxx | 4
editeng/source/uno/unofield.cxx | 24
editeng/source/uno/unoipset.cxx | 4
editeng/source/uno/unonrule.cxx | 2
editeng/source/uno/unotext.cxx | 2
editeng/source/xml/xmltxtexp.cxx | 2
extensions/source/bibliography/general.cxx | 2
extensions/source/ole/oleobjw.cxx | 22
extensions/source/ole/servprov.cxx | 8
extensions/source/ole/unoconversionutilities.hxx | 28
extensions/test/ole/OleClient/funcs.cxx | 2
extensions/test/ole/OleConverterVar1/convTest.cxx | 2
filter/source/graphicfilter/icgm/actimpr.cxx | 6
filter/source/msfilter/msocximex.cxx | 2
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 4
fpicker/source/aqua/SalAquaFilePicker.mm | 4
fpicker/source/win32/filepicker/FilePicker.cxx | 4
fpicker/source/win32/misc/WinImplHelper.cxx | 14
include/editeng/unotext.hxx | 86 +-
include/svx/unoshprp.hxx | 348 +++++-----
linguistic/source/lngopt.cxx | 14
oox/source/helper/propertymap.cxx | 4
sd/source/core/CustomAnimationEffect.cxx | 22
sd/source/core/EffectMigration.cxx | 2
sd/source/core/stlsheet.cxx | 8
sd/source/filter/xml/sdxmlwrp.cxx | 14
sd/source/ui/animations/CustomAnimationDialog.cxx | 2
sd/source/ui/animations/CustomAnimationList.cxx | 2
sd/source/ui/unoidl/DrawController.cxx | 6
sd/source/ui/unoidl/randomnode.cxx | 2
sd/source/ui/unoidl/unomodel.cxx | 4
sd/source/ui/unoidl/unoobj.cxx | 10
sd/source/ui/unoidl/unopage.cxx | 20
sd/source/ui/unoidl/unopback.cxx | 4
starmath/source/mathmlexport.cxx | 6
starmath/source/mathmlimport.cxx | 6
starmath/source/unomodel.cxx | 84 +-
svl/source/numbers/numfmuno.cxx | 24
sw/source/core/fields/docufld.cxx | 4
sw/source/core/layout/atrfrm.cxx | 2
sw/source/core/para/paratr.cxx | 4
sw/source/core/uibase/shells/drformsh.cxx | 2
sw/source/core/uibase/shells/textdrw.cxx | 2
sw/source/core/uibase/utlui/unotools.cxx | 2
sw/source/core/unocore/unosett.cxx | 4
sw/source/filter/html/htmlforw.cxx | 2
sw/source/filter/xml/swxml.cxx | 8
sw/source/filter/xml/wrtxml.cxx | 6
sw/source/ui/fldui/flddinf.cxx | 6
xmloff/source/chart/PropertyMaps.cxx | 10
xmloff/source/core/xmlexp.cxx | 2
xmloff/source/core/xmlimp.cxx | 2
xmloff/source/draw/sdpropls.cxx | 24
xmloff/source/draw/ximpstyl.cxx | 2
xmloff/source/meta/MetaExportComponent.cxx | 2
xmloff/source/text/txtparae.cxx | 4
70 files changed, 504 insertions(+), 504 deletions(-)
New commits:
commit 5ec7a589bed7991ffe8ad9a2f544a6699d159765
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sat May 10 00:14:44 2014 +0200
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part8
Change-Id: Ie16923d17541e84e0d7424fffe37caf410786abf
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 296e706..102fe6c 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 486eb96..574af68 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 af91f6fe..02e6fa2 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 5b4a030..a8af6d4 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 83dbdbf..55c0175 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 e002067..23727db 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 0b6a15c..0d349a8 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 98953bf6..fee7607 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 a8503a6..3e5c0a7 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 475ecad..a88b32b 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 d1109ec6..37c8dd8 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 4348a70..156f4fa 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 a065dc0..0527ae4 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 87dbc79..b9bd35f 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 55f642c..6fca87b 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 6e14f3c..fd44829 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 84915f0..e0b66fc 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 3b3f242..971b55b 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 659baec..e2c4b7a 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 6e5b01b..65bb17a 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 bd27749..2babb13 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 f7070bf..ca0c815 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 e650b2e..77006bf 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 4d3059d..bdbe761 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 c484644..68c3700 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 726a17c..1b949ce 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 43ff940..8db2cc3 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 5706df0..fbb419d 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 ced9df1..7703264 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 6c2aa35..7c4858a 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 2d91c33..a8bb989 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 bc42e73..6011bcf 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 90a2961..528eb50 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 40b4f64..3b263fd 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}, \
\
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list