sc/inc/CommonProperties.hxx | 20 ++++++++++++++++++++
sc/source/ui/unoobj/cellsuno.cxx | 37 +++++++++++++------------------------
sc/source/ui/unoobj/styleuno.cxx | 7 +++----
solenv/clang-format/excludelist | 1 +
4 files changed, 37 insertions(+), 28 deletions(-)
New commits:
commit bcd3ca80cd1f59c4b94660daa8c3e66944caf58f
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Fri Jun 23 17:13:44 2023 +0900
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Sun Jun 25 17:36:00 2023 +0200
sc: simplify and fix prop. mapping for cell BG and char theme color
Change-Id: I461106200d37f0c605c07095c6b5871ea89e0e20
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153501
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/sc/inc/CommonProperties.hxx b/sc/inc/CommonProperties.hxx
new file mode 100644
index 000000000000..2c7d1e0a080b
--- /dev/null
+++ b/sc/inc/CommonProperties.hxx
@@ -0,0 +1,20 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#define CELL_BACKGROUND_COLOR_PROPERTIES \
+ { SC_UNONAME_CELLBACK, ATTR_BACKGROUND, cppu::UnoType<sal_Int32>::get(),
0, MID_BACK_COLOR }, \
+ { SC_UNONAME_CELL_BACKGROUND_COMPLEX_COLOR, ATTR_BACKGROUND,
cppu::UnoType<css::util::XComplexColor>::get(), 0, MID_BACKGROUND_COMPLEX_COLOR
}, \
+
+#define CHAR_COLOR_PROPERTIES \
+ { SC_UNONAME_CCOLOR, ATTR_FONT_COLOR, cppu::UnoType<sal_Int32>::get(), 0,
MID_COLOR_RGB }, \
+ { SC_UNONAME_CHAR_COMPLEX_COLOR, ATTR_FONT_COLOR,
cppu::UnoType<css::util::XComplexColor>::get(), 0, MID_COMPLEX_COLOR }, \
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 371ea346d364..d6a836fdc8d9 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -137,6 +137,7 @@
#include <table.hxx>
#include <refundo.hxx>
#include <columnspanset.hxx>
+#include <CommonProperties.hxx>
#include <memory>
@@ -156,12 +157,10 @@ static const SfxItemPropertySet* lcl_GetCellsPropertySet()
{ SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,cppu::UnoType<bool>::get(),
0, 0 },
{ SC_UNONAME_BOTTBORDER,ATTR_BORDER,
::cppu::UnoType<table::BorderLine>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
{ SC_UNONAME_BOTTBORDER2,ATTR_BORDER,
::cppu::UnoType<table::BorderLine2>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
- { SC_UNONAME_CELLBACK, ATTR_BACKGROUND,
cppu::UnoType<sal_Int32>::get(), 0, MID_BACK_COLOR },
- { SC_UNONAME_CELL_BACKGROUND_COMPLEX_COLOR, ATTR_BACKGROUND,
cppu::UnoType<css::util::XComplexColor>::get(), 0, MID_BACKGROUND_COMPLEX_COLOR
},
+ CELL_BACKGROUND_COLOR_PROPERTIES
{ SC_UNONAME_CELLPRO, ATTR_PROTECTION,
cppu::UnoType<util::CellProtection>::get(), 0, 0 },
{ SC_UNONAME_CELLSTYL,
SC_WID_UNO_CELLSTYL,cppu::UnoType<OUString>::get(), 0, 0 },
- { SC_UNONAME_CCOLOR, ATTR_FONT_COLOR,
cppu::UnoType<sal_Int32>::get(), 0, 0 },
- { SC_UNONAME_CHAR_COMPLEX_COLOR, ATTR_FONT_COLOR,
cppu::UnoType<css::util::XComplexColor>::get(), 0, MID_BACKGROUND_COMPLEX_COLOR
},
+ CHAR_COLOR_PROPERTIES
{ SC_UNONAME_COUTL, ATTR_FONT_CONTOUR, cppu::UnoType<bool>::get(),
0, 0 },
{ SC_UNONAME_CCROSS,
ATTR_FONT_CROSSEDOUT,cppu::UnoType<bool>::get(), 0,
MID_CROSSED_OUT },
{ SC_UNONAME_CEMPHAS,
ATTR_FONT_EMPHASISMARK,cppu::UnoType<sal_Int16>::get(), 0, MID_EMPHASIS
},
@@ -267,12 +266,10 @@ static const SfxItemPropertySet* lcl_GetRangePropertySet()
{ SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,cppu::UnoType<bool>::get(),
0, 0 },
{ SC_UNONAME_BOTTBORDER,ATTR_BORDER,
::cppu::UnoType<table::BorderLine>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
{ SC_UNONAME_BOTTBORDER2,ATTR_BORDER,
::cppu::UnoType<table::BorderLine2>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
- { SC_UNONAME_CELLBACK, ATTR_BACKGROUND,
cppu::UnoType<sal_Int32>::get(), 0, MID_BACK_COLOR },
- { SC_UNONAME_CELL_BACKGROUND_COMPLEX_COLOR, ATTR_BACKGROUND,
cppu::UnoType<css::util::XComplexColor>::get(), 0, MID_BACKGROUND_COMPLEX_COLOR
},
+ CELL_BACKGROUND_COLOR_PROPERTIES
{ SC_UNONAME_CELLPRO, ATTR_PROTECTION,
cppu::UnoType<util::CellProtection>::get(), 0, 0 },
{ SC_UNONAME_CELLSTYL,
SC_WID_UNO_CELLSTYL,cppu::UnoType<OUString>::get(), 0, 0 },
- { SC_UNONAME_CCOLOR, ATTR_FONT_COLOR,
cppu::UnoType<sal_Int32>::get(), 0, 0 },
- { SC_UNONAME_CHAR_COMPLEX_COLOR, ATTR_FONT_COLOR,
cppu::UnoType<css::util::XComplexColor>::get(), 0, MID_BACKGROUND_COMPLEX_COLOR
},
+ CHAR_COLOR_PROPERTIES
{ SC_UNONAME_COUTL, ATTR_FONT_CONTOUR, cppu::UnoType<bool>::get(),
0, 0 },
{ SC_UNONAME_CCROSS,
ATTR_FONT_CROSSEDOUT,cppu::UnoType<bool>::get(), 0,
MID_CROSSED_OUT },
{ SC_UNONAME_CEMPHAS,
ATTR_FONT_EMPHASISMARK,cppu::UnoType<sal_Int16>::get(), 0, MID_EMPHASIS
},
@@ -379,12 +376,10 @@ static const SfxItemPropertySet* lcl_GetCellPropertySet()
{ SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,cppu::UnoType<bool>::get(),
0, 0 },
{ SC_UNONAME_BOTTBORDER,ATTR_BORDER,
::cppu::UnoType<table::BorderLine>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
{ SC_UNONAME_BOTTBORDER2,ATTR_BORDER,
::cppu::UnoType<table::BorderLine2>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
- { SC_UNONAME_CELLBACK, ATTR_BACKGROUND,
cppu::UnoType<sal_Int32>::get(), 0, MID_BACK_COLOR },
- { SC_UNONAME_CELL_BACKGROUND_COMPLEX_COLOR, ATTR_BACKGROUND,
cppu::UnoType<css::util::XComplexColor>::get(), 0, MID_BACKGROUND_COMPLEX_COLOR
},
+ CELL_BACKGROUND_COLOR_PROPERTIES
{ SC_UNONAME_CELLPRO, ATTR_PROTECTION,
cppu::UnoType<util::CellProtection>::get(), 0, 0 },
{ SC_UNONAME_CELLSTYL,
SC_WID_UNO_CELLSTYL,cppu::UnoType<OUString>::get(), 0, 0 },
- { SC_UNONAME_CCOLOR, ATTR_FONT_COLOR,
cppu::UnoType<sal_Int32>::get(), 0, 0 },
- { SC_UNONAME_CHAR_COMPLEX_COLOR, ATTR_FONT_COLOR,
cppu::UnoType<css::util::XComplexColor>::get(), 0, MID_BACKGROUND_COMPLEX_COLOR
},
+ CHAR_COLOR_PROPERTIES
{ SC_UNONAME_COUTL, ATTR_FONT_CONTOUR, cppu::UnoType<bool>::get(),
0, 0 },
{ SC_UNONAME_CCROSS,
ATTR_FONT_CROSSEDOUT,cppu::UnoType<bool>::get(), 0,
MID_CROSSED_OUT },
{ SC_UNONAME_CEMPHAS,
ATTR_FONT_EMPHASISMARK,cppu::UnoType<sal_Int16>::get(), 0, MID_EMPHASIS
},
@@ -497,12 +492,10 @@ static const SfxItemPropertySet*
lcl_GetColumnPropertySet()
{ SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,cppu::UnoType<bool>::get(),
0, 0 },
{ SC_UNONAME_BOTTBORDER,ATTR_BORDER,
::cppu::UnoType<table::BorderLine>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
{ SC_UNONAME_BOTTBORDER2,ATTR_BORDER,
::cppu::UnoType<table::BorderLine2>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
- { SC_UNONAME_CELLBACK, ATTR_BACKGROUND,
cppu::UnoType<sal_Int32>::get(), 0, MID_BACK_COLOR },
- { SC_UNONAME_CELL_BACKGROUND_COMPLEX_COLOR, ATTR_BACKGROUND,
cppu::UnoType<css::util::XComplexColor>::get(), 0, MID_BACKGROUND_COMPLEX_COLOR
},
+ CELL_BACKGROUND_COLOR_PROPERTIES
{ SC_UNONAME_CELLPRO, ATTR_PROTECTION,
cppu::UnoType<util::CellProtection>::get(), 0, 0 },
{ SC_UNONAME_CELLSTYL,
SC_WID_UNO_CELLSTYL,cppu::UnoType<OUString>::get(), 0, 0 },
- { SC_UNONAME_CCOLOR, ATTR_FONT_COLOR,
cppu::UnoType<sal_Int32>::get(), 0, 0 },
- { SC_UNONAME_CHAR_COMPLEX_COLOR, ATTR_FONT_COLOR,
cppu::UnoType<css::util::XComplexColor>::get(), 0, MID_BACKGROUND_COMPLEX_COLOR
},
+ CHAR_COLOR_PROPERTIES
{ SC_UNONAME_COUTL, ATTR_FONT_CONTOUR, cppu::UnoType<bool>::get(),
0, 0 },
{ SC_UNONAME_CCROSS,
ATTR_FONT_CROSSEDOUT,cppu::UnoType<bool>::get(), 0,
MID_CROSSED_OUT },
{ SC_UNONAME_CEMPHAS,
ATTR_FONT_EMPHASISMARK,cppu::UnoType<sal_Int16>::get(), 0, MID_EMPHASIS
},
@@ -610,12 +603,10 @@ static const SfxItemPropertySet* lcl_GetRowPropertySet()
{ SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,cppu::UnoType<bool>::get(),
0, 0 },
{ SC_UNONAME_BOTTBORDER,ATTR_BORDER,
::cppu::UnoType<table::BorderLine>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
{ SC_UNONAME_BOTTBORDER2,ATTR_BORDER,
::cppu::UnoType<table::BorderLine2>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
- { SC_UNONAME_CELLBACK, ATTR_BACKGROUND,
cppu::UnoType<sal_Int32>::get(), 0, MID_BACK_COLOR },
- { SC_UNONAME_CELL_BACKGROUND_COMPLEX_COLOR, ATTR_BACKGROUND,
cppu::UnoType<css::util::XComplexColor>::get(), 0, MID_BACKGROUND_COMPLEX_COLOR
},
+ CELL_BACKGROUND_COLOR_PROPERTIES
{ SC_UNONAME_CELLPRO, ATTR_PROTECTION,
cppu::UnoType<util::CellProtection>::get(), 0, 0 },
{ SC_UNONAME_CELLSTYL,
SC_WID_UNO_CELLSTYL,cppu::UnoType<OUString>::get(), 0, 0 },
- { SC_UNONAME_CCOLOR, ATTR_FONT_COLOR,
cppu::UnoType<sal_Int32>::get(), 0, 0 },
- { SC_UNONAME_CHAR_COMPLEX_COLOR, ATTR_FONT_COLOR,
cppu::UnoType<css::util::XComplexColor>::get(), 0, MID_BACKGROUND_COMPLEX_COLOR
},
+ CHAR_COLOR_PROPERTIES
{ SC_UNONAME_COUTL, ATTR_FONT_CONTOUR, cppu::UnoType<bool>::get(),
0, 0 },
{ SC_UNONAME_CCROSS,
ATTR_FONT_CROSSEDOUT,cppu::UnoType<bool>::get(), 0,
MID_CROSSED_OUT },
{ SC_UNONAME_CEMPHAS,
ATTR_FONT_EMPHASISMARK,cppu::UnoType<sal_Int16>::get(), 0, MID_EMPHASIS
},
@@ -726,12 +717,10 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet()
{ SC_UNONAME_BORDCOL, SC_WID_UNO_BORDCOL,
cppu::UnoType<sal_Int32>::get(), 0, 0 },
{ SC_UNONAME_BOTTBORDER,ATTR_BORDER,
::cppu::UnoType<table::BorderLine>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
{ SC_UNONAME_BOTTBORDER2,ATTR_BORDER,
::cppu::UnoType<table::BorderLine2>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
- { SC_UNONAME_CELLBACK, ATTR_BACKGROUND,
cppu::UnoType<sal_Int32>::get(), 0, MID_BACK_COLOR },
- { SC_UNONAME_CELL_BACKGROUND_COMPLEX_COLOR, ATTR_BACKGROUND,
cppu::UnoType<css::util::XComplexColor>::get(), 0, MID_BACKGROUND_COMPLEX_COLOR
},
+ CELL_BACKGROUND_COLOR_PROPERTIES
{ SC_UNONAME_CELLPRO, ATTR_PROTECTION,
cppu::UnoType<util::CellProtection>::get(), 0, 0 },
{ SC_UNONAME_CELLSTYL,
SC_WID_UNO_CELLSTYL,cppu::UnoType<OUString>::get(), 0, 0 },
- { SC_UNONAME_CCOLOR, ATTR_FONT_COLOR,
cppu::UnoType<sal_Int32>::get(), 0, 0 },
- { SC_UNONAME_CHAR_COMPLEX_COLOR, ATTR_FONT_COLOR,
cppu::UnoType<css::util::XComplexColor>::get(), 0, MID_BACKGROUND_COMPLEX_COLOR
},
+ CHAR_COLOR_PROPERTIES
{ SC_UNONAME_COUTL, ATTR_FONT_CONTOUR, cppu::UnoType<bool>::get(),
0, 0 },
{ SC_UNONAME_CCROSS,
ATTR_FONT_CROSSEDOUT,cppu::UnoType<bool>::get(), 0,
MID_CROSSED_OUT },
{ SC_UNONAME_CEMPHAS,
ATTR_FONT_EMPHASISMARK,cppu::UnoType<sal_Int16>::get(), 0, MID_EMPHASIS
},
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 3ef06022c743..d1ffe93e8886 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -66,6 +66,7 @@
#include <comphelper/propertysequence.hxx>
#include <cppuhelper/supportsservice.hxx>
+#include <CommonProperties.hxx>
#include <styleuno.hxx>
#include <docsh.hxx>
#include <attrib.hxx>
@@ -109,11 +110,9 @@ static const SfxItemPropertySet* lcl_GetCellStyleSet()
{SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,cppu::UnoType<bool>::get(),
0, 0 },
{SC_UNONAME_BOTTBORDER,ATTR_BORDER,
::cppu::UnoType<table::BorderLine>::get(), 0, BOTTOM_BORDER |
CONVERT_TWIPS },
{SC_UNONAME_BOTTBORDER2,ATTR_BORDER,
::cppu::UnoType<table::BorderLine2>::get(), 0, BOTTOM_BORDER |
CONVERT_TWIPS },
- {SC_UNONAME_CELLBACK, ATTR_BACKGROUND,
::cppu::UnoType<sal_Int32>::get(), 0, MID_BACK_COLOR },
- {SC_UNONAME_CELL_BACKGROUND_COMPLEX_COLOR, ATTR_BACKGROUND,
cppu::UnoType<css::util::XComplexColor>::get(), 0, MID_BACKGROUND_COMPLEX_COLOR
},
+ CELL_BACKGROUND_COLOR_PROPERTIES
{SC_UNONAME_CELLPRO, ATTR_PROTECTION,
::cppu::UnoType<util::CellProtection>::get(), 0, 0 },
- {SC_UNONAME_CCOLOR, ATTR_FONT_COLOR,
::cppu::UnoType<sal_Int32>::get(), 0, 0 },
- {SC_UNONAME_CHAR_COMPLEX_COLOR, ATTR_FONT_COLOR,
cppu::UnoType<css::util::XComplexColor>::get(), 0, MID_BACKGROUND_COMPLEX_COLOR
},
+ CHAR_COLOR_PROPERTIES
{SC_UNONAME_COUTL, ATTR_FONT_CONTOUR, cppu::UnoType<bool>::get(),
0, 0 },
{SC_UNONAME_CCROSS, ATTR_FONT_CROSSEDOUT,cppu::UnoType<bool>::get(),
0, MID_CROSSED_OUT },
{SC_UNONAME_CEMPHAS,
ATTR_FONT_EMPHASISMARK,cppu::UnoType<sal_Int16>::get(), 0, MID_EMPHASIS
},
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 03a8b79b6416..2e454f9892dc 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -7768,6 +7768,7 @@ sax/test/sax/testwriter.cxx
sax/test/saxdemo.cxx
sax/test/testcomponent.cxx
sc/inc/ChartTools.hxx
+sc/inc/CommonProperties.hxx
sc/inc/NumberFormatControl.hxx
sc/inc/PivotTableDataProvider.hxx
sc/inc/PivotTableDataSequence.hxx
