sc/source/ui/view/cliputil.cxx | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 379ee97dd7a1f8cb33ed68c2d51aca13865c9c79
Author: Dennis Francis <dennis.fran...@collabora.com>
AuthorDate: Tue Jan 19 10:56:04 2021 +0530
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Thu Feb 11 17:55:07 2021 +0100
lok: Send rows heights invalidation on paste
... when the dest cell has wrap-text option set.
Change-Id: I9f0dd157694701c96fd91e02b8232ed205f13ae4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109602
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110767
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/sc/source/ui/view/cliputil.cxx b/sc/source/ui/view/cliputil.cxx
index 21d642cb3cac..00628c6e9d3e 100644
--- a/sc/source/ui/view/cliputil.cxx
+++ b/sc/source/ui/view/cliputil.cxx
@@ -20,9 +20,11 @@
#include <viewutil.hxx>
#include <markdata.hxx>
#include <gridwin.hxx>
+#include <scitems.hxx>
#include <vcl/waitobj.hxx>
#include <sfx2/classificationhelper.hxx>
+#include <comphelper/lok.hxx>
namespace
{
@@ -48,8 +50,10 @@ void ScClipUtil::PasteFromClipboard( ScViewData* pViewData,
ScTabViewShell* pTab
{
const ScTransferObj* pOwnClip =
ScTransferObj::GetOwnClipboard(ScTabViewShell::GetClipData(pViewData->GetActiveWin()));
ScDocument* pThisDoc = pViewData->GetDocument();
- ScDPObject* pDPObj = pThisDoc->GetDPAtCursor( pViewData->GetCurX(),
- pViewData->GetCurY(), pViewData->GetTabNo() );
+ SCCOL nThisCol = pViewData->GetCurX();
+ SCROW nThisRow = pViewData->GetCurY();
+ SCTAB nThisTab = pViewData->GetTabNo();
+ ScDPObject* pDPObj = pThisDoc->GetDPAtCursor( nThisCol, nThisRow, nThisTab
);
if ( pOwnClip && pDPObj )
{
// paste from Calc into DataPilot table: sort (similar to drag & drop)
@@ -91,6 +95,12 @@ void ScClipUtil::PasteFromClipboard( ScViewData* pViewData,
ScTabViewShell* pTab
bShowDialog ); // allow warning dialog
}
}
+ if (comphelper::LibreOfficeKit::isActive())
+ {
+ const SfxBoolItem* pItem = static_cast<const
SfxBoolItem*>(pThisDoc->GetAttr(nThisCol, nThisRow, nThisTab, ATTR_LINEBREAK));
+ if (pItem->GetValue())
+ ScTabViewShell::notifyAllViewsHeaderInvalidation(ROW_HEADER,
nThisTab);
+ }
pTabViewShell->CellContentChanged(); // => PasteFromSystem() ???
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
