[Libreoffice-commits] core.git: 3 commits - sw/qa sw/source writerfilter/source

[Miklos Vajna]

 sw/qa/extras/rtfimport/rtfimport.cxx |    3 ++-
 sw/source/core/doc/docbm.cxx         |    2 ++
 writerfilter/source/ooxml/efforts.sh |   20 --------------------
 3 files changed, 4 insertions(+), 21 deletions(-)

New commits:
commit 17fa344d034df1a1179b4e5961ec3001402a6df1
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat May 24 22:00:05 2014 +0200

    coverity#1158081 Unchecked dynamic_cast
    
    Change-Id: Ia67656ac35d50c1f70045ff8e9084bcc54b0d9a8

diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 901ac71..21de483 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -573,6 +573,8 @@ namespace sw { namespace mark
             ++ppMark)
         {
             ::sw::mark::MarkBase* pMark = dynamic_cast< ::sw::mark::MarkBase* >(ppMark->get());
+            if (!pMark)
+                continue;
             // is on position ??
             bool bChangedPos = false;
             if(&pMark->GetMarkPos().nNode.GetNode() == pOldNode)
commit 8617afc0a88789722202cd0f30678eaee6c95580
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat May 24 21:55:34 2014 +0200

    writerfilter: unused efforts.sh
    
    Change-Id: Ide86e29584faeff1d4b8a7d6d8a9a59acc725bd4

diff --git a/writerfilter/source/ooxml/efforts.sh b/writerfilter/source/ooxml/efforts.sh
deleted file mode 100755
index e2c58e2..0000000
--- a/writerfilter/source/ooxml/efforts.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-./status.sh | xmllint --format - | xsltproc todo.xsl - | xsltproc effort.xsl -
commit 1c14618eaf7c2cc15f060733d6f88a5d4ed132f9
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat May 24 21:53:19 2014 +0200

    CppunitTest_sw_rtfimport: the point here was only that this was nearly zero
    
    If the old width was that small, then something larger should be also
    fine. (Seen 564 instead of 423.)
    
    Change-Id: Ife0fd4a55738268cdc1691b90e28b51adba829ef

diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index e96f037..0284736 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -821,7 +821,8 @@ DECLARE_RTFIMPORT_TEST(testFdo52989, "fdo52989.rtf")
 {
     // Same as n#192129, but for JPEG files.
     uno::Reference<drawing::XShape> xShape(getShape(1), uno::UNO_QUERY);
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(423), xShape->getSize().Width);
+    // This was 2, should be 423.
+    CPPUNIT_ASSERT(xShape->getSize().Width >= 423);
 }
 
 DECLARE_RTFIMPORT_TEST(testFdo48442, "fdo48442.rtf")