diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-01-30 21:29:31 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-02-07 10:11:48 +0100 |
| commit | 49a5b76e9c18c9ee43cc1e1bb9de14fd50ceda77 (patch) | |
| tree | b531f82dd3e1fa2de36c55eb58d06b5bb752bb3f /sfx2 | |
| parent | 997754eeda670585ff23fdaf0ed8830149fddca6 (diff) | |
use ViewShell DOCCOLOR when available
for fallback, continue to warn if the terminal fallback gets used,
but fill stub it to return the application DOCCOLOR
Change-Id: I2bf3a1c6c6adb58811fd36c70f93932de246f10a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162782
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
(cherry picked from commit 3a48ad467b7fbf9cbdfff1222e08c02b0ff5d544)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162852
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit 2bdc2d6327058d31bfd2ddb08f5c01ea9755bd66)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163077
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/viewsh.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 93c18a16e2e2..3d4444b56b16 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -30,6 +30,7 @@ #include <vcl/toolbox.hxx> #include <vcl/weld.hxx> #include <svl/intitem.hxx> +#include <svtools/colorcfg.hxx> #include <svtools/langhelp.hxx> #include <com/sun/star/awt/XPopupMenu.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> @@ -3320,10 +3321,11 @@ vcl::Window* SfxViewShell::GetEditWindowForActiveOLEObj() const return pEditWin; } -::Color SfxViewShell::GetColorConfigColor(svtools::ColorConfigEntry) const +::Color SfxViewShell::GetColorConfigColor(svtools::ColorConfigEntry eEntry) const { SAL_WARN("sfx.view", "SfxViewShell::GetColorConfigColor not overridden!"); - return {}; + svtools::ColorConfig aColorConfig; + return aColorConfig.GetColorValue(eEntry).nColor; } void SfxViewShell::SetLOKLanguageTag(const OUString& rBcp47LanguageTag) |