distro-configs/Jenkins/Linux_ubsan_master.conf | 1 - include/vcl/menubtn.hxx | 2 +- qadevOOo/runner/base/java_fat.java | 6 +++++- vcl/source/control/menubtn.cxx | 6 ------ 4 files changed, 6 insertions(+), 9 deletions(-)
New commits: commit 05618e74c77658da76f467a1ab328cb310a19e84 Author: Caolán McNamara <[email protected]> Date: Sat Feb 20 20:54:04 2016 +0000 packagekit is implied by dbus now Change-Id: Ic29f55a846c48a3ddb6151d60e612d6b35a0ef3a diff --git a/distro-configs/Jenkins/Linux_ubsan_master.conf b/distro-configs/Jenkins/Linux_ubsan_master.conf index 0c23236..bcb3c24 100644 --- a/distro-configs/Jenkins/Linux_ubsan_master.conf +++ b/distro-configs/Jenkins/Linux_ubsan_master.conf @@ -23,7 +23,6 @@ --enable-extra-sample --enable-extra-template --enable-gstreamer-1-0 ---enable-packagekit --enable-python=fully-internal --enable-release-build --enable-vlc commit 60bb689cd43ea89b4e1886d0f2a15ef366c6dce8 Author: Caolán McNamara <[email protected]> Date: Sat Feb 20 20:51:43 2016 +0000 StarOffice 5.1 was released in 1999, fixing this now Change-Id: I0b6bf947f7d309820334ed1ac6eae5a29b5c69fb diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx index d7dead7..5f791cb 100644 --- a/include/vcl/menubtn.hxx +++ b/include/vcl/menubtn.hxx @@ -66,7 +66,7 @@ public: void ExecuteMenu(); - void SetMenuMode( sal_uInt16 nMode ); + void SetMenuMode(sal_uInt16 nMode) { mnMenuMode = nMode; } void SetPopupMenu( PopupMenu* pNewMenu ); PopupMenu* GetPopupMenu() const { return mpMenu; } diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index 773d439..9863950 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -160,12 +160,6 @@ void MenuButton::Select() maSelectHdl.Call( this ); } -void MenuButton::SetMenuMode( sal_uInt16 nMode ) -{ - // FIXME: It's better to not inline this for 5.1; in 6.0 we can make it inline, however - mnMenuMode = nMode; -} - void MenuButton::SetPopupMenu( PopupMenu* pNewMenu ) { if (pNewMenu == mpMenu) commit f14628438d70f621a48e5ab00a4fa76e8229d831 Author: Caolán McNamara <[email protected]> Date: Sat Feb 20 20:42:45 2016 +0000 coverity#1326436 Dereference null return value Change-Id: I40f73b48757e81ac4e1b5374bef4fea334ca8d0a diff --git a/qadevOOo/runner/base/java_fat.java b/qadevOOo/runner/base/java_fat.java index a0426fd..2fa1d05 100644 --- a/qadevOOo/runner/base/java_fat.java +++ b/qadevOOo/runner/base/java_fat.java @@ -360,7 +360,11 @@ public class java_fat implements TestBase { try { tCase.initializeTestCase(param); - return tCase.getTestEnvironment(param); + TestEnvironment tEnv = tCase.getTestEnvironment(param); + if (tEnv == null) { + throw new Exception("Could not get env for '" + entry.entryName + "'"); + } + return tEnv; } catch (com.sun.star.lang.DisposedException de) { System.out.println("Office disposed"); closeExistingOffice();
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
