[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sc/source

[Caolán McNamara]

 sc/source/ui/app/transobj.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 48cdb25686e0db390c910622d729590a19213a5d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 23 16:45:51 2015 +0000

    Resolves: fdo#75565 reduce block on pasting rtf like we do for html
    
    Change-Id: I74a9748a2e4981dc5d1677f06db7eceed9e4b108
    (cherry picked from commit 0efbd9931ea854cf71c4c54ca3f3d55d6db1fa13)
    Reviewed-on: https://gerrit.libreoffice.org/14144
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit a0ef7698b7df63b8befe274305051063425f8eb6)

diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index ba1aec8..0b4dace 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -295,8 +295,9 @@ sal_Bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor, const
 
             bool bIncludeFiltered = pDoc->IsCutMode() || bUsedForLink;
 
+            bool bReduceBlockFormat = nFormat == SOT_FORMATSTR_ID_HTML || nFormat == SOT_FORMAT_RTF;
             ScRange aReducedBlock = aBlock;
-            if ( nFormat == SOT_FORMATSTR_ID_HTML && (aBlock.aEnd.Col() == MAXCOL || aBlock.aEnd.Row() == MAXROW) && aBlock.aStart.Tab() == aBlock.aEnd.Tab() )
+            if (bReduceBlockFormat && (aBlock.aEnd.Col() == MAXCOL || aBlock.aEnd.Row() == MAXROW) && aBlock.aStart.Tab() == aBlock.aEnd.Tab())
             {
                 bool bShrunk = false;
                 //shrink the area to allow pasting to external applications