summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-04-29 17:37:49 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-04-29 16:18:15 +0000
commitc30b5d2a382162be94e6a6ac5d5794a074ebfaaa (patch)
tree0888dd263962d24a4d8fb994a902af8e4efa201d
parentWhat is bin/distro-install-file-lists supposed to do? (diff)
downloadcore-c30b5d2a382162be94e6a6ac5d5794a074ebfaaa.tar.gz
core-c30b5d2a382162be94e6a6ac5d5794a074ebfaaa.zip
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 <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
-rw-r--r--bean/com/sun/star/comp/beans/LocalOfficeConnection.java1
-rw-r--r--sd/qa/unit/misc-tests.cxx3
2 files changed, 4 insertions, 0 deletions
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index c2d17b7c0e33..6132b7624fab 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 f2ac807f1bab..bc73b5f33a21 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);
}