Revert "tdf#167511 correctly apply Color in HighContrast mode to text III"

This reverts commit 6381d36667.
Need to fix tdf#167511 different.

Change-Id: Ide1f47aecc193ef6093a6903bd724699d82b49d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188529
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>

svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx

@@ -72,9 +72,6 @@ namespace drawinglayer::primitive2d
             bool                                    mbContainsPageCountField : 1;
             bool                                    mbContainsOtherFields : 1;
 
-            // tdf#167511 also need to react for EditViewActive to correctly show HighContrast
-            bool                                    mbEditViewActive : 1;
-
         protected:
             // support for XTEXT_PAINTSHAPE_BEGIN/XTEXT_PAINTSHAPE_END Metafile comments
             static Primitive2DReference encapsulateWithTextHierarchyBlockPrimitive2D(Primitive2DContainer&& aCandidate);

svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx

@@ -29,7 +29,6 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdoutl.hxx>
-#include <vcl/svapp.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <utility>
 #include <osl/diagnose.h>
@@ -104,8 +103,7 @@ namespace drawinglayer::primitive2d
             mnLastPageCount(0),
             mbContainsPageField(false),
             mbContainsPageCountField(false),
-            mbContainsOtherFields(false),
-            mbEditViewActive(false)
+            mbContainsOtherFields(false)
         {
             const EditTextObject& rETO = maOutlinerParaObject.GetTextObject();
 
@@ -198,14 +196,6 @@ namespace drawinglayer::primitive2d
                     }
                 }
 
-                // tdf#167511 check if EditViewActive has changed, but only if we are in
-                // HighContrast mode at all
-                if (!bDoDelete && mbEditViewActive != rViewInformation.getEditViewActive()
-                    && Application::GetSettings().GetStyleSettings().GetHighContrastMode())
-                {
-                    bDoDelete = true;
-                }
-
                 if(bDoDelete)
                 {
                     const_cast< SdrTextPrimitive2D* >(this)->setBuffered2DDecomposition(nullptr);
@@ -239,7 +229,6 @@ namespace drawinglayer::primitive2d
                 const_cast< SdrTextPrimitive2D* >(this)->mnLastPageNumber = nCurrentlyValidPageNumber;
                 const_cast< SdrTextPrimitive2D* >(this)->mnLastPageCount = nCurrentlyValidPageCount;
                 const_cast< SdrTextPrimitive2D* >(this)->maLastTextBackgroundColor = aNewTextBackgroundColor;
-                const_cast< SdrTextPrimitive2D* >(this)->mbEditViewActive = rViewInformation.getEditViewActive();
             }
 
             // call parent