sfx2/source/appl/childwin.cxx | 7 ++++++- sfx2/source/inc/workwin.hxx | 1 + sw/source/core/unocore/unoframe.cxx | 4 ---- 3 files changed, 7 insertions(+), 5 deletions(-)
New commits: commit 8f99f936326342566067c849fbf27867825b81cf Author: Caolán McNamara <caol...@redhat.com> Date: Fri Jun 5 10:36:32 2015 +0100 Resolves: tdf#91864 unset a dying childwindow as the active window Change-Id: Ief014895facbc092913b3069ed04cace1e233ff0 diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 673b0c1..3346ac2 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -177,7 +177,12 @@ void SfxChildWindow::Destroy() { if ( GetFrame().is() ) { - pImp->pWorkWin = NULL; + if (pImp->pWorkWin) + { + if (pImp->pWorkWin->GetActiveChild_Impl() == pWindow) + pImp->pWorkWin->SetActiveChild_Impl(NULL); + pImp->pWorkWin = NULL; + } try { ::com::sun::star::uno::Reference < ::com::sun::star::util::XCloseable > xClose( GetFrame(), ::com::sun::star::uno::UNO_QUERY ); diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index 7233fe6..9574b67 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -322,6 +322,7 @@ public: bool IsVisible_Impl( sal_uInt16 nMode ) const; bool IsFloating( sal_uInt16 nId ); void SetActiveChild_Impl( vcl::Window *pChild ); + VclPtr<vcl::Window> GetActiveChild_Impl() const { return pActiveChild; } bool ActivateNextChild_Impl( bool bForward = true ); bool AllowChildWindowCreation_Impl( const SfxChildWin_Impl& i_rCW ) const; commit f170b307f6a0f98a3ef5670f64c14d89cfa0fb33 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Jun 5 12:47:41 2015 +0100 fix OSL_DEBUG_LEVEL > 1 build Change-Id: If0a98411e5cbcc3411c8b1135df2848563cf320c diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 4ad4ef8..9a58928 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -3251,10 +3251,6 @@ uno::Reference< text::XTextCursor > SwXTextFrame::createTextCursor() throw( uno SwXTextCursor *const pXCursor = new SwXTextCursor( *pFormat->GetDoc(), this, CURSOR_FRAME, *aPam.GetPoint()); aRef = static_cast<text::XWordCursor*>(pXCursor); -#if OSL_DEBUG_LEVEL > 1 - SwUnoCrsr *const pUnoCrsr = pXCursor->GetCursor(); - (void) pUnoCrsr; -#endif } else throw uno::RuntimeException();
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits