writerfilter/source/dmapper/PropertyIds.cxx | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit d73fc13af4fccb098928d1646ad843d92505562e
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Sep 10 11:39:57 2012 +0100
Related: rhbz#855541 ensure PropertyNameSupplier singleton ctor is
threadsafe
nothing really to do with odd multithreaded run_exit_handlers bug, just
tidied
it up in passing
Change-Id: I9e56a21f92e5f89bbcb4413bb7cae44c48affb17
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx
b/writerfilter/source/dmapper/PropertyIds.cxx
index 1b4e8ab..f6e6f69 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -16,6 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <rtl/instance.hxx>
#include <rtl/ustring.hxx>
#include "PropertyIds.hxx"
#include <map>
@@ -326,10 +327,15 @@ const OUString& PropertyNameSupplier::GetName(
PropertyIds eId ) const
}
return aIt->second;
}
+
+namespace
+{
+ class thePropertyNameSupplier : public rtl::Static<PropertyNameSupplier,
PropertyNameSupplier> {};
+}
+
PropertyNameSupplier& PropertyNameSupplier::GetPropertyNameSupplier()
{
- static PropertyNameSupplier aNameSupplier;
- return aNameSupplier;
+ return thePropertyNameSupplier::get();
}
} //namespace dmapper
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
