svx/source/form/formcontrolling.cxx | 54 ++++++++++++++----------------------
1 file changed, 22 insertions(+), 32 deletions(-)
New commits:
commit 034a462475c2878e1eba13f10b2fcaf8c1755c4a
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue Oct 30 08:04:17 2018 +0100
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Tue Oct 30 10:31:15 2018 +0100
Simplify static initialization
Change-Id: Ief8157da03f2fa79f97d83bdbb589030ddd82686
Reviewed-on: https://gerrit.libreoffice.org/62538
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/svx/source/form/formcontrolling.cxx
b/svx/source/form/formcontrolling.cxx
index 1b2d703f96cd..1cdd504da545 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -76,38 +76,28 @@ namespace svx
const FeatureDescriptions& getFeatureDescriptions()
{
- static FeatureDescriptions s_aFeatureDescriptions;
- if ( s_aFeatureDescriptions.empty() )
- {
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if ( s_aFeatureDescriptions.empty() )
- {
- FeatureDescription aDescriptions[] = {
- { OUString(FMURL_FORM_POSITION),
SID_FM_RECORD_ABSOLUTE, FormFeature::MoveAbsolute },
- { OUString(FMURL_FORM_RECORDCOUNT),
SID_FM_RECORD_TOTAL, FormFeature::TotalRecords },
- { OUString(FMURL_RECORD_MOVEFIRST),
SID_FM_RECORD_FIRST, FormFeature::MoveToFirst },
- { OUString(FMURL_RECORD_MOVEPREV),
SID_FM_RECORD_PREV, FormFeature::MoveToPrevious },
- { OUString(FMURL_RECORD_MOVENEXT),
SID_FM_RECORD_NEXT, FormFeature::MoveToNext },
- { OUString(FMURL_RECORD_MOVELAST),
SID_FM_RECORD_LAST, FormFeature::MoveToLast },
- { OUString(FMURL_RECORD_MOVETONEW),
SID_FM_RECORD_NEW, FormFeature::MoveToInsertRow },
- { OUString(FMURL_RECORD_SAVE),
SID_FM_RECORD_SAVE, FormFeature::SaveRecordChanges },
- { OUString(FMURL_RECORD_DELETE),
SID_FM_RECORD_DELETE, FormFeature::DeleteRecord },
- { OUString(FMURL_FORM_REFRESH),
SID_FM_REFRESH, FormFeature::ReloadForm },
- { OUString(FMURL_FORM_REFRESH_CURRENT_CONTROL),
-
SID_FM_REFRESH_FORM_CONTROL,FormFeature::RefreshCurrentControl },
- { OUString(FMURL_RECORD_UNDO),
SID_FM_RECORD_UNDO, FormFeature::UndoRecordChanges },
- { OUString(FMURL_FORM_SORT_UP), SID_FM_SORTUP,
FormFeature::SortAscending },
- { OUString(FMURL_FORM_SORT_DOWN),
SID_FM_SORTDOWN, FormFeature::SortDescending },
- { OUString(FMURL_FORM_SORT),
SID_FM_ORDERCRIT, FormFeature::InteractiveSort },
- { OUString(FMURL_FORM_AUTO_FILTER),
SID_FM_AUTOFILTER, FormFeature::AutoFilter },
- { OUString(FMURL_FORM_FILTER),
SID_FM_FILTERCRIT, FormFeature::InteractiveFilter },
- { OUString(FMURL_FORM_APPLY_FILTER),
SID_FM_FORM_FILTERED, FormFeature::ToggleApplyFilter },
- { OUString(FMURL_FORM_REMOVE_FILTER),
SID_FM_REMOVE_FILTER_SORT, FormFeature::RemoveFilterAndSort }
- };
- for (FeatureDescription & rDescription : aDescriptions)
- s_aFeatureDescriptions.push_back( rDescription );
- }
- };
+ static const FeatureDescriptions s_aFeatureDescriptions({
+ { OUString(FMURL_FORM_POSITION),
SID_FM_RECORD_ABSOLUTE, FormFeature::MoveAbsolute },
+ { OUString(FMURL_FORM_RECORDCOUNT),
SID_FM_RECORD_TOTAL, FormFeature::TotalRecords },
+ { OUString(FMURL_RECORD_MOVEFIRST),
SID_FM_RECORD_FIRST, FormFeature::MoveToFirst },
+ { OUString(FMURL_RECORD_MOVEPREV),
SID_FM_RECORD_PREV, FormFeature::MoveToPrevious },
+ { OUString(FMURL_RECORD_MOVENEXT),
SID_FM_RECORD_NEXT, FormFeature::MoveToNext },
+ { OUString(FMURL_RECORD_MOVELAST),
SID_FM_RECORD_LAST, FormFeature::MoveToLast },
+ { OUString(FMURL_RECORD_MOVETONEW), SID_FM_RECORD_NEW,
FormFeature::MoveToInsertRow },
+ { OUString(FMURL_RECORD_SAVE),
SID_FM_RECORD_SAVE, FormFeature::SaveRecordChanges },
+ { OUString(FMURL_RECORD_DELETE),
SID_FM_RECORD_DELETE, FormFeature::DeleteRecord },
+ { OUString(FMURL_FORM_REFRESH), SID_FM_REFRESH,
FormFeature::ReloadForm },
+ { OUString(FMURL_FORM_REFRESH_CURRENT_CONTROL),
+
SID_FM_REFRESH_FORM_CONTROL,FormFeature::RefreshCurrentControl },
+ { OUString(FMURL_RECORD_UNDO),
SID_FM_RECORD_UNDO, FormFeature::UndoRecordChanges },
+ { OUString(FMURL_FORM_SORT_UP), SID_FM_SORTUP,
FormFeature::SortAscending },
+ { OUString(FMURL_FORM_SORT_DOWN), SID_FM_SORTDOWN,
FormFeature::SortDescending },
+ { OUString(FMURL_FORM_SORT), SID_FM_ORDERCRIT,
FormFeature::InteractiveSort },
+ { OUString(FMURL_FORM_AUTO_FILTER), SID_FM_AUTOFILTER,
FormFeature::AutoFilter },
+ { OUString(FMURL_FORM_FILTER), SID_FM_FILTERCRIT,
FormFeature::InteractiveFilter },
+ { OUString(FMURL_FORM_APPLY_FILTER),
SID_FM_FORM_FILTERED, FormFeature::ToggleApplyFilter },
+ { OUString(FMURL_FORM_REMOVE_FILTER),
SID_FM_REMOVE_FILTER_SORT, FormFeature::RemoveFilterAndSort }
+ });
return s_aFeatureDescriptions;
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
