summaryrefslogtreecommitdiff
path: root/cui/source/tabpages/tphatch.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source/tabpages/tphatch.cxx')
-rw-r--r--cui/source/tabpages/tphatch.cxx58
1 files changed, 29 insertions, 29 deletions
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 04c7dc89d..55f1fe3e5 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -170,12 +170,12 @@ void SvxHatchTabPage::Construct()
void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet )
{
- USHORT nPos;
- USHORT nCount;
+ sal_uInt16 nPos;
+ sal_uInt16 nCount;
if( *pDlgType == 0 ) // Flaechen-Dialog
{
- *pbAreaTP = FALSE;
+ *pbAreaTP = sal_False;
if( pColorTab )
{
@@ -291,12 +291,12 @@ long SvxHatchTabPage::CheckChanges_Impl()
case RET_CANCEL:
// return( -1L ); <-- wuerde die Seite nicht verlassen
break;
- // return( TRUE ); // Abbruch
+ // return( sal_True ); // Abbruch
}
delete aMessDlg; //add by CHINA001
}
- USHORT nPos = aLbHatchings.GetSelectEntryPos();
+ sal_uInt16 nPos = aLbHatchings.GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
*pPos = nPos;
return 0L;
@@ -304,9 +304,9 @@ long SvxHatchTabPage::CheckChanges_Impl()
// -----------------------------------------------------------------------
-BOOL SvxHatchTabPage::FillItemSet( SfxItemSet& rSet )
+sal_Bool SvxHatchTabPage::FillItemSet( SfxItemSet& rSet )
{
- if( *pDlgType == 0 && *pbAreaTP == FALSE ) // Flaechen-Dialog
+ if( *pDlgType == 0 && *pbAreaTP == sal_False ) // Flaechen-Dialog
{
if( *pPageType == PT_HATCH )
{
@@ -314,7 +314,7 @@ BOOL SvxHatchTabPage::FillItemSet( SfxItemSet& rSet )
XHatch* pXHatch = NULL;
String aString;
- USHORT nPos = aLbHatchings.GetSelectEntryPos();
+ sal_uInt16 nPos = aLbHatchings.GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
pXHatch = new XHatch( pHatchingList->GetHatch( nPos )->GetHatch() );
@@ -335,7 +335,7 @@ BOOL SvxHatchTabPage::FillItemSet( SfxItemSet& rSet )
delete pXHatch;
}
}
- return TRUE;
+ return sal_True;
}
// -----------------------------------------------------------------------
@@ -419,10 +419,10 @@ IMPL_LINK( SvxHatchTabPage, ChangeHatchHdl_Impl, void *, EMPTYARG )
else
{
const SfxPoolItem* pPoolItem = NULL;
- if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLSTYLE ), TRUE, &pPoolItem ) )
+ if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLSTYLE ), sal_True, &pPoolItem ) )
{
if( ( XFILL_HATCH == (XFillStyle) ( ( const XFillStyleItem* ) pPoolItem )->GetValue() ) &&
- ( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLHATCH ), TRUE, &pPoolItem ) ) )
+ ( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLHATCH ), sal_True, &pPoolItem ) ) )
{
pHatch = new XHatch( ( ( const XFillHatchItem* ) pPoolItem )->GetHatchValue() );
}
@@ -438,7 +438,7 @@ IMPL_LINK( SvxHatchTabPage, ChangeHatchHdl_Impl, void *, EMPTYARG )
if( pHatch )
{
aLbLineType.SelectEntryPos(
- sal::static_int_cast< USHORT >( pHatch->GetHatchStyle() ) );
+ sal::static_int_cast< sal_uInt16 >( pHatch->GetHatchStyle() ) );
// Wenn der Eintrag nicht in der Listbox ist, wird die Farbe
// temporaer hinzugenommen
aLbLineColor.SetNoSelection();
@@ -468,10 +468,10 @@ IMPL_LINK( SvxHatchTabPage, ChangeHatchHdl_Impl, void *, EMPTYARG )
// Backgroundcolor
/*
const SfxPoolItem* pPoolItem = NULL;
- if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBACKGROUND ), TRUE, &pPoolItem ) )
+ if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBACKGROUND ), sal_True, &pPoolItem ) )
{
rXFSet.Put ( XFillBackgroundItem( ( ( XFillBackgroundItem* )pPoolItem)->GetValue() ) );
- if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), TRUE, &pPoolItem ) )
+ if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), sal_True, &pPoolItem ) )
{
Color aColor( ( ( const XFillColorItem* ) pPoolItem )->GetValue() );
rXFSet.Put( XFillColorItem( String(), aColor ) );
@@ -505,18 +505,18 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
long nCount = pHatchingList->Count();
long j = 1;
- BOOL bDifferent = FALSE;
+ sal_Bool bDifferent = sal_False;
while( !bDifferent )
{
aName = aNewName;
aName += sal_Unicode(' ');
aName += UniString::CreateFromInt32( j++ );
- bDifferent = TRUE;
+ bDifferent = sal_True;
for( long i = 0; i < nCount && bDifferent; i++ )
if( aName == pHatchingList->GetHatch( i )->GetName() )
- bDifferent = FALSE;
+ bDifferent = sal_False;
}
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
@@ -524,17 +524,17 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
WarningBox* pWarnBox = NULL;
- USHORT nError = RID_SVXSTR_WARN_NAME_DUPLICATE;
+ sal_uInt16 nError = RID_SVXSTR_WARN_NAME_DUPLICATE;
while( pDlg->Execute() == RET_OK )
{
pDlg->GetName( aName );
- bDifferent = TRUE;
+ bDifferent = sal_True;
for( long i = 0; i < nCount && bDifferent; i++ )
if( aName == pHatchingList->GetHatch( i )->GetName() )
- bDifferent = FALSE;
+ bDifferent = sal_False;
if( bDifferent ) {
nError = 0;
@@ -573,7 +573,7 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
#ifdef WNT
// hack: #31355# W.P.
Rectangle aRect( aLbHatchings.GetPosPixel(), aLbHatchings.GetSizePixel() );
- if( TRUE ) { // ??? overlapped with pDlg
+ if( sal_True ) { // ??? overlapped with pDlg
// and srolling
Invalidate( aRect );
//aLbHatchings.Invalidate();
@@ -600,7 +600,7 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
IMPL_LINK( SvxHatchTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
{
- USHORT nPos = aLbHatchings.GetSelectEntryPos();
+ sal_uInt16 nPos = aLbHatchings.GetSelectEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
@@ -616,23 +616,23 @@ IMPL_LINK( SvxHatchTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
long nCount = pHatchingList->Count();
- BOOL bDifferent = FALSE;
- BOOL bLoop = TRUE;
+ sal_Bool bDifferent = sal_False;
+ sal_Bool bLoop = sal_True;
while( bLoop && pDlg->Execute() == RET_OK )
{
pDlg->GetName( aName );
- bDifferent = TRUE;
+ bDifferent = sal_True;
for( long i = 0; i < nCount && bDifferent; i++ )
{
if( aName == pHatchingList->GetHatch( i )->GetName() &&
aName != aOldName )
- bDifferent = FALSE;
+ bDifferent = sal_False;
}
if( bDifferent )
{
- bLoop = FALSE;
+ bLoop = sal_False;
XHatch aXHatch( aLbLineColor.GetSelectEntryColor(),
(XHatchStyle) aLbLineType.GetSelectEntryPos(),
GetCoreValue( aMtrDistance, ePoolUnit ),
@@ -672,7 +672,7 @@ IMPL_LINK( SvxHatchTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
IMPL_LINK( SvxHatchTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
{
- USHORT nPos = aLbHatchings.GetSelectEntryPos();
+ sal_uInt16 nPos = aLbHatchings.GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
@@ -708,7 +708,7 @@ IMPL_LINK( SvxHatchTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
IMPL_LINK( SvxHatchTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
{
ResMgr& rMgr = CUI_MGR();
- USHORT nReturn = RET_YES;
+ sal_uInt16 nReturn = RET_YES;
if ( *pnHatchingListState & CT_MODIFIED )
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 03:24:17 +0000