[Libreoffice-commits] .: 80 commits - bridges/source connectivity/source dtrans/source embedserv/source l10ntools/source sdext/source setup_native/source sfx2/source shell/inc shell/source svl/source tools/source vcl/win
David Tardon
dtardon at kemper.freedesktop.org
Mon Mar 12 00:54:28 PDT 2012
bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx | 2
connectivity/source/drivers/ado/ACatalog.cxx | 2
connectivity/source/drivers/ado/AConnection.cxx | 6
connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx | 2
connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx | 5
connectivity/source/drivers/ado/ADriver.cxx | 3
connectivity/source/drivers/ado/AKeys.cxx | 4
connectivity/source/drivers/ado/AResultSet.cxx | 34 +--
connectivity/source/drivers/ado/AStatement.cxx | 2
connectivity/source/drivers/ado/Awrapado.cxx | 106 ++++------
connectivity/source/drivers/ado/adoimp.cxx | 2
connectivity/source/drivers/odbc/makefile.mk | 4
connectivity/source/drivers/odbcbase/makefile.mk | 4
connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx | 3
connectivity/source/inc/ado/ATables.hxx | 2
connectivity/source/inc/ado/Aolewrap.hxx | 7
connectivity/source/inc/ado/Awrapado.hxx | 12 -
connectivity/source/inc/ado/Awrapadox.hxx | 6
connectivity/source/inc/ado/WrapCatalog.hxx | 2
connectivity/source/inc/ado/WrapColumn.hxx | 2
connectivity/source/inc/ado/WrapIndex.hxx | 2
connectivity/source/inc/ado/WrapKey.hxx | 2
connectivity/source/inc/ado/WrapTable.hxx | 2
dtrans/source/win32/clipb/MtaOleClipb.cxx | 4
dtrans/source/win32/dnd/globals.cxx | 2
dtrans/source/win32/dnd/idroptarget.cxx | 3
dtrans/source/win32/dnd/source.cxx | 5
dtrans/source/win32/dnd/target.cxx | 18 -
dtrans/source/win32/dtobj/APNDataObject.cxx | 3
dtrans/source/win32/dtobj/FmtFilter.cxx | 2
dtrans/source/win32/dtobj/XNotifyingDataObject.cxx | 3
dtrans/source/win32/dtobj/XTDataObject.cxx | 3
dtrans/source/win32/misc/ImplHelper.cxx | 69 +++---
embedserv/source/inc/embservconst.h | 7
embedserv/source/inprocserv/advisesink.cxx | 2
embedserv/source/inprocserv/dllentry.cxx | 6
embedserv/source/inprocserv/inprocembobj.cxx | 6
embedserv/source/inprocserv/inprocembobj.h | 2
l10ntools/source/gsicheck.cxx | 2
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 6
setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx | 2
sfx2/source/appl/shutdowniconw32.cxx | 2
shell/inc/internal/fileextensions.hxx | 6
shell/source/all/makefile.mk | 8
shell/source/backends/wininetbe/wininetbackend.cxx | 4
shell/source/backends/wininetbe/wininetbecdef.cxx | 2
shell/source/tools/regsvrex/regsvrex.cxx | 5
shell/source/win32/SysShExec.cxx | 2
shell/source/win32/ooofilereader/makefile.mk | 8
shell/source/win32/shlxthandler/columninfo/columninfo.cxx | 4
shell/source/win32/shlxthandler/columninfo/makefile.mk | 8
shell/source/win32/shlxthandler/infotips/makefile.mk | 8
shell/source/win32/shlxthandler/makefile.mk | 4
shell/source/win32/shlxthandler/ooofilt/makefile.mk | 4
shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx | 12 -
shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx | 5
shell/source/win32/shlxthandler/prophdl/makefile.mk | 4
shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx | 4
shell/source/win32/shlxthandler/propsheets/makefile.mk | 2
shell/source/win32/shlxthandler/thumbviewer/makefile.mk | 8
shell/source/win32/shlxthandler/util/makefile.mk | 8
shell/source/win32/shlxthandler/util/registry.cxx | 3
shell/source/win32/simplemail/senddoc.cxx | 4
svl/source/svdde/ddecli.cxx | 3
tools/source/fsys/wntmsc.cxx | 22 +-
tools/source/misc/pathutils.cxx | 2
vcl/win/source/gdi/salgdi.cxx | 34 +--
vcl/win/source/gdi/salgdi2.cxx | 2
vcl/win/source/gdi/salgdi3.cxx | 10
vcl/win/source/gdi/salnativewidgets-luna.cxx | 4
vcl/win/source/gdi/salprn.cxx | 18 -
vcl/win/source/gdi/winlayout.cxx | 12 -
vcl/win/source/window/salframe.cxx | 52 ++--
vcl/win/source/window/salmenu.cxx | 4
vcl/win/source/window/salobj.cxx | 4
75 files changed, 348 insertions(+), 295 deletions(-)
New commits:
commit ff7aa733b5aeeb4c0e115dbc71897577b4324e82
Author: David Tardon <dtardon at redhat.com>
Date: Sat Mar 10 19:09:41 2012 +0100
suppress "SQL_API redefined" error with -Werror
diff --git a/connectivity/source/drivers/odbc/makefile.mk b/connectivity/source/drivers/odbc/makefile.mk
index 6d701b8..3c79b49 100755
--- a/connectivity/source/drivers/odbc/makefile.mk
+++ b/connectivity/source/drivers/odbc/makefile.mk
@@ -35,6 +35,10 @@ VISIBILITY_HIDDEN=TRUE
USE_DEFFILE=TRUE
LDUMP=ldump2.exe
+.IF "$(GUI)$(COM)" == "WNTGCC"
+EXTERNAL_WARNINGS_NOT_ERRORS = TRUE
+.ENDIF
+
# --- Settings ----------------------------------
.IF "$(DBGUTIL_OJ)"!=""
diff --git a/connectivity/source/drivers/odbcbase/makefile.mk b/connectivity/source/drivers/odbcbase/makefile.mk
index 85e96ea..b32e619 100755
--- a/connectivity/source/drivers/odbcbase/makefile.mk
+++ b/connectivity/source/drivers/odbcbase/makefile.mk
@@ -33,6 +33,10 @@ TARGET=odbcbase
ENABLE_EXCEPTIONS=TRUE
VISIBILITY_HIDDEN=TRUE
+.IF "$(GUI)$(COM)" == "WNTGCC"
+EXTERNAL_WARNINGS_NOT_ERRORS = TRUE
+.ENDIF
+
# --- Settings ----------------------------------
.INCLUDE : settings.mk
commit fc6d226a0ed0e493a33d5f82edcedec0ddd37ec7
Author: David Tardon <dtardon at redhat.com>
Date: Sat Mar 10 19:00:43 2012 +0100
WaE: missing braces around initializer for 'unsigned char [8]'
diff --git a/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx
index 14f5f52..3c05419 100644
--- a/connectivity/source/drivers/ado/adoimp.cxx
+++ b/connectivity/source/drivers/ado/adoimp.cxx
@@ -41,7 +41,7 @@ using namespace com::sun::star::sdbc;
using namespace com::sun::star::sdbcx;
-#define MYADOID(l) {l, 0,0x10,0x80,0,0,0xAA,0,0x6D,0x2E,0xA4};
+#define MYADOID(l) {l, 0,0x10,{0x80,0,0,0xAA,0,0x6D,0x2E,0xA4}};
const CLSID ADOS::CLSID_ADOCONNECTION_21 = MYADOID(0x00000514);
const IID ADOS::IID_ADOCONNECTION_21 = MYADOID(0x00000550);
commit 48548f0b353d498ed93ee64c57ebef001ed09aaf
Author: David Tardon <dtardon at redhat.com>
Date: Sat Mar 10 18:54:45 2012 +0100
WaE: variable 'hr' set but not used
diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx
index f61373b..7631852 100644
--- a/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/connectivity/source/drivers/ado/Awrapado.cxx
@@ -1633,7 +1633,6 @@ WpBase::operator IDispatch*()
ADORecordset* WpADOConnection::getExportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table )
{
// Create elements used in the array
- HRESULT hr = S_OK;
SAFEARRAYBOUND rgsabound[1];
SAFEARRAY *psa = NULL;
OLEVariant varCriteria[6];
@@ -1647,17 +1646,17 @@ ADORecordset* WpADOConnection::getExportedKeys( const ::com::sun::star::uno::Any
if(catalog.hasValue())
varCriteria[nPos].setString(::comphelper::getString(catalog));
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
if(schema.getLength() && schema.toChar() != '%')
varCriteria[nPos].setString(schema);
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
varCriteria[nPos].setString(table);
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
OLEVariant vtEmpty;
vtEmpty.setNoArg();
@@ -1674,7 +1673,6 @@ ADORecordset* WpADOConnection::getExportedKeys( const ::com::sun::star::uno::Any
ADORecordset* WpADOConnection::getImportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table )
{
// Create elements used in the array
- HRESULT hr = S_OK;
SAFEARRAYBOUND rgsabound[1];
SAFEARRAY *psa = NULL;
OLEVariant varCriteria[6];
@@ -1685,20 +1683,20 @@ ADORecordset* WpADOConnection::getImportedKeys( const ::com::sun::star::uno::Any
psa = SafeArrayCreate( VT_VARIANT, 1, rgsabound );
sal_Int32 nPos=0;
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
if(catalog.hasValue())
varCriteria[nPos].setString(::comphelper::getString(catalog));
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
if(schema.getLength() && schema.toChar() != '%')
varCriteria[nPos].setString(schema);
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
varCriteria[nPos].setString(table);
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
OLEVariant vtEmpty;
vtEmpty.setNoArg();
@@ -1717,7 +1715,6 @@ ADORecordset* WpADOConnection::getImportedKeys( const ::com::sun::star::uno::Any
ADORecordset* WpADOConnection::getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table )
{
// Create elements used in the array
- HRESULT hr = S_OK;
SAFEARRAYBOUND rgsabound[1];
SAFEARRAY *psa = NULL;
OLEVariant varCriteria[3];
@@ -1731,13 +1728,13 @@ ADORecordset* WpADOConnection::getPrimaryKeys( const ::com::sun::star::uno::Any&
if(catalog.hasValue())
varCriteria[nPos].setString(::comphelper::getString(catalog));
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
if(schema.getLength() && schema.toChar() != '%')
varCriteria[nPos].setString(schema);
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
varCriteria[nPos].setString(table);
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
OLEVariant vtEmpty;
@@ -1758,7 +1755,6 @@ ADORecordset* WpADOConnection::getIndexInfo(
sal_Bool /*unique*/, sal_Bool /*approximate*/ )
{
// Create elements used in the array
- HRESULT hr = S_OK;
SAFEARRAYBOUND rgsabound[1];
SAFEARRAY *psa = NULL;
OLEVariant varCriteria[5];
@@ -1772,17 +1768,17 @@ ADORecordset* WpADOConnection::getIndexInfo(
if(catalog.hasValue())
varCriteria[nPos].setString(::comphelper::getString(catalog));
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
if(schema.getLength() && schema.toChar() != '%')
varCriteria[nPos].setString(schema);
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// INDEX_NAME
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// INDEX_NAME
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TYPE
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TYPE
varCriteria[nPos].setString(table);
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
OLEVariant vtEmpty;
vtEmpty.setNoArg();
@@ -1801,7 +1797,6 @@ ADORecordset* WpADOConnection::getTablePrivileges( const ::com::sun::star::uno::
const ::rtl::OUString& schemaPattern,
const ::rtl::OUString& tableNamePattern )
{
- HRESULT hr = S_OK;
SAFEARRAYBOUND rgsabound[1];
SAFEARRAY *psa = NULL;
OLEVariant varCriteria[5];
@@ -1815,17 +1810,17 @@ ADORecordset* WpADOConnection::getTablePrivileges( const ::com::sun::star::uno::
if(catalog.hasValue())
varCriteria[nPos].setString(::comphelper::getString(catalog));
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
if(schemaPattern.getLength() && schemaPattern.toChar() != '%')
varCriteria[nPos].setString(schemaPattern);
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
if(tableNamePattern.toChar() != '%')
varCriteria[nPos].setString(tableNamePattern);
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// GRANTOR
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// GRANTEE
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// GRANTOR
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// GRANTEE
OLEVariant vtEmpty;
vtEmpty.setNoArg();
@@ -1848,7 +1843,6 @@ ADORecordset* WpADOConnection::getCrossReference( const ::com::sun::star::uno::A
const ::rtl::OUString& foreignTable)
{
// Create elements used in the array
- HRESULT hr = S_OK;
SAFEARRAYBOUND rgsabound[1];
SAFEARRAY *psa = NULL;
OLEVariant varCriteria[6];
@@ -1862,24 +1856,24 @@ ADORecordset* WpADOConnection::getCrossReference( const ::com::sun::star::uno::A
if(primaryCatalog.hasValue())
varCriteria[nPos].setString(::comphelper::getString(primaryCatalog));
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
if(primarySchema.getLength() && primarySchema.toChar() != '%')
varCriteria[nPos].setString(primarySchema);
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
varCriteria[nPos].setString(primaryTable);
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
if(foreignCatalog.hasValue())
varCriteria[nPos].setString(::comphelper::getString(foreignCatalog));
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
if(foreignSchema.getLength() && foreignSchema.toChar() != '%')
varCriteria[nPos].setString(foreignSchema);
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
varCriteria[nPos].setString(foreignTable);
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
OLEVariant vtEmpty;
vtEmpty.setNoArg();
@@ -1898,7 +1892,6 @@ ADORecordset* WpADOConnection::getProcedures( const ::com::sun::star::uno::Any&
const ::rtl::OUString& schemaPattern,
const ::rtl::OUString& procedureNamePattern )
{
- HRESULT hr = S_OK;
SAFEARRAYBOUND rgsabound[1];
SAFEARRAY *psa = NULL;
OLEVariant varCriteria[3];
@@ -1912,14 +1905,14 @@ ADORecordset* WpADOConnection::getProcedures( const ::com::sun::star::uno::Any&
if(catalog.hasValue())
varCriteria[nPos].setString(::comphelper::getString(catalog));
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
if(schemaPattern.getLength() && schemaPattern.toChar() != '%')
varCriteria[nPos].setString(schemaPattern);
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
if(procedureNamePattern.toChar() != '%')
varCriteria[nPos].setString(procedureNamePattern);
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
OLEVariant vtEmpty;
vtEmpty.setNoArg();
@@ -1940,7 +1933,6 @@ ADORecordset* WpADOConnection::getProcedureColumns( const ::com::sun::star::uno:
const ::rtl::OUString& columnNamePattern )
{
// Create elements used in the array
- HRESULT hr = S_OK;
SAFEARRAYBOUND rgsabound[1];
SAFEARRAY *psa = NULL;
OLEVariant varCriteria[4];
@@ -1954,18 +1946,18 @@ ADORecordset* WpADOConnection::getProcedureColumns( const ::com::sun::star::uno:
if(catalog.hasValue())
varCriteria[nPos].setString(::comphelper::getString(catalog));
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
if(schemaPattern.getLength() && schemaPattern.toChar() != '%')
varCriteria[nPos].setString(schemaPattern);
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
if(procedureNamePattern.toChar() != '%')
varCriteria[nPos].setString(procedureNamePattern);
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
if(columnNamePattern.toChar() != '%')
varCriteria[nPos].setString(columnNamePattern);
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// COLUMN_NAME
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// COLUMN_NAME
OLEVariant vtEmpty;
vtEmpty.setNoArg();
@@ -2050,7 +2042,6 @@ ADORecordset* WpADOConnection::getColumns( const ::com::sun::star::uno::Any& cat
const ::rtl::OUString& columnNamePattern )
{
// Create elements used in the array
- HRESULT hr = S_OK;
SAFEARRAYBOUND rgsabound[1];
SAFEARRAY *psa = NULL;
OLEVariant varCriteria[4];
@@ -2064,17 +2055,17 @@ ADORecordset* WpADOConnection::getColumns( const ::com::sun::star::uno::Any& cat
if(catalog.hasValue())
varCriteria[nPos].setString(::comphelper::getString(catalog));
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
if(schemaPattern.getLength() && schemaPattern.toChar() != '%')
varCriteria[nPos].setString(schemaPattern);
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
if(tableNamePattern.toChar() != '%')
varCriteria[nPos].setString(tableNamePattern);
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
varCriteria[nPos].setString(columnNamePattern);
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// COLUMN_NAME
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// COLUMN_NAME
OLEVariant vtEmpty;
vtEmpty.setNoArg();
@@ -2095,7 +2086,6 @@ ADORecordset* WpADOConnection::getColumnPrivileges( const ::com::sun::star::uno:
const ::rtl::OUString& columnNamePattern )
{
// Create elements used in the array
- HRESULT hr = S_OK;
SAFEARRAYBOUND rgsabound[1];
SAFEARRAY *psa = NULL;
OLEVariant varCriteria[4];
@@ -2109,16 +2099,16 @@ ADORecordset* WpADOConnection::getColumnPrivileges( const ::com::sun::star::uno:
if(catalog.hasValue())
varCriteria[nPos].setString(::comphelper::getString(catalog));
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG
if(schema.getLength() && schema.toChar() != '%')
varCriteria[nPos].setString(schema);
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA
varCriteria[nPos].setString(table);
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_NAME
varCriteria[nPos].setString(columnNamePattern);
- hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// COLUMN_NAME
+ SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// COLUMN_NAME
OLEVariant vtEmpty;
vtEmpty.setNoArg();
commit d56e3db6534182f8e2a7753cb100a85727c9bcb2
Author: David Tardon <dtardon at redhat.com>
Date: Sat Mar 10 18:51:02 2012 +0100
WaE: declaration of 'Parameters' shadows a global declaration
diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx
index c079ad8..f61373b 100644
--- a/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/connectivity/source/drivers/ado/Awrapado.cxx
@@ -369,10 +369,10 @@ sal_Bool WpADOCommand::put_Prepared(VARIANT_BOOL bPrepared) const
return SUCCEEDED(pInterface->put_Prepared(bPrepared));
}
-sal_Bool WpADOCommand::Execute(OLEVariant& RecordsAffected,OLEVariant& Parameters,long Options, ADORecordset** ppiRset)
+sal_Bool WpADOCommand::Execute(OLEVariant& RecordsAffected,OLEVariant& Params,long Options, ADORecordset** ppiRset)
{
OSL_ENSURE(pInterface,"Interface is null!");
- return SUCCEEDED(pInterface->Execute(&RecordsAffected,&Parameters,Options,ppiRset));
+ return SUCCEEDED(pInterface->Execute(&RecordsAffected,&Params,Options,ppiRset));
}
ADOParameter* WpADOCommand::CreateParameter(const ::rtl::OUString &_bstr,DataTypeEnum Type,ParameterDirectionEnum Direction,long nSize,const OLEVariant &Value)
commit b3276fca5d8e7a3f6061a5d2de9bcc7ec0455037
Author: David Tardon <dtardon at redhat.com>
Date: Sat Mar 10 18:49:52 2012 +0100
WaE: "_WIN32_WINNT" redefined
diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx
index 43706e0..0b845ec 100644
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -26,6 +26,9 @@
*
************************************************************************/
+#if defined _WIN32_WINNT
+#undef _WIN32_WINNT
+#endif
#define _WIN32_WINNT 0x0501
#include "ado/ADriver.hxx"
commit 9efb2d1da6c7e7ca23e40ebb0a542c068122cf51
Author: David Tardon <dtardon at redhat.com>
Date: Sat Mar 10 18:45:01 2012 +0100
WaE: 'nPos' may be used uninitialized in this function
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index e36ef0a..841bf20 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -854,7 +854,7 @@ sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark ) throw(SQLExc
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
- sal_Int32 nPos;
+ sal_Int32 nPos = 0;
bookmark >>= nPos;
OSL_ENSURE(nPos >= 0 && nPos < (sal_Int32)m_aBookmarks.size(),"Invalid Index for vector");
if(nPos < 0 || nPos >= (sal_Int32)m_aBookmarks.size())
@@ -869,7 +869,7 @@ sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_I
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
- sal_Int32 nPos;
+ sal_Int32 nPos = 0;
bookmark >>= nPos;
nPos += rows;
OSL_ENSURE(nPos >= 0 && nPos < (sal_Int32)m_aBookmarks.size(),"Invalid Index for vector");
@@ -883,9 +883,9 @@ sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& bookmark1, const Any
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
- sal_Int32 nPos1;
+ sal_Int32 nPos1 = 0;
bookmark1 >>= nPos1;
- sal_Int32 nPos2;
+ sal_Int32 nPos2 = 0;
bookmark2 >>= nPos2;
if(nPos1 == nPos2) // they should be equal
return sal_True;
@@ -929,7 +929,7 @@ sal_Int32 SAL_CALL OResultSet::hashBookmark( const Any& bookmark ) throw(SQLExce
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
- sal_Int32 nPos;
+ sal_Int32 nPos = 0;
bookmark >>= nPos;
return nPos;
}
@@ -942,7 +942,7 @@ Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& ro
OLEVariant aVar;
- sal_Int32 nPos;
+ sal_Int32 nPos = 0;
// Create SafeArray Bounds and initialize the array
SAFEARRAYBOUND rgsabound[1];
commit 623f9a6e42cb045ef40ff39c9555fb45f48c2d9c
Author: David Tardon <dtardon at redhat.com>
Date: Sat Mar 10 18:42:46 2012 +0100
WaE: declaration of 'first' shadows a member of 'this'
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index 3c83cc0..e36ef0a 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -878,15 +878,15 @@ sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_I
return SUCCEEDED(m_pRecordSet->Move(rows,m_aBookmarks[nPos]));
}
//------------------------------------------------------------------------------
-sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& first, const Any& second ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& bookmark1, const Any& bookmark2 ) throw(SQLException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
sal_Int32 nPos1;
- first >>= nPos1;
+ bookmark1 >>= nPos1;
sal_Int32 nPos2;
- second >>= nPos2;
+ bookmark2 >>= nPos2;
if(nPos1 == nPos2) // they should be equal
return sal_True;
commit bd6310886dc4351a8ac3ed3ee9a4f65d2a0e005c
Author: David Tardon <dtardon at redhat.com>
Date: Sat Mar 10 18:40:30 2012 +0100
WaE: enumeral and non-enumeral type in conditional expression
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index 0499476..3c83cc0 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -285,7 +285,7 @@ sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException)
PositionEnum_Param aPos;
m_pRecordSet->get_AbsolutePosition(&aPos);
- return (aPos > 0) ? aPos : m_nRowPos;
+ return (aPos > 0) ? static_cast<sal_Int32>(aPos) : m_nRowPos;
// return the rowcount from driver if the driver doesn't support this return our count
}
// -------------------------------------------------------------------------
commit e54a81fbb05b932df67a50c2599bcdd07a94fad4
Author: David Tardon <dtardon at redhat.com>
Date: Sat Mar 10 18:38:14 2012 +0100
add missing member initializers
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index ff703d0..7d90b12 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -64,7 +64,10 @@ ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet(ADORecordset* _pRecordSet
,m_pRecordSet(_pRecordSet)
,m_aStatement(NULL)
,m_xMetaData(NULL)
+ ,m_nRowPos(0)
+ ,m_bWasNull(sal_False)
,m_bEOF(sal_False)
+ ,m_bOnFirstAfterOpen(sal_False)
{
osl_incrementInterlockedCount( &m_refCount );
m_aColMapping.push_back(-1);
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index 4ba03a6..0499476 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -92,16 +92,22 @@ OResultSet::OResultSet(ADORecordset* _pRecordSet,OStatement_Base* pStmt) : ORes
,m_xStatement(*pStmt)
,m_xMetaData(NULL)
,m_nRowPos(0)
+ ,m_bWasNull(sal_False)
,m_bEOF(sal_False)
+ ,m_bOnFirstAfterOpen(sal_False)
{
}
// -------------------------------------------------------------------------
OResultSet::OResultSet(ADORecordset* _pRecordSet) : OResultSet_BASE(m_aMutex)
,OPropertySetHelper(OResultSet_BASE::rBHelper)
,m_pRecordSet(_pRecordSet)
+ ,m_pStmt(NULL)
,m_xStatement(NULL)
,m_xMetaData(NULL)
+ ,m_nRowPos(0)
+ ,m_bWasNull(sal_False)
,m_bEOF(sal_False)
+ ,m_bOnFirstAfterOpen(sal_False)
{
}
// -----------------------------------------------------------------------------
commit 5511f8e05dbf971f3f4af89c9f42f0003a63c1a5
Author: David Tardon <dtardon at redhat.com>
Date: Sat Mar 10 18:34:00 2012 +0100
WaE: initialization order
diff --git a/connectivity/source/drivers/ado/ACatalog.cxx b/connectivity/source/drivers/ado/ACatalog.cxx
index e2f46a7..0cb3a68 100644
--- a/connectivity/source/drivers/ado/ACatalog.cxx
+++ b/connectivity/source/drivers/ado/ACatalog.cxx
@@ -41,8 +41,8 @@ using namespace connectivity;
using namespace connectivity::ado;
// -------------------------------------------------------------------------
OCatalog::OCatalog(_ADOCatalog* _pCatalog,OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon)
- ,m_pConnection(_pCon)
,m_aCatalog(_pCatalog)
+ ,m_pConnection(_pCon)
{
}
// -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index 94cab5d..40c93b3 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -57,13 +57,13 @@ IMPLEMENT_SERVICE_INFO(OConnection,"com.sun.star.sdbcx.AConnection","com.sun.sta
// --------------------------------------------------------------------------------
OConnection::OConnection(ODriver* _pDriver) throw(SQLException, RuntimeException)
: OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this),
- m_bClosed(sal_False),
m_xCatalog(NULL),
m_pDriver(_pDriver),
m_pAdoConnection(NULL),
- m_bAutocommit(sal_True),
+ m_pCatalog(NULL),
m_nEngineType(0),
- m_pCatalog(NULL)
+ m_bClosed(sal_False),
+ m_bAutocommit(sal_True)
{
osl_incrementInterlockedCount( &m_refCount );
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index 356afab..ff703d0 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -61,9 +61,9 @@ using namespace com::sun::star::sdbc;
ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet(ADORecordset* _pRecordSet)
:ODatabaseMetaDataResultSet_BASE(m_aMutex)
,OPropertySetHelper(ODatabaseMetaDataResultSet_BASE::rBHelper)
+ ,m_pRecordSet(_pRecordSet)
,m_aStatement(NULL)
,m_xMetaData(NULL)
- ,m_pRecordSet(_pRecordSet)
,m_bEOF(sal_False)
{
osl_incrementInterlockedCount( &m_refCount );
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index 3155458..4ba03a6 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -87,20 +87,20 @@ sal_Bool SAL_CALL OResultSet::supportsService( const ::rtl::OUString& _rServiceN
// -------------------------------------------------------------------------
OResultSet::OResultSet(ADORecordset* _pRecordSet,OStatement_Base* pStmt) : OResultSet_BASE(m_aMutex)
,OPropertySetHelper(OResultSet_BASE::rBHelper)
- ,m_xStatement(*pStmt)
+ ,m_pRecordSet(_pRecordSet)
,m_pStmt(pStmt)
- ,m_nRowPos(0)
+ ,m_xStatement(*pStmt)
,m_xMetaData(NULL)
- ,m_pRecordSet(_pRecordSet)
+ ,m_nRowPos(0)
,m_bEOF(sal_False)
{
}
// -------------------------------------------------------------------------
OResultSet::OResultSet(ADORecordset* _pRecordSet) : OResultSet_BASE(m_aMutex)
,OPropertySetHelper(OResultSet_BASE::rBHelper)
+ ,m_pRecordSet(_pRecordSet)
,m_xStatement(NULL)
,m_xMetaData(NULL)
- ,m_pRecordSet(_pRecordSet)
,m_bEOF(sal_False)
{
}
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index ff75f75..5d00d31 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -65,8 +65,8 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection ) : OStatement_BASE(
,OPropertySetHelper(OStatement_BASE::rBHelper)
,OSubComponent<OStatement_Base, OStatement_BASE>((::cppu::OWeakObject*)_pConnection, this)
,m_pConnection(_pConnection)
- ,m_nFetchSize(1)
,m_nMaxRows(0)
+ ,m_nFetchSize(1)
,m_eLockType(adLockReadOnly)
,m_eCursorType(adOpenForwardOnly)
{
diff --git a/connectivity/source/inc/ado/ATables.hxx b/connectivity/source/inc/ado/ATables.hxx
index 1548cd3..2feca48 100644
--- a/connectivity/source/inc/ado/ATables.hxx
+++ b/connectivity/source/inc/ado/ATables.hxx
@@ -53,8 +53,8 @@ namespace connectivity
const TStringVector &_rVector,
const WpADOTables& _rCollection,
sal_Bool _bCase) : sdbcx::OCollection(*_pParent,_bCase,_rMutex,_rVector)
- ,m_pCatalog(_pParent)
,m_aCollection(_rCollection)
+ ,m_pCatalog(_pParent)
{
OSL_ENSURE(m_aCollection.IsValid(),"Collection isn't valid");
}
commit 3bee1da46b18a6b5b9a25dbb266be2ee5972e80d
Author: David Tardon <dtardon at redhat.com>
Date: Sat Mar 10 18:27:08 2012 +0100
suppress error when building with -Werror
This is in windows headers--nothing we can do.
diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx
index d02d735..737ec38 100644
--- a/connectivity/source/drivers/ado/AKeys.cxx
+++ b/connectivity/source/drivers/ado/AKeys.cxx
@@ -39,6 +39,10 @@
#include <connectivity/dbexception.hxx>
#include "resource/ado_res.hrc"
+#if defined __MINGW32__
+#pragma GCC diagnostic warning "-Wwrite-strings"
+#endif
+
using namespace ::comphelper;
using namespace connectivity;
using namespace connectivity::ado;
commit 02536846f2a8c23fd95a7d9a8b11b9208006528d
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 19:33:26 2012 +0100
WaE: compoarison between signed and unsigned interger expressions
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
index 7dc3cb4..6322184 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
@@ -96,7 +96,7 @@ sal_Int32 ODatabaseMetaData::getMaxSize(sal_uInt32 _nId)
sal_Int32 nSize = 0;
::std::map<sal_uInt32,LiteralInfo>::const_iterator aIter = m_aLiteralInfo.find(_nId);
if(aIter != m_aLiteralInfo.end() && (*aIter).second.fSupported)
- nSize = ((*aIter).second.cchMaxLen == (-1)) ? 0 : (*aIter).second.cchMaxLen;
+ nSize = (static_cast<sal_Int32>((*aIter).second.cchMaxLen) == (-1)) ? 0 : (*aIter).second.cchMaxLen;
return nSize;
}
// -------------------------------------------------------------------------
commit cd8b0994a86a0b4413826ba3c2b163abfdf9f547
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 19:29:29 2012 +0100
WaE: member initialization order
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
index e764554..b6a59e9 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
@@ -76,7 +76,8 @@ namespace connectivity
public:
// a Constructor, that is needed for when Returning the Object is needed:
ODatabaseMetaDataResultSetMetaData( ADORecordset* _pRecordSet ,ODatabaseMetaDataResultSet* _pRes)
- : m_pRecordSet(_pRecordSet),m_vMapping(_pRes->getColumnMapping()),
+ : m_vMapping(_pRes->getColumnMapping()),
+ m_pRecordSet(_pRecordSet),
m_nColCount(m_vMapping.size()-1)
{
if(m_pRecordSet)
commit 135e783db24e9468a69a1224567f54e4d7d3d4bd
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 19:25:25 2012 +0100
WaE: base class should be explicitly initialized
diff --git a/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx
index 06bcadc..ad4897e 100644
--- a/connectivity/source/inc/ado/Aolewrap.hxx
+++ b/connectivity/source/inc/ado/Aolewrap.hxx
@@ -103,8 +103,9 @@ namespace connectivity
}
WpOLEBase(const WpOLEBase<T>& aWrapper)
+ : WpBase(aWrapper)
+ , pInterface(aWrapper.pInterface)
{
- operator=(aWrapper);
}
virtual ~WpOLEBase()
@@ -145,7 +146,7 @@ namespace connectivity
// Ctors, operator=
// They only call the superclass
WpOLECollection(Ts* pInt=NULL):WpOLEBase<Ts>(pInt){}
- WpOLECollection(const WpOLECollection& rhs){operator=(rhs);}
+ WpOLECollection(const WpOLECollection& rhs) : WpOLEBase<Ts>(rhs) {}
inline WpOLECollection& operator=(const WpOLECollection& rhs)
{WpOLEBase<Ts>::operator=(rhs); return *this;};
@@ -220,7 +221,7 @@ namespace connectivity
// They only call the superclass
using WpOLEBase<Ts>::pInterface;
WpOLEAppendCollection(Ts* pInt=NULL):WpOLECollection<Ts,T,WrapT>(pInt){}
- WpOLEAppendCollection(const WpOLEAppendCollection& rhs){ operator=(rhs); }
+ WpOLEAppendCollection(const WpOLEAppendCollection& rhs) : WpOLEAppendCollection<Ts, T, WrapT>(rhs) {}
inline WpOLEAppendCollection& operator=(const WpOLEAppendCollection& rhs)
{WpOLEBase<Ts>::operator=(rhs); return *this;};
//////////////////////////////////////////////////////////////////////
diff --git a/connectivity/source/inc/ado/Awrapado.hxx b/connectivity/source/inc/ado/Awrapado.hxx
index 0cab36c..169429a 100644
--- a/connectivity/source/inc/ado/Awrapado.hxx
+++ b/connectivity/source/inc/ado/Awrapado.hxx
@@ -63,7 +63,7 @@ namespace connectivity
WpADOConnection(ADOConnection* pInt) : WpOLEBase<ADOConnection>(pInt){}
- WpADOConnection(const WpADOConnection& rhs){operator=(rhs);}
+ WpADOConnection(const WpADOConnection& rhs) : WpOLEBase<ADOConnection>(rhs) {}
WpADOConnection& operator=(const WpADOConnection& rhs)
{WpOLEBase<ADOConnection>::operator=(rhs); return *this;}
@@ -156,7 +156,7 @@ namespace connectivity
// They only call the superclass
WpADOCommand(ADOCommand* pInt) : WpOLEBase<ADOCommand>(pInt){}
- WpADOCommand(const WpADOCommand& rhs){operator=(rhs);}
+ WpADOCommand(const WpADOCommand& rhs) : WpOLEBase<ADOCommand>(rhs) {}
WpADOCommand& operator=(const WpADOCommand& rhs)
{
@@ -195,7 +195,7 @@ namespace connectivity
// They only call the superclass
WpADOError(ADOError* pInt):WpOLEBase<ADOError>(pInt){}
- WpADOError(const WpADOError& rhs){operator=(rhs);}
+ WpADOError(const WpADOError& rhs) : WpOLEBase<ADOError>(rhs) {}
WpADOError& operator=(const WpADOError& rhs)
{WpOLEBase<ADOError>::operator=(rhs); return *this;}
@@ -220,7 +220,7 @@ namespace connectivity
// Ctors, operator=
// They only call the superclass
WpADOField(ADOField* pInt=NULL):WpOLEBase<ADOField>(pInt){}
- WpADOField(const WpADOField& rhs){operator=(rhs);}
+ WpADOField(const WpADOField& rhs) : WpOLEBase<ADOField>(rhs) {}
WpADOField& operator=(const WpADOField& rhs)
{WpOLEBase<ADOField>::operator=(rhs); return *this;}
@@ -268,7 +268,7 @@ namespace connectivity
// Ctors, operator=
// They only call the superclass
WpADOProperty(ADOProperty* pInt=NULL):WpOLEBase<ADOProperty>(pInt){}
- WpADOProperty(const WpADOProperty& rhs){operator=(rhs);}
+ WpADOProperty(const WpADOProperty& rhs) : WpOLEBase<ADOProperty>(rhs) {}
WpADOProperty& operator=(const WpADOProperty& rhs)
{WpOLEBase<ADOProperty>::operator=(rhs); return *this;}
//////////////////////////////////////////////////////////////////////
@@ -290,7 +290,7 @@ namespace connectivity
// Ctors, operator=
// They only call the superclass
WpADORecordset(ADORecordset* pInt=NULL):WpOLEBase<ADORecordset>(pInt){}
- WpADORecordset(const WpADORecordset& rhs){operator=(rhs);}
+ WpADORecordset(const WpADORecordset& rhs) : WpOLEBase<ADORecordset>() {operator=(rhs);}
WpADORecordset& operator=(const WpADORecordset& rhs)
{
WpOLEBase<ADORecordset>::operator=(rhs);
diff --git a/connectivity/source/inc/ado/Awrapadox.hxx b/connectivity/source/inc/ado/Awrapadox.hxx
index 614c139..2b457aa 100644
--- a/connectivity/source/inc/ado/Awrapadox.hxx
+++ b/connectivity/source/inc/ado/Awrapadox.hxx
@@ -86,7 +86,7 @@ namespace connectivity
{
public:
WpADOView(ADOView* pInt=NULL) : WpOLEBase<ADOView>(pInt){}
- WpADOView(const WpADOView& rhs){operator=(rhs);}
+ WpADOView(const WpADOView& rhs) : WpOLEBase<ADOView>(rhs) {}
inline WpADOView& operator=(const WpADOView& rhs)
{WpOLEBase<ADOView>::operator=(rhs); return *this;}
@@ -100,7 +100,7 @@ namespace connectivity
{
public:
WpADOGroup(ADOGroup* pInt=NULL) : WpOLEBase<ADOGroup>(pInt){}
- WpADOGroup(const WpADOGroup& rhs){operator=(rhs);}
+ WpADOGroup(const WpADOGroup& rhs) : WpOLEBase<ADOGroup>(rhs) {}
inline WpADOGroup& operator=(const WpADOGroup& rhs)
{WpOLEBase<ADOGroup>::operator=(rhs); return *this;}
@@ -124,7 +124,7 @@ namespace connectivity
{
public:
WpADOUser(_ADOUser* pInt=NULL) : WpOLEBase<_ADOUser>(pInt){}
- WpADOUser(const WpADOUser& rhs){operator=(rhs);}
+ WpADOUser(const WpADOUser& rhs) : WpOLEBase<_ADOUser>(rhs) {}
inline WpADOUser& operator=(const WpADOUser& rhs)
{WpOLEBase<_ADOUser>::operator=(rhs); return *this;}
diff --git a/connectivity/source/inc/ado/WrapCatalog.hxx b/connectivity/source/inc/ado/WrapCatalog.hxx
index 8ebbb62..d028ee9 100644
--- a/connectivity/source/inc/ado/WrapCatalog.hxx
+++ b/connectivity/source/inc/ado/WrapCatalog.hxx
@@ -38,7 +38,7 @@ namespace connectivity
{
public:
WpADOCatalog(_ADOCatalog* pInt = NULL) : WpOLEBase<_ADOCatalog>(pInt){}
- WpADOCatalog(const WpADOCatalog& rhs){operator=(rhs);}
+ WpADOCatalog(const WpADOCatalog& rhs) : WpOLEBase<_ADOCatalog>(rhs) {}
inline WpADOCatalog& operator=(const WpADOCatalog& rhs)
{WpOLEBase<_ADOCatalog>::operator=(rhs); return *this;}
diff --git a/connectivity/source/inc/ado/WrapColumn.hxx b/connectivity/source/inc/ado/WrapColumn.hxx
index e39474b..e8111b3 100644
--- a/connectivity/source/inc/ado/WrapColumn.hxx
+++ b/connectivity/source/inc/ado/WrapColumn.hxx
@@ -42,7 +42,7 @@ namespace connectivity
{
public:
WpADOColumn(_ADOColumn* pInt=NULL) : WpOLEBase<_ADOColumn>(pInt){}
- WpADOColumn(const WpADOColumn& rhs){operator=(rhs);}
+ WpADOColumn(const WpADOColumn& rhs) : WpOLEBase<_ADOColumn>(rhs) {}
void Create();
diff --git a/connectivity/source/inc/ado/WrapIndex.hxx b/connectivity/source/inc/ado/WrapIndex.hxx
index bc350f7..a09568b 100644
--- a/connectivity/source/inc/ado/WrapIndex.hxx
+++ b/connectivity/source/inc/ado/WrapIndex.hxx
@@ -38,7 +38,7 @@ namespace connectivity
{
public:
WpADOIndex(_ADOIndex* pInt=NULL) : WpOLEBase<_ADOIndex>(pInt){}
- WpADOIndex(const WpADOIndex& rhs){operator=(rhs);}
+ WpADOIndex(const WpADOIndex& rhs) : WpOLEBase<_ADOIndex>(rhs) {}
inline WpADOIndex& operator=(const WpADOIndex& rhs)
{WpOLEBase<_ADOIndex>::operator=(rhs); return *this;}
diff --git a/connectivity/source/inc/ado/WrapKey.hxx b/connectivity/source/inc/ado/WrapKey.hxx
index 3666338..ebae37d 100644
--- a/connectivity/source/inc/ado/WrapKey.hxx
+++ b/connectivity/source/inc/ado/WrapKey.hxx
@@ -38,7 +38,7 @@ namespace connectivity
{
public:
WpADOKey(ADOKey* pInt=NULL) : WpOLEBase<ADOKey>(pInt){}
- WpADOKey(const WpADOKey& rhs){operator=(rhs);}
+ WpADOKey(const WpADOKey& rhs) : WpOLEBase<ADOKey>(rhs) {}
inline WpADOKey& operator=(const WpADOKey& rhs)
{WpOLEBase<ADOKey>::operator=(rhs); return *this;}
diff --git a/connectivity/source/inc/ado/WrapTable.hxx b/connectivity/source/inc/ado/WrapTable.hxx
index 646b26e..cfba444 100644
--- a/connectivity/source/inc/ado/WrapTable.hxx
+++ b/connectivity/source/inc/ado/WrapTable.hxx
@@ -40,7 +40,7 @@ namespace connectivity
{
public:
WpADOTable(_ADOTable* pInt=NULL) : WpOLEBase<_ADOTable>(pInt){}
- WpADOTable(const WpADOTable& rhs){operator=(rhs);}
+ WpADOTable(const WpADOTable& rhs) : WpOLEBase<_ADOTable>(rhs) {}
inline WpADOTable& operator=(const WpADOTable& rhs)
{WpOLEBase<_ADOTable>::operator=(rhs); return *this;}
commit 04c8f56627f51e7c2be926858e77f81623f7b4d2
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 14:06:02 2012 +0100
WaE: missing initializer for member
diff --git a/shell/source/backends/wininetbe/wininetbecdef.cxx b/shell/source/backends/wininetbe/wininetbecdef.cxx
index 32f2335..1f1034c 100644
--- a/shell/source/backends/wininetbe/wininetbecdef.cxx
+++ b/shell/source/backends/wininetbe/wininetbecdef.cxx
@@ -57,7 +57,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
NULL,
0
},
- { NULL }
+ { NULL, NULL, NULL, NULL, NULL, 0 }
} ;
//------------------------------------------------------------------------------
commit c79f0398f6e67fb5aab5b37c582bd1efc9ab0d79
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 14:03:30 2012 +0100
WaE: deprecated conversion from string constant to 'LPSTR'
diff --git a/shell/source/win32/simplemail/senddoc.cxx b/shell/source/win32/simplemail/senddoc.cxx
index 29e374f..c7f623d 100644
--- a/shell/source/win32/simplemail/senddoc.cxx
+++ b/shell/source/win32/simplemail/senddoc.cxx
@@ -155,7 +155,7 @@ void initMapiOriginator(MapiRecipDesc* pMapiOriginator)
ZeroMemory(pMapiOriginator, sizeof(MapiRecipDesc));
pMapiOriginator->ulRecipClass = MAPI_ORIG;
- pMapiOriginator->lpszName = "";
+ pMapiOriginator->lpszName = const_cast<char*>("");
pMapiOriginator->lpszAddress = const_cast<char*>(gFrom.c_str());
}
commit b0e3615c635be2bcdf82c24a0aadbf0c5ffe149b
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 14:02:09 2012 +0100
WaE: deprecated conversion from string constant to 'char*'
diff --git a/shell/source/win32/simplemail/senddoc.cxx b/shell/source/win32/simplemail/senddoc.cxx
index 54169e5..29e374f 100644
--- a/shell/source/win32/simplemail/senddoc.cxx
+++ b/shell/source/win32/simplemail/senddoc.cxx
@@ -187,7 +187,7 @@ void initMapiMessage(
pMapiMessage->nFileCount = aMapiAttachmentList.size();
}
-char* KnownParameter[] =
+const char* KnownParameter[] =
{
"--to",
"--cc",
commit 392b37cadf9dc5337b75b95aced92b72072ff448
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 14:01:08 2012 +0100
WaE: comparison between signed and unsigned integer expressions
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index c35e445..b4c656c 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -161,7 +161,7 @@ namespace // private
oslFileError _mapError( DWORD dwError )
{
- int i;
+ unsigned i;
/* check the table for the OS error code */
for ( i = 0; i < ERRTABLESIZE; ++i )
commit 5cf40e38212016d568ac31c4b33731cf5bfb0a50
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 13:56:34 2012 +0100
WaE: variable 'hr' set but not used
diff --git a/shell/source/tools/regsvrex/regsvrex.cxx b/shell/source/tools/regsvrex/regsvrex.cxx
index 15528a8..e27d8bd 100644
--- a/shell/source/tools/regsvrex/regsvrex.cxx
+++ b/shell/source/tools/regsvrex/regsvrex.cxx
@@ -51,7 +51,6 @@ bool IsUnregisterParameter(const char* Param)
int main(int argc, char* argv[])
{
HMODULE hmod;
- HRESULT hr = E_FAIL;
lpfnDllRegisterServer lpfn_register;
lpfnDllUnregisterServer lpfn_unregister;
@@ -65,7 +64,7 @@ int main(int argc, char* argv[])
hmod, "DllRegisterServer");
if (lpfn_register)
- hr = lpfn_register();
+ lpfn_register();
FreeLibrary(hmod);
}
@@ -80,7 +79,7 @@ int main(int argc, char* argv[])
hmod, "DllUnregisterServer");
if (lpfn_unregister)
- hr = lpfn_unregister();
+ lpfn_unregister();
FreeLibrary(hmod);
}
commit 3eb65ae04ad57dd86e379f0baafe48c080d7ed22
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 13:55:43 2012 +0100
WaE: variable 'bRet' set but not used
diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx
index 20d35c7..fb14831 100644
--- a/shell/source/backends/wininetbe/wininetbackend.cxx
+++ b/shell/source/backends/wininetbe/wininetbackend.cxx
@@ -127,7 +127,7 @@ WinInetBackend::WinInetBackend()
// query for the neccessary space
DWORD dwLength = 0;
- BOOL bRet = lpfnInternetQueryOption(
+ lpfnInternetQueryOption(
NULL,
INTERNET_OPTION_PROXY,
(LPVOID)lpi,
@@ -144,7 +144,7 @@ WinInetBackend::WinInetBackend()
lpi = reinterpret_cast< LPINTERNET_PROXY_INFO >(
alloca( dwLength ) );
- bRet = lpfnInternetQueryOption(
+ lpfnInternetQueryOption(
NULL,
INTERNET_OPTION_PROXY,
(LPVOID)lpi,
commit 2009feb8ec40fb4ea2785ada8cd1cdd5c952b8bf
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 13:54:35 2012 +0100
WaE: defined but not used
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
index a6339f4..8528d0c 100644
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
@@ -990,7 +990,6 @@ namespace /* private */
const char* GUID_PLACEHOLDER = "{GUID}";
const char* GUID_PERSIST_PLACEHOLDER = "{GUIDPERSIST}";
const char* EXTENSION_PLACEHOLDER = "{EXT}";
- const char* FORWARDKEY_PLACEHOLDER = "{FWDKEY}";
const char* CLSID_GUID_INPROC_ENTRY = "CLSID\\{GUID}\\InProcServer32";
const char* CLSID_GUID_ENTRY = "CLSID\\{GUID}";
commit 9dd2c03c37bb4fa68f7e4a7125a9e610f4151155
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 13:53:51 2012 +0100
WaE: deprecated conversion from string constant to 'LPSTR'
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
index 07bb501..a6339f4 100644
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
@@ -1223,10 +1223,11 @@ namespace /* private */
*pChar = *( pChar+1 ) ='\0';
HKEY hSubKey;
+ char dummy[] = "";
int rc = RegCreateKeyExA(HKEY_LOCAL_MACHINE,
INDEXING_FILTER_DLLSTOREGISTER,
0,
- "",
+ dummy,
REG_OPTION_NON_VOLATILE,
KEY_WRITE,
0,
commit 75c5b3561ebdff4af9fdd219a64ba77fb1a13254
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 13:52:03 2012 +0100
WaE: deleting object of abstract class type with non-virt. destuctor
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
index ed49f82..07bb501 100644
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
@@ -908,10 +908,14 @@ extern "C" SCODE STDMETHODCALLTYPE DllGetClassObject(
void ** ppvObj
)
{
+ COooFilterCF* pImpl = 0;
IUnknown *pResult = 0;
if ( CLSID_COooFilter == cid )
- pResult = (IUnknown *) new COooFilterCF;
+ {
+ pImpl = new COooFilterCF;
+ pResult = (IUnknown *) pImpl;
+ }
else
return CLASS_E_CLASSNOTAVAILABLE;
if ( 0 != pResult )
@@ -921,7 +925,7 @@ extern "C" SCODE STDMETHODCALLTYPE DllGetClassObject(
pResult->Release();
else
{
- delete pResult;
+ delete pImpl;
return E_UNEXPECTED;
}
}
commit c696282069faa88c486abdffbca6a5255102f4d8
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 13:46:03 2012 +0100
WaE: variable 'hr' set but not used
diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
index f89a044..54409eb 100644
--- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
@@ -57,12 +57,11 @@ IStream* PrepareIStream( IStream* pStream, zlib_filefunc_def &zFileFunc )
// These next few lines work around the "Seek pointer" bug found on Vista.
char cBuf[20];
unsigned long nCount;
- HRESULT hr;
ULARGE_INTEGER nNewPosition;
LARGE_INTEGER nMove;
nMove.QuadPart = 0;
- hr = pStream->Seek( nMove, STREAM_SEEK_SET, &nNewPosition );
- hr = pStream->Read( cBuf, 20, &nCount );
+ pStream->Seek( nMove, STREAM_SEEK_SET, &nNewPosition );
+ pStream->Read( cBuf, 20, &nCount );
fill_stream_filefunc( &zFileFunc );
zFileFunc.opaque = (void*)pStream;
commit 5982c0306feb633ad04a435684cd0e919ff29574
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 13:44:46 2012 +0100
suppress errors with -Werror
diff --git a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
index 1cbe62a..bce143b 100644
--- a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
+++ b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
@@ -36,6 +36,10 @@
#include <sal/macros.h>
#include <malloc.h>
+#if defined GCC
+#pragma GCC diagnostic warning "-Wmissing-braces"
+#endif
+
//----------------------------
namespace /* private */
commit 2c5a817591bee01825de1e2885e55a3bd9d22a15
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 13:36:31 2012 +0100
WaE: "_WIN32_WINNT" redefined
diff --git a/shell/source/win32/shlxthandler/columninfo/makefile.mk b/shell/source/win32/shlxthandler/columninfo/makefile.mk
index ceefe93..31c019f 100644
--- a/shell/source/win32/shlxthandler/columninfo/makefile.mk
+++ b/shell/source/win32/shlxthandler/columninfo/makefile.mk
@@ -36,22 +36,22 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE
.IF "$(COM)" == "MSC"
CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
.ENDIF
-CDEFS+=-D_WIN32_IE=0x501
+CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501
# --- Files --------------------------------------------------------
SLOFILES=$(SLO)$/columninfo.obj
.IF "$(BUILD_X64)"!=""
-CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE
.IF "$(COM)" == "MSC"
CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
.ENDIF
-CDEFS_X64+=-D_WIN32_IE=0x501
+CDEFS_X64+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x501
SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
.ENDIF # "$(BUILD_X64)"!=""
diff --git a/shell/source/win32/shlxthandler/infotips/makefile.mk b/shell/source/win32/shlxthandler/infotips/makefile.mk
index 9daeafd..e7caf3a 100644
--- a/shell/source/win32/shlxthandler/infotips/makefile.mk
+++ b/shell/source/win32/shlxthandler/infotips/makefile.mk
@@ -36,22 +36,22 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
.INCLUDE : settings.mk
-CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE
.IF "$(COM)" == "MSC"
CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
.ENDIF
-CDEFS+=-D_WIN32_IE=0x501
+CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501
# --- Files --------------------------------------------------------
SLOFILES=$(SLO)$/$(TARGET).obj
.IF "$(BUILD_X64)"!=""
-CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE
.IF "$(COM)" == "MSC"
CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
.ENDIF
-CDEFS_X64+=-D_WIN32_IE=0x501
+CDEFS_X64+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501
SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
.ENDIF # "$(BUILD_X64)"!=""
diff --git a/shell/source/win32/shlxthandler/ooofilt/makefile.mk b/shell/source/win32/shlxthandler/ooofilt/makefile.mk
index 92111c6..1748f46 100644
--- a/shell/source/win32/shlxthandler/ooofilt/makefile.mk
+++ b/shell/source/win32/shlxthandler/ooofilt/makefile.mk
@@ -40,11 +40,11 @@ UWINAPILIB=
.INCLUDE : settings.mk
-CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE
.IF "$(COM)" == "MSC"
CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
.ENDIF
-CDEFS+=-D_WIN32_IE=0x501
+CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501
# --- Files --------------------------------------------------------
diff --git a/shell/source/win32/shlxthandler/prophdl/makefile.mk b/shell/source/win32/shlxthandler/prophdl/makefile.mk
index 0dc48af..64d83a6 100644
--- a/shell/source/win32/shlxthandler/prophdl/makefile.mk
+++ b/shell/source/win32/shlxthandler/prophdl/makefile.mk
@@ -49,11 +49,11 @@ ALL :
UWINAPILIB =
UWINAPILIB_X64 =
-CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE
.IF "$(COM)" == "MSC"
CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -wd4100
.ENDIF
-CDEFS+=-D_WIN32_IE=0x501
+CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501
# --- Files --------------------------------------------------------
diff --git a/shell/source/win32/shlxthandler/propsheets/makefile.mk b/shell/source/win32/shlxthandler/propsheets/makefile.mk
index 68c6407..5b4405f 100644
--- a/shell/source/win32/shlxthandler/propsheets/makefile.mk
+++ b/shell/source/win32/shlxthandler/propsheets/makefile.mk
@@ -41,7 +41,7 @@ CDEFS+=-U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -U_WIN32_IE -D_WIN32_IE=0x501
CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE
CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
-CDEFS_X64+=-D_WIN32_WINNT=0x0501 -D_WIN32_IE=0x501
+CDEFS_X64+=-U_WIN32_IE -D_WIN32_WINNT=0x0501 -U_WIN32_WINNT -D_WIN32_IE=0x501
.ENDIF
# --- Files --------------------------------------------------------
diff --git a/shell/source/win32/shlxthandler/thumbviewer/makefile.mk b/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
index ed90b9c..189c42a 100644
--- a/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
+++ b/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
@@ -35,8 +35,8 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-CFLAGS+=-DWIN32_LEAN_AND_MEAN -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
-CDEFS+=-D_WIN32_IE=0x501
+CFLAGS+=-DWIN32_LEAN_AND_MEAN -D_NTSDK -DUNICODE -D_UNICODE
+CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501
.IF "$(COM)" == "GCC"
CDEFS+=-DDONT_HAVE_GDIPLUS
.ENDIF
@@ -47,8 +47,8 @@ SLOFILES=$(SLO)$/$(TARGET).obj
.IF "$(BUILD_X64)"!=""
# ----------------- x64 ------------------------
-CFLAGS_X64+=-DWIN32_LEAN_AND_MEAN -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
-CDEFS_X64+=-D_WIN32_IE=0x501
+CFLAGS_X64+=-DWIN32_LEAN_AND_MEAN -D_NTSDK -DUNICODE -D_UNICODE
+CDEFS_X64+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501
SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
.ENDIF # "$(BUILD_X64)"!=""
commit 064d8f1405a6b64766eee3d73136eb2f3acc7509
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 13:30:39 2012 +0100
WaE: invalid conversion from 'const char*' to 'LPSTR'
diff --git a/shell/source/win32/shlxthandler/util/registry.cxx b/shell/source/win32/shlxthandler/util/registry.cxx
index ff2d60b..3824dc5 100644
--- a/shell/source/win32/shlxthandler/util/registry.cxx
+++ b/shell/source/win32/shlxthandler/util/registry.cxx
@@ -57,8 +57,9 @@ bool SetRegistryKey(HKEY RootKey, const char* KeyName, const char* ValueName, co
HKEY hSubKey;
// open or create the desired key
+ char dummy[] = "";
int rc = RegCreateKeyExA(
- RootKey, KeyName, 0, "", REG_OPTION_NON_VOLATILE, KEY_WRITE, 0, &hSubKey, 0);
+ RootKey, const_cast<char*>(KeyName), 0, dummy, REG_OPTION_NON_VOLATILE, KEY_WRITE, 0, &hSubKey, 0);
if (ERROR_SUCCESS == rc)
{
commit bd6757d60d2f126ad0ba34144db3a6660a786ad5
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 13:23:55 2012 +0100
WaE: value computed is not used
diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
index 49bb3c6..5c0cd50 100644
--- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
@@ -110,7 +110,7 @@ void list_view_builder::setup_list_view()
HBITMAP h_bmp = LoadBitmap(GetModuleHandle(MODULE_NAME), MAKEINTRESOURCE(IDB_PROPERTY_IMAGES));
ImageList_AddMasked(h_ils, h_bmp, RGB(255, 0, 255));
- ListView_SetImageList(hwnd_list_view_, h_ils, LVSIL_SMALL);
+ (void) ListView_SetImageList(hwnd_list_view_, h_ils, LVSIL_SMALL);
std::wstring header = GetResString(IDS_PROPERTY);
commit d860d2626312bc561436eb95c8113868f6572f30
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 13:21:35 2012 +0100
WaE: deprecated conversion from string constant to 'char*''
diff --git a/shell/inc/internal/fileextensions.hxx b/shell/inc/internal/fileextensions.hxx
index 4005258..23b7822 100644
--- a/shell/inc/internal/fileextensions.hxx
+++ b/shell/inc/internal/fileextensions.hxx
@@ -43,9 +43,9 @@
*/
struct FileExtensionEntry
{
- char* ExtensionAnsi; // e.g. ".sxw"
- wchar_t* ExtensionUnicode; // e.g. L".sxw"
- char* RegistryForwardKey; // e.g. "soffice.StarWriterDocument.6"
+ const char* ExtensionAnsi; // e.g. ".sxw"
+ const wchar_t* ExtensionUnicode; // e.g. L".sxw"
+ const char* RegistryForwardKey; // e.g. "soffice.StarWriterDocument.6"
};
extern FileExtensionEntry OOFileExtensionTable[];
commit ca67ec0ebc6fd29785607c561c251827e75c24e9
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 13:19:56 2012 +0100
WaE: initialization order
diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
index 8b35e19..49bb3c6 100644
--- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
@@ -67,8 +67,8 @@ list_view_builder::list_view_builder(
HWND hwnd_list_view,
const std::wstring& column1_title,
const std::wstring& column2_title) :
- hwnd_list_view_(hwnd_list_view),
row_index_(-1),
+ hwnd_list_view_(hwnd_list_view),
column1_title_(column1_title),
column2_title_(column2_title)
{
commit 3b521d1bc640258782372bf0d11889419304ade8
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 13:16:20 2012 +0100
WaE: "_WIN32_WINNT" redefined
diff --git a/shell/source/all/makefile.mk b/shell/source/all/makefile.mk
index 87312d3..8791e62 100644
--- a/shell/source/all/makefile.mk
+++ b/shell/source/all/makefile.mk
@@ -38,18 +38,18 @@ VISIBILITY_HIDDEN = TRUE
.INCLUDE : settings.mk
.IF "$(GUI)" == "WNT"
-CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE
.IF "$(COM)" == "MSC"
CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
.ENDIF
-CDEFS+=-D_WIN32_IE=0x501
+CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501
.IF "$(BUILD_X64)"!=""
-CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE
.IF "$(COM)" == "MSC"
CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
.ENDIF
-CDEFS_X64+=-D_WIN32_IE=0x501
+CDEFS_X64+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501
.ENDIF # "$(BUILD_X64)"!=""
.ENDIF
diff --git a/shell/source/win32/ooofilereader/makefile.mk b/shell/source/win32/ooofilereader/makefile.mk
index 90f0429..6b9d1ef 100644
--- a/shell/source/win32/ooofilereader/makefile.mk
+++ b/shell/source/win32/ooofilereader/makefile.mk
@@ -36,16 +36,16 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE
.IF "$(COM)" == "MSC"
CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
.ENDIF
-CDEFS+=-D_WIN32_IE=0x501
-CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501
+CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE
.IF "$(COM)" == "MSC"
CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
.ENDIF
-CDEFS_X64+=-D_WIN32_IE=0x501
+CDEFS_X64+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501
# --- Files --------------------------------------------------------
diff --git a/shell/source/win32/shlxthandler/makefile.mk b/shell/source/win32/shlxthandler/makefile.mk
index 5778cce..b02a278 100644
--- a/shell/source/win32/shlxthandler/makefile.mk
+++ b/shell/source/win32/shlxthandler/makefile.mk
@@ -49,7 +49,7 @@ ALL :
UWINAPILIB =
UWINAPILIB_X64 =
-CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE
.IF "$(COM)" == "MSC"
CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
.ENDIF
@@ -57,7 +57,7 @@ CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
CDEFS+=-DDONT_HAVE_GDIPLUS
.ENDIF
-CDEFS+=-D_WIN32_IE=0x501
+CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501
# --- Files --------------------------------------------------------
diff --git a/shell/source/win32/shlxthandler/util/makefile.mk b/shell/source/win32/shlxthandler/util/makefile.mk
index dff0fa9..f2edb7f 100644
--- a/shell/source/win32/shlxthandler/util/makefile.mk
+++ b/shell/source/win32/shlxthandler/util/makefile.mk
@@ -35,17 +35,17 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE
.IF "$(COM)" == "MSC"
CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
.ENDIF
-CDEFS+=-D_WIN32_IE=0x501
+CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501
-CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE
.IF "$(COM)" == "MSC"
CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
.ENDIF
-CDEFS_X64+=-D_WIN32_IE=0x501
+CDEFS_X64+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501
# --- Files --------------------------------------------------------
commit c169483c49f78ce72d751610bb3b04103f8132c5
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 12:39:17 2012 +0100
WaE: "__uuidof" redefined
It would probably be better to find out why the "stock" __uuidof from
MinGW causes linking error for libdnd (missing symbols) and if it can be
fixed , but I am too lazy .-)
diff --git a/dtrans/source/win32/clipb/MtaOleClipb.cxx b/dtrans/source/win32/clipb/MtaOleClipb.cxx
index 96f9647..ca09a86 100644
--- a/dtrans/source/win32/clipb/MtaOleClipb.cxx
+++ b/dtrans/source/win32/clipb/MtaOleClipb.cxx
@@ -55,6 +55,9 @@
#include <systools/win32/comtools.hxx>
#ifdef __MINGW32__
+#if defined __uuidof
+#undef __uuidof
+#endif
#define __uuidof(I) IID_##I
#endif
diff --git a/dtrans/source/win32/dnd/idroptarget.cxx b/dtrans/source/win32/dnd/idroptarget.cxx
index 9d8a60f..f6b1ca7 100644
--- a/dtrans/source/win32/dnd/idroptarget.cxx
+++ b/dtrans/source/win32/dnd/idroptarget.cxx
@@ -30,6 +30,9 @@
#include <rtl/unload.h>
#ifdef __MINGW32__
+#if defined __uuidof
+#undef __uuidof
+#endif
#define __uuidof(I) IID_##I
#endif
diff --git a/dtrans/source/win32/dnd/source.cxx b/dtrans/source/win32/dnd/source.cxx
index 5a1c636..91860d7 100644
--- a/dtrans/source/win32/dnd/source.cxx
+++ b/dtrans/source/win32/dnd/source.cxx
@@ -45,6 +45,9 @@
#include <stdio.h>
#ifdef __MINGW32__
+#if defined __uuidof
+#undef __uuidof
+#endif
#define __uuidof(I) IID_##I
#endif
diff --git a/dtrans/source/win32/dtobj/APNDataObject.cxx b/dtrans/source/win32/dtobj/APNDataObject.cxx
index 48f39ee..eb7761c 100644
--- a/dtrans/source/win32/dtobj/APNDataObject.cxx
+++ b/dtrans/source/win32/dtobj/APNDataObject.cxx
@@ -34,6 +34,9 @@
#include <systools/win32/comtools.hxx>
#ifdef __MINGW32__
+#if defined __uuidof
+#undef __uuidof
+#endif
#define __uuidof(I) IID_##I
#endif
diff --git a/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx b/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx
index 6809f65..2a8432d 100644
--- a/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx
@@ -33,6 +33,9 @@
#include "../../inc/DtObjFactory.hxx"
#ifdef __MINGW32__
+#if defined __uuidof
+#undef __uuidof
+#endif
#define __uuidof(I) IID_##I
#endif
diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx
index a5888b7..31028ac 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.cxx
@@ -50,6 +50,9 @@
#endif
#ifdef __MINGW32__
+#if defined __uuidof
+#undef __uuidof
+#endif
#define __uuidof(I) IID_##I
#endif
commit 49884860e60d807cf0d8649a19e98c8bf05b197e
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 12:01:15 2012 +0100
WaE: variable 'hr' set but not used
diff --git a/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx
index e894679..42fec62 100644
--- a/dtrans/source/win32/dnd/target.cxx
+++ b/dtrans/source/win32/dnd/target.cxx
@@ -90,7 +90,6 @@ DropTarget::~DropTarget()
// the IDropTarget object will live on. MEMORY LEAK
void SAL_CALL DropTarget::disposing()
{
- HRESULT hr= S_OK;
if( m_threadIdTarget)
{
// Call RevokeDragDrop and wait for the OLE thread to die;
@@ -101,7 +100,7 @@ void SAL_CALL DropTarget::disposing()
}
else
{
- hr= RevokeDragDrop( m_hWnd);
+ RevokeDragDrop( m_hWnd);
m_hWnd= 0;
}
if( m_pDropTarget)
commit 4d34615cfc651e8cc72211488bb14f0ff5842237
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 11:59:33 2012 +0100
add missing initializer
diff --git a/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx
index 5a33a98..e894679 100644
--- a/dtrans/source/win32/dnd/target.cxx
+++ b/dtrans/source/win32/dnd/target.cxx
@@ -67,7 +67,8 @@ DropTarget::DropTarget( const Reference<XMultiServiceFactory>& sf):
m_bActive(sal_True),
m_nDefaultActions(ACTION_COPY|ACTION_MOVE|ACTION_LINK|ACTION_DEFAULT),
m_nCurrentDropAction( ACTION_NONE),
- m_nLastDropAction(0)
+ m_nLastDropAction(0),
+ m_bDropComplete(false)
{
commit 14eda666492ae3c5694cf993dfe5fa547a0628ee
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 11:58:50 2012 +0100
WaE: initialization order
diff --git a/dtrans/source/win32/dnd/source.cxx b/dtrans/source/win32/dnd/source.cxx
index f242688..5a1c636 100644
--- a/dtrans/source/win32/dnd/source.cxx
+++ b/dtrans/source/win32/dnd/source.cxx
@@ -74,8 +74,8 @@ unsigned __stdcall DndOleSTAFunc(LPVOID pParams);
/** Ctor
*/
DragSource::DragSource( const Reference<XMultiServiceFactory>& sf):
- m_serviceFactory( sf),
WeakComponentImplHelper3< XDragSource, XInitialization, XServiceInfo >(m_mutex),
+ m_serviceFactory( sf),
// m_pcurrentContext_impl(0),
m_hAppWindow(0),
m_MouseButton(0),
diff --git a/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx
index b16a62c..5a33a98 100644
--- a/dtrans/source/win32/dnd/target.cxx
+++ b/dtrans/source/win32/dnd/target.cxx
@@ -56,17 +56,17 @@ extern rtl_StandardModuleCount g_moduleCount;
DWORD WINAPI DndTargetOleSTAFunc(LPVOID pParams);
DropTarget::DropTarget( const Reference<XMultiServiceFactory>& sf):
+ WeakComponentImplHelper3<XInitialization,XDropTarget, XServiceInfo>(m_mutex),
m_hWnd( NULL),
+ m_threadIdWindow(0),
+ m_threadIdTarget(0),
+ m_hOleThread(0),
+ m_oleThreadId( 0),
+ m_pDropTarget( NULL),
m_serviceFactory( sf),
- WeakComponentImplHelper3<XInitialization,XDropTarget, XServiceInfo>(m_mutex),
m_bActive(sal_True),
m_nDefaultActions(ACTION_COPY|ACTION_MOVE|ACTION_LINK|ACTION_DEFAULT),
m_nCurrentDropAction( ACTION_NONE),
- m_oleThreadId( 0),
- m_pDropTarget( NULL),
- m_threadIdWindow(0),
- m_threadIdTarget(0),
- m_hOleThread(0),
m_nLastDropAction(0)
commit 45c2e99be29025a88b70551856f9fa896c13bb69
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 11:55:15 2012 +0100
probable intent
diff --git a/dtrans/source/win32/dnd/globals.cxx b/dtrans/source/win32/dnd/globals.cxx
index 5222a80..4e478b7 100644
--- a/dtrans/source/win32/dnd/globals.cxx
+++ b/dtrans/source/win32/dnd/globals.cxx
@@ -83,7 +83,7 @@ sal_Int8 dndOleKeysToAction( DWORD grfKeyState, sal_Int8 nSourceActions)
{
ret= ACTION_LINK;
}
- else if ( grfKeyState & MK_RBUTTON |
+ else if ( grfKeyState & MK_RBUTTON ||
grfKeyState & MK_ALT)
{
ret= ACTION_COPY_OR_MOVE | ACTION_LINK;
commit d8639ceb1dbcd6438f9d49357aed38fc982a3df0
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 11:53:03 2012 +0100
WaE: variable 'dwResult' set but not used
diff --git a/dtrans/source/win32/clipb/MtaOleClipb.cxx b/dtrans/source/win32/clipb/MtaOleClipb.cxx
index 86c83b6..96f9647 100644
--- a/dtrans/source/win32/clipb/MtaOleClipb.cxx
+++ b/dtrans/source/win32/clipb/MtaOleClipb.cxx
@@ -327,6 +327,7 @@ CMtaOleClipboard::~CMtaOleClipboard( )
sal_uInt32 dwResult = WaitForSingleObject(
m_hClipboardChangedNotifierThread, MAX_WAIT_SHUTDOWN );
+ (void) dwResult;
OSL_ENSURE( dwResult == WAIT_OBJECT_0, "clipboard notifier thread could not terminate" );
if ( NULL != m_hClipboardChangedNotifierThread )
commit f74379741fad32b015f47ca6247e4b7804725a38
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 11:51:29 2012 +0100
fix indentation
diff --git a/dtrans/source/win32/misc/ImplHelper.cxx b/dtrans/source/win32/misc/ImplHelper.cxx
index 169d739..5243aac 100644
--- a/dtrans/source/win32/misc/ImplHelper.cxx
+++ b/dtrans/source/win32/misc/ImplHelper.cxx
@@ -407,17 +407,17 @@ sal_Int32 SAL_CALL CompareFormatEtc( const FORMATETC* pFetcLhs, const FORMATETC*
if ( nMatch == FORMATETC_EXACT_MATCH || nMatch == FORMATETC_PARTIAL_MATCH )
{
- if ( pFetcLhs->tymed == pFetcRhs->tymed )
- // same medium flags; equal
- ;
- else if ( ( pFetcLhs->tymed & ~pFetcRhs->tymed ) != 0 )
- {
- // left not subset of medium flags of right; not equal
- nMatch = FORMATETC_NO_MATCH;
- }
- else
- // left subset of right
- nMatch = FORMATETC_PARTIAL_MATCH;
+ if ( pFetcLhs->tymed == pFetcRhs->tymed )
+ // same medium flags; equal
+ ;
+ else if ( ( pFetcLhs->tymed & ~pFetcRhs->tymed ) != 0 )
+ {
+ // left not subset of medium flags of right; not equal
+ nMatch = FORMATETC_NO_MATCH;
+ }
+ else
+ // left subset of right
+ nMatch = FORMATETC_PARTIAL_MATCH;
}
}
}
commit 1be53d0081c2c40a95dae762d8a946d104b8e9cd
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 11:49:28 2012 +0100
WaE: suggest explicit braces to avoid ambiguous 'else'
diff --git a/dtrans/source/win32/misc/ImplHelper.cxx b/dtrans/source/win32/misc/ImplHelper.cxx
index abeb028..169d739 100644
--- a/dtrans/source/win32/misc/ImplHelper.cxx
+++ b/dtrans/source/win32/misc/ImplHelper.cxx
@@ -385,39 +385,40 @@ sal_Int32 SAL_CALL CompareFormatEtc( const FORMATETC* pFetcLhs, const FORMATETC*
{
#endif
if ( pFetcLhs != pFetcRhs )
-
- if ( ( pFetcLhs->cfFormat != pFetcRhs->cfFormat ) ||
- ( pFetcLhs->lindex != pFetcRhs->lindex ) ||
- !CompareTargetDevice( pFetcLhs->ptd, pFetcRhs->ptd ) )
{
- nMatch = FORMATETC_NO_MATCH;
- }
-
- else if ( pFetcLhs->dwAspect == pFetcRhs->dwAspect )
- // same aspects; equal
- ;
- else if ( ( pFetcLhs->dwAspect & ~pFetcRhs->dwAspect ) != 0 )
- {
- // left not subset of aspects of right; not equal
- nMatch = FORMATETC_NO_MATCH;
- }
- else
- // left subset of right
- nMatch = FORMATETC_PARTIAL_MATCH;
-
- if ( nMatch == FORMATETC_EXACT_MATCH || nMatch == FORMATETC_PARTIAL_MATCH )
- {
- if ( pFetcLhs->tymed == pFetcRhs->tymed )
- // same medium flags; equal
- ;
- else if ( ( pFetcLhs->tymed & ~pFetcRhs->tymed ) != 0 )
- {
- // left not subset of medium flags of right; not equal
- nMatch = FORMATETC_NO_MATCH;
- }
- else
- // left subset of right
- nMatch = FORMATETC_PARTIAL_MATCH;
+ if ( ( pFetcLhs->cfFormat != pFetcRhs->cfFormat ) ||
+ ( pFetcLhs->lindex != pFetcRhs->lindex ) ||
+ !CompareTargetDevice( pFetcLhs->ptd, pFetcRhs->ptd ) )
+ {
+ nMatch = FORMATETC_NO_MATCH;
+ }
+
+ else if ( pFetcLhs->dwAspect == pFetcRhs->dwAspect )
+ // same aspects; equal
+ ;
+ else if ( ( pFetcLhs->dwAspect & ~pFetcRhs->dwAspect ) != 0 )
+ {
+ // left not subset of aspects of right; not equal
+ nMatch = FORMATETC_NO_MATCH;
+ }
+ else
+ // left subset of right
+ nMatch = FORMATETC_PARTIAL_MATCH;
+
+ if ( nMatch == FORMATETC_EXACT_MATCH || nMatch == FORMATETC_PARTIAL_MATCH )
+ {
+ if ( pFetcLhs->tymed == pFetcRhs->tymed )
+ // same medium flags; equal
+ ;
+ else if ( ( pFetcLhs->tymed & ~pFetcRhs->tymed ) != 0 )
+ {
+ // left not subset of medium flags of right; not equal
+ nMatch = FORMATETC_NO_MATCH;
+ }
+ else
+ // left subset of right
+ nMatch = FORMATETC_PARTIAL_MATCH;
+ }
}
}
#ifdef __MINGW32__
commit 55afdcce6d46e9824467999aef92ef04347cfeb1
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 11:44:28 2012 +0100
WaE: comparison between signed and unsigned integer expressions
diff --git a/dtrans/source/win32/misc/ImplHelper.cxx b/dtrans/source/win32/misc/ImplHelper.cxx
index 9061e80..abeb028 100644
--- a/dtrans/source/win32/misc/ImplHelper.cxx
+++ b/dtrans/source/win32/misc/ImplHelper.cxx
@@ -183,8 +183,8 @@ sal_Bool SAL_CALL IsOEMCP( sal_uInt32 codepage )
861, 862, 863, 864, 865, 866,
869, 874, 932, 936, 949, 950, 1361 };
- for ( sal_Int8 i = 0; i < ( SAL_N_ELEMENTS( arrOEMCP ) ); ++i )
- if ( (sal_uInt32) arrOEMCP[i] == codepage )
+ for ( size_t i = 0; i < SAL_N_ELEMENTS( arrOEMCP ); ++i )
+ if ( arrOEMCP[i] == codepage )
return sal_True;
return sal_False;
commit 7553b372efef9d73db8b3a48db1dce3e292962f3
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 11:43:27 2012 +0100
use SAL_N_ELEMENTS
diff --git a/dtrans/source/win32/misc/ImplHelper.cxx b/dtrans/source/win32/misc/ImplHelper.cxx
index 7d7b22f..9061e80 100644
--- a/dtrans/source/win32/misc/ImplHelper.cxx
+++ b/dtrans/source/win32/misc/ImplHelper.cxx
@@ -183,7 +183,7 @@ sal_Bool SAL_CALL IsOEMCP( sal_uInt32 codepage )
861, 862, 863, 864, 865, 866,
869, 874, 932, 936, 949, 950, 1361 };
- for ( sal_Int8 i = 0; i < ( sizeof( arrOEMCP )/sizeof( sal_uInt32 ) ); ++i )
+ for ( sal_Int8 i = 0; i < ( SAL_N_ELEMENTS( arrOEMCP ) ); ++i )
if ( (sal_uInt32) arrOEMCP[i] == codepage )
return sal_True;
commit 0441206f22ee4abb6ee762099d4658bce97a9706
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 11:39:20 2012 +0100
WaE: multi-character character constant
diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx
index 4093e92..f6880d8 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.cxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.cxx
@@ -215,7 +215,7 @@ Sequence< sal_Int8 > SAL_CALL WinDIBToOOBMP( const Sequence< sal_Int8 >& aWinDIB
else if( ( BI_BITFIELDS == pBmpInfoHdr->biCompression ) && ( ( 16 == pBmpInfoHdr->biBitCount ) || ( 32 == pBmpInfoHdr->biBitCount ) ) )
nOffset += 12;
- pBmpFileHdr->bfType = 'MB';
+ pBmpFileHdr->bfType = ('M' << 8) | 'B';
pBmpFileHdr->bfSize = 0; // maybe: nMemSize + sizeof(BITMAPFILEHEADER)
pBmpFileHdr->bfReserved1 = 0;
pBmpFileHdr->bfReserved2 = 0;
commit 72137b44ff5db6893bf49277ab4d99b16365c34f
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 10:34:34 2012 +0100
suppress errors with -Werror
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 3f1261c..77e5896 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -56,8 +56,12 @@
#ifdef WNT
# define snprintf _snprintf
-#endif
+#if defined GCC
+#pragma GCC diagnostic warning "-Wformat"
+#pragma GCC diagnostic warning "-Wformat-extra-args"
+#endif
+#endif
/* SYNC STREAMS
============
commit 76e17e8c124996b74fdcc2447d0ca18ccf5ed5cb
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 10:24:54 2012 +0100
WaE: comparison between signed and unsigned integer expressions
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx
index 8bd1803..294cefb 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -122,7 +122,7 @@ static void addMenuItem( HMENU hMenu, UINT id, UINT iconId, const OUString& text
memset( &mi, 0, sizeof( MENUITEMINFOW ) );
mi.cbSize = sizeof( MENUITEMINFOW );
- if( id == -1 )
+ if( id == static_cast<UINT>( -1 ) )
{
mi.fMask=MIIM_TYPE;
mi.fType=MFT_SEPARATOR;
commit c4ee0b0a7450b496978f10f9205023568739090e
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 10:18:20 2012 +0100
WaE: declaration of 'HWND__* hWnd' shadows a parameter
diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx
index bdb515a..e91ca8d 100644
--- a/vcl/win/source/window/salobj.cxx
+++ b/vcl/win/source/window/salobj.cxx
@@ -87,11 +87,11 @@ WinSalFrame* ImplFindSalObjectFrame( HWND hWnd )
if ( pObject )
{
// Dazugehoerenden Frame suchen
- HWND hWnd = ::GetParent( pObject->mhWnd );
+ HWND hWnd2 = ::GetParent( pObject->mhWnd );
pFrame = GetSalData()->mpFirstFrame;
while ( pFrame )
{
- if ( pFrame->mhWnd == hWnd )
+ if ( pFrame->mhWnd == hWnd2 )
break;
pFrame = pFrame->mpNextFrame;
commit e8d7c38231c048bfcf24d8a39f0ed598dabcf071
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 10:14:32 2012 +0100
WaE: comparison between signed and unsigned integer expressions
diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx
index e3f4345..b215a06 100644
--- a/vcl/win/source/window/salmenu.cxx
+++ b/vcl/win/source/window/salmenu.cxx
@@ -202,7 +202,7 @@ void WinSalMenu::InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos )
if( nPos == MENU_APPEND )
{
nPos = ::GetMenuItemCount( mhMenu );
- if( nPos == -1 )
+ if( nPos == static_cast<unsigned>( -1 ) )
return;
}
@@ -299,7 +299,7 @@ void WinSalMenu::SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsig
void WinSalMenu::CheckItem( unsigned nPos, sal_Bool bCheck )
{
- if( -1 != ::CheckMenuItem( mhMenu, nPos, MF_BYPOSITION|(bCheck ? MF_CHECKED : MF_UNCHECKED) ) )
+ if( static_cast<unsigned>( -1 ) != ::CheckMenuItem( mhMenu, nPos, MF_BYPOSITION|(bCheck ? MF_CHECKED : MF_UNCHECKED) ) )
ImplDrawMenuBar( this );
}
commit 277e9c4ca81ec2315214126c0ac6949e20c5443e
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 10:11:02 2012 +0100
WaE: format '%x' expects argument of type 'unsigned int'
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 1b33118..5d64d15 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -6144,14 +6144,14 @@ sal_Bool ImplWriteLastError( DWORD lastError, const char *szApiCall )
if( first )
{
first = 0;
- fprintf( fp, "Process ID: %d (0x%x)\n", GetCurrentProcessId(), GetCurrentProcessId() );
+ fprintf( fp, "Process ID: %ld (0x%lx)\n", GetCurrentProcessId(), GetCurrentProcessId() );
}
time_t aclock;
time( &aclock ); // Get time in seconds
struct tm *newtime = localtime( &aclock ); // Convert time to struct tm form
fprintf( fp, asctime( newtime ) ); // print time stamp
- fprintf( fp, "%s returned %u (0x%x)\n", szApiCall, lastError, lastError );
+ fprintf( fp, "%s returned %lu (0x%lx)\n", szApiCall, lastError, lastError );
bSuccess = TRUE; // may be FormatMessage fails but we wrote at least the error code
LPVOID lpMsgBuf;
commit 79305e38c5f53fb821d4931af87d8c4befeca2f9
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 10:08:21 2012 +0100
WaE: cast to pointer from integer of different size
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 985b3d4..1b33118 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -3482,10 +3482,9 @@ LanguageType WinSalFrame::GetInputLanguage()
sal_Bool WinSalFrame::MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode )
{
sal_Bool bRet = FALSE;
- HKL hkl = 0;
-
+ sal_IntPtr nLangType = aLangType;
// just use the passed language identifier, do not try to load additional keyboard support
- hkl = (HKL) aLangType;
+ HKL hkl = (HKL) nLangType;
if( hkl )
{
commit 91b8bae79f3bec139fa51420727445c160116e65
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 10:05:44 2012 +0100
WaE: comparison between signed and unsigned integer expressions
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 5e90306..985b3d4 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2445,7 +2445,7 @@ static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf,
rtl::OUString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode )
{
- static const int nMaxKeyLen = 350;
+ static const UINT nMaxKeyLen = 350;
sal_Unicode aKeyBuf[ nMaxKeyLen ];
UINT nKeyBufLen = 0;
UINT nSysCode = 0;
commit 47cad9e8e82bd28748c93ad716f294274188cb49
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 10:03:40 2012 +0100
WaE: declaration shadows a previous local
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index d175220..5e90306 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -420,10 +420,10 @@ SalFrame* ImplSalCreateFrame( WinSalInstance* pInst,
{
// Document Windows are also maximized, if the current Document Window
// is also maximized
- HWND hWnd = GetForegroundWindow();
- if ( hWnd && IsMaximized( hWnd ) &&
- (GetWindowInstance( hWnd ) == pInst->mhInst) &&
- ((GetWindowStyle( hWnd ) & (WS_POPUP | WS_MAXIMIZEBOX | WS_THICKFRAME)) == (WS_MAXIMIZEBOX | WS_THICKFRAME)) )
+ HWND hWnd2 = GetForegroundWindow();
+ if ( hWnd2 && IsMaximized( hWnd2 ) &&
+ (GetWindowInstance( hWnd2 ) == pInst->mhInst) &&
+ ((GetWindowStyle( hWnd2 ) & (WS_POPUP | WS_MAXIMIZEBOX | WS_THICKFRAME)) == (WS_MAXIMIZEBOX | WS_THICKFRAME)) )
pFrame->mnShowState = SW_SHOWMAXIMIZED;
}
}
@@ -1433,18 +1433,18 @@ void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight,
{
POINT pt;
GetCursorPos( &pt );
- RECT aRect;
- aRect.left = pt.x;
- aRect.top = pt.y;
- aRect.right = pt.x+2;
- aRect.bottom = pt.y+2;
+ RECT aRect2;
+ aRect2.left = pt.x;
+ aRect2.top = pt.y;
+ aRect2.right = pt.x+2;
+ aRect2.bottom = pt.y+2;
// dualmonitor support:
// Get screensize of the monitor whith the mouse pointer
- ImplSalGetWorkArea( mhWnd, &aRect, &aRect );
+ ImplSalGetWorkArea( mhWnd, &aRect2, &aRect2 );
- nX = ((aRect.right-aRect.left)-nWidth)/2 + aRect.left;
- nY = ((aRect.bottom-aRect.top)-nHeight)/2 + aRect.top;
+ nX = ((aRect2.right-aRect2.left)-nWidth)/2 + aRect2.left;
+ nY = ((aRect2.bottom-aRect2.top)-nHeight)/2 + aRect2.top;
}
@@ -5259,10 +5259,10 @@ static sal_Bool ImplHandleIMECompositionInput( WinSalFrame* pFrame,
if ( pAttrBuf )
{
- xub_StrLen nTextLen = aEvt.maText.Len();
- pSalAttrAry = new sal_uInt16[nTextLen];
- memset( pSalAttrAry, 0, nTextLen*sizeof( sal_uInt16 ) );
- for ( xub_StrLen i = 0; (i < nTextLen) && (i < nAttrLen); i++ )
+ xub_StrLen nTextLen2 = aEvt.maText.Len();
+ pSalAttrAry = new sal_uInt16[nTextLen2];
+ memset( pSalAttrAry, 0, nTextLen2*sizeof( sal_uInt16 ) );
+ for ( xub_StrLen i = 0; (i < nTextLen2) && (i < nAttrLen); i++ )
{
BYTE nWinAttr = pAttrBuf[i];
sal_uInt16 nSalAttr;
@@ -5456,8 +5456,8 @@ static void ImplHandleIMENotify( HWND hWnd, WPARAM wParam )
pFrame->mbCandidateMode = TRUE;
ImplHandleIMEComposition( hWnd, GCS_CURSORPOS );
- HWND hWnd = pFrame->mhWnd;
- HIMC hIMC = ImmGetContext( hWnd );
+ HWND hWnd2 = pFrame->mhWnd;
+ HIMC hIMC = ImmGetContext( hWnd2 );
if ( hIMC )
{
LONG nBufLen = ImmGetCompositionStringW( hIMC, GCS_COMPSTR, 0, 0 );
@@ -5479,7 +5479,7 @@ static void ImplHandleIMENotify( HWND hWnd, WPARAM wParam )
ImmSetCandidateWindow( hIMC, &aForm );
}
- ImmReleaseContext( hWnd, hIMC );
+ ImmReleaseContext( hWnd2, hIMC );
}
}
@@ -5845,7 +5845,6 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lP
if( !wParam )
{
- ImplSVData* pSVData = ImplGetSVData();
pSVData->maAppData.mnModalMode++;
ImplHideSplash();
commit bf9e5195519cf34c170dc42fa05848d158cfc344
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 09:59:53 2012 +0100
WaE: deprecated conversion from string constant to 'sal_Char*'
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 5e82f5a..d175220 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2473,7 +2473,7 @@ rtl::OUString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode )
sal_uInt16 nCode = nKeyCode & 0x0FFF;
sal_uLong nSysCode2 = 0;
- sal_Char* pReplace = NULL;
+ const sal_Char* pReplace = NULL;
sal_Unicode cSVCode = 0;
sal_Char aFBuf[4];
nSysCode = 0;
commit ded657d0663c9f461b2f992e32b2ceb416505386
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 09:58:36 2012 +0100
WaE: unused variable 'nRC'
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 0a9e824..5d0611b 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -2721,7 +2721,7 @@ void UniscribeLayout::Justify( long nNewWidth )
nItemWidth += mpCharWidths[ i ];
nItemWidth = (int)((fStretch - 1.0) * nItemWidth + 0.5);
- HRESULT nRC = (*pScriptJustify) (
+ (*pScriptJustify) (
mpVisualAttrs + rVisualItem.mnMinGlyphPos,
mpGlyphAdvances + rVisualItem.mnMinGlyphPos,
rVisualItem.mnEndGlyphPos - rVisualItem.mnMinGlyphPos,
commit 557daa9c4b27a3c45c788c65d0c17ff2ffd088ff
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 09:57:31 2012 +0100
WaE: declaration shadows a previous local
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 7b08ee8..0a9e824 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -542,9 +542,9 @@ bool SimpleWinLayout::LayoutText( ImplLayoutArgs& rArgs )
mpCharWidths[ i ] = 0;
for( i = 0; i < mnGlyphCount; ++i )
{
- int j = mpGlyphs2Chars[ i ] - rArgs.mnMinCharPos;
- if( j >= 0 )
- mpCharWidths[ j ] += mpGlyphAdvances[ i ];
+ int k = mpGlyphs2Chars[ i ] - rArgs.mnMinCharPos;
+ if( k >= 0 )
+ mpCharWidths[ k ] += mpGlyphAdvances[ i ];
}
}
@@ -1448,8 +1448,8 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs )
if( (rArgs.mnEndCharPos <= rVisualItem.mnMinCharPos)
|| (rArgs.mnMinCharPos >= rVisualItem.mnEndCharPos) )
{
- for( int i = rVisualItem.mnMinCharPos; i < rVisualItem.mnEndCharPos; ++i )
- mpLogClusters[i] = sal::static_int_cast<WORD>(~0U);
+ for( int j = rVisualItem.mnMinCharPos; j < rVisualItem.mnEndCharPos; ++j )
+ mpLogClusters[j] = sal::static_int_cast<WORD>(~0U);
continue;
}
commit d0d9d7970bfb273fb9c7314439d029ecc4f042e0
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 09:55:03 2012 +0100
WaE: 'nRet' may be used uninitialized in this function
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index e382fac..fbc4fd9 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -1790,7 +1790,7 @@ SalGraphics* WinSalPrinter::StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJo
if ( pDevModeW != pOrgDevModeW )
rtl_freeMemory( pDevModeW );
}
- int nRet = 0;
+ volatile int nRet = 0;
CATCH_DRIVER_EX_BEGIN;
nRet = ::StartPage( hDC );
CATCH_DRIVER_EX_END( "exception in StartPage", this );
@@ -1829,7 +1829,7 @@ sal_Bool WinSalPrinter::EndPage()
if( ! isValid() )
return FALSE;
- int nRet = 0;
+ volatile int nRet = 0;
CATCH_DRIVER_EX_BEGIN;
nRet = ::EndPage( hDC );
CATCH_DRIVER_EX_END( "exception in EndPage", this );
commit 7baf49884c585836ef11fcbaa41b3529d7e95155
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 09:32:01 2012 +0100
WaE: 'nAcquire' may be used uninitialized in this function
Or, the joys of using setjmp/longjmp...
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index b179e62..e382fac 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -1701,14 +1701,13 @@ sal_Bool WinSalPrinter::EndJob()
// it should be safe to release the yield mutex over the EndDoc
// call, however the real solution is supposed to be the threading
// framework yet to come.
- SalData* pSalData = GetSalData();
- sal_uLong nAcquire = pSalData->mpFirstInstance->ReleaseYieldMutex();
+ volatile sal_uLong nAcquire = GetSalData()->mpFirstInstance->ReleaseYieldMutex();
CATCH_DRIVER_EX_BEGIN;
if( ::EndDoc( hDC ) <= 0 )
GetLastError();
CATCH_DRIVER_EX_END( "exception in EndDoc", this );
- pSalData->mpFirstInstance->AcquireYieldMutex( nAcquire );
+ GetSalData()->mpFirstInstance->AcquireYieldMutex( nAcquire );
DeleteDC( hDC );
mhDC = 0;
}
commit 8d6afe4fc32e52960aa01909cdd8080ec5152f0a
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 8 06:47:31 2012 +0100
WaE: unused variable 'err'
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index 59c16eb..b179e62 100644
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list