[Libreoffice-commits] core.git: bridges/source embedserv/source sal/osl svl/source tools/source vcl/win winaccessibility/source
Stephan Bergmann
sbergman at redhat.com
Wed May 25 06:42:44 UTC 2016
bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx | 3 ++-
bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx | 3 ++-
embedserv/source/embed/ed_ioleobject.cxx | 2 +-
embedserv/source/embed/tracker.cxx | 6 ++++++
sal/osl/w32/file_url.cxx | 3 +++
sal/osl/w32/socket.cxx | 1 +
svl/source/svdde/ddecli.cxx | 2 +-
tools/source/inet/inetmime.cxx | 1 +
vcl/win/gdi/salgdi2.cxx | 1 +
vcl/win/window/salframe.cxx | 1 +
winaccessibility/source/UAccCOM/MAccessible.cxx | 1 +
11 files changed, 20 insertions(+), 4 deletions(-)
New commits:
commit a890e3189b4146aba3dfaf2f3e1ac212bb02c8a4
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed May 25 08:42:15 2016 +0200
SAL_FALLTRHOUGH in Windows-only code
Change-Id: If35da46c209746a86687e1c3f60f72f2f08aa681
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
index a37b391..a1a27c1 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
@@ -338,7 +338,8 @@ extern "C" typelib_TypeClass cpp_vtable_call(
}
TYPELIB_DANGER_RELEASE( pTD2 );
}
- } // Fall through!
+ SAL_FALLTHROUGH;
+ }
default:
{
typelib_InterfaceMethodTypeDescription * pMethodTD =
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
index 65ca1ee..05d3ec9 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
@@ -423,7 +423,8 @@ void unoInterfaceProxyDispatch(
}
TYPELIB_DANGER_RELEASE( pTD );
}
- } // Else perform queryInterface()
+ SAL_FALLTHROUGH; // else perform queryInterface()
+ }
default:
if ( ! cpp_call(
pThis, aVtableSlot,
diff --git a/embedserv/source/embed/ed_ioleobject.cxx b/embedserv/source/embed/ed_ioleobject.cxx
index 986d6fd..3a79799 100644
--- a/embedserv/source/embed/ed_ioleobject.cxx
+++ b/embedserv/source/embed/ed_ioleobject.cxx
@@ -192,7 +192,7 @@ STDMETHODIMP EmbedDocument_Impl::DoVerb(
pActiveSite,TRUE)))
return NOERROR;
- // intended fall through
+ SAL_FALLTHROUGH;
case OLEIVERB_OPEN:
OSL_ENSURE(m_pDocHolder,"no document to open");
diff --git a/embedserv/source/embed/tracker.cxx b/embedserv/source/embed/tracker.cxx
index fc89860..f0e3954 100644
--- a/embedserv/source/embed/tracker.cxx
+++ b/embedserv/source/embed/tracker.cxx
@@ -16,6 +16,11 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
+#include <sal/config.h>
+
+#include <sal/types.h>
+
#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
#endif
@@ -442,6 +447,7 @@ BOOL Tracker::TrackHandle(int nHandle,HWND hWnd,POINT point,HWND hWndClipTo)
case WM_KEYDOWN:
if (msg.wParam != VK_ESCAPE)
break;
+ SAL_FALLTHROUGH;
case WM_RBUTTONDOWN:
if (bMoved)
{
diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index 248529b..5009082 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -84,6 +84,7 @@ static BOOL IsValidFilePathComponent(
break;
}
}
+ SAL_FALLTHROUGH;
case 0:
case ' ':
if ( dwFlags & VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD )
@@ -104,6 +105,7 @@ static BOOL IsValidFilePathComponent(
case '*':
if ( dwFlags & VALIDATEPATH_ALLOW_WILDCARDS )
break;
+ SAL_FALLTHROUGH;
/* The following characters are reserved */
case '<':
case '>':
@@ -580,6 +582,7 @@ static void _osl_encodeURL( rtl_uString *strURL, rtl_String **pstrEncodedURL )
pURLDest += 3;
break;
}
+ SAL_FALLTHROUGH;
case '!':
case '\'':
case '(':
diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx
index a0d1340..ea6ea0d 100644
--- a/sal/osl/w32/socket.cxx
+++ b/sal/osl/w32/socket.cxx
@@ -559,6 +559,7 @@ sal_Bool SAL_CALL osl_isEqualSocketAddr(oslSocketAddr Addr1, oslSocketAddr Addr2
(pInetAddr1->sin_addr.s_addr == pInetAddr2->sin_addr.s_addr) &&
(pInetAddr1->sin_port == pInetAddr2->sin_port))
return sal_True;
+ SAL_FALLTHROUGH;
}
default:
diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx
index 09c6e94..2901028 100644
--- a/svl/source/svdde/ddecli.cxx
+++ b/svl/source/svdde/ddecli.cxx
@@ -125,7 +125,7 @@ HDDEDATA CALLBACK DdeInternal::CliCallback( WORD nCode, WORD nCbType,
nRet = (HDDEDATA)DDE_FACK;
break;
}
- // no break
+ SAL_FALLTHROUGH;
case XTYP_REQUEST:
if( !hData && XTYP_REQUEST == nCode )
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index 5fdbf43..33bf396 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -846,6 +846,7 @@ createPreferredCharsetList(rtl_TextEncoding eEncoding)
#if defined(_WIN32)
pList->prepend(Charset(RTL_TEXTENCODING_MS_1252,
aWindows1252Ranges));
+ break;
#endif // WNT
case RTL_TEXTENCODING_ISO_8859_1:
case RTL_TEXTENCODING_UTF7:
diff --git a/vcl/win/gdi/salgdi2.cxx b/vcl/win/gdi/salgdi2.cxx
index 2104bdb..8514e73 100644
--- a/vcl/win/gdi/salgdi2.cxx
+++ b/vcl/win/gdi/salgdi2.cxx
@@ -50,6 +50,7 @@ bool WinSalGraphics::supportsOperation( OutDevSupportType eType ) const
break;
case OutDevSupport_B2DDraw:
bRet = bAllowForTest;
+ break;
default: break;
}
return bRet;
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index a716898..6b5fa26 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -5707,6 +5707,7 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lP
case WM_KILLFOCUS:
DestroyCaret();
+ SAL_FALLTHROUGH;
case WM_SETFOCUS:
case SAL_MSG_POSTFOCUS:
ImplHandleFocusMsg( hWnd );
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx
index 2ef25ad..edbc31b 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -3011,6 +3011,7 @@ void CMAccessible::ConvertAnyToVariant(const css::uno::Any &rAnyVal, VARIANT *pv
}
}
}
+ SAL_FALLTHROUGH;
}
case TypeClass_SERVICE:
case TypeClass_MODULE:
More information about the Libreoffice-commits
mailing list