[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - starmath/source
starmath/source/mathmlexport.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 352a728ffbe171ea6f9f8e93e143fa24198d8271
Author: Julien Nabet serval2...@yahoo.fr
Date: Wed Aug 20 23:02:56 2014 +0200
Resolves: fdo#82747 Crash on opening wikipedia ODT Book
Test if there's indeed a subnode before testing its type
Cherry-picked from 3d34eb4612fa59fae7594399d3d6f798ddb35582
Change-Id: I1bb32652ceb82b0818a8d2cd8d71b46dd96ef2aa
Reviewed-on: https://gerrit.libreoffice.org/11050
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
Reviewed-on: https://gerrit.libreoffice.org/11084
Reviewed-by: David Tardon dtar...@redhat.com
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 7fffe8f..7299d08 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -890,6 +890,7 @@ void SmXMLExport::ExportTable(const SmNode *pNode, int
nLevel)
}
else if (pTemp-GetType() == NLINE
pTemp-GetNumSubNodes() == 1
+ pTemp-GetSubNode(0)
pTemp-GetSubNode(0)-GetType() == NALIGN)
{
// For the Table() construction, the NALIGN node is a child
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - starmath/source
starmath/source/ElementsDockingWindow.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2a21807a4ddaaba511e1a0bbd13301b0bc518019
Author: Thomas Arnhold tho...@arnhold.org
Date: Wed May 28 09:40:40 2014 +0200
Related fdo#71616: Set correct BaseSize
BaseSize has to be set in 100th mm, otherwise the scalable
brackets are far too thin.
See starmath/source/cfgitem.cxx:
pFormat-SetBaseSize( Size(0, SmPtsTo100th_mm( nTmp16 )) );
nTmp16 is 12pt - 422 100th mm (at least for me). Let's reuse that.
Change-Id: I69571ae002f790199ab423955b1635eda42096eb
Reviewed-on: https://gerrit.libreoffice.org/9524
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/starmath/source/ElementsDockingWindow.cxx
b/starmath/source/ElementsDockingWindow.cxx
index dc1a3bb..45672dd 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -211,7 +211,7 @@ SmElementsControl::SmElementsControl(Window *pParent, const
ResId rResId) :
mbVerticalMode(true),
mpScroll(new ScrollBar(this, WB_VERT))
{
-maFormat.SetBaseSize(PixelToLogic(Size(0, 24)));
+maFormat.SetBaseSize(PixelToLogic(Size(0, SmPtsTo100th_mm(12;
mpScroll-SetScrollHdl( LINK(this, SmElementsControl, ScrollHdl) );
mpScroll-Show();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - starmath/source
starmath/source/ElementsDockingWindow.cxx | 27 +++
1 file changed, 27 insertions(+)
New commits:
commit 519e4381a0339b638b5fff5141bff31c0f59ffb0
Author: Thomas Arnhold tho...@arnhold.org
Date: Wed May 28 08:57:54 2014 +0200
Resolves: fdo#71616 Elements dock: Better display of scalable braces
Change-Id: I2255be738aa2230b4102030891026f1f9ad2c38f
Reviewed-on: https://gerrit.libreoffice.org/9525
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/starmath/source/ElementsDockingWindow.cxx
b/starmath/source/ElementsDockingWindow.cxx
index 45672dd..aa49662 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -508,6 +508,33 @@ void SmElementsControl::addElements(const sal_uInt16
aElementsArray[][2], sal_uI
addElement(\ + SM_RESSTR(STR_ALIGN_CENTER) + \,
SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
else if (aElementId == RID_ALIGNRX)
addElement(\ + SM_RESSTR(STR_ALIGN_RIGHT) + \,
SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
+
+else if (aElementId == RID_SLRPARENTX)
+addElement(left ( binom{?}{?} right ) ,
SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
+else if (aElementId == RID_SLRBRACKETX)
+addElement(left [ binom{?}{?} right ] ,
SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
+else if (aElementId == RID_SLRDBRACKETX)
+addElement(left ldbracket binom{?}{?} right rdbracket ,
SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
+else if (aElementId == RID_SLRBRACEX)
+addElement(left lbrace binom{?}{?} right rbrace ,
SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
+else if (aElementId == RID_SLRANGLEX)
+addElement(left langle binom{?}{?} right rangle ,
SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
+else if (aElementId == RID_SLRCEILX)
+addElement(left lceil binom{?}{?} right rceil ,
SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
+else if (aElementId == RID_SLRFLOORX)
+addElement(left lfloor binom{?}{?} right rfloor ,
SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
+
+else if (aElementId == RID_SLRLINEX)
+addElement(left lline binom{?}{?} right rline ,
SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
+else if (aElementId == RID_SLRDLINEX)
+addElement(left ldline binom{?}{?} right rdline ,
SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
+else if (aElementId == RID_SLMRANGLEXY)
+addElement(left langle binom{?}{?} mline binom{?}{?}
right rangle , SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
+
+else if (aElementId == RID_XOVERBRACEY)
+addElement({???} overbrace {?} ,
SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
+else if (aElementId == RID_XUNDERBRACEY)
+addElement({???} underbrace {?} ,
SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
else
addElement(SM_RESSTR(aElementId), SM_RESSTR(aElementId),
SM_RESSTR(aElementIdHelp));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - starmath/source
starmath/source/dialog.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f7e32ba07910956bd09d79e37eb8ce6eb8a0ac30 Author: Caolán McNamara caol...@redhat.com Date: Wed Apr 16 13:04:52 2014 +0100 Resolves: fdo#75525 out by one error (cherry picked from commit 12984e46704f1e55f76b210cf65217e54662dc26) Conflicts: starmath/source/dialog.cxx Change-Id: I0171d2a79b6b015fa2f01d78228e901005017fb0 Reviewed-on: https://gerrit.libreoffice.org/9066 Reviewed-by: Kohei Yoshida libreoff...@kohei.us Tested-by: Kohei Yoshida libreoff...@kohei.us diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 73d93ab..fc9641b 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -643,7 +643,7 @@ SmCategoryDesc::SmCategoryDesc(VclBuilderContainer rBuilder, sal_uInt16 nCatego Graphics [i] = 0; } -const FieldMinMax rMinMax = pMinMaxData[ nCategoryIdx ][i]; +const FieldMinMax rMinMax = pMinMaxData[ nCategoryIdx-1 ][i]; Value[i] = Minimum[i] = rMinMax.nMin; Maximum[i] = rMinMax.nMax; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - starmath/source
starmath/source/ooxmlexport.cxx | 21 +
1 file changed, 17 insertions(+), 4 deletions(-)
New commits:
commit cde6d800698522a804dc8f82c158ce7e0c3e05f5
Author: Dinesh Patil dinesh.pa...@synerzip.com
Date: Wed Mar 12 20:04:16 2014 +0530
fdo#76078: LO Crashes while saving the docx file containing only opening
brace
- System handles an equation having opening brace and closing brace.
- Whereas it fails to handle equations having only opening brace and no
closing
brace, due to which LO crashes with assertion while exporting.
- Fixed this issue and added unit test case for the same.
- Also fixed the same for closing brace alone.
Reviewed-on: https://gerrit.libreoffice.org/8561
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
(cherry picked from commit ade1641ab632565820ede720b6151435aca4dd78)
Signed-off-by: Michael Stahl mst...@redhat.com
Conflicts:
sw/qa/extras/inc/swmodeltestbase.hxx
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I34a8a635b42bfdfac265fb70b977c0001cd2b4ff
diff --git a/starmath/source/ooxmlexport.cxx b/starmath/source/ooxmlexport.cxx
index 8d1c808..0a98d98 100644
--- a/starmath/source/ooxmlexport.cxx
+++ b/starmath/source/ooxmlexport.cxx
@@ -453,8 +453,15 @@ void SmOoxmlExport::HandleBrace( const SmBraceNode* pNode,
int nLevel )
{
m_pSerializer-startElementNS( XML_m, XML_d, FSEND );
m_pSerializer-startElementNS( XML_m, XML_dPr, FSEND );
-m_pSerializer-singleElementNS( XML_m, XML_begChr,
-FSNS( XML_m, XML_val ), mathSymbolToString(
pNode-OpeningBrace()).getStr(), FSEND );
+
+//check if the node has an opening brace
+if( TNONE == pNode-GetSubNode(0)-GetToken().eType )
+m_pSerializer-singleElementNS( XML_m, XML_begChr,
+FSNS( XML_m, XML_val ), , FSEND );
+else
+m_pSerializer-singleElementNS( XML_m, XML_begChr,
+FSNS( XML_m, XML_val ), mathSymbolToString(
pNode-OpeningBrace()).getStr(), FSEND );
+
std::vector const SmNode* subnodes;
if( pNode-Body()-GetType() == NBRACEBODY )
{
@@ -479,8 +486,14 @@ void SmOoxmlExport::HandleBrace( const SmBraceNode* pNode,
int nLevel )
}
else
subnodes.push_back( pNode-Body());
-m_pSerializer-singleElementNS( XML_m, XML_endChr,
-FSNS( XML_m, XML_val ), mathSymbolToString(
pNode-ClosingBrace()).getStr(), FSEND );
+
+if( TNONE == pNode-GetSubNode(2)-GetToken().eType )
+m_pSerializer-singleElementNS( XML_m, XML_endChr,
+FSNS( XML_m, XML_val ), , FSEND );
+else
+m_pSerializer-singleElementNS( XML_m, XML_endChr,
+FSNS( XML_m, XML_val ), mathSymbolToString(
pNode-ClosingBrace()).getStr(), FSEND );
+
m_pSerializer-endElementNS( XML_m, XML_dPr );
for( unsigned int i = 0; i subnodes.size(); ++i )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - starmath/source
starmath/source/commands.src | 38 +++---
1 file changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 7e78ca35dd80d2330cfc4e6ede7a1139b136a673
Author: Andras Timar andras.ti...@collabora.com
Date: Mon Jan 6 10:57:16 2014 +0100
Typo fixes in Math tooltips
Change-Id: I7623fd53dd60fdfd9afb99135b79adfb434aa72a
diff --git a/starmath/source/commands.src b/starmath/source/commands.src
index 950c582..a51eae2 100644
--- a/starmath/source/commands.src
+++ b/starmath/source/commands.src
@@ -48,7 +48,7 @@ String RID_NEGX_HELP
String RID_XPLUSY { Text = ? + ? ; };
String RID_XPLUSY_HELP
{
-Text [ en-US ] = Addition + ;
+Text [ en-US ] = Addition + ;
};
String RID_XMINUSY { Text = ? - ? ; };
String RID_XMINUSY_HELP
@@ -281,7 +281,7 @@ String RID_FACTX_HELP
String RID_SQRTX{ Text = sqrt{?} ; };
String RID_SQRTX_HELP
{
-Text [ en-US ] = Square Root ;
+Text [ en-US ] = Square Root ;
};
String RID_NROOTXY { Text = nroot{?}{?} ; };
String RID_NROOTXY_HELP
@@ -336,7 +336,7 @@ String RID_ARCSINX_HELP
String RID_ARCCOSX { Text = arccos(?) ; };
String RID_ARCCOSX_HELP
{
-Text [ en-US ] = Arccosise ;
+Text [ en-US ] = Arccosine ;
};
String RID_ARCTANX { Text = arctan(?) ; };
String RID_ARCTANX_HELP
@@ -401,7 +401,7 @@ String RID_SUM_FROMX_HELP
String RID_SUM_TOX { Text = sum to{?} ? ; };
String RID_SUM_TOX_HELP
{
-Text [ en-US ] = Sum SuperScript Top ;
+Text [ en-US ] = Sum Superscript Top ;
};
String RID_SUM_FROMTOX { Text = sum from{?} to{?} ? ; };
String RID_SUM_FROMTOX_HELP
@@ -436,7 +436,7 @@ String RID_COPRODX_HELP
String RID_COPROD_FROMX { Text = coprod from{?} ? ; };
String RID_COPROD_FROMX_HELP
{
-Text [ en-US ] = Coproduct ;
+Text [ en-US ] = Coproduct Subscript Bottom ;
};
String RID_COPROD_TOX { Text = coprod to{?} ? ; };
String RID_COPROD_TOX_HELP
@@ -456,24 +456,24 @@ String RID_LIMX_HELP
String RID_LIM_FROMX{ Text = lim from{?} ? ; };
String RID_LIM_FROMX_HELP
{
-Text [ en-US ] = Lime Subscript Bottom ;
+Text [ en-US ] = Limes Subscript Bottom ;
};
String RID_LIM_TOX { Text = lim to{?} ? ; };
String RID_LIM_TOX_HELP
{
-Text [ en-US ] = Lime Superscript Top ;
+Text [ en-US ] = Limes Superscript Top ;
};
String RID_LIM_FROMTOX { Text = lim from{?} to{?} ? ; };
String RID_LIM_FROMTOX_HELP
{
-Text [ en-US ] = Lime Sup/Sub script ;
+Text [ en-US ] = Limes Sup/Sub script ;
};
String RID_LIMINFX { Text = liminf ? ; };
String RID_LIMSUPX { Text = limsup ? ; };
String RID_EXISTS { Text = exists ; };
String RID_EXISTS_HELP
{
-Text [ en-US ] = There exists ;
+Text [ en-US ] = There Exists ;
};
String RID_NOTEXISTS{ Text = notexists ; };
String RID_NOTEXISTS_HELP
@@ -493,7 +493,7 @@ String RID_INTX_HELP
String RID_INT_FROMX{ Text = int from{?} ? ; };
String RID_INT_FROMX_HELP
{
-Text [ en-US ] = Integral Subscript Top ;
+Text [ en-US ] = Integral Subscript Bottom ;
};
String RID_INT_TOX { Text = int to{?} ? ; };
String RID_INT_TOX_HELP
@@ -603,7 +603,7 @@ String RID_LLLINT_TOX_HELP
String RID_LLLINT_FROMTOX { Text = lllint from{?} to{?} ? ; };
String RID_LLLINT_FROMTOX_HELP
{
-Text [ en-US ] = Trile Curve Integral Sup/Sub script ;
+Text [ en-US ] = Triple Curve Integral Sup/Sub script ;
};
String RID_FROMX{ Text = from{?} ? ; };
String RID_TOX { Text = to{?} ? ; };
@@ -646,7 +646,7 @@ String RID_DDOTX_HELP
String RID_DDDOTX { Text = dddot ? ; };
String RID_DDDOTX_HELP
{
-Text [ en-US ] = Triple Dot ;
+Text [ en-US ] = Triple Dot ;
};
String RID_GRAVEX { Text = grave ? ; };
String RID_GRAVEX_HELP
@@ -752,12 +752,12 @@ String RID_LRGROUPX_HELP
String RID_LRPARENTX{ Text = (?) ; };
String RID_LRPARENTX_HELP
{
-Text [ en-US ] = Round Brackets (Scalable) ;
+Text [ en-US ] = Round Brackets ;
};
String RID_LRBRACKETX { Text = [?] ; };
String RID_LRBRACKETX_HELP
{
-Text [ en-US ] = Square Brackets (Scalable) ;
+Text [ en-US ] = Square Brackets ;
};
String RID_LRDBRACKETX { Text = ldbracket ? rdbracket ; };
String RID_LRDBRACKETX_HELP
@@ -827,12 +827,12 @@ String RID_SLRANGLEX_HELP
String RID_SLRCEILX { Text = left lceil ? right rceil ; };
String RID_SLRCEILX_HELP
{
-Text [ en-US ] = Minor ceil ;
+Text [ en-US ] = Ceiling (Scalable) ;
};
String RID_SLRFLOORX{ Text = left lfloor ? right rfloor ; };
String RID_SLRFLOORX_HELP
{
-Text [ en-US ] = Minor floor ;
+Text [ en-US ] = Floor (Scalable) ;
};
String RID_SLRLINEX { Text = left lline ? right rline ; };
String RID_SLRLINEX_HELP
@@ -902,7 +902,7 @@ String RID_BLANK_HELP
String RID_NEWLINE { Text = newline ; };
String
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - starmath/source
starmath/source/unomodel.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 710fa2954a67d4a5277cb16a3d9b513ca679cbd5 Author: Arnaud Versini arnaud.vers...@gmail.com Date: Sat Jan 4 12:16:23 2014 +0100 Resolve fdo#72632 by adding missing break Change-Id: I7e27b685f2e6e1e1b96aee907f4c634252b0e17b Reviewed-on: https://gerrit.libreoffice.org/7270 Tested-by: Arnaud Versini arnaud.vers...@libreoffice.org Reviewed-by: Arnaud Versini arnaud.vers...@libreoffice.org (cherry picked from commit bdc192739892114e8b159a8af185ff28b873e748) Reviewed-on: https://gerrit.libreoffice.org/7271 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index f2a4eab..4e01de5 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -945,6 +945,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu *pValue = static_castsal_Int32( pDocSh-pTree-GetFormulaBaseline() ); } +break; } case HANDLE_INTEROP_GRAB_BAG: getGrabBagItem(*pValue); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - starmath/source
starmath/source/commands.src | 1120 ++-
1 file changed, 896 insertions(+), 224 deletions(-)
New commits:
commit 241eef7ca9b863ceb1f7f457a4bb2931b5d37f17
Author: Andras Timar andras.ti...@collabora.com
Date: Sat Dec 28 21:22:45 2013 +0100
fdo#73008 enable localization of tooltips in Math Elements Dock
Change-Id: Ia30f9884bd95c14116bc52f0c4cf7107f2238653
diff --git a/starmath/source/commands.src b/starmath/source/commands.src
index b66b97e..950c582 100644
--- a/starmath/source/commands.src
+++ b/starmath/source/commands.src
@@ -21,468 +21,1140 @@
#include starmath.hrc
String RID_PLUSX{ Text = +? ; };
-String RID_PLUSX_HELP { Text = + Sign ; };
+String RID_PLUSX_HELP
+{
+Text [ en-US ] = + Sign ;
+};
String RID_MINUSX { Text = -? ; };
-String RID_MINUSX_HELP { Text = - Sign ; };
+String RID_MINUSX_HELP
+{
+Text [ en-US ] = - Sign ;
+};
String RID_PLUSMINUSX { Text = +-? ; };
-String RID_PLUSMINUSX_HELP { Text = +- Sign ; };
+String RID_PLUSMINUSX_HELP
+{
+Text [ en-US ] = +- Sign ;
+};
String RID_MINUSPLUSX { Text = -+? ; };
-String RID_MINUSPLUSX_HELP { Text = -+ Sign ; };
+String RID_MINUSPLUSX_HELP
+{
+Text [ en-US ] = -+ Sign ;
+};
String RID_NEGX { Text = neg ? ; };
-String RID_NEGX_HELP{ Text = Boolean NOT ; };
+String RID_NEGX_HELP
+{
+Text [ en-US ] = Boolean NOT ;
+};
String RID_XPLUSY { Text = ? + ? ; };
-String RID_XPLUSY_HELP { Text = Addition + ; };
+String RID_XPLUSY_HELP
+{
+Text [ en-US ] = Addition + ;
+};
String RID_XMINUSY { Text = ? - ? ; };
-String RID_XMINUSY_HELP { Text = Subtraction - ; };
+String RID_XMINUSY_HELP
+{
+Text [ en-US ] = Subtraction - ;
+};
String RID_XCDOTY { Text = ? cdot ? ; };
-String RID_XCDOTY_HELP { Text = Multiplication (Dot) ; };
+String RID_XCDOTY_HELP
+{
+Text [ en-US ] = Multiplication (Dot) ;
+};
String RID_XTIMESY { Text = ? times ? ; };
-String RID_XTIMESY_HELP { Text = Multiplication (x) ; };
+String RID_XTIMESY_HELP
+{
+Text [ en-US ] = Multiplication (x) ;
+};
String RID_XSYMTIMESY { Text = ? * ? ; };
-String RID_XSYMTIMESY_HELP { Text = Multiplication (*) ; };
+String RID_XSYMTIMESY_HELP
+{
+Text [ en-US ] = Multiplication (*) ;
+};
String RID_XSYMDIVIDEY { Text = ? / ? ; };
-String RID_XSYMDIVIDEY_HELP { Text = Division (Slash) ; };
+String RID_XSYMDIVIDEY_HELP
+{
+Text [ en-US ] = Division (Slash) ;
+};
String RID_XDIVY{ Text = ? div ? ; };
-String RID_XDIVY_HELP { Text = Division (÷) ; };
+String RID_XDIVY_HELP
+{
+Text [ en-US ] = Division (÷) ;
+};
String RID_XOVERY { Text = {?} over {?} ; };
-String RID_XOVERY_HELP { Text = Division (Fraction) ; };
+String RID_XOVERY_HELP
+{
+Text [ en-US ] = Division (Fraction) ;
+};
String RID_XODIVIDEY{ Text = ? odivide ? ; };
String RID_XODOTY { Text = ? odot ? ; };
String RID_XOMINUSY { Text = ? ominus ? ; };
String RID_XOPLUSY { Text = ? oplus ? ; };
String RID_XOTIMESY { Text = ? otimes ? ; };
String RID_XANDY{ Text = ? and ? ; };
-String RID_XANDY_HELP { Text = Boolean AND ; };
+String RID_XANDY_HELP
+{
+Text [ en-US ] = Boolean AND ;
+};
String RID_XORY { Text = ? or ? ; };
-String RID_XORY_HELP{ Text = Boolean OR ; };
+String RID_XORY_HELP
+{
+Text [ en-US ] = Boolean OR ;
+};
String RID_XEQY { Text = ? = ? ; };
-String RID_XEQY_HELP{ Text = Is Equal ; };
+String RID_XEQY_HELP
+{
+Text [ en-US ] = Is Equal ;
+};
String RID_XNEQY{ Text = ? ? ; };
-String RID_XNEQY_HELP { Text = Is Not Equal ; };
+String RID_XNEQY_HELP
+{
+Text [ en-US ] = Is Not Equal ;
+};
String RID_XLTY { Text = ? ? ; };
-String RID_XLTY_HELP{ Text = Is Less Than ; };
+String RID_XLTY_HELP
+{
+Text [ en-US ] = Is Less Than ;
+};
String RID_XGTY { Text = ? ? ; };
-String RID_XGTY_HELP{ Text = Is Greater Than ; };
+String RID_XGTY_HELP
+{
+Text [ en-US ] = Is Greater Than ;
+};
String RID_XLEY { Text = ? = ? ; };
-String RID_XLEY_HELP{ Text = Is Less Than Or Equal To ; };
+String RID_XLEY_HELP
+{
+Text [ en-US ] = Is Less Than Or Equal To ;
+};
String RID_XGEY { Text = ? = ? ; };
-String RID_XGEY_HELP{ Text = Is Greater Than Or Equal To ; };
+String RID_XGEY_HELP
+{
+Text [ en-US ] = Is Greater Than Or Equal To ;
+};
String RID_XLESLANTY{ Text = ? leslant ? ; };
-String RID_XLESLANTY_HELP { Text = Is Less Than Or Equal To ; };
+String RID_XLESLANTY_HELP
+{
+Text [ en-US ] = Is Less Than Or Equal To ;
+};
String RID_XGESLANTY{ Text = ? geslant ? ; };
-String RID_XGESLANTY_HELP { Text = Is Greater Than Or Equal To ; };
+String RID_XGESLANTY_HELP
+{
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - starmath/source sw/CppunitTest_sw_filters_test.mk sw/qa
starmath/source/parse.cxx | 38 +++---
sw/CppunitTest_sw_filters_test.mk |1
sw/qa/core/data/rtf/pass/fdo61638.rtf | 31 +++
3 files changed, 54 insertions(+), 16 deletions(-)
New commits:
commit 4d2be4e7fa811db504a0fade72514b514ac84c96
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Dec 17 10:07:10 2013 +0100
fdo#61638 SmParser::NextToken: don't crash on ending dot
Change-Id: Ia9c168e52a99286910c9e63e0e052671c5259ba8
(cherry picked from commit cdd59ee13b1dca7e3d269bf1a3c555903eee96ee)
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 5a79bbb..98b579a 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -872,24 +872,30 @@ void SmParser::NextToken()
break;
case '.':
{
-// for compatibility with SO5.2
-// texts like .34 ...56 ... h ...78..90
-// will be treated as numbers
-m_aCurToken.eType = TNUMBER;
-m_aCurToken.cMathChar = '\0';
-m_aCurToken.nGroup = 0;
-m_aCurToken.nLevel= 5;
-
-sal_Int32 nTxtStart = m_nBufferIndex;
-sal_Unicode cChar;
-do
+// Only one character? Then it can't be a number.
+if (m_nBufferIndex m_aBufferString.getLength() - 1)
{
-cChar = m_aBufferString[ ++m_nBufferIndex ];
+// for compatibility with SO5.2
+// texts like .34 ...56 ... h ...78..90
+// will be treated as numbers
+m_aCurToken.eType = TNUMBER;
+m_aCurToken.cMathChar = '\0';
+m_aCurToken.nGroup = 0;
+m_aCurToken.nLevel= 5;
+
+sal_Int32 nTxtStart = m_nBufferIndex;
+sal_Unicode cChar;
+do
+{
+cChar = m_aBufferString[ ++m_nBufferIndex ];
+}
+while ( cChar == '.' || rtl::isAsciiDigit( cChar )
);
+
+m_aCurToken.aText = m_aBufferString.copy(
nTxtStart, m_nBufferIndex - nTxtStart );
+aRes.EndPos = m_nBufferIndex;
}
-while ( cChar == '.' || rtl::isAsciiDigit( cChar ) );
-
-m_aCurToken.aText = m_aBufferString.copy( nTxtStart,
m_nBufferIndex - nTxtStart );
-aRes.EndPos = m_nBufferIndex;
+else
+bHandled = false;
}
break;
case '/':
diff --git a/sw/CppunitTest_sw_filters_test.mk
b/sw/CppunitTest_sw_filters_test.mk
index 0cc65fd..1e96a5c 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -70,6 +70,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
sax/source/expatwrap/expwrap \
sax/source/fastparser/fastsax \
sfx2/util/sfx \
+ starmath/util/sm \
svtools/util/svt \
sw/util/msword \
sw/util/sw \
diff --git a/sw/qa/core/data/rtf/pass/fdo61638.rtf
b/sw/qa/core/data/rtf/pass/fdo61638.rtf
new file mode 100644
index 000..e85245b
--- /dev/null
+++ b/sw/qa/core/data/rtf/pass/fdo61638.rtf
@@ -0,0 +1,31 @@
+{\rtf1
+{\mmath
+{\*\moMathPara
+{\*\moMath
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\f34\insrsid7877010
\hich\af34\dbch\af31505\loch\f34
+{\mr\mscr0\msty2 a}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\f34\insrsid7877010
\hich\af34\dbch\af31505\loch\f34
+{\mr\mscr0\msty2 =}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\f34\insrsid7877010
\hich\af34\dbch\af31505\loch\f34
+{\mr\mscr0\msty2 b}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\f34\insrsid7877010
\hich\af34\dbch\af31505\loch\f34
+{\mr\mscr0\msty2 +}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\f34\insrsid7877010
\hich\af34\dbch\af31505\loch\f34
+{\mr\mscr0\msty2 c}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\f34\insrsid7877010
\hich\af34\dbch\af31505\loch\f34
+{\mr\mscr0\msty2 +}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\f34\insrsid7877010
\hich\af34\dbch\af31505\loch\f34
+{\mr\mscr0\msty2 d}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\f34\insrsid7877010 .}
+}
+}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid7877010 \par }
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - starmath/source
starmath/source/commands.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b4da3c26521b5b20a792c1913ee26ff846d166f0
Author: Andras Timar andras.ti...@collabora.com
Date: Thu Dec 5 18:08:07 2013 +0100
typo: Align Right - Align Left
Change-Id: I8a347394bff7767a8d2b1b548ea9d9b8848bb1ae
diff --git a/starmath/source/commands.src b/starmath/source/commands.src
index cf52574..b66b97e 100644
--- a/starmath/source/commands.src
+++ b/starmath/source/commands.src
@@ -389,7 +389,7 @@ String RID_STACK_HELP { Text = Vertical Stack ; };
String RID_MATRIX { Text = matrix{? # ? ## ? # ?} ; };
String RID_MATRIX_HELP { Text = Matrix Stack ; };
String RID_ALIGNLX { Text = alignl ? ; };
-String RID_ALIGNLX_HELP { Text = Align Right ; };
+String RID_ALIGNLX_HELP { Text = Align Left ; };
String RID_ALIGNCX { Text = alignc ? ; };
String RID_ALIGNCX_HELP { Text = Align Center ; };
String RID_ALIGNRX { Text = alignr ? ; };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
