diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-04-22 16:21:57 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-22 16:07:05 +0000 |
| commit | 63b603c0f1cbf038aabceecf896e9b28b95ab1cd (patch) | |
| tree | 4af854629de80373d5235dc889ee07da712ba22f | |
| parent | 565c2dd3039a7c9aa1d82eadc4d5e54ea87cda9c (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/3557
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | vcl/inc/unx/salinst.h | 10 | ||||
| -rw-r--r-- | vcl/unx/generic/dtrans/X11_service.cxx | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h index 7d8b45efd660..bdf39b280523 100644 --- a/vcl/inc/unx/salinst.h +++ b/vcl/inc/unx/salinst.h @@ -37,11 +37,21 @@ #include <vcl/solarmutex.hxx> #include "generic/geninst.h" +#include <tools/prex.h> +#include <X11/Xlib.h> +#include <tools/postx.h> + +namespace com { namespace sun { namespace star { namespace datatransfer { + namespace clipboard { class XClipboard; } +} } } } // -=-= SalInstanceData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= class SalXLib; class VCLPLUG_GEN_PUBLIC X11SalInstance : public SalGenericInstance { +private: + boost::unordered_map< OUString, boost::unordered_map< Atom, com::sun::star::uno::Reference< com::sun::star::datatransfer::clipboard::XClipboard > >, OUStringHash > m_aInstances; + protected: SalXLib *mpXLib; public: diff --git a/vcl/unx/generic/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx index 175db9590b36..1085401d9040 100644 --- a/vcl/unx/generic/dtrans/X11_service.cxx +++ b/vcl/unx/generic/dtrans/X11_service.cxx @@ -77,8 +77,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; |