diff options
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx | 3 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx | 3 | ||||
| -rw-r--r-- | include/LibreOfficeKit/LibreOfficeKitInit.h | 5 |
3 files changed, 10 insertions, 1 deletions
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx index 7189bd7e37f1..6a3689ca6c33 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx @@ -121,6 +121,7 @@ void cpp2uno_call( case typelib_TypeClass_UNSIGNED_HYPER: case typelib_TypeClass_DOUBLE: pCppStack += sizeof(sal_Int32); // extra long + SAL_FALLTHROUGH; default: break; } @@ -344,6 +345,7 @@ extern "C" void cpp_vtable_call( TYPELIB_DANGER_RELEASE( pTD ); } } // else perform queryInterface() + SAL_FALLTHROUGH; default: cpp2uno_call( pCppI, aMemberDescr.get(), @@ -425,6 +427,7 @@ unsigned char * codeSnippet( break; } } + SAL_FALLTHROUGH; case typelib_TypeClass_STRING: case typelib_TypeClass_TYPE: case typelib_TypeClass_SEQUENCE: diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx index 0102ea186196..d7e60b5b6c8f 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx @@ -115,6 +115,7 @@ void callVirtualMethod( case typelib_TypeClass_HYPER: case typelib_TypeClass_UNSIGNED_HYPER: ((long*)pRegisterReturn)[1] = edx; + SAL_FALLTHROUGH; case typelib_TypeClass_LONG: case typelib_TypeClass_UNSIGNED_LONG: case typelib_TypeClass_CHAR: @@ -221,6 +222,7 @@ static void cpp_call( case typelib_TypeClass_UNSIGNED_HYPER: case typelib_TypeClass_DOUBLE: pCppStack += sizeof(sal_Int32); // extra long + SAL_FALLTHROUGH; default: break; } @@ -453,6 +455,7 @@ void unoInterfaceProxyDispatch( TYPELIB_DANGER_RELEASE( pTD ); } } // else perform queryInterface() + SAL_FALLTHROUGH; default: // dependent dispatch cpp_call( diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h b/include/LibreOfficeKit/LibreOfficeKitInit.h index 322ba8be9e4b..f4ab9cdf2082 100644 --- a/include/LibreOfficeKit/LibreOfficeKitInit.h +++ b/include/LibreOfficeKit/LibreOfficeKitInit.h @@ -42,7 +42,10 @@ extern "C" #endif #define SEPARATOR '/' - inline void *lok_loadlib(const char *pFN) +#ifndef __OBJC__ + inline +#endif + void *lok_loadlib(const char *pFN) { return dlopen(pFN, RTLD_LAZY #if defined LOK_LOADLIB_GLOBAL |