[Libreoffice-commits] core.git: officecfg/registry starmath/qa

[Julien Nabet]

 officecfg/registry/schema/org/openoffice/Office/Math.xcs |    2 +-
 starmath/qa/cppunit/test_node.cxx                        |   10 +++++-----
 starmath/qa/extras/mmlexport-test.cxx                    |    6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 68155a68578a0f4066c1c566c2d378bbae05c216
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Jan 23 21:30:11 2017 +0100

    tdf#105483: let's put lowercase Greek letter in italic
    
    and let uppercase one in non italic
    See comments from tdf#52225 in addition to initial description of this one
    
    + adapt QA tests associated (keep on to test "0" case)
    
    Change-Id: Ia84685fc5d336dd96b97d02c0e81f92e7966a6f1
    Reviewed-on: https://gerrit.libreoffice.org/33480
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Takeshi Abe <tabe at fixedpoint.jp>

diff --git a/officecfg/registry/schema/org/openoffice/Office/Math.xcs b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
index c89c779..75d88ec 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Math.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
@@ -412,7 +412,7 @@
             </info>
           </maxInclusive>
         </constraints>
-        <value>0</value>
+        <value>2</value>
       </prop>
       <prop oor:name="ScaleNormalBracket" oor:type="xs:boolean" oor:nillable="false">
         <!-- OldPath: Math/StandardFormat -->
diff --git a/starmath/qa/cppunit/test_node.cxx b/starmath/qa/cppunit/test_node.cxx
index fbeca91..68396b7 100644
--- a/starmath/qa/cppunit/test_node.cxx
+++ b/starmath/qa/cppunit/test_node.cxx
@@ -105,10 +105,10 @@ void NodeTest::testTdf52225()
     } while (false)
 
     SmFormat aFormat = mxDocShell->GetFormat();
-    CPPUNIT_ASSERT_EQUAL(sal_Int16(0), aFormat.GetGreekCharStyle()); // default format
+    CPPUNIT_ASSERT_EQUAL(sal_Int16(2), aFormat.GetGreekCharStyle()); // default format = 2
     CHECK_GREEK_SYMBOL("%ALPHA", 0x0391, false);
     CHECK_GREEK_SYMBOL("%iALPHA", 0x0391, true);
-    CHECK_GREEK_SYMBOL("%alpha", 0x03b1, false);
+    CHECK_GREEK_SYMBOL("%alpha", 0x03b1, true);
     CHECK_GREEK_SYMBOL("%ialpha", 0x03b1, true);
 
     // mode 1
@@ -119,12 +119,12 @@ void NodeTest::testTdf52225()
     CHECK_GREEK_SYMBOL("%beta", 0x03b2, true);
     CHECK_GREEK_SYMBOL("%ibeta", 0x03b2, true);
 
-    // mode 2
-    aFormat.SetGreekCharStyle(2);
+    // mode 0
+    aFormat.SetGreekCharStyle(0);
     mxDocShell->SetFormat(aFormat);
     CHECK_GREEK_SYMBOL("%GAMMA", 0x0393, false);
     CHECK_GREEK_SYMBOL("%iGAMMA", 0x0393, true);
-    CHECK_GREEK_SYMBOL("%gamma", 0x03b3, true);
+    CHECK_GREEK_SYMBOL("%gamma", 0x03b3, false);
     CHECK_GREEK_SYMBOL("%igamma", 0x03b3, true);
 
 #undef CHECK_GREEK_SYMBOL
diff --git a/starmath/qa/extras/mmlexport-test.cxx b/starmath/qa/extras/mmlexport-test.cxx
index b63b22f..b3cb3aa 100644
--- a/starmath/qa/extras/mmlexport-test.cxx
+++ b/starmath/qa/extras/mmlexport-test.cxx
@@ -132,13 +132,13 @@ void MathMLExportTest::testTdf101022()
     }                                                                   \
     while (false)
 
-    CHECK_MATHVARIANT(false, false); // default mode 0
+    CHECK_MATHVARIANT(false, true); // default mode 2
 
     mxDocShell->SetGreekCharStyle(1); // mode 1
     CHECK_MATHVARIANT(true, true);
 
-    mxDocShell->SetGreekCharStyle(2); // mode 2
-    CHECK_MATHVARIANT(false, true);
+    mxDocShell->SetGreekCharStyle(0); // mode 0
+    CHECK_MATHVARIANT(false, false);
 
 #undef CHECK_MATHVARIANT
 }