diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-10-04 03:20:02 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-10-04 07:25:34 +0200 |
| commit | 02bfb5e22eb55679e10d66e246218ea5adec65e1 (patch) | |
| tree | 0bbdf3b26ff0c1d30676f2ade53ad22ec57a1beb /sw/inc | |
| parent | aceb396e65fe024afb9adfb2d4646f96ecb985c3 (diff) | |
Use function-local statics for SwStyleNameMapper lists/maps
Simplifies memory management; makes code clearer; in case of
SwStyleNameMapper::getHashTable, avoids unnecessary filling
of vIndexes at each call.
Change-Id: I789bc0695d39dddcccac6cbc43fb48ab94f1321b
Reviewed-on: https://gerrit.libreoffice.org/80174
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/SwStyleNameMapper.hxx | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx index 79d4f1011238..139f09c974db 100644 --- a/sw/inc/SwStyleNameMapper.hxx +++ b/sw/inc/SwStyleNameMapper.hxx @@ -78,51 +78,6 @@ class SwStyleNameMapper final friend void InitCore(); friend void FinitCore(); - // UI Name tables - static std::vector<OUString> *s_pTextUINameArray, - *s_pListsUINameArray, - *s_pExtraUINameArray, - *s_pRegisterUINameArray, - *s_pDocUINameArray, - *s_pHTMLUINameArray, - *s_pFrameFormatUINameArray, - *s_pChrFormatUINameArray, - *s_pHTMLChrFormatUINameArray, - *s_pPageDescUINameArray, - *s_pNumRuleUINameArray, - *s_pTableStyleUINameArray, - *s_pCellStyleUINameArray, - // Programmatic Name tables - *s_pTextProgNameArray, - *s_pListsProgNameArray, - *s_pExtraProgNameArray, - *s_pRegisterProgNameArray, - *s_pDocProgNameArray, - *s_pHTMLProgNameArray, - *s_pFrameFormatProgNameArray, - *s_pChrFormatProgNameArray, - *s_pHTMLChrFormatProgNameArray, - *s_pPageDescProgNameArray, - *s_pNumRuleProgNameArray, - *s_pTableStyleProgNameArray, - *s_pCellStyleProgNameArray; - - static NameToIdHash *s_pParaUIMap, - *s_pCharUIMap, - *s_pPageUIMap, - *s_pFrameUIMap, - *s_pNumRuleUIMap, - *s_pTableStyleUIMap, - *s_pCellStyleUIMap, - - *s_pParaProgMap, - *s_pCharProgMap, - *s_pPageProgMap, - *s_pFrameProgMap, - *s_pNumRuleProgMap, - *s_pTableStyleProgMap, - *s_pCellStyleProgMap; - static void fillNameFromId(sal_uInt16 nId, OUString &rName, bool bProgName); static const OUString& getNameFromId(sal_uInt16 nId, const OUString &rName, bool bProgName); |