[Libreoffice-commits] core.git: Branch 'feature/editviewoverlay' - editeng/source

[Armin Le Grand]

 editeng/source/editeng/impedit3.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 326ce5de1e7f64e589a899c919ac33c1b399959c
Author: Armin Le Grand <Armin.Le.Grand at cib.de>
Date:   Thu Aug 10 11:43:28 2017 +0200

    editviewoverlay: Adapted URL in edit mode
    
    For histotrical reasons a URL in edit mode is
    visualized in a single line. To keep compatible,
    also do this when EditView is on Overlay
    
    Change-Id: Ib11b1716aa558c13295a8a02e2845a88fa98ed11

diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index f46e14e0f0dd..4699ce520fc9 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -3250,7 +3250,14 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, tools::Rectangle aClipRect, Po
                                     nTextLen = aText.getLength();
                                     ExtraPortionInfo *pExtraInfo = rTextPortion.GetExtraInfos();
                                     // Do not split the Fields into different lines while editing
-                                    if( bStripOnly && !bParsingFields && pExtraInfo && pExtraInfo->lineBreaksList.size() )
+                                    // With EditView on Overlay bStripOnly is now set for stripping to
+                                    // primitives. To stay compatible in EditMode use pActiveView to detect
+                                    // when we are in EditMode. For whatever reason URLs are drawn as single
+                                    // line in edit mode, originally clipped against edit area (which is no
+                                    // longer done in Overlay mode and allows to *read* the URL).
+                                    // It would be difficult to change this due to needed adaptions in
+                                    // EditEngine (look for lineBreaksList creation)
+                                    if( nullptr == pActiveView && bStripOnly && !bParsingFields && pExtraInfo && pExtraInfo->lineBreaksList.size() )
                                     {
                                         bParsingFields = true;
                                         itSubLines = pExtraInfo->lineBreaksList.begin();