core.git: 2 commits - cui/source test/source

[Caolán McNamara (via logerrit)]

 cui/source/factory/dlgfact.cxx |    6 +-----
 test/source/xmltesttools.cxx   |    1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit d842ba65ec0c4e17a951570b0464afbfeac24dce
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Feb 3 14:17:10 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun Feb 4 08:49:58 2024 +0100

    cid#1591495 Resource leak
    
    since:
    
    commit 1d7ce421480d9170316533de03feb8d04eb5c767
    Date:   Tue Jan 30 17:15:07 2024 +0600
    
        tdf#159438: when there's no frame, close previous bookmark first
    
    Change-Id: I81a28429041047afbe6f4cea327e6f19e3805cc3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162953
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/test/source/xmltesttools.cxx b/test/source/xmltesttools.cxx
index 143819cc6c5b..b0e4cf48e989 100644
--- a/test/source/xmltesttools.cxx
+++ b/test/source/xmltesttools.cxx
@@ -303,6 +303,7 @@ void XmlTestTools::assertXPathNodeName(const 
xmlDocUniquePtr& pXmlDoc, const OSt
     xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0];
     CPPUNIT_ASSERT_EQUAL_MESSAGE(OString(OString::Concat("In XPath '" + rXPath 
+ "' name of node is incorrect")).getStr(),
                                  rExpectedName, oconvert(pXmlNode->name));
+    xmlXPathFreeObject(pXmlObj);
 }
 
 void XmlTestTools::registerODFNamespaces(xmlXPathContextPtr& pXmlXpathCtx)
commit 1478c593b505255c859faa893279483decb5a5bb
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Feb 3 06:45:32 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun Feb 4 08:49:43 2024 +0100

    cid#1591486 Logically dead code
    
    since:
    
    commit 93c4bfc96acf7f387120ff05883068d358a608c1
    Date:   Thu Jan 25 10:29:47 2024 +0200
    
        make writer databases dialog async
    
    Change-Id: Ic67a7b5313e1dfad9c34fc3bf05ca808af29ceba
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162944
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 6cb6f3147657..b25ce9c9359b 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -838,11 +838,7 @@ VclPtr<VclAbstractDialog> 
AbstractDialogFactory_Impl::CreateVclDialog(weld::Wind
                 bActivateLastSelection = true;
             Reference< frame::XFrame > xFrame;
             auto xDlg = std::make_unique<OfaTreeOptionsDialog>(pParent, 
xFrame, bActivateLastSelection);
-            if (nResId == SID_OPTIONS_DATABASES)
-            {
-                xDlg->ActivatePage(SID_SB_DBREGISTEROPTIONS);
-            }
-            else if (nResId == SID_LANGUAGE_OPTIONS)
+            if (nResId == SID_LANGUAGE_OPTIONS)
             {
                 //open the tab page "tools/options/languages"
                 xDlg->ActivatePage(OFA_TP_LANGUAGES_FOR_SET_DOCUMENT_LANGUAGE);