diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-11-17 21:17:07 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-11-19 17:44:54 +0000 |
| commit | 19e8dd66cb8a66536e19fc7780fbc1101be13710 (patch) | |
| tree | e2743b6e7130ee7484ce3fd7d2e360fe0c874fbb /desktop/inc | |
| parent | 0d89cf29adf79fb0fc673b836ffd39ccf65b3383 (diff) | |
Revert "sb140: #i117084# do not leak Lockfile instance"
This reverts commit 1d38dbab29245e430792f7b3a4c14c94cd011504.
Conflicts:
desktop/source/app/app.cxx
Diffstat (limited to 'desktop/inc')
| -rw-r--r-- | desktop/inc/app.hxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 4f56c32560e7..edbcde80fad2 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -31,7 +31,6 @@ // stl includes first #include <map> -#include <memory> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <vcl/svapp.hxx> #include <vcl/timer.hxx> @@ -197,7 +196,7 @@ class Desktop : public Application OUString m_aBootstrapErrorMessage; BootstrapStatus m_aBootstrapStatus; - std::auto_ptr< Lockfile > m_pLockfile; + Lockfile *m_pLockfile; Timer m_firstRunTimer; static ResMgr* pResMgr; |