Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3556
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/56/3556/1
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
---
M vcl/inc/unx/salinst.h
M vcl/unx/generic/dtrans/X11_service.cxx
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h
index 83ba4b8..ea997d6 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 dc2ff17..5d4ac5e 100644
--- a/vcl/unx/generic/dtrans/X11_service.cxx
+++ b/vcl/unx/generic/dtrans/X11_service.cxx
@@ -62,8 +62,6 @@
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;
--
To view, visit https://gerrit.libreoffice.org/3556
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc8275276811ba24b62f93096e7cb98a5dbf658c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Stephan Bergmann <sberg...@redhat.com>
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
