editeng/source/editeng/StripPortionsHelper.cxx | 54 ++++++++--------------
editeng/source/editeng/editview.cxx | 3 -
editeng/source/editeng/impedit3.cxx | 24 ++++-----
editeng/source/outliner/outlvw.cxx | 5 --
include/editeng/StripPortionsHelper.hxx | 25 ++--------
include/svx/svdoutl.hxx | 2
sc/source/ui/view/tabview3.cxx | 5 --
svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx | 3 -
svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx | 13 -----
svx/source/svdraw/svdedxv.cxx | 7 --
svx/source/svdraw/svdotextdecomposition.cxx | 5 --
svx/source/svdraw/svdotextpathdecomposition.cxx | 8 ---
svx/source/svdraw/svdoutl.cxx | 4 -
13 files changed, 45 insertions(+), 113 deletions(-)
New commits:
commit 624690f479e402f9e5e9223801dde04f20418dd2
Author: Armin Le Grand (collabora) <armin.legr...@collabora.com>
AuthorDate: Tue Jul 29 15:06:17 2025 +0200
Commit: Armin Le Grand <armin.le.gr...@me.com>
CommitDate: Wed Jul 30 13:22:39 2025 +0200
Revert "tdf#167511 correctly apply Color in HighContrast mode to text II"
This reverts commit d6a3d308598d47d6658c51a95a561cc3c93a3393.
Need to fix differently
Change-Id: Ifaf6fbc37eaef95b15ba762978e4ca6b0ca82000
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188530
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <armin.le.gr...@me.com>
diff --git a/editeng/source/editeng/StripPortionsHelper.cxx
b/editeng/source/editeng/StripPortionsHelper.cxx
index 808f848991a4..cf8e59d6489e 100644
--- a/editeng/source/editeng/StripPortionsHelper.cxx
+++ b/editeng/source/editeng/StripPortionsHelper.cxx
@@ -85,8 +85,7 @@
CheckFieldPrimitive(drawinglayer::primitive2d::BasePrimitive2D* pPrimitive,
}
rtl::Reference<drawinglayer::primitive2d::BasePrimitive2D>
-buildTextPortionPrimitive(const drawinglayer::geometry::ViewInformation2D&
rViewInformation2D,
- const DrawPortionInfo& rInfo, const OUString& rText,
+buildTextPortionPrimitive(const DrawPortionInfo& rInfo, const OUString& rText,
const drawinglayer::attribute::FontAttribute&
rFontAttribute,
const std::vector<double>& rDXArray,
const basegfx::B2DHomMatrix& rNewTransform)
@@ -104,9 +103,7 @@ buildTextPortionPrimitive(const
drawinglayer::geometry::ViewInformation2D& rView
}
// tdf#167511 get FontColor, evtl. adapted for HighContrast
- const bool
bHighContrast(Application::GetSettings().GetStyleSettings().GetHighContrastMode()
- && rViewInformation2D.getEditViewActive());
- const Color aFontColor(bHighContrast
+ const Color
aFontColor(Application::GetSettings().GetStyleSettings().GetHighContrastMode()
?
Application::GetSettings().GetStyleSettings().GetWindowTextColor()
: rInfo.mrFont.GetColor());
const basegfx::BColor aBFontColor(aFontColor.getBColor());
@@ -225,7 +222,6 @@ buildTextPortionPrimitive(const
drawinglayer::geometry::ViewInformation2D& rView
class DoCapitalsDrawPortionInfo : public SvxDoCapitals
{
private:
- const drawinglayer::geometry::ViewInformation2D& mrViewInformation2D;
drawinglayer::primitive2d::Primitive2DContainer& mrTarget;
const basegfx::B2DHomMatrix& mrNewTransformA;
const basegfx::B2DHomMatrix& mrNewTransformB;
@@ -233,13 +229,11 @@ private:
SvxFont m_aFont;
public:
- DoCapitalsDrawPortionInfo(const drawinglayer::geometry::ViewInformation2D&
rViewInformation2D,
- drawinglayer::primitive2d::Primitive2DContainer&
rTarget,
+ DoCapitalsDrawPortionInfo(drawinglayer::primitive2d::Primitive2DContainer&
rTarget,
const basegfx::B2DHomMatrix& rNewTransformA,
const basegfx::B2DHomMatrix& rNewTransformB,
const DrawPortionInfo& rInfo)
: SvxDoCapitals(rInfo.maText, rInfo.mnTextStart, rInfo.mnTextLen)
- , mrViewInformation2D(rViewInformation2D)
, mrTarget(rTarget)
, mrNewTransformA(rNewTransformA)
, mrNewTransformB(rNewTransformB)
@@ -261,7 +255,6 @@ public:
};
void CreateTextPortionPrimitivesFromDrawPortionInfo(
- const drawinglayer::geometry::ViewInformation2D& rViewInformation2D,
drawinglayer::primitive2d::Primitive2DContainer& rTarget,
const basegfx::B2DHomMatrix& rNewTransformA, const basegfx::B2DHomMatrix&
rNewTransformB,
const DrawPortionInfo& rInfo)
@@ -347,8 +340,7 @@ void CreateTextPortionPrimitivesFromDrawPortionInfo(
OUString caseMappedText = rInfo.mrFont.CalcCaseMap(rInfo.maText);
rtl::Reference<drawinglayer::primitive2d::BasePrimitive2D> pNewPrimitive(
- buildTextPortionPrimitive(rViewInformation2D, rInfo, caseMappedText,
aFontAttribute,
- aDXArray, aNewTransform));
+ buildTextPortionPrimitive(rInfo, caseMappedText, aFontAttribute,
aDXArray, aNewTransform));
bool bSmallCaps = rInfo.mrFont.IsCapital();
if (bSmallCaps && rInfo.mpDXArray.empty())
@@ -359,8 +351,8 @@ void CreateTextPortionPrimitivesFromDrawPortionInfo(
if (bSmallCaps)
{
// rerun with each sub-portion
- DoCapitalsDrawPortionInfo aDoDrawPortionInfo(rViewInformation2D,
rTarget, rNewTransformA,
- rNewTransformB, rInfo);
+ DoCapitalsDrawPortionInfo aDoDrawPortionInfo(rTarget, rNewTransformA,
rNewTransformB,
+ rInfo);
rInfo.mrFont.DoOnCapitals(aDoDrawPortionInfo);
// transfer collected primitives from rTarget to a new container
@@ -533,8 +525,8 @@ void DoCapitalsDrawPortionInfo::Do(const OUString&
rSpanTxt, const sal_Int32 nSp
nullptr, /* no field in subportion, handled outside */
false, false, false, m_rInfo.mpLocale, m_rInfo.maOverlineColor,
m_rInfo.maTextLineColor);
- CreateTextPortionPrimitivesFromDrawPortionInfo(mrViewInformation2D,
mrTarget, mrNewTransformA,
- mrNewTransformB, aInfo);
+ CreateTextPortionPrimitivesFromDrawPortionInfo(mrTarget, mrNewTransformA,
mrNewTransformB,
+ aInfo);
if (!bUpper)
m_aFont.SetPropr(nProp);
@@ -607,9 +599,8 @@ void
TextHierarchyBreakup::flushLinePrimitivesToParagraphPrimitives(sal_Int32 nP
void TextHierarchyBreakup::processDrawPortionInfo(const DrawPortionInfo&
rDrawPortionInfo)
{
- CreateTextPortionPrimitivesFromDrawPortionInfo(getViewInformation2D(),
maTextPortionPrimitives,
- maNewTransformA,
maNewTransformB,
- rDrawPortionInfo);
+ CreateTextPortionPrimitivesFromDrawPortionInfo(maTextPortionPrimitives,
maNewTransformA,
+ maNewTransformB,
rDrawPortionInfo);
if (rDrawPortionInfo.mbEndOfLine || rDrawPortionInfo.mbEndOfParagraph)
{
@@ -665,10 +656,8 @@ void TextHierarchyBreakup::directlyAddB2DPrimitive(
maTextPortionPrimitives.push_back(rSource);
}
-TextHierarchyBreakup::TextHierarchyBreakup(
- const drawinglayer::geometry::ViewInformation2D& rViewInformation2D)
- : StripPortionsHelper(rViewInformation2D)
- , maTextPortionPrimitives()
+TextHierarchyBreakup::TextHierarchyBreakup()
+ : maTextPortionPrimitives()
, maLinePrimitives()
, maParagraphPrimitives()
, maNewTransformA()
@@ -676,11 +665,9 @@ TextHierarchyBreakup::TextHierarchyBreakup(
{
}
-TextHierarchyBreakup::TextHierarchyBreakup(
- const drawinglayer::geometry::ViewInformation2D& rViewInformation2D,
- const basegfx::B2DHomMatrix& rNewTransformA, const basegfx::B2DHomMatrix&
rNewTransformB)
- : StripPortionsHelper(rViewInformation2D)
- , maTextPortionPrimitives()
+TextHierarchyBreakup::TextHierarchyBreakup(const basegfx::B2DHomMatrix&
rNewTransformA,
+ const basegfx::B2DHomMatrix&
rNewTransformB)
+ : maTextPortionPrimitives()
, maLinePrimitives()
, maParagraphPrimitives()
, maNewTransformA(rNewTransformA)
@@ -720,17 +707,16 @@ sal_Int32
TextHierarchyBreakupOutliner::getParagraphCount() const
return mrOutliner.GetParagraphCount();
}
-TextHierarchyBreakupOutliner::TextHierarchyBreakupOutliner(
- const drawinglayer::geometry::ViewInformation2D& rViewInformation2D,
Outliner& rOutliner)
- : TextHierarchyBreakup(rViewInformation2D)
+TextHierarchyBreakupOutliner::TextHierarchyBreakupOutliner(Outliner& rOutliner)
+ : TextHierarchyBreakup()
, mrOutliner(rOutliner)
{
}
TextHierarchyBreakupOutliner::TextHierarchyBreakupOutliner(
- const drawinglayer::geometry::ViewInformation2D& rViewInformation2D,
Outliner& rOutliner,
- const basegfx::B2DHomMatrix& rNewTransformA, const basegfx::B2DHomMatrix&
rNewTransformB)
- : TextHierarchyBreakup(rViewInformation2D, rNewTransformA, rNewTransformB)
+ Outliner& rOutliner, const basegfx::B2DHomMatrix& rNewTransformA,
+ const basegfx::B2DHomMatrix& rNewTransformB)
+ : TextHierarchyBreakup(rNewTransformA, rNewTransformB)
, mrOutliner(rOutliner)
{
}
diff --git a/editeng/source/editeng/editview.cxx
b/editeng/source/editeng/editview.cxx
index b21cd9a56a66..ae94c4c9b3f0 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -411,8 +411,7 @@ void EditView::DrawText_ToEditView( const tools::Rectangle&
rRect, OutputDevice*
{
// use TextHierarchyBreakup to get all text embedded to the
// TextHierarchy.*Primitive2D groupings for better processing
- const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
- TextHierarchyBreakup aHelper(aViewInformation2D);
+ TextHierarchyBreakup aHelper;
// hand that Helper over to DrawText_ToEditView at the EditEngine
// for usage
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 4ef20665453c..7ddae54bd77d 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -3382,18 +3382,18 @@ void ImpEditEngine::DrawText_ToPosition( OutputDevice&
rOutDev, const Point& rSt
if (bUsePrimitives)
{
// extract Primitives.
- // create ViewInformation2D based on target OutputDevice
- drawinglayer::geometry::ViewInformation2D aViewInformation2D;
-
aViewInformation2D.setViewTransformation(rOutDev.GetViewTransformation());
-
// Do not use Orientation, that will be added below as transformation
- TextHierarchyBreakup aHelper(aViewInformation2D);
+ TextHierarchyBreakup aHelper;
PaintOrStrip(rOutDev, aBigRect, aStartPos, 0_deg10, &aHelper);
if (aHelper.getTextPortionPrimitives().empty())
// no Primitives, done
return;
+ // create ViewInformation2D based on target OutputDevice
+ drawinglayer::geometry::ViewInformation2D aViewInformation2D;
+
aViewInformation2D.setViewTransformation(rOutDev.GetViewTransformation());
+
// get content
drawinglayer::primitive2d::Primitive2DContainer
aContent(aHelper.getTextPortionPrimitives());
@@ -3450,20 +3450,20 @@ void ImpEditEngine::DrawText_ToRectangle( OutputDevice&
rOutDev, const tools::Re
if (bUsePrimitives)
{
- // create ViewInformation2D based on target OutputDevice
- drawinglayer::geometry::ViewInformation2D aViewInformation2D;
-
aViewInformation2D.setViewTransformation(rOutDev.GetViewTransformation());
- const basegfx::B2DRange
aClipRange(vcl::unotools::b2DRectangleFromRectangle(aOutRect));
- aViewInformation2D.setViewport(aClipRange);
-
// extract Primitives
- TextHierarchyBreakup aHelper(aViewInformation2D);
+ TextHierarchyBreakup aHelper;
PaintOrStrip(rOutDev, aOutRect, aStartPos, 0_deg10, &aHelper);
if (aHelper.getTextPortionPrimitives().empty())
// no Primitives, done
return;
+ // create ViewInformation2D based on target OutputDevice
+ drawinglayer::geometry::ViewInformation2D aViewInformation2D;
+
aViewInformation2D.setViewTransformation(rOutDev.GetViewTransformation());
+ const basegfx::B2DRange
aClipRange(vcl::unotools::b2DRectangleFromRectangle(aOutRect));
+ aViewInformation2D.setViewport(aClipRange);
+
// get content and it's range
drawinglayer::primitive2d::Primitive2DContainer
aContent(aHelper.getTextPortionPrimitives());
const basegfx::B2DRange
aContentRange(aContent.getB2DRange(aViewInformation2D));
diff --git a/editeng/source/outliner/outlvw.cxx
b/editeng/source/outliner/outlvw.cxx
index faf04e84c2c0..c7e772be9524 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -69,9 +69,8 @@ void OutlinerView::DrawText_ToEditView( const
tools::Rectangle& rRect, OutputDev
// use TextHierarchyBreakupOutliner to get all text embedded to the
// TextHierarchy.*Primitive2D groupings for better processing, plus
- // the correct paragraph countings
- const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
- TextHierarchyBreakupOutliner aHelper(aViewInformation2D, rOwner);
+ // the correct paragtaph countings
+ TextHierarchyBreakupOutliner aHelper(rOwner);
// hand that Helper over to DrawText_ToEditView at the EditEngine
// for usage
diff --git a/include/editeng/StripPortionsHelper.hxx
b/include/editeng/StripPortionsHelper.hxx
index ab19e78298e9..dc235471eb37 100644
--- a/include/editeng/StripPortionsHelper.hxx
+++ b/include/editeng/StripPortionsHelper.hxx
@@ -109,23 +109,11 @@ public:
class EDITENG_DLLPUBLIC StripPortionsHelper
{
- const drawinglayer::geometry::ViewInformation2D& mrViewInformation2D;
-
public:
- StripPortionsHelper(const drawinglayer::geometry::ViewInformation2D&
rViewInformation2D)
- : mrViewInformation2D(rViewInformation2D)
- {
- }
-
virtual void processDrawPortionInfo(const DrawPortionInfo&) = 0;
virtual void processDrawBulletInfo(const DrawBulletInfo&) = 0;
virtual void directlyAddB2DPrimitive(const
drawinglayer::primitive2d::Primitive2DReference&)
= 0;
-
- const drawinglayer::geometry::ViewInformation2D& getViewInformation2D()
const
- {
- return mrViewInformation2D;
- }
};
class EDITENG_DLLPUBLIC TextHierarchyBreakup : public StripPortionsHelper
@@ -148,9 +136,8 @@ public:
virtual void
directlyAddB2DPrimitive(const
drawinglayer::primitive2d::Primitive2DReference&) override;
- TextHierarchyBreakup(const drawinglayer::geometry::ViewInformation2D&
rViewInformation2D);
- TextHierarchyBreakup(const drawinglayer::geometry::ViewInformation2D&
rViewInformation2D,
- const basegfx::B2DHomMatrix& rNewTransformA,
+ TextHierarchyBreakup();
+ TextHierarchyBreakup(const basegfx::B2DHomMatrix& rNewTransformA,
const basegfx::B2DHomMatrix& rNewTransformB);
const drawinglayer::primitive2d::Primitive2DContainer&
getTextPortionPrimitives();
@@ -165,11 +152,9 @@ protected:
virtual sal_Int32 getParagraphCount() const override;
public:
- TextHierarchyBreakupOutliner(
- const drawinglayer::geometry::ViewInformation2D& rViewInformation2D,
Outliner& rOutliner);
- TextHierarchyBreakupOutliner(
- const drawinglayer::geometry::ViewInformation2D& rViewInformation2D,
Outliner& rOutliner,
- const basegfx::B2DHomMatrix& rNewTransformA, const
basegfx::B2DHomMatrix& rNewTransformB);
+ TextHierarchyBreakupOutliner(Outliner& rOutliner);
+ TextHierarchyBreakupOutliner(Outliner& rOutliner, const
basegfx::B2DHomMatrix& rNewTransformA,
+ const basegfx::B2DHomMatrix& rNewTransformB);
};
#endif // INCLUDED_EDITENG_STRIPPORTIONSHELPER_HXX
diff --git a/include/svx/svdoutl.hxx b/include/svx/svdoutl.hxx
index b8e45b213b9d..0af4f6804849 100644
--- a/include/svx/svdoutl.hxx
+++ b/include/svx/svdoutl.hxx
@@ -63,7 +63,6 @@ public:
virtual void processDrawPortionInfo(const DrawPortionInfo&
rDrawPortionInfo) override;
TextHierarchyBreakupBlockText(
- const drawinglayer::geometry::ViewInformation2D& rViewInformation2D,
SdrOutliner& rOutliner,
const basegfx::B2DHomMatrix& rNewTransformA,
const basegfx::B2DHomMatrix& rNewTransformB,
@@ -79,7 +78,6 @@ public:
virtual void processDrawPortionInfo(const DrawPortionInfo&
rDrawPortionInfo) override;
TextHierarchyBreakupContourText(
- const drawinglayer::geometry::ViewInformation2D& rViewInformation2D,
SdrOutliner& rOutliner,
const basegfx::B2DHomMatrix& rNewTransformA,
const basegfx::B2DHomMatrix& rNewTransformB,
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 614651c98f48..566a1f4be261 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -2312,10 +2312,7 @@ drawinglayer::primitive2d::Primitive2DContainer
ScTextEditOverlayObject::createO
// use no transformations. The result will be in logic coordinates
// based on aEditRectangle and the EditEngine setup, see
// ScViewData::SetEditEngine
- drawinglayer::geometry::ViewInformation2D aViewInformation2D;
- // TextEditOverlay is only possible in EditView, activate it
- aViewInformation2D.setEditViewActive(true);
- TextHierarchyBreakup aBreakup(aViewInformation2D);
+ TextHierarchyBreakup aBreakup;
pEditView->getEditEngine().StripPortions(aBreakup);
aRetval = aBreakup.getTextPortionPrimitives();
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index ca575912232e..e0a3b26fa19f 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -784,11 +784,8 @@ void TextEditOverlayObject::checkDataChange(const
basegfx::B2DRange& rMinTextEdi
// of this mechanism, it *may* be possible to buffer layouted
// primitives per ParaPortion with/in/dependent on the EditEngine
// content if needed. For now, get and compare
- drawinglayer::geometry::ViewInformation2D aViewInformation2D;
- // TextEditOverlay is only possible in EditView, activate it
- aViewInformation2D.setEditViewActive(true);
- TextHierarchyBreakupBlockText aBreakup(aViewInformation2D,
*pSdrOutliner, aNewTransformA,
- aNewTransformB, aClipRange);
+ TextHierarchyBreakupBlockText aBreakup(*pSdrOutliner, aNewTransformA,
aNewTransformB,
+ aClipRange);
pSdrOutliner->StripPortions(aBreakup);
aNewTextPrimitives.append(aBreakup.getTextPortionPrimitives());
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx
b/svx/source/svdraw/svdotextdecomposition.cxx
index 3f7d41a6597d..7a6001d628e4 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -152,7 +152,6 @@ void SdrTextObj::impDecomposeContourTextPrimitive(
// ScaledUnitPolyPolygon. Thus aPolyPolygon might be smaller than aScale
from aObjectMatrix. We
// use this smaller size for the text area, otherwise the text will reach
into the stroke.
TextHierarchyBreakupContourText aBreakup(
- aViewInformation,
rOutliner,
aNewTransformA,
aNewTransformB,
@@ -304,7 +303,6 @@ void SdrTextObj::impDecomposeAutoFitTextPrimitive(
// now break up text primitives.
TextHierarchyBreakupBlockText aBreakup(
- aViewInformation,
rOutliner,
aNewTransformA,
aNewTransformB,
@@ -622,7 +620,6 @@ void SdrTextObj::impDecomposeBlockTextPrimitive(
// now break up text primitives.
TextHierarchyBreakupBlockText aBreakup(
- aViewInformation,
rOutliner,
aNewTransformA,
aNewTransformB,
@@ -707,7 +704,6 @@ void SdrTextObj::impDecomposeStretchTextPrimitive(
// now break up text primitives.
TextHierarchyBreakupOutliner aBreakup(
- aViewInformation,
rOutliner,
aNewTransformA,
aNewTransformB);
@@ -1137,7 +1133,6 @@ void SdrTextObj::impDecomposeChainedTextPrimitive(
// now break up text primitives.
TextHierarchyBreakupBlockText aBreakup(
- aViewInformation,
rOutliner,
aNewTransformA,
aNewTransformB,
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx
b/svx/source/svdraw/svdotextpathdecomposition.cxx
index 20fa93f76490..ec4017ba4350 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -154,12 +154,6 @@ namespace
::std::vector< impPathTextPortion > maPathTextPortions;
public:
- TextHierarchyBreakupPathTextPortions(const
drawinglayer::geometry::ViewInformation2D& rViewInformation2D)
- : StripPortionsHelper(rViewInformation2D)
- , maPathTextPortions()
- {
- }
-
virtual void processDrawPortionInfo(const DrawPortionInfo&
rDrawPortionInfo) override
{
// extract and add data for TextOnPath further processing
@@ -646,7 +640,7 @@ void SdrTextObj::impDecomposePathTextPrimitive(
rOutliner.setVisualizedPage(GetSdrPageFromXDrawPage(aViewInformation.getVisualizedPage()));
// now break up to text portions
- TextHierarchyBreakupPathTextPortions aBreakup(aViewInformation);
+ TextHierarchyBreakupPathTextPortions aBreakup;
rOutliner.StripPortions(aBreakup);
const ::std::vector< impPathTextPortion >
rPathTextPortions(aBreakup.sortAndGetPathTextPortions());
diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx
index dff076f1da52..da7bafc506c7 100644
--- a/svx/source/svdraw/svdoutl.cxx
+++ b/svx/source/svdraw/svdoutl.cxx
@@ -166,13 +166,11 @@ void
TextHierarchyBreakupBlockText::processDrawPortionInfo(const DrawPortionInfo
}
TextHierarchyBreakupBlockText::TextHierarchyBreakupBlockText(
- const drawinglayer::geometry::ViewInformation2D& rViewInformation2D,
SdrOutliner& rOutliner,
const basegfx::B2DHomMatrix& rNewTransformA,
const basegfx::B2DHomMatrix& rNewTransformB,
const basegfx::B2DRange& rClipRange)
: TextHierarchyBreakupOutliner(
- rViewInformation2D,
rOutliner,
rNewTransformA,
rNewTransformB)
@@ -191,13 +189,11 @@ void
TextHierarchyBreakupContourText::processDrawPortionInfo(const DrawPortionIn
}
TextHierarchyBreakupContourText::TextHierarchyBreakupContourText(
- const drawinglayer::geometry::ViewInformation2D& rViewInformation2D,
SdrOutliner& rOutliner,
const basegfx::B2DHomMatrix& rNewTransformA,
const basegfx::B2DHomMatrix& rNewTransformB,
const basegfx::B2DVector& rScale)
: TextHierarchyBreakupOutliner(
- rViewInformation2D,
rOutliner,
rNewTransformA,
rNewTransformB)
commit 355ffcbd8242e8e2c4df3daa6f2d5d61580cae12
Author: Armin Le Grand (collabora) <armin.legr...@collabora.com>
AuthorDate: Tue Jul 29 14:24:58 2025 +0200
Commit: Armin Le Grand <armin.le.gr...@me.com>
CommitDate: Wed Jul 30 13:22:26 2025 +0200
Revert "tdf#167511 correctly apply Color in HighContrast mode to text III"
This reverts commit 6381d366672234d899eeff278870cfb1c5d100e9.
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.gr...@me.com>
diff --git a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
index bff0ab884cff..ddb0a4075d3d 100644
--- a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
+++ b/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);
diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
index a83fe8bbc8bc..cc1e850ccb68 100644
--- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
+++ b/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
