diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx index b3cb9c93cc07..4ef0c2d1422f 100644 --- a/sw/inc/SwStyleNameMapper.hxx +++ b/sw/inc/SwStyleNameMapper.hxx @@ -16,8 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SWSTYLENAMEMAPPER_HXX -#define _SWSTYLENAMEMAPPER_HXX +#ifndef SWSTYLENAMEMAPPER_HXX +#define SWSTYLENAMEMAPPER_HXX #include #include @@ -27,7 +27,7 @@ #include #include -#include +#include /** This class holds all data about the names of styles used in the user * interface (UI names...these are localised into different languages). @@ -86,7 +86,7 @@ class SwStyleNameMapper protected: // UI Name tables - static boost::ptr_vector *pTextUINameArray, + static ::std::vector *pTextUINameArray, *pListsUINameArray, *pExtraUINameArray, *pRegisterUINameArray, @@ -166,29 +166,29 @@ public: const OUString& rExtraUIName); static const OUString GetSpecialExtraUIName(const OUString& rExtraProgName); - static const boost::ptr_vector& GetTextUINameArray(); - static const boost::ptr_vector& GetListsUINameArray(); - static const boost::ptr_vector& GetExtraUINameArray(); - static const boost::ptr_vector& GetRegisterUINameArray(); - static const boost::ptr_vector& GetDocUINameArray(); - static const boost::ptr_vector& GetHTMLUINameArray(); - static const boost::ptr_vector& GetFrmFmtUINameArray(); - static const boost::ptr_vector& GetChrFmtUINameArray(); - static const boost::ptr_vector& GetHTMLChrFmtUINameArray(); - static const boost::ptr_vector& GetPageDescUINameArray(); - static const boost::ptr_vector& GetNumRuleUINameArray(); + static const ::std::vector& GetTextUINameArray(); + static const ::std::vector& GetListsUINameArray(); + static const ::std::vector& GetExtraUINameArray(); + static const ::std::vector& GetRegisterUINameArray(); + static const ::std::vector& GetDocUINameArray(); + static const ::std::vector& GetHTMLUINameArray(); + static const ::std::vector& GetFrmFmtUINameArray(); + static const ::std::vector& GetChrFmtUINameArray(); + static const ::std::vector& GetHTMLChrFmtUINameArray(); + static const ::std::vector& GetPageDescUINameArray(); + static const ::std::vector& GetNumRuleUINameArray(); - static const boost::ptr_vector& GetTextProgNameArray(); - static const boost::ptr_vector& GetListsProgNameArray(); - static const boost::ptr_vector& GetExtraProgNameArray(); - static const boost::ptr_vector& GetRegisterProgNameArray(); - static const boost::ptr_vector& GetDocProgNameArray(); - static const boost::ptr_vector& GetHTMLProgNameArray(); - static const boost::ptr_vector& GetFrmFmtProgNameArray(); - static const boost::ptr_vector& GetChrFmtProgNameArray(); - static const boost::ptr_vector& GetHTMLChrFmtProgNameArray(); - static const boost::ptr_vector& GetPageDescProgNameArray(); - static const boost::ptr_vector& GetNumRuleProgNameArray(); + static const ::std::vector& GetTextProgNameArray(); + static const ::std::vector& GetListsProgNameArray(); + static const ::std::vector& GetExtraProgNameArray(); + static const ::std::vector& GetRegisterProgNameArray(); + static const ::std::vector& GetDocProgNameArray(); + static const ::std::vector& GetHTMLProgNameArray(); + static const ::std::vector& GetFrmFmtProgNameArray(); + static const ::std::vector& GetChrFmtProgNameArray(); + static const ::std::vector& GetHTMLChrFmtProgNameArray(); + static const ::std::vector& GetPageDescProgNameArray(); + static const ::std::vector& GetNumRuleProgNameArray(); }; #endif // _NAME_MAPPER_HXX diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index da2d0d17cc67..bda6a871b3a7 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -16,15 +16,16 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DOCSTYLE_HXX -#define _DOCSTYLE_HXX +#ifndef SW_DOCSTYLE_HXX +#define SW_DOCSTYLE_HXX #include #include #include #include "swdllapi.h" -#include + +#include class SwDoc; class SwDocStyleSheetPool; @@ -156,7 +157,7 @@ class SwStyleSheetIterator : public SfxStyleSheetIterator, public SfxListener sal_uInt16 nLastPos; sal_Bool bFirstCalled; - void AppendStyleList(const boost::ptr_vector& rLst, + void AppendStyleList(const ::std::vector& rLst, sal_Bool bUsed, sal_Bool bTestHidden, bool bOnlyHidden, diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx index 7c1855ad1948..d8ac49ab1385 100644 --- a/sw/source/core/doc/SwStyleNameMapper.cxx +++ b/sw/source/core/doc/SwStyleNameMapper.cxx @@ -27,7 +27,7 @@ extern ResMgr* pSwResMgr; // Initialise UI names to 0 -boost::ptr_vector *SwStyleNameMapper::pTextUINameArray = 0, +::std::vector *SwStyleNameMapper::pTextUINameArray = 0, *SwStyleNameMapper::pListsUINameArray = 0, *SwStyleNameMapper::pExtraUINameArray = 0, *SwStyleNameMapper::pRegisterUINameArray = 0, @@ -308,28 +308,29 @@ const struct SwTableEntry NumRuleProgNameTable [] = }; #undef ENTRY -static boost::ptr_vector* +static ::std::vector* lcl_NewUINameArray(sal_uInt16 nStt, sal_uInt16 const nEnd) { - boost::ptr_vector *const pNameArray = new boost::ptr_vector; + ::std::vector *const pNameArray = new ::std::vector; pNameArray->reserve(nEnd - nStt); while( nStt < nEnd ) { const ResId rRId( nStt, *pSwResMgr ); - pNameArray->push_back(new OUString(rRId)); + pNameArray->push_back(OUString(rRId)); ++nStt; } return pNameArray; } -static boost::ptr_vector* +static ::std::vector* lcl_NewProgNameArray(const SwTableEntry *pTable, sal_uInt8 const nCount) { - boost::ptr_vector *const pProgNameArray = new boost::ptr_vector; + ::std::vector *const pProgNameArray = new ::std::vector; pProgNameArray->reserve(nCount); while (pTable->nLength) { - pProgNameArray->push_back(new OUString(pTable->pChar, pTable->nLength, RTL_TEXTENCODING_ASCII_US)); + pProgNameArray->push_back(OUString( + pTable->pChar, pTable->nLength, RTL_TEXTENCODING_ASCII_US)); pTable++; } return pProgNameArray; @@ -338,7 +339,7 @@ lcl_NewProgNameArray(const SwTableEntry *pTable, sal_uInt8 const nCount) static OUString lcl_GetSpecialExtraName(const OUString& rExtraName, const bool bIsUIName ) { - const boost::ptr_vector& rExtraArr = bIsUIName + const ::std::vector& rExtraArr = bIsUIName ? SwStyleNameMapper::GetExtraUINameArray() : SwStyleNameMapper::GetExtraProgNameArray(); static const sal_uInt16 nIds[] = @@ -392,7 +393,7 @@ static void lcl_CheckSuffixAndDelete(OUString & rString) const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlags, bool bProgName ) { NameToIdHash *pHash = 0; - const boost::ptr_vector *pStrings; + const ::std::vector *pStrings = 0; switch ( eFlags ) { @@ -732,7 +733,7 @@ const OUString& SwStyleNameMapper::getNameFromId( sal_uInt16 const nId, const OUString& rFillName, bool const bProgName) { sal_uInt16 nStt = 0; - const boost::ptr_vector* pStrArr = 0; + const ::std::vector* pStrArr = 0; switch( (USER_FMT | COLL_GET_RANGE_BITS | POOLGRP_NOCOLLID) & nId ) { @@ -861,7 +862,7 @@ sal_uInt16 SwStyleNameMapper::GetPoolIdFromProgName( return aIter != rHashMap.end() ? (*aIter).second : USHRT_MAX; } -const boost::ptr_vector& SwStyleNameMapper::GetTextUINameArray() +const ::std::vector& SwStyleNameMapper::GetTextUINameArray() { if (!pTextUINameArray) pTextUINameArray = lcl_NewUINameArray( RC_POOLCOLL_TEXT_BEGIN, @@ -869,7 +870,7 @@ const boost::ptr_vector& SwStyleNameMapper::GetTextUINameArray() return *pTextUINameArray; } -const boost::ptr_vector& SwStyleNameMapper::GetListsUINameArray() +const ::std::vector& SwStyleNameMapper::GetListsUINameArray() { if (!pListsUINameArray) pListsUINameArray = lcl_NewUINameArray( RC_POOLCOLL_LISTS_BEGIN, @@ -877,7 +878,7 @@ const boost::ptr_vector& SwStyleNameMapper::GetListsUINameArray() return *pListsUINameArray; } -const boost::ptr_vector& SwStyleNameMapper::GetExtraUINameArray() +const ::std::vector& SwStyleNameMapper::GetExtraUINameArray() { if (!pExtraUINameArray) pExtraUINameArray = lcl_NewUINameArray( RC_POOLCOLL_EXTRA_BEGIN, @@ -885,7 +886,7 @@ const boost::ptr_vector& SwStyleNameMapper::GetExtraUINameArray() return *pExtraUINameArray; } -const boost::ptr_vector& SwStyleNameMapper::GetRegisterUINameArray() +const ::std::vector& SwStyleNameMapper::GetRegisterUINameArray() { if (!pRegisterUINameArray) pRegisterUINameArray = lcl_NewUINameArray( RC_POOLCOLL_REGISTER_BEGIN, @@ -893,7 +894,7 @@ const boost::ptr_vector& SwStyleNameMapper::GetRegisterUINameArray() return *pRegisterUINameArray; } -const boost::ptr_vector& SwStyleNameMapper::GetDocUINameArray() +const ::std::vector& SwStyleNameMapper::GetDocUINameArray() { if (!pDocUINameArray) pDocUINameArray = lcl_NewUINameArray( RC_POOLCOLL_DOC_BEGIN, @@ -901,7 +902,7 @@ const boost::ptr_vector& SwStyleNameMapper::GetDocUINameArray() return *pDocUINameArray; } -const boost::ptr_vector& SwStyleNameMapper::GetHTMLUINameArray() +const ::std::vector& SwStyleNameMapper::GetHTMLUINameArray() { if (!pHTMLUINameArray) pHTMLUINameArray = lcl_NewUINameArray( RC_POOLCOLL_HTML_BEGIN, @@ -909,7 +910,7 @@ const boost::ptr_vector& SwStyleNameMapper::GetHTMLUINameArray() return *pHTMLUINameArray; } -const boost::ptr_vector& SwStyleNameMapper::GetFrmFmtUINameArray() +const ::std::vector& SwStyleNameMapper::GetFrmFmtUINameArray() { if (!pFrmFmtUINameArray) pFrmFmtUINameArray = lcl_NewUINameArray( RC_POOLFRMFMT_BEGIN, @@ -917,7 +918,7 @@ const boost::ptr_vector& SwStyleNameMapper::GetFrmFmtUINameArray() return *pFrmFmtUINameArray; } -const boost::ptr_vector& SwStyleNameMapper::GetChrFmtUINameArray() +const ::std::vector& SwStyleNameMapper::GetChrFmtUINameArray() { if (!pChrFmtUINameArray) pChrFmtUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_BEGIN, @@ -925,7 +926,7 @@ const boost::ptr_vector& SwStyleNameMapper::GetChrFmtUINameArray() return *pChrFmtUINameArray; } -const boost::ptr_vector& SwStyleNameMapper::GetHTMLChrFmtUINameArray() +const ::std::vector& SwStyleNameMapper::GetHTMLChrFmtUINameArray() { if (!pHTMLChrFmtUINameArray) pHTMLChrFmtUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_HTML_BEGIN, @@ -933,7 +934,7 @@ const boost::ptr_vector& SwStyleNameMapper::GetHTMLChrFmtUINameArray() return *pHTMLChrFmtUINameArray; } -const boost::ptr_vector& SwStyleNameMapper::GetPageDescUINameArray() +const ::std::vector& SwStyleNameMapper::GetPageDescUINameArray() { if (!pPageDescUINameArray) pPageDescUINameArray = lcl_NewUINameArray( RC_POOLPAGEDESC_BEGIN, @@ -941,7 +942,7 @@ const boost::ptr_vector& SwStyleNameMapper::GetPageDescUINameArray() return *pPageDescUINameArray; } -const boost::ptr_vector& SwStyleNameMapper::GetNumRuleUINameArray() +const ::std::vector& SwStyleNameMapper::GetNumRuleUINameArray() { if (!pNumRuleUINameArray) pNumRuleUINameArray = lcl_NewUINameArray( RC_POOLNUMRULE_BEGIN, @@ -949,7 +950,7 @@ const boost::ptr_vector& SwStyleNameMapper::GetNumRuleUINameArray() return *pNumRuleUINameArray; } -const boost::ptr_vector& SwStyleNameMapper::GetTextProgNameArray() +const ::std::vector& SwStyleNameMapper::GetTextProgNameArray() { if (!pTextProgNameArray) pTextProgNameArray = lcl_NewProgNameArray(TextProgNameTable, @@ -957,7 +958,7 @@ const boost::ptr_vector& SwStyleNameMapper::GetTextProgNameArray() return *pTextProgNameArray; } -const boost::ptr_vector& SwStyleNameMapper::GetListsProgNameArray() +const ::std::vector& SwStyleNameMapper::GetListsProgNameArray() { if (!pListsProgNameArray) pListsProgNameArray = lcl_NewProgNameArray( ListsProgNameTable, @@ -965,7 +966,7 @@ const boost::ptr_vector& SwStyleNameMapper::GetListsProgNameArray() return *pListsProgNameArray; } -const boost::ptr_vector& SwStyleNameMapper::GetExtraProgNameArray() +const ::std::vector& SwStyleNameMapper::GetExtraProgNameArray() { if (!pExtraProgNameArray) pExtraProgNameArray = lcl_NewProgNameArray( ExtraProgNameTable, @@ -973,7 +974,7 @@ const boost::ptr_vector& SwStyleNameMapper::GetExtraProgNameArray() return *pExtraProgNameArray; } -const boost::ptr_vector& SwStyleNameMapper::GetRegisterProgNameArray() +const ::std::vector& SwStyleNameMapper::GetRegisterProgNameArray() { if (!pRegisterProgNameArray) pRegisterProgNameArray = lcl_NewProgNameArray( RegisterProgNameTable, @@ -981,7 +982,7 @@ const boost::ptr_vector& SwStyleNameMapper::GetRegisterProgNameArray() return *pRegisterProgNameArray; } -const boost::ptr_vector& SwStyleNameMapper::GetDocProgNameArray() +const ::std::vector& SwStyleNameMapper::GetDocProgNameArray() { if (!pDocProgNameArray) pDocProgNameArray = lcl_NewProgNameArray( DocProgNameTable, @@ -989,7 +990,7 @@ const boost::ptr_vector& SwStyleNameMapper::GetDocProgNameArray() return *pDocProgNameArray; } -const boost::ptr_vector& SwStyleNameMapper::GetHTMLProgNameArray() +const ::std::vector& SwStyleNameMapper::GetHTMLProgNameArray() { if (!pHTMLProgNameArray) pHTMLProgNameArray = lcl_NewProgNameArray( HTMLProgNameTable, @@ -997,7 +998,7 @@ const boost::ptr_vector& SwStyleNameMapper::GetHTMLProgNameArray() return *pHTMLProgNameArray; } -const boost::ptr_vector& SwStyleNameMapper::GetFrmFmtProgNameArray() +const ::std::vector& SwStyleNameMapper::GetFrmFmtProgNameArray() { if (!pFrmFmtProgNameArray) pFrmFmtProgNameArray = lcl_NewProgNameArray( FrmFmtProgNameTable, @@ -1005,7 +1006,7 @@ const boost::ptr_vector& SwStyleNameMapper::GetFrmFmtProgNameArray() return *pFrmFmtProgNameArray; } -const boost::ptr_vector& SwStyleNameMapper::GetChrFmtProgNameArray() +const ::std::vector& SwStyleNameMapper::GetChrFmtProgNameArray() { if (!pChrFmtProgNameArray) pChrFmtProgNameArray = lcl_NewProgNameArray( ChrFmtProgNameTable, @@ -1013,7 +1014,7 @@ const boost::ptr_vector& SwStyleNameMapper::GetChrFmtProgNameArray() return *pChrFmtProgNameArray; } -const boost::ptr_vector& SwStyleNameMapper::GetHTMLChrFmtProgNameArray() +const ::std::vector& SwStyleNameMapper::GetHTMLChrFmtProgNameArray() { if (!pHTMLChrFmtProgNameArray) pHTMLChrFmtProgNameArray = lcl_NewProgNameArray( HTMLChrFmtProgNameTable, @@ -1021,7 +1022,7 @@ const boost::ptr_vector& SwStyleNameMapper::GetHTMLChrFmtProgNameArray return *pHTMLChrFmtProgNameArray; } -const boost::ptr_vector& SwStyleNameMapper::GetPageDescProgNameArray() +const ::std::vector& SwStyleNameMapper::GetPageDescProgNameArray() { if (!pPageDescProgNameArray) pPageDescProgNameArray = lcl_NewProgNameArray( PageDescProgNameTable, @@ -1029,7 +1030,7 @@ const boost::ptr_vector& SwStyleNameMapper::GetPageDescProgNameArray() return *pPageDescProgNameArray; } -const boost::ptr_vector& SwStyleNameMapper::GetNumRuleProgNameArray() +const ::std::vector& SwStyleNameMapper::GetNumRuleProgNameArray() { if (!pNumRuleProgNameArray) pNumRuleProgNameArray = lcl_NewProgNameArray( NumRuleProgNameTable, diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 44d99c72d2d2..6ef78727d29e 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -565,7 +565,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, bool bSetValue = true; if( rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_SUB_TYPE))) { - const boost::ptr_vector& rExtraArr( + const ::std::vector& rExtraArr( SwStyleNameMapper::GetExtraUINameArray()); OUString sTypeName = pType->GetName(); static sal_uInt16 nIds[] = diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx index 7d3b56fc7d99..4ee1310404af 100644 --- a/sw/source/ui/app/docstyle.cxx +++ b/sw/source/ui/app/docstyle.cxx @@ -2810,7 +2810,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::Find(const OUString& rName) return 0; } -void SwStyleSheetIterator::AppendStyleList(const boost::ptr_vector& rList, +void SwStyleSheetIterator::AppendStyleList(const ::std::vector& rList, sal_Bool bTestUsed, sal_Bool bTestHidden, bool bOnlyHidden, sal_uInt16 nSection, char cType ) { diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index 7f438b8760d2..c68f6163b4b9 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -297,7 +297,7 @@ sal_Bool SwView::InsertGraphicDlg( SfxRequest& rReq ) // pool formats // - const boost::ptr_vector& rFrmPoolArr( + const ::std::vector& rFrmPoolArr( SwStyleNameMapper::GetFrmFmtUINameArray()); for( i = 0; i < rFrmPoolArr.size(); ++i ) {