[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - starmath/source

[Oliver Specht]

 starmath/source/node.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit cda827958eefb636a4dbe57e1df7d21b5878171f
Author: Oliver Specht 
Date:   Fri Feb 26 10:40:45 2016 +0100

tdf#98088: prevent access to invalid sub node

Change-Id: I73bd77682bfb60474ba18ca85bc5d008c70a7f97
Reviewed-on: https://gerrit.libreoffice.org/22715
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 529e06a1b855ac83468230a15903aeafe1ac89a7)

diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index a1847ef..dc021cb 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -2066,7 +2066,8 @@ void SmFontNode::CreateTextFromNode(OUString )
 default:
 break;
 }
-GetSubNode(1)->CreateTextFromNode(rText);
+if(GetNumSubNodes() > 1)
+GetSubNode(1)->CreateTextFromNode(rText);
 }
 
 void SmFontNode::Prepare(const SmFormat , const SmDocShell )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - starmath/source

[Takeshi Abe]

 starmath/source/dialog.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 46dac6598b066a43db851a5764778cfa1207e97d
Author: Takeshi Abe 
Date:   Fri Mar 11 19:50:59 2016 +0900

Resolves tdf#88485: Allow to select rightmost symbols in the dialog

by adjusting target area with proper offsets.

Change-Id: I66100c898354909623991c3af3e78287d6f5a9a0
Reviewed-on: https://gerrit.libreoffice.org/23147
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit e7e1d50fc0c8077be9d9603eab8ef86098c9aa24)
Reviewed-on: https://gerrit.libreoffice.org/23158

diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index e043179..6a97fba 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -1185,6 +1185,8 @@ void SmShowSymbolSetWindow::MouseButtonDown(const 
MouseEvent& rMEvt)
 GrabFocus();
 
 Size aOutputSize(nColumns * nLen, nRows * nLen);
+aOutputSize.Width() += nXOffset;
+aOutputSize.Height() += nYOffset;
 Point aPoint(rMEvt.GetPosPixel());
 aPoint.X() -= nXOffset;
 aPoint.Y() -= nYOffset;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits