[Libreoffice-commits] core.git: 2 commits - oox/qa svx/source

[Noel Grandin (via logerrit)]

 oox/qa/unit/CryptoTest.cxx    |   13 +++++++++++++
 svx/source/svdraw/svdview.cxx |    2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 9d146b9418c66d1fd21fe0eb74f1b4daef30a31a
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu May 20 11:17:04 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu May 20 13:11:47 2021 +0200

    fix crash when del in textbox in draw
    
    regression from
        commit 9090dc1f3b27195f5defd35586ac79357992be21
        split OutputDevice from Window
    
    Change-Id: Ib0df6b691f2281c366126c3a0cf3aae985e706be
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115857
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index a2e6861556ad..0cfe786c8799 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -163,7 +163,7 @@ SdrView::~SdrView()
 
 bool SdrView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin)
 {
-    SetActualWin(pWin->GetOutDev());
+    SetActualWin(pWin ? pWin->GetOutDev() : nullptr);
     bool bRet = SdrCreateView::KeyInput(rKEvt,pWin);
     if (!bRet && !IsExtendedKeyInputDispatcherEnabled()) {
         bRet = true;
commit 2601814987fdac8d0b1d655d40987c331f3e51f4
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu May 20 09:11:48 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu May 20 13:11:35 2021 +0200

    fix leak in CppunitTest_oox_crypto
    
    Change-Id: I41d4fe581842cb7822ae899dc6ee6a43e485d211
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115856
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/oox/qa/unit/CryptoTest.cxx b/oox/qa/unit/CryptoTest.cxx
index 94f1f765fc2b..cbdf99b65216 100644
--- a/oox/qa/unit/CryptoTest.cxx
+++ b/oox/qa/unit/CryptoTest.cxx
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <config_oox.h>
 #include <cppunit/plugin/TestPlugIn.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/TestFixture.h>
@@ -20,11 +21,16 @@
 #include <oox/helper/binaryinputstream.hxx>
 #include <oox/helper/binaryoutputstream.hxx>
 
+#if USE_TLS_NSS
+#include <nss.h>
+#endif
+
 using namespace css;
 
 class CryptoTest : public CppUnit::TestFixture
 {
 public:
+    virtual ~CryptoTest() override;
     void testCryptoHash();
     void testRoundUp();
     void testStandard2007();
@@ -58,6 +64,13 @@ std::string toString(std::vector<sal_uInt8> const& aInput)
 }
 }
 
+CryptoTest::~CryptoTest()
+{
+#if USE_TLS_NSS
+    NSS_Shutdown();
+#endif
+}
+
 void CryptoTest::testCryptoHash()
 {
     // Check examples from Wikipedia (https://en.wikipedia.org/wiki/HMAC)