[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sc/qa sc/source

Thorsten Behrens (via logerrit) logerrit at kemper.freedesktop.org
Tue May 28 22:22:23 UTC 2019


 sc/qa/unit/subsequent_filters-test.cxx |    1 +
 sc/source/core/data/drwlayer.cxx       |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 5845eee5c0b45e85d55b120eb555b312cb8bbc8e
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Tue May 28 16:08:58 2019 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed May 29 00:21:22 2019 +0200

    sc: fix WaE
    
    Change-Id: I68aaeb638df6bb4858371adc81f80f4228be8ac9

diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index a5a276ea055d..75173251efaf 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -3533,6 +3533,7 @@ void ScFiltersTest::testAutoheight2Rows()
 
     // We will do relative comparison, because calculated autoheight
     // can be different on different platforms
+    (void)nHeight2;
     CPPUNIT_ASSERT_MESSAGE("Row #3 shoud be thinner than #1", nHeight3 < nHeight1);
 
     xDocSh->DoClose();
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index eb471d300b07..e875e92ffd08 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -1480,8 +1480,8 @@ void ScDrawLayer::DeleteObjectsInSelection( const ScMarkData& rMark )
                                                      pObjData->maStart.Row()));
                         if (bObjectInMarkArea || bObjectAnchoredToMarkedCell)
                         {
-                            ScRange aRange = pDoc->GetRange( nTab, aObjRect );
-                            if (rMark.IsAllMarked(aRange))
+                            ScRange aRange2 = pDoc->GetRange( nTab, aObjRect );
+                            if (rMark.IsAllMarked(aRange2))
                                 ppObj[nDelCount++] = pObject;
                         }
                     }


More information about the Libreoffice-commits mailing list