diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-10-06 11:28:37 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-10-06 12:38:50 +0300 |
| commit | 2d8f396d12f83f0c0b5f0c4adb1796d66fd0bd2f (patch) | |
| tree | 92ad721a8c7f9a85d6e6ba01d5e4f862284eec42 /vcl | |
| parent | 8a8fa926c1fe843c5c79f7b300b7365855460e62 (diff) | |
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
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Executable_ui-previewer.mk | 1 | ||||
| -rw-r--r-- | vcl/Executable_vcldemo.mk | 1 | ||||
| -rw-r--r-- | vcl/source/app/svapp.cxx | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/vcl/Executable_ui-previewer.mk b/vcl/Executable_ui-previewer.mk index ab19caac14de..444ded1c3ba0 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 878ab62a2ce2..fb29b9a1991f 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 fd5806cef057..fd0077eab3b1 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 |