mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cid#1358838 cid#1358839 cid#1358840 assert to avoid null pointer dereference

Browse Source 
Change-Id: I95f069cb3efa7137c9382c9d9eb6d1353471d28e
Reviewed-on: https://gerrit.libreoffice.org/24498
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
This commit is contained in:
Miklos Vajna 2016-04-29 17:37:49 +02:00
parent ec51593297
commit c30b5d2a38
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bean/com/sun/star/comp/beans/LocalOfficeConnection.java
View File

@ -310,6 +310,7 @@ public class LocalOfficeConnection
Object aInitialObject = null; Object aInitialObject = null;
try try
{ {
System.out.println("debug, LocalOfficeConnection: mURL is '"+mURL+"'");
aInitialObject = resolve(xLocalContext, mURL); aInitialObject = resolve(xLocalContext, mURL);
} }
catch( com.sun.star.connection.NoConnectException e ) catch( com.sun.star.connection.NoConnectException e )

3
sd/qa/unit/misc-tests.cxx
View File

@ -162,6 +162,7 @@ void SdMiscTest::testTdf99396()
// Set the vertical alignment of the cells to bottom. // Set the vertical alignment of the cells to bottom.
sdr::table::SvxTableController* pTableController = dynamic_cast<sdr::table::SvxTableController*>(pView->getSelectionController().get()); sdr::table::SvxTableController* pTableController = dynamic_cast<sdr::table::SvxTableController*>(pView->getSelectionController().get());
CPPUNIT_ASSERT(pTableController);
SfxRequest aRequest(pViewShell->GetViewFrame(), SID_TABLE_VERT_BOTTOM); SfxRequest aRequest(pViewShell->GetViewFrame(), SID_TABLE_VERT_BOTTOM);
pTableController->Execute(aRequest); pTableController->Execute(aRequest);
// This was 0, it wasn't possible to undo a vertical alignment change. // This was 0, it wasn't possible to undo a vertical alignment change.
@ -178,6 +179,7 @@ void SdMiscTest::testTdf99396TextEdit()
SdPage* pPage = pViewShell->GetActualPage(); SdPage* pPage = pViewShell->GetActualPage();
SdrObject* pObject = pPage->GetObj(0); SdrObject* pObject = pPage->GetObj(0);
auto pTableObject = dynamic_cast<sdr::table::SdrTableObj*>(pObject); auto pTableObject = dynamic_cast<sdr::table::SdrTableObj*>(pObject);
CPPUNIT_ASSERT(pTableObject);
SdrView* pView = pViewShell->GetView(); SdrView* pView = pViewShell->GetView();
pView->MarkObj(pObject, pView->GetSdrPageView()); pView->MarkObj(pObject, pView->GetSdrPageView());
@ -199,6 +201,7 @@ void SdMiscTest::testTdf99396TextEdit()
} }
{ {
auto pTableController = dynamic_cast<sdr::table::SvxTableController*>(pView->getSelectionController().get()); auto pTableController = dynamic_cast<sdr::table::SvxTableController*>(pView->getSelectionController().get());
CPPUNIT_ASSERT(pTableController);
SfxRequest aRequest(pViewShell->GetViewFrame(), SID_TABLE_VERT_BOTTOM); SfxRequest aRequest(pViewShell->GetViewFrame(), SID_TABLE_VERT_BOTTOM);
pTableController->Execute(aRequest); pTableController->Execute(aRequest);
} }