diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-22 10:08:07 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-22 10:08:07 +0200 |
commit | 85825e0fd54551735ef05b8484f71974734b9135 (patch) | |
tree | 8bece458e55c1b5eab7559076579bf76cca8df68 /sw/inc/expfld.hxx | |
parent | fc233b52ce2acc1bcd7cecc3d51bcab870c81932 (diff) |
Avoid reserved identifiers
Change-Id: I27ff0f4f0eb395d7e0a60dd604758c220a3134c4
Diffstat (limited to 'sw/inc/expfld.hxx')
-rw-r--r-- | sw/inc/expfld.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index 99c9c6e612a3..8e84d2814fb3 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -32,7 +32,7 @@ struct SwPosition; class SwTextField; class SwDoc; class SwFormatField; -class _SetGetExpFields; +class SetGetExpFields; class SwEditShell; /// Forward declaration: get "BodyTextNode" for exp.fld in Fly's headers/footers/footnotes. @@ -41,32 +41,32 @@ const SwTextNode* GetBodyTextNode( const SwDoc& pDoc, SwPosition& rPos, OUString ReplacePoint(const OUString& sTmpName, bool bWithCommandType = false); -struct _SeqFieldLstElem +struct SeqFieldLstElem { OUString sDlgEntry; sal_uInt16 nSeqNo; - _SeqFieldLstElem( const OUString& rStr, sal_uInt16 nNo ) + SeqFieldLstElem( const OUString& rStr, sal_uInt16 nNo ) : sDlgEntry( rStr ), nSeqNo( nNo ) {} }; class SW_DLLPUBLIC SwSeqFieldList { - std::vector<_SeqFieldLstElem*> maData; + std::vector<SeqFieldLstElem*> maData; public: ~SwSeqFieldList() { - for( std::vector<_SeqFieldLstElem*>::const_iterator it = maData.begin(); it != maData.end(); ++it ) + for( std::vector<SeqFieldLstElem*>::const_iterator it = maData.begin(); it != maData.end(); ++it ) delete *it; } - bool InsertSort(_SeqFieldLstElem* pNew); - bool SeekEntry(const _SeqFieldLstElem& rNew, size_t* pPos) const; + bool InsertSort(SeqFieldLstElem* pNew); + bool SeekEntry(const SeqFieldLstElem& rNew, size_t* pPos) const; size_t Count() { return maData.size(); } - _SeqFieldLstElem* operator[](size_t nIndex) { return maData[nIndex]; } - const _SeqFieldLstElem* operator[](size_t nIndex) const { return maData[nIndex]; } + SeqFieldLstElem* operator[](size_t nIndex) { return maData[nIndex]; } + const SeqFieldLstElem* operator[](size_t nIndex) const { return maData[nIndex]; } void Clear() { maData.clear(); } }; @@ -373,7 +373,7 @@ public: private: SwEditShell* pSh; - _SetGetExpFields* pSrtLst; + SetGetExpFields* pSrtLst; std::set<const SwTextField*> aTmpLst; }; |