[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sc/source

[Serge Krot]

 sc/source/ui/view/cellsh1.cxx |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 600fd17be36bb37a4f439c2c8b812d46fae2007f
Author: Serge Krot <Serge.Krot at cib.de>
Date:   Fri Nov 17 16:21:31 2017 +0100

    tdf#50746 Make "paste unformatted text" work for Calc
    
    The same command with the same Ctrl+Shift+Alt+V hot-key
    was already added inside Writer. So now Calc has it too.
    
    Change-Id: I2b2d1b02e33288bc058c773431f029fb1d33d3be
    Reviewed-on: https://gerrit.libreoffice.org/44886
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Reviewed-on: https://gerrit.libreoffice.org/45013
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 5e4d470c8373..14f8b8b14fea 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1645,12 +1645,17 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
             // this makes FID_INS_CELL_CONTENTS superfluous
             {
                 WaitObject aWait( GetViewData()->GetDialogParent() );
-                bool bRet = pTabViewShell->PasteFromSystem(SotClipboardFormatId::STRING, true); // TRUE: no error messages
+
+                const bool bRet = pTabViewShell->PasteFromSystem(SotClipboardFormatId::STRING, true); // TRUE: no error messages
                 if ( bRet )
                 {
-                    rReq.SetReturnValue(SfxInt16Item(nSlot, bRet ? 1 : 0)); // 1 = success, 0 = fail
+                    rReq.SetReturnValue(SfxInt16Item(nSlot, 1)); // 1 = success
                     rReq.Done();
                 }
+                else
+                {
+                    rReq.SetReturnValue(SfxInt16Item(nSlot, 0)); // 0 = fail
+                }
 
                 pTabViewShell->CellContentChanged();        // => PasteFromSystem() ???
             }