[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - sc/source

[Marco Cecchetti]

 sc/source/ui/drawfunc/fuins1.cxx |   27 ---------------------------
 sc/source/ui/view/tabvwsh4.cxx   |   25 +------------------------
 2 files changed, 1 insertion(+), 51 deletions(-)

New commits:
commit 57402a5c2d2ba1635c43ef2a97d71e17652b707d
Author: Marco Cecchetti <marco.cecchetti at collabora.com>
Date:   Sun Jan 1 20:32:51 2017 +0100

    Revert "Invalidate the entire sheet after having inserted the image."
    
    This reverts commit fe87a31885dc870a9a8e4c4dcb105a4a5627164f
    
    Change-Id: I8fb9b67696913c1de0778d22b242673c89b07813
    Reviewed-on: https://gerrit.libreoffice.org/32689
    Reviewed-by: Marco Cecchetti <mrcekets at gmail.com>
    Tested-by: Marco Cecchetti <mrcekets at gmail.com>

diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index 9dc65bf..c7fd4c9 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -23,7 +23,6 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdview.hxx>
-#include <svx/svdundo.hxx>
 #include <svx/linkwarn.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <svl/stritem.hxx>
@@ -42,10 +41,6 @@
 #include "sc.hrc"
 #include "globstr.hrc"
 
-#include <LibreOfficeKit/LibreOfficeKitEnums.h>
-#include <comphelper/lok.hxx>
-#include <sfx2/lokhelper.hxx>
-
 using namespace ::com::sun::star;
 
 void ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& rPage )
@@ -256,28 +251,6 @@ FuInsertGraphic::FuInsertGraphic( ScTabViewShell*   pViewSh,
         if ( nError == GRFILTER_OK )
         {
             lcl_InsertGraphic( aGraphic, aFileName, aFilterName, bAsLink, true, pViewSh, pWindow, pView );
-
-            // FIXME HACK: The ViewObjectContact sdr thing is not set up well
-            // enough for the invalidate to work here automagically, because
-            // we set it up for each tile, and it does not survive for too
-            // long.  Luckily for inserting an image, we can live with a full
-            // invalidate, so let's just do it for now.
-            if (comphelper::LibreOfficeKit::isActive())
-            {
-                std::stringstream ss;
-                ss << "EMPTY";
-                if (comphelper::LibreOfficeKit::isPartInInvalidation())
-                    ss << ", " << pViewSh->getPart();
-                OString aPayload = ss.str().c_str();
-
-                SfxViewShell* pCurView = SfxViewShell::GetFirst();
-                while (pCurView)
-                {
-                    pCurView->libreOfficeKitViewCallback(LOK_CALLBACK_INVALIDATE_TILES, aPayload.getStr());
-
-                    pCurView = SfxViewShell::GetNext(*pCurView);
-                }
-            }
         }
     }
     else
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index aa6f763..4ef54ad 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -572,30 +572,7 @@ void ScTabViewShell::UpdateDrawShell()
 
     SdrView* pDrView = GetSdrView();
     if ( pDrView && !pDrView->AreObjectsMarked() && !IsDrawSelMode() )
-    {
-        SetDrawShell(false);
-
-        // FIXME HACK: The ViewObjectContact sdr thing is not set up well
-        // enough for the invalidate to work here automagically, because
-        // we set it up for each tile, and it does not survive for too
-        // long.
-        if (comphelper::LibreOfficeKit::isActive())
-        {
-            std::stringstream ss;
-            ss << "EMPTY";
-            if (comphelper::LibreOfficeKit::isPartInInvalidation())
-                ss << ", " << getPart();
-            OString aPayload = ss.str().c_str();
-
-            SfxViewShell* pCurView = SfxViewShell::GetFirst();
-            while (pCurView)
-            {
-                pCurView->libreOfficeKitViewCallback(LOK_CALLBACK_INVALIDATE_TILES, aPayload.getStr());
-
-                pCurView = SfxViewShell::GetNext(*pCurView);
-            }
-        }
-    }
+        SetDrawShell( false );
 }
 
 void ScTabViewShell::SetDrawShellOrSub()