diff options
Diffstat (limited to 'sw/source/ui/chrdlg/swuiccoll.cxx')
-rw-r--r-- | sw/source/ui/chrdlg/swuiccoll.cxx | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 44006ef5cab4..94a0e7845930 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -59,7 +59,7 @@ #include "swuiccoll.hxx" -static USHORT __FAR_DATA aPageRg[] = { +static sal_uInt16 __FAR_DATA aPageRg[] = { FN_COND_COLL, FN_COND_COLL, 0 }; @@ -94,7 +94,7 @@ SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet) pCmds( SwCondCollItem::GetCmds() ), pFmt(0), - bNewTemplate(FALSE) + bNewTemplate(sal_False) { FreeResource(); SetExchangeSupport(); @@ -118,12 +118,12 @@ SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet) SfxStyleFamilies aFamilies(SW_RES(DLG_STYLE_DESIGNER)); const SfxStyleFamilyItem* pFamilyItem = 0; - USHORT nCount = aFamilies.Count(); - USHORT i; + sal_uInt16 nCount = aFamilies.Count(); + sal_uInt16 i; for( i = 0; i < nCount; ++i) { - if(SFX_STYLE_FAMILY_PARA == (USHORT)(pFamilyItem = aFamilies.GetObject(i))->GetFamily()) + if(SFX_STYLE_FAMILY_PARA == (sal_uInt16)(pFamilyItem = aFamilies.GetObject(i))->GetFamily()) break; } @@ -131,7 +131,7 @@ SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet) for( i = 0; i < rFilterList.Count(); ++i) { aFilterLB.InsertEntry(rFilterList.GetObject(i)->aName); - USHORT* pFilter = new USHORT(rFilterList.GetObject(i)->nFlags); + sal_uInt16* pFilter = new sal_uInt16(rFilterList.GetObject(i)->nFlags); aFilterLB.SetEntryData(i, pFilter); } aFilterLB.SelectEntryPos(1); @@ -147,8 +147,8 @@ Page: Dtor __EXPORT SwCondCollPage::~SwCondCollPage() { - for(USHORT i = 0; i < aFilterLB.GetEntryCount(); ++i) - delete (USHORT*)aFilterLB.GetEntryData(i); + for(sal_uInt16 i = 0; i < aFilterLB.GetEntryCount(); ++i) + delete (sal_uInt16*)aFilterLB.GetEntryData(i); } @@ -176,11 +176,11 @@ Page: FillItemSet-Overload ****************************************************************************/ -BOOL __EXPORT SwCondCollPage::FillItemSet(SfxItemSet &rSet) +sal_Bool __EXPORT SwCondCollPage::FillItemSet(SfxItemSet &rSet) { - BOOL bModified = TRUE; + sal_Bool bModified = sal_True; SwCondCollItem aCondItem; - for(USHORT i = 0; i < aStrArr.Count(); i++) + for(sal_uInt16 i = 0; i < aStrArr.Count(); i++) { String sEntry = aTbLinks.GetEntryText(i, 1); aCondItem.SetStyle( &sEntry, i); @@ -216,7 +216,7 @@ void __EXPORT SwCondCollPage::Reset(const SfxItemSet &/*rSet*/) } aStyleLB.SelectEntryPos(0); - for( USHORT n = 0; n < aStrArr.Count(); n++) + for( sal_uInt16 n = 0; n < aStrArr.Count(); n++) { String aEntry( aStrArr.GetString(n) ); aEntry += '\t'; @@ -242,7 +242,7 @@ void __EXPORT SwCondCollPage::Reset(const SfxItemSet &/*rSet*/) ****************************************************************************/ -USHORT* __EXPORT SwCondCollPage::GetRanges() +sal_uInt16* __EXPORT SwCondCollPage::GetRanges() { return aPageRg; } @@ -255,10 +255,10 @@ USHORT* __EXPORT SwCondCollPage::GetRanges() IMPL_LINK( SwCondCollPage, OnOffHdl, CheckBox*, pBox ) { - const BOOL bEnable = pBox->IsChecked(); + const sal_Bool bEnable = pBox->IsChecked(); aContextFT.Enable( bEnable ); aUsedFT .Enable( bEnable ); - aTbLinks .EnableList( bEnable != FALSE ); + aTbLinks .EnableList( bEnable != sal_False ); aStyleFT .Enable( bEnable ); aStyleLB .Enable( bEnable ); aFilterLB .Enable( bEnable ); @@ -277,7 +277,7 @@ IMPL_LINK( SwCondCollPage, OnOffHdl, CheckBox*, pBox ) IMPL_LINK( SwCondCollPage, AssignRemoveHdl, PushButton*, pBtn) { SvLBoxEntry* pE = aTbLinks.FirstSelected(); - ULONG nPos; + sal_uLong nPos; if( !pE || LISTBOX_ENTRY_NOTFOUND == ( nPos = aTbLinks.GetModel()->GetAbsPos( pE ) ) ) { @@ -285,21 +285,21 @@ IMPL_LINK( SwCondCollPage, AssignRemoveHdl, PushButton*, pBtn) return 0; } - String sSel = aStrArr.GetString( USHORT(nPos) ); + String sSel = aStrArr.GetString( sal_uInt16(nPos) ); sSel += '\t'; - const BOOL bAssEnabled = pBtn != &aRemovePB && aAssignPB.IsEnabled(); + const sal_Bool bAssEnabled = pBtn != &aRemovePB && aAssignPB.IsEnabled(); aAssignPB.Enable( !bAssEnabled ); aRemovePB.Enable( bAssEnabled ); if ( bAssEnabled ) sSel += aStyleLB.GetSelectEntry(); - aTbLinks.SetUpdateMode(FALSE); + aTbLinks.SetUpdateMode(sal_False); aTbLinks.GetModel()->Remove(pE); pE = aTbLinks.InsertEntryToColumn(sSel, nPos); aTbLinks.Select(pE); aTbLinks.MakeVisible(pE); - aTbLinks.SetUpdateMode(TRUE); + aTbLinks.SetUpdateMode(sal_True); return 0; } @@ -313,8 +313,8 @@ IMPL_LINK( SwCondCollPage, SelectHdl, ListBox*, pBox) if(pBox == &aFilterLB) { aStyleLB.Clear(); - USHORT nSearchFlags = pBox->GetSelectEntryPos(); - nSearchFlags = *(USHORT*)aFilterLB.GetEntryData(nSearchFlags); + sal_uInt16 nSearchFlags = pBox->GetSelectEntryPos(); + nSearchFlags = *(sal_uInt16*)aFilterLB.GetEntryData(nSearchFlags); SfxStyleSheetBasePool* pPool = rSh.GetView().GetDocShell()->GetStyleSheetPool(); pPool->SetSearchMask(SFX_STYLE_FAMILY_PARA, nSearchFlags); const SfxStyleSheetBase* pBase = pPool->First(); @@ -350,7 +350,7 @@ IMPL_LINK( SwCondCollPage, SelectHdl, ListBox*, pBox) ****************************************************************************/ -void SwCondCollPage::SetCollection( SwFmt* pFormat, BOOL bNew ) +void SwCondCollPage::SetCollection( SwFmt* pFormat, sal_Bool bNew ) { pFmt = pFormat; bNewTemplate = bNew; |