swunolocking1: #i105557#: fix locking for SwXMeta:

move SwClient base to pImpl struct, and use UnoImplPtr to lock destructor.
replace broken SwClient iteration with a WeakReference in sw::Meta.
make constructor protected, and add factory function CreateXMeta.
use new XUnoTunnel and XServiceInfo helpers.

1 files changed, 13 insertions, 1 deletions

diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx
index 6d3f63ece477..792a7d8374db 100755
--- a/sw/inc/fmtmeta.hxx
+++ b/sw/inc/fmtmeta.hxx
@@ -31,6 +31,8 @@
 #ifndef SW_FMTMETA_HXX
 #define SW_FMTMETA_HXX
 
+#include <cppuhelper/weakref.hxx>
+
 #include <svtools/poolitem.hxx>
 #include <sfx2/Metadatable.hxx>
 
@@ -141,7 +143,10 @@ class Meta
 {
 protected:
     friend class ::SwFmtMeta; // SetFmtMeta, NotifyChangeTxtNode
-    friend class ::SwXMeta; // GetTxtNode, GetTxtAttr
+    friend class ::SwXMeta; // GetTxtNode, GetTxtAttr, Get/SetXMeta
+
+    ::com::sun::star::uno::WeakReference<
+        ::com::sun::star::rdf::XMetadatable> m_wXMeta;
 
     SwFmtMeta * m_pFmt;
 
@@ -153,6 +158,13 @@ protected:
 
     void NotifyChangeTxtNode();
 
+    ::com::sun::star::uno::WeakReference<
+        ::com::sun::star::rdf::XMetadatable> const& GetXMeta() const
+            { return m_wXMeta; }
+    void SetXMeta(::com::sun::star::uno::Reference<
+                    ::com::sun::star::rdf::XMetadatable> const& xMeta)
+            { m_wXMeta = xMeta; }
+
 public:
     explicit Meta(SwFmtMeta * const i_pFmt = 0);
     virtual ~Meta();