Kaydet (Commit) ea10e890 authored tarafından Miklos Vajna's avatar Miklos Vajna

sw: prefix members of SwStyleNameMapper

Change-Id: I374caad0258624e9794993a01ab39c60fbb65a1a
üst 338b6a64
...@@ -82,41 +82,41 @@ class SwStyleNameMapper ...@@ -82,41 +82,41 @@ class SwStyleNameMapper
protected: protected:
// UI Name tables // UI Name tables
static ::std::vector<OUString> *pTextUINameArray, static ::std::vector<OUString> *m_pTextUINameArray,
*pListsUINameArray, *m_pListsUINameArray,
*pExtraUINameArray, *m_pExtraUINameArray,
*pRegisterUINameArray, *m_pRegisterUINameArray,
*pDocUINameArray, *m_pDocUINameArray,
*pHTMLUINameArray, *m_pHTMLUINameArray,
*pFrameFormatUINameArray, *m_pFrameFormatUINameArray,
*pChrFormatUINameArray, *m_pChrFormatUINameArray,
*pHTMLChrFormatUINameArray, *m_pHTMLChrFormatUINameArray,
*pPageDescUINameArray, *m_pPageDescUINameArray,
*pNumRuleUINameArray, *m_pNumRuleUINameArray,
// Programmatic Name tables // Programmatic Name tables
*pTextProgNameArray, *m_pTextProgNameArray,
*pListsProgNameArray, *m_pListsProgNameArray,
*pExtraProgNameArray, *m_pExtraProgNameArray,
*pRegisterProgNameArray, *m_pRegisterProgNameArray,
*pDocProgNameArray, *m_pDocProgNameArray,
*pHTMLProgNameArray, *m_pHTMLProgNameArray,
*pFrameFormatProgNameArray, *m_pFrameFormatProgNameArray,
*pChrFormatProgNameArray, *m_pChrFormatProgNameArray,
*pHTMLChrFormatProgNameArray, *m_pHTMLChrFormatProgNameArray,
*pPageDescProgNameArray, *m_pPageDescProgNameArray,
*pNumRuleProgNameArray; *m_pNumRuleProgNameArray;
static NameToIdHash *pParaUIMap, static NameToIdHash *m_pParaUIMap,
*pCharUIMap, *m_pCharUIMap,
*pPageUIMap, *m_pPageUIMap,
*pFrameUIMap, *m_pFrameUIMap,
*pNumRuleUIMap, *m_pNumRuleUIMap,
*pParaProgMap, *m_pParaProgMap,
*pCharProgMap, *m_pCharProgMap,
*pPageProgMap, *m_pPageProgMap,
*pFrameProgMap, *m_pFrameProgMap,
*pNumRuleProgMap; *m_pNumRuleProgMap;
static void fillNameFromId(sal_uInt16 nId, OUString &rName, bool bProgName); static void fillNameFromId(sal_uInt16 nId, OUString &rName, bool bProgName);
static const OUString& getNameFromId(sal_uInt16 nId, const OUString &rName, static const OUString& getNameFromId(sal_uInt16 nId, const OUString &rName,
......
...@@ -780,43 +780,43 @@ void _FinitCore() ...@@ -780,43 +780,43 @@ void _FinitCore()
#endif #endif
delete SwDoc::mpACmpltWords; delete SwDoc::mpACmpltWords;
delete SwStyleNameMapper::pTextUINameArray; delete SwStyleNameMapper::m_pTextUINameArray;
delete SwStyleNameMapper::pListsUINameArray; delete SwStyleNameMapper::m_pListsUINameArray;
delete SwStyleNameMapper::pExtraUINameArray; delete SwStyleNameMapper::m_pExtraUINameArray;
delete SwStyleNameMapper::pRegisterUINameArray; delete SwStyleNameMapper::m_pRegisterUINameArray;
delete SwStyleNameMapper::pDocUINameArray; delete SwStyleNameMapper::m_pDocUINameArray;
delete SwStyleNameMapper::pHTMLUINameArray; delete SwStyleNameMapper::m_pHTMLUINameArray;
delete SwStyleNameMapper::pFrameFormatUINameArray; delete SwStyleNameMapper::m_pFrameFormatUINameArray;
delete SwStyleNameMapper::pChrFormatUINameArray; delete SwStyleNameMapper::m_pChrFormatUINameArray;
delete SwStyleNameMapper::pHTMLChrFormatUINameArray; delete SwStyleNameMapper::m_pHTMLChrFormatUINameArray;
delete SwStyleNameMapper::pPageDescUINameArray; delete SwStyleNameMapper::m_pPageDescUINameArray;
delete SwStyleNameMapper::pNumRuleUINameArray; delete SwStyleNameMapper::m_pNumRuleUINameArray;
// Delete programmatic name arrays also // Delete programmatic name arrays also
delete SwStyleNameMapper::pTextProgNameArray; delete SwStyleNameMapper::m_pTextProgNameArray;
delete SwStyleNameMapper::pListsProgNameArray; delete SwStyleNameMapper::m_pListsProgNameArray;
delete SwStyleNameMapper::pExtraProgNameArray; delete SwStyleNameMapper::m_pExtraProgNameArray;
delete SwStyleNameMapper::pRegisterProgNameArray; delete SwStyleNameMapper::m_pRegisterProgNameArray;
delete SwStyleNameMapper::pDocProgNameArray; delete SwStyleNameMapper::m_pDocProgNameArray;
delete SwStyleNameMapper::pHTMLProgNameArray; delete SwStyleNameMapper::m_pHTMLProgNameArray;
delete SwStyleNameMapper::pFrameFormatProgNameArray; delete SwStyleNameMapper::m_pFrameFormatProgNameArray;
delete SwStyleNameMapper::pChrFormatProgNameArray; delete SwStyleNameMapper::m_pChrFormatProgNameArray;
delete SwStyleNameMapper::pHTMLChrFormatProgNameArray; delete SwStyleNameMapper::m_pHTMLChrFormatProgNameArray;
delete SwStyleNameMapper::pPageDescProgNameArray; delete SwStyleNameMapper::m_pPageDescProgNameArray;
delete SwStyleNameMapper::pNumRuleProgNameArray; delete SwStyleNameMapper::m_pNumRuleProgNameArray;
// And finally, any hash tables that we used // And finally, any hash tables that we used
delete SwStyleNameMapper::pParaUIMap; delete SwStyleNameMapper::m_pParaUIMap;
delete SwStyleNameMapper::pCharUIMap; delete SwStyleNameMapper::m_pCharUIMap;
delete SwStyleNameMapper::pPageUIMap; delete SwStyleNameMapper::m_pPageUIMap;
delete SwStyleNameMapper::pFrameUIMap; delete SwStyleNameMapper::m_pFrameUIMap;
delete SwStyleNameMapper::pNumRuleUIMap; delete SwStyleNameMapper::m_pNumRuleUIMap;
delete SwStyleNameMapper::pParaProgMap; delete SwStyleNameMapper::m_pParaProgMap;
delete SwStyleNameMapper::pCharProgMap; delete SwStyleNameMapper::m_pCharProgMap;
delete SwStyleNameMapper::pPageProgMap; delete SwStyleNameMapper::m_pPageProgMap;
delete SwStyleNameMapper::pFrameProgMap; delete SwStyleNameMapper::m_pFrameProgMap;
delete SwStyleNameMapper::pNumRuleProgMap; delete SwStyleNameMapper::m_pNumRuleProgMap;
// delete all default attributes // delete all default attributes
for( sal_uInt16 n = 0; n < POOLATTR_END - POOLATTR_BEGIN; n++ ) for( sal_uInt16 n = 0; n < POOLATTR_END - POOLATTR_BEGIN; n++ )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment