[Libreoffice-commits] core.git: sc/qa sc/source

[Maxim Monastirsky (via logerrit)]

 sc/qa/unit/subsequent_export-test.cxx |   26 ++++++++++++++++++++++++++
 sc/source/ui/unoobj/defltuno.cxx      |    3 +++
 2 files changed, 29 insertions(+)

New commits:
commit a796aa9d65e3d4292232820d424b3f62c673fa07
Author:     Maxim Monastirsky <momonasmon at gmail.com>
AuthorDate: Sun Feb 7 17:42:27 2021 +0200
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Thu May 13 18:26:12 2021 +0200

    tdf#112559 sc: Expose font height via the Defaults UNO API
    
    This fixes both ODF import and export of the default cell style.
    
    Change-Id: I776591c6ed932a136b95107d3c4a0f25c1bebdf1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110539
    Tested-by: Jenkins
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index 01cf0a236a24..4864266b8790 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -57,6 +57,7 @@
 #include <editeng/borderline.hxx>
 #include <editeng/escapementitem.hxx>
 #include <editeng/fontitem.hxx>
+#include <editeng/fhgtitem.hxx>
 #include <editeng/udlnitem.hxx>
 #include <editeng/flditem.hxx>
 #include <editeng/colritem.hxx>
@@ -89,6 +90,7 @@ public:
     virtual void tearDown() override;
 
     void test();
+    void testDefaultFontHeight();
     void testTdf139167();
     void testTdf113271();
     void testTdf139394();
@@ -293,6 +295,7 @@ public:
 
     CPPUNIT_TEST_SUITE(ScExportTest);
     CPPUNIT_TEST(test);
+    CPPUNIT_TEST(testDefaultFontHeight);
     CPPUNIT_TEST(testTdf139167);
     CPPUNIT_TEST(testTdf113271);
     CPPUNIT_TEST(testTdf139394);
@@ -544,6 +547,29 @@ void ScExportTest::test()
     xDocSh->DoClose();
 }
 
+void ScExportTest::testDefaultFontHeight()
+{
+    ScDocShellRef xDocSh = new ScDocShell;
+    xDocSh->DoInitNew();
+
+    ScDocumentPool* pPool = xDocSh->GetDocument().GetPool();
+    pPool->SetPoolDefaultItem(SvxFontHeightItem(400, 100, ATTR_FONT_HEIGHT));
+    pPool->SetPoolDefaultItem(SvxFontHeightItem(400, 100, ATTR_CJK_FONT_HEIGHT));
+    pPool->SetPoolDefaultItem(SvxFontHeightItem(400, 100, ATTR_CTL_FONT_HEIGHT));
+
+    xDocSh = saveAndReload(xDocSh.get(), FORMAT_ODS);
+
+    pPool = xDocSh->GetDocument().GetPool();
+    const SvxFontHeightItem& rItem = pPool->GetDefaultItem(ATTR_FONT_HEIGHT);
+    CPPUNIT_ASSERT_EQUAL(sal_uInt32(400), rItem.GetHeight());
+    const SvxFontHeightItem& rCJKItem = pPool->GetDefaultItem(ATTR_CJK_FONT_HEIGHT);
+    CPPUNIT_ASSERT_EQUAL(sal_uInt32(400), rCJKItem.GetHeight());
+    const SvxFontHeightItem& rCTLItem = pPool->GetDefaultItem(ATTR_CTL_FONT_HEIGHT);
+    CPPUNIT_ASSERT_EQUAL(sal_uInt32(400), rCTLItem.GetHeight());
+
+    xDocSh->DoClose();
+}
+
 void ScExportTest::testTdf139167()
 {
     ScDocShellRef xShell = loadDoc(u"tdf139167.", FORMAT_XLSX);
diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx
index b09a5a004d2b..ae2fe0242892 100644
--- a/sc/source/ui/unoobj/defltuno.cxx
+++ b/sc/source/ui/unoobj/defltuno.cxx
@@ -59,6 +59,9 @@ static const SfxItemPropertyMapEntry* lcl_GetDocDefaultsMap()
         {u"" SC_UNONAME_CLOCAL,   ATTR_FONT_LANGUAGE, cppu::UnoType<lang::Locale>::get(),     0, MID_LANG_LOCALE },
         {u"" SC_UNO_CJK_CLOCAL,   ATTR_CJK_FONT_LANGUAGE, cppu::UnoType<lang::Locale>::get(), 0, MID_LANG_LOCALE },
         {u"" SC_UNO_CTL_CLOCAL,   ATTR_CTL_FONT_LANGUAGE, cppu::UnoType<lang::Locale>::get(), 0, MID_LANG_LOCALE },
+        {u"" SC_UNONAME_CHEIGHT,  ATTR_FONT_HEIGHT,     cppu::UnoType<float>::get(), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNO_CJK_CHEIGHT,  ATTR_CJK_FONT_HEIGHT, cppu::UnoType<float>::get(), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNO_CTL_CHEIGHT,  ATTR_CTL_FONT_HEIGHT, cppu::UnoType<float>::get(), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
         {u"" SC_UNO_STANDARDDEC,              0,      cppu::UnoType<sal_Int16>::get(),        0, 0 },
         {u"" SC_UNO_TABSTOPDIS,               0,      cppu::UnoType<sal_Int32>::get(),        0, 0 },
         { u"", 0, css::uno::Type(), 0, 0 }