diff options
| author | Release Engineers <releng@openoffice.org> | 2009-05-07 06:54:56 +0000 |
|---|---|---|
| committer | Release Engineers <releng@openoffice.org> | 2009-05-07 06:54:56 +0000 |
| commit | 85ebb35cfa8ff96c35f08c045489230fe69dfd8e (patch) | |
| tree | 5dc7ded9765fcae172c35992999f2ad1f4a49e16 /connectivity | |
| parent | fc22eceb453267c9770779e487d12d7e55620e7d (diff) | |
CWS-TOOLING: integrate CWS cmcfixes58
2009-05-04 13:51:10 +0200 cmc r271450 : #i101533# latest sw warnings
2009-05-04 00:02:46 +0200 cmc r271436 : #i101517# silence new warnings
2009-05-03 23:13:53 +0200 cmc r271435 : #i101305# add that one back in
2009-05-02 16:30:42 +0200 cmc r271431 : #i101493# get it to build, and remove some warnings
2009-05-02 16:12:37 +0200 cmc r271430 : CWS-TOOLING: rebase CWS cmcfixes58 to trunk@271427 (milestone: DEV300:m47)
2009-04-23 13:19:33 +0200 cmc r271163 : #i101305# remove annoying import foo is unused warnings
2009-04-21 17:10:34 +0200 cmc r271048 : #i101246# remove AVMEDIA_MANAGER_SERVICE_NAME defines again
2009-04-21 17:07:41 +0200 cmc r271047 : #i86323# remove xml2cmp unused methods
Diffstat (limited to 'connectivity')
4 files changed, 7 insertions, 4 deletions
diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx index 8539ff7b74..adee9a2110 100644 --- a/connectivity/source/drivers/evoab2/EApi.cxx +++ b/connectivity/source/drivers/evoab2/EApi.cxx @@ -36,7 +36,7 @@ #include <stdio.h> #define DECLARE_FN_POINTERS 1 #include "EApi.h" -static char *eBookLibNames[] = { +static const char *eBookLibNames[] = { "libebook-1.2.so.9", // evolution-2.8 "libebook-1.2.so.5", // evolution-2.4 and 2.6+ "libebook-1.2.so.3", // evolution-2.2 diff --git a/connectivity/source/drivers/evoab2/EApi.h b/connectivity/source/drivers/evoab2/EApi.h index b0a3b2bf31..a6b7832e73 100644 --- a/connectivity/source/drivers/evoab2/EApi.h +++ b/connectivity/source/drivers/evoab2/EApi.h @@ -60,7 +60,7 @@ typedef int EContactField; EAPI_EXTERN const char *(*e_contact_field_name) ( EContactField field_id); EAPI_EXTERN gpointer (*e_contact_get) (EContact *contact, EContactField field_id); -EAPI_EXTERN const gpointer (*e_contact_get_const) (EContact *contact, EContactField field_id); +EAPI_EXTERN gconstpointer (*e_contact_get_const) (EContact *contact, EContactField field_id); // e-source.h typedef void ESource; #define E_SOURCE(a) ((ESource *)(a)) diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx index 5dbf5493a2..4bc618a99b 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx @@ -39,6 +39,9 @@ #include <com/sun/star/lang/DisposedException.hpp> #include "propertyids.hxx" #include <connectivity/dbexception.hxx> +#include <connectivity/dbtools.hxx> + +#include "resource/common_res.hrc" using namespace connectivity::evoab; using namespace com::sun::star::uno; diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index 685d24a40f..501db8978e 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -478,7 +478,7 @@ OEvoabResultSet::getValue( sal_Int32 nColumnNum, GType nType, GValue *pStackValu { OEvoabResultSetMetaData *pMeta = (OEvoabResultSetMetaData *) m_xMetaData.get(); sal_Int32 nFieldNumber = pMeta->fieldAtColumn(nColumnNum); - GValue aValue = { 0, 0 }; + GValue aValue = {0, {{0}}}; if (getValue (nFieldNumber, G_TYPE_STRING, &aValue)) { const char *pStr = g_value_get_string (&aValue); @@ -500,7 +500,7 @@ sal_Bool SAL_CALL OEvoabResultSet::getBoolean( sal_Int32 nColumnNum ) throw(SQLE { OEvoabResultSetMetaData *pMeta = (OEvoabResultSetMetaData *) m_xMetaData.get(); sal_Int32 nFieldNumber = pMeta->fieldAtColumn(nColumnNum); - GValue aValue = { 0, 0 }; + GValue aValue = {0, {{0}}}; if (getValue (nFieldNumber, G_TYPE_BOOLEAN, &aValue)) { bResult = g_value_get_boolean (&aValue); |