bean/com/sun/star/comp/beans/LocalOfficeConnection.java | 1 + sd/qa/unit/misc-tests.cxx | 3 +++ 2 files changed, 4 insertions(+)
New commits: commit c30b5d2a382162be94e6a6ac5d5794a074ebfaaa Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Fri Apr 29 17:37:49 2016 +0200 cid#1358838 cid#1358839 cid#1358840 assert to avoid null pointer dereference Change-Id: I95f069cb3efa7137c9382c9d9eb6d1353471d28e Reviewed-on: https://gerrit.libreoffice.org/24498 Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk> Tested-by: Jenkins <c...@libreoffice.org> diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java index c2d17b7..6132b76 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java @@ -310,6 +310,7 @@ public class LocalOfficeConnection Object aInitialObject = null; try { + System.out.println("debug, LocalOfficeConnection: mURL is '"+mURL+"'"); aInitialObject = resolve(xLocalContext, mURL); } catch( com.sun.star.connection.NoConnectException e ) diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx index f2ac807..bc73b5f 100644 --- a/sd/qa/unit/misc-tests.cxx +++ b/sd/qa/unit/misc-tests.cxx @@ -162,6 +162,7 @@ void SdMiscTest::testTdf99396() // Set the vertical alignment of the cells to bottom. sdr::table::SvxTableController* pTableController = dynamic_cast<sdr::table::SvxTableController*>(pView->getSelectionController().get()); + CPPUNIT_ASSERT(pTableController); SfxRequest aRequest(pViewShell->GetViewFrame(), SID_TABLE_VERT_BOTTOM); pTableController->Execute(aRequest); // This was 0, it wasn't possible to undo a vertical alignment change. @@ -178,6 +179,7 @@ void SdMiscTest::testTdf99396TextEdit() SdPage* pPage = pViewShell->GetActualPage(); SdrObject* pObject = pPage->GetObj(0); auto pTableObject = dynamic_cast<sdr::table::SdrTableObj*>(pObject); + CPPUNIT_ASSERT(pTableObject); SdrView* pView = pViewShell->GetView(); pView->MarkObj(pObject, pView->GetSdrPageView()); @@ -199,6 +201,7 @@ void SdMiscTest::testTdf99396TextEdit() } { auto pTableController = dynamic_cast<sdr::table::SvxTableController*>(pView->getSelectionController().get()); + CPPUNIT_ASSERT(pTableController); SfxRequest aRequest(pViewShell->GetViewFrame(), SID_TABLE_VERT_BOTTOM); pTableController->Execute(aRequest); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits