diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-05-12 13:19:56 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-05-15 19:37:58 +0200 |
| commit | f9c94cfdde6c0af621cf80467a9d83c789699093 (patch) | |
| tree | cefdc576502e46dca563399ba4cbbd621d9a416e /editeng | |
| parent | SM handle background theme changes (diff) | |
| download | core-f9c94cfdde6c0af621cf80467a9d83c789699093.tar.gz core-f9c94cfdde6c0af621cf80467a9d83c789699093.zip | |
tdf#90297 set default SmEditWindow background
This implements ApplySetting for the proper background of the
undocked SfxDockingWindow.
In addition, like all other code, this sets the text color via
the EditEngine font objects and therefore reverts the uneeded
EditEngine interface from the original commit ea191cf9807d
("tdf#90297 use field colors for math's edit engine").
Change-Id: Ib7df4ce730da92a1e41f58b8348a5aec18208166
Reviewed-on: https://gerrit.libreoffice.org/72312
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/editeng.cxx | 10 | ||||
| -rw-r--r-- | editeng/source/editeng/impedit.hxx | 4 | ||||
| -rw-r--r-- | editeng/source/editeng/impedit2.cxx | 1 | ||||
| -rw-r--r-- | editeng/source/editeng/impedit3.cxx | 4 |
4 files changed, 1 insertions, 18 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 5faf9eb9f3f3..458f71b34d3f 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -183,16 +183,6 @@ Color const & EditEngine::GetBackgroundColor() const return pImpEditEngine->GetBackgroundColor(); } -void EditEngine::SetTextColor( const Color& rColor ) -{ - pImpEditEngine->SetTextColor( rColor ); -} - -Color const & EditEngine::GetTextColor() const -{ - return pImpEditEngine->GetTextColor(); -} - Color EditEngine::GetAutoColor() const { return pImpEditEngine->GetAutoColor(); diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 987281ef89e4..9f0e27909515 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -463,7 +463,6 @@ private: EditSelectionEngine aSelEngine; Color maBackgroundColor; - Color maTextColor; sal_uInt16 nStretchX; sal_uInt16 nStretchY; @@ -679,9 +678,6 @@ private: void SetBackgroundColor( const Color& rColor ) { maBackgroundColor = rColor; } const Color& GetBackgroundColor() const { return maBackgroundColor; } - void SetTextColor( const Color& rColor ) { maTextColor = rColor; } - const Color& GetTextColor() const { return maTextColor; } - long CalcVertLineSpacing(Point& rStartPos) const; Color GetAutoColor() const; diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 0d1d3b399f93..6b4b8da61b2e 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -124,7 +124,6 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) : eDefLanguage = LANGUAGE_DONTKNOW; maBackgroundColor = COL_AUTO; - maTextColor = COL_AUTO; nAsianCompressionMode = CharCompressType::NONE; diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 0cdee12d70ae..ec3e10cf1290 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -4418,9 +4418,7 @@ Reference < i18n::XExtendedInputSequenceChecker > const & ImpEditEngine::ImplGet Color ImpEditEngine::GetAutoColor() const { - Color aColor = GetTextColor(); - if ( aColor == COL_AUTO ) - aColor = GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor; + Color aColor = GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor; if ( GetBackgroundColor() != COL_AUTO ) { |