starmath/uiconfig/smath/ui/smathsettings.ui | 2 +- sw/source/filter/ww8/ww8par.cxx | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-)
New commits: commit 8eb5dce78943da38d73838b564117c4307b4fcb7 Author: Andras Timar <andras.ti...@collabora.com> Date: Tue Jul 8 14:42:14 2014 +0200 fdo#81036 escape ~ in .ui and fix a typo (straight apostrophe) Change-Id: I652dc63cc0e8fb04d7c3115d66d60dabda60f0f4 (cherry picked from commit 4861e4961f7dc4f28a14c5f9d9b969456bfec720) Reviewed-on: https://gerrit.libreoffice.org/10143 Reviewed-by: Matúš Kukan <matus.ku...@collabora.com> Tested-by: Matúš Kukan <matus.ku...@collabora.com> diff --git a/starmath/uiconfig/smath/ui/smathsettings.ui b/starmath/uiconfig/smath/ui/smathsettings.ui index 1b983c2..38fee44 100644 --- a/starmath/uiconfig/smath/ui/smathsettings.ui +++ b/starmath/uiconfig/smath/ui/smathsettings.ui @@ -239,7 +239,7 @@ <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="norightspaces"> - <property name="label" translatable="yes">Ig_nore ~ and ` at the end of the line</property> + <property name="label" translatable="yes">Ig_nore ~~ and ' at the end of the line</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> commit f61ea10dde1b7e3173a96d40c2725e76765cfbc4 Author: Michael Stahl <mst...@redhat.com> Date: Tue Jul 8 13:05:41 2014 +0200 sw: do more input validation in SwWW8ImplReader::Read_And (to fix up f2945255df273404ee2457dcf761cb8f334b732b) Change-Id: Ie20fb9db4515b9737322ec7224ecd7e411d31c03 (cherry picked from commit ae2e7ad276acb9394691a9d4a702ed7a6b07b508) Reviewed-on: https://gerrit.libreoffice.org/10137 Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk> Tested-by: Miklos Vajna <vmik...@collabora.co.uk> diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index c3e29c3..9224568 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -2179,7 +2179,9 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes) //that relate to each annotation index as the parser passes //those points. sal_Int32 nLen = nEnd - nStart; - if( nLen ) + // the start and end positions are apparently stored in + // different arrays, so in an invalid file only one could exist + if(SAL_MAX_INT32 != nEnd && SAL_MAX_INT32 != nStart && nLen > 0) { if (pPaM->GetPoint()->nContent.GetIndex() >= nLen) {
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits