[Libreoffice-commits] core.git: 2 commits - basctl/source embeddedobj/source

[Lionel Elie Mamane]

 basctl/source/basicide/baside2b.cxx      |    3 ++-
 embeddedobj/source/general/docholder.cxx |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit a58affd7709c439216ead5d3d79a50d580895494
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Thu Mar 5 11:06:28 2015 +0100

    protect against NULL current SfxViewShell
    
    Change-Id: I748493de799902f5acf905c7ce919e3ebbf1a800

diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 0b60a6f..8e0fe9f 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -508,7 +508,8 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
 #endif
     bool const bWasModified = pEditEngine->IsModified();
     // see if there is an accelerator to be processed first
-    bool bDone = SfxViewShell::Current()->KeyInput( rKEvt );
+    SfxViewShell *pVS( SfxViewShell::Current());
+    bool bDone = pVS && pVS->KeyInput( rKEvt );
 
     if( pCodeCompleteWnd->IsVisible() && CodeCompleteOptions::IsCodeCompleteOn() )
     {
commit 8992def7c010d001052b11ec6400b1847dcad774
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Thu Mar 5 11:28:09 2015 +0100

    More helpful exception message
    
    Change-Id: I63dcc98667ebfc94cc16407d283e65e1514d89fb

diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 753ba2d..7fb23f8 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -1121,7 +1121,7 @@ void SAL_CALL DocumentHolder::queryClosing( const lang::EventObject& aSource, sa
         throw (util::CloseVetoException, uno::RuntimeException, std::exception)
 {
     if ( m_xComponent.is() && m_xComponent == aSource.Source && !m_bAllowClosing )
-        throw util::CloseVetoException();
+        throw util::CloseVetoException("To close an embedded document, close the document holder (document definition), not the document itself.", static_cast< ::cppu::OWeakObject*>(this));
 }