[Libreoffice-commits] .: sw/source

[Joseph Powers]

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

New commits:
commit 73673812f3b950bb9e83173c08362fd817cbc515
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Sun Jan 2 14:37:12 2011 -0800

    Fix issues cause my my lack of GIT foo

diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx
index afe55ab..8112b6f 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 6b9baba..040f26b 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;