sc/source/ui/app/transobj.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit a0ef7698b7df63b8befe274305051063425f8eb6
Author: Caolán McNamara <caol...@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.mohrh...@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index cb822e2..bfcdb11 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -287,8 +287,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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
