mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rhbz#954991 Avoid static data (causing trouble at exit)

Browse Source 
Change-Id: Ifc8275276811ba24b62f93096e7cb98a5dbf658c
This commit is contained in:
Stephan Bergmann
2013-04-22 16:21:57 +02:00
parent 5329713ca1
commit aa1aedb2a0
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vcl/inc/unx/salinst.h
View File

@@ -27,10 +27,20 @@
#include <vcl/solarmutex.hxx> #include <vcl/solarmutex.hxx>
#include "generic/geninst.h" #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 SalXLib;
class VCLPLUG_GEN_PUBLIC X11SalInstance : public SalGenericInstance 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: protected:
SalXLib *mpXLib; SalXLib *mpXLib;
public: public:

2
vcl/unx/generic/dtrans/X11_service.cxx
View File

@@ -61,8 +61,6 @@ Sequence< OUString > SAL_CALL x11::Xdnd_dropTarget_getSupportedServiceNames()
css::uno::Reference< XInterface > X11SalInstance::CreateClipboard( const Sequence< Any >& arguments ) 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; OUString aDisplayName;
Atom nSelection; Atom nSelection;