diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-06-09 15:27:12 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2023-06-11 14:54:48 +0200 |
| commit | f1633dc0e06b046a9ca0f2fa53e7858be1584ffb (patch) | |
| tree | fdefd78f2406efdb03c288a86c4d49cdd8c2bed5 | |
| parent | bd2b39f6a710aa0d3d280b574926bd248e3416b0 (diff) | |
Related: tdf#155507 don't broadcast UI Theme change unless it did change
a problem since:
https://github.com/CollaboraOnline/online/commit/b6d4c88f9011845acae5c8537c0826055c8327a2
Change-Id: Iac1189ba7b892324b5f000f5f6240787b3209892
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152817
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
| -rw-r--r-- | sc/qa/unit/tiledrendering/tiledrendering.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/appl/appserv.cxx | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx index 8e42f5c29a53..039cffe5ab0e 100644 --- a/sc/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx @@ -3231,9 +3231,10 @@ void ScTiledRenderingTest::testUndoReorderingMulti() void ScTiledRenderingTest::testGetViewRenderState() { - // Add an empty dark scheme to avoid a warning + // Add a pair of schemes, last added is the default svtools::EditableColorConfig aColorConfig; aColorConfig.AddScheme(u"Dark"); + aColorConfig.AddScheme(u"Light"); ScModelObj* pModelObj = createDoc("empty.ods"); int nFirstViewId = SfxLokHelper::getView(); diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index f2dfca480c5d..418bcb88430b 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -602,8 +602,10 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) SAL_WARN("sfx.appl", "FN_CHANGE_THEME: no theme name"); break; } + const OUString& rSchemeName = pNewThemeArg->GetValue(); svtools::EditableColorConfig aEditableConfig; - aEditableConfig.LoadScheme(pNewThemeArg->GetValue()); + if (aEditableConfig.GetCurrentSchemeName() != rSchemeName) + aEditableConfig.LoadScheme(rSchemeName); break; } |