Author: truckman
Date: Tue May 1 18:38:50 2018
New Revision: 1830706
URL: http://svn.apache.org/viewvc?rev=1830706&view=rev
Log:
Fix the easy cast-related errors reported by clang 6 in its default
C++14 mode.
Modified:
openoffice/trunk/main/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
openoffice/trunk/main/connectivity/source/commontools/dbexception.cxx
openoffice/trunk/main/connectivity/source/drivers/adabas/BUser.cxx
openoffice/trunk/main/connectivity/source/drivers/file/FResultSet.cxx
openoffice/trunk/main/connectivity/source/drivers/file/FStatement.cxx
openoffice/trunk/main/connectivity/source/drivers/hsqldb/HUser.cxx
openoffice/trunk/main/connectivity/source/drivers/mysql/YUser.cxx
openoffice/trunk/main/connectivity/source/inc/propertyids.hxx
openoffice/trunk/main/connectivity/source/parse/PColumn.cxx
openoffice/trunk/main/connectivity/source/sdbcx/VCatalog.cxx
openoffice/trunk/main/connectivity/source/sdbcx/VColumn.cxx
openoffice/trunk/main/connectivity/source/sdbcx/VIndex.cxx
openoffice/trunk/main/connectivity/source/sdbcx/VKey.cxx
openoffice/trunk/main/connectivity/source/sdbcx/VKeyColumn.cxx
openoffice/trunk/main/connectivity/source/sdbcx/VTable.cxx
openoffice/trunk/main/connectivity/source/sdbcx/VView.cxx
openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
openoffice/trunk/main/vcl/unx/generic/app/wmadaptor.cxx
Modified:
openoffice/trunk/main/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx?rev=1830706&r1=1830705&r2=1830706&view=diff
==============================================================================
---
openoffice/trunk/main/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
(original)
+++
openoffice/trunk/main/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
Tue May 1 18:38:50 2018
@@ -88,10 +88,10 @@ ODatabaseMetaDataResultSet::~ODatabaseMe
// -------------------------------------------------------------------------
void ODatabaseMetaDataResultSet::construct()
{
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE),
PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize,
::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE),
PROPERTY_ID_RESULTSETTYPE,
PropertyAttribute::READONLY,&m_nResultSetType,
::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION),
PROPERTY_ID_FETCHDIRECTION, 0,
&m_nFetchDirection, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY),
PROPERTY_ID_RESULTSETCONCURRENCY,
PropertyAttribute::READONLY,&m_nResultSetConcurrency,
::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE),
PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize,
::getCppuType(static_cast<sal_Int32*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE),
PROPERTY_ID_RESULTSETTYPE,
PropertyAttribute::READONLY,&m_nResultSetType,
::getCppuType(static_cast<sal_Int32*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION),
PROPERTY_ID_FETCHDIRECTION, 0,
&m_nFetchDirection, ::getCppuType(static_cast<sal_Int32*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY),
PROPERTY_ID_RESULTSETCONCURRENCY,
PropertyAttribute::READONLY,&m_nResultSetConcurrency,
::getCppuType(static_cast<sal_Int32*>(NULL)));
}
//
-----------------------------------------------------------------------------
void ODatabaseMetaDataResultSet::setType(MetaDataResultSetType _eType)
Modified: openoffice/trunk/main/connectivity/source/commontools/dbexception.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/commontools/dbexception.cxx?rev=1830706&r1=1830705&r2=1830706&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/commontools/dbexception.cxx
(original)
+++ openoffice/trunk/main/connectivity/source/commontools/dbexception.cxx Tue
May 1 18:38:50 2018
@@ -141,7 +141,7 @@ SQLExceptionInfo::SQLExceptionInfo(const
//------------------------------------------------------------------------------
SQLExceptionInfo::SQLExceptionInfo(const staruno::Any& _rError)
{
- const staruno::Type& aSQLExceptionType =
::getCppuType(reinterpret_cast< ::com::sun::star::sdbc::SQLException*>(NULL));
+ const staruno::Type& aSQLExceptionType = ::getCppuType(static_cast<
::com::sun::star::sdbc::SQLException*>(NULL));
sal_Bool bValid = isAssignableFrom(aSQLExceptionType,
_rError.getValueType());
if (bValid)
m_aContent = _rError;
@@ -155,9 +155,9 @@ void SQLExceptionInfo::implDetermineType
{
staruno::Type aContentType = m_aContent.getValueType();
- const Type& aSQLExceptionType = ::getCppuType( reinterpret_cast<
SQLException* >( NULL ) );
- const Type& aSQLWarningType = ::getCppuType( reinterpret_cast<
SQLWarning* >( NULL ) );
- const Type& aSQLContextType = ::getCppuType( reinterpret_cast<
SQLContext* >( NULL ) );
+ const Type& aSQLExceptionType = ::getCppuType( static_cast< SQLException*
>( NULL ) );
+ const Type& aSQLWarningType = ::getCppuType( static_cast< SQLWarning*
>( NULL ) );
+ const Type& aSQLContextType = ::getCppuType( static_cast< SQLContext*
>( NULL ) );
if ( isAssignableFrom( aSQLContextType, m_aContent.getValueType() ) )
m_eType = SQL_CONTEXT;
Modified: openoffice/trunk/main/connectivity/source/drivers/adabas/BUser.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/drivers/adabas/BUser.cxx?rev=1830706&r1=1830705&r2=1830706&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/drivers/adabas/BUser.cxx
(original)
+++ openoffice/trunk/main/connectivity/source/drivers/adabas/BUser.cxx Tue May
1 18:38:50 2018
@@ -93,7 +93,7 @@ typedef connectivity::sdbcx::OUser OUser
void OUserExtend::construct()
{
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD),
PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast<
::rtl::OUString*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD),
PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast<
::rtl::OUString*>(NULL)));
}
//
-----------------------------------------------------------------------------
cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const
Modified: openoffice/trunk/main/connectivity/source/drivers/file/FResultSet.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/drivers/file/FResultSet.cxx?rev=1830706&r1=1830705&r2=1830706&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/drivers/file/FResultSet.cxx
(original)
+++ openoffice/trunk/main/connectivity/source/drivers/file/FResultSet.cxx Tue
May 1 18:38:50 2018
@@ -150,10 +150,10 @@ OResultSet::~OResultSet()
void OResultSet::construct()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "[email protected]",
"OResultSet::construct" );
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE),
PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize,
::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE),
PROPERTY_ID_RESULTSETTYPE,
PropertyAttribute::READONLY,&m_nResultSetType,
::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION),
PROPERTY_ID_FETCHDIRECTION, 0,&m_nFetchDirection,
::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY),
PROPERTY_ID_RESULTSETCONCURRENCY,PropertyAttribute::READONLY,&m_nResultSetConcurrency,
::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE),
PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize,
::getCppuType(static_cast<sal_Int32*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE),
PROPERTY_ID_RESULTSETTYPE,
PropertyAttribute::READONLY,&m_nResultSetType,
::getCppuType(static_cast<sal_Int32*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION),
PROPERTY_ID_FETCHDIRECTION, 0,&m_nFetchDirection,
::getCppuType(static_cast<sal_Int32*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY),
PROPERTY_ID_RESULTSETCONCURRENCY,PropertyAttribute::READONLY,&m_nResultSetConcurrency,
::getCppuType(static_cast<sal_Int32*>(NULL)));
}
// -------------------------------------------------------------------------
void OResultSet::disposing(void)
Modified: openoffice/trunk/main/connectivity/source/drivers/file/FStatement.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/drivers/file/FStatement.cxx?rev=1830706&r1=1830705&r2=1830706&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/drivers/file/FStatement.cxx
(original)
+++ openoffice/trunk/main/connectivity/source/drivers/file/FStatement.cxx Tue
May 1 18:38:50 2018
@@ -90,16 +90,16 @@ OStatement_Base::OStatement_Base(OConnec
sal_Int32 nAttrib = 0;
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME),
PROPERTY_ID_CURSORNAME, nAttrib,&m_aCursorName,
::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE),
PROPERTY_ID_MAXFIELDSIZE, nAttrib,&m_nMaxFieldSize,
::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS),
PROPERTY_ID_MAXROWS,
nAttrib,&m_nMaxRows,
::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT),
PROPERTY_ID_QUERYTIMEOUT, nAttrib,&m_nQueryTimeOut,
::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE),
PROPERTY_ID_FETCHSIZE, nAttrib,&m_nFetchSize,
::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE),
PROPERTY_ID_RESULTSETTYPE, nAttrib,&m_nResultSetType,
::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION),
PROPERTY_ID_FETCHDIRECTION, nAttrib,&m_nFetchDirection,
::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME),
PROPERTY_ID_CURSORNAME, nAttrib,&m_aCursorName,
::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE),
PROPERTY_ID_MAXFIELDSIZE, nAttrib,&m_nMaxFieldSize,
::getCppuType(static_cast<sal_Int32*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS),
PROPERTY_ID_MAXROWS,
nAttrib,&m_nMaxRows, ::getCppuType(static_cast<sal_Int32*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT),
PROPERTY_ID_QUERYTIMEOUT, nAttrib,&m_nQueryTimeOut,
::getCppuType(static_cast<sal_Int32*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE),
PROPERTY_ID_FETCHSIZE, nAttrib,&m_nFetchSize,
::getCppuType(static_cast<sal_Int32*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE),
PROPERTY_ID_RESULTSETTYPE, nAttrib,&m_nResultSetType,
::getCppuType(static_cast<sal_Int32*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION),
PROPERTY_ID_FETCHDIRECTION, nAttrib,&m_nFetchDirection,
::getCppuType(static_cast<sal_Int32*>(NULL)));
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(reinterpret_cast<sal_Int32*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY),
PROPERTY_ID_RESULTSETCONCURRENCY,
nAttrib,&m_nResultSetConcurrency,
::getCppuType(static_cast<sal_Int32*>(NULL)));
}
//
-----------------------------------------------------------------------------
OStatement_Base::~OStatement_Base()
Modified: openoffice/trunk/main/connectivity/source/drivers/hsqldb/HUser.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/drivers/hsqldb/HUser.cxx?rev=1830706&r1=1830705&r2=1830706&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/drivers/hsqldb/HUser.cxx
(original)
+++ openoffice/trunk/main/connectivity/source/drivers/hsqldb/HUser.cxx Tue May
1 18:38:50 2018
@@ -68,7 +68,7 @@ OUserExtend::OUserExtend( const ::com::s
typedef connectivity::sdbcx::OUser OUser_TYPEDEF;
void OUserExtend::construct()
{
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD),
PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast<
::rtl::OUString*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD),
PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast<
::rtl::OUString*>(NULL)));
}
//
-----------------------------------------------------------------------------
cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const
Modified: openoffice/trunk/main/connectivity/source/drivers/mysql/YUser.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/drivers/mysql/YUser.cxx?rev=1830706&r1=1830705&r2=1830706&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/drivers/mysql/YUser.cxx (original)
+++ openoffice/trunk/main/connectivity/source/drivers/mysql/YUser.cxx Tue May
1 18:38:50 2018
@@ -68,7 +68,7 @@ OUserExtend::OUserExtend( const ::com::s
typedef connectivity::sdbcx::OUser OUser_TYPEDEF;
void OUserExtend::construct()
{
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD),
PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast<
::rtl::OUString*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD),
PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast<
::rtl::OUString*>(NULL)));
}
//
-----------------------------------------------------------------------------
cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const
Modified: openoffice/trunk/main/connectivity/source/inc/propertyids.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/inc/propertyids.hxx?rev=1830706&r1=1830705&r2=1830706&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/inc/propertyids.hxx (original)
+++ openoffice/trunk/main/connectivity/source/inc/propertyids.hxx Tue May 1
18:38:50 2018
@@ -70,7 +70,7 @@ namespace connectivity
//------------------------------------------------------------------------------
#define DECL_PROP1IMPL(varname, type) \
-pProperties[nPos++] =
::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_##varname),
PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< type*>(NULL)),
+pProperties[nPos++] =
::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_##varname),
PROPERTY_ID_##varname, ::getCppuType(static_cast< type*>(NULL)),
//------------------------------------------------------------------------------
#define DECL_PROP0(varname, type) \
DECL_PROP1IMPL(varname, type) 0)
Modified: openoffice/trunk/main/connectivity/source/parse/PColumn.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/parse/PColumn.cxx?rev=1830706&r1=1830705&r2=1830706&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/parse/PColumn.cxx (original)
+++ openoffice/trunk/main/connectivity/source/parse/PColumn.cxx Tue May 1
18:38:50 2018
@@ -173,13 +173,13 @@ OParseColumn::~OParseColumn()
// -------------------------------------------------------------------------
void OParseColumn::construct()
{
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION),
PROPERTY_ID_FUNCTION, 0,
&m_bFunction, ::getCppuType(reinterpret_cast<
sal_Bool*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AGGREGATEFUNCTION),
PROPERTY_ID_AGGREGATEFUNCTION, 0, &m_bAggregateFunction,
::getCppuType(reinterpret_cast< sal_Bool*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME),
PROPERTY_ID_TABLENAME, 0,
&m_aTableName, ::getCppuType(reinterpret_cast<
::rtl::OUString*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME),
PROPERTY_ID_REALNAME, 0,
&m_aRealName, ::getCppuType(reinterpret_cast<
::rtl::OUString*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DBASEPRECISIONCHANGED),
PROPERTY_ID_DBASEPRECISIONCHANGED, 0, &m_bDbasePrecisionChanged,
::getCppuType(reinterpret_cast<sal_Bool*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSEARCHABLE),
PROPERTY_ID_ISSEARCHABLE, 0,
&m_bIsSearchable, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_LABEL),
PROPERTY_ID_LABEL,
0, &m_sLabel, ::getCppuType(reinterpret_cast<
::rtl::OUString*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION),
PROPERTY_ID_FUNCTION, 0,
&m_bFunction, ::getCppuType(static_cast<
sal_Bool*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AGGREGATEFUNCTION),
PROPERTY_ID_AGGREGATEFUNCTION, 0, &m_bAggregateFunction,
::getCppuType(static_cast< sal_Bool*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME),
PROPERTY_ID_TABLENAME, 0,
&m_aTableName, ::getCppuType(static_cast<
::rtl::OUString*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME),
PROPERTY_ID_REALNAME, 0,
&m_aRealName, ::getCppuType(static_cast<
::rtl::OUString*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DBASEPRECISIONCHANGED),
PROPERTY_ID_DBASEPRECISIONCHANGED, 0, &m_bDbasePrecisionChanged,
::getCppuType(static_cast<sal_Bool*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSEARCHABLE),
PROPERTY_ID_ISSEARCHABLE, 0,
&m_bIsSearchable, ::getCppuType(static_cast< sal_Bool*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_LABEL),
PROPERTY_ID_LABEL,
0, &m_sLabel, ::getCppuType(static_cast<
::rtl::OUString*>(NULL)));
}
//
-----------------------------------------------------------------------------
::cppu::IPropertyArrayHelper* OParseColumn::createArrayHelper() const
@@ -265,9 +265,9 @@ OOrderColumn::~OOrderColumn()
void OOrderColumn::construct()
{
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING),
PROPERTY_ID_ISASCENDING,
- PropertyAttribute::READONLY, const_cast< sal_Bool* >( &m_bAscending
), ::getCppuType( reinterpret_cast< sal_Bool* >( NULL ) ) );
+ PropertyAttribute::READONLY, const_cast< sal_Bool* >( &m_bAscending
), ::getCppuType( static_cast< sal_Bool* >( NULL ) ) );
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME),
PROPERTY_ID_TABLENAME,
- PropertyAttribute::READONLY, const_cast< ::rtl::OUString* >(
&m_sTableName ), ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ PropertyAttribute::READONLY, const_cast< ::rtl::OUString* >(
&m_sTableName ), ::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
}
//
-----------------------------------------------------------------------------
::cppu::IPropertyArrayHelper* OOrderColumn::createArrayHelper() const
Modified: openoffice/trunk/main/connectivity/source/sdbcx/VCatalog.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/sdbcx/VCatalog.cxx?rev=1830706&r1=1830705&r2=1830706&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/sdbcx/VCatalog.cxx (original)
+++ openoffice/trunk/main/connectivity/source/sdbcx/VCatalog.cxx Tue May 1
18:38:50 2018
@@ -227,7 +227,7 @@ void OCatalog::fillNames(Reference< XRes
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(reinterpret_cast<
::rtl::OUString*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),
PROPERTY_ID_NAME ,nAttrib,&m_Name,::getCppuType(static_cast<
::rtl::OUString*>(NULL)));
}
// -------------------------------------------------------------------------
ODescriptor::~ODescriptor()
Modified: openoffice/trunk/main/connectivity/source/sdbcx/VColumn.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/sdbcx/VColumn.cxx?rev=1830706&r1=1830705&r2=1830706&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/sdbcx/VColumn.cxx (original)
+++ openoffice/trunk/main/connectivity/source/sdbcx/VColumn.cxx Tue May 1
18:38:50 2018
@@ -163,13 +163,13 @@ void OColumn::construct()
sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME),
PROPERTY_ID_TYPENAME,
nAttrib,&m_TypeName, ::getCppuType(reinterpret_cast<
::rtl::OUString*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION),
PROPERTY_ID_DESCRIPTION, nAttrib,&m_Description,
::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE),
PROPERTY_ID_DEFAULTVALUE,
nAttrib,&m_DefaultValue, ::getCppuType(reinterpret_cast<
::rtl::OUString*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION),
PROPERTY_ID_PRECISION, nAttrib,&m_Precision,
::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE),
PROPERTY_ID_TYPE,
nAttrib,&m_Type,
::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE),
PROPERTY_ID_SCALE,
nAttrib,&m_Scale,
::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE),
PROPERTY_ID_ISNULLABLE, nAttrib,&m_IsNullable,
::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME),
PROPERTY_ID_TYPENAME,
nAttrib,&m_TypeName, ::getCppuType(static_cast<
::rtl::OUString*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION),
PROPERTY_ID_DESCRIPTION, nAttrib,&m_Description,
::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE),
PROPERTY_ID_DEFAULTVALUE,
nAttrib,&m_DefaultValue, ::getCppuType(static_cast<
::rtl::OUString*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION),
PROPERTY_ID_PRECISION, nAttrib,&m_Precision,
::getCppuType(static_cast<sal_Int32*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE),
PROPERTY_ID_TYPE,
nAttrib,&m_Type,
::getCppuType(static_cast<sal_Int32*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE),
PROPERTY_ID_SCALE,
nAttrib,&m_Scale,
::getCppuType(static_cast<sal_Int32*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE),
PROPERTY_ID_ISNULLABLE, nAttrib,&m_IsNullable,
::getCppuType(static_cast<sal_Int32*>(NULL)));
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT),
PROPERTY_ID_ISAUTOINCREMENT, nAttrib,&m_IsAutoIncrement,
::getBooleanCppuType());
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISROWVERSION),
PROPERTY_ID_ISROWVERSION,
nAttrib,&m_IsRowVersion, ::getBooleanCppuType());
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY),
PROPERTY_ID_ISCURRENCY, nAttrib,&m_IsCurrency,
::getBooleanCppuType());
Modified: openoffice/trunk/main/connectivity/source/sdbcx/VIndex.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/sdbcx/VIndex.cxx?rev=1830706&r1=1830705&r2=1830706&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/sdbcx/VIndex.cxx (original)
+++ openoffice/trunk/main/connectivity/source/sdbcx/VIndex.cxx Tue May 1
18:38:50 2018
@@ -139,7 +139,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(reinterpret_cast<
::rtl::OUString*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOG),
PROPERTY_ID_CATALOG,
nAttrib,&m_Catalog, ::getCppuType(static_cast<
::rtl::OUString*>(NULL)));
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());
Modified: openoffice/trunk/main/connectivity/source/sdbcx/VKey.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/sdbcx/VKey.cxx?rev=1830706&r1=1830705&r2=1830706&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/sdbcx/VKey.cxx (original)
+++ openoffice/trunk/main/connectivity/source/sdbcx/VKey.cxx Tue May 1
18:38:50 2018
@@ -136,10 +136,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(reinterpret_cast< ::rtl::OUString*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE),
PROPERTY_ID_TYPE,
nAttrib,&m_aProps->m_Type,
::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_UPDATERULE),
PROPERTY_ID_UPDATERULE,
nAttrib,&m_aProps->m_UpdateRule,
::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELETERULE),
PROPERTY_ID_DELETERULE,
nAttrib,&m_aProps->m_DeleteRule,
::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REFERENCEDTABLE),
PROPERTY_ID_REFERENCEDTABLE, nAttrib,&m_aProps->m_ReferencedTable,
::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE),
PROPERTY_ID_TYPE,
nAttrib,&m_aProps->m_Type,
::getCppuType(static_cast<sal_Int32*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_UPDATERULE),
PROPERTY_ID_UPDATERULE,
nAttrib,&m_aProps->m_UpdateRule,
::getCppuType(static_cast<sal_Int32*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELETERULE),
PROPERTY_ID_DELETERULE,
nAttrib,&m_aProps->m_DeleteRule,
::getCppuType(static_cast<sal_Int32*>(NULL)));
}
// -------------------------------------------------------------------------
void SAL_CALL OKey::disposing()
Modified: openoffice/trunk/main/connectivity/source/sdbcx/VKeyColumn.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/sdbcx/VKeyColumn.cxx?rev=1830706&r1=1830705&r2=1830706&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/sdbcx/VKeyColumn.cxx (original)
+++ openoffice/trunk/main/connectivity/source/sdbcx/VKeyColumn.cxx Tue May 1
18:38:50 2018
@@ -112,7 +112,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(reinterpret_cast< ::rtl::OUString*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN),
PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn,
::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
}
//
-----------------------------------------------------------------------------
Modified: openoffice/trunk/main/connectivity/source/sdbcx/VTable.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/sdbcx/VTable.cxx?rev=1830706&r1=1830705&r2=1830706&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/sdbcx/VTable.cxx (original)
+++ openoffice/trunk/main/connectivity/source/sdbcx/VTable.cxx Tue May 1
18:38:50 2018
@@ -118,10 +118,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(reinterpret_cast< ::rtl::OUString*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME),
PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName,
::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION),
PROPERTY_ID_DESCRIPTION,nAttrib,&m_Description,
::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE),
PROPERTY_ID_TYPE, nAttrib,&m_Type,
::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME),
PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName,
::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME),
PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName,
::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION),
PROPERTY_ID_DESCRIPTION,nAttrib,&m_Description,
::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE),
PROPERTY_ID_TYPE, nAttrib,&m_Type,
::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
}
//
-----------------------------------------------------------------------------
void SAL_CALL OTable::acquire() throw()
Modified: openoffice/trunk/main/connectivity/source/sdbcx/VView.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/sdbcx/VView.cxx?rev=1830706&r1=1830705&r2=1830706&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/sdbcx/VView.cxx (original)
+++ openoffice/trunk/main/connectivity/source/sdbcx/VView.cxx Tue May 1
18:38:50 2018
@@ -75,10 +75,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(reinterpret_cast< ::rtl::OUString*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME),
PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName,
::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND),
PROPERTY_ID_COMMAND, nAttrib,&m_Command,
::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CHECKOPTION),
PROPERTY_ID_CHECKOPTION,nAttrib,&m_CheckOption,
::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME),
PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName,
::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME),
PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName,
::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND),
PROPERTY_ID_COMMAND, nAttrib,&m_Command,
::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CHECKOPTION),
PROPERTY_ID_CHECKOPTION,nAttrib,&m_CheckOption,
::getCppuType(static_cast< sal_Int32*>(NULL)));
}
// -------------------------------------------------------------------------
void OView::disposing(void)
Modified: openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx?rev=1830706&r1=1830705&r2=1830706&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
(original)
+++ openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx Tue
May 1 18:38:50 2018
@@ -121,7 +121,7 @@ sal_uInt32 PngHelper::deflateBuffer( con
void PngHelper::appendFileHeader( OutputBuffer& o_rOutputBuf )
{
- static const Output_t aHeader[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a,
0x1a, 0x0a };
+ static const Output_t aHeader[] = { static_cast<char>(0x89), 0x50, 0x4e,
0x47, 0x0d, 0x0a, 0x1a, 0x0a };
o_rOutputBuf.insert( o_rOutputBuf.end(), aHeader, aHeader +
sizeof(aHeader)/sizeof(aHeader[0]) );
}
Modified: openoffice/trunk/main/vcl/unx/generic/app/wmadaptor.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/unx/generic/app/wmadaptor.cxx?rev=1830706&r1=1830705&r2=1830706&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/unx/generic/app/wmadaptor.cxx (original)
+++ openoffice/trunk/main/vcl/unx/generic/app/wmadaptor.cxx Tue May 1 18:38:50
2018
@@ -2522,7 +2522,7 @@ void WMAdaptor::setPID( X11SalFrame* i_p
void WMAdaptor::setClientMachine( X11SalFrame* i_pFrame ) const
{
rtl::OString aWmClient( rtl::OUStringToOString(
GetX11SalData()->GetLocalHostName(), RTL_TEXTENCODING_ASCII_US ) );
- XTextProperty aClientProp = { (unsigned char*)aWmClient.getStr(),
XA_STRING, 8, aWmClient.getLength() };
+ XTextProperty aClientProp = { (unsigned char*)aWmClient.getStr(),
XA_STRING, 8, static_cast<unsigned long>(aWmClient.getLength()) };
XSetWMClientMachine( m_pDisplay, i_pFrame->GetShellWindow(), &aClientProp
);
}
