Skip to content

C
core
Kaydet (Commit) 5fca48a9 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Michael Stahl
Dosyalara gözat
Seçenekler

Convert SV_DECL_PTRARR(SwDependentFields) to std::vector

üst 1eca4ec2
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 8 deletions
sw/source/core/unocore/unofield.cxx
Dosyayı görüntüle @ 5fca48a9
...@@ -729,9 +729,7 @@ SwFieldType* SwXFieldMaster::GetFldType(sal_Bool bDontCreate) const ...@@ -729,9 +729,7 @@ SwFieldType* SwXFieldMaster::GetFldType(sal_Bool bDontCreate) const
return (SwFieldType*)GetRegisteredIn(); return (SwFieldType*)GetRegisteredIn();
} }
typedef SwFmtFld* SwFmtFldPtr; typedef std::vector<SwFmtFld*> SwDependentFields;
SV_DECL_PTRARR(SwDependentFields, SwFmtFldPtr, 5)
SV_IMPL_PTRARR(SwDependentFields, SwFmtFldPtr)
uno::Any SwXFieldMaster::getPropertyValue(const OUString& rPropertyName) uno::Any SwXFieldMaster::getPropertyValue(const OUString& rPropertyName)
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
...@@ -757,19 +755,19 @@ uno::Any SwXFieldMaster::getPropertyValue(const OUString& rPropertyName) ...@@ -757,19 +755,19 @@ uno::Any SwXFieldMaster::getPropertyValue(const OUString& rPropertyName)
//fill all text fields into a sequence //fill all text fields into a sequence
SwDependentFields aFldArr; SwDependentFields aFldArr;
SwIterator<SwFmtFld,SwFieldType> aIter( *pType ); SwIterator<SwFmtFld,SwFieldType> aIter( *pType );
SwFmtFldPtr pFld = aIter.First(); SwFmtFld* pFld = aIter.First();
while(pFld) while(pFld)
{ {
if(pFld->IsFldInDoc()) if(pFld->IsFldInDoc())
aFldArr.Insert(pFld, aFldArr.Count()); aFldArr.push_back(pFld);
pFld = aIter.Next(); pFld = aIter.Next();
} }
uno::Sequence<uno::Reference <text::XDependentTextField> > aRetSeq(aFldArr.Count()); uno::Sequence<uno::Reference <text::XDependentTextField> > aRetSeq(aFldArr.size());
uno::Reference<text::XDependentTextField>* pRetSeq = aRetSeq.getArray(); uno::Reference<text::XDependentTextField>* pRetSeq = aRetSeq.getArray();
for(sal_uInt16 i = 0; i < aFldArr.Count(); i++) for(sal_uInt16 i = 0; i < aFldArr.size(); i++)
{ {
pFld = aFldArr.GetObject(i); pFld = aFldArr[i];
SwXTextField * pInsert = SwXTextField::CreateSwXTextField(*GetDoc(), *pFld); SwXTextField * pInsert = SwXTextField::CreateSwXTextField(*GetDoc(), *pFld);
pRetSeq[i] = uno::Reference<text::XDependentTextField>(pInsert); pRetSeq[i] = uno::Reference<text::XDependentTextField>(pInsert);
......
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