[Libreoffice-commits] core.git: 2 commits - editeng/source sw/qa

[Caolán McNamara]

 editeng/source/editeng/impedit.hxx             |    3 ++-
 sw/qa/extras/tiledrendering/tiledrendering.cxx |    1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit dcfa2cb4e8f2ce94c5c723efe49961c3b8004c93
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 9 21:09:36 2018 +0000

    coverity#1401328 Uncaught exception
    
    Change-Id: Idc2363f80026370953f5c48a9d0eeb396a43362c
    Reviewed-on: https://gerrit.libreoffice.org/49526
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 1f651ea7f43d..dc5ac2ff01b9 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -56,6 +56,7 @@
 #include <i18nlangtag/lang.h>
 #include <rtl/ref.hxx>
 #include <LibreOfficeKit/LibreOfficeKitTypes.h>
+#include <o3tl/deleter.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
 #include <memory>
@@ -225,7 +226,7 @@ class ImpEditView : public vcl::unohelper::DragAndDropClient
 
 private:
     EditView*                 pEditView;
-    std::unique_ptr<vcl::Cursor>  pCursor;
+    std::unique_ptr<vcl::Cursor, o3tl::default_delete<vcl::Cursor>>  pCursor;
     std::unique_ptr<Color>    pBackgroundColor;
     /// Containing view shell, if any.
     OutlinerViewShell*        mpViewShell;
commit 741ef849587078ca9911514afd4c0ecbdec271cc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 9 21:04:24 2018 +0000

    ofz#1429182 Unchecked dynamic_cast
    
    Change-Id: Id070114568cc1cfac2d09c42a8d17f137f5bb075
    Reviewed-on: https://gerrit.libreoffice.org/49525
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 7848a877cf41..68fae582f70a 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -2096,6 +2096,7 @@ void SwTiledRenderingTest::testIMESupport()
     SwXTextDocument* pXTextDocument = createDoc("dummy.fodt");
 
     SwView* pView = dynamic_cast<SwView*>(SfxViewShell::Current());
+    assert(pView);
     SwWrtShell* pWrtShell = pView->GetWrtShellPtr();
 
     // sequence of chinese IME compositions when 'nihao' is typed in an IME