sc/qa/extras/scstylefamilyobj.cxx | 6 +++++-
sc/res/xml/styles.xml | 4 ++++
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit d93051cba341a73fe389e7471fc60d46da3aa1fe
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Sun Sep 27 20:37:34 2020 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Sep 28 21:03:59 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 <er...@redhat.com>
(cherry picked from commit 930d82550863430c9bef96ac307c3ff2cfefe4d8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103432
Reviewed-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 4cabc8e6574feb08cd7b80de9bc59c1c8f1797c3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103442
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Tested-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/qa/extras/scstylefamilyobj.cxx
b/sc/qa/extras/scstylefamilyobj.cxx
index a5843a8f3a1f..8597d22b0f71 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>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
