Fix issues cause my my lack of GIT foo

This commit is contained in:
Joseph Powers 2011-01-02 14:37:12 -08:00
parent 82318984b9
commit 9bf72222a6
2 changed files with 5 additions and 4 deletions

View file

@ -112,11 +112,11 @@ SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet)
SfxStyleFamilies aFamilies(SW_RES(DLG_STYLE_DESIGNER)); SfxStyleFamilies aFamilies(SW_RES(DLG_STYLE_DESIGNER));
const SfxStyleFamilyItem* pFamilyItem = 0; 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; break;
} }

View file

@ -254,7 +254,8 @@ public:
void SetWrtShell(SwWrtShell& rSh); void SetWrtShell(SwWrtShell& rSh);
}; };
typedef ::std::vector< Control* > TOXControlList;
DECLARE_LIST( TOXControlList, Control* )
class SwTOXEdit; class SwTOXEdit;
class SwTOXButton; class SwTOXButton;