summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-01-23 16:45:51 +0000
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2015-02-03 12:19:43 +0100
commit48cdb25686e0db390c910622d729590a19213a5d (patch)
tree569348a1b0b0806e4f53834e34f29c56ccefd598
parent6e4e936d9bffbe7f890809b722a74cd7f95106a8 (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.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index ba1aec8524c4..0b4daceaa1ea 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