summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorMarco Cecchetti <marco.cecchetti@collabora.com>2017-05-03 17:22:27 +0200
committerMarco Cecchetti <mrcekets@gmail.com>2017-05-16 20:48:01 +0200
commit6e3f9d38c0bdeff606d36ce8daabd3ad8ee1b6bb (patch)
tree8e3781e3dc78d840d7636e9e37fe060e69138e03 /sc
parentad605e2e0606ee2c5c0fb23b84a0f011af62d124 (diff)
lok: sc: invalidate col/row header on undo row/col operations
Change-Id: Ia0b2174cfcc3f2b3075e8f6eee1eb0f56b64db44 Reviewed-on: https://gerrit.libreoffice.org/37686 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Marco Cecchetti <mrcekets@gmail.com>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/undo/undoblk.cxx14
-rw-r--r--sc/source/ui/undo/undoblk2.cxx10
2 files changed, 23 insertions, 1 deletions
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index 291151d11a6d..1c2757c40897 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -23,6 +23,8 @@
#include <editeng/boxitem.hxx>
#include <editeng/justifyitem.hxx>
#include <sfx2/app.hxx>
+#include <comphelper/lok.hxx>
+#include <sfx2/lokhelper.hxx>
#include "undoblk.hxx"
#include "undoutil.hxx"
@@ -257,7 +259,19 @@ void ScUndoInsertCells::DoChange( const bool bUndo )
}
pDocShell->PostDataChanged();
if (pViewShell)
+ {
pViewShell->CellContentChanged();
+
+ if (comphelper::LibreOfficeKit::isActive())
+ {
+ if (eCmd == INS_INSCOLS_BEFORE || eCmd == INS_INSCOLS_AFTER || eCmd == INS_CELLSRIGHT)
+ ScTabViewShell::notifyAllViewsHeaderInvalidation("column", pViewShell->GetViewData().GetTabNo());
+
+ if (eCmd == INS_INSROWS_BEFORE || eCmd == INS_INSROWS_AFTER || eCmd == INS_CELLSDOWN)
+ ScTabViewShell::notifyAllViewsHeaderInvalidation("row", pViewShell->GetViewData().GetTabNo());
+ }
+
+ }
}
void ScUndoInsertCells::Undo()
diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx
index 50404d5e09fc..cdf75b9f1882 100644
--- a/sc/source/ui/undo/undoblk2.cxx
+++ b/sc/source/ui/undo/undoblk2.cxx
@@ -30,6 +30,8 @@
#include "undoolk.hxx"
+#include <comphelper/lok.hxx>
+#include <sfx2/lokhelper.hxx>
/** Change column widths or row heights */
ScUndoWidthOrHeight::ScUndoWidthOrHeight( ScDocShell* pNewDocShell,
@@ -94,6 +96,7 @@ void ScUndoWidthOrHeight::Undo()
if (pUndoTab) // Outlines are included when saving ?
rDoc.SetOutlineTable( nStartTab, pUndoTab );
+ ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
SCTAB nTabCount = rDoc.GetTableCount();
ScMarkData::iterator itr = aMarkData.begin(), itrEnd = aMarkData.end();
for (; itr != itrEnd && *itr < nTabCount; ++itr)
@@ -117,7 +120,6 @@ void ScUndoWidthOrHeight::Undo()
DoSdrUndoAction( pDrawUndo, &rDoc );
- ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
{
pViewShell->UpdateScrollBars();
@@ -125,6 +127,12 @@ void ScUndoWidthOrHeight::Undo()
SCTAB nCurrentTab = pViewShell->GetViewData().GetTabNo();
if ( nCurrentTab < nStartTab || nCurrentTab > nEndTab )
pViewShell->SetTabNo( nStartTab );
+
+ if (comphelper::LibreOfficeKit::isActive())
+ {
+ OString aPayload = bWidth ? "column" : "row";
+ ScTabViewShell::notifyAllViewsHeaderInvalidation(aPayload, pViewShell->GetViewData().GetTabNo());
+ }
}
EndUndo();