diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-22 13:12:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-22 18:54:21 +0100 |
| commit | 170df072a612456ec83143dff0174a2e376afcba (patch) | |
| tree | 2761d280b41b103679650a47f85dcc111395343d /toolkit/source/controls/dialogcontrol.cxx | |
| parent | c5b920dc889410ef5c4baf0adf7fc57ff0d2f123 (diff) | |
improve function-local statics in toolkit
Change-Id: I2a134d1cc74eaeaad46f4249fadd215b2391ba19
Reviewed-on: https://gerrit.libreoffice.org/63789
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'toolkit/source/controls/dialogcontrol.cxx')
| -rw-r--r-- | toolkit/source/controls/dialogcontrol.cxx | 36 |
1 files changed, 8 insertions, 28 deletions
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 277cd80ded29..16a3affbfcdf 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -258,13 +258,8 @@ Any UnoControlDialogModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const ::cppu::IPropertyArrayHelper& UnoControlDialogModel::getInfoHelper() { - static UnoPropertyArrayHelper* pHelper = nullptr; - if ( !pHelper ) - { - Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); - pHelper = new UnoPropertyArrayHelper( aIDs ); - } - return *pHelper; + static UnoPropertyArrayHelper aHelper( ImplGetPropertyIds() ); + return aHelper; } // XMultiPropertySet @@ -886,13 +881,8 @@ uno::Any UnoMultiPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const ::cppu::IPropertyArrayHelper& UnoMultiPageModel::getInfoHelper() { - static UnoPropertyArrayHelper* pHelper = nullptr; - if ( !pHelper ) - { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); - pHelper = new UnoPropertyArrayHelper( aIDs ); - } - return *pHelper; + static UnoPropertyArrayHelper aHelper( ImplGetPropertyIds() ); + return aHelper; } // beans::XMultiPropertySet @@ -998,13 +988,8 @@ uno::Any UnoPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const ::cppu::IPropertyArrayHelper& UnoPageModel::getInfoHelper() { - static UnoPropertyArrayHelper* pHelper = nullptr; - if ( !pHelper ) - { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); - pHelper = new UnoPropertyArrayHelper( aIDs ); - } - return *pHelper; + static UnoPropertyArrayHelper aHelper( ImplGetPropertyIds() ); + return aHelper; } // beans::XMultiPropertySet @@ -1164,13 +1149,8 @@ uno::Any UnoFrameModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const ::cppu::IPropertyArrayHelper& UnoFrameModel::getInfoHelper() { - static UnoPropertyArrayHelper* pHelper = nullptr; - if ( !pHelper ) - { - uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds(); - pHelper = new UnoPropertyArrayHelper( aIDs ); - } - return *pHelper; + static UnoPropertyArrayHelper aHelper( ImplGetPropertyIds() ); + return aHelper; } // beans::XMultiPropertySet |