sd/qa/unit/import-tests.cxx | 1 + vcl/unx/generic/window/salframe.cxx | 9 +-------- 2 files changed, 2 insertions(+), 8 deletions(-)
New commits: commit 930fc5958a40d92d15bfd27297bb4dacd2b07e49 Author: Caolán McNamara <caol...@redhat.com> Date: Sat Mar 21 21:37:17 2015 +0000 coverity#1291169 dead code Change-Id: I6287b234140cfa848a87f77dbd0a1809b8f60a86 diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index c5aa6b8..e7a5cf8 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -3745,8 +3745,6 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent ) ::Window hWM_Parent; ::Window hRoot, *Children, hDummy; unsigned int nChildren; - bool bNone = false; - bool bAccessParentWindow = true; static const char* pDisableStackingCheck = getenv( "SAL_DISABLE_STACKING_CHECK" ); @@ -3784,11 +3782,7 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent ) if( hDummy == hWM_Parent ) hDummy = hRoot; if( hDummy != hRoot ) - { hWM_Parent = hDummy; - if( bAccessParentWindow && bNone ) - XSetWindowBackgroundPixmap( pDisplay, hWM_Parent, None ); - } if( Children ) XFree( Children ); } while( hDummy != hRoot ); @@ -3800,8 +3794,7 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent ) ) { mhStackingWindow = hWM_Parent; - if (bAccessParentWindow) - XSelectInput( pDisplay, GetStackingWindow(), StructureNotifyMask ); + XSelectInput( pDisplay, GetStackingWindow(), StructureNotifyMask ); } if( hWM_Parent == pDisplay_->GetRootWindow( pDisplay_->GetDefaultXScreen() ) commit 5b286a7132608088af5c622ca921a4a887ece88d Author: Caolán McNamara <caol...@redhat.com> Date: Sat Mar 21 21:31:04 2015 +0000 coverity#1291170 unchecked dynamic_cast Change-Id: I6d141fcaff4877cfee6400f104d3c41fd967d6f3 diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 5d68859..cdfdd30 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -1133,6 +1133,7 @@ void SdImportTest::testBulletSuffix() CPPUNIT_ASSERT_MESSAGE( "no text object", pTxtObj != NULL); const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject(); const SvxNumBulletItem *pNumFmt = dynamic_cast<const SvxNumBulletItem *>(aEdit.GetParaAttribs(1).GetItem(EE_PARA_NUMBULLET)); + CPPUNIT_ASSERT(pNumFmt); CPPUNIT_ASSERT_EQUAL_MESSAGE( "Bullet's suffix is wrong!", OUString(pNumFmt->GetNumRule()->GetLevel(0).GetSuffix()), OUString("") ); xDocShRef->DoClose(); }
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits