diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-01-23 16:45:51 +0000 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2015-02-06 13:13:43 +0100 |
commit | ff876c5ca311d3a416923c24c39e7129dd267a72 (patch) | |
tree | 7f37642a7479340472e52429886fc7ed1721a8e2 | |
parent | e8270bb89115ef5edf017c1230aacf23f887f7db (diff) |
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@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit a0ef7698b7df63b8befe274305051063425f8eb6)
-rw-r--r-- | sc/source/ui/app/transobj.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 1d3bb94e2906..380f49489da9 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -290,8 +290,9 @@ bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor, const OUSt 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 |