drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx | 5 +---- svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx | 11 +---------- 2 files changed, 2 insertions(+), 14 deletions(-)
New commits: commit 316c33628e67b41c69796c1af69b21f8d6c205c4 Author: Caolán McNamara <[email protected]> AuthorDate: Wed Jan 21 22:23:11 2026 +0100 Commit: Szymon Kłos <[email protected]> CommitDate: Thu Jan 22 05:50:27 2026 +0100 Revert "drawinglayer: suppress text if text in edited in other view in LOK case" This reverts commit df6dc0146e5936d0fc23592d489deb1015c8c03b. Reason for revert: With this in place I get: Expected to find element: `text tspan.TextPosition tspan`, but never found it from make check-mobile spec=impress/apply_font_text_spec.js while without it the test (generally) passes Change-Id: I58daa1051da173b20e5f9aae1ec89eb160efaa22 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197775 Reviewed-by: Szymon Kłos <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx index f99268bad576..d0a69ad9a336 100644 --- a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx @@ -148,10 +148,7 @@ namespace drawinglayer::primitive2d { // check if TextEdit is active. If not, process. If yes, suppress the content // lok case: always decompose it when we're rendering a slide show - bool bSuppress = rViewInformation.getTextEditActive() || comphelper::LibreOfficeKit::isActive(); - if (comphelper::LibreOfficeKit::isSlideshowRendering()) - bSuppress = false; - if (!bSuppress) + if (!rViewInformation.getTextEditActive() || comphelper::LibreOfficeKit::isSlideshowRendering()) GroupPrimitive2D::get2DDecomposition(rVisitor, rViewInformation); } diff --git a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx index 6a1427718c07..d6eb5bb303ae 100644 --- a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx @@ -24,7 +24,6 @@ #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <drawinglayer/primitive2d/exclusiveeditviewprimitive2d.hxx> -#include <drawinglayer/primitive2d/texthierarchyprimitive2d.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <utility> @@ -136,15 +135,7 @@ namespace drawinglayer::primitive2d } else { - if (getSdrLFSTAttribute().getText().isInEditMode()) - { - drawinglayer::primitive2d::Primitive2DReference aWrapped( - new drawinglayer::primitive2d::TextHierarchyEditPrimitive2D( - std::move(aTempContentText))); - aRetval.append(std::move(aWrapped)); - } - else - aRetval.append(std::move(aTempContentText)); + aRetval.append(std::move(aTempContentText)); } }
