From cfba837abe3137b2bb20ddb414bb91078c4a1c9f Mon Sep 17 00:00:00 2001
From: Paris Oplopoios <paris.oplopoios@collabora.com>
Date: Fri, 13 Oct 2023 15:55:51 +0300
Subject: Revert "Make sure views get new themes on .uno:ChangeTheme"

Seems to cause more issues than it solves, reverting for now

This reverts commit 884fd220d0025a92510d3ff4710c8c517c8f271e.

Change-Id: If32a9d3bd922afe5611e5258987eec9ec685bc8e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157951
Tested-by: Jenkins
Reviewed-by: Paris Oplopoios <parisoplop@gmail.com>
---
 sw/inc/view.hxx                     |  2 --
 sw/inc/viewopt.hxx                  |  2 +-
 sw/source/core/view/vnew.cxx        | 17 +----------------
 sw/source/uibase/uiview/viewprt.cxx | 14 --------------
 4 files changed, 2 insertions(+), 33 deletions(-)

(limited to 'sw')

diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index c6add7e23364..c5967bb4e213 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -679,8 +679,6 @@ 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 b5bf16b5ca22..3c847acfd6fe 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -851,7 +851,7 @@ public:
 
 inline bool SwViewOption::operator==( const SwViewOption &rOpt ) const
 {
-    return IsEqualFlags( rOpt ) && m_nZoom == rOpt.GetZoom() && m_aColorConfig == rOpt.m_aColorConfig && m_sThemeName == rOpt.m_sThemeName;
+    return IsEqualFlags( rOpt ) && m_nZoom == rOpt.GetZoom() && m_aColorConfig == rOpt.m_aColorConfig;
 }
 
 inline void SwViewOption::SetUIOptions( const SwViewOption& rVOpt )
diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx
index e6d8675d6ce6..613a15df633b 100644
--- a/sw/source/core/view/vnew.cxx
+++ b/sw/source/core/view/vnew.cxx
@@ -42,7 +42,6 @@
 #include <ndgrf.hxx>
 #include <ndindex.hxx>
 #include <accessibilityoptions.hxx>
-#include <comphelper/lok.hxx>
 
 void SwViewShell::Init( const SwViewOption *pNewOpt )
 {
@@ -249,21 +248,7 @@ SwViewShell::SwViewShell( SwViewShell& rShell, vcl::Window *pWindow,
     bool bModified = mxDoc->getIDocumentState().IsModified();
 
     OutputDevice* pOrigOut = mpOut;
-
-    SwViewOption aNewOpt;
-
-    if ( rShell.GetViewOptions() )
-    {
-        aNewOpt = *rShell.GetViewOptions();
-    }
-
-    if ( comphelper::LibreOfficeKit::isActive() )
-    {
-        // Do not copy the color config in tiled rendering
-        aNewOpt.SetThemeName("Default");
-    }
-
-    Init( &aNewOpt ); // might change Outdev (InitPrt())
+    Init( rShell.GetViewOptions() ); // might change Outdev (InitPrt())
     mpOut = pOrigOut;
 
     if ( mbPreview )
diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx
index 92ae55feb08a..bc9c5e19b840 100644
--- a/sw/source/uibase/uiview/viewprt.cxx
+++ b/sw/source/uibase/uiview/viewprt.cxx
@@ -316,20 +316,6 @@ void SwView::NotifyCursor(SfxViewShell* pViewShell) const
     return {};
 }
 
-OUString SwView::GetColorConfigName() const
-{
-    if (const SwViewOption* pViewOptions = GetWrtShell().GetViewOptions())
-    {
-        return pViewOptions->GetThemeName();
-    }
-    else
-    {
-        SAL_WARN("sw", "GetViewOptions() returned nullptr");
-    }
-
-    return {};
-}
-
 // Create page printer/additions for SwView and SwPagePreview
 
 std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController,
-- 
cgit