commit 0d341d28f73603670e3b8c639c583229d3c723a6
author PriyankaGaikwad <priyanka.gaikwad@synerzip.com> Tue Apr 28 18:09:50 2015 +0530
committer Markus Mohrhard <markus.mohrhard@googlemail.com> Thu Apr 30 03:05:01 2015 +0000
tree 49cbbb3957b42ed800e4de2bbf127cbfe6939158
parent 0cd88d27ecd87c8c5791418bcac6ab1684ece74a

tdf#90908 : FILESAVE: XLSX wrong export of font size 18

After roundtrip is font size changed from 18 to 11

Current behavior:
The 'sz' tag was not exported
Expected behaviour:
After RT 'sz' tag should export with value 18

XML Difference :
Original
 <a:rPr lang="en-IN" sz="1800" b="1" i="1" u="sng"/>
Roundtrip
 <a:rPr b="1" i="1" lang="en-IN" strike="noStrike" u="sng">

Change-Id: I7955f89a8db9c18c11546f4c60aa130a0be14bb5
Reviewed-on: https://gerrit.libreoffice.org/15565
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

oox/source/export/drawingml.cxx

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 4f0621d..e8673d2d 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1322,7 +1322,7 @@ void DrawingML::WriteRunProperties( Reference< XPropertySet > rRun, bool bIsFiel
                          XML_b, bold,
                          XML_i, italic,
                          XML_lang, usLanguage.isEmpty() ? NULL : USS( usLanguage ),
                          XML_sz, nSize == 1800 ? NULL : IS( nSize ),
                          XML_sz, IS( nSize ),
                          XML_strike, strikeout,
                          XML_u, underline,
                          XML_baseline, nCharEscapement == 0 ? NULL : IS( nCharEscapement*1000 ),

sc/qa/unit/data/xlsx/fontSize.xlsx

diff --git a/sc/qa/unit/data/xlsx/fontSize.xlsx b/sc/qa/unit/data/xlsx/fontSize.xlsx
new file mode 100644
index 0000000..8811df7
--- /dev/null
+++ b/sc/qa/unit/data/xlsx/fontSize.xlsx
Binary files differ

sc/qa/unit/subsequent_export-test.cxx

diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index ecf39bd..cd3e07b 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -138,6 +138,7 @@ public:
    void testSupBookVirtualPath();
    void testSheetLocalRangeNameXLS();
    void testSheetTextBoxHyperlink();
    void testFontSize();

    CPPUNIT_TEST_SUITE(ScExportTest);
    CPPUNIT_TEST(test);
@@ -186,6 +187,7 @@ public:
    CPPUNIT_TEST(testImageWithSpecialID);
    CPPUNIT_TEST(testSheetLocalRangeNameXLS);
    CPPUNIT_TEST(testSheetTextBoxHyperlink);
    CPPUNIT_TEST(testFontSize);

    CPPUNIT_TEST_SUITE_END();

@@ -2536,6 +2538,19 @@ void ScExportTest::testSheetTextBoxHyperlink()
    xDocSh->DoClose();
}

void ScExportTest::testFontSize()
{
    ScDocShellRef xDocSh = loadDoc("fontSize.", XLSX);
    CPPUNIT_ASSERT(xDocSh.Is());

    xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory, "xl/drawings/drawing1.xml", XLSX);
    CPPUNIT_ASSERT(pDoc);
    OUString fontSize = getXPath(pDoc,
                "/xdr:wsDr/xdr:twoCellAnchor/xdr:sp[1]/xdr:txBody/a:p[1]/a:r[1]/a:rPr", "sz");
    // make sure that the font size is 18
    CPPUNIT_ASSERT_EQUAL(OUString("1800"), fontSize);
}

CPPUNIT_TEST_SUITE_REGISTRATION(ScExportTest);

CPPUNIT_PLUGIN_IMPLEMENT();