diff options
| author | Paris Oplopoios <paris.oplopoios@collabora.com> | 2023-07-03 19:00:59 +0300 |
|---|---|---|
| committer | Paris Oplopoios <parisoplop@gmail.com> | 2023-07-05 10:17:03 +0200 |
| commit | 63d019c6780733018ffc0b157a235cb57893d6d4 (patch) | |
| tree | 8517a7dd918939d6cb1dc72de7cf26efc203d98c /sw/inc | |
| parent | 1a561775a486b5daf4b04b287dc3849b387ec388 (diff) | |
Make sure views get new themes on .uno:ChangeTheme
It would be that sometimes .uno:ChangeTheme would not load the new
scheme because it was using EditableConfig::GetCurrentSchemeName which
uses a static name - normally great except for when you need different
views to have different color schemes in tiled rendering
Change-Id: I5b149bd1a4776337f76753c6de98d5386a899d34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153939
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Paris Oplopoios <parisoplop@gmail.com>
(cherry picked from commit 77f5b9259864798b6efc213f6dfa685cd440f71a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154001
Tested-by: Jenkins
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/view.hxx | 2 | ||||
| -rw-r--r-- | sw/inc/viewopt.hxx | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index b1d2ea5b9e90..dee2363dedd9 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -676,6 +676,8 @@ public: void NotifyCursor(SfxViewShell* pViewShell) const override; /// See SfxViewShell::GetColorConfigColor(). ::Color GetColorConfigColor(svtools::ColorConfigEntry nColorType) const override; + /// See SfxViewShell::GetColorConfigName(). + OUString GetColorConfigName() const override; void ShowUIElement(const OUString& sElementURL) const; diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index 4ff2d1a43956..b82b970cb540 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -854,7 +854,7 @@ public: inline bool SwViewOption::operator==( const SwViewOption &rOpt ) const { - return IsEqualFlags( rOpt ) && m_nZoom == rOpt.GetZoom() && m_aColorConfig == rOpt.m_aColorConfig; + return IsEqualFlags( rOpt ) && m_nZoom == rOpt.GetZoom() && m_aColorConfig == rOpt.m_aColorConfig && m_sThemeName == rOpt.m_sThemeName; } inline void SwViewOption::SetUIOptions( const SwViewOption& rVOpt ) |