diff options
Diffstat (limited to 'sw/source/ui/fmtui/tmpdlg.cxx')
| -rw-r--r-- | sw/source/ui/fmtui/tmpdlg.cxx | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index 015a31fce90e..bacee1ee3a5e 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -109,14 +109,14 @@ extern SW_DLLPUBLIC SwWrtShell* GetActiveWrtShell(); SwTemplateDlg::SwTemplateDlg(Window* pParent, SfxStyleSheetBase& rBase, - USHORT nRegion, - BOOL bColumn, + sal_uInt16 nRegion, + sal_Bool bColumn, SwWrtShell* pActShell, - BOOL bNew ) : + sal_Bool bNew ) : SfxStyleDialog( pParent, SW_RES(DLG_TEMPLATE_BASE + nRegion), rBase, - FALSE, + sal_False, 0 ), nType( nRegion ), pWrtShell(pActShell), @@ -295,7 +295,7 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent, AddTabPage(TP_PAGE_STD, String(SW_RES(STR_PAGE_STD)), pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ), - FALSE, + sal_False, 1 ); // nach der Verwalten-Page if(!pActShell || 0 == ::GetHtmlMode(pWrtShell->GetView().GetDocShell())) { @@ -333,7 +333,7 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent, /* const SfxPoolItem* pItem; if(SFX_ITEM_SET == rBase.GetItemSet().GetItemState( - FN_PARAM_ACT_NUMBER, FALSE, &pItem )) + FN_PARAM_ACT_NUMBER, sal_False, &pItem )) { // pActNum = (ActNumberFormat*)((const SwPtrItem*)pItem)->GetValue(); } @@ -366,10 +366,10 @@ short SwTemplateDlg::Ok() { const SfxPoolItem *pOutItem, *pExItem; if( SFX_ITEM_SET == pExampleSet->GetItemState( - SID_ATTR_NUMBERING_RULE, FALSE, &pExItem ) && + SID_ATTR_NUMBERING_RULE, sal_False, &pExItem ) && ( !GetOutputItemSet() || SFX_ITEM_SET != GetOutputItemSet()->GetItemState( - SID_ATTR_NUMBERING_RULE, FALSE, &pOutItem ) || + SID_ATTR_NUMBERING_RULE, sal_False, &pOutItem ) || *pExItem != *pOutItem )) { if( GetOutputItemSet() ) @@ -401,7 +401,7 @@ const SfxItemSet* SwTemplateDlg::GetRefreshedSet() Beschreibung: --------------------------------------------------------------------*/ -void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) +void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { //Namen der Vorlagen und Metric setzen String sNumCharFmt, sBulletCharFmt; @@ -419,7 +419,7 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) GetDocShell()->GetItem( SID_ATTR_CHAR_FONTLIST ) ) ); aSet.Put (SvxFontListItem( aFontListItem.GetFontList(), SID_ATTR_CHAR_FONTLIST)); - UINT32 nFlags = 0; + sal_uInt32 nFlags = 0; if(rPage.GetItemSet().GetParent() && 0 == (nHtmlMode & HTMLMODE_ON )) nFlags = SVX_RELATIVE_MODE; if( SFX_STYLE_FAMILY_CHAR == nType ) @@ -431,7 +431,7 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) case TP_CHAR_EXT: { - UINT32 nFlags = SVX_ENABLE_FLASH; + sal_uInt32 nFlags = SVX_ENABLE_FLASH; if( SFX_STYLE_FAMILY_CHAR == nType ) nFlags = nFlags|SVX_PREVIEW_CHARACTER; aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlags)); @@ -486,35 +486,35 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) aNames.Insert(new String(pBase->GetName())); pBase = pPool->Next(); } - for(USHORT i = 0; i < aNames.Count(); i++) + for(sal_uInt16 i = 0; i < aNames.Count(); i++) rBox.InsertEntry(*aNames.GetObject(i)); } break; case TP_PARA_ALIGN: { - aSet.Put(SfxBoolItem(SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,TRUE)); + aSet.Put(SfxBoolItem(SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,sal_True)); rPage.PageCreated(aSet); } break; case TP_FRM_STD: - ((SwFrmPage&)rPage).SetNewFrame( TRUE ); - ((SwFrmPage&)rPage).SetFormatUsed( TRUE ); + ((SwFrmPage&)rPage).SetNewFrame( sal_True ); + ((SwFrmPage&)rPage).SetFormatUsed( sal_True ); break; case TP_FRM_ADD: - ((SwFrmAddPage&)rPage).SetFormatUsed(TRUE); - ((SwFrmAddPage&)rPage).SetNewFrame(TRUE); + ((SwFrmAddPage&)rPage).SetFormatUsed(sal_True); + ((SwFrmAddPage&)rPage).SetNewFrame(sal_True); break; case TP_FRM_WRAP: - ((SwWrapTabPage&)rPage).SetFormatUsed( TRUE, FALSE ); + ((SwWrapTabPage&)rPage).SetFormatUsed( sal_True, sal_False ); break; case TP_COLUMN: if( nType == SFX_STYLE_FAMILY_FRAME ) - ((SwColumnPage&)rPage).SetFrmMode(TRUE); - ((SwColumnPage&)rPage).SetFormatUsed( TRUE ); + ((SwColumnPage&)rPage).SetFrmMode(sal_True); + ((SwColumnPage&)rPage).SetFormatUsed( sal_True ); break; case TP_BACKGROUND: @@ -541,7 +541,7 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) List aList; String* pNew = new String; SwStyleNameMapper::FillUIName( RES_POOLCOLL_TEXT, *pNew ); - aList.Insert( pNew, (ULONG)0 ); + aList.Insert( pNew, (sal_uLong)0 ); if( pWrtShell ) { SfxStyleSheetBasePool* pStyleSheetPool = pWrtShell-> @@ -557,7 +557,7 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) } aSet.Put (SfxStringListItem(SID_COLLECT_LIST, &aList)); rPage.PageCreated(aSet); - for( USHORT i = (USHORT)aList.Count(); i; --i ) + for( sal_uInt16 i = (sal_uInt16)aList.Count(); i; --i ) delete (String*)aList.Remove(i); } break; @@ -591,16 +591,16 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) SwDocShell* pDocShell = ::GetActiveWrtShell()->GetView().GetDocShell(); ::FillCharStyleListBox(rCharFmtLB, pDocShell); List aList; - for(USHORT j = 0; j < rCharFmtLB.GetEntryCount(); j++) + for(sal_uInt16 j = 0; j < rCharFmtLB.GetEntryCount(); j++) { aList.Insert( new XubString(rCharFmtLB.GetEntry(j)), LIST_APPEND ); } aSet.Put( SfxStringListItem( SID_CHAR_FMT_LIST_BOX,&aList ) ) ; FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebDocShell, pDocShell)); - aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM, static_cast< USHORT >(eMetric))); + aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM, static_cast< sal_uInt16 >(eMetric))); rPage.PageCreated(aSet); - for( USHORT i = (USHORT)aList.Count(); i; --i ) + for( sal_uInt16 i = (sal_uInt16)aList.Count(); i; --i ) delete (XubString*)aList.Remove(i); aList.Clear(); } @@ -610,7 +610,7 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) SwDocShell* pDocShell = ::GetActiveWrtShell()->GetView().GetDocShell(); FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebDocShell, pDocShell)); - aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM, static_cast< USHORT >(eMetric))); + aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM, static_cast< sal_uInt16 >(eMetric))); rPage.PageCreated(aSet); } break; |