From 4ac1a406a78f58c8fba4040c960091e2af4a390b Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 17 Oct 2016 08:45:09 +0200 Subject: sw: rename static members in SwStyleNameMapper Other code in sw seems to use the 'm_' prefix only for non-static members, while the most used convention for static members is 's_', so use that here as well. Change-Id: Ic7dd5c454e98753a9489664ee022e05ef743b863 Reviewed-on: https://gerrit.libreoffice.org/29958 Reviewed-by: Miklos Vajna Tested-by: Jenkins --- sw/inc/SwStyleNameMapper.hxx | 84 ++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 42 deletions(-) (limited to 'sw/inc/SwStyleNameMapper.hxx') diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx index 74336563dc18..9b120d8314b3 100644 --- a/sw/inc/SwStyleNameMapper.hxx +++ b/sw/inc/SwStyleNameMapper.hxx @@ -82,49 +82,49 @@ class SwStyleNameMapper protected: // UI Name tables - static std::vector *m_pTextUINameArray, - *m_pListsUINameArray, - *m_pExtraUINameArray, - *m_pRegisterUINameArray, - *m_pDocUINameArray, - *m_pHTMLUINameArray, - *m_pFrameFormatUINameArray, - *m_pChrFormatUINameArray, - *m_pHTMLChrFormatUINameArray, - *m_pPageDescUINameArray, - *m_pNumRuleUINameArray, - *m_pTableStyleUINameArray, - *m_pCellStyleUINameArray, + static std::vector *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 - *m_pTextProgNameArray, - *m_pListsProgNameArray, - *m_pExtraProgNameArray, - *m_pRegisterProgNameArray, - *m_pDocProgNameArray, - *m_pHTMLProgNameArray, - *m_pFrameFormatProgNameArray, - *m_pChrFormatProgNameArray, - *m_pHTMLChrFormatProgNameArray, - *m_pPageDescProgNameArray, - *m_pNumRuleProgNameArray, - *m_pTableStyleProgNameArray, - *m_pCellStyleProgNameArray; - - static NameToIdHash *m_pParaUIMap, - *m_pCharUIMap, - *m_pPageUIMap, - *m_pFrameUIMap, - *m_pNumRuleUIMap, - *m_pTableStyleUIMap, - *m_pCellStyleUIMap, - - *m_pParaProgMap, - *m_pCharProgMap, - *m_pPageProgMap, - *m_pFrameProgMap, - *m_pNumRuleProgMap, - *m_pTableStyleProgMap, - *m_pCellStyleProgMap; + *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, -- cgit