[Libreoffice-commits] core.git: svx/source

[Thorsten Wagner (via logerrit)]

 svx/source/tbxctrls/StylesPreviewToolBoxControl.cxx |    3 ++-
 svx/source/tbxctrls/tbcontrl.cxx                    |    9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 396ceb05ef2bb75ba5c81b83f443863c485fa0b9
Author:     Thorsten Wagner <thorsten.wagner.4 at gmail.com>
AuthorDate: Mon Jun 28 23:40:12 2021 +0200
Commit:     Heiko Tietze <heiko.tietze at documentfoundation.org>
CommitDate: Thu Jul 8 08:34:05 2021 +0200

    tdf#125533 Update Calc style names for style sidebar dropdown
    
    Style names for Calc are updated to current style names. As
    default styles shown by sidebar dropdown are hardcoded, styles
    Accent 1, Accent 2, and Accent 3 were added to offer a few
    more options.
    
    Change-Id: I0e4b00f7e8a64e1ded077c559ed208fe71d784ac
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118038
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>

diff --git a/svx/source/tbxctrls/StylesPreviewToolBoxControl.cxx b/svx/source/tbxctrls/StylesPreviewToolBoxControl.cxx
index 47995067ae03..8a96feeb43c9 100644
--- a/svx/source/tbxctrls/StylesPreviewToolBoxControl.cxx
+++ b/svx/source/tbxctrls/StylesPreviewToolBoxControl.cxx
@@ -91,7 +91,8 @@ void StylesPreviewToolBoxControl::InitializeStyles(
         }
         else if (xServices->supportsService("com.sun.star.sheet.SpreadsheetDocument"))
         {
-            static const char* aCalcStyles[] = { "Default", "Heading1", "Result", "Result2" };
+            static const char* aCalcStyles[] = { "Default",   "Accent 1",  "Accent 2", "Accent 3",
+                                                 "Heading 1", "Heading 2", "Result" };
             css::uno::Reference<css::container::XNameAccess> xCellStyles;
             xStylesSupplier->getStyleFamilies()->getByName("CellStyles") >>= xCellStyles;
             for (const char* pCalcStyle : aCalcStyles)
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 1add34406833..7495876f2563 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2595,9 +2595,12 @@ struct SvxStyleToolBoxControl::Impl
                 static const char* aCalcStyles[] =
                 {
                     "Default",
-                    "Heading1",
-                    "Result",
-                    "Result2"
+                    "Accent 1",
+                    "Accent 2",
+                    "Accent 3",
+                    "Heading 1",
+                    "Heading 2",
+                    "Result"
                 };
                 Reference<container::XNameAccess> xCellStyles;
                 xStylesSupplier->getStyleFamilies()->getByName("CellStyles") >>= xCellStyles;