diff options
-rw-r--r-- | bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx | 3 | ||||
-rw-r--r-- | bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx | 3 | ||||
-rw-r--r-- | embedserv/source/embed/ed_ioleobject.cxx | 2 | ||||
-rw-r--r-- | embedserv/source/embed/tracker.cxx | 6 | ||||
-rw-r--r-- | sal/osl/w32/file_url.cxx | 3 | ||||
-rw-r--r-- | sal/osl/w32/socket.cxx | 1 | ||||
-rw-r--r-- | svl/source/svdde/ddecli.cxx | 2 | ||||
-rw-r--r-- | tools/source/inet/inetmime.cxx | 1 | ||||
-rw-r--r-- | vcl/win/gdi/salgdi2.cxx | 1 | ||||
-rw-r--r-- | vcl/win/window/salframe.cxx | 1 | ||||
-rw-r--r-- | winaccessibility/source/UAccCOM/MAccessible.cxx | 1 |
11 files changed, 20 insertions, 4 deletions
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 a37b391168d2..a1a27c126970 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 65ca1ee20e9a..05d3ec9f7408 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 986d6fdef991..3a79799231df 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 fc8986061c2c..f0e3954d2e29 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 248529bef9f4..5009082bc11c 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 a0d1340e0b85..ea6ea0df3bc0 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 09c6e9444104..29010286c9a6 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 5fdbf43342f6..33bf39664914 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 2104bdb7469f..8514e73c1523 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 a7168989505c..6b5fa26b071c 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 2ef25adeda68..edbc31b78ad4 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: |