diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-04-22 16:21:57 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-22 15:36:29 +0000 |
| commit | 2e4675303baa7efeff0f71d47c2edece20c6677e (patch) | |
| tree | c68ecbb02358ff28f4821eb61fba4bb53da76b4d /vcl/unx/generic/dtrans/X11_service.cxx | |
| parent | bd9238f3fe4bd004cb77e89813eb730e1e865667 (diff) | |
rhbz#954991 Avoid static data (causing trouble at exit)
(cherry picked from commit aa1aedb2a0ef97cb6110f18a1de86abc8dbcd304)
Conflicts:
vcl/inc/unx/salinst.h
vcl/unx/generic/dtrans/X11_service.cxx
Change-Id: Ifc8275276811ba24b62f93096e7cb98a5dbf658c
Reviewed-on: https://gerrit.libreoffice.org/3556
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'vcl/unx/generic/dtrans/X11_service.cxx')
| -rw-r--r-- | vcl/unx/generic/dtrans/X11_service.cxx | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/vcl/unx/generic/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx index dc2ff1766ee2..5d4ac5e5e339 100644 --- a/vcl/unx/generic/dtrans/X11_service.cxx +++ b/vcl/unx/generic/dtrans/X11_service.cxx @@ -62,8 +62,6 @@ Sequence< OUString > SAL_CALL x11::Xdnd_dropTarget_getSupportedServiceNames() css::uno::Reference< XInterface > X11SalInstance::CreateClipboard( const Sequence< Any >& arguments ) { - static boost::unordered_map< OUString, ::boost::unordered_map< Atom, Reference< XClipboard > >, ::rtl::OUStringHash > m_aInstances; - OUString aDisplayName; Atom nSelection; |