[Libreoffice-commits] core.git: 14 commits - avmedia/source dtrans/source embedserv/source extensions/source fpicker/source include/drawinglayer sdext/source soltools/mkdepend vcl/source vcl/win winaccessibility/source xmlsecurity/source
Stephan Bergmann
sbergman at redhat.com
Tue Jan 26 08:07:18 PST 2016
avmedia/source/framework/collada_headers.hxx | 2 -
dtrans/source/win32/dtobj/FmtFilter.cxx | 2 -
dtrans/source/win32/dtobj/XTDataObject.cxx | 4 +-
embedserv/source/embed/esdll.cxx | 8 ++++-
embedserv/source/inc/embeddocaccess.hxx | 1
embedserv/source/inc/stdafx.h | 1
extensions/source/ole/ole2uno.hxx | 2 -
extensions/source/ole/oledll.cxx | 9 +++++-
extensions/source/ole/unoobjw.cxx | 4 +-
extensions/source/ole/wincrap.hxx | 1
extensions/source/ole/windata.hxx | 1
fpicker/source/win32/filepicker/dibpreview.cxx | 2 -
include/drawinglayer/primitive2d/baseprimitive2d.hxx | 2 -
include/drawinglayer/primitive3d/baseprimitive3d.hxx | 2 -
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 +-
soltools/mkdepend/include.c | 2 +
vcl/source/font/fontselect.cxx | 3 ++
vcl/win/gdi/salgdi.cxx | 2 -
vcl/win/gdi/winlayout.cxx | 15 ++++------
vcl/win/gdi/winlayout.hxx | 3 --
winaccessibility/source/UAccCOM/MAccessible.cxx | 4 ++
winaccessibility/source/UAccCOM/UAccCOM.cxx | 8 ++++-
winaccessibility/source/UAccCOM/stdafx.h | 1
winaccessibility/source/service/AccComponentEventListener.cxx | 6 ++--
winaccessibility/source/service/AccContainerEventListener.cxx | 4 +-
winaccessibility/source/service/AccListEventListener.cxx | 2 -
winaccessibility/source/service/AccObject.cxx | 4 +-
winaccessibility/source/service/AccParagraphEventListener.cxx | 2 -
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx | 5 ++-
29 files changed, 69 insertions(+), 37 deletions(-)
New commits:
commit 27feec6f91e464651ede25a955aac5bf75bcacf6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 26 17:05:19 2016 +0100
-Werror,-Wsign-compare (clang-cl)
Change-Id: Ib4ed6a89d8da6dd15c3931b0fb92a2ddf7576171
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
index b0193a5..f78eeaa 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <cstddef>
#include <string.h>
#ifdef _MSC_VER
@@ -94,7 +97,7 @@ void traceTrustStatus(DWORD err)
{
if (err == 0)
SAL_INFO("xmlsecurity.xmlsec", " " << arErrStrings[0].name);
- for (int i = 1; i < SAL_N_ELEMENTS(arErrStrings); i++)
+ for (std::size_t i = 1; i < SAL_N_ELEMENTS(arErrStrings); i++)
{
if (arErrStrings[i].error & err)
SAL_INFO("xmlsecurity.xmlsec", " " << arErrStrings[i].name);
commit 377fa55b49858d93c1644c6e003fc39c48867dbb
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 26 17:05:02 2016 +0100
-Werror,-Wsign-compare (clang-cl)
Change-Id: I7a3f17e84bbf44a472838ab20b4490f1ef3654d6
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx
index 74a6518..ce2a303 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -22,6 +22,8 @@
#include "MAccessible.h"
#include <algorithm>
+#include <cstddef>
+
#include "AccAction.h"
#include "AccRelation.h"
#include "AccComponent.h"
@@ -3063,7 +3065,7 @@ STDMETHODIMP CMAccessible:: get_states(AccessibleStates __RPC_FAR *states )
*states = 0x0;
for( int i = 0; i < count; i++ )
{
- for( int j = 0; j < SAL_N_ELEMENTS(UNO_STATES); j++ )
+ for( std::size_t j = 0; j < SAL_N_ELEMENTS(UNO_STATES); j++ )
{
if( pStates[i] == UNO_STATES[j] )
{
diff --git a/winaccessibility/source/service/AccObject.cxx b/winaccessibility/source/service/AccObject.cxx
index 8b60ddf..47118d5 100644
--- a/winaccessibility/source/service/AccObject.cxx
+++ b/winaccessibility/source/service/AccObject.cxx
@@ -800,8 +800,8 @@ void AccObject::UpdateRole()
XAccessibleContext* pContext = m_xAccContextRef.get();
m_pIMAcc->Put_XAccRole( ROLE_SYSTEM_WINDOW );
- short iRoleIndex = pContext->getAccessibleRole();
- if ((0 <= iRoleIndex) && (iRoleIndex < SAL_N_ELEMENTS(ROLE_TABLE)))
+ sal_Int16 iRoleIndex = pContext->getAccessibleRole();
+ if ((0 <= iRoleIndex) && (sal_uInt16(iRoleIndex) < SAL_N_ELEMENTS(ROLE_TABLE)))
{
short iIA2Role = ROLE_TABLE[iRoleIndex][1] ;
m_pIMAcc->Put_XAccRole( iIA2Role );
commit 29c3ba5e7b1bd604d1cbf7a1ea2912570ddec40a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 26 17:04:21 2016 +0100
-Werror,-Wmissing-field-initializers (clang-cl)
Change-Id: I93e04007fcf4f9ff9a5da01b4c7d64904fdf2b87
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index e2a7349..856f70d 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -1695,7 +1695,7 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs )
aScriptState.fDigitSubstitute = bool(rArgs.mnFlags & SalLayoutFlags::SubstituteDigits);
aScriptState.fArabicNumContext = aScriptState.fDigitSubstitute & aScriptState.uBidiLevel;
DWORD nLangId = 0; // TODO: get language from font
- SCRIPT_CONTROL aScriptControl = {nLangId,false,false,false,false,false,false,false,false,0};
+ SCRIPT_CONTROL aScriptControl = {nLangId,false,false,false,false,false,false,false,false,false,false,0};
aScriptControl.fNeutralOverride = aScriptState.fOverrideDirection;
aScriptControl.fContextDigits = bool(rArgs.mnFlags & SalLayoutFlags::SubstituteDigits);
aScriptControl.fMergeNeutralItems = true;
commit 214d5795cd0f4eefd6b3e65ee51484175e0bfcb0
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 26 17:03:58 2016 +0100
-Werror,-Wunused-private-field (clang-cl)
Change-Id: Id60b0ecbfd2599ad9bc7e9aa60c3dbda78edc825
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 77e032f..e2a7349 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -497,7 +497,7 @@ bool WinFontInstance::AddChunkOfGlyphs(bool bRealGlyphIndices, int nGlyphIndex,
return true;
}
-SimpleWinLayout::SimpleWinLayout(HDC hDC, BYTE nCharSet, const WinFontFace& rWinFontData,
+SimpleWinLayout::SimpleWinLayout(HDC hDC, const WinFontFace& rWinFontData,
WinFontInstance& rWinFontEntry, bool bUseOpenGL)
: WinLayout(hDC, rWinFontData, rWinFontEntry, bUseOpenGL),
mnGlyphCount( 0 ),
@@ -510,8 +510,7 @@ SimpleWinLayout::SimpleWinLayout(HDC hDC, BYTE nCharSet, const WinFontFace& rWin
mpGlyphs2Chars( NULL ),
mpGlyphRTLFlags( NULL ),
mnWidth( 0 ),
- mnNotdefWidth( -1 ),
- mnCharSet( nCharSet )
+ mnNotdefWidth( -1 )
{
}
@@ -3782,7 +3781,7 @@ SalLayout* WinSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe
rFontInstance.SetKernData( mnFontKernPairCount, mpFontKernPairs );
}
- pWinLayout = new SimpleWinLayout(getHDC(), ANSI_CHARSET, rFontFace, rFontInstance, bUseOpenGL);
+ pWinLayout = new SimpleWinLayout(getHDC(), rFontFace, rFontInstance, bUseOpenGL);
}
else
{
diff --git a/vcl/win/gdi/winlayout.hxx b/vcl/win/gdi/winlayout.hxx
index 0df8397..6709cb1 100644
--- a/vcl/win/gdi/winlayout.hxx
+++ b/vcl/win/gdi/winlayout.hxx
@@ -71,7 +71,7 @@ public:
class SimpleWinLayout : public WinLayout
{
public:
- SimpleWinLayout(HDC, BYTE nCharSet, const WinFontFace&, WinFontInstance&, bool bUseOpenGL);
+ SimpleWinLayout(HDC, const WinFontFace&, WinFontInstance&, bool bUseOpenGL);
virtual ~SimpleWinLayout();
virtual bool LayoutText( ImplLayoutArgs& ) override;
@@ -110,7 +110,6 @@ private:
mutable long mnWidth;
int mnNotdefWidth;
- BYTE mnCharSet;
};
class UniscribeLayout : public WinLayout
commit 49f29c11520440b03ea35cec256e7aba20774700
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 26 17:02:59 2016 +0100
wchar_t confusion (clang-cl)
Change-Id: I5b245cfcca21e68391ee20f7b6af4de9e1c203e3
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index c2b6a97..77e032f 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -312,7 +312,7 @@ bool WinFontInstance::AddChunkOfGlyphs(bool bRealGlyphIndices, int nGlyphIndex,
}
else
{
- if (!GetTextExtentExPointW(hDC, aGlyphIndices.data(), nCount, 0, NULL, NULL, &aSize))
+ if (!GetTextExtentExPointW(hDC, reinterpret_cast<wchar_t *>(aGlyphIndices.data()), nCount, 0, NULL, NULL, &aSize))
{
SAL_WARN("vcl.gdi", "GetTextExtentExPoint failed: " << WindowsErrorString(GetLastError()));
SelectObject(hDC, hOrigFont);
commit 2a3521cdb2290e8d06ffffcdabe4a923018e64ee
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 26 17:02:03 2016 +0100
-Werror,-Wreorder (clang-cl)
Change-Id: I8efee414d4c4ec9984e3336ab09bb031c590d4fd
diff --git a/vcl/win/gdi/salgdi.cxx b/vcl/win/gdi/salgdi.cxx
index 6783cc1..ca9ceff 100644
--- a/vcl/win/gdi/salgdi.cxx
+++ b/vcl/win/gdi/salgdi.cxx
@@ -607,9 +607,9 @@ WinSalGraphics::WinSalGraphics(WinSalGraphics::Type eType, bool bScreen, HWND hW
mhDefPal(0),
mpStdClipRgnData(NULL),
mpFontAttrCache(NULL),
+ mbFontKernInit(false),
mpFontKernPairs(NULL),
mnFontKernPairCount(0),
- mbFontKernInit(false),
mnPenWidth(GSL_PEN_WIDTH)
{
if (OpenGLHelper::isVCLOpenGLEnabled() && !mbPrinter)
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index c03b203..c2b6a97 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -3811,10 +3811,10 @@ int WinSalGraphics::GetMinKashidaWidth()
WinFontInstance::WinFontInstance( FontSelectPattern& rFSD )
: LogicalFontInstance( rFSD )
-, mpGLyphyAtlas( nullptr )
-, mpGLyphyFont( nullptr )
, mpKerningPairs( NULL )
, mnKerningPairs( -1 )
+, mpGLyphyAtlas( nullptr )
+, mpGLyphyFont( nullptr )
, maWidthMap( 512 )
, mnMinKashidaWidth( -1 )
, mnMinKashidaGlyph( -1 )
commit f6649ca1036fb9b326e96c01f8d2d79162e35ea5
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 26 16:57:59 2016 +0100
PhysicalFontFace needs to be complete here
...so rFontData can be cast up in the FontAttributes copy ctor call in the
WNT-only FontSelectPatternAttributes ctor
Change-Id: I6d0de266d7838530208e0c82aed085fcf333c8f4
diff --git a/vcl/source/font/fontselect.cxx b/vcl/source/font/fontselect.cxx
index c6351bb..ce47045 100644
--- a/vcl/source/font/fontselect.cxx
+++ b/vcl/source/font/fontselect.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <PhysicalFontFace.hxx>
#include "svdata.hxx"
#include <config_graphite.h>
commit 8bb79dfe5e02e839af625bf2b9917370f52c0a0f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 26 16:56:15 2016 +0100
Fix order of SAL_WARN_UNUSED and DLLPUBLIC for clang-cl
...as previously done in 5fa9ce570dc59a3fc9eb47f28b3fed739f20ab23
Change-Id: I2bed1e1423b78b25b9a1337c60b79912c28c931f
diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
index 836bda9..9b64fa2 100644
--- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
@@ -54,7 +54,7 @@ namespace drawinglayer { namespace primitive2d {
typedef css::uno::Sequence< Primitive2DReference > Primitive2DSequence;
- class DRAWINGLAYER_DLLPUBLIC SAL_WARN_UNUSED Primitive2DContainer : public std::vector< Primitive2DReference >
+ class SAL_WARN_UNUSED DRAWINGLAYER_DLLPUBLIC Primitive2DContainer : public std::vector< Primitive2DReference >
{
public:
explicit Primitive2DContainer() {}
diff --git a/include/drawinglayer/primitive3d/baseprimitive3d.hxx b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
index 2911dec..d3eaf47 100644
--- a/include/drawinglayer/primitive3d/baseprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
@@ -53,7 +53,7 @@ namespace drawinglayer { namespace primitive3d {
typedef css::uno::Reference< css::graphic::XPrimitive3D > Primitive3DReference;
typedef css::uno::Sequence< Primitive3DReference > Primitive3DSequence;
- class DRAWINGLAYER_DLLPUBLIC SAL_WARN_UNUSED Primitive3DContainer : public std::vector< Primitive3DReference >
+ class SAL_WARN_UNUSED DRAWINGLAYER_DLLPUBLIC Primitive3DContainer : public std::vector< Primitive3DReference >
{
public:
explicit Primitive3DContainer() {}
commit b41b66c3eae2d69cf9a477d3f3f82b4a3ca46abe
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 26 16:54:14 2016 +0100
-Werror,-Wsign-compare (clang-cl)
According to MSDN: "If [StretchDIBits] fails, or no scan lines are copied, the
return value is 0."
Change-Id: I882b97b55f92618f0163f8829bf779a35b5a1452
diff --git a/fpicker/source/win32/filepicker/dibpreview.cxx b/fpicker/source/win32/filepicker/dibpreview.cxx
index 0d2ebf4..48d24cf 100644
--- a/fpicker/source/win32/filepicker/dibpreview.cxx
+++ b/fpicker/source/win32/filepicker/dibpreview.cxx
@@ -241,7 +241,7 @@ void SAL_CALL CDIBPreview::onPaint(HWND hWnd, HDC hDC)
0, 0, cxDib, cyDib, pBits, pbmi,
DIB_RGB_COLORS, SRCCOPY);
- OSL_ASSERT(GDI_ERROR != GDIError);
+ OSL_ASSERT(0 != GDIError);
// paint the border
RECT rc;
commit a567413c30e7797afea106d499c0cbb35171085f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 26 16:53:44 2016 +0100
-Werror,-Wignored-qualifiers (clang-cl)
Change-Id: I82d109db92d820df7a7d5875270c20449e77d0a5
diff --git a/extensions/source/ole/ole2uno.hxx b/extensions/source/ole/ole2uno.hxx
index 346de1e..d341b45 100644
--- a/extensions/source/ole/ole2uno.hxx
+++ b/extensions/source/ole/ole2uno.hxx
@@ -59,7 +59,7 @@ using namespace std;
namespace ole_adapter
{
-const VARTYPE getVarType( const Any& val);
+VARTYPE getVarType( const Any& val);
/* creates a Type object for a given type name.
The function returns false if the name does not represent
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 2f1ad7f..9136310 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -1618,7 +1618,7 @@ static HRESULT mapCannotConvertException(const CannotConvertException &e, unsign
// function returned VT_DISPATCH then the IDispatch of the same
// object is being returned.
// See InterfaceOleWrapper_Impl::Invoke, InterfaceOleWrapper_Impl::m_defaultValueType
-const VARTYPE getVarType( const Any& value)
+VARTYPE getVarType( const Any& value)
{
VARTYPE ret= VT_EMPTY;
commit 4b68b6d323e555595b540946d5fcc6a2cd9ae2fe
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 26 16:52:59 2016 +0100
Silence -Werror,-Wmissing-field-initializers in END_OBJECT_MAP (clang-cl)
Change-Id: Ia9ba7fc6cd94e2d726cd9b1dc72c140af16dd700
diff --git a/embedserv/source/embed/esdll.cxx b/embedserv/source/embed/esdll.cxx
index 911ffdc..fb5f1cc 100644
--- a/embedserv/source/embed/esdll.cxx
+++ b/embedserv/source/embed/esdll.cxx
@@ -41,8 +41,14 @@ CComModule _Module;
#include <atlcom.h>
BEGIN_OBJECT_MAP(ObjectMap)
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wmissing-field-initializers"
+#endif
END_OBJECT_MAP()
-
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
// DLL Entry Point
diff --git a/extensions/source/ole/oledll.cxx b/extensions/source/ole/oledll.cxx
index f3c862f..c319cc7 100644
--- a/extensions/source/ole/oledll.cxx
+++ b/extensions/source/ole/oledll.cxx
@@ -50,8 +50,14 @@ CComModule _Module;
#pragma warning (pop)
BEGIN_OBJECT_MAP(ObjectMap)
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wmissing-field-initializers"
+#endif
END_OBJECT_MAP()
-
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
// DLL Entry Point
diff --git a/winaccessibility/source/UAccCOM/UAccCOM.cxx b/winaccessibility/source/UAccCOM/UAccCOM.cxx
index 4f54a37..f563966 100644
--- a/winaccessibility/source/UAccCOM/UAccCOM.cxx
+++ b/winaccessibility/source/UAccCOM/UAccCOM.cxx
@@ -64,8 +64,14 @@ OBJECT_ENTRY(CLSID_AccValue, CAccValue)
OBJECT_ENTRY(CLSID_AccTable, CAccTable)
OBJECT_ENTRY(CLSID_AccHyperLink, CAccHyperLink)
OBJECT_ENTRY(CLSID_AccHypertext, CAccHypertext)
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wmissing-field-initializers"
+#endif
END_OBJECT_MAP()
-
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
// DLL Entry Point
commit b6a99534d878a0062b0fdc9d6f24cb231a2e03a7
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 26 16:51:01 2016 +0100
-Werror,-Wsign-compare (clang-cl)
Change-Id: I12f59526f6b6f4367fdc6f31ffc677cb45795049
diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx
index d6d1a1c..aaa416f 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.cxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.cxx
@@ -180,7 +180,7 @@ HENHMETAFILE SAL_CALL OOMFPictToWinENHMFPict( Sequence< sal_Int8 >& aOOMetaFileP
Sequence< sal_Int8 > SAL_CALL WinDIBToOOBMP( const Sequence< sal_Int8 >& aWinDIB )
{
- OSL_ENSURE(aWinDIB.getLength() > sizeof(BITMAPINFOHEADER), "CF_DIBV5/CF_DIB too small (!)");
+ OSL_ENSURE(sal_uInt32(aWinDIB.getLength()) > sizeof(BITMAPINFOHEADER), "CF_DIBV5/CF_DIB too small (!)");
Sequence< sal_Int8 > ooBmpStream;
ooBmpStream.realloc(aWinDIB.getLength( ) + sizeof(BITMAPFILEHEADER));
diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx
index 7f3a46c..51108a1 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.cxx
@@ -272,11 +272,11 @@ void SAL_CALL CXTDataObject::renderAnyDataAndSetupStgMedium(
#ifdef DBG_UTIL
if(CF_DIBV5 == fetc.cfFormat)
{
- OSL_ENSURE(clipDataStream.getLength( ) > (sizeof(BITMAPFILEHEADER) + sizeof(BITMAPV5HEADER)), "Wrong size on CF_DIBV5 data (!)");
+ OSL_ENSURE(sal_uInt32(clipDataStream.getLength()) > (sizeof(BITMAPFILEHEADER) + sizeof(BITMAPV5HEADER)), "Wrong size on CF_DIBV5 data (!)");
}
else // CF_DIB == fetc.cfFormat
{
- OSL_ENSURE(clipDataStream.getLength( ) > (sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER)), "Wrong size on CF_DIB data (!)");
+ OSL_ENSURE(sal_uInt32(clipDataStream.getLength()) > (sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER)), "Wrong size on CF_DIB data (!)");
}
#endif
commit 432adca092005cc517941b38ab30968e23817671
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 26 16:49:49 2016 +0100
Silence more warnings, clang-cl's /W4 now also includes -Wextra
Change-Id: I20fa3b02570bdbc3ccd297401a7669b0fda5c624
diff --git a/avmedia/source/framework/collada_headers.hxx b/avmedia/source/framework/collada_headers.hxx
index e32e069..6ef8238 100644
--- a/avmedia/source/framework/collada_headers.hxx
+++ b/avmedia/source/framework/collada_headers.hxx
@@ -12,7 +12,7 @@
#include <sal/config.h>
-#if defined __GNUC__
+#if defined __GNUC__ || defined __clang__
#pragma GCC system_header
#elif defined _MSC_VER
#pragma warning(push, 1)
diff --git a/embedserv/source/inc/embeddocaccess.hxx b/embedserv/source/inc/embeddocaccess.hxx
index 712167b..914d448 100644
--- a/embedserv/source/inc/embeddocaccess.hxx
+++ b/embedserv/source/inc/embeddocaccess.hxx
@@ -33,6 +33,7 @@
#if defined __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wall"
+#pragma clang diagnostic ignored "-Wextra"
#pragma clang diagnostic ignored "-Wmicrosoft"
#endif
#include <atldbcli.h>
diff --git a/embedserv/source/inc/stdafx.h b/embedserv/source/inc/stdafx.h
index 7b147a8..c4b6bf4 100644
--- a/embedserv/source/inc/stdafx.h
+++ b/embedserv/source/inc/stdafx.h
@@ -23,6 +23,7 @@
#pragma clang diagnostic ignored "-Wattributes"
#pragma clang diagnostic ignored "-Wdelete-incomplete"
#pragma clang diagnostic ignored "-Wdynamic-class-memaccess"
+#pragma clang diagnostic ignored "-Wextra"
#pragma clang diagnostic ignored "-Wint-to-pointer-cast"
#pragma clang diagnostic ignored "-Winvalid-noreturn"
#pragma clang diagnostic ignored "-Wmicrosoft"
diff --git a/extensions/source/ole/oledll.cxx b/extensions/source/ole/oledll.cxx
index f3adb8e..f3c862f 100644
--- a/extensions/source/ole/oledll.cxx
+++ b/extensions/source/ole/oledll.cxx
@@ -29,6 +29,7 @@
#pragma clang diagnostic ignored "-Wall"
#pragma clang diagnostic ignored "-Wattributes"
#pragma clang diagnostic ignored "-Wdelete-incomplete"
+#pragma clang diagnostic ignored "-Wextra"
#pragma clang diagnostic ignored "-Wint-to-pointer-cast"
#pragma clang diagnostic ignored "-Winvalid-noreturn"
#pragma clang diagnostic ignored "-Wmicrosoft"
diff --git a/extensions/source/ole/wincrap.hxx b/extensions/source/ole/wincrap.hxx
index f47b5ce..4e5dab8 100644
--- a/extensions/source/ole/wincrap.hxx
+++ b/extensions/source/ole/wincrap.hxx
@@ -45,6 +45,7 @@
#pragma clang diagnostic ignored "-Wall"
#pragma clang diagnostic ignored "-Wattributes"
#pragma clang diagnostic ignored "-Wdelete-incomplete"
+#pragma clang diagnostic ignored "-Wextra"
#pragma clang diagnostic ignored "-Wint-to-pointer-cast"
#pragma clang diagnostic ignored "-Winvalid-noreturn"
#pragma clang diagnostic ignored "-Wmicrosoft"
diff --git a/extensions/source/ole/windata.hxx b/extensions/source/ole/windata.hxx
index b8b43ce..8e942d6 100644
--- a/extensions/source/ole/windata.hxx
+++ b/extensions/source/ole/windata.hxx
@@ -28,6 +28,7 @@
#if defined __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wall"
+#pragma clang diagnostic ignored "-Wextra"
#pragma clang diagnostic ignored "-Wint-to-pointer-cast"
#pragma clang diagnostic ignored "-Winvalid-noreturn"
#pragma clang diagnostic ignored "-Wmicrosoft"
diff --git a/winaccessibility/source/UAccCOM/stdafx.h b/winaccessibility/source/UAccCOM/stdafx.h
index b1cf88a..6879f1c 100644
--- a/winaccessibility/source/UAccCOM/stdafx.h
+++ b/winaccessibility/source/UAccCOM/stdafx.h
@@ -40,6 +40,7 @@
#pragma clang diagnostic ignored "-Wall"
#pragma clang diagnostic ignored "-Wattributes"
#pragma clang diagnostic ignored "-Wdelete-incomplete"
+#pragma clang diagnostic ignored "-Wextra"
#pragma clang diagnostic ignored "-Wint-to-pointer-cast"
#pragma clang diagnostic ignored "-Winvalid-noreturn"
#pragma clang diagnostic ignored "-Wmicrosoft"
commit d48e05425055e16c28556aefd15838ae7461ec66
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 26 16:45:51 2016 +0100
-Werror,-Wunused-parameter (clang-cl)
Change-Id: I1ac58714e04b995ef5229888f0c427104c001318
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index f33e79f..2f1ad7f 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -1556,7 +1556,7 @@ STDMETHODIMP UnoObjectWrapperRemoteOpt::Invoke ( DISPID dispidMember, REFIID /*
}
HRESULT UnoObjectWrapperRemoteOpt::methodInvoke( DISPID /*dispidMember*/, DISPPARAMS * /*pdispparams*/, VARIANT * /*pvarResult*/,
- EXCEPINFO * /*pexcepinfo*/, unsigned int * /*puArgErr*/, Sequence<Any> params)
+ EXCEPINFO * /*pexcepinfo*/, unsigned int * /*puArgErr*/, Sequence<Any>)
{
return S_OK;
}
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index ae49dea..e148b26 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -23,7 +23,7 @@
#include <sal/types.h>
#include <config_poppler.h>
-#if defined __GNUC__
+#if defined __GNUC__ || defined __clang__
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wunused-parameter"
#elif defined _MSC_VER
@@ -39,7 +39,7 @@
#include "GlobalParams.h"
#include "PDFDoc.h"
-#if defined __GNUC__
+#if defined __GNUC__ || defined __clang__
# pragma GCC diagnostic pop
#elif defined _MSC_VER
#pragma warning(pop)
diff --git a/soltools/mkdepend/include.c b/soltools/mkdepend/include.c
index cb1cc17..6712b1a 100644
--- a/soltools/mkdepend/include.c
+++ b/soltools/mkdepend/include.c
@@ -257,6 +257,8 @@ int issymbolic(char *dir, char *component)
fatalerr("out of .. dirs, increase MAXDIRS\n");
return TRUE;
}
+#else
+ (void)dir; (void)component;
#endif
return FALSE;
}
diff --git a/winaccessibility/source/service/AccComponentEventListener.cxx b/winaccessibility/source/service/AccComponentEventListener.cxx
index 22fa47d..39fb611 100644
--- a/winaccessibility/source/service/AccComponentEventListener.cxx
+++ b/winaccessibility/source/service/AccComponentEventListener.cxx
@@ -91,7 +91,7 @@ throw (css::uno::RuntimeException)
* @param oldValue the old value of the source of event
* @param newValue the new value of the source of event
*/
-void AccComponentEventListener::HandleValueChangedEvent(Any oldValue, Any newValue)
+void AccComponentEventListener::HandleValueChangedEvent(Any, Any)
{
pAgent->UpdateValue(m_xAccessible.get());
pAgent->NotifyAccEvent(UM_EVENT_OBJECT_VALUECHANGE, m_xAccessible.get());
@@ -112,7 +112,7 @@ void AccComponentEventListener::HandleActionChangedEvent()
* @param oldValue the old value of the source of event
* @param newValue the new value of the source of event
*/
-void AccComponentEventListener::HandleTextChangedEvent(Any oldValue, Any newValue)
+void AccComponentEventListener::HandleTextChangedEvent(Any, Any newValue)
{
pAgent->UpdateValue(m_xAccessible.get(), newValue);
pAgent->NotifyAccEvent(UM_EVENT_OBJECT_VALUECHANGE, m_xAccessible.get());
@@ -124,7 +124,7 @@ void AccComponentEventListener::HandleTextChangedEvent(Any oldValue, Any newValu
* @param oldValue the old value of the source of event
* @param newValue the new value of the source of event
*/
-void AccComponentEventListener::HandleCaretChangedEvent(Any oldValue, Any newValue)
+void AccComponentEventListener::HandleCaretChangedEvent(Any, Any)
{
pAgent->NotifyAccEvent(UM_EVENT_OBJECT_CARETCHANGE, m_xAccessible.get());
}
diff --git a/winaccessibility/source/service/AccContainerEventListener.cxx b/winaccessibility/source/service/AccContainerEventListener.cxx
index f882ea4..194bf3e 100644
--- a/winaccessibility/source/service/AccContainerEventListener.cxx
+++ b/winaccessibility/source/service/AccContainerEventListener.cxx
@@ -195,7 +195,7 @@ void AccContainerEventListener::HandleAllChildrenChangedEvent()
/**
* handle the TEXT_CHANGED event
*/
-void AccContainerEventListener::HandleTextChangedEvent(Any oldValue, Any newValue)
+void AccContainerEventListener::HandleTextChangedEvent(Any, Any newValue)
{
pAgent->UpdateValue(m_xAccessible.get(), newValue);
pAgent->NotifyAccEvent(UM_EVENT_OBJECT_TEXTCHANGE, m_xAccessible.get());
@@ -421,7 +421,7 @@ void AccContainerEventListener::FireStateFocusedChange(bool enable)
* @param oldValue the old value of the source of event
* @param newValue the new value of the source of event
*/
-void AccContainerEventListener::HandleValueChangedEvent(Any oldValue, Any newValue)
+void AccContainerEventListener::HandleValueChangedEvent(Any, Any)
{
pAgent->UpdateValue(m_xAccessible.get());
pAgent->NotifyAccEvent(UM_EVENT_OBJECT_VALUECHANGE, m_xAccessible.get());
diff --git a/winaccessibility/source/service/AccListEventListener.cxx b/winaccessibility/source/service/AccListEventListener.cxx
index 6e88706..9557bfb 100644
--- a/winaccessibility/source/service/AccListEventListener.cxx
+++ b/winaccessibility/source/service/AccListEventListener.cxx
@@ -111,7 +111,7 @@ void AccListEventListener::HandleActiveDescendantChangedEvent(Any oldValue, Any
* @param oldValue the old value of the source of event
* @param newValue the new value of the source of event
*/
-void AccListEventListener::HandleValueChangedEvent(Any oldValue, Any newValue)
+void AccListEventListener::HandleValueChangedEvent(Any, Any)
{
//to enable value changed event
if (GetParentRole() == AccessibleRole::COMBO_BOX)
diff --git a/winaccessibility/source/service/AccParagraphEventListener.cxx b/winaccessibility/source/service/AccParagraphEventListener.cxx
index 9d064c2..e9d5668 100644
--- a/winaccessibility/source/service/AccParagraphEventListener.cxx
+++ b/winaccessibility/source/service/AccParagraphEventListener.cxx
@@ -93,7 +93,7 @@ throw (css::uno::RuntimeException)
* @param oldValue in UNO, this parameter is always NULL
* @param newValue in UNO, this parameter is always NULL
*/
-void AccParagraphEventListener::HandleCaretChangedEvent(Any oldValue, Any newValue)
+void AccParagraphEventListener::HandleCaretChangedEvent(Any, Any)
{
pAgent->UpdateLocation(m_xAccessible.get());
pAgent->NotifyAccEvent(UM_EVENT_OBJECT_CARETCHANGE, m_xAccessible.get());
More information about the Libreoffice-commits
mailing list