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

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Thu Jun 25 15:24:36 UTC 2020


 sc/source/ui/view/gridwin.cxx |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit a84adccbd8cda66fd4d84c8443b0715820afd1da
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Thu May 28 12:53:16 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Jun 25 17:23:56 2020 +0200

    tdf#128502: Remove assertions that fire for gtktiledviewer on two docs
    
    If you run gtktiledviewer so that it opens a spreadsheet and a text
    document these assertions would fire.
    
    In each case the assertion is followed by code that just returns if
    the asserted condition doesn't hold, so it is unlikely that this
    change will break anything.
    
    There sure will be a lot of further changes needed to make such a use
    case work. (For starters, editing either of the two documents does not
    work.) But let's do it step by step.
    
    Change-Id: I4063dbbcac7c77b57e1f4cb3f05bd5096c08c0fe
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95037
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95144
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index e30818c50c00..094fe1d7f456 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5740,7 +5740,6 @@ void ScGridWindow::notifyKitCellViewCursor(const SfxViewShell* pForShell) const
     if (mpOOCursors) // cf. getCellCursor above
     {
         auto pForTabView = dynamic_cast<const ScTabViewShell *>(pForShell);
-        assert(pForTabView);
         if (!pForTabView)
             return;
         aCursor = pForTabView->GetViewData().describeCellCursorAt(
@@ -5777,7 +5776,6 @@ void ScGridWindow::updateKitOtherCursors() const
          it = SfxViewShell::GetNext(*it))
     {
         auto pOther = dynamic_cast<const ScTabViewShell *>(it);
-        assert(pOther);
         if (!pOther)
             continue;
         const ScGridWindow *pGrid = pOther->GetViewData().GetActiveWin();
@@ -6002,7 +6000,6 @@ void ScGridWindow::updateOtherKitSelections() const
          it = SfxViewShell::GetNext(*it))
     {
         auto pOther = dynamic_cast<const ScTabViewShell *>(it);
-        assert(pOther);
         if (!pOther)
             return;
 


More information about the Libreoffice-commits mailing list