[Libreoffice-commits] core.git: 2 commits - o3tl/README vcl/Executable_ui-previewer.mk vcl/Executable_vcldemo.mk vcl/source

[Tor Lillqvist]

 o3tl/README                    |    2 ++
 vcl/Executable_ui-previewer.mk |    1 -
 vcl/Executable_vcldemo.mk      |    1 -
 vcl/source/app/svapp.cxx       |    1 +
 4 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 83d020a49330aafefd051c24b746d13d126281db
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Oct 6 12:20:09 2014 +0300

    Add guess at what o3tl means
    
    Change-Id: I69c8ce10140e92714e9d5c4b4173ade59d36be08

diff --git a/o3tl/README b/o3tl/README
index de46c85..b49b075 100644
--- a/o3tl/README
+++ b/o3tl/README
@@ -1,5 +1,7 @@
 Very basic template functionality, a bit like boost or stl, but specific to LibO
 
+o3tl presumably stands for "OOo [o3, get it?] tools"
+
 From [http://blog.thebehrens.net/2006/01/15/update-cow_wrapper-is-available-now/]
 The scope for o3tl is admittedly kind of ambitious, as it should contain "...very basic (template)
 functionality, comparable to what's provided by boost or stl, but specific to OOo (what comes to mind
commit 2d8f396d12f83f0c0b5f0c4adb1796d66fd0bd2f
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Oct 6 11:28:37 2014 +0300

    Don't unintentionally unload the tk library
    
    Fixes the root cause for the crashes in vcldemo and ui-previewer that
    indirectly were fixed by 0b7631bccb2a47ab71a0c1edbabe8a5892ff5f9c and
    f5cfed29b05184894ec6ad2d14f73bff0b5a2783. Those two commits are now reverted.
    
    Change-Id: If5dac37f032d2b74c977562c339e9799bbc4454c

diff --git a/vcl/Executable_ui-previewer.mk b/vcl/Executable_ui-previewer.mk
index ab19caa..444ded1 100644
--- a/vcl/Executable_ui-previewer.mk
+++ b/vcl/Executable_ui-previewer.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_Executable_use_libraries,ui-previewer,\
 	cppu \
 	cppuhelper \
 	sal \
-	tk \
     tl \
     ucbhelper \
     vcl \
diff --git a/vcl/Executable_vcldemo.mk b/vcl/Executable_vcldemo.mk
index 878ab62..fb29b9a 100644
--- a/vcl/Executable_vcldemo.mk
+++ b/vcl/Executable_vcldemo.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_Executable_set_include,vcldemo,\
 
 $(eval $(call gb_Executable_use_libraries,vcldemo,\
     tl \
-    tk \
     sal \
     vcl \
     cppu \
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index fd5806c..fd0077e 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1413,6 +1413,7 @@ UnoWrapperBase* Application::GetUnoWrapper( bool bCreateIfNotExist )
             {
                 pSVData->mpUnoWrapper = fnCreateWrapper();
             }
+            aTkLib.release();
         }
         DBG_ASSERT( pSVData->mpUnoWrapper, "UnoWrapper could not be created!" );
 #else