diff options
| -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 a997457e8a0d..3f8d06e1eb24 100644 --- a/vcl/inc/unx/salinst.h +++ b/vcl/inc/unx/salinst.h @@ -27,10 +27,20 @@ #include <vcl/solarmutex.hxx> #include "generic/geninst.h" +#include <prex.h> +#include <X11/Xlib.h> +#include <postx.h> + +namespace com { namespace sun { namespace star { namespace datatransfer { + namespace clipboard { class XClipboard; } +} } } } 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 efc36b74205a..2e8e0cd3e582 100644 --- a/vcl/unx/generic/dtrans/X11_service.cxx +++ b/vcl/unx/generic/dtrans/X11_service.cxx @@ -61,8 +61,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 > >, OUStringHash > m_aInstances; - OUString aDisplayName; Atom nSelection; |