Kaydet (Commit) 344966c6 authored tarafından Nigel Hawkins's avatar Nigel Hawkins

Remove use of SvLongs in authfld.[ch]xx

üst a19b744f
...@@ -31,9 +31,7 @@ ...@@ -31,9 +31,7 @@
#include "swdllapi.h" #include "swdllapi.h"
#include <fldbas.hxx> #include <fldbas.hxx>
#include <toxe.hxx> #include <toxe.hxx>
#include <vector>
#define _SVSTDARR_LONGS
#include <svl/svstdarr.hxx>
class SwAuthDataArr; class SwAuthDataArr;
...@@ -71,7 +69,7 @@ class SW_DLLPUBLIC SwAuthorityFieldType : public SwFieldType ...@@ -71,7 +69,7 @@ class SW_DLLPUBLIC SwAuthorityFieldType : public SwFieldType
{ {
SwDoc* m_pDoc; SwDoc* m_pDoc;
SwAuthDataArr* m_pDataArr; SwAuthDataArr* m_pDataArr;
SvLongs* m_pSequArr; std::vector<long> m_SequArr;
SortKeyArr* m_pSortKeyArr; SortKeyArr* m_pSortKeyArr;
sal_Unicode m_cPrefix; sal_Unicode m_cPrefix;
sal_Unicode m_cSuffix; sal_Unicode m_cSuffix;
...@@ -101,7 +99,7 @@ public: ...@@ -101,7 +99,7 @@ public:
BOOL AddField(long nHandle); BOOL AddField(long nHandle);
void DelSequenceArray() void DelSequenceArray()
{ {
m_pSequArr->Remove(0, m_pSequArr->Count()); m_SequArr.clear();
} }
const SwAuthEntry* GetEntryByHandle(long nHandle) const; const SwAuthEntry* GetEntryByHandle(long nHandle) const;
......
...@@ -93,7 +93,6 @@ SwAuthorityFieldType::SwAuthorityFieldType(SwDoc* pDoc) ...@@ -93,7 +93,6 @@ SwAuthorityFieldType::SwAuthorityFieldType(SwDoc* pDoc)
: SwFieldType( RES_AUTHORITY ), : SwFieldType( RES_AUTHORITY ),
m_pDoc(pDoc), m_pDoc(pDoc),
m_pDataArr(new SwAuthDataArr ), m_pDataArr(new SwAuthDataArr ),
m_pSequArr(new SvLongs(5, 5)),
m_pSortKeyArr(new SortKeyArr(3, 3)), m_pSortKeyArr(new SortKeyArr(3, 3)),
m_cPrefix('['), m_cPrefix('['),
m_cSuffix(']'), m_cSuffix(']'),
...@@ -106,7 +105,6 @@ SwAuthorityFieldType::SwAuthorityFieldType(SwDoc* pDoc) ...@@ -106,7 +105,6 @@ SwAuthorityFieldType::SwAuthorityFieldType(SwDoc* pDoc)
SwAuthorityFieldType::SwAuthorityFieldType( const SwAuthorityFieldType& rFType) SwAuthorityFieldType::SwAuthorityFieldType( const SwAuthorityFieldType& rFType)
: SwFieldType( RES_AUTHORITY ), : SwFieldType( RES_AUTHORITY ),
m_pDataArr(new SwAuthDataArr ), m_pDataArr(new SwAuthDataArr ),
m_pSequArr(new SvLongs(5, 5)),
m_pSortKeyArr(new SortKeyArr(3, 3)), m_pSortKeyArr(new SortKeyArr(3, 3)),
m_cPrefix(rFType.m_cPrefix), m_cPrefix(rFType.m_cPrefix),
m_cSuffix(rFType.m_cSuffix), m_cSuffix(rFType.m_cSuffix),
...@@ -123,7 +121,7 @@ SwAuthorityFieldType::~SwAuthorityFieldType() ...@@ -123,7 +121,7 @@ SwAuthorityFieldType::~SwAuthorityFieldType()
{ {
m_pSortKeyArr->DeleteAndDestroy(0, m_pSortKeyArr->Count()); m_pSortKeyArr->DeleteAndDestroy(0, m_pSortKeyArr->Count());
delete m_pSortKeyArr; delete m_pSortKeyArr;
delete m_pSequArr; m_SequArr.clear();
delete m_pDataArr; delete m_pDataArr;
} }
...@@ -314,9 +312,9 @@ USHORT SwAuthorityFieldType::GetSequencePos(long nHandle) ...@@ -314,9 +312,9 @@ USHORT SwAuthorityFieldType::GetSequencePos(long nHandle)
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
sal_Bool bCurrentFieldWithoutTextNode = sal_False; sal_Bool bCurrentFieldWithoutTextNode = sal_False;
#endif #endif
if(m_pSequArr->Count() && m_pSequArr->Count() != m_pDataArr->Count()) if(!m_SequArr.empty() && m_SequArr.size() != m_pDataArr->Count())
DelSequenceArray(); DelSequenceArray();
if(!m_pSequArr->Count()) if(m_SequArr.empty())
{ {
SwTOXSortTabBases aSortArr; SwTOXSortTabBases aSortArr;
SwClientIter aIter( *this ); SwClientIter aIter( *this );
...@@ -387,15 +385,15 @@ USHORT SwAuthorityFieldType::GetSequencePos(long nHandle) ...@@ -387,15 +385,15 @@ USHORT SwAuthorityFieldType::GetSequencePos(long nHandle)
const SwTOXSortTabBase& rBase = *aSortArr[i]; const SwTOXSortTabBase& rBase = *aSortArr[i];
SwFmtFld& rFmtFld = ((SwTOXAuthority&)rBase).GetFldFmt(); SwFmtFld& rFmtFld = ((SwTOXAuthority&)rBase).GetFldFmt();
SwAuthorityField* pAFld = (SwAuthorityField*)rFmtFld.GetFld(); SwAuthorityField* pAFld = (SwAuthorityField*)rFmtFld.GetFld();
m_pSequArr->Insert(pAFld->GetHandle(), i); m_SequArr.push_back(pAFld->GetHandle());
} }
aSortArr.DeleteAndDestroy(0, aSortArr.Count()); aSortArr.DeleteAndDestroy(0, aSortArr.Count());
} }
//find nHandle //find nHandle
USHORT nRet = 0; USHORT nRet = 0;
for(USHORT i = 0; i < m_pSequArr->Count(); i++) for(USHORT i = 0; i < m_SequArr.size(); ++i)
{ {
if((*m_pSequArr)[i] == nHandle) if(m_SequArr[i] == nHandle)
{ {
nRet = i + 1; nRet = i + 1;
break; break;
......
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