connectivity/source/drivers/ado/AColumn.cxx | 10 - connectivity/source/drivers/ado/AConnection.cxx | 6 connectivity/source/drivers/ado/APreparedStatement.cxx | 6 connectivity/source/drivers/ado/AResultSetMetaData.cxx | 9 - dtrans/source/win32/dtobj/DOTransferable.cxx | 1 embedserv/source/embed/ed_idataobj.cxx | 1 extensions/source/ole/unoconversionutilities.hxx | 1 extensions/source/ole/unoobjw.cxx | 2 sd/source/ui/remotecontrol/BluetoothServer.cxx | 6 sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h | 27 --- sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c | 6 svtools/source/uno/fpicker.cxx | 2 sw/source/core/layout/dbg_lay.cxx | 8 - tools/source/stream/strmwnt.cxx | 2 vcl/opengl/win/blocklist_parser.cxx | 2 vcl/source/gdi/pdfwriter_impl.cxx | 2 winaccessibility/inc/AccComponentEventListener.hxx | 2 winaccessibility/inc/AccContainerEventListener.hxx | 2 winaccessibility/inc/AccDialogEventListener.hxx | 2 winaccessibility/inc/AccEventListener.hxx | 4 winaccessibility/inc/AccFrameEventListener.hxx | 2 winaccessibility/inc/AccListEventListener.hxx | 4 winaccessibility/inc/AccMenuEventListener.hxx | 2 winaccessibility/inc/AccParagraphEventListener.hxx | 2 winaccessibility/inc/AccWindowEventListener.hxx | 2 winaccessibility/source/UAccCOM/AccActionBase.cxx | 4 winaccessibility/source/UAccCOM/AccActionBase.h | 2 winaccessibility/source/UAccCOM/MAccessible.cxx | 77 ---------- winaccessibility/source/UAccCOM/UAccCOM.cxx | 8 + winaccessibility/source/UAccCOM/acccommon.h | 2 winaccessibility/source/UAccCOM/stdafx.h | 13 + winaccessibility/source/service/AccListEventListener.cxx | 3 winaccessibility/source/service/AccObject.cxx | 14 + winaccessibility/source/service/AccObjectWinManager.cxx | 4 winaccessibility/source/service/msaaservice_impl.cxx | 36 +++- xmlsecurity/source/xmlsec/mscrypt/oid.hxx | 4 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx | 4 xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx | 1 xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 4 39 files changed, 98 insertions(+), 191 deletions(-)
New commits: commit c098227ca3cd4529cc7b7f6c52ada19753e3f203 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 22:48:05 2015 +0100 -Werror,-Wwritable-strings Change-Id: I01f63a28651c05cf1bba244daa6bd066cc4c04ac diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 103ad97..7c1e4e8 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -1368,8 +1368,10 @@ void SAL_CALL BluetoothServer::run() WSAQUERYSETW aRecord; memset( &aRecord, 0, sizeof(aRecord)); aRecord.dwSize = sizeof(aRecord); - aRecord.lpszServiceInstanceName = L"LibreOffice Impress Remote Control"; - aRecord.lpszComment = L"Remote control of presentations over bluetooth."; + aRecord.lpszServiceInstanceName = const_cast<wchar_t *>( + L"LibreOffice Impress Remote Control"); + aRecord.lpszComment = const_cast<wchar_t *>( + L"Remote control of presentations over bluetooth."); aRecord.lpServiceClassId = (LPGUID) &SerialPortServiceClass_UUID; aRecord.dwNameSpace = NS_BTH; aRecord.dwNumberOfCsAddrs = 1; commit 77838efb0748689ee77007a92d9a01e03e6dbdb7 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 22:40:23 2015 +0100 Use proper return type for DNSServiceRefSockFD ...which is e.g. unsigned long long for Windows 64-bit (and declaring the function in dns_sd.h is not necessary, and the dnssd_sock_t typedef is not known there) Change-Id: Iaa0eb03a83b76200204ba905313bcc27b5007b39 diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h b/sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h index 31daaeb..faaa741 100644 --- a/sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h +++ b/sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h @@ -741,33 +741,6 @@ DNSServiceErrorType DNSSD_API DNSServiceGetProperty * *********************************************************************************************/ -/* DNSServiceRefSockFD() - * - * Access underlying Unix domain socket for an initialized DNSServiceRef. - * The DNS Service Discovery implementation uses this socket to communicate between the client and - * the mDNSResponder daemon. The application MUST NOT directly read from or write to this socket. - * Access to the socket is provided so that it can be used as a kqueue event source, a CFRunLoop - * event source, in a select() loop, etc. When the underlying event management subsystem (kqueue/ - * select/CFRunLoop etc.) indicates to the client that data is available for reading on the - * socket, the client should call DNSServiceProcessResult(), which will extract the daemon's - * reply from the socket, and pass it to the appropriate application callback. By using a run - * loop or select(), results from the daemon can be processed asynchronously. Alternatively, - * a client can choose to fork a thread and have it loop calling "DNSServiceProcessResult(ref);" - * If DNSServiceProcessResult() is called when no data is available for reading on the socket, it - * will block until data does become available, and then process the data and return to the caller. - * When data arrives on the socket, the client is responsible for calling DNSServiceProcessResult(ref) - * in a timely fashion -- if the client allows a large backlog of data to build up the daemon - * may terminate the connection. - * - * sdRef: A DNSServiceRef initialized by any of the DNSService calls. - * - * return value: The DNSServiceRef's underlying socket descriptor, or -1 on - * error. - */ - -int DNSSD_API DNSServiceRefSockFD(DNSServiceRef sdRef); - - /* DNSServiceProcessResult() * * Read a reply from the daemon, calling the appropriate application callback. This call will diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c index c38197c..c6b50a2 100644 --- a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c +++ b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c @@ -799,7 +799,7 @@ cleanup: return err; } -int DNSSD_API DNSServiceRefSockFD(DNSServiceRef sdRef) +dnssd_sock_t DNSSD_API DNSServiceRefSockFD(DNSServiceRef sdRef) { if (!sdRef) { syslog(LOG_WARNING, "dnssd_clientstub DNSServiceRefSockFD called with NULL DNSServiceRef"); return dnssd_InvalidSocket; } @@ -816,7 +816,7 @@ int DNSSD_API DNSServiceRefSockFD(DNSServiceRef sdRef) return dnssd_InvalidSocket; } - return (int) sdRef->sockfd; + return sdRef->sockfd; } #if _DNS_SD_LIBDISPATCH @@ -2025,7 +2025,7 @@ DNSServiceErrorType DNSSD_API DNSServiceSetDispatchQueue dispatch_queue_t queue ) { - int dnssd_fd = DNSServiceRefSockFD(service); + dnssd_sock_t dnssd_fd = DNSServiceRefSockFD(service); if (dnssd_fd == dnssd_InvalidSocket) return kDNSServiceErr_BadParam; if (!queue) { commit 1eb80742966388b2c209183f951f2924dcd12a26 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 21:06:38 2015 +0100 -Werror,-Wformat Change-Id: I8ac3c45b83961541c4b5d9b2d5dc7193013d806d diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index 8018207..6036fa9 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -345,7 +345,7 @@ void SwImplProtocol::CheckLine( OString& rLine ) } if( !aTok.isEmpty() ) { - sal_uLong nVal; + long nVal; sscanf( aTok.getStr(), "%li", &nVal ); switch ( nInitFile ) { @@ -362,9 +362,9 @@ void SwImplProtocol::CheckLine( OString& rLine ) case 3: { sal_uLong nOld = SwProtocol::Record(); if( bNo ) - nOld &= ~nVal; // remove function + nOld &= ~sal_uLong(nVal); // remove function else - nOld |= nVal; // remove function + nOld |= sal_uLong(nVal); // remove function SwProtocol::SetRecord( nOld ); } break; @@ -378,7 +378,7 @@ void SwImplProtocol::CheckLine( OString& rLine ) break; case 5: nMaxLines = (sal_uInt16)nVal; break; - case 6: aVars.push_back( (long)nVal ); + case 6: aVars.push_back( nVal ); break; } } commit 3c63480d3e0f961476df154854a51e50fb536ad4 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 18:28:28 2015 +0100 -Werror,-Wwritable-strings Change-Id: Iba3e60522acc5ef6ee4b9211c68c7f7317c9c4a9 diff --git a/xmlsecurity/source/xmlsec/mscrypt/oid.hxx b/xmlsecurity/source/xmlsec/mscrypt/oid.hxx index 4521cc3..94fa4c4 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/oid.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/oid.hxx @@ -21,8 +21,8 @@ #define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_OID_HXX typedef struct { - char *oid; - char *desc; + char const *oid; + char const *desc; } OIDItem; OIDItem OIDs[] = { commit 872ec271ebc783a97beaed85f8db018c1cda71d5 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 18:26:59 2015 +0100 -Werror,-Wunused-variable Change-Id: I98523b403f2497acfcf49baede87448636ff2709 diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx index d66c616..8287fab 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx @@ -394,7 +394,6 @@ OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectName() throw ( ::com::s ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > SAL_CALL X509Certificate_MSCryptImpl::findCertificateExtension( const ::com::sun::star::uno::Sequence< sal_Int8 >& /*oid*/ ) throw (::com::sun::star::uno::RuntimeException) { if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL && m_pCertContext->pCertInfo->cExtension != 0 ) { CertificateExtension_XmlSecImpl* xExtn ; - Sequence< Reference< XCertificateExtension > > xExtns( m_pCertContext->pCertInfo->cExtension ) ; xExtn = NULL ; for( unsigned int i = 0; i < m_pCertContext->pCertInfo->cExtension; i++ ) { commit 5d7854828d0ff164e7e9bbdd049a396b2c1faade Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 18:24:00 2015 +0100 -Werror,-Wreorder Change-Id: I4e9b0752653f705dc7292838555cc3d429a983d1 diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx index 04d16ca..b0193a5 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx @@ -101,7 +101,7 @@ void traceTrustStatus(DWORD err) } } -SecurityEnvironment_MSCryptImpl::SecurityEnvironment_MSCryptImpl( const Reference< XMultiServiceFactory >& aFactory ) : m_hProv( NULL ) , m_pszContainer( NULL ) , m_hKeyStore( NULL ), m_hCertStore( NULL ), m_tSymKeyList() , m_tPubKeyList() , m_tPriKeyList(), m_xServiceManager( aFactory ), m_bEnableDefault( sal_False ), m_hMySystemStore(NULL), m_hRootSystemStore(NULL), m_hTrustSystemStore(NULL), m_hCaSystemStore(NULL){ +SecurityEnvironment_MSCryptImpl::SecurityEnvironment_MSCryptImpl( const Reference< XMultiServiceFactory >& aFactory ) : m_hProv( NULL ) , m_pszContainer( NULL ) , m_hKeyStore( NULL ), m_hCertStore( NULL ), m_hMySystemStore(NULL), m_hRootSystemStore(NULL), m_hTrustSystemStore(NULL), m_hCaSystemStore(NULL), m_bEnableDefault( sal_False ), m_tSymKeyList() , m_tPubKeyList() , m_tPriKeyList(), m_xServiceManager( aFactory ){ } commit 24065e8f8c3f2d38d013d753a9e09d5fc5ffd6db Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 18:18:24 2015 +0100 -Werror,-Wwritable-strings Change-Id: I396b617ea844c63f4e85ff4e26dd8a631281815b diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx index 7c99df8..04d16ca 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx @@ -57,7 +57,7 @@ extern X509Certificate_MSCryptImpl* MswcryCertContextToXCert( PCCERT_CONTEXT cer struct CertErrorToString{ DWORD error; - char * name; + char const * name; }; CertErrorToString arErrStrings[] = commit 09d4fe3275d089e7200b67bacaf415ed9aa249c7 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 18:17:50 2015 +0100 -Werror,-Wunused-function Change-Id: I3a39ca3a653f16799be1c4cc598f3b9e127e0569 diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index b727668..2ddcb83 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -104,6 +104,8 @@ struct GetNSSInitStaticMutex } }; +#ifdef XMLSEC_CRYPTO_NSS + void deleteRootsModule() { SECMODModule *RootsModule = nullptr; @@ -217,6 +219,8 @@ OString getMozillaCurrentProfile( const css::uno::Reference< css::uno::XComponen return OString(); } +#endif + //Older versions of Firefox (FF), for example FF2, and Thunderbird (TB) 2 write //the roots certificate module (libnssckbi.so), which they use, into the //profile. This module will then already be loaded during NSS_Init (and the commit f6ca10a6508456e543591191e0c05c82ac14e0d3 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 17:20:10 2015 +0100 -Werror,-Wunused-variable Change-Id: Ib7c576caff35dba57727bbb0ed12a7c50be2d95e diff --git a/connectivity/source/drivers/ado/AResultSetMetaData.cxx b/connectivity/source/drivers/ado/AResultSetMetaData.cxx index 03f8057..ca2150ef 100644 --- a/connectivity/source/drivers/ado/AResultSetMetaData.cxx +++ b/connectivity/source/drivers/ado/AResultSetMetaData.cxx @@ -161,15 +161,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw( if ( aProps.IsValid() ) { bRet = OTools::getValue( aProps, OUString("ISAUTOINCREMENT") ); -#if OSL_DEBUG_LEVEL > 0 - sal_Int32 nCount = aProps.GetItemCount(); - for (sal_Int32 i = 0; i<nCount; ++i) - { - WpADOProperty aProp = aProps.GetItem(i); - OUString sName = aProp.GetName(); - OUString sVal = aProp.GetValue(); - } -#endif } } return bRet; commit 4c400707ff52f353d8cfa7ce54ac0cf26d64c51f Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 17:19:58 2015 +0100 -Werror,-Wunused-variable Change-Id: I23b4532cffbc9152a36f7f4cfadfc016c93f2706 diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx index 2e581fe..aea1232 100644 --- a/connectivity/source/drivers/ado/APreparedStatement.cxx +++ b/connectivity/source/drivers/ado/APreparedStatement.cxx @@ -219,11 +219,6 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEn WpADOParameter aParam(pParam); if(pParam) { -#if OSL_DEBUG_LEVEL > 0 - OUString sParam = aParam.GetName(); - -#endif // OSL_DEBUG_LEVEL - DataTypeEnum eType = aParam.GetADOType(); if ( _eType != eType && _eType != adDBTimeStamp ) { @@ -438,7 +433,6 @@ void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, Runtim WpADOParameter aParam(pParam); if(pParam) { - OUString sParam = aParam.GetName(); CHECK_RETURN(aParam.PutValue(aVal)); } } commit 2dd5b6e256a1d07d677080b202d2dbe6f27f26ee Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 17:10:20 2015 +0100 -Werror,-Wunused-variable Change-Id: I1fce689dfda33860623487085c45308d76274f6c diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index c1d6ee7..c63018a 100644 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.cxx @@ -541,12 +541,6 @@ const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _r { // search the best matching type OExtendedTypeInfo* pInfo = aIter->second; - #ifdef DBG_UTIL - OUString sDBTypeName = pInfo->aSimpleType.aTypeName; - sal_Int32 nDBTypePrecision = pInfo->aSimpleType.nPrecision; (void)nDBTypePrecision; - sal_Int32 nDBTypeScale = pInfo->aSimpleType.nMaximumScale; (void)nDBTypeScale; - sal_Int32 nAdoType = pInfo->eType; (void)nAdoType; - #endif if ( ( !_sTypeName.getLength() || (pInfo->aSimpleType.aTypeName.equalsIgnoreAsciiCase(_sTypeName)) ) commit 1ff534a3a048574fc73fc94615ba2de84f16168d Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 17:01:46 2015 +0100 -Werror,-Wunused-variable Change-Id: Iaa58497f5c38dd69a8f98a7febb051cc2e3e5301 diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx index e1a9803..65f2d4a 100644 --- a/connectivity/source/drivers/ado/AColumn.cxx +++ b/connectivity/source/drivers/ado/AColumn.cxx @@ -249,16 +249,6 @@ void OAdoColumn::fillPropertyValues() m_Description = OTools::getValue( aProps, OUString("Description") ); m_DefaultValue = OTools::getValue( aProps, OUString("Default") ); - -#if OSL_DEBUG_LEVEL > 0 - sal_Int32 nCount = aProps.GetItemCount(); - for (sal_Int32 i = 0; i<nCount; ++i) - { - WpADOProperty aProp = aProps.GetItem(i); - OUString sName = aProp.GetName(); - OUString sVal = aProp.GetValue(); - } -#endif } } } commit 77a39107b1d629022d3ba8711f7a7051e9461280 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 16:50:18 2015 +0100 Silence clang-cl -Wextra-tokens in midl-generated code Change-Id: Ib7f83de9bd0636cff11c5e75932d2bc8fd8437fa diff --git a/winaccessibility/source/UAccCOM/UAccCOM.cxx b/winaccessibility/source/UAccCOM/UAccCOM.cxx index 86d27d6..4f54a37 100644 --- a/winaccessibility/source/UAccCOM/UAccCOM.cxx +++ b/winaccessibility/source/UAccCOM/UAccCOM.cxx @@ -23,8 +23,16 @@ #include "UAccCOM.h" #include <accHelper.hxx> +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wextra-tokens" + // "#endif !_MIDL_USE_GUIDDEF_" in midl-generated code +#endif #include "UAccCOM_i.c" #include "ia2_api_all_i.c" +#if defined __clang__ +#pragma clang diagnostic pop +#endif #include "MAccessible.h" #include "EnumVariant.h" diff --git a/winaccessibility/source/service/AccObject.cxx b/winaccessibility/source/service/AccObject.cxx index 803a55c..8b60ddf 100644 --- a/winaccessibility/source/service/AccObject.cxx +++ b/winaccessibility/source/service/AccObject.cxx @@ -32,9 +32,17 @@ #include "AccObject.hxx" #include "AccEventListener.hxx" -#include "UAccCOM_i.c" #include "AccResource.hxx" +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wextra-tokens" + // "#endif !_MIDL_USE_GUIDDEF_" in midl-generated code +#endif +#include "UAccCOM_i.c" +#if defined __clang__ +#pragma clang diagnostic pop +#endif using namespace std; using namespace com::sun::star::uno; commit f5f63b9f9869b632a89078500ba0a74d72f913e6 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 16:49:37 2015 +0100 Silence clang-cl warnings in ATL headers Change-Id: I42fe7bfcd89c11fe2940bff43d4a8653e0026db2 diff --git a/winaccessibility/source/UAccCOM/stdafx.h b/winaccessibility/source/UAccCOM/stdafx.h index e71ac0b..b1cf88a 100644 --- a/winaccessibility/source/UAccCOM/stdafx.h +++ b/winaccessibility/source/UAccCOM/stdafx.h @@ -35,11 +35,24 @@ #include <prewin.h> #include <windows.h> +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wall" +#pragma clang diagnostic ignored "-Wattributes" +#pragma clang diagnostic ignored "-Wdelete-incomplete" +#pragma clang diagnostic ignored "-Wint-to-pointer-cast" +#pragma clang diagnostic ignored "-Winvalid-noreturn" +#pragma clang diagnostic ignored "-Wmicrosoft" +#pragma clang diagnostic ignored "-Wnon-pod-varargs" +#endif #include <atlbase.h> // You may derive a class from CComModule and use it if you want to override // something, but do not change the name of _Module extern CComModule _Module; #include <atlcom.h> +#if defined __clang__ +#pragma clang diagnostic pop +#endif #include <postwin.h> #undef OPAQUE commit 3d4da2347ee6ef787902e0af57e7f9635e3bd6c0 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 16:48:38 2015 +0100 Remove unused data Change-Id: Ica186e36851ebcf0f902e7a2b731b6157e8a50d5 diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx index f7962da..74a6518 100644 --- a/winaccessibility/source/UAccCOM/MAccessible.cxx +++ b/winaccessibility/source/UAccCOM/MAccessible.cxx @@ -126,73 +126,6 @@ short UNO_STATES[] = VERTICAL // = (sal_Int16)29; }; -// <=== map ===> - -BSTR IA2_STATES_NAME[] = -{ - _T("Active"), - _T("Armed"), - _T("Defunct"), - _T("Editable"), - _T("Horizontal"), - _T("Iconified"), - _T("Invalid Entry"), - _T("Manages Descendants"), - _T("Modal"), - _T("Multi Line"), - _T("Opaque"), - _T("Required"), - _T("Selectable Text"), - _T("Single Line"), - _T("Stale"), - _T("Supports Autocompletion"), - _T("Transient"), - _T("Vertical") -}; - -// IA2 states mapping, and name -// maintenance the consistency. change one, change them all - -BSTR UNO_ALL_STATES[] = -{ - _T("INVALID"), // INVALID ( 0 ) - _T("ACTIVE"), // ACTIVE ( 1 ) - _T("ARMED"), // ARMED ( 2 ) - _T("BUSY"), // BUSY ( 3 ) - _T("CHECKED"), // CHECKED ( 4 ) - _T("DEFUNC"), // DEFUNC ( 5 ) - _T("EDITABLE"), // EDITABLE ( 6 ) - _T("ENABLED"), // ENABLED ( 7 ) - _T("EXPANDABLE"), // EXPANDABLE ( 8 ) - _T("EXPANDED"), // EXPANDED ( 9 ) - _T("FOCUSABLE"), // FOCUSABLE ( 10 ) - _T("FOCUSED"), // FOCUSED ( 11 ) - _T("HORIZONTAL"), // HORIZONTAL ( 12 ) - _T("ICONIFIED"), // ICONIFIED ( 13 ) - _T("INDETERMINATE"), // INDETERMINATE ( 14 ) - _T("MANAGES_DESCENDANTS"),// MANAGES_DESCENDANTS ( 15 ) - _T("MODAL"), // MODAL ( 16 ) - _T("MULTI_LINE"), // MULTI_LINE ( 17 ) - _T("MULTI_SELECTABLE"), // MULTI_SELECTABLE ( 18 ) - _T("OPAQUE"), // OPAQUE ( 19 ) - _T("PRESSED"), // PRESSED ( 20 ) - _T("RESIZABLE"), // RESIZABLE ( 21 ) - _T("SELECTABLE"), // SELECTABLE ( 22 ) - _T("SELECTED"), // SELECTED ( 23 ) - _T("SENSITIVE"), // SENSITIVE ( 24 ) - _T("SHOWING"), // SHOWING ( 25 ) - _T("SINGLE_LINE"), // SINGLE_LINE ( 26 ) - _T("STALE"), // STALE ( 27 ) - _T("TRANSIENT"), // TRANSIENT ( 28 ) - _T("VERTICAL"), // VERTICAL ( 29 ) - _T("VISIBLE"), // VISIBLE ( 30 ) - _T("MOVEABLE"), // MOVEABLE ( 31 ) - _T("OFFSCREEN"), // OFFSCREEN ( 32 ) - _T("COLLAPSE"), // COLLAPSE ( 33 ) - _T("DEFAULT") // DEFAULT ( 34 ) -}; - - using namespace com::sun::star::accessibility::AccessibleRole; commit 5f0d57f3c817cd58077575846fe042ce6034ab0a Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 16:48:01 2015 +0100 -Werror,-Wwritable-strings Change-Id: I40f1b0b9fb56e13ab676090aee58f7f642334d3d diff --git a/winaccessibility/source/UAccCOM/AccActionBase.cxx b/winaccessibility/source/UAccCOM/AccActionBase.cxx index 71ffb9b..0ad4db0 100644 --- a/winaccessibility/source/UAccCOM/AccActionBase.cxx +++ b/winaccessibility/source/UAccCOM/AccActionBase.cxx @@ -297,12 +297,12 @@ void CAccActionBase::GetkeyBindingStrByXkeyBinding( const Sequence< KeyStroke > * * @param key the key code. */ -OLECHAR* CAccActionBase::getOLECHARFromKeyCode(long key) +OLECHAR const * CAccActionBase::getOLECHARFromKeyCode(long key) { static struct keyMap { int keyCode; - OLECHAR* key; + OLECHAR const * key; } map[] = { diff --git a/winaccessibility/source/UAccCOM/AccActionBase.h b/winaccessibility/source/UAccCOM/AccActionBase.h index 7839030..d4bfaa4 100644 --- a/winaccessibility/source/UAccCOM/AccActionBase.h +++ b/winaccessibility/source/UAccCOM/AccActionBase.h @@ -68,7 +68,7 @@ public: protected: - static OLECHAR* getOLECHARFromKeyCode(long key); + static OLECHAR const * getOLECHARFromKeyCode(long key); css::uno::Reference<css::accessibility::XAccessibleAction> pRXAct; commit a8a4441a5fa0ce03b1e864d6d94cf6b68aedd928 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 16:46:11 2015 +0100 -Werror,-Wunused-function Change-Id: I39c81f80b14c1c16cd600ea11cc59d2e1bd311a2 diff --git a/winaccessibility/source/UAccCOM/acccommon.h b/winaccessibility/source/UAccCOM/acccommon.h index 869816c..e900033 100644 --- a/winaccessibility/source/UAccCOM/acccommon.h +++ b/winaccessibility/source/UAccCOM/acccommon.h @@ -59,8 +59,6 @@ enum DM_NIR { #define CHECK_STR L"Check" //End -static DWORD GetMSAAStateFromUNO(short xState); - template<typename T, typename Ifc> HRESULT createInstance(REFIID iid, Ifc ** ppIfc) { commit cb0529ccb8655a8424721659e19d9b65ec20f92a Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 16:06:25 2015 +0100 -Werror,-Wmicrosoft-exception-spec Change-Id: I71983978713eedbd1250083e607bfadaa824c2ef diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx index b39e8fd..6ca7842 100644 --- a/winaccessibility/source/service/msaaservice_impl.cxx +++ b/winaccessibility/source/service/msaaservice_impl.cxx @@ -67,19 +67,29 @@ public: virtual ~MSAAServiceImpl(); // XComponent - as used by VCL to lifecycle manage this bridge. - virtual void SAL_CALL dispose(); - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& ) { /* dummy */ } - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& ) { /* dummy */ } + virtual void SAL_CALL dispose() + throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& ) + throw (css::uno::RuntimeException, std::exception) + { /* dummy */ } + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& ) + throw (css::uno::RuntimeException, std::exception) + { /* dummy */ } // XMSAAService virtual sal_Int64 SAL_CALL getAccObjectPtr( - sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam); - virtual void SAL_CALL handleWindowOpened(sal_Int64); + sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam) + throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL handleWindowOpened(sal_Int64) + throw (css::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName(); - virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(); + virtual OUString SAL_CALL getImplementationName() + throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) + throw (css::uno::RuntimeException, std::exception); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw (css::uno::RuntimeException, std::exception); }; /** @@ -89,7 +99,7 @@ public: */ sal_Int64 MSAAServiceImpl::getAccObjectPtr( sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard g; @@ -107,6 +117,7 @@ throw (RuntimeException) * @return */ void MSAAServiceImpl::handleWindowOpened(sal_Int64 nAcc) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -120,7 +131,7 @@ void MSAAServiceImpl::handleWindowOpened(sal_Int64 nAcc) } } -OUString MSAAServiceImpl::getImplementationName() throw (RuntimeException) +OUString MSAAServiceImpl::getImplementationName() throw (RuntimeException, std::exception) { return getImplementationName_MSAAServiceImpl(); } @@ -130,7 +141,7 @@ OUString MSAAServiceImpl::getImplementationName() throw (RuntimeException) * @param Service name. * @return If the service name is supported. */ -sal_Bool MSAAServiceImpl::supportsService( OUString const & serviceName ) throw (RuntimeException) +sal_Bool MSAAServiceImpl::supportsService( OUString const & serviceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } @@ -140,7 +151,7 @@ sal_Bool MSAAServiceImpl::supportsService( OUString const & serviceName ) throw * @param. * @return service name sequence. */ -Sequence< OUString > MSAAServiceImpl::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > MSAAServiceImpl::getSupportedServiceNames() throw (RuntimeException, std::exception) { return getSupportedServiceNames_MSAAServiceImpl(); } @@ -271,6 +282,7 @@ MSAAServiceImpl::~MSAAServiceImpl() } void MSAAServiceImpl::dispose() + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; commit b2a953f3a41a2f038ba5fee0a36a936d3a36ce55 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 15:59:11 2015 +0100 -Werror,-Wunused-private-field Change-Id: I0a231c3cf0241034d9132067569130c343b98c16 diff --git a/winaccessibility/inc/AccListEventListener.hxx b/winaccessibility/inc/AccListEventListener.hxx index 74ed5d3..4a036e1 100644 --- a/winaccessibility/inc/AccListEventListener.hxx +++ b/winaccessibility/inc/AccListEventListener.hxx @@ -34,8 +34,6 @@ */ class AccListEventListener: public AccDescendantManagerEventListener { -private: - bool shouldDeleteChild; public: AccListEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); virtual ~AccListEventListener(); diff --git a/winaccessibility/source/service/AccListEventListener.cxx b/winaccessibility/source/service/AccListEventListener.cxx index 5e3adef..6e88706 100644 --- a/winaccessibility/source/service/AccListEventListener.cxx +++ b/winaccessibility/source/service/AccListEventListener.cxx @@ -33,8 +33,7 @@ using namespace com::sun::star::uno; using namespace com::sun::star::accessibility; AccListEventListener::AccListEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent) - :AccDescendantManagerEventListener(pAcc, Agent), - shouldDeleteChild(true) + :AccDescendantManagerEventListener(pAcc, Agent) { } commit 0cf4249df2eec9499dde7cc384f798f61c98ad9a Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 15:56:10 2015 +0100 -Werror,-Wreorder Change-Id: Ica880a9ea0b613b833897c4ccefcc3ee286b80e8 diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx b/winaccessibility/source/service/AccObjectWinManager.cxx index 1bf4af3..4b48410 100644 --- a/winaccessibility/source/service/AccObjectWinManager.cxx +++ b/winaccessibility/source/service/AccObjectWinManager.cxx @@ -63,8 +63,8 @@ using namespace com::sun::star::uno; * @return */ AccObjectWinManager::AccObjectWinManager( AccObjectManagerAgent* Agent ): - pAgent( Agent ), - oldFocus( NULL ) + oldFocus( NULL ), + pAgent( Agent ) { } commit f7b287ef12ca316573bcc935fdbad4fd0d5fd188 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 15:30:06 2015 +0100 -Werror,-Winconsistent-missing-override Change-Id: I5c96e762c78aaf4ad9e2bd751f45dd1166e9d768 diff --git a/winaccessibility/inc/AccComponentEventListener.hxx b/winaccessibility/inc/AccComponentEventListener.hxx index cf8698f..37b20d0 100644 --- a/winaccessibility/inc/AccComponentEventListener.hxx +++ b/winaccessibility/inc/AccComponentEventListener.hxx @@ -42,7 +42,7 @@ public: virtual ~AccComponentEventListener(); // XAccessibleEventListener - virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException); + virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override; //for value changed event virtual void HandleValueChangedEvent( diff --git a/winaccessibility/inc/AccContainerEventListener.hxx b/winaccessibility/inc/AccContainerEventListener.hxx index de15707..08d0f3c 100644 --- a/winaccessibility/inc/AccContainerEventListener.hxx +++ b/winaccessibility/inc/AccContainerEventListener.hxx @@ -42,7 +42,7 @@ public: virtual ~AccContainerEventListener(); //AccessibleEventListener - virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException); + virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override; //for child changed event virtual void HandleChildChangedEvent( diff --git a/winaccessibility/inc/AccDialogEventListener.hxx b/winaccessibility/inc/AccDialogEventListener.hxx index 8857512..6318757 100644 --- a/winaccessibility/inc/AccDialogEventListener.hxx +++ b/winaccessibility/inc/AccDialogEventListener.hxx @@ -38,7 +38,7 @@ public: virtual ~AccDialogEventListener(); //AccessibleEventListener - virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException); + virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override; //for child changed event virtual void HandleChildChangedEvent( diff --git a/winaccessibility/inc/AccEventListener.hxx b/winaccessibility/inc/AccEventListener.hxx index ecb7b28..0b629fe 100644 --- a/winaccessibility/inc/AccEventListener.hxx +++ b/winaccessibility/inc/AccEventListener.hxx @@ -48,10 +48,10 @@ public: virtual ~AccEventListener(); // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException); + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException) override; // XAccessibleEventListener - virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException); + virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override; //for name changed event virtual void HandleNameChangedEvent(css::uno::Any name); diff --git a/winaccessibility/inc/AccFrameEventListener.hxx b/winaccessibility/inc/AccFrameEventListener.hxx index b41104d..0e9a642 100644 --- a/winaccessibility/inc/AccFrameEventListener.hxx +++ b/winaccessibility/inc/AccFrameEventListener.hxx @@ -39,7 +39,7 @@ public: virtual ~AccFrameEventListener(); // XAccessibleEventListener - virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException); + virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override; //for child changed event virtual void HandleChildChangedEvent( diff --git a/winaccessibility/inc/AccListEventListener.hxx b/winaccessibility/inc/AccListEventListener.hxx index a59ec47..74ed5d3 100644 --- a/winaccessibility/inc/AccListEventListener.hxx +++ b/winaccessibility/inc/AccListEventListener.hxx @@ -41,7 +41,7 @@ public: virtual ~AccListEventListener(); // XAccessibleEventListener - virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException); + virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override; //for active descendant changed event virtual void HandleActiveDescendantChangedEvent( diff --git a/winaccessibility/inc/AccMenuEventListener.hxx b/winaccessibility/inc/AccMenuEventListener.hxx index fbeeec7..4b96e1b 100644 --- a/winaccessibility/inc/AccMenuEventListener.hxx +++ b/winaccessibility/inc/AccMenuEventListener.hxx @@ -39,7 +39,7 @@ public: virtual ~AccMenuEventListener(); //AccessibleEventListener - virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException); + virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override; //for child changed event virtual void HandleChildChangedEvent( diff --git a/winaccessibility/inc/AccParagraphEventListener.hxx b/winaccessibility/inc/AccParagraphEventListener.hxx index a618223..aecdacf 100644 --- a/winaccessibility/inc/AccParagraphEventListener.hxx +++ b/winaccessibility/inc/AccParagraphEventListener.hxx @@ -39,7 +39,7 @@ public: virtual ~AccParagraphEventListener(); //AccessibleEventListener - virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException); + virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override; //for caret changed event virtual void HandleCaretChangedEvent( diff --git a/winaccessibility/inc/AccWindowEventListener.hxx b/winaccessibility/inc/AccWindowEventListener.hxx index ef9a8a7..9c01afa 100644 --- a/winaccessibility/inc/AccWindowEventListener.hxx +++ b/winaccessibility/inc/AccWindowEventListener.hxx @@ -39,7 +39,7 @@ public: virtual ~AccWindowEventListener(); // XAccessibleEventListener - virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException); + virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override; //for child changed event virtual void HandleChildChangedEvent( commit 458d14360a5a776566ced7ad478f2ad9cda406d4 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 15:21:06 2015 +0100 -Werror,-Wreorder Change-Id: I61c2ee2693ccf150aad1c380c26be7b3a08c57a3 diff --git a/winaccessibility/source/service/AccObject.cxx b/winaccessibility/source/service/AccObject.cxx index 9766898..803a55c 100644 --- a/winaccessibility/source/service/AccObject.cxx +++ b/winaccessibility/source/service/AccObject.cxx @@ -149,12 +149,12 @@ const short ROLE_TABLE[][2] = */ AccObject::AccObject(XAccessible* pAcc, AccObjectManagerAgent* pAgent, AccEventListener* pListener) : - m_pIMAcc (NULL), m_resID (NULL), m_pParantID (NULL), + m_bShouldDestroy(sal_False), + m_pIMAcc (NULL), m_pParentObj(NULL), m_pListener (pListener), - m_bShouldDestroy(sal_False), m_xAccRef( pAcc ) { ImplInitializeCreateObj(); commit e57b7010aa116ad6634a30132315869c9c0f2186 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 15:20:36 2015 +0100 -Werror,-Wreorder Change-Id: I86eb0de03c07d527cfd852f41e1969febf8276a6 diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx index 070d0df..f7962da 100644 --- a/winaccessibility/source/UAccCOM/MAccessible.cxx +++ b/winaccessibility/source/UAccCOM/MAccessible.cxx @@ -223,17 +223,17 @@ using namespace com::sun::star::accessibility::AccessibleRole; AccObjectManagerAgent* CMAccessible::g_pAgent = NULL; CMAccessible::CMAccessible(): +m_pszName(NULL), +m_pszValue(NULL), +m_pszActionDescription(NULL), m_iRole(0x00), m_dState(0x00), +m_pszDescription(NULL), +m_pIParent(NULL), m_dChildID(0x00), m_dFocusChildID(UACC_NO_FOCUS), m_hwnd(NULL), -m_pIParent(NULL), -m_pszName(NULL), -m_pszValue(NULL), -m_pszDescription(NULL), m_isDestroy(FALSE), -m_pszActionDescription(NULL), m_bRequiresSave(FALSE) { m_sLocation.m_dLeft=0; commit ded9155d924d8e0261981f9294ddb6486874ed8f Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 14:18:26 2015 +0100 -Werror,-Wunused-variable Change-Id: Idfca7a384f2108af7ef197f255eb5f07933a7322 diff --git a/svtools/source/uno/fpicker.cxx b/svtools/source/uno/fpicker.cxx index bed1a8c..aa650f5 100644 --- a/svtools/source/uno/fpicker.cxx +++ b/svtools/source/uno/fpicker.cxx @@ -115,8 +115,8 @@ Sequence< OUString > FilePicker_getSupportedServiceNames() */ static OUString FolderPicker_getSystemPickerServiceName() { - OUString aDesktopEnvironment (Application::GetDesktopEnvironment()); #ifdef UNX + OUString aDesktopEnvironment (Application::GetDesktopEnvironment()); if (aDesktopEnvironment.equalsIgnoreAsciiCase("tde")) return OUString("com.sun.star.ui.dialogs.TDEFolderPicker"); else if (aDesktopEnvironment.equalsIgnoreAsciiCase("kde")) commit 4814ea51560037a7fe0960e5b7e6f616aae8a5b2 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 14:05:18 2015 +0100 -Werror,-Wunused-variable Change-Id: I578ffc1f49e0e101781cb2c8c4160d5ac5be0d8b diff --git a/vcl/opengl/win/blocklist_parser.cxx b/vcl/opengl/win/blocklist_parser.cxx index 98e7243..bb9e6fb 100644 --- a/vcl/opengl/win/blocklist_parser.cxx +++ b/vcl/opengl/win/blocklist_parser.cxx @@ -164,8 +164,6 @@ void WinBlocklistParser::handleDevices(wgl::DriverInfo& rDriver, xmlreader::XmlR xmlreader::XmlReader::Result res = rReader.nextItem( xmlreader::XmlReader::TEXT_NORMALIZED, &name, &nsId); - OString aId(name.begin, name.length); - if (res == xmlreader::XmlReader::RESULT_BEGIN) { ++nLevel; commit 412ae2c3b3093ad96be79c55deb6e67bf2be029a Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 13:57:18 2015 +0100 -Werror,-Wunused-variable Change-Id: I429175643129021c1f0a35eaaa1bd86ee7dbb23a diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 420cdae..c28cf3a 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -7254,8 +7254,6 @@ bool PDFWriterImpl::finalizeSignature() return false; } - OString pass = OUStringToOString( m_aContext.SignPassword, RTL_TEXTENCODING_UTF8 ); - PCCERT_CONTEXT pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, reinterpret_cast<const BYTE*>(n_derArray), n_derLength); if (pCertContext == NULL) { commit cf6645cef9e985dc1c11dbb3dfa0e7d7e1ff20fd Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 13:19:37 2015 +0100 -Werror,-Wunused-variable Change-Id: I72a5f707787930c64057c71e5caf9ab726739e4f diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index 0f897ba..f33e79f 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -535,7 +535,6 @@ Reference<XInterface> InterfaceOleWrapper_Impl::createComWrapperInstance() // to an actual Type object. bool getType( const BSTR name, Type & type) { - Type retType; bool ret = false; typelib_TypeDescription * pDesc= NULL; OUString str( reinterpret_cast<const sal_Unicode*>(name)); @@ -971,7 +970,6 @@ HRESULT InterfaceOleWrapper_Impl::doGetProperty( DISPPARAMS * /*pdispparams*/, V { HRESULT ret= S_OK; - Any value; try { Any returnValue = m_xInvocation->getValue( name); commit 01764a27ae3e0d47847a1cd5fe58ea30b418b2e3 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 13:12:28 2015 +0100 -Werror,-Wunused-variable Change-Id: I13259b76d5fba0bd4dcc99ce8161e8f049dbe698 diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx index be18ec9..83d3a18 100644 --- a/extensions/source/ole/unoconversionutilities.hxx +++ b/extensions/source/ole/unoconversionutilities.hxx @@ -1973,7 +1973,6 @@ void UnoConversionUtilities<T>::dispatchExObject2Sequence( const VARIANTARG* pva "Conversion of dispatch object to Sequence failed!"); DISPID dispid; - OUString sindex; DISPPARAMS param= {0,0,0,0}; CComVariant result; commit f174e02434dd28e11894a4c6807c49c5ce7742d4 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 13:05:29 2015 +0100 -Werror,-Wunused-variable Change-Id: I07f77584b1c8848a17dc2be94a8f90aef2e02ef8 diff --git a/tools/source/stream/strmwnt.cxx b/tools/source/stream/strmwnt.cxx index e73f1b4..954ef05 100644 --- a/tools/source/stream/strmwnt.cxx +++ b/tools/source/stream/strmwnt.cxx @@ -109,7 +109,7 @@ SvFileStream::SvFileStream( const OUString& rFileName, StreamMode nMode ) SetBufferSize( 8192 ); // convert URL to SystemPath, if necessary - OUString aFileName, aNormPath; + OUString aFileName; if ( FileBase::getSystemPathFromFileURL( rFileName, aFileName ) != FileBase::E_None ) aFileName = rFileName; commit 31927f9703d8d1fbe90c39c58886bcfdb63e3b03 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 13:01:57 2015 +0100 -Werror,-Wunused-variable Change-Id: I6800b97cfbf2e986c341d8893658f511951bc8f0 diff --git a/embedserv/source/embed/ed_idataobj.cxx b/embedserv/source/embed/ed_idataobj.cxx index ddb802a..c51327c 100644 --- a/embedserv/source/embed/ed_idataobj.cxx +++ b/embedserv/source/embed/ed_idataobj.cxx @@ -42,7 +42,6 @@ sal_uInt64 EmbedDocument_Impl::getMetaFileHandle_Impl( sal_Bool isEnhMeta ) uno::Reference< datatransfer::XTransferable > xTransferable( m_pDocHolder->GetDocument(), uno::UNO_QUERY ); if ( xTransferable.is() ) { - uno::Sequence< sal_Int8 > aMetaBuffer; datatransfer::DataFlavor aFlavor; if ( isEnhMeta ) commit 7535cca0e0da14980ca0821710ebc207faeeaceb Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Nov 27 11:57:57 2015 +0100 -Werror,-Wunused-variable Change-Id: I107fcb7d73c40597face7bff9aca4eab6952691d diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx index 5a7a0b4..2eab944 100644 --- a/dtrans/source/win32/dtobj/DOTransferable.cxx +++ b/dtrans/source/win32/dtobj/DOTransferable.cxx @@ -224,7 +224,6 @@ void SAL_CALL CDOTransferable::addSupportedFlavor( const DataFlavor& aFlavor ) //inline DataFlavor SAL_CALL CDOTransferable::formatEtcToDataFlavor( const FORMATETC& aFormatEtc ) { - DataFlavor aFlavor; LCID lcid = 0; // for non-unicode text format we must provid a locale to get _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits