From 9bf72222a64db43e60eafe2ab97d797595275e10 Mon Sep 17 00:00:00 2001
From: Joseph Powers <jpowers27@cox.net>
Date: Sun, 2 Jan 2011 14:37:12 -0800
Subject: [PATCH] Fix issues cause my my lack of GIT foo

---
 sw/source/ui/chrdlg/swuiccoll.cxx | 6 +++---
 sw/source/ui/inc/swuicnttab.hxx   | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx
index 539169532a6b..56138189ab35 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -112,11 +112,11 @@ SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet)
 
     SfxStyleFamilies aFamilies(SW_RES(DLG_STYLE_DESIGNER));
     const SfxStyleFamilyItem* pFamilyItem = 0;
-    USHORT nCount = aFamilies.Count();
 
-    for(USHORT i = 0; i < nCount; ++i)
+    size_t nCount = aFamilies.size();
+    for( size_t i = 0; i < nCount; ++i )
     {
-        if(SFX_STYLE_FAMILY_PARA == (USHORT)(pFamilyItem = aFamilies.GetObject(i))->GetFamily())
+        if(SFX_STYLE_FAMILY_PARA == (USHORT)(pFamilyItem = aFamilies.at( i ))->GetFamily())
             break;
     }
 
diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx
index a7a931657b6c..13775ef3c735 100644
--- a/sw/source/ui/inc/swuicnttab.hxx
+++ b/sw/source/ui/inc/swuicnttab.hxx
@@ -254,7 +254,8 @@ public:
     void                SetWrtShell(SwWrtShell& rSh);
 };
 
-typedef ::std::vector< Control* > TOXControlList;
+
+DECLARE_LIST( TOXControlList, Control* )
 
 class SwTOXEdit;
 class SwTOXButton;