[Libreoffice-commits] core.git: 2 commits - include/comphelper sd/source starmath/source

[Caolán McNamara]

 include/comphelper/unique_disposing_ptr.hxx          |    3 ++-
 sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx |    3 ++-
 starmath/source/mathtype.cxx                         |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit e6928ce494339a74e5e5b1ab1d32af4adcef3e11
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 5 15:21:47 2017 +0000

    coverity#1401328 Uncaught exception
    
    Change-Id: I358b3c410bc7871c7184da4959b24b9f52b4a4d7
    Reviewed-on: https://gerrit.libreoffice.org/45892
    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/include/comphelper/unique_disposing_ptr.hxx b/include/comphelper/unique_disposing_ptr.hxx
index 8434a1e916b3..f2c3adcc2a2c 100644
--- a/include/comphelper/unique_disposing_ptr.hxx
+++ b/include/comphelper/unique_disposing_ptr.hxx
@@ -17,6 +17,7 @@
 #include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
+#include <o3tl/deleter.hxx>
 #include <vcl/svapp.hxx>
 
 namespace comphelper
@@ -25,7 +26,7 @@ namespace comphelper
 template<class T> class unique_disposing_ptr
 {
 private:
-    std::unique_ptr<T> m_xItem;
+    std::unique_ptr<T, o3tl::default_delete<T>> m_xItem;
     css::uno::Reference< css::frame::XTerminateListener> m_xTerminateListener;
 
     unique_disposing_ptr(const unique_disposing_ptr&) = delete;
diff --git a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
index 791055f095d4..34f12a6dc546 100644
--- a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
+++ b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
@@ -22,6 +22,7 @@
 
 #include <sdmod.hxx>
 #include <memory>
+#include <o3tl/deleter.hxx>
 #include <com/sun/star/uno/XInterface.hpp>
 
 namespace sd {
@@ -83,7 +84,7 @@ public:
 
 private:
     friend class SdGlobalResourceContainerInstance;
-    friend struct ::std::default_delete<SdGlobalResourceContainer>;
+    friend struct o3tl::default_delete<SdGlobalResourceContainer>;
 
     class Implementation;
     ::std::unique_ptr<Implementation> mpImpl;
commit 175c0541c7cb57e97ff04572cd012d7b5aaf9560
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 5 17:26:20 2017 +0000

    ofz: tmRoot variation 1 has two arguments
    
    Change-Id: I75ad9bcbc35ee2a0b9b7941cadc9b4bee79fb6c0
    Reviewed-on: https://gerrit.libreoffice.org/45905
    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/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 11ce178bf6b6..9dd5ec5f9297 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -1348,7 +1348,7 @@ bool MathType::HandleRecords(int nLevel, sal_uInt8 nSelector,
                                     sMainTerm = rRet;
                                     rRet.clear();
                                 }
-                                else
+                                else if (nPart == 1)
                                 {
                                     sPush += rRet;
                                     rRet = sPush;