Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3557
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/3557/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 7d8b45e..bdf39b2 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 175db95..1085401 100644
--- a/vcl/unx/generic/dtrans/X11_service.cxx
+++ b/vcl/unx/generic/dtrans/X11_service.cxx
@@ -77,8 +77,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/3557
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc8275276811ba24b62f93096e7cb98a5dbf658c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Stephan Bergmann <sbergman@redhat.com>
Context
- [PATCH libreoffice-3-6] rhbz#954991 Avoid static data (causing trouble at exit) · Stephan Bergmann (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.