diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-22 13:12:52 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-22 14:27:18 +0100 |
commit | 28d82c33131f5f1a300c632acc06e027b04a5a4d (patch) | |
tree | 80df037d5b16118700d816551203fdbdba21f636 /vbahelper/source/msforms | |
parent | dd0e6849297c18aabe4fc29c0340a2ed1e474eaf (diff) |
improve function-local statics in vbahelper
Change-Id: Id54660390baa337d8bd54a19924e138c2ccb0bc7
Reviewed-on: https://gerrit.libreoffice.org/63790
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vbahelper/source/msforms')
-rw-r--r-- | vbahelper/source/msforms/vbabutton.cxx | 8 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbacheckbox.cxx | 8 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbacombobox.cxx | 8 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbacontrol.cxx | 8 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbaimage.cxx | 8 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbalabel.cxx | 8 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbalistbox.cxx | 8 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbamultipage.cxx | 8 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbapages.cxx | 8 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbaprogressbar.cxx | 8 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbaradiobutton.cxx | 8 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbascrollbar.cxx | 8 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbaspinbutton.cxx | 8 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbasystemaxcontrol.cxx | 8 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbatextbox.cxx | 8 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbatogglebutton.cxx | 8 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbauserform.cxx | 8 |
17 files changed, 51 insertions, 85 deletions
diff --git a/vbahelper/source/msforms/vbabutton.cxx b/vbahelper/source/msforms/vbabutton.cxx index 0951731d2c64..7c7e98143432 100644 --- a/vbahelper/source/msforms/vbabutton.cxx +++ b/vbahelper/source/msforms/vbabutton.cxx @@ -118,12 +118,10 @@ VbaButton::getServiceImplName() uno::Sequence< OUString > VbaButton::getServiceNames() { - static uno::Sequence< OUString > aServiceNames; - if ( aServiceNames.getLength() == 0 ) + static uno::Sequence< OUString > const aServiceNames { - aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = "ooo.vba.msforms.Button"; - } + "ooo.vba.msforms.Button" + }; return aServiceNames; } diff --git a/vbahelper/source/msforms/vbacheckbox.cxx b/vbahelper/source/msforms/vbacheckbox.cxx index 83928d8567c4..719fd3183696 100644 --- a/vbahelper/source/msforms/vbacheckbox.cxx +++ b/vbahelper/source/msforms/vbacheckbox.cxx @@ -92,12 +92,10 @@ ScVbaCheckbox::getServiceImplName() uno::Sequence< OUString > ScVbaCheckbox::getServiceNames() { - static uno::Sequence< OUString > aServiceNames; - if ( aServiceNames.getLength() == 0 ) + static uno::Sequence< OUString > const aServiceNames { - aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = "ooo.vba.msforms.CheckBox"; - } + "ooo.vba.msforms.CheckBox" + }; return aServiceNames; } diff --git a/vbahelper/source/msforms/vbacombobox.cxx b/vbahelper/source/msforms/vbacombobox.cxx index 65e946e0516a..78ceafb5ea88 100644 --- a/vbahelper/source/msforms/vbacombobox.cxx +++ b/vbahelper/source/msforms/vbacombobox.cxx @@ -299,12 +299,10 @@ void SAL_CALL ScVbaComboBox::setLinkedCell( const OUString& _linkedcell ) uno::Sequence< OUString > ScVbaComboBox::getServiceNames() { - static uno::Sequence< OUString > aServiceNames; - if ( aServiceNames.getLength() == 0 ) + static uno::Sequence< OUString > const aServiceNames { - aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = "ooo.vba.msforms.ComboBox"; - } + "ooo.vba.msforms.ComboBox" + }; return aServiceNames; } diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index 65c2e9838519..8f60a67af807 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -703,12 +703,10 @@ ScVbaControl::getServiceImplName() uno::Sequence< OUString > ScVbaControl::getServiceNames() { - static uno::Sequence< OUString > aServiceNames; - if ( aServiceNames.getLength() == 0 ) + static uno::Sequence< OUString > const aServiceNames { - aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = "ooo.vba.excel.Control"; - } + "ooo.vba.excel.Control" + }; return aServiceNames; } diff --git a/vbahelper/source/msforms/vbaimage.cxx b/vbahelper/source/msforms/vbaimage.cxx index 875fafeacea3..1deeaf249f31 100644 --- a/vbahelper/source/msforms/vbaimage.cxx +++ b/vbahelper/source/msforms/vbaimage.cxx @@ -36,12 +36,10 @@ ScVbaImage::getServiceImplName() uno::Sequence< OUString > ScVbaImage::getServiceNames() { - static uno::Sequence< OUString > aServiceNames; - if ( aServiceNames.getLength() == 0 ) + static uno::Sequence< OUString > const aServiceNames { - aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = "ooo.vba.msforms.Image"; - } + "ooo.vba.msforms.Image" + }; return aServiceNames; } diff --git a/vbahelper/source/msforms/vbalabel.cxx b/vbahelper/source/msforms/vbalabel.cxx index 70d0ddaae01d..567cd6b79c4a 100644 --- a/vbahelper/source/msforms/vbalabel.cxx +++ b/vbahelper/source/msforms/vbalabel.cxx @@ -102,12 +102,10 @@ void SAL_CALL ScVbaLabel::setAutoSize( sal_Bool bAutoSize ) uno::Sequence< OUString > ScVbaLabel::getServiceNames() { - static uno::Sequence< OUString > aServiceNames; - if ( aServiceNames.getLength() == 0 ) + static uno::Sequence< OUString > const aServiceNames { - aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = "ooo.vba.msforms.Label"; - } + "ooo.vba.msforms.Label" + }; return aServiceNames; } diff --git a/vbahelper/source/msforms/vbalistbox.cxx b/vbahelper/source/msforms/vbalistbox.cxx index d0e4856cf3a1..c91996c6d6f4 100644 --- a/vbahelper/source/msforms/vbalistbox.cxx +++ b/vbahelper/source/msforms/vbalistbox.cxx @@ -284,12 +284,10 @@ ScVbaListBox::getServiceImplName() uno::Sequence< OUString > ScVbaListBox::getServiceNames() { - static uno::Sequence< OUString > aServiceNames; - if ( aServiceNames.getLength() == 0 ) + static uno::Sequence< OUString > const aServiceNames { - aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = "ooo.vba.msforms.ScVbaListBox"; - } + "ooo.vba.msforms.ScVbaListBox" + }; return aServiceNames; } diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx index c3f73e88137f..0608c1d64bda 100644 --- a/vbahelper/source/msforms/vbamultipage.cxx +++ b/vbahelper/source/msforms/vbamultipage.cxx @@ -103,12 +103,10 @@ ScVbaMultiPage::Pages( const uno::Any& index ) uno::Sequence< OUString > ScVbaMultiPage::getServiceNames() { - static uno::Sequence< OUString > aServiceNames; - if ( aServiceNames.getLength() == 0 ) + static uno::Sequence< OUString > const aServiceNames { - aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = "ooo.vba.msforms.MultiPage"; - } + "ooo.vba.msforms.MultiPage" + }; return aServiceNames; } diff --git a/vbahelper/source/msforms/vbapages.cxx b/vbahelper/source/msforms/vbapages.cxx index 6854ef68f82b..c40aaa8fdf90 100644 --- a/vbahelper/source/msforms/vbapages.cxx +++ b/vbahelper/source/msforms/vbapages.cxx @@ -54,12 +54,10 @@ ScVbaPages::createEnumeration() uno::Sequence< OUString > ScVbaPages::getServiceNames() { - static uno::Sequence< OUString > aServiceNames; - if ( aServiceNames.getLength() == 0 ) + static uno::Sequence< OUString > const aServiceNames { - aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = "ooo.vba.msform.Pages"; - } + "ooo.vba.msform.Pages" + }; return aServiceNames; } diff --git a/vbahelper/source/msforms/vbaprogressbar.cxx b/vbahelper/source/msforms/vbaprogressbar.cxx index 92700ba65ebb..64b6726905ff 100644 --- a/vbahelper/source/msforms/vbaprogressbar.cxx +++ b/vbahelper/source/msforms/vbaprogressbar.cxx @@ -51,12 +51,10 @@ ScVbaProgressBar::getServiceImplName() uno::Sequence< OUString > ScVbaProgressBar::getServiceNames() { - static uno::Sequence< OUString > aServiceNames; - if ( aServiceNames.getLength() == 0 ) + static uno::Sequence< OUString > const aServiceNames { - aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = "ooo.vba.msforms.Label"; - } + "ooo.vba.msforms.Label" + }; return aServiceNames; } diff --git a/vbahelper/source/msforms/vbaradiobutton.cxx b/vbahelper/source/msforms/vbaradiobutton.cxx index 50e9b4fb26bb..8328dff14d76 100644 --- a/vbahelper/source/msforms/vbaradiobutton.cxx +++ b/vbahelper/source/msforms/vbaradiobutton.cxx @@ -100,12 +100,10 @@ ScVbaRadioButton::getServiceImplName() uno::Sequence< OUString > ScVbaRadioButton::getServiceNames() { - static uno::Sequence< OUString > aServiceNames; - if ( aServiceNames.getLength() == 0 ) + static uno::Sequence< OUString > const aServiceNames { - aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = "ooo.vba.msforms.RadioButton"; - } + "ooo.vba.msforms.RadioButton" + }; return aServiceNames; } diff --git a/vbahelper/source/msforms/vbascrollbar.cxx b/vbahelper/source/msforms/vbascrollbar.cxx index a10ecec11a68..10c49e79c16b 100644 --- a/vbahelper/source/msforms/vbascrollbar.cxx +++ b/vbahelper/source/msforms/vbascrollbar.cxx @@ -105,12 +105,10 @@ ScVbaScrollBar::getServiceImplName() uno::Sequence< OUString > ScVbaScrollBar::getServiceNames() { - static uno::Sequence< OUString > aServiceNames; - if ( aServiceNames.getLength() == 0 ) + static uno::Sequence< OUString > const aServiceNames { - aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = "ooo.vba.msforms.Frame"; - } + "ooo.vba.msforms.Frame" + }; return aServiceNames; } diff --git a/vbahelper/source/msforms/vbaspinbutton.cxx b/vbahelper/source/msforms/vbaspinbutton.cxx index 45279ed94800..1da95fcedc55 100644 --- a/vbahelper/source/msforms/vbaspinbutton.cxx +++ b/vbahelper/source/msforms/vbaspinbutton.cxx @@ -77,12 +77,10 @@ ScVbaSpinButton::getServiceImplName() uno::Sequence< OUString > ScVbaSpinButton::getServiceNames() { - static uno::Sequence< OUString > aServiceNames; - if ( aServiceNames.getLength() == 0 ) + static uno::Sequence< OUString > const aServiceNames { - aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = "ooo.vba.msforms.Frame"; - } + "ooo.vba.msforms.Frame" + }; return aServiceNames; } diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.cxx b/vbahelper/source/msforms/vbasystemaxcontrol.cxx index 640326d42fae..d1c42c3746b2 100644 --- a/vbahelper/source/msforms/vbasystemaxcontrol.cxx +++ b/vbahelper/source/msforms/vbasystemaxcontrol.cxx @@ -75,12 +75,10 @@ VbaSystemAXControl::getServiceImplName() uno::Sequence< OUString > VbaSystemAXControl::getServiceNames() { - static uno::Sequence< OUString > aServiceNames; - if ( aServiceNames.getLength() == 0 ) + static uno::Sequence< OUString > const aServiceNames { - aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = "ooo.vba.msforms.Frame"; - } + "ooo.vba.msforms.Frame" + }; return aServiceNames; } diff --git a/vbahelper/source/msforms/vbatextbox.cxx b/vbahelper/source/msforms/vbatextbox.cxx index 87b3c8e0f22b..3f0eba580934 100644 --- a/vbahelper/source/msforms/vbatextbox.cxx +++ b/vbahelper/source/msforms/vbatextbox.cxx @@ -176,12 +176,10 @@ ScVbaTextBox::getServiceImplName() uno::Sequence< OUString > ScVbaTextBox::getServiceNames() { - static uno::Sequence< OUString > aServiceNames; - if ( aServiceNames.getLength() == 0 ) + static uno::Sequence< OUString > const aServiceNames { - aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = "ooo.vba.msforms.TextBox"; - } + "ooo.vba.msforms.TextBox" + }; return aServiceNames; } diff --git a/vbahelper/source/msforms/vbatogglebutton.cxx b/vbahelper/source/msforms/vbatogglebutton.cxx index a81b1a8da536..66106e9266d8 100644 --- a/vbahelper/source/msforms/vbatogglebutton.cxx +++ b/vbahelper/source/msforms/vbatogglebutton.cxx @@ -154,12 +154,10 @@ ScVbaToggleButton::getServiceImplName() uno::Sequence< OUString > ScVbaToggleButton::getServiceNames() { - static uno::Sequence< OUString > aServiceNames; - if ( aServiceNames.getLength() == 0 ) + static uno::Sequence< OUString > const aServiceNames { - aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = "ooo.vba.msforms.ToggleButton"; - } + "ooo.vba.msforms.ToggleButton" + }; return aServiceNames; } diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx index 03d803d44207..6f69f0435a9a 100644 --- a/vbahelper/source/msforms/vbauserform.cxx +++ b/vbahelper/source/msforms/vbauserform.cxx @@ -187,12 +187,10 @@ ScVbaUserForm::getServiceImplName() uno::Sequence< OUString > ScVbaUserForm::getServiceNames() { - static uno::Sequence< OUString > aServiceNames; - if ( aServiceNames.getLength() == 0 ) + static uno::Sequence< OUString > const aServiceNames { - aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = "ooo.vba.excel.UserForm"; - } + "ooo.vba.excel.UserForm" + }; return aServiceNames; } |