core.git: Branch 'libreoffice-24-2' - svx/source

[Caolán McNamara (via logerrit)]

 svx/source/svdraw/svdotextdecomposition.cxx |   40 +++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 7 deletions(-)

New commits:
commit d768e6e376b7828e3a306a97b789a76f85f9f3b9
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sun Mar 3 14:53:19 2024 +0000
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Sun Mar 3 20:35:56 2024 +0100

    Resolves: tdf#159696 Small capitals with 'Individual words' underlining
    
    Change-Id: I79af3f74ef384f734273b00bddbcfed8952a3ad2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164275
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index 1bad74cebb70..a74c6d5b8f3a 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -35,6 +35,7 @@
 #include <basegfx/vector/b2dvector.hxx>
 #include <sdr/primitive2d/sdrtextprimitive2d.hxx>
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
+#include <drawinglayer/primitive2d/textbreakuphelper.hxx>
 #include <drawinglayer/primitive2d/textprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx>
 #include <basegfx/range/b2drange.hxx>
@@ -328,13 +329,38 @@ namespace
                 const 
drawinglayer::primitive2d::TextDecoratedPortionPrimitive2D* pTCPP =
                     static_cast<const 
drawinglayer::primitive2d::TextDecoratedPortionPrimitive2D*>(pNewPrimitive.get());
 
-                pTCPP->CreateDecorationGeometryContent(
-                    aContainer,
-                    pTCPP->getTextTransform(),
-                    caseMappedText,
-                    rInfo.mnTextStart,
-                    rInfo.mnTextLen,
-                    aDXArray);
+                if (pTCPP->getWordLineMode()) // single word mode: 'Individual 
words' in UI
+                {
+                    // Split to single word primitives using TextBreakupHelper
+                    drawinglayer::primitive2d::TextBreakupHelper 
aTextBreakupHelper(*pTCPP);
+                    drawinglayer::primitive2d::Primitive2DContainer 
aBroken(aTextBreakupHelper.extractResult(drawinglayer::primitive2d::BreakupUnit::Word));
+                    for (auto& rPortion : aBroken)
+                    {
+                        assert(rPortion->getPrimitive2DID() == 
PRIMITIVE2D_ID_TEXTDECORATEDPORTIONPRIMITIVE2D &&
+                               "TextBreakupHelper generates same output 
primitive type as input");
+
+                        const 
drawinglayer::primitive2d::TextDecoratedPortionPrimitive2D* pPortion =
+                            static_cast<const 
drawinglayer::primitive2d::TextDecoratedPortionPrimitive2D*>(rPortion.get());
+
+                        pPortion->CreateDecorationGeometryContent(
+                            aContainer,
+                            pPortion->getTextTransform(),
+                            caseMappedText,
+                            pPortion->getTextPosition(),
+                            pPortion->getTextLength(),
+                            pPortion->getDXArray());
+                    }
+                }
+                else
+                {
+                    pTCPP->CreateDecorationGeometryContent(
+                        aContainer,
+                        pTCPP->getTextTransform(),
+                        caseMappedText,
+                        rInfo.mnTextStart,
+                        rInfo.mnTextLen,
+                        aDXArray);
+                }
             }
 
             pNewPrimitive = new 
drawinglayer::primitive2d::GroupPrimitive2D(std::move(aContainer));