diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-06-12 02:12:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-13 09:13:37 +0200 |
| commit | a3bedb7ae8f23476843e00380aba05002aa1e827 (patch) | |
| tree | 0eb626a63ebb5d45c7e837def5cca433b96eba56 /reportdesign/source | |
| parent | e272761e8fca9eccbf6fd5737df2b1aee1730947 (diff) | |
use local statics for getUnoTunnelImplementationId
replace uses of double checked locking pattern and
rtl::Static
Change-Id: I479d9d94f652b4fb4c67388405823a5f4e2b6ed4
Reviewed-on: https://gerrit.libreoffice.org/38690
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'reportdesign/source')
| -rw-r--r-- | reportdesign/source/core/api/ReportDefinition.cxx | 14 | ||||
| -rw-r--r-- | reportdesign/source/core/api/Section.cxx | 14 |
2 files changed, 6 insertions, 22 deletions
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 4dcd58d1039e..eeb651da8a0f 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -2006,17 +2006,9 @@ uno::Sequence< sal_Int8 > SAL_CALL OReportDefinition::getImplementationId( ) uno::Sequence< sal_Int8 > OReportDefinition::getUnoTunnelImplementationId() { - static ::cppu::OImplementationId * pId = nullptr; - if (! pId) - { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if (! pId) - { - static ::cppu::OImplementationId aId; - pId = &aId; - } - } - return pId->getImplementationId(); + static ::cppu::OImplementationId implId; + + return implId.getImplementationId(); } uno::Reference< uno::XComponentContext > OReportDefinition::getContext() diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index e875191a7f5a..c8b29a7798b4 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -592,17 +592,9 @@ OSection* OSection::getImplementation( const uno::Reference< uno::XInterface >& uno::Sequence< sal_Int8 > OSection::getUnoTunnelImplementationId() { - static ::cppu::OImplementationId * pId = nullptr; - if (! pId) - { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if (! pId) - { - static ::cppu::OImplementationId aId; - pId = &aId; - } - } - return pId->getImplementationId(); + static ::cppu::OImplementationId implId; + + return implId.getImplementationId(); } void OSection::notifyElementAdded(const uno::Reference< drawing::XShape >& xShape ) |