[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/qa sc/res

[Eike Rathke (via logerrit)]

 sc/qa/extras/scstylefamilyobj.cxx |    6 +++++-
 sc/res/xml/styles.xml             |    4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 916cefa8e3b785489a9ef09cf4c5c6af09bed82d
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Sun Sep 27 20:37:34 2020 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Mon Sep 28 19:09:40 2020 +0200

    Resolves: tdf#133812 Add the 'Result' style again used by the Subtotal tool
    
    Necessary to also adapt the test case that checks for a defined
    number of styles.
    
    Regression from
    
        commit 7b0aed617f1e57335837cf56ef2d222a96f8270d
        CommitDate: Wed Sep 28 11:42:56 2016 +0000
    
            Remove old cell styles from calc
    
    and
    
        commit 06f319937187f76ee402d53b3baa78c391c2af19
        CommitDate: Sun Oct 2 13:51:26 2016 +0000
    
            tdf#90937 Add a set of cell styles to calc
    
    Change-Id: I3e47d8e24d375a64d9056e7a85197b89173c8e41
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103520
    Tested-by: Jenkins
    Reviewed-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit 930d82550863430c9bef96ac307c3ff2cfefe4d8)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103433
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sc/qa/extras/scstylefamilyobj.cxx b/sc/qa/extras/scstylefamilyobj.cxx
index fe5d8fb2ec19..6f8965c20bd9 100644
--- a/sc/qa/extras/scstylefamilyobj.cxx
+++ b/sc/qa/extras/scstylefamilyobj.cxx
@@ -83,10 +83,14 @@ private:
     uno::Reference<lang::XComponent> m_xComponent;
 };
 
+/* TODO: this c/should be derived/defined from the real style count, default
+ * implemented plus sc/res/xml/styles.xml */
+constexpr sal_Int32 kScStyleFamilyObjCount = 20;
+
 ScStyleFamilyObj::ScStyleFamilyObj()
     : CalcUnoApiTest("/sc/qa/extras/testdocuments")
     , XElementAccess(cppu::UnoType<style::XStyle>::get())
-    , XIndexAccess(19)
+    , XIndexAccess(kScStyleFamilyObjCount)
     , XNameAccess("ScStyleFamilyObj")
     , XNameContainer("ScStyleFamilyObj")
     , XNameReplace("ScStyleFamilyObj")
diff --git a/sc/res/xml/styles.xml b/sc/res/xml/styles.xml
index 9bfda940c3d9..d1d1a750e241 100644
--- a/sc/res/xml/styles.xml
+++ b/sc/res/xml/styles.xml
@@ -57,4 +57,8 @@
     <style:style style:name="Accent 3" style:family="table-cell" style:parent-style-name="Accent">
         <style:table-cell-properties fo:background-color="#dddddd"/>
     </style:style>
+
+    <style:style style:name="Result" style:family="table-cell" style:parent-style-name="Default">
+        <style:text-properties fo:font-weight="bold" fo:font-style="italic" style:text-underline-style="solid"/>
+    </style:style>
 </office:styles>