diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-11-18 20:28:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-11-19 12:58:53 +0100 |
| commit | 2fe77d0ed8c7c6f2ea0374e0c003ae6280fd591c (patch) | |
| tree | b9acbbad735cc8036a717ced171722708cee952e /unoxml | |
| parent | 4bc44490f51f7cc4a36cc7131137018da986c293 (diff) | |
rtl::Static->thread-safe static in unoxml
Change-Id: Icb458f9ba38225aef17a2421533be79c6d9445d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125496
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'unoxml')
| -rw-r--r-- | unoxml/source/dom/domimplementation.cxx | 16 | ||||
| -rw-r--r-- | unoxml/source/dom/node.cxx | 1 |
2 files changed, 6 insertions, 11 deletions
diff --git a/unoxml/source/dom/domimplementation.cxx b/unoxml/source/dom/domimplementation.cxx index 41cf2c7c053c..0bd7e5940ac6 100644 --- a/unoxml/source/dom/domimplementation.cxx +++ b/unoxml/source/dom/domimplementation.cxx @@ -19,25 +19,21 @@ #include "domimplementation.hxx" -#include <rtl/instance.hxx> #include <osl/diagnose.h> +#include <rtl/ref.hxx> using namespace css::uno; using namespace css::xml::dom; namespace DOM { - // why the heck is this thing static? - // perhaps it would be helpful to know what the implementation should - // do to answer this question... - namespace { - struct DOMImplementation - : public ::rtl::Static<CDOMImplementation, DOMImplementation> {}; - } - CDOMImplementation* CDOMImplementation::get() { - return & DOMImplementation::get(); + // why the heck is this thing static? + // perhaps it would be helpful to know what the implementation should + // do to answer this question... + static rtl::Reference<CDOMImplementation> xDOMImplementation = new CDOMImplementation; + return &*xDOMImplementation; } // there is just 1 static instance, so these must not delete it! diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx index 14c5dc454da1..f39aba6bd079 100644 --- a/unoxml/source/dom/node.cxx +++ b/unoxml/source/dom/node.cxx @@ -25,7 +25,6 @@ #include <algorithm> -#include <rtl/instance.hxx> #include <osl/mutex.hxx> #include <osl/diagnose.h> #include <sal/log.hxx> |