summaryrefslogtreecommitdiff
path: root/sw/source/uibase
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/uibase')
-rw-r--r--sw/source/uibase/dochdl/gloshdl.cxx3
-rw-r--r--sw/source/uibase/inc/gloslst.hxx4
-rw-r--r--sw/source/uibase/inc/redlndlg.hxx7
-rw-r--r--sw/source/uibase/inc/uinums.hxx4
-rw-r--r--sw/source/uibase/misc/redlndlg.cxx2
5 files changed, 6 insertions, 14 deletions
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx
index a370117a9c18..9f44305e1175 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -70,7 +70,6 @@ struct TextBlockInfo_Impl
OUString sLongName;
OUString sGroupName;
};
-typedef boost::ptr_vector<TextBlockInfo_Impl> TextBlockInfoArr;
// Dialog for edit templates
void SwGlossaryHdl::GlossaryDlg()
@@ -393,7 +392,7 @@ bool SwGlossaryHdl::Expand( const OUString& rShortName,
SwGlossaries *pGlossaries,
SwTextBlocks *pGlossary )
{
- TextBlockInfoArr aFoundArr;
+ boost::ptr_vector<TextBlockInfo_Impl> aFoundArr;
OUString aShortName( rShortName );
bool bCancel = false;
// search for text block
diff --git a/sw/source/uibase/inc/gloslst.hxx b/sw/source/uibase/inc/gloslst.hxx
index 729b917f4c70..c5ae2bff1c08 100644
--- a/sw/source/uibase/inc/gloslst.hxx
+++ b/sw/source/uibase/inc/gloslst.hxx
@@ -43,11 +43,9 @@ struct AutoTextGroup
}
};
-typedef std::vector<AutoTextGroup*> AutoTextGroups;
-
class SwGlossaryList : public AutoTimer
{
- AutoTextGroups aGroupArr;
+ std::vector<AutoTextGroup*> aGroupArr;
OUString sPath;
bool bFilled;
diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx
index 40c33d07dad9..a4d8581b68bb 100644
--- a/sw/source/uibase/inc/redlndlg.hxx
+++ b/sw/source/uibase/inc/redlndlg.hxx
@@ -55,18 +55,15 @@ struct SwRedlineDataParent
{ return (pData && pData->GetSeqNo() < rObj.pData->GetSeqNo()); }
};
-typedef boost::ptr_vector<SwRedlineDataParent> SwRedlineDataParentArr;
-
class SwRedlineDataParentSortArr : public o3tl::sorted_vector<SwRedlineDataParent*, o3tl::less_ptr_to<SwRedlineDataParent> > {};
typedef boost::ptr_vector<SwRedlineDataChild> SwRedlineDataChildArr;
-typedef std::vector<SvTreeListEntry*> SvLBoxEntryArr;
-
class SW_DLLPUBLIC SwRedlineAcceptDlg
{
VclPtr<vcl::Window> pParentDlg;
- SwRedlineDataParentArr aRedlineParents;
+ boost::ptr_vector<SwRedlineDataParent>
+ aRedlineParents;
SwRedlineDataChildArr aRedlineChildren;
SwRedlineDataParentSortArr aUsedSeqNo;
VclPtr<SvxAcceptChgCtr> aTabPagesCTRL;
diff --git a/sw/source/uibase/inc/uinums.hxx b/sw/source/uibase/inc/uinums.hxx
index 65823dd0231e..b6205c0dcbbd 100644
--- a/sw/source/uibase/inc/uinums.hxx
+++ b/sw/source/uibase/inc/uinums.hxx
@@ -31,8 +31,6 @@ namespace sw { class StoredChapterNumberingRules; }
#define MAX_NUM_RULES 9
-typedef boost::ptr_vector<SfxPoolItem> _SwNumFormatsAttrs;
-
class SW_DLLPUBLIC SwNumRulesWithName
{
OUString maName;
@@ -44,7 +42,7 @@ class SW_DLLPUBLIC SwNumRulesWithName
SwNumFormat aFormat;
OUString sCharFormatName;
sal_uInt16 nCharPoolId;
- _SwNumFormatsAttrs aItems;
+ boost::ptr_vector<SfxPoolItem> aItems;
_SwNumFormatGlobal& operator=( const _SwNumFormatGlobal& ) SAL_DELETED_FUNCTION;
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index dd2f23f46ae3..8c17d0b0c186 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -647,7 +647,7 @@ void SwRedlineAcceptDlg::RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd)
SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr();
sal_uInt16 nCount = pSh->GetRedlineCount();
- SvLBoxEntryArr aLBoxArr;
+ std::vector<SvTreeListEntry*> aLBoxArr;
// because of Bug of TLB that ALWAYS calls the SelectHandler at Remove:
pTable->SetSelectHdl(aOldSelectHdl);