diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-06-01 22:40:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-06-01 22:40:08 +0100 |
| commit | 2e846d734bf3965c4104a5baab35a8fa524d42a2 (patch) | |
| tree | ac2411e81412804dbe51147280db12ddff3d8999 /sw/source/core/unocore/unofield.cxx | |
| parent | 52388d29994a52f3dea83dbf214e81f9abfc11dc (diff) | |
use uuid template here instead of hand-rolled ones
Diffstat (limited to 'sw/source/core/unocore/unofield.cxx')
| -rw-r--r-- | sw/source/core/unocore/unofield.cxx | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index f635fbd697d7..5ffd6f34854d 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -48,6 +48,7 @@ #include <viewsh.hxx> #include <comphelper/types.hxx> #include <comphelper/processfactory.hxx> +#include <comphelper/servicehelper.hxx> #include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/DateTimeRange.hpp> #include <com/sun/star/util/DateTime.hpp> @@ -396,10 +397,14 @@ sal_uInt16 lcl_GetPropertyMapOfService( sal_uInt16 nServiceId ) ******************************************************************/ TYPEINIT1(SwXFieldMaster, SwClient); +namespace +{ + class theSwXFieldMasterUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXFieldMasterUnoTunnelId > {}; +} + const uno::Sequence< sal_Int8 > & SwXFieldMaster::getUnoTunnelId() { - static uno::Sequence< sal_Int8 > aSeq = ::CreateUnoTunnelId(); - return aSeq; + return theSwXFieldMasterUnoTunnelId::get().getSeq(); } sal_Int64 SAL_CALL SwXFieldMaster::getSomething( const uno::Sequence< sal_Int8 >& rId ) @@ -1066,10 +1071,14 @@ struct SwFieldProperties_Impl TYPEINIT1(SwXTextField, SwClient); +namespace +{ + class theSwXTextFieldUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXTextFieldUnoTunnelId > {}; +} + const uno::Sequence< sal_Int8 > & SwXTextField::getUnoTunnelId() { - static uno::Sequence< sal_Int8 > aSeq = ::CreateUnoTunnelId(); - return aSeq; + return theSwXTextFieldUnoTunnelId::get().getSeq(); } sal_Int64 SAL_CALL SwXTextField::getSomething( const uno::Sequence< sal_Int8 >& rId ) |