diff options
author | Joseph Powers <jpowers27@cox.net> | 2010-12-26 16:44:17 -0800 |
---|---|---|
committer | Joseph Powers <jpowers27@cox.net> | 2010-12-26 16:44:17 -0800 |
commit | 35b81d6e106c94cb504fdf739263eb7af6f5fdfb (patch) | |
tree | 5c25d23375052faadba0c3115a7a5d9a2f62d2fe /xmloff/source | |
parent | 0e1f0b606695f48542f50ddf2d5f66e39e7988bd (diff) |
Remove DECLARE_LIST(ImpXMLAutoLayoutInfoList, ImpXMLAutoLayoutInfo*)
Diffstat (limited to 'xmloff/source')
-rw-r--r-- | xmloff/source/draw/sdxmlexp.cxx | 25 | ||||
-rw-r--r-- | xmloff/source/draw/sdxmlexp_impl.hxx | 3 |
2 files changed, 14 insertions, 14 deletions
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index aa7b9b952668..0ece929dc149 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -403,8 +403,6 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI maPresRect.SetSize(aLayoutSize); } -DECLARE_LIST(ImpXMLAutoLayoutInfoList, ImpXMLAutoLayoutInfo*) - ////////////////////////////////////////////////////////////////////////////// // #110680# @@ -420,7 +418,7 @@ SdXMLExport::SdXMLExport( mpPageMasterUsageList(new ImpXMLEXPPageMasterList()), mpNotesPageMasterUsageList(new ImpXMLEXPPageMasterList()), mpHandoutPageMaster(NULL), - mpAutoLayoutInfoList(new ImpXMLAutoLayoutInfoList(1, 4, 4)), + mpAutoLayoutInfoList(new ImpXMLAutoLayoutInfoList()), mpSdPropHdlFactory(0L), mpPropertySetMapper(0L), mpPresPagePropsMapper(0L), @@ -739,8 +737,9 @@ SdXMLExport::~SdXMLExport() // clear auto-layout infos if(mpAutoLayoutInfoList) { - while(mpAutoLayoutInfoList->Count()) - delete mpAutoLayoutInfoList->Remove(mpAutoLayoutInfoList->Count() - 1L); + for ( size_t i = 0, n = mpAutoLayoutInfoList->size(); i < n; ++i ) + delete mpAutoLayoutInfoList->at( i ); + mpAutoLayoutInfoList->clear(); delete mpAutoLayoutInfoList; mpAutoLayoutInfoList = 0L; } @@ -878,21 +877,21 @@ BOOL SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, OUStr ImpXMLAutoLayoutInfo* pNew = new ImpXMLAutoLayoutInfo(nType, pInfo); BOOL bDidExist(FALSE); - for(sal_uInt32 nCnt = 0L; !bDidExist && nCnt < mpAutoLayoutInfoList->Count(); nCnt++) + for( size_t nCnt = 0; !bDidExist && nCnt < mpAutoLayoutInfoList->size(); nCnt++) { - if(*mpAutoLayoutInfoList->GetObject(nCnt) == *pNew) + if( *mpAutoLayoutInfoList->at( nCnt ) == *pNew) { delete pNew; - pNew = mpAutoLayoutInfoList->GetObject(nCnt); + pNew = mpAutoLayoutInfoList->at( nCnt ); bDidExist = TRUE; } } if(!bDidExist) { - mpAutoLayoutInfoList->Insert(pNew, LIST_APPEND); + mpAutoLayoutInfoList->push_back( pNew ); OUString sNewName = OUString(RTL_CONSTASCII_USTRINGPARAM("AL")); - sNewName += OUString::valueOf(sal_Int32(mpAutoLayoutInfoList->Count() - 1)); + sNewName += OUString::valueOf(sal_Int32( mpAutoLayoutInfoList->size() - 1 )); sNewName += OUString(RTL_CONSTASCII_USTRINGPARAM("T")); sNewName += OUString::valueOf(sal_Int32(nType)); pNew->SetLayoutName(sNewName); @@ -911,11 +910,11 @@ BOOL SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, OUStr void SdXMLExport::ImpWriteAutoLayoutInfos() { - if(mpAutoLayoutInfoList->Count()) + if( !mpAutoLayoutInfoList->empty() ) { - for(sal_uInt32 nCnt = 0L; nCnt < mpAutoLayoutInfoList->Count(); nCnt++) + for(size_t nCnt = 0; nCnt < mpAutoLayoutInfoList->size(); nCnt++) { - ImpXMLAutoLayoutInfo* pInfo = mpAutoLayoutInfoList->GetObject(nCnt); + ImpXMLAutoLayoutInfo* pInfo = mpAutoLayoutInfoList->at( nCnt ); if(pInfo) { // prepare presentation-page layout attributes, style-name diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx index cfca17884b79..ef8dd0319eb1 100644 --- a/xmloff/source/draw/sdxmlexp_impl.hxx +++ b/xmloff/source/draw/sdxmlexp_impl.hxx @@ -52,7 +52,7 @@ class Rectangle; class ImpPresPageDrawStylePropMapper; class ImpXMLEXPPageMasterInfo; class ImpXMLDrawPageInfoList; -class ImpXMLAutoLayoutInfoList; +class ImpXMLAutoLayoutInfo; class SvXMLAutoStylePoolP; class XMLSdPropHdlFactory; class ImpXMLShapeStyleInfo; @@ -60,6 +60,7 @@ class XMLShapeExportPropertyMapper; class XMLPageExportPropertyMapper; typedef ::std::vector< ImpXMLEXPPageMasterInfo* > ImpXMLEXPPageMasterList; +typedef ::std::vector< ImpXMLAutoLayoutInfo* > ImpXMLAutoLayoutInfoList; ////////////////////////////////////////////////////////////////////////////// |