[Libreoffice-commits] core.git: connectivity/source dbaccess/source extensions/source forms/source reportdesign/source ucb/source ucb/workben xmlhelp/source xmloff/source
Julien Nabet
serval2412 at yahoo.fr
Sat May 10 14:54:51 PDT 2014
connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx | 8 -
connectivity/source/commontools/dbexception.cxx | 6 -
connectivity/source/drivers/ado/AColumn.cxx | 2
connectivity/source/drivers/ado/AUser.cxx | 2
connectivity/source/drivers/file/FResultSet.cxx | 8 -
connectivity/source/drivers/file/FStatement.cxx | 16 +-
connectivity/source/drivers/hsqldb/HUser.cxx | 2
connectivity/source/drivers/mysql/YUser.cxx | 2
connectivity/source/sdbcx/VCatalog.cxx | 2
connectivity/source/sdbcx/VIndex.cxx | 2
connectivity/source/sdbcx/VKey.cxx | 8 -
connectivity/source/sdbcx/VKeyColumn.cxx | 2
connectivity/source/sdbcx/VTable.cxx | 8 -
connectivity/source/sdbcx/VView.cxx | 8 -
dbaccess/source/core/api/RowSet.cxx | 54 +++++-----
dbaccess/source/core/api/TableDeco.cxx | 2
dbaccess/source/core/dataaccess/ContentHelper.cxx | 4
extensions/source/resource/ResourceIndexAccess.cxx | 2
forms/source/component/ComboBox.cxx | 2
forms/source/component/ListBox.cxx | 4
reportdesign/source/ui/report/ReportController.cxx | 2
ucb/source/cacher/cachedcontentresultset.cxx | 4
ucb/source/core/ucbprops.cxx | 12 +-
ucb/source/ucp/cmis/cmis_content.cxx | 24 ++--
ucb/source/ucp/cmis/cmis_repo_content.cxx | 4
ucb/source/ucp/ext/ucpext_content.cxx | 8 -
ucb/source/ucp/file/bc.cxx | 10 -
ucb/source/ucp/file/filrset.cxx | 4
ucb/source/ucp/file/prov.cxx | 6 -
ucb/source/ucp/file/shell.cxx | 34 +++---
ucb/source/ucp/ftp/ftpcontent.cxx | 2
ucb/source/ucp/ftp/ftpcontentcaps.cxx | 10 -
ucb/source/ucp/ftp/ftpresultsetbase.cxx | 4
ucb/source/ucp/gio/gio_content.cxx | 18 +--
ucb/source/ucp/gvfs/gvfs_content.cxx | 22 ++--
ucb/source/ucp/hierarchy/hierarchycontent.cxx | 10 -
ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx | 32 ++---
ucb/source/ucp/package/pkgcontent.cxx | 10 -
ucb/source/ucp/package/pkgcontentcaps.cxx | 24 ++--
ucb/source/ucp/tdoc/tdoc_content.cxx | 6 -
ucb/source/ucp/tdoc/tdoc_contentcaps.cxx | 24 ++--
ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx | 28 ++---
ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx | 38 +++----
ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx | 28 ++---
ucb/source/ucp/webdav/webdavcontentcaps.cxx | 38 +++----
ucb/workben/ucb/ucbdemo.cxx | 6 -
xmlhelp/source/cxxhelp/provider/contentcaps.cxx | 10 -
xmlhelp/source/cxxhelp/provider/resultsetbase.cxx | 4
xmloff/source/forms/elementimport.cxx | 2
xmloff/source/forms/formattributes.cxx | 8 -
xmloff/source/forms/layerimport.cxx | 14 +-
xmloff/source/forms/propertyimport.cxx | 2
52 files changed, 296 insertions(+), 296 deletions(-)
New commits:
commit fa51b556800f332b311786770b3d6e57b65f615c
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sat May 10 23:51:21 2014 +0200
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part9
Change-Id: I82ed4a4868cb22566706ca0f4b1321e0d45016cf
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 8598bfc..87bd7d3 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -86,10 +86,10 @@ ODatabaseMetaDataResultSet::~ODatabaseMetaDataResultSet()
void ODatabaseMetaDataResultSet::construct()
{
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::getCppuType(static_cast<sal_Int32*>(0)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY,&m_nResultSetType, ::getCppuType(static_cast<sal_Int32*>(0)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0, &m_nFetchDirection, ::getCppuType(static_cast<sal_Int32*>(0)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY,&m_nResultSetConcurrency, ::getCppuType(static_cast<sal_Int32*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::cppu::UnoType<sal_Int32>::get());
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY,&m_nResultSetType, ::cppu::UnoType<sal_Int32>::get());
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0, &m_nFetchDirection, ::cppu::UnoType<sal_Int32>::get());
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY,&m_nResultSetConcurrency, ::cppu::UnoType<sal_Int32>::get());
}
void ODatabaseMetaDataResultSet::setType(MetaDataResultSetType _eType)
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index 11fb067..77abf1e 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -140,9 +140,9 @@ SQLExceptionInfo::SQLExceptionInfo(const staruno::Any& _rError)
void SQLExceptionInfo::implDetermineType()
{
- const Type& aSQLExceptionType = ::getCppuType( static_cast< SQLException* >( 0 ) );
- const Type& aSQLWarningType = ::getCppuType( static_cast< SQLWarning* >( 0 ) );
- const Type& aSQLContextType = ::getCppuType( static_cast< SQLContext* >( 0 ) );
+ const Type& aSQLExceptionType = ::cppu::UnoType<SQLException>::get();
+ const Type& aSQLWarningType = ::cppu::UnoType<SQLWarning>::get();
+ const Type& aSQLContextType = ::cppu::UnoType<SQLContext>::get();
if ( isAssignableFrom( aSQLContextType, m_aContent.getValueType() ) )
m_eType = SQL_CONTEXT;
diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx
index 5ae6385..4ba8812 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -106,7 +106,7 @@ void OAdoColumn::construct()
sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING), PROPERTY_ID_ISASCENDING, nAttrib,&m_IsAscending, ::getBooleanCppuType());
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(static_cast< OUString*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::cppu::UnoType<OUString>::get());
}
void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception)
diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx
index dc3ce53..810946e 100644
--- a/connectivity/source/drivers/ado/AUser.cxx
+++ b/connectivity/source/drivers/ado/AUser.cxx
@@ -136,7 +136,7 @@ OUserExtend::OUserExtend(OCatalog* _pParent,sal_Bool _bCase, const OUString& _Na
void OUserExtend::construct()
{
OUser_TYPEDEF::construct();
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< OUString*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::cppu::UnoType<OUString>::get());
}
cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index e51b25c..fd90fb1 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -135,10 +135,10 @@ OResultSet::~OResultSet()
void OResultSet::construct()
{
SAL_INFO( "connectivity.drivers", "file Ocke.Janssen at sun.com OResultSet::construct" );
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::getCppuType(static_cast<sal_Int32*>(0)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY,&m_nResultSetType, ::getCppuType(static_cast<sal_Int32*>(0)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0,&m_nFetchDirection, ::getCppuType(static_cast<sal_Int32*>(0)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY,PropertyAttribute::READONLY,&m_nResultSetConcurrency, ::getCppuType(static_cast<sal_Int32*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::cppu::UnoType<sal_Int32>::get());
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY,&m_nResultSetType, ::cppu::UnoType<sal_Int32>::get());
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0,&m_nFetchDirection, ::cppu::UnoType<sal_Int32>::get());
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY,PropertyAttribute::READONLY,&m_nResultSetConcurrency, ::cppu::UnoType<sal_Int32>::get());
}
void OResultSet::disposing(void)
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index af6936e..5be7e09 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -78,16 +78,16 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection )
sal_Int32 nAttrib = 0;
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, nAttrib,&m_aCursorName, ::getCppuType(static_cast< OUString*>(0)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), PROPERTY_ID_MAXFIELDSIZE, nAttrib,&m_nMaxFieldSize, ::getCppuType(static_cast<sal_Int32*>(0)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), PROPERTY_ID_MAXROWS, nAttrib,&m_nMaxRows, ::getCppuType(static_cast<sal_Int32*>(0)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), PROPERTY_ID_QUERYTIMEOUT, nAttrib,&m_nQueryTimeOut, ::getCppuType(static_cast<sal_Int32*>(0)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, nAttrib,&m_nFetchSize, ::getCppuType(static_cast<sal_Int32*>(0)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, nAttrib,&m_nResultSetType, ::getCppuType(static_cast<sal_Int32*>(0)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, nAttrib,&m_nFetchDirection, ::getCppuType(static_cast<sal_Int32*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, nAttrib,&m_aCursorName, ::cppu::UnoType<OUString>::get());
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), PROPERTY_ID_MAXFIELDSIZE, nAttrib,&m_nMaxFieldSize, ::cppu::UnoType<sal_Int32>::get());
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), PROPERTY_ID_MAXROWS, nAttrib,&m_nMaxRows, ::cppu::UnoType<sal_Int32>::get());
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), PROPERTY_ID_QUERYTIMEOUT, nAttrib,&m_nQueryTimeOut, ::cppu::UnoType<sal_Int32>::get());
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, nAttrib,&m_nFetchSize, ::cppu::UnoType<sal_Int32>::get());
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, nAttrib,&m_nResultSetType, ::cppu::UnoType<sal_Int32>::get());
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, nAttrib,&m_nFetchDirection, ::cppu::UnoType<sal_Int32>::get());
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING),PROPERTY_ID_ESCAPEPROCESSING, nAttrib,&m_bEscapeProcessing,::getCppuBooleanType());
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, nAttrib,&m_nResultSetConcurrency, ::getCppuType(static_cast<sal_Int32*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, nAttrib,&m_nResultSetConcurrency, ::cppu::UnoType<sal_Int32>::get());
}
OStatement_Base::~OStatement_Base()
diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx
index 83eece4..df04d37 100644
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -61,7 +61,7 @@ OUserExtend::OUserExtend( const ::com::sun::star::uno::Reference< ::com::sun::
void OUserExtend::construct()
{
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< OUString*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::cppu::UnoType<OUString>::get());
}
cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const
diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx
index 4d955ee..f67cbaf 100644
--- a/connectivity/source/drivers/mysql/YUser.cxx
+++ b/connectivity/source/drivers/mysql/YUser.cxx
@@ -61,7 +61,7 @@ OUserExtend::OUserExtend( const ::com::sun::star::uno::Reference< ::com::sun::
void OUserExtend::construct()
{
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< OUString*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::cppu::UnoType<OUString>::get());
}
cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const
diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx
index 9af5e22..8691057 100644
--- a/connectivity/source/sdbcx/VCatalog.cxx
+++ b/connectivity/source/sdbcx/VCatalog.cxx
@@ -220,7 +220,7 @@ void OCatalog::fillNames(Reference< XResultSet >& _xResult,TStringVector& _rName
void ODescriptor::construct()
{
sal_Int32 nAttrib = isNew() ? 0 : ::com::sun::star::beans::PropertyAttribute::READONLY;
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME), PROPERTY_ID_NAME ,nAttrib,&m_Name,::getCppuType(static_cast< OUString*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME), PROPERTY_ID_NAME ,nAttrib,&m_Name,::cppu::UnoType<OUString>::get());
}
ODescriptor::~ODescriptor()
diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx
index 43c6167..4729228 100644
--- a/connectivity/source/sdbcx/VIndex.cxx
+++ b/connectivity/source/sdbcx/VIndex.cxx
@@ -127,7 +127,7 @@ void OIndex::construct()
sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOG), PROPERTY_ID_CATALOG, nAttrib,&m_Catalog, ::getCppuType(static_cast< OUString*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOG), PROPERTY_ID_CATALOG, nAttrib,&m_Catalog, ::cppu::UnoType<OUString>::get());
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISUNIQUE), PROPERTY_ID_ISUNIQUE, nAttrib,&m_IsUnique, ::getBooleanCppuType());
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISPRIMARYKEYINDEX),PROPERTY_ID_ISPRIMARYKEYINDEX, nAttrib,&m_IsPrimaryKeyIndex, ::getBooleanCppuType());
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCLUSTERED), PROPERTY_ID_ISCLUSTERED, nAttrib,&m_IsClustered, ::getBooleanCppuType());
diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx
index af05f81..a7d3c42 100644
--- a/connectivity/source/sdbcx/VKey.cxx
+++ b/connectivity/source/sdbcx/VKey.cxx
@@ -123,10 +123,10 @@ void OKey::construct()
sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REFERENCEDTABLE), PROPERTY_ID_REFERENCEDTABLE, nAttrib,&m_aProps->m_ReferencedTable, ::getCppuType(static_cast< OUString*>(0)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_aProps->m_Type, ::getCppuType(static_cast<sal_Int32*>(0)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_UPDATERULE), PROPERTY_ID_UPDATERULE, nAttrib,&m_aProps->m_UpdateRule, ::getCppuType(static_cast<sal_Int32*>(0)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELETERULE), PROPERTY_ID_DELETERULE, nAttrib,&m_aProps->m_DeleteRule, ::getCppuType(static_cast<sal_Int32*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REFERENCEDTABLE), PROPERTY_ID_REFERENCEDTABLE, nAttrib,&m_aProps->m_ReferencedTable, ::cppu::UnoType<OUString>::get());
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_aProps->m_Type, ::cppu::UnoType<sal_Int32>::get());
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_UPDATERULE), PROPERTY_ID_UPDATERULE, nAttrib,&m_aProps->m_UpdateRule, ::cppu::UnoType<sal_Int32>::get());
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELETERULE), PROPERTY_ID_DELETERULE, nAttrib,&m_aProps->m_DeleteRule, ::cppu::UnoType<sal_Int32>::get());
}
void SAL_CALL OKey::disposing()
diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx
index fdbb9e2..dafe705 100644
--- a/connectivity/source/sdbcx/VKeyColumn.cxx
+++ b/connectivity/source/sdbcx/VKeyColumn.cxx
@@ -107,7 +107,7 @@ OKeyColumn::~OKeyColumn()
void OKeyColumn::construct()
{
sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(static_cast< OUString*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::cppu::UnoType<OUString>::get());
}
diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx
index 2a2fe35..e9cb3ae 100644
--- a/connectivity/source/sdbcx/VTable.cxx
+++ b/connectivity/source/sdbcx/VTable.cxx
@@ -106,10 +106,10 @@ void OTable::construct()
sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(static_cast< OUString*>(0)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(static_cast< OUString*>(0)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION), PROPERTY_ID_DESCRIPTION,nAttrib,&m_Description, ::getCppuType(static_cast< OUString*>(0)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_Type, ::getCppuType(static_cast< OUString*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::cppu::UnoType<OUString>::get());
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::cppu::UnoType<OUString>::get());
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION), PROPERTY_ID_DESCRIPTION,nAttrib,&m_Description, ::cppu::UnoType<OUString>::get());
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_Type, ::cppu::UnoType<OUString>::get());
}
void SAL_CALL OTable::acquire() throw()
diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx
index acae77f..e8cedba 100644
--- a/connectivity/source/sdbcx/VView.cxx
+++ b/connectivity/source/sdbcx/VView.cxx
@@ -69,10 +69,10 @@ void OView::construct()
sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(static_cast< OUString*>(0)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(static_cast< OUString*>(0)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND), PROPERTY_ID_COMMAND, nAttrib,&m_Command, ::getCppuType(static_cast< OUString*>(0)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CHECKOPTION), PROPERTY_ID_CHECKOPTION,nAttrib,&m_CheckOption, ::getCppuType(static_cast< sal_Int32*>(0)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::cppu::UnoType<OUString>::get());
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::cppu::UnoType<OUString>::get());
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND), PROPERTY_ID_COMMAND, nAttrib,&m_Command, ::cppu::UnoType<OUString>::get());
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CHECKOPTION), PROPERTY_ID_CHECKOPTION,nAttrib,&m_CheckOption, ::cppu::UnoType<sal_Int32>::get());
}
void OView::disposing(void)
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 6eeb20b..ed0471e 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -171,17 +171,17 @@ ORowSet::ORowSet( const Reference< ::com::sun::star::uno::XComponentContext >& _
// sdb.RowSet Properties
registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT|PropertyAttribute::BOUND, &m_aActiveConnection, ::getCppuType(static_cast< Reference< XConnection >* >(0)));
- registerProperty(PROPERTY_DATASOURCENAME, PROPERTY_ID_DATASOURCENAME, PropertyAttribute::BOUND, &m_aDataSourceName, ::getCppuType(static_cast< OUString*>(0)));
- registerProperty(PROPERTY_COMMAND, PROPERTY_ID_COMMAND, PropertyAttribute::BOUND, &m_aCommand, ::getCppuType(static_cast< OUString*>(0)));
- registerProperty(PROPERTY_COMMAND_TYPE, PROPERTY_ID_COMMAND_TYPE, PropertyAttribute::BOUND, &m_nCommandType, ::getCppuType(static_cast< sal_Int32*>(0)));
- registerProperty(PROPERTY_ACTIVECOMMAND, PROPERTY_ID_ACTIVECOMMAND, nRBT, &m_aActiveCommand, ::getCppuType(static_cast< OUString*>(0)));
+ registerProperty(PROPERTY_DATASOURCENAME, PROPERTY_ID_DATASOURCENAME, PropertyAttribute::BOUND, &m_aDataSourceName, ::cppu::UnoType<OUString>::get());
+ registerProperty(PROPERTY_COMMAND, PROPERTY_ID_COMMAND, PropertyAttribute::BOUND, &m_aCommand, ::cppu::UnoType<OUString>::get());
+ registerProperty(PROPERTY_COMMAND_TYPE, PROPERTY_ID_COMMAND_TYPE, PropertyAttribute::BOUND, &m_nCommandType, ::cppu::UnoType<sal_Int32>::get());
+ registerProperty(PROPERTY_ACTIVECOMMAND, PROPERTY_ID_ACTIVECOMMAND, nRBT, &m_aActiveCommand, ::cppu::UnoType<OUString>::get());
registerProperty(PROPERTY_IGNORERESULT, PROPERTY_ID_IGNORERESULT, PropertyAttribute::BOUND, &m_bIgnoreResult, ::getBooleanCppuType());
- registerProperty(PROPERTY_FILTER, PROPERTY_ID_FILTER, PropertyAttribute::BOUND, &m_aFilter, ::getCppuType(static_cast< OUString*>(0)));
- registerProperty(PROPERTY_HAVING_CLAUSE, PROPERTY_ID_HAVING_CLAUSE, PropertyAttribute::BOUND, &m_aHavingClause, ::getCppuType(static_cast< OUString*>(0)));
- registerProperty(PROPERTY_GROUP_BY, PROPERTY_ID_GROUP_BY, PropertyAttribute::BOUND, &m_aGroupBy, ::getCppuType(static_cast< OUString*>(0)));
+ registerProperty(PROPERTY_FILTER, PROPERTY_ID_FILTER, PropertyAttribute::BOUND, &m_aFilter, ::cppu::UnoType<OUString>::get());
+ registerProperty(PROPERTY_HAVING_CLAUSE, PROPERTY_ID_HAVING_CLAUSE, PropertyAttribute::BOUND, &m_aHavingClause, ::cppu::UnoType<OUString>::get());
+ registerProperty(PROPERTY_GROUP_BY, PROPERTY_ID_GROUP_BY, PropertyAttribute::BOUND, &m_aGroupBy, ::cppu::UnoType<OUString>::get());
registerProperty(PROPERTY_APPLYFILTER, PROPERTY_ID_APPLYFILTER, PropertyAttribute::BOUND, &m_bApplyFilter, ::getBooleanCppuType());
- registerProperty(PROPERTY_ORDER, PROPERTY_ID_ORDER, PropertyAttribute::BOUND, &m_aOrder, ::getCppuType(static_cast< OUString*>(0)));
- registerProperty(PROPERTY_PRIVILEGES, PROPERTY_ID_PRIVILEGES, nRT, &m_nPrivileges, ::getCppuType(static_cast< sal_Int32*>(0)));
+ registerProperty(PROPERTY_ORDER, PROPERTY_ID_ORDER, PropertyAttribute::BOUND, &m_aOrder, ::cppu::UnoType<OUString>::get());
+ registerProperty(PROPERTY_PRIVILEGES, PROPERTY_ID_PRIVILEGES, nRT, &m_nPrivileges, ::cppu::UnoType<sal_Int32>::get());
registerProperty(PROPERTY_ISMODIFIED, PROPERTY_ID_ISMODIFIED, nBT, &m_bModified, ::getBooleanCppuType());
registerProperty(PROPERTY_ISNEW, PROPERTY_ID_ISNEW, nRBT, &m_bNew, ::getBooleanCppuType());
registerProperty(PROPERTY_SINGLESELECTQUERYCOMPOSER,PROPERTY_ID_SINGLESELECTQUERYCOMPOSER, nRT, &m_xComposer, ::getCppuType(static_cast< Reference< XSingleSelectQueryComposer >* >(0)));
@@ -190,25 +190,25 @@ ORowSet::ORowSet( const Reference< ::com::sun::star::uno::XComponentContext >& _
registerProperty(PROPERTY_ISBOOKMARKABLE, PROPERTY_ID_ISBOOKMARKABLE, nRT, &m_bIsBookmarkable, ::getBooleanCppuType());
registerProperty(PROPERTY_CANUPDATEINSERTEDROWS,PROPERTY_ID_CANUPDATEINSERTEDROWS, nRT, &m_bCanUpdateInsertedRows, ::getBooleanCppuType());
// sdbc.ResultSet Properties
- registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::TRANSIENT, &m_nResultSetConcurrency,::getCppuType(static_cast< sal_Int32*>(0)));
- registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::TRANSIENT, &m_nResultSetType, ::getCppuType(static_cast< sal_Int32*>(0)));
- registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(static_cast< sal_Int32*>(0)));
- registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(static_cast< sal_Int32*>(0)));
+ registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::TRANSIENT, &m_nResultSetConcurrency,::cppu::UnoType<sal_Int32>::get());
+ registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::TRANSIENT, &m_nResultSetType, ::cppu::UnoType<sal_Int32>::get());
+ registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::cppu::UnoType<sal_Int32>::get());
+ registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::cppu::UnoType<sal_Int32>::get());
// sdbc.RowSet Properties
- registerProperty(PROPERTY_URL, PROPERTY_ID_URL, 0, &m_aURL, ::getCppuType(static_cast< OUString*>(0)));
- registerProperty(PROPERTY_TRANSACTIONISOLATION, PROPERTY_ID_TRANSACTIONISOLATION, PropertyAttribute::TRANSIENT, &m_nTransactionIsolation,::getCppuType(static_cast< sal_Int32*>(0)));
+ registerProperty(PROPERTY_URL, PROPERTY_ID_URL, 0, &m_aURL, ::cppu::UnoType<OUString>::get());
+ registerProperty(PROPERTY_TRANSACTIONISOLATION, PROPERTY_ID_TRANSACTIONISOLATION, PropertyAttribute::TRANSIENT, &m_nTransactionIsolation,::cppu::UnoType<sal_Int32>::get());
registerMayBeVoidProperty(PROPERTY_TYPEMAP, PROPERTY_ID_TYPEMAP, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT, &m_aTypeMap, ::getCppuType(static_cast< Reference< XNameAccess >* >(0)));
registerProperty(PROPERTY_ESCAPE_PROCESSING,PROPERTY_ID_ESCAPE_PROCESSING, PropertyAttribute::BOUND, &m_bUseEscapeProcessing,::getBooleanCppuType() );
- registerProperty(PROPERTY_QUERYTIMEOUT, PROPERTY_ID_QUERYTIMEOUT, PropertyAttribute::TRANSIENT, &m_nQueryTimeOut, ::getCppuType(static_cast< sal_Int32*>(0)));
- registerProperty(PROPERTY_MAXFIELDSIZE, PROPERTY_ID_MAXFIELDSIZE, PropertyAttribute::TRANSIENT, &m_nMaxFieldSize, ::getCppuType(static_cast< sal_Int32*>(0)));
- registerProperty(PROPERTY_MAXROWS, PROPERTY_ID_MAXROWS, 0, &m_nMaxRows, ::getCppuType(static_cast< sal_Int32*>(0)) );
- registerProperty(PROPERTY_USER, PROPERTY_ID_USER, PropertyAttribute::TRANSIENT, &m_aUser, ::getCppuType(static_cast< OUString*>(0)));
- registerProperty(PROPERTY_PASSWORD, PROPERTY_ID_PASSWORD, PropertyAttribute::TRANSIENT, &m_aPassword, ::getCppuType(static_cast< OUString*>(0)));
+ registerProperty(PROPERTY_QUERYTIMEOUT, PROPERTY_ID_QUERYTIMEOUT, PropertyAttribute::TRANSIENT, &m_nQueryTimeOut, ::cppu::UnoType<sal_Int32>::get());
+ registerProperty(PROPERTY_MAXFIELDSIZE, PROPERTY_ID_MAXFIELDSIZE, PropertyAttribute::TRANSIENT, &m_nMaxFieldSize, ::cppu::UnoType<sal_Int32>::get());
+ registerProperty(PROPERTY_MAXROWS, PROPERTY_ID_MAXROWS, 0, &m_nMaxRows, ::cppu::UnoType<sal_Int32>::get() );
+ registerProperty(PROPERTY_USER, PROPERTY_ID_USER, PropertyAttribute::TRANSIENT, &m_aUser, ::cppu::UnoType<OUString>::get());
+ registerProperty(PROPERTY_PASSWORD, PROPERTY_ID_PASSWORD, PropertyAttribute::TRANSIENT, &m_aPassword, ::cppu::UnoType<OUString>::get());
- registerProperty(PROPERTY_UPDATE_CATALOGNAME, PROPERTY_ID_UPDATE_CATALOGNAME, PropertyAttribute::BOUND, &m_aUpdateCatalogName, ::getCppuType(static_cast< OUString*>(0)));
- registerProperty(PROPERTY_UPDATE_SCHEMANAME, PROPERTY_ID_UPDATE_SCHEMANAME, PropertyAttribute::BOUND, &m_aUpdateSchemaName, ::getCppuType(static_cast< OUString*>(0)));
- registerProperty(PROPERTY_UPDATE_TABLENAME, PROPERTY_ID_UPDATE_TABLENAME, PropertyAttribute::BOUND, &m_aUpdateTableName, ::getCppuType(static_cast< OUString*>(0)));
+ registerProperty(PROPERTY_UPDATE_CATALOGNAME, PROPERTY_ID_UPDATE_CATALOGNAME, PropertyAttribute::BOUND, &m_aUpdateCatalogName, ::cppu::UnoType<OUString>::get());
+ registerProperty(PROPERTY_UPDATE_SCHEMANAME, PROPERTY_ID_UPDATE_SCHEMANAME, PropertyAttribute::BOUND, &m_aUpdateSchemaName, ::cppu::UnoType<OUString>::get());
+ registerProperty(PROPERTY_UPDATE_TABLENAME, PROPERTY_ID_UPDATE_TABLENAME, PropertyAttribute::BOUND, &m_aUpdateTableName, ::cppu::UnoType<OUString>::get());
// ???
registerProperty(PROPERTY_CHANGE_NOTIFICATION_ENABLED, PROPERTY_ID_PROPCHANGE_NOTIFY, PropertyAttribute::BOUND, &m_bPropChangeNotifyEnabled, ::getBooleanCppuType());
@@ -2829,10 +2829,10 @@ ORowSetClone::ORowSetClone( const Reference<XComponentContext>& _rContext, ORowS
// sdb.RowSet Properties
registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, &rParent.m_aActiveConnection, ::getCppuType(static_cast< Reference< XConnection >* >(0)));
- registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY, &m_nResultSetConcurrency,::getCppuType(static_cast< sal_Int32*>(0)));
- registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY, &m_nResultSetType, ::getCppuType(static_cast< sal_Int32*>(0)));
- registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(static_cast< sal_Int32*>(0)));
- registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(static_cast< sal_Int32*>(0)));
+ registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY, &m_nResultSetConcurrency,::cppu::UnoType<sal_Int32>::get());
+ registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY, &m_nResultSetType, ::cppu::UnoType<sal_Int32>::get());
+ registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::cppu::UnoType<sal_Int32>::get());
+ registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::cppu::UnoType<sal_Int32>::get());
registerProperty(PROPERTY_ISBOOKMARKABLE, PROPERTY_ID_ISBOOKMARKABLE, nRT, &m_bIsBookmarkable, ::getBooleanCppuType());
}
diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx
index 84010da..e7dfba1 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -145,7 +145,7 @@ sal_Bool SAL_CALL ODBTableDecorator::convertFastPropertyValue(
{
Any aValue;
getFastPropertyValue(aValue,nHandle);
- bRet = ::comphelper::tryPropertyValue(rConvertedValue,rOldValue,rValue,aValue,::getCppuType(static_cast< OUString*>(0)));
+ bRet = ::comphelper::tryPropertyValue(rConvertedValue,rOldValue,rValue,aValue,::cppu::UnoType<OUString>::get());
}
break; // we assume that it works
}
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index ce43d56..ff32477 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -449,13 +449,13 @@ Reference< XRow > OContentHelper::getPropertyValues( const Sequence< Property >&
// Append all Core Properties.
xRow->appendString (
Property( "ContentType", -1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
PropertyAttribute::BOUND
| PropertyAttribute::READONLY ),
getContentType() );
xRow->appendString (
Property( "Title", -1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
PropertyAttribute::BOUND ),
m_pImpl->m_aProps.aTitle );
xRow->appendBoolean(
diff --git a/extensions/source/resource/ResourceIndexAccess.cxx b/extensions/source/resource/ResourceIndexAccess.cxx
index 4671086..10bb0bc 100644
--- a/extensions/source/resource/ResourceIndexAccess.cxx
+++ b/extensions/source/resource/ResourceIndexAccess.cxx
@@ -66,7 +66,7 @@ namespace
virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XElementAccessBase
virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return ::getCppuType(static_cast< OUString*>(0)); };
+ { return ::cppu::UnoType<OUString>::get(); };
};
class ResourceStringListIndexAccess : public ResourceIndexAccessBase
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index c49abf2..e7c1730 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -212,7 +212,7 @@ void OComboBoxModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const
switch (_nHandle)
{
case PROPERTY_ID_LISTSOURCETYPE :
- DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(static_cast<ListSourceType*>(0))),
+ DBG_ASSERT(_rValue.getValueType().equals(::cppu::UnoType<ListSourceType>::get()),
"OComboBoxModel::setFastPropertyValue_NoBroadcast : invalid type !" );
_rValue >>= m_eListSourceType;
break;
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 7dcd15f..e0c017f 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -306,7 +306,7 @@ namespace frm
break;
case PROPERTY_ID_LISTSOURCETYPE :
- DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(static_cast<ListSourceType*>(0))),
+ DBG_ASSERT(_rValue.getValueType().equals(::cppu::UnoType<ListSourceType>::get()),
"OComboBoxModel::setFastPropertyValue_NoBroadcast : invalid type !" );
_rValue >>= m_eListSourceType;
break;
@@ -399,7 +399,7 @@ namespace frm
switch (_nHandle)
{
case PROPERTY_ID_BOUNDCOLUMN :
- bModified = tryPropertyValue(_rConvertedValue, _rOldValue, _rValue, m_aBoundColumn, ::getCppuType(static_cast<sal_Int16*>(0)));
+ bModified = tryPropertyValue(_rConvertedValue, _rOldValue, _rValue, m_aBoundColumn, ::cppu::UnoType<sal_Int16>::get());
break;
case PROPERTY_ID_LISTSOURCETYPE:
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index e4fd4e0..c4f709a 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -304,7 +304,7 @@ OReportController::OReportController(Reference< XComponentContext > const & xCon
m_pReportControllerObserver->acquire();
registerProperty(OUString("ZoomValue"), PROPERTY_ID_ZOOMVALUE,
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::TRANSIENT,
- &m_nZoomValue, ::getCppuType(static_cast< sal_Int16*>(0)));
+ &m_nZoomValue, ::cppu::UnoType<sal_Int16>::get());
}
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index 5d43109..7cf7006 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -489,7 +489,7 @@ CCRS_PropertySetInfo::CCRS_PropertySetInfo(
{
Property& rMyProp = (*m_pProperties)[ nOrigProps - nDeleted ];
rMyProp.Name = m_aPropertyNameForFetchSize;
- rMyProp.Type = getCppuType( static_cast< const sal_Int32 * >( 0 ) );
+ rMyProp.Type = cppu::UnoType<sal_Int32>::get();
rMyProp.Attributes = PropertyAttribute::BOUND | PropertyAttribute::MAYBEDEFAULT;
if( nFetchSize != -1 )
@@ -503,7 +503,7 @@ CCRS_PropertySetInfo::CCRS_PropertySetInfo(
{
Property& rMyProp = (*m_pProperties)[ nOrigProps - nDeleted + 1 ];
rMyProp.Name = m_aPropertyNameForFetchDirection;
- rMyProp.Type = getCppuType( static_cast< const sal_Bool * >( 0 ) );
+ rMyProp.Type = cppu::UnoType<sal_Bool>::get();
rMyProp.Attributes = PropertyAttribute::BOUND | PropertyAttribute::MAYBEDEFAULT;
if( nFetchDirection != -1 )
diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index 120c6b8..2693fb6 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -61,31 +61,31 @@ struct PropertyTableEntry
static const com::sun::star::uno::Type& OUString_getCppuType()
{
- return getCppuType( static_cast< const OUString * >( 0 ) );
+ return cppu::UnoType<OUString>::get();
}
static const com::sun::star::uno::Type& sal_uInt16_getCppuType()
{
// ! uInt -> Int, because of Java !!!
- return getCppuType( static_cast< const sal_Int16 * >( 0 ) );
+ return cppu::UnoType<sal_Int16>::get();
}
static const com::sun::star::uno::Type& sal_uInt32_getCppuType()
{
// ! uInt -> Int, because of Java !!!
- return getCppuType( static_cast< const sal_Int32 * >( 0 ) );
+ return cppu::UnoType<sal_Int32>::get();
}
static const com::sun::star::uno::Type& sal_uInt64_getCppuType()
{
// ! uInt -> Int, because of Java !!!
- return getCppuType( static_cast< const sal_Int64 * >( 0 ) );
+ return cppu::UnoType<sal_Int64>::get();
}
static const com::sun::star::uno::Type& enum_getCppuType()
{
// ! enum -> Int, because of Java !!!
- return getCppuType( static_cast< const sal_Int16 * >( 0 ) );
+ return cppu::UnoType<sal_Int16>::get();
}
static const com::sun::star::uno::Type& sal_Bool_getCppuType()
@@ -95,7 +95,7 @@ static const com::sun::star::uno::Type& sal_Bool_getCppuType()
static const com::sun::star::uno::Type& byte_getCppuType()
{
- return getCppuType( static_cast< const sal_Int8 * >( 0 ) );
+ return cppu::UnoType<sal_Int8>::get();
}
static const com::sun::star::uno::Type& Sequence_CrossReference_getCppuType()
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index a37606c..96a1639 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -1448,31 +1448,31 @@ namespace cmis
-1, getCppuBooleanType(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "Title" ),
- -1, getCppuType( static_cast< const OUString * >( 0 ) ),
+ -1, cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ),
beans::Property( OUString( "ObjectId" ),
- -1, getCppuType( static_cast< const OUString * >( 0 ) ),
+ -1, cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ),
beans::Property( OUString( "TitleOnServer" ),
- -1, getCppuType( static_cast< const OUString * >( 0 ) ),
+ -1, cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ),
beans::Property( OUString( "IsReadOnly" ),
-1, getCppuBooleanType(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "DateCreated" ),
- -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ),
+ -1, cppu::UnoType<util::DateTime>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "DateModified" ),
- -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ),
+ -1, cppu::UnoType<util::DateTime>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "Size" ),
- -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ),
+ -1, cppu::UnoType<sal_Int64>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "CreatableContentsInfo" ),
-1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "MediaType" ),
- -1, getCppuType( static_cast< const OUString * >( 0 ) ),
+ -1, cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ),
beans::Property( OUString( "CmisProperties" ),
-1, getCppuType( static_cast< const uno::Sequence< document::CmisProperty> * >( 0 ) ),
@@ -1523,13 +1523,13 @@ namespace cmis
-1, getCppuType( static_cast<ucb::InsertCommandArgument2 * >( 0 ) ) ),
ucb::CommandInfo
( OUString( "open" ),
- -1, getCppuType( static_cast<ucb::OpenCommandArgument2 * >( 0 ) ) ),
+ -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ),
// Mandatory CMIS-only commands
ucb::CommandInfo ( OUString( "checkout" ), -1, getCppuVoidType() ),
ucb::CommandInfo ( OUString( "cancelCheckout" ), -1, getCppuVoidType() ),
ucb::CommandInfo ( OUString( "checkIn" ), -1,
- getCppuType( static_cast<ucb::TransferInfo * >( 0 ) ) ),
+ cppu::UnoType<ucb::TransferInfo>::get() ),
ucb::CommandInfo ( OUString( "updateProperties" ), -1, getCppuVoidType() ),
ucb::CommandInfo
( OUString( "getAllVersions" ),
@@ -1539,10 +1539,10 @@ namespace cmis
// Folder Only, omitted if not a folder
ucb::CommandInfo
( OUString( "transfer" ),
- -1, getCppuType( static_cast<ucb::TransferInfo * >( 0 ) ) ),
+ -1, cppu::UnoType<ucb::TransferInfo>::get() ),
ucb::CommandInfo
( OUString( "createNewContent" ),
- -1, getCppuType( static_cast<ucb::ContentInfo * >( 0 ) ) )
+ -1, cppu::UnoType<ucb::ContentInfo>::get() )
};
const int nProps = SAL_N_ELEMENTS( aCommandInfoTable );
@@ -1829,7 +1829,7 @@ namespace cmis
props[0] = beans::Property(
OUString("Title"),
-1,
- getCppuType( static_cast< OUString* >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND );
// file
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index 116c4b2..3771e1a 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -221,7 +221,7 @@ namespace cmis
-1, getCppuBooleanType(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "Title" ),
- -1, getCppuType( static_cast< const OUString * >( 0 ) ),
+ -1, cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ),
beans::Property( OUString( "IsReadOnly" ),
-1, getCppuBooleanType(),
@@ -254,7 +254,7 @@ namespace cmis
// Optional standard commands
ucb::CommandInfo
( OUString( "open" ),
- -1, getCppuType( static_cast<ucb::OpenCommandArgument2 * >( 0 ) ) ),
+ -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ),
};
const int nProps = SAL_N_ELEMENTS(aCommandInfoTable);
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index d5fa68e..dfb9488 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -435,12 +435,12 @@ namespace ucb { namespace ucp { namespace ext
// Append all Core Properties.
xRow->appendString ( Property( OUString("ContentType"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
PropertyAttribute::BOUND | PropertyAttribute::READONLY ),
ContentProvider::getArtificialNodeContentType() );
xRow->appendString ( Property( OUString("Title"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
PropertyAttribute::BOUND | PropertyAttribute::READONLY ),
i_rTitle );
xRow->appendBoolean( Property( OUString("IsDocument"),
@@ -594,7 +594,7 @@ namespace ucb { namespace ucp { namespace ext
Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
PropertyAttribute::BOUND | PropertyAttribute::READONLY
),
Property(
@@ -612,7 +612,7 @@ namespace ucb { namespace ucp { namespace ext
Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
PropertyAttribute::BOUND | PropertyAttribute::READONLY
)
};
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index e444d31..3b59a31 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -398,7 +398,7 @@ BaseContent::execute( const Command& aCommand,
seq[0] = beans::Property(
OUString("CasePreservingURL"),
-1,
- getCppuType( static_cast< sal_Bool* >(0) ),
+ cppu::UnoType<sal_Bool>::get(),
0 );
Reference< sdbc::XRow > xRow = getPropertyValues( CommandId,seq );
OUString CasePreservingURL = xRow->getString(1);
@@ -507,7 +507,7 @@ BaseContent::getContentType()
Sequence< beans::Property > seq(1);
seq[0] = beans::Property( OUString("IsDocument"),
-1,
- getCppuType( static_cast< sal_Bool* >(0) ),
+ cppu::UnoType<sal_Bool>::get(),
0 );
Reference< sdbc::XRow > xRow = getPropertyValues( -1,seq );
bool IsDocument = xRow->getBoolean( 1 );
@@ -644,7 +644,7 @@ BaseContent::createNewContent(
Sequence< beans::Property > seq(1);
seq[0] = beans::Property( OUString("IsDocument"),
-1,
- getCppuType( static_cast< sal_Bool* >(0) ),
+ cppu::UnoType<sal_Bool>::get(),
0 );
Reference< sdbc::XRow > xRow = getPropertyValues( -1,seq );
IsDocument = xRow->getBoolean( 1 );
@@ -1101,7 +1101,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier,
Sequence< beans::Property > seq(1);
seq[0] = beans::Property( OUString("IsDocument"),
-1,
- getCppuType( static_cast< sal_Bool* >(0) ),
+ cppu::UnoType<sal_Bool>::get(),
0 );
Reference< sdbc::XRow > xRow = getPropertyValues( nMyCommandIdentifier,seq );
bool IsDocument = xRow->getBoolean( 1 );
@@ -1170,7 +1170,7 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier,
Sequence< beans::Property > seq(1);
seq[0] = beans::Property( OUString("IsDocument"),
-1,
- getCppuType( static_cast< sal_Bool* >(0) ),
+ cppu::UnoType<sal_Bool>::get(),
0 );
Reference< sdbc::XRow > xRow = getPropertyValues( -1,seq );
diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx
index cdc6682..f499af0 100644
--- a/ucb/source/ucp/file/filrset.cxx
+++ b/ucb/source/ucp/file/filrset.cxx
@@ -743,12 +743,12 @@ XResultSet_impl::getPropertySetInfo()
uno::Sequence< beans::Property > seq(2);
seq[0].Name = "RowCount";
seq[0].Handle = -1;
- seq[0].Type = getCppuType( static_cast< sal_Int32* >(0) );
+ seq[0].Type = cppu::UnoType<sal_Int32>::get();
seq[0].Attributes = beans::PropertyAttribute::READONLY;
seq[0].Name = "IsRowCountFinal";
seq[0].Handle = -1;
- seq[0].Type = getCppuType( static_cast< sal_Bool* >(0) );
+ seq[0].Type = cppu::UnoType<sal_Bool>::get();
seq[0].Attributes = beans::PropertyAttribute::READONLY;
XPropertySetInfo_impl* p = new XPropertySetInfo_impl( m_pMyShell,
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index 223d4c8..ac5b6e4 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -336,17 +336,17 @@ XPropertySetInfoImpl2::XPropertySetInfoImpl2()
{
m_seq[0] = Property( OUString("HostName"),
-1,
- getCppuType( static_cast< OUString* >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
PropertyAttribute::READONLY );
m_seq[1] = Property( OUString("HomeDirectory"),
-1,
- getCppuType( static_cast< OUString* >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
PropertyAttribute::READONLY );
m_seq[2] = Property( OUString("FileSystemNotation"),
-1,
- getCppuType( static_cast< sal_Int32* >( 0 ) ),
+ cppu::UnoType<sal_Int32>::get(),
PropertyAttribute::READONLY );
}
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index e9d3111..c5ac2ef 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -177,7 +177,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_aDefaultProperties.insert( MyProperty( true,
Title,
-1 ,
- getCppuType( static_cast< OUString* >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -188,7 +188,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
MyProperty( true,
CasePreservingURL,
-1 ,
- getCppuType( static_cast< OUString* >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -200,7 +200,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_aDefaultProperties.insert( MyProperty( true,
IsFolder,
-1 ,
- getCppuType( static_cast< sal_Bool* >( 0 ) ),
+ cppu::UnoType<sal_Bool>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -212,7 +212,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_aDefaultProperties.insert( MyProperty( true,
IsDocument,
-1 ,
- getCppuType( static_cast< sal_Bool* >( 0 ) ),
+ cppu::UnoType<sal_Bool>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -223,7 +223,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_aDefaultProperties.insert( MyProperty( true,
IsVolume,
-1 ,
- getCppuType( static_cast< sal_Bool* >( 0 ) ),
+ cppu::UnoType<sal_Bool>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -235,7 +235,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_aDefaultProperties.insert( MyProperty( true,
IsRemoveable,
-1 ,
- getCppuType( static_cast< sal_Bool* >( 0 ) ),
+ cppu::UnoType<sal_Bool>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -246,7 +246,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_aDefaultProperties.insert( MyProperty( true,
IsRemote,
-1 ,
- getCppuType( static_cast< sal_Bool* >( 0 ) ),
+ cppu::UnoType<sal_Bool>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -257,7 +257,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_aDefaultProperties.insert( MyProperty( true,
IsCompactDisc,
-1 ,
- getCppuType( static_cast< sal_Bool* >( 0 ) ),
+ cppu::UnoType<sal_Bool>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -268,7 +268,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_aDefaultProperties.insert( MyProperty( true,
IsFloppy,
-1 ,
- getCppuType( static_cast< sal_Bool* >( 0 ) ),
+ cppu::UnoType<sal_Bool>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -281,7 +281,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
true,
IsHidden,
-1 ,
- getCppuType( static_cast< sal_Bool* >( 0 ) ),
+ cppu::UnoType<sal_Bool>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -299,7 +299,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_aDefaultProperties.insert( MyProperty( false,
ContentType,
-1 ,
- getCppuType( static_cast< OUString* >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
aAny,
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -311,7 +311,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_aDefaultProperties.insert( MyProperty( true,
DateModified,
-1 ,
- getCppuType( static_cast< util::DateTime* >( 0 ) ),
+ cppu::UnoType<util::DateTime>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -321,7 +321,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_aDefaultProperties.insert( MyProperty( true,
Size,
-1,
- getCppuType( static_cast< sal_Int64* >( 0 ) ),
+ cppu::UnoType<sal_Int64>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -331,7 +331,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_aDefaultProperties.insert( MyProperty( true,
IsReadOnly,
-1 ,
- getCppuType( static_cast< sal_Bool* >( 0 ) ),
+ cppu::UnoType<sal_Bool>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -376,7 +376,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_sCommandInfo[6].Name = "delete";
m_sCommandInfo[6].Handle = -1;
- m_sCommandInfo[6].ArgType = getCppuType( static_cast< sal_Bool* >( 0 ) );
+ m_sCommandInfo[6].ArgType = cppu::UnoType<sal_Bool>::get();
m_sCommandInfo[7].Name = "insert";
m_sCommandInfo[7].Handle = -1;
@@ -384,7 +384,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_sCommandInfo[7].Name = "createNewContent";
m_sCommandInfo[7].Handle = -1;
- m_sCommandInfo[7].ArgType = getCppuType( static_cast< ucb::ContentInfo * > ( 0 ) );
+ m_sCommandInfo[7].ArgType = cppu::UnoType<ucb::ContentInfo>::get();
if(m_bWithConfig)
{
@@ -3019,7 +3019,7 @@ uno::Sequence< ucb::ContentInfo > shell::queryCreatableContentsInfo()
props[0] = beans::Property(
OUString("Title"),
-1,
- getCppuType( static_cast< OUString* >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID
| beans::PropertyAttribute::BOUND );
seq[0].Properties = props;
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index 24c63ff..5d3a70e 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -661,7 +661,7 @@ FTPContent::queryCreatableContentsInfo_Static( )
props[0] = Property(
OUString("Title"),
-1,
- getCppuType( static_cast< OUString* >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
PropertyAttribute::MAYBEVOID
| PropertyAttribute::BOUND );
seq[0].Properties = props;
diff --git a/ucb/source/ucp/ftp/ftpcontentcaps.cxx b/ucb/source/ucp/ftp/ftpcontentcaps.cxx
index ce8bbc1..8e4aa4e 100644
--- a/ucb/source/ucp/ftp/ftpcontentcaps.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentcaps.cxx
@@ -43,7 +43,7 @@ uno::Sequence< beans::Property > FTPContent::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -64,21 +64,21 @@ uno::Sequence< beans::Property > FTPContent::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
// | beans::PropertyAttribute::READONLY
),
beans::Property(
OUString( "Size" ),
-1,
- getCppuType( static_cast< const sal_Int64 * >( 0 ) ),
+ cppu::UnoType<sal_Int64>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
OUString( "DateCreated" ),
-1,
- getCppuType( static_cast< util::DateTime * >( 0 ) ),
+ cppu::UnoType<util::DateTime>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -165,7 +165,7 @@ uno::Sequence< ucb::CommandInfo > FTPContent::getCommands(
ucb::CommandInfo(
OUString( "createNewContent" ),
-1,
- getCppuType( static_cast< ucb::ContentInfo * >( 0 ) )
+ cppu::UnoType<ucb::ContentInfo>::get()
)
};
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
index d37f991..a1ed5f7 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
@@ -504,12 +504,12 @@ ResultSetBase::getPropertySetInfo()
uno::Sequence< beans::Property > seq(2);
seq[0].Name = "RowCount";
seq[0].Handle = -1;
- seq[0].Type = getCppuType( static_cast< sal_Int32* >(0) );
+ seq[0].Type = cppu::UnoType<sal_Int32>::get();
seq[0].Attributes = beans::PropertyAttribute::READONLY;
seq[1].Name = "IsRowCountFinal";
seq[1].Handle = -1;
- seq[1].Type = getCppuType( static_cast< sal_Bool* >(0) );
+ seq[1].Type = cppu::UnoType<sal_Bool>::get();
seq[1].Attributes = beans::PropertyAttribute::READONLY;
//t
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index 62e44d3..adba80d 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -1116,7 +1116,7 @@ uno::Sequence< ucb::ContentInfo > Content::queryCreatableContentsInfo(
props[0] = beans::Property(
OUString("Title"),
-1,
- getCppuType( static_cast< OUString* >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND );
// file
@@ -1236,19 +1236,19 @@ uno::Sequence< beans::Property > Content::getProperties(
-1, getCppuBooleanType(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "Title" ),
- -1, getCppuType( static_cast< const OUString * >( 0 ) ),
+ -1, cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ),
beans::Property( OUString( "IsReadOnly" ),
-1, getCppuBooleanType(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "DateCreated" ),
- -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ),
+ -1, cppu::UnoType<util::DateTime>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "DateModified" ),
- -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ),
+ -1, cppu::UnoType<util::DateTime>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "Size" ),
- -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ),
+ -1, cppu::UnoType<sal_Int64>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "IsVolume" ),
-1, getCppuBooleanType(),
@@ -1295,18 +1295,18 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( const uno::Reference< uc
-1, getCppuBooleanType() ),
ucb::CommandInfo
( OUString( "insert" ),
- -1, getCppuType( static_cast<ucb::InsertCommandArgument * >( 0 ) ) ),
+ -1, cppu::UnoType<ucb::InsertCommandArgument>::get() ),
ucb::CommandInfo
( OUString( "open" ),
- -1, getCppuType( static_cast<ucb::OpenCommandArgument2 * >( 0 ) ) ),
+ -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ),
// Folder Only, omitted if not a folder
ucb::CommandInfo
( OUString( "transfer" ),
- -1, getCppuType( static_cast<ucb::TransferInfo * >( 0 ) ) ),
+ -1, cppu::UnoType<ucb::TransferInfo>::get() ),
ucb::CommandInfo
( OUString( "createNewContent" ),
- -1, getCppuType( static_cast<ucb::ContentInfo * >( 0 ) ) )
+ -1, cppu::UnoType<ucb::ContentInfo>::get() )
};
const int nProps = sizeof (aCommandInfoTable) / sizeof (aCommandInfoTable[0]);
diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx
index 80d2050..8f82888 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.cxx
@@ -445,7 +445,7 @@ uno::Sequence< ucb::ContentInfo > Content::queryCreatableContentsInfo(
props[0] = beans::Property(
OUString("Title"),
-1,
- getCppuType( static_cast< OUString* >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND );
// file
@@ -1301,7 +1301,7 @@ uno::Sequence< beans::Property > Content::getProperties(
{
static const beans::Property aGenericProperties[] = {
beans::Property( OUString( "ContentType" ),
- -1, getCppuType( static_cast< const OUString * >( 0 ) ),
+ -1, cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "IsDocument" ),
-1, getCppuBooleanType(),
@@ -1310,21 +1310,21 @@ uno::Sequence< beans::Property > Content::getProperties(
-1, getCppuBooleanType(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "Title" ),
- -1, getCppuType( static_cast< const OUString * >( 0 ) ),
+ -1, cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ),
// Optional ...
beans::Property( OUString( "DateCreated" ),
- -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ),
+ -1, cppu::UnoType<util::DateTime>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "DateModified" ),
- -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ),
+ -1, cppu::UnoType<util::DateTime>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
// FIXME: Too expensive for now (?)
// beans::Property( OUString( "MediaType" ),
-// -1, getCppuType( static_cast< const OUString * >( 0 ) ),
+// -1, cppu::UnoType<OUString>::get(),
// beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "Size" ),
- -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ),
+ -1, cppu::UnoType<sal_Int64>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "IsReadOnly" ),
-1, getCppuBooleanType(),
@@ -1373,18 +1373,18 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
-1, getCppuBooleanType() ),
ucb::CommandInfo
( OUString( "insert" ),
- -1, getCppuType( static_cast<ucb::InsertCommandArgument * >( 0 ) ) ),
+ -1, cppu::UnoType<ucb::InsertCommandArgument>::get() ),
ucb::CommandInfo
( OUString( "open" ),
- -1, getCppuType( static_cast<ucb::OpenCommandArgument2 * >( 0 ) ) ),
+ -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ),
// Folder Only, omitted if not a folder
ucb::CommandInfo
( OUString( "transfer" ),
- -1, getCppuType( static_cast<ucb::TransferInfo * >( 0 ) ) ),
+ -1, cppu::UnoType<ucb::TransferInfo>::get() ),
ucb::CommandInfo
( OUString( "createNewContent" ),
- -1, getCppuType( static_cast<ucb::ContentInfo * >( 0 ) ) )
+ -1, cppu::UnoType<ucb::ContentInfo>::get() )
};
const int nProps
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 001b995..a99d4b6 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -1005,14 +1005,14 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues(
xRow->appendString (
beans::Property( OUString("ContentType"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ),
rData.getContentType() );
xRow->appendString (
beans::Property( OUString("Title"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
// @@@ Might actually be read-only!
beans::PropertyAttribute::BOUND ),
rData.getTitle() );
@@ -1873,7 +1873,7 @@ HierarchyContentProperties::getCreatableContentsInfo() const
aFolderProps.getArray()[ 0 ] = beans::Property(
OUString("Title"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND );
aSeq.getArray()[ 0 ].Properties = aFolderProps;
@@ -1885,12 +1885,12 @@ HierarchyContentProperties::getCreatableContentsInfo() const
aLinkProps.getArray()[ 0 ] = beans::Property(
OUString("Title"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND );
aLinkProps.getArray()[ 1 ] = beans::Property(
OUString("TargetURL"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND );
aSeq.getArray()[ 1 ].Properties = aLinkProps;
diff --git a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
index b536584..67bdb2d 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
@@ -104,7 +104,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -125,7 +125,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -135,7 +135,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "TargetURL" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -163,7 +163,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -184,7 +184,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
),
@@ -193,7 +193,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "TargetURL" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
),
beans::Property(
@@ -229,7 +229,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -250,7 +250,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -281,7 +281,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -302,7 +302,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
),
@@ -342,7 +342,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -363,7 +363,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -596,12 +596,12 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
ucb::CommandInfo(
OUString( "transfer" ),
-1,
- getCppuType( static_cast< ucb::TransferInfo * >( 0 ) )
+ cppu::UnoType<ucb::TransferInfo>::get()
),
ucb::CommandInfo(
OUString( "createNewContent" ),
-1,
- getCppuType( static_cast< ucb::ContentInfo * >( 0 ) )
+ cppu::UnoType<ucb::ContentInfo>::get()
)
// New commands
@@ -705,12 +705,12 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
ucb::CommandInfo(
OUString( "transfer" ),
-1,
- getCppuType( static_cast< ucb::TransferInfo * >( 0 ) )
+ cppu::UnoType<ucb::TransferInfo>::get()
),
ucb::CommandInfo(
OUString( "createNewContent" ),
-1,
- getCppuType( static_cast< ucb::ContentInfo * >( 0 ) )
+ cppu::UnoType<ucb::ContentInfo>::get()
)
// New commands
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index 2c703b0..2b85a29 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -109,7 +109,7 @@ ContentProperties::getCreatableContentsInfo( PackageUri const & rUri ) const
aProps.getArray()[ 0 ] = beans::Property(
OUString("Title"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND );
uno::Sequence< ucb::ContentInfo > aSeq( 2 );
@@ -924,7 +924,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
beans::Property(
OUString("ContentType"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ),
rData.aContentType );
@@ -932,7 +932,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
beans::Property(
OUString("Title"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ),
rData.aTitle );
xRow->appendBoolean(
@@ -965,7 +965,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
beans::Property(
OUString("MediaType"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ),
rData.aMediaType );
@@ -976,7 +976,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
beans::Property(
OUString("Size"),
-1,
- getCppuType( static_cast< const sal_Int64 * >( 0 ) ),
+ cppu::UnoType<sal_Int64>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ),
rData.nSize );
diff --git a/ucb/source/ucp/package/pkgcontentcaps.cxx b/ucb/source/ucp/package/pkgcontentcaps.cxx
index a45e580..2e81cb4 100644
--- a/ucb/source/ucp/package/pkgcontentcaps.cxx
+++ b/ucb/source/ucp/package/pkgcontentcaps.cxx
@@ -105,7 +105,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -126,7 +126,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -136,7 +136,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "MediaType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
),
beans::Property(
@@ -177,7 +177,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -198,7 +198,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
),
@@ -207,7 +207,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "MediaType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
),
beans::Property(
@@ -242,7 +242,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -263,7 +263,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
),
@@ -272,13 +272,13 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "MediaType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
),
beans::Property(
OUString( "Size" ),
-1,
- getCppuType( static_cast< const sal_Int64 * >( 0 ) ),
+ cppu::UnoType<sal_Int64>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -375,7 +375,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "createNewContent" ),
-1,
- getCppuType( static_cast< ucb::ContentInfo * >( 0 ) )
+ cppu::UnoType<ucb::ContentInfo>::get()
),
// New commands
@@ -454,7 +454,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "createNewContent" ),
-1,
- getCppuType( static_cast< ucb::ContentInfo * >( 0 ) )
+ cppu::UnoType<ucb::ContentInfo>::get()
),
// New commands
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index 683f0cf..74e0423 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -1037,7 +1037,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
xRow->appendString (
beans::Property( OUString("ContentType"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ),
rData.getContentType() );
@@ -1047,7 +1047,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
xRow->appendString (
beans::Property( OUString("Title"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
// Title is read-only for root and documents.
beans::PropertyAttribute::BOUND |
( ( eType == ROOT ) || ( eType == DOCUMENT )
@@ -2943,7 +2943,7 @@ ContentProperties::getCreatableContentsInfo() const
aProps.getArray()[ 0 ] = beans::Property(
OUString("Title"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND );
#ifdef NO_STREAM_CREATION_WITHIN_DOCUMENT_ROOT
diff --git a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
index f014581..5e0cce0 100644
--- a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
@@ -112,7 +112,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -133,7 +133,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
),
@@ -170,7 +170,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -191,7 +191,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
),
@@ -236,7 +236,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -257,7 +257,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -305,7 +305,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -326,7 +326,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -537,12 +537,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "transfer" ),
-1,
- getCppuType( static_cast< ucb::TransferInfo * >( 0 ) )
+ cppu::UnoType<ucb::TransferInfo>::get()
),
ucb::CommandInfo(
OUString( "createNewContent" ),
-1,
- getCppuType( static_cast< ucb::ContentInfo * >( 0 ) )
+ cppu::UnoType<ucb::ContentInfo>::get()
)
// New commands
@@ -598,12 +598,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "transfer" ),
-1,
- getCppuType( static_cast< ucb::TransferInfo * >( 0 ) )
+ cppu::UnoType<ucb::TransferInfo>::get()
),
ucb::CommandInfo(
OUString( "createNewContent" ),
-1,
- getCppuType( static_cast< ucb::ContentInfo * >( 0 ) )
+ cppu::UnoType<ucb::ContentInfo>::get()
)
// New commands
diff --git a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx
index b37b4e9..c9f14f0 100644
--- a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx
+++ b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx
@@ -309,23 +309,23 @@ static OUString decodeValue( const OUString & rValue )
// static
bool UCBDeadPropertyValue::supportsType( const uno::Type & rType )
{
- if ( ( rType != getCppuType( static_cast< const OUString * >( 0 ) ) )
+ if ( ( rType != cppu::UnoType<OUString>::get() )
&&
- ( rType != getCppuType( static_cast< const sal_Int32 * >( 0 ) ) )
+ ( rType != cppu::UnoType<sal_Int32>::get() )
&&
- ( rType != getCppuType( static_cast< const sal_Int16 * >( 0 ) ) )
+ ( rType != cppu::UnoType<sal_Int16>::get() )
&&
( rType != getCppuBooleanType() )
&&
( rType != getCppuCharType() )
&&
- ( rType != getCppuType( static_cast< const sal_Int8 * >( 0 ) ) )
+ ( rType != cppu::UnoType<sal_Int8>::get() )
&&
- ( rType != getCppuType( static_cast< const sal_Int64 * >( 0 ) ) )
+ ( rType != cppu::UnoType<sal_Int64>::get() )
&&
- ( rType != getCppuType( static_cast< const float * >( 0 ) ) )
+ ( rType != cppu::UnoType<float>::get() )
&&
- ( rType != getCppuType( static_cast< const double * >( 0 ) ) ) )
+ ( rType != cppu::UnoType<double>::get() ) )
{
return false;
}
@@ -430,13 +430,13 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
OUString aStringValue;
OUString aStringType;
- if ( rType == getCppuType( static_cast< const OUString * >( 0 ) ) )
+ if ( rType == cppu::UnoType<OUString>::get() )
{
// string
rInData >>= aStringValue;
aStringType = aTypeString;
}
- else if ( rType == getCppuType( static_cast< const sal_Int32 * >( 0 ) ) )
+ else if ( rType == cppu::UnoType<sal_Int32>::get() )
{
// long
sal_Int32 nValue = 0;
@@ -444,7 +444,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
aStringValue = OUString::number( nValue );
aStringType = aTypeLong;
}
- else if ( rType == getCppuType( static_cast< const sal_Int16 * >( 0 ) ) )
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list