diff options
Diffstat (limited to 'sw/source/ui/chrdlg/chardlg.cxx')
-rw-r--r-- | sw/source/ui/chrdlg/chardlg.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 38b1ba906fdd..61ca1e90a750 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -99,7 +99,7 @@ using namespace ::sfx2; SwCharDlg::SwCharDlg(Window* pParent, SwView& rVw, const SfxItemSet& rCoreSet, - const String* pStr, BOOL bIsDrwTxtDlg) : + const String* pStr, sal_Bool bIsDrwTxtDlg) : SfxTabDialog(pParent, SW_RES(DLG_CHAR), &rCoreSet, pStr != 0), rView(rVw), bIsDrwTxtMode(bIsDrwTxtDlg) @@ -150,7 +150,7 @@ SwCharDlg::~SwCharDlg() -void SwCharDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) +void SwCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); switch( nId ) @@ -211,18 +211,18 @@ SwCharURLPage::SwCharURLPage( Window* pParent, aNotVisitedFT( this, SW_RES(FT_NOT_VISITED)), aNotVisitedLB( this, SW_RES(LB_NOT_VISITED)), pINetItem(0), - bModified(FALSE) + bModified(sal_False) { FreeResource(); const SfxPoolItem* pItem; SfxObjectShell* pShell; - if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_HTML_MODE, FALSE, &pItem) || + if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_HTML_MODE, sal_False, &pItem) || ( 0 != ( pShell = SfxObjectShell::Current()) && 0 != (pItem = pShell->GetItem(SID_HTML_MODE)))) { - USHORT nHtmlMode = ((const SfxUInt16Item*)pItem)->GetValue(); + sal_uInt16 nHtmlMode = ((const SfxUInt16Item*)pItem)->GetValue(); if(HTMLMODE_ON & nHtmlMode) { aStyleFL.Hide(); @@ -243,10 +243,10 @@ SwCharURLPage::SwCharURLPage( Window* pParent, TargetList* pList = new TargetList; const SfxFrame& rFrame = pView->GetViewFrame()->GetTopFrame(); rFrame.GetTargetList(*pList); - USHORT nCount = (USHORT)pList->Count(); + sal_uInt16 nCount = (sal_uInt16)pList->Count(); if( nCount ) { - USHORT i; + sal_uInt16 i; for ( i = 0; i < nCount; i++ ) { @@ -278,7 +278,7 @@ SwCharURLPage::~SwCharURLPage() void SwCharURLPage::Reset(const SfxItemSet& rSet) { const SfxPoolItem* pItem; - if(SFX_ITEM_SET == rSet.GetItemState(RES_TXTATR_INETFMT, FALSE, &pItem)) + if(SFX_ITEM_SET == rSet.GetItemState(RES_TXTATR_INETFMT, sal_False, &pItem)) { const SwFmtINetFmt* pINetFmt = (const SwFmtINetFmt*)pItem; aURLED.SetText( INetURLObject::decode( pINetFmt->GetValue(), @@ -305,11 +305,11 @@ void SwCharURLPage::Reset(const SfxItemSet& rSet) if( pINetFmt->GetMacroTbl() ) pINetItem->SetMacroTable( *pINetFmt->GetMacroTbl() ); } - if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_SELECTION, FALSE, &pItem)) + if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_SELECTION, sal_False, &pItem)) { aTextED.SetText(((const SfxStringItem*)pItem)->GetValue()); - aTextFT.Enable( FALSE ); - aTextED.Enable( FALSE ); + aTextFT.Enable( sal_False ); + aTextED.Enable( sal_False ); } } @@ -317,7 +317,7 @@ void SwCharURLPage::Reset(const SfxItemSet& rSet) --------------------------------------------------*/ -BOOL SwCharURLPage::FillItemSet(SfxItemSet& rSet) +sal_Bool SwCharURLPage::FillItemSet(SfxItemSet& rSet) { ::rtl::OUString sURL = aURLED.GetText(); if(sURL.getLength()) @@ -338,7 +338,7 @@ BOOL SwCharURLPage::FillItemSet(SfxItemSet& rSet) //zuerst die gueltigen Einstellungen setzen String sEntry = aVisitedLB.GetSelectEntry(); - USHORT nId = SwStyleNameMapper::GetPoolIdFromUIName( sEntry, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT); + sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName( sEntry, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT); aINetFmt.SetVisitedFmtId(nId); aINetFmt.SetVisitedFmt(nId == RES_POOLCHR_INET_VISIT ? aEmptyStr : sEntry); @@ -351,14 +351,14 @@ BOOL SwCharURLPage::FillItemSet(SfxItemSet& rSet) aINetFmt.SetMacroTbl( &pINetItem->GetMacroTable() ); if(aVisitedLB.GetSavedValue() != aVisitedLB.GetSelectEntryPos()) - bModified = TRUE; + bModified = sal_True; if(aNotVisitedLB.GetSavedValue() != aNotVisitedLB.GetSelectEntryPos()) - bModified = TRUE; + bModified = sal_True; if(aTextED.IsModified()) { - bModified = TRUE; + bModified = sal_True; rSet.Put(SfxStringItem(FN_PARAM_SELECTION, aTextED.GetText())); } if(bModified) |