diff options
author | August Sodora <augsod@gmail.com> | 2012-01-14 00:33:41 -0500 |
---|---|---|
committer | August Sodora <augsod@gmail.com> | 2012-01-14 00:33:41 -0500 |
commit | e1df68d79b50148078a13436b2b913f28ddf84e4 (patch) | |
tree | 1497901481bb127bac9f6422c07fdf03e3014a50 /sw | |
parent | 169f3b47c0ad339c6983de2e19d94627c9e567d3 (diff) |
SvStringsDtor->boost::ptr_vector
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/SwStyleNameMapper.hxx | 56 | ||||
-rw-r--r-- | sw/inc/docstyle.hxx | 3 | ||||
-rw-r--r-- | sw/source/core/doc/SwStyleNameMapper.cxx | 108 | ||||
-rw-r--r-- | sw/source/core/unocore/unofield.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/app/docsh2.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/app/docst.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/app/docstyle.cxx | 28 | ||||
-rw-r--r-- | sw/source/ui/uiview/view2.cxx | 6 |
8 files changed, 107 insertions, 104 deletions
diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx index 3627d0b5dbc4..339f265bf0c2 100644 --- a/sw/inc/SwStyleNameMapper.hxx +++ b/sw/inc/SwStyleNameMapper.hxx @@ -39,6 +39,8 @@ #endif #include <stringhash.hxx> +#include <boost/ptr_container/ptr_vector.hpp> + /** This class holds all data about the names of styles used in the user * interface (UI names...these are localised into different languages). * These UI names are loaded from the resource files on demand. @@ -83,11 +85,9 @@ * " (user)", we simply remove it. */ -class SvStringsDtor; class String; struct SwTableEntry; - typedef ::boost::unordered_map < const String*, sal_uInt16, StringHash, StringEq > NameToIdHash; class SwStyleNameMapper @@ -97,7 +97,7 @@ class SwStyleNameMapper protected: // UI Name tables - static SvStringsDtor *pTextUINameArray, + static boost::ptr_vector<String> *pTextUINameArray, *pListsUINameArray, *pExtraUINameArray, *pRegisterUINameArray, @@ -133,11 +133,11 @@ protected: *pFrameProgMap, *pNumRuleProgMap; - static SvStringsDtor* NewUINameArray( SvStringsDtor*&, + static boost::ptr_vector<String>* NewUINameArray( boost::ptr_vector<String>*&, sal_uInt16 nStt, sal_uInt16 nEnd ); - static SvStringsDtor* NewProgNameArray( SvStringsDtor*&, + static boost::ptr_vector<String>* NewProgNameArray( boost::ptr_vector<String>*&, const SwTableEntry *pTable, sal_uInt8 nCount); @@ -178,29 +178,29 @@ public: SW_DLLPUBLIC static const String GetSpecialExtraProgName( const String& rExtraUIName ); static const String GetSpecialExtraUIName( const String& rExtraProgName ); - static const SvStringsDtor& GetTextUINameArray(); - static const SvStringsDtor& GetListsUINameArray(); - static const SvStringsDtor& GetExtraUINameArray(); - static const SvStringsDtor& GetRegisterUINameArray(); - static const SvStringsDtor& GetDocUINameArray(); - static const SvStringsDtor& GetHTMLUINameArray(); - static const SvStringsDtor& GetFrmFmtUINameArray(); - static const SvStringsDtor& GetChrFmtUINameArray(); - static const SvStringsDtor& GetHTMLChrFmtUINameArray(); - static const SvStringsDtor& GetPageDescUINameArray(); - static const SvStringsDtor& GetNumRuleUINameArray(); - - static const SvStringsDtor& GetTextProgNameArray(); - static const SvStringsDtor& GetListsProgNameArray(); - static const SvStringsDtor& GetExtraProgNameArray(); - static const SvStringsDtor& GetRegisterProgNameArray(); - static const SvStringsDtor& GetDocProgNameArray(); - static const SvStringsDtor& GetHTMLProgNameArray(); - static const SvStringsDtor& GetFrmFmtProgNameArray(); - static const SvStringsDtor& GetChrFmtProgNameArray(); - static const SvStringsDtor& GetHTMLChrFmtProgNameArray(); - static const SvStringsDtor& GetPageDescProgNameArray(); - static const SvStringsDtor& GetNumRuleProgNameArray(); + static const boost::ptr_vector<String>& GetTextUINameArray(); + static const boost::ptr_vector<String>& GetListsUINameArray(); + static const boost::ptr_vector<String>& GetExtraUINameArray(); + static const boost::ptr_vector<String>& GetRegisterUINameArray(); + static const boost::ptr_vector<String>& GetDocUINameArray(); + static const boost::ptr_vector<String>& GetHTMLUINameArray(); + static const boost::ptr_vector<String>& GetFrmFmtUINameArray(); + static const boost::ptr_vector<String>& GetChrFmtUINameArray(); + static const boost::ptr_vector<String>& GetHTMLChrFmtUINameArray(); + static const boost::ptr_vector<String>& GetPageDescUINameArray(); + static const boost::ptr_vector<String>& GetNumRuleUINameArray(); + + static const boost::ptr_vector<String>& GetTextProgNameArray(); + static const boost::ptr_vector<String>& GetListsProgNameArray(); + static const boost::ptr_vector<String>& GetExtraProgNameArray(); + static const boost::ptr_vector<String>& GetRegisterProgNameArray(); + static const boost::ptr_vector<String>& GetDocProgNameArray(); + static const boost::ptr_vector<String>& GetHTMLProgNameArray(); + static const boost::ptr_vector<String>& GetFrmFmtProgNameArray(); + static const boost::ptr_vector<String>& GetChrFmtProgNameArray(); + static const boost::ptr_vector<String>& GetHTMLChrFmtProgNameArray(); + static const boost::ptr_vector<String>& GetPageDescProgNameArray(); + static const boost::ptr_vector<String>& GetNumRuleProgNameArray(); }; #endif // _NAME_MAPPER_HXX diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index dea7fbfee013..1ad76314dd6f 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -34,6 +34,7 @@ #include <svl/style.hxx> #include <svl/itemset.hxx> #include "swdllapi.h" +#include <boost/ptr_container/ptr_vector.hpp> class SwDoc; class SwDocStyleSheetPool; @@ -162,7 +163,7 @@ class SwStyleSheetIterator : public SfxStyleSheetIterator, public SfxListener sal_uInt16 nLastPos; sal_Bool bFirstCalled; - void AppendStyleList(const SvStringsDtor& rLst, + void AppendStyleList(const boost::ptr_vector<String>& rLst, sal_Bool bUsed, sal_uInt16 nSection, char cType); diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx index df33c4fb8bd3..019b62df17b9 100644 --- a/sw/source/core/doc/SwStyleNameMapper.cxx +++ b/sw/source/core/doc/SwStyleNameMapper.cxx @@ -37,7 +37,7 @@ extern ResMgr* pSwResMgr; // Initialise UI names to 0 -SvStringsDtor *SwStyleNameMapper::pTextUINameArray = 0, +boost::ptr_vector<String> *SwStyleNameMapper::pTextUINameArray = 0, *SwStyleNameMapper::pListsUINameArray = 0, *SwStyleNameMapper::pExtraUINameArray = 0, *SwStyleNameMapper::pRegisterUINameArray = 0, @@ -350,7 +350,7 @@ void SwStyleNameMapper::CheckSuffixAndDelete ( String & rString ) const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlags, sal_Bool bProgName ) { NameToIdHash *pHash = 0; - const SvStringsDtor *pStrings; + const boost::ptr_vector<String> *pStrings; switch ( eFlags ) { @@ -370,22 +370,22 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag RES_POOLCOLL_HTML_END - RES_POOLCOLL_HTML_BEGIN ); pStrings = bProgName ? &GetTextProgNameArray() : &GetTextUINameArray(); for ( nIndex = 0, nId = RES_POOLCOLL_TEXT_BEGIN ; nId < RES_POOLCOLL_TEXT_END ; nId++,nIndex++ ) - (*pHash)[(*pStrings)[nIndex]] = nId; + (*pHash)[&((*pStrings)[nIndex])] = nId; pStrings = bProgName ? &GetListsProgNameArray() : &GetListsUINameArray(); for ( nIndex = 0, nId = RES_POOLCOLL_LISTS_BEGIN ; nId < RES_POOLCOLL_LISTS_END ; nId++,nIndex++ ) - (*pHash)[(*pStrings)[nIndex]] = nId; + (*pHash)[&((*pStrings)[nIndex])] = nId; pStrings = bProgName ? &GetExtraProgNameArray() : &GetExtraUINameArray(); for ( nIndex = 0, nId = RES_POOLCOLL_EXTRA_BEGIN ; nId < RES_POOLCOLL_EXTRA_END ; nId++,nIndex++ ) - (*pHash)[(*pStrings)[nIndex]] = nId; + (*pHash)[&((*pStrings)[nIndex])] = nId; pStrings = bProgName ? &GetRegisterProgNameArray() : &GetRegisterUINameArray(); for ( nIndex = 0, nId = RES_POOLCOLL_REGISTER_BEGIN ; nId < RES_POOLCOLL_REGISTER_END ; nId++,nIndex++ ) - (*pHash)[(*pStrings)[nIndex]] = nId; + (*pHash)[&((*pStrings)[nIndex])] = nId; pStrings = bProgName ? &GetDocProgNameArray() : &GetDocUINameArray(); for ( nIndex = 0, nId = RES_POOLCOLL_DOC_BEGIN ; nId < RES_POOLCOLL_DOC_END ; nId++,nIndex++ ) - (*pHash)[(*pStrings)[nIndex]] = nId; + (*pHash)[&((*pStrings)[nIndex])] = nId; pStrings = bProgName ? &GetHTMLProgNameArray() : &GetHTMLUINameArray(); for ( nIndex = 0, nId = RES_POOLCOLL_HTML_BEGIN ; nId < RES_POOLCOLL_HTML_END ; nId++,nIndex++ ) - (*pHash)[(*pStrings)[nIndex]] = nId; + (*pHash)[&((*pStrings)[nIndex])] = nId; if ( bProgName ) pParaProgMap = pHash; @@ -406,10 +406,10 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag RES_POOLCHR_HTML_END - RES_POOLCHR_HTML_BEGIN ); pStrings = bProgName ? &GetChrFmtProgNameArray() : &GetChrFmtUINameArray(); for ( nIndex = 0, nId = RES_POOLCHR_NORMAL_BEGIN ; nId < RES_POOLCHR_NORMAL_END ; nId++,nIndex++ ) - (*pHash)[(*pStrings)[nIndex]] = nId; + (*pHash)[&((*pStrings)[nIndex])] = nId; pStrings = bProgName ? &GetHTMLChrFmtProgNameArray() : &GetHTMLChrFmtUINameArray(); for ( nIndex = 0, nId = RES_POOLCHR_HTML_BEGIN ; nId < RES_POOLCHR_HTML_END ; nId++,nIndex++ ) - (*pHash)[(*pStrings)[nIndex]] = nId; + (*pHash)[&((*pStrings)[nIndex])] = nId; if (bProgName ) pCharProgMap = pHash; else @@ -425,7 +425,7 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag pHash = new NameToIdHash ( RES_POOLFRM_END - RES_POOLFRM_BEGIN ); pStrings = bProgName ? &GetFrmFmtProgNameArray() : &GetFrmFmtUINameArray(); for ( sal_uInt16 nIndex=0,nId = RES_POOLFRM_BEGIN ; nId < RES_POOLFRM_END ; nId++,nIndex++ ) - (*pHash)[(*pStrings)[nIndex]] = nId; + (*pHash)[&((*pStrings)[nIndex])] = nId; if ( bProgName ) pFrameProgMap = pHash; else @@ -441,7 +441,7 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag pHash = new NameToIdHash ( RES_POOLPAGE_END - RES_POOLPAGE_BEGIN ); pStrings = bProgName ? &GetPageDescProgNameArray() : &GetPageDescUINameArray(); for ( sal_uInt16 nIndex=0,nId = RES_POOLPAGE_BEGIN ; nId < RES_POOLPAGE_END ; nId++,nIndex++ ) - (*pHash)[(*pStrings)[nIndex]] = nId; + (*pHash)[&((*pStrings)[nIndex])] = nId; if ( bProgName ) pPageProgMap = pHash; else @@ -457,7 +457,9 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag pHash = new NameToIdHash ( RES_POOLNUMRULE_END - RES_POOLNUMRULE_BEGIN ); pStrings = bProgName ? &GetNumRuleProgNameArray() : &GetNumRuleUINameArray(); for ( sal_uInt16 nIndex=0,nId = RES_POOLNUMRULE_BEGIN ; nId < RES_POOLNUMRULE_END ; nId++,nIndex++ ) - (*pHash)[(*pStrings)[nIndex]] = nId; + { + (*pHash)[&((*pStrings)[nIndex])] = nId; + } if ( bProgName ) pNumRuleProgMap = pHash; else @@ -681,7 +683,7 @@ void SwStyleNameMapper::FillUIName ( const String& rName, String& rFillName, SwG const String& SwStyleNameMapper::getNameFromId( sal_uInt16 nId, const String& rFillName, sal_Bool bProgName ) { sal_uInt16 nStt = 0; - const SvStringsDtor* pStrArr = 0; + const boost::ptr_vector<String>* pStrArr = 0; switch( (USER_FMT | COLL_GET_RANGE_BITS | POOLGRP_NOCOLLID) & nId ) { @@ -761,12 +763,12 @@ const String& SwStyleNameMapper::getNameFromId( sal_uInt16 nId, const String& rF } break; } - return pStrArr ? *(pStrArr->operator[] ( nId - nStt ) ) : rFillName; + return pStrArr ? (pStrArr->operator[] ( nId - nStt ) ) : rFillName; } void SwStyleNameMapper::fillNameFromId( sal_uInt16 nId, String& rFillName, sal_Bool bProgName ) { sal_uInt16 nStt = 0; - const SvStringsDtor* pStrArr = 0; + const boost::ptr_vector<String>* pStrArr = 0; switch( (USER_FMT | COLL_GET_RANGE_BITS | POOLGRP_NOCOLLID) & nId ) { @@ -847,7 +849,7 @@ void SwStyleNameMapper::fillNameFromId( sal_uInt16 nId, String& rFillName, sal_B break; } if (pStrArr) - rFillName = *(pStrArr->operator[] ( nId - nStt ) ); + rFillName = (pStrArr->operator[] ( nId - nStt ) ); } // Get the UI Name from the pool ID void SwStyleNameMapper::FillUIName ( sal_uInt16 nId, String& rFillName ) @@ -885,23 +887,23 @@ sal_uInt16 SwStyleNameMapper::GetPoolIdFromProgName( const String& rName, SwGetP return aIter != rHashMap.end() ? (*aIter).second : USHRT_MAX; } -SvStringsDtor* SwStyleNameMapper::NewUINameArray( SvStringsDtor*& pNameArray, sal_uInt16 nStt, sal_uInt16 nEnd ) +boost::ptr_vector<String>* SwStyleNameMapper::NewUINameArray( boost::ptr_vector<String>*& pNameArray, sal_uInt16 nStt, sal_uInt16 nEnd ) { if( !pNameArray ) { - pNameArray = new SvStringsDtor( static_cast < sal_Int8 > (nEnd - nStt), 1 ); + pNameArray = new boost::ptr_vector<String>; + pNameArray->reserve(nEnd - nStt); while( nStt < nEnd ) { const ResId rRId( nStt, *pSwResMgr ); - String* pStr = new String( rRId ); - pNameArray->Insert( pStr, pNameArray->Count() ); + pNameArray->push_back(new String(rRId)); ++nStt; } } return pNameArray; } -const SvStringsDtor& SwStyleNameMapper::GetTextUINameArray() +const boost::ptr_vector<String>& SwStyleNameMapper::GetTextUINameArray() { return pTextUINameArray ? *pTextUINameArray : *NewUINameArray( pTextUINameArray, RC_POOLCOLL_TEXT_BEGIN, @@ -909,7 +911,7 @@ const SvStringsDtor& SwStyleNameMapper::GetTextUINameArray() (RES_POOLCOLL_TEXT_END - RES_POOLCOLL_TEXT_BEGIN )) ); } -const SvStringsDtor& SwStyleNameMapper::GetListsUINameArray() +const boost::ptr_vector<String>& SwStyleNameMapper::GetListsUINameArray() { return pListsUINameArray ? *pListsUINameArray : *NewUINameArray( pListsUINameArray, RC_POOLCOLL_LISTS_BEGIN, @@ -917,7 +919,7 @@ const SvStringsDtor& SwStyleNameMapper::GetListsUINameArray() (RES_POOLCOLL_LISTS_END - RES_POOLCOLL_LISTS_BEGIN )) ); } -const SvStringsDtor& SwStyleNameMapper::GetExtraUINameArray() +const boost::ptr_vector<String>& SwStyleNameMapper::GetExtraUINameArray() { return pExtraUINameArray ? *pExtraUINameArray : *NewUINameArray( pExtraUINameArray, RC_POOLCOLL_EXTRA_BEGIN, @@ -925,7 +927,7 @@ const SvStringsDtor& SwStyleNameMapper::GetExtraUINameArray() (RES_POOLCOLL_EXTRA_END - RES_POOLCOLL_EXTRA_BEGIN )) ); } -const SvStringsDtor& SwStyleNameMapper::GetRegisterUINameArray() +const boost::ptr_vector<String>& SwStyleNameMapper::GetRegisterUINameArray() { return pRegisterUINameArray ? *pRegisterUINameArray : *NewUINameArray( pRegisterUINameArray, RC_POOLCOLL_REGISTER_BEGIN, @@ -933,7 +935,7 @@ const SvStringsDtor& SwStyleNameMapper::GetRegisterUINameArray() (RES_POOLCOLL_REGISTER_END - RES_POOLCOLL_REGISTER_BEGIN )) ); } -const SvStringsDtor& SwStyleNameMapper::GetDocUINameArray() +const boost::ptr_vector<String>& SwStyleNameMapper::GetDocUINameArray() { return pDocUINameArray ? *pDocUINameArray : *NewUINameArray( pDocUINameArray, RC_POOLCOLL_DOC_BEGIN, @@ -941,7 +943,7 @@ const SvStringsDtor& SwStyleNameMapper::GetDocUINameArray() (RES_POOLCOLL_DOC_END - RES_POOLCOLL_DOC_BEGIN )) ); } -const SvStringsDtor& SwStyleNameMapper::GetHTMLUINameArray() +const boost::ptr_vector<String>& SwStyleNameMapper::GetHTMLUINameArray() { return pHTMLUINameArray ? *pHTMLUINameArray : *NewUINameArray( pHTMLUINameArray, RC_POOLCOLL_HTML_BEGIN, @@ -949,7 +951,7 @@ const SvStringsDtor& SwStyleNameMapper::GetHTMLUINameArray() (RES_POOLCOLL_HTML_END - RES_POOLCOLL_HTML_BEGIN )) ); } -const SvStringsDtor& SwStyleNameMapper::GetFrmFmtUINameArray() +const boost::ptr_vector<String>& SwStyleNameMapper::GetFrmFmtUINameArray() { return pFrmFmtUINameArray ? *pFrmFmtUINameArray : *NewUINameArray( pFrmFmtUINameArray, RC_POOLFRMFMT_BEGIN, @@ -957,7 +959,7 @@ const SvStringsDtor& SwStyleNameMapper::GetFrmFmtUINameArray() (RES_POOLFRM_END - RES_POOLFRM_BEGIN )) ); } -const SvStringsDtor& SwStyleNameMapper::GetChrFmtUINameArray() +const boost::ptr_vector<String>& SwStyleNameMapper::GetChrFmtUINameArray() { return pChrFmtUINameArray ? *pChrFmtUINameArray : *NewUINameArray( pChrFmtUINameArray, RC_POOLCHRFMT_BEGIN, @@ -965,7 +967,7 @@ const SvStringsDtor& SwStyleNameMapper::GetChrFmtUINameArray() (RES_POOLCHR_NORMAL_END - RES_POOLCHR_NORMAL_BEGIN )) ); } -const SvStringsDtor& SwStyleNameMapper::GetHTMLChrFmtUINameArray() +const boost::ptr_vector<String>& SwStyleNameMapper::GetHTMLChrFmtUINameArray() { return pHTMLChrFmtUINameArray ? *pHTMLChrFmtUINameArray : *NewUINameArray( pHTMLChrFmtUINameArray, RC_POOLCHRFMT_HTML_BEGIN, @@ -973,7 +975,7 @@ const SvStringsDtor& SwStyleNameMapper::GetHTMLChrFmtUINameArray() (RES_POOLCHR_HTML_END - RES_POOLCHR_HTML_BEGIN )) ); } -const SvStringsDtor& SwStyleNameMapper::GetPageDescUINameArray() +const boost::ptr_vector<String>& SwStyleNameMapper::GetPageDescUINameArray() { return pPageDescUINameArray ? *pPageDescUINameArray : *NewUINameArray( pPageDescUINameArray, RC_POOLPAGEDESC_BEGIN, @@ -981,7 +983,7 @@ const SvStringsDtor& SwStyleNameMapper::GetPageDescUINameArray() (RES_POOLPAGE_END - RES_POOLPAGE_BEGIN )) ); } -const SvStringsDtor& SwStyleNameMapper::GetNumRuleUINameArray() +const boost::ptr_vector<String>& SwStyleNameMapper::GetNumRuleUINameArray() { return pNumRuleUINameArray ? *pNumRuleUINameArray : *NewUINameArray( pNumRuleUINameArray, RC_POOLNUMRULE_BEGIN, @@ -989,92 +991,92 @@ const SvStringsDtor& SwStyleNameMapper::GetNumRuleUINameArray() (RES_POOLNUMRULE_END - RES_POOLNUMRULE_BEGIN )) ); } -SvStringsDtor* SwStyleNameMapper::NewProgNameArray( SvStringsDtor*& pProgNameArray, const SwTableEntry *pTable, sal_uInt8 nCount ) +boost::ptr_vector<String>* SwStyleNameMapper::NewProgNameArray( boost::ptr_vector<String>*& pProgNameArray, const SwTableEntry *pTable, sal_uInt8 nCount ) { if( !pProgNameArray ) { - pProgNameArray = new SvStringsDtor( nCount, 1 ); + pProgNameArray = new boost::ptr_vector<String>; + pProgNameArray->reserve(nCount); while (pTable->nLength) { - String* pStr = new String( pTable->pChar, pTable->nLength, RTL_TEXTENCODING_ASCII_US ); - pProgNameArray->Insert( pStr, pProgNameArray->Count() ); + pProgNameArray->push_back(new String( pTable->pChar, pTable->nLength, RTL_TEXTENCODING_ASCII_US )); pTable++; } } return pProgNameArray; } -const SvStringsDtor& SwStyleNameMapper::GetTextProgNameArray() +const boost::ptr_vector<String>& SwStyleNameMapper::GetTextProgNameArray() { return pTextProgNameArray ? *pTextProgNameArray : *NewProgNameArray( pTextProgNameArray, TextProgNameTable, sizeof ( TextProgNameTable ) / sizeof ( SwTableEntry ) ); } -const SvStringsDtor& SwStyleNameMapper::GetListsProgNameArray() +const boost::ptr_vector<String>& SwStyleNameMapper::GetListsProgNameArray() { return pListsProgNameArray ? *pListsProgNameArray : *NewProgNameArray( pListsProgNameArray, ListsProgNameTable, sizeof ( ListsProgNameTable ) / sizeof ( SwTableEntry ) ); } -const SvStringsDtor& SwStyleNameMapper::GetExtraProgNameArray() +const boost::ptr_vector<String>& SwStyleNameMapper::GetExtraProgNameArray() { return pExtraProgNameArray ? *pExtraProgNameArray : *NewProgNameArray( pExtraProgNameArray, ExtraProgNameTable, sizeof ( ExtraProgNameTable ) / sizeof ( SwTableEntry ) ); } -const SvStringsDtor& SwStyleNameMapper::GetRegisterProgNameArray() +const boost::ptr_vector<String>& SwStyleNameMapper::GetRegisterProgNameArray() { return pRegisterProgNameArray ? *pRegisterProgNameArray : *NewProgNameArray( pRegisterProgNameArray, RegisterProgNameTable, sizeof ( RegisterProgNameTable ) / sizeof ( SwTableEntry ) ); } -const SvStringsDtor& SwStyleNameMapper::GetDocProgNameArray() +const boost::ptr_vector<String>& SwStyleNameMapper::GetDocProgNameArray() { return pDocProgNameArray ? *pDocProgNameArray : *NewProgNameArray( pDocProgNameArray, DocProgNameTable, sizeof ( DocProgNameTable ) / sizeof ( SwTableEntry ) ); } -const SvStringsDtor& SwStyleNameMapper::GetHTMLProgNameArray() +const boost::ptr_vector<String>& SwStyleNameMapper::GetHTMLProgNameArray() { return pHTMLProgNameArray ? *pHTMLProgNameArray : *NewProgNameArray( pHTMLProgNameArray, HTMLProgNameTable, sizeof ( HTMLProgNameTable ) / sizeof ( SwTableEntry ) ); } -const SvStringsDtor& SwStyleNameMapper::GetFrmFmtProgNameArray() +const boost::ptr_vector<String>& SwStyleNameMapper::GetFrmFmtProgNameArray() { return pFrmFmtProgNameArray ? *pFrmFmtProgNameArray : *NewProgNameArray( pFrmFmtProgNameArray, FrmFmtProgNameTable, sizeof ( FrmFmtProgNameTable ) / sizeof ( SwTableEntry ) ); } -const SvStringsDtor& SwStyleNameMapper::GetChrFmtProgNameArray() +const boost::ptr_vector<String>& SwStyleNameMapper::GetChrFmtProgNameArray() { return pChrFmtProgNameArray ? *pChrFmtProgNameArray : *NewProgNameArray( pChrFmtProgNameArray, ChrFmtProgNameTable, sizeof ( ChrFmtProgNameTable ) / sizeof ( SwTableEntry ) ); } -const SvStringsDtor& SwStyleNameMapper::GetHTMLChrFmtProgNameArray() +const boost::ptr_vector<String>& SwStyleNameMapper::GetHTMLChrFmtProgNameArray() { return pHTMLChrFmtProgNameArray ? *pHTMLChrFmtProgNameArray : *NewProgNameArray( pHTMLChrFmtProgNameArray, HTMLChrFmtProgNameTable, sizeof ( HTMLChrFmtProgNameTable ) / sizeof ( SwTableEntry ) ); } -const SvStringsDtor& SwStyleNameMapper::GetPageDescProgNameArray() +const boost::ptr_vector<String>& SwStyleNameMapper::GetPageDescProgNameArray() { return pPageDescProgNameArray ? *pPageDescProgNameArray : *NewProgNameArray( pPageDescProgNameArray, PageDescProgNameTable, sizeof ( PageDescProgNameTable ) / sizeof ( SwTableEntry ) ); } -const SvStringsDtor& SwStyleNameMapper::GetNumRuleProgNameArray() +const boost::ptr_vector<String>& SwStyleNameMapper::GetNumRuleProgNameArray() { return pNumRuleProgNameArray ? *pNumRuleProgNameArray : *NewProgNameArray( pNumRuleProgNameArray, NumRuleProgNameTable, @@ -1086,7 +1088,7 @@ const String SwStyleNameMapper::GetSpecialExtraProgName( const String& rExtraUIN { String aRes = rExtraUIName; sal_Bool bChgName = sal_False; - const SvStringsDtor& rExtraArr = GetExtraUINameArray(); + const boost::ptr_vector<String>& rExtraArr(GetExtraUINameArray()); static sal_uInt16 nIds[] = { RES_POOLCOLL_LABEL_DRAWING - RES_POOLCOLL_EXTRA_BEGIN, @@ -1098,14 +1100,14 @@ const String SwStyleNameMapper::GetSpecialExtraProgName( const String& rExtraUIN const sal_uInt16 * pIds; for ( pIds = nIds; *pIds; ++pIds) { - if (aRes == *rExtraArr[ *pIds ]) + if (aRes == rExtraArr[ *pIds ]) { bChgName = sal_True; break; } } if (bChgName) - aRes = *GetExtraProgNameArray()[*pIds]; + aRes = GetExtraProgNameArray()[*pIds]; return aRes; } @@ -1113,7 +1115,7 @@ const String SwStyleNameMapper::GetSpecialExtraUIName( const String& rExtraProgN { String aRes = rExtraProgName; sal_Bool bChgName = sal_False; - const SvStringsDtor& rExtraArr = GetExtraProgNameArray(); + const boost::ptr_vector<String>& rExtraArr(GetExtraProgNameArray()); static sal_uInt16 nIds[] = { RES_POOLCOLL_LABEL_DRAWING - RES_POOLCOLL_EXTRA_BEGIN, @@ -1126,14 +1128,14 @@ const String SwStyleNameMapper::GetSpecialExtraUIName( const String& rExtraProgN for ( pIds = nIds; *pIds; ++pIds) { - if (aRes == *rExtraArr[ *pIds ]) + if (aRes == rExtraArr[ *pIds ]) { bChgName = sal_True; break; } } if (bChgName) - aRes = *GetExtraUINameArray()[*pIds]; + aRes = GetExtraUINameArray()[*pIds]; return aRes; } diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 0b2a6fd1f854..2f88674d8585 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -531,7 +531,7 @@ void SwXFieldMaster::setPropertyValue( const OUString& rPropertyName, sal_Bool bSetValue = sal_True; if( rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_SUB_TYPE))) { - const SvStringsDtor& rExtraArr = SwStyleNameMapper::GetExtraUINameArray(); + const boost::ptr_vector<String>& rExtraArr(SwStyleNameMapper::GetExtraUINameArray()); String sTypeName = pType->GetName(); static sal_uInt16 nIds[] = { @@ -543,7 +543,7 @@ void SwXFieldMaster::setPropertyValue( const OUString& rPropertyName, }; for(const sal_uInt16 * pIds = nIds; *pIds; ++pIds) { - if(sTypeName == *rExtraArr[ *pIds ] ) + if(sTypeName == rExtraArr[ *pIds ] ) { bSetValue = sal_False; break; diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 4903ff8db5bb..5064712280a4 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -389,7 +389,7 @@ sal_Bool SwDocShell::Insert( SfxObjectShell &rSource, const_cast<const SwDoc *>(pDoc)->GetPageDesc(0).GetName() == rOldName ) || ( SFX_STYLE_FAMILY_CHAR == eOldFamily && - rOldName == *SwStyleNameMapper::GetTextUINameArray()[ RES_POOLCOLL_STANDARD - + rOldName == SwStyleNameMapper::GetTextUINameArray()[ RES_POOLCOLL_STANDARD - RES_POOLCOLL_TEXT_BEGIN ] )) return sal_False; @@ -579,7 +579,7 @@ sal_Bool SwDocShell::Remove(sal_uInt16 nIdx1, // see Insert const_cast<const SwDoc *>(pDoc)->GetPageDesc(0).GetName() == aName ) || ( SFX_STYLE_FAMILY_CHAR == eFamily && - aName == *SwStyleNameMapper::GetTextUINameArray()[ RES_POOLCOLL_STANDARD - + aName == SwStyleNameMapper::GetTextUINameArray()[ RES_POOLCOLL_STANDARD - RES_POOLCOLL_TEXT_BEGIN ] )) return sal_False; diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx index b2652d40899f..48dc2c5ab240 100644 --- a/sw/source/ui/app/docst.cxx +++ b/sw/source/ui/app/docst.cxx @@ -143,7 +143,7 @@ void SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh) if(pFmt) aName = pFmt->GetName(); else - aName = *SwStyleNameMapper::GetTextUINameArray()[ + aName = SwStyleNameMapper::GetTextUINameArray()[ RES_POOLCOLL_STANDARD - RES_POOLCOLL_TEXT_BEGIN ]; rSet.Put(SfxTemplateItem(nWhich, aName)); } diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx index 5da6519a6e2b..0cbf32ed6990 100644 --- a/sw/source/ui/app/docstyle.cxx +++ b/sw/source/ui/app/docstyle.cxx @@ -127,7 +127,7 @@ SwCharFmt* lcl_FindCharFmt( SwDoc& rDoc, if( rName.Len() ) { pFmt = rDoc.FindCharFmtByName( rName ); - if( !pFmt && rName == *SwStyleNameMapper::GetTextUINameArray()[ RES_POOLCOLL_STANDARD - + if( !pFmt && rName == SwStyleNameMapper::GetTextUINameArray()[ RES_POOLCOLL_STANDARD - RES_POOLCOLL_TEXT_BEGIN ] ) { // Standard-Character template @@ -1542,7 +1542,7 @@ sal_Bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType ) pFmt = pCharFmt; if( !bCreate && !pFmt ) { - if( aName == *SwStyleNameMapper::GetTextUINameArray()[ RES_POOLCOLL_STANDARD - + if( aName == SwStyleNameMapper::GetTextUINameArray()[ RES_POOLCOLL_STANDARD - RES_POOLCOLL_TEXT_BEGIN ] ) nPoolId = 0; else @@ -2461,7 +2461,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() } aLst.Append( cCHAR, pFmt == rDoc.GetDfltCharFmt() - ? (const String&) *SwStyleNameMapper::GetTextUINameArray()[ RES_POOLCOLL_STANDARD - + ? SwStyleNameMapper::GetTextUINameArray()[ RES_POOLCOLL_STANDARD - RES_POOLCOLL_TEXT_BEGIN ] : pFmt->GetName() ); } @@ -2475,13 +2475,13 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() bIsSearchUsed, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, cCHAR); else { - aLst.Append( cCHAR, *SwStyleNameMapper::GetChrFmtUINameArray()[ + aLst.Append( cCHAR, SwStyleNameMapper::GetChrFmtUINameArray()[ RES_POOLCHR_INET_NORMAL - RES_POOLCHR_BEGIN ] ); - aLst.Append( cCHAR, *SwStyleNameMapper::GetChrFmtUINameArray()[ + aLst.Append( cCHAR, SwStyleNameMapper::GetChrFmtUINameArray()[ RES_POOLCHR_INET_VISIT - RES_POOLCHR_BEGIN ] ); - aLst.Append( cCHAR, *SwStyleNameMapper::GetChrFmtUINameArray()[ + aLst.Append( cCHAR, SwStyleNameMapper::GetChrFmtUINameArray()[ RES_POOLCHR_ENDNOTE - RES_POOLCHR_BEGIN ] ); - aLst.Append( cCHAR, *SwStyleNameMapper::GetChrFmtUINameArray()[ + aLst.Append( cCHAR, SwStyleNameMapper::GetChrFmtUINameArray()[ RES_POOLCHR_FOOTNOTE - RES_POOLCHR_BEGIN ] ); } AppendStyleList(SwStyleNameMapper::GetHTMLChrFmtUINameArray(), @@ -2602,7 +2602,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() { if( !bIsSearchUsed || rDoc.IsPoolTxtCollUsed( RES_POOLCOLL_TEXT )) - aLst.Append( cPARA, *SwStyleNameMapper::GetTextUINameArray()[ + aLst.Append( cPARA, SwStyleNameMapper::GetTextUINameArray()[ RES_POOLCOLL_TEXT - RES_POOLCOLL_TEXT_BEGIN ] ); } if ( bAll || @@ -2782,17 +2782,17 @@ SfxStyleSheetBase* SwStyleSheetIterator::Find( const UniString& rName ) return 0; } -void SwStyleSheetIterator::AppendStyleList(const SvStringsDtor& rList, +void SwStyleSheetIterator::AppendStyleList(const boost::ptr_vector<String>& rList, sal_Bool bTestUsed, sal_uInt16 nSection, char cType ) { if( bTestUsed ) { SwDoc& rDoc = ((SwDocStyleSheetPool*)pBasePool)->GetDoc(); - for ( sal_uInt16 i=0; i < rList.Count(); ++i ) + for ( sal_uInt16 i=0; i < rList.size(); ++i ) { sal_Bool bUsed = sal_False; - sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName(*rList[i], (SwGetPoolIdFromName)nSection); + sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName(rList[i], (SwGetPoolIdFromName)nSection); switch ( nSection ) { case nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL: @@ -2810,12 +2810,12 @@ void SwStyleSheetIterator::AppendStyleList(const SvStringsDtor& rList, OSL_ENSURE( !this, "unknown PoolFmt-Id" ); } if ( bUsed ) - aLst.Append( cType, *rList[i] ); + aLst.Append( cType, rList[i] ); } } else - for ( sal_uInt16 i=0; i < rList.Count(); ++i ) - aLst.Append( cType, *rList[i] ); + for ( sal_uInt16 i=0; i < rList.size(); ++i ) + aLst.Append( cType, rList[i] ); } void SwStyleSheetIterator::Notify( SfxBroadcaster&, const SfxHint& rHint ) diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index 9f5ed0d189c3..ccfd6e94afce 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -285,10 +285,10 @@ sal_Bool SwView::InsertGraphicDlg( SfxRequest& rReq ) // pool formats // - const SvStringsDtor& rFrmPoolArr = SwStyleNameMapper::GetFrmFmtUINameArray(); - for( i = 0; i < rFrmPoolArr.Count(); i++ ) + const boost::ptr_vector<String>& rFrmPoolArr(SwStyleNameMapper::GetFrmFmtUINameArray()); + for( i = 0; i < rFrmPoolArr.size(); ++i ) { - aFormats.push_back(*rFrmPoolArr[i]); + aFormats.push_back(rFrmPoolArr[i]); } std::sort(aFormats.begin(), aFormats.end()); |