[Libreoffice-commits] core.git: 2 commits - helpcontent2 toolkit/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Nov 22 17:54:39 UTC 2018
helpcontent2 | 2
toolkit/source/controls/animatedimages.cxx | 9 -
toolkit/source/controls/controlmodelcontainerbase.cxx | 9 -
toolkit/source/controls/dialogcontrol.cxx | 36 ----
toolkit/source/controls/formattedcontrol.cxx | 9 -
toolkit/source/controls/grid/gridcontrol.cxx | 9 -
toolkit/source/controls/roadmapcontrol.cxx | 9 -
toolkit/source/controls/tabpagecontainer.cxx | 9 -
toolkit/source/controls/tabpagemodel.cxx | 9 -
toolkit/source/controls/tkscrollbar.cxx | 9 -
toolkit/source/controls/tkspinbutton.cxx | 9 -
toolkit/source/controls/tree/treecontrol.cxx | 9 -
toolkit/source/controls/unocontrolcontainermodel.cxx | 11 -
toolkit/source/controls/unocontrols.cxx | 162 ++++--------------
14 files changed, 67 insertions(+), 234 deletions(-)
New commits:
commit 170df072a612456ec83143dff0174a2e376afcba
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Nov 22 13:12:17 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Nov 22 18:54:21 2018 +0100
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 at collabora.co.uk>
diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx
index a9cee3921d5a..23bb5a4f4b3e 100644
--- a/toolkit/source/controls/animatedimages.cxx
+++ b/toolkit/source/controls/animatedimages.cxx
@@ -347,13 +347,8 @@ namespace toolkit {
::cppu::IPropertyArrayHelper& SAL_CALL AnimatedImagesControlModel::getInfoHelper()
{
- static UnoPropertyArrayHelper* pHelper = nullptr;
- if ( !pHelper )
- {
- Sequence< sal_Int32 > aIDs = ImplGetPropertyIds();
- pHelper = new UnoPropertyArrayHelper( aIDs );
- }
- return *pHelper;
+ static UnoPropertyArrayHelper aHelper( ImplGetPropertyIds() );
+ return aHelper;
}
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 4d05caa81ff8..514cfccec5b9 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -233,13 +233,8 @@ Any ControlModelContainerBase::ImplGetDefaultValue( sal_uInt16 nPropId ) const
::cppu::IPropertyArrayHelper& ControlModelContainerBase::getInfoHelper()
{
- static UnoPropertyArrayHelper* pHelper = nullptr;
- if ( !pHelper )
- {
- Sequence<sal_Int32> aIDs = ImplGetPropertyIds();
- pHelper = new UnoPropertyArrayHelper( aIDs );
- }
- return *pHelper;
+ static UnoPropertyArrayHelper aHelper( ImplGetPropertyIds() );
+ return aHelper;
}
void SAL_CALL ControlModelContainerBase::dispose( )
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
diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx
index 1bc3178305f8..1567b5817e16 100644
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.cxx
@@ -392,13 +392,8 @@ namespace toolkit
::cppu::IPropertyArrayHelper& UnoControlFormattedFieldModel::getInfoHelper()
{
- static UnoPropertyArrayHelper* pHelper = nullptr;
- if ( !pHelper )
- {
- Sequence<sal_Int32> aIDs = ImplGetPropertyIds();
- pHelper = new UnoPropertyArrayHelper( aIDs );
- }
- return *pHelper;
+ static UnoPropertyArrayHelper aHelper( ImplGetPropertyIds() );
+ return aHelper;
}
// beans::XMultiPropertySet
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index 3807e570b89e..6cd6e8ad151b 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -251,13 +251,8 @@ Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
::cppu::IPropertyArrayHelper& UnoGridModel::getInfoHelper()
{
- static UnoPropertyArrayHelper* pHelper = nullptr;
- if ( !pHelper )
- {
- Sequence<sal_Int32> aIDs = ImplGetPropertyIds();
- pHelper = new UnoPropertyArrayHelper( aIDs );
- }
- return *pHelper;
+ static UnoPropertyArrayHelper aHelper( ImplGetPropertyIds() );
+ return aHelper;
}
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index 1807c2200394..3e7f9e0bd500 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -156,13 +156,8 @@ static void lcl_throwIndexOutOfBoundsException( )
::cppu::IPropertyArrayHelper& UnoControlRoadmapModel::getInfoHelper()
{
- static UnoPropertyArrayHelper* pHelper = nullptr;
- if ( !pHelper )
- {
- Sequence<sal_Int32> aIDs = ImplGetPropertyIds();
- pHelper = new UnoPropertyArrayHelper( aIDs );
- }
- return *pHelper;
+ static UnoPropertyArrayHelper aHelper( ImplGetPropertyIds() );
+ return aHelper;
}
diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx
index fd276a1020d8..f7084896db19 100644
--- a/toolkit/source/controls/tabpagecontainer.cxx
+++ b/toolkit/source/controls/tabpagecontainer.cxx
@@ -81,13 +81,8 @@ uno::Any UnoControlTabPageContainerModel::ImplGetDefaultValue( sal_uInt16 nPropI
::cppu::IPropertyArrayHelper& UnoControlTabPageContainerModel::getInfoHelper()
{
- static UnoPropertyArrayHelper* pHelper = nullptr;
- if ( !pHelper )
- {
- css::uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds();
- pHelper = new UnoPropertyArrayHelper( aIDs );
- }
- return *pHelper;
+ static UnoPropertyArrayHelper aHelper( ImplGetPropertyIds() );
+ return aHelper;
}
Reference< css::beans::XPropertySetInfo > UnoControlTabPageContainerModel::getPropertySetInfo( )
{
diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx
index ade7374176f8..b0731ec3b9e3 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -92,13 +92,8 @@ Any UnoControlTabPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
::cppu::IPropertyArrayHelper& UnoControlTabPageModel::getInfoHelper()
{
- static UnoPropertyArrayHelper* pHelper = nullptr;
- if ( !pHelper )
- {
- Sequence<sal_Int32> aIDs = ImplGetPropertyIds();
- pHelper = new UnoPropertyArrayHelper( aIDs );
- }
- return *pHelper;
+ static UnoPropertyArrayHelper aHelper( ImplGetPropertyIds() );
+ return aHelper;
}
// beans::XMultiPropertySet
uno::Reference< beans::XPropertySetInfo > UnoControlTabPageModel::getPropertySetInfo( )
diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index a91a5933066a..ea8510db9dba 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -81,13 +81,8 @@ namespace toolkit
::cppu::IPropertyArrayHelper& UnoControlScrollBarModel::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;
}
diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx
index 46e72e406648..3baf18dfbbde 100644
--- a/toolkit/source/controls/tkspinbutton.cxx
+++ b/toolkit/source/controls/tkspinbutton.cxx
@@ -169,13 +169,8 @@ public:
::cppu::IPropertyArrayHelper& UnoSpinButtonModel::getInfoHelper()
{
- static UnoPropertyArrayHelper* pHelper = nullptr;
- if ( !pHelper )
- {
- Sequence<sal_Int32> aIDs = ImplGetPropertyIds();
- pHelper = new UnoPropertyArrayHelper( aIDs );
- }
- return *pHelper;
+ static UnoPropertyArrayHelper aHelper( ImplGetPropertyIds() );
+ return aHelper;
}
diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx
index 044894ea191d..50eb1136531a 100644
--- a/toolkit/source/controls/tree/treecontrol.cxx
+++ b/toolkit/source/controls/tree/treecontrol.cxx
@@ -105,13 +105,8 @@ Any UnoTreeModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
::cppu::IPropertyArrayHelper& UnoTreeModel::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
diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx
index d7ded7950c2f..162173157b29 100644
--- a/toolkit/source/controls/unocontrolcontainermodel.cxx
+++ b/toolkit/source/controls/unocontrolcontainermodel.cxx
@@ -79,15 +79,8 @@ css::uno::Reference< css::beans::XPropertySetInfo > UnoControlContainerModel::ge
::cppu::IPropertyArrayHelper& UnoControlContainerModel::getInfoHelper()
{
- ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
- static UnoPropertyArrayHelper* pHelper = nullptr;
- if ( !pHelper )
- {
- css::uno::Sequence<sal_Int32> aIDs = ImplGetPropertyIds();
- pHelper = new UnoPropertyArrayHelper( aIDs );
- }
- return *pHelper;
+ static UnoPropertyArrayHelper aHelper( ImplGetPropertyIds() );
+ return aHelper;
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index f093137f35e6..f9aac462f571 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -136,13 +136,8 @@ uno::Any UnoControlEditModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
::cppu::IPropertyArrayHelper& UnoControlEditModel::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
@@ -535,13 +530,8 @@ uno::Any UnoControlFileControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c
::cppu::IPropertyArrayHelper& UnoControlFileControlModel::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
@@ -721,13 +711,8 @@ uno::Any UnoControlButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
::cppu::IPropertyArrayHelper& UnoControlButtonModel::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
@@ -962,13 +947,8 @@ uno::Any UnoControlImageControlModel::ImplGetDefaultValue( sal_uInt16 nPropId )
::cppu::IPropertyArrayHelper& UnoControlImageControlModel::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
@@ -1123,13 +1103,8 @@ uno::Any UnoControlRadioButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c
::cppu::IPropertyArrayHelper& UnoControlRadioButtonModel::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
@@ -1370,13 +1345,8 @@ uno::Any UnoControlCheckBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons
::cppu::IPropertyArrayHelper& UnoControlCheckBoxModel::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
@@ -1593,13 +1563,8 @@ uno::Any UnoControlFixedHyperlinkModel::ImplGetDefaultValue( sal_uInt16 nPropId
::cppu::IPropertyArrayHelper& UnoControlFixedHyperlinkModel::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
@@ -1780,13 +1745,8 @@ uno::Any UnoControlFixedTextModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con
::cppu::IPropertyArrayHelper& UnoControlFixedTextModel::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
@@ -1952,13 +1912,8 @@ uno::Any UnoControlGroupBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons
::cppu::IPropertyArrayHelper& UnoControlGroupBoxModel::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
@@ -2192,13 +2147,8 @@ uno::Any UnoControlListBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
::cppu::IPropertyArrayHelper& UnoControlListBoxModel::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;
}
@@ -3051,13 +3001,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlComboBoxModel::getPropertySe
::cppu::IPropertyArrayHelper& UnoControlComboBoxModel::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;
}
@@ -3553,13 +3498,8 @@ uno::Any UnoControlDateFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con
::cppu::IPropertyArrayHelper& UnoControlDateFieldModel::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
@@ -3828,13 +3768,8 @@ uno::Any UnoControlTimeFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con
::cppu::IPropertyArrayHelper& UnoControlTimeFieldModel::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
@@ -4062,13 +3997,8 @@ uno::Any UnoControlNumericFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId )
::cppu::IPropertyArrayHelper& UnoControlNumericFieldModel::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
@@ -4291,13 +4221,8 @@ uno::Any UnoControlCurrencyFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId )
::cppu::IPropertyArrayHelper& UnoControlCurrencyFieldModel::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
@@ -4515,13 +4440,8 @@ uno::Any UnoControlPatternFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId )
::cppu::IPropertyArrayHelper& UnoControlPatternFieldModel::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
@@ -4698,13 +4618,8 @@ uno::Any UnoControlProgressBarModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c
::cppu::IPropertyArrayHelper& UnoControlProgressBarModel::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
@@ -4863,13 +4778,8 @@ uno::Any UnoControlFixedLineModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con
::cppu::IPropertyArrayHelper& UnoControlFixedLineModel::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
commit c5b920dc889410ef5c4baf0adf7fc57ff0d2f123
Author: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
AuthorDate: Thu Nov 22 11:54:01 2018 -0600
Commit: Gerrit Code Review <gerrit at gerrit.libreoffice.org>
CommitDate: Thu Nov 22 18:54:10 2018 +0100
Update git submodules
* Update helpcontent2 from branch 'master'
- tdf#119415 Widen search box and style placeholder
Change-Id: I0f60cfea338e695e778d16a208153597ec6d19ca
diff --git a/helpcontent2 b/helpcontent2
index a678c05324cf..ad162dec44f8 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a678c05324cff46eace7c439a4595a3014fa8576
+Subproject commit ad162dec44f8dc15cfa7405cba597b76cba8b3bd
More information about the Libreoffice-commits
mailing list