[Libreoffice] [REVIEW] starmath: check for existing edit window

[Michael Meeks]

Hi guys,

On Sat, 2011-07-16 at 01:08 +0200, Jonas Finnemann Jensen wrote:
>         Please let me know if it looks problematic
> Looks great :)

	I'd like to get Miklos' crasher fix pair (just a couple of null pointer
checks) back-ported from libreoffice-3-4 into libreoffice-3-4-2, so far
Jonas, Miklos & myself have approved them.

	I'd like one more approval (they are somewhat trivial) and someone to
pick to libreoffice-3-4-2; patches appended.

	Thanks,

		Michael.

commit aac4ab2af1ea151839e8a41ee9a9ec4d74558367
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Fri Jul 15 18:11:43 2011 +0200

    starmath: check for edit window when inline editing is enabled
    
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>

diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 662911e..c924e31 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -224,7 +224,8 @@ void SmGraphicWindow::GetFocus()
 {
     if (!IsInlineEditEnabled())
         return;
-    pViewShell->GetEditWindow()->Flush();
+    if (pViewShell->GetEditWindow())
+        pViewShell->GetEditWindow()->Flush();
     //Let view shell know what insertions should be done in visual editor
     pViewShell->SetInsertIntoEditWindow(false);
     SetIsCursorVisible(true);

commit b8c8e7627e0ffd75744049228207be344ddb7118
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Thu Jul 14 16:44:32 2011 +0200

    starmath: check for existing edit window
    
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>

diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 3a099c3..662911e 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -195,6 +195,8 @@ void SmGraphicWindow::MouseButtonDown(const MouseEvent& rMEvt)
 
         if (pNode)
         {      SmEditWindow  *pEdit = pViewShell->GetEditWindow();
+            if (!pEdit)
+                return;
             const SmToken  aToken (pNode->GetToken());
 
             // set selection to the beginning of the token


-- 
 michael.meeks at novell.com  <><, Pseudo Engineer, itinerant idiot