[Libreoffice-commits] core.git: 2 commits - solenv/bin sw/qa

[Miklos Vajna]

 solenv/bin/modules/installer/scriptitems.pm |    3 ---
 sw/qa/extras/inc/swmodeltestbase.hxx        |    2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit c03a1e46460e4255d7709df9ba8147947f66acfb
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Sun Jun 16 11:13:30 2013 +0200

    SwModelTestBase: fix for leaking temporary files
    
    This alone pushes down the number of created /tmp/lu* from 527 to 2
    after a single run. Regression from
    9b53538a076a2370df975655c8579dfe09cff09b.
    
    Change-Id: I5ea2e3da0b89223fb32469af3d59a2a3b246d00f
    Helped-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index 9f8d8b5..38c5a47 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -264,6 +264,8 @@ protected:
 
     void load(const char* pDir, const char* pName, bool bCalcLayout = true)
     {
+        if (mxComponent.is())
+            mxComponent->dispose();
         // Output name early, so in the case of a hang, the name of the hanging input file is visible.
         std::cerr << pName << ",";
         m_nStartTime = osl_getGlobalTimer();
commit 216fe5cf3c41713fa2a11731e4c3d514236b2480
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Sun Jun 16 01:41:20 2013 +0200

    solenv: fix missing last char of the git hash in the about dialog
    
    When 918695a2bf8f95fd437071bfc6ac59e446c256f8 introduced this, we were
    having a "foo-bar-baz-"-like hash, and removing the last char made
    sense.  Since we then switched to 'git log -n 1 --pretty=format:"%H"'
    from './g -s log -n 1 --pretty=format:%h-', this is just no longer
    necessary.
    
    Change-Id: Icee0d38e5bd917163d678df5cb12c36902460c7b

diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 52aedf9..b22391d 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -667,9 +667,6 @@ sub replace_setup_variables
     if ($? || !$buildidstring) {
         $buildidstring = $localbuild . $localminor . "(Build:" . $installer::globals::buildid . ")";
     }
-    else {
-        $buildidstring = substr($buildidstring, 0, -1);
-    }
 
     if ( $localminor =~ /^\s*\w(\d+)\w*\s*$/ ) { $localminor = $1; }