diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-04-22 16:21:57 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-05-07 13:21:00 +0200 |
| commit | 0e3cec6b72a7c37a5c591431b3ea86fdb70ad33e (patch) | |
| tree | 4365949e7c9fe49209b0779d641407b99e95bf80 /vcl | |
| parent | 6fb16fba6892aa5e131d34505c80cd4053d41250 (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')
| -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 83ba4b87fa3f..ea997d6de108 100644 --- a/vcl/inc/unx/salinst.h +++ b/vcl/inc/unx/salinst.h @@ -27,11 +27,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 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; |