[Libreoffice-commits] core.git: vcl/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Mon Feb 3 19:24:12 UTC 2020


 vcl/source/control/edit.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 12f9fdfac8b41d74e9474e8966e3d28755424931
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Feb 3 15:19:07 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Feb 3 20:23:43 2020 +0100

    Related: tdf#129933 assert on pasting over selection in edit
    
    when its selected right to left with cursor flashing at the start
    
    format->paragraph->area->color->pick, cursor into hex# edit, end to
    cursor at the end, shift + home to select all, right to left, ctrl+c,
    ctrl+v, assert
    
    Change-Id: I8e29108ddff94487c298bd5e6607b98f5f841afd
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87883
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index a8a2cbe6f833..b3de2be3a68f 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1286,8 +1286,12 @@ void Edit::ImplPaste( uno::Reference< datatransfer::clipboard::XClipboard > cons
                 uno::Any aData = xDataObj->getTransferData( aFlavor );
                 OUString aText;
                 aData >>= aText;
-                if( ImplTruncateToMaxLen( aText, maSelection.Len() ) )
+
+                Selection aSelection(maSelection);
+                aSelection.Justify();
+                if (ImplTruncateToMaxLen(aText, aSelection.Len()))
                     ShowTruncationWarning(GetFrameWeld());
+
                 ReplaceSelected( aText );
             }
             catch( const css::uno::Exception& )


More information about the Libreoffice-commits mailing list