[Libreoffice-commits] core.git: sc/source

Stephan Bergmann sbergman at redhat.com
Tue May 16 16:27:21 UTC 2017


 sc/source/ui/undo/undoblk.cxx  |   14 --------------
 sc/source/ui/undo/undoblk2.cxx |   10 +---------
 2 files changed, 1 insertion(+), 23 deletions(-)

New commits:
commit 7f2d6d8480f06434a1b5bc748ac2f3f80b2e71cb
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue May 16 18:23:32 2017 +0200

    Revert "lok: sc: invalidate col/row header on undo row/col operations"
    
    This reverts commit 76d47e6f63e11d3509339ade6203757d63582d21, breaks the build.

diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index 1c2757c40897..291151d11a6d 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -23,8 +23,6 @@
 #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"
@@ -259,19 +257,7 @@ 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 cdf75b9f1882..50404d5e09fc 100644
--- a/sc/source/ui/undo/undoblk2.cxx
+++ b/sc/source/ui/undo/undoblk2.cxx
@@ -30,8 +30,6 @@
 
 #include "undoolk.hxx"
 
-#include <comphelper/lok.hxx>
-#include <sfx2/lokhelper.hxx>
 
 /** Change column widths or row heights */
 ScUndoWidthOrHeight::ScUndoWidthOrHeight( ScDocShell* pNewDocShell,
@@ -96,7 +94,6 @@ 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)
@@ -120,6 +117,7 @@ void ScUndoWidthOrHeight::Undo()
 
     DoSdrUndoAction( pDrawUndo, &rDoc );
 
+    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if (pViewShell)
     {
         pViewShell->UpdateScrollBars();
@@ -127,12 +125,6 @@ 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();


More information about the Libreoffice-commits mailing list