diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-03-11 13:27:23 +0000 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-03-11 18:47:41 +0100 |
| commit | 17dc98b0f0d96362db03e48c0589013c349da156 (patch) | |
| tree | 94056fbbbe3ec35b002aa8b4aa5b708af0e036c8 /svx | |
| parent | ed8a6bf198547b11af7a312ac14faace9d61512d (diff) | |
Document Colors do not show any color in the Palette
same is true for "Theme Colors", a problem since:
commit 4ccc2f0e3f45c9d78f74b1848851bedf71f7382d
Date: Fri Mar 1 22:11:14 2024 +0200
cool#8327 use tools::JsonWriter for theme colors
Change-Id: Ibaab5df197bd8005037e066181e8a50bdda5ceda
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164658
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164669
Tested-by: Jenkins
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/tbxctrls/PaletteManager.cxx | 3 | ||||
| -rw-r--r-- | svx/source/theme/ThemeColorPaletteManager.cxx | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx index fda9803c9d03..d1dafc182bb9 100644 --- a/svx/source/tbxctrls/PaletteManager.cxx +++ b/svx/source/tbxctrls/PaletteManager.cxx @@ -480,8 +480,7 @@ void PaletteManager::generateJSON(tools::JsonWriter& aTree, const std::set<Color auto aColorIt = rColors.begin(); while (aColorIt != rColors.end()) { - auto aColorRowTree = aTree.startStruct(); - auto aColorRowTree2 = aTree.startArray(""); + auto aColorRowTree = aTree.startAnonArray(); for (sal_uInt32 nColumn = 0; nColumn < nColumnCount; nColumn++) { diff --git a/svx/source/theme/ThemeColorPaletteManager.cxx b/svx/source/theme/ThemeColorPaletteManager.cxx index ae2fe2f0bdfd..deca9a3c54be 100644 --- a/svx/source/theme/ThemeColorPaletteManager.cxx +++ b/svx/source/theme/ThemeColorPaletteManager.cxx @@ -134,9 +134,11 @@ void ThemeColorPaletteManager::generateJSON(tools::JsonWriter& aTree) for (size_t nEffect = 0; nEffect < 6; ++nEffect) { - auto aColorRowTree = aTree.startStruct(); + auto aColorRowTree = aTree.startAnonArray(); for (size_t nIndex = 0; nIndex < 12; ++nIndex) { + auto aColorTree = aTree.startStruct(); + auto const& rColorData = aThemePaletteCollection.maColors[nIndex]; auto const& rEffectData = rColorData.maEffects[nEffect]; |