summaryrefslogtreecommitdiff
path: root/cui/source/tabpages/tpbitmap.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source/tabpages/tpbitmap.cxx')
-rw-r--r--cui/source/tabpages/tpbitmap.cxx89
1 files changed, 50 insertions, 39 deletions
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index e7b5cf60275d..3deed69a50f1 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -66,6 +66,7 @@
#include <svx/svxdlg.hxx>
#include <dialmgr.hxx>
#include "sfx2/opengrf.hxx"
+#include "paragrph.hrc"
#define DLGWIN this->GetParent()->GetParent()
@@ -140,6 +141,16 @@ SvxBitmapTabPage::SvxBitmapTabPage
aLbBackgroundColor.SetSelectHdl(
LINK( this, SvxBitmapTabPage, ChangeBackgrndColorHdl_Impl ) );
+ String accName = String(SVX_RES(STR_EXAMPLE));
+ aCtlPreview.SetAccessibleName(accName);
+ aCtlPixel.SetAccessibleRelationMemberOf( &aFlProp );
+ aCtlPixel.SetAccessibleRelationLabeledBy( &aFtPixelEdit );
+ aLbBitmaps.SetAccessibleRelationLabeledBy(&aLbBitmaps);
+ aBtnAdd.SetAccessibleRelationMemberOf( &aFlProp );
+ aBtnModify.SetAccessibleRelationMemberOf( &aFlProp );
+ aBtnImport.SetAccessibleRelationMemberOf( &aFlProp );
+ aBtnDelete.SetAccessibleRelationMemberOf( &aFlProp );
+
}
// -----------------------------------------------------------------------
@@ -158,12 +169,12 @@ void SvxBitmapTabPage::Construct()
void SvxBitmapTabPage::ActivatePage( const SfxItemSet& )
{
- USHORT nPos;
- USHORT nCount;
+ sal_uInt16 nPos;
+ sal_uInt16 nCount;
if( *pDlgType == 0 ) // Flaechen-Dialog
{
- *pbAreaTP = FALSE;
+ *pbAreaTP = sal_False;
if( pColorTab )
{
@@ -246,9 +257,9 @@ int SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet)
// -----------------------------------------------------------------------
-BOOL SvxBitmapTabPage::FillItemSet( SfxItemSet& _rOutAttrs )
+sal_Bool SvxBitmapTabPage::FillItemSet( SfxItemSet& _rOutAttrs )
{
- if( *pDlgType == 0 && *pbAreaTP == FALSE ) // Flaechen-Dialog
+ if( *pDlgType == 0 && *pbAreaTP == sal_False ) // Flaechen-Dialog
{
if( *pPageType == PT_BITMAP )
{
@@ -256,7 +267,7 @@ BOOL SvxBitmapTabPage::FillItemSet( SfxItemSet& _rOutAttrs )
XOBitmap aXOBitmap;
String aString;
- USHORT nPos = aLbBitmaps.GetSelectEntryPos();
+ sal_uInt16 nPos = aLbBitmaps.GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
aXOBitmap = pBitmapList->GetBitmap( nPos )->GetXBitmap();
@@ -276,7 +287,7 @@ BOOL SvxBitmapTabPage::FillItemSet( SfxItemSet& _rOutAttrs )
_rOutAttrs.Put( XFillBitmapItem( aString, aXOBitmap ) );
}
}
- return TRUE;
+ return sal_True;
}
// -----------------------------------------------------------------------
@@ -334,11 +345,11 @@ IMPL_LINK( SvxBitmapTabPage, ChangeBitmapHdl_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 ) )
{
XFillStyle eXFS = (XFillStyle) ( ( const XFillStyleItem* ) pPoolItem )->GetValue();
if( ( XFILL_BITMAP == eXFS ) &&
- ( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBITMAP ), TRUE, &pPoolItem ) ) )
+ ( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBITMAP ), sal_True, &pPoolItem ) ) )
{
pXOBitmap = new XOBitmap( ( ( const XFillBitmapItem* ) pPoolItem )->GetBitmapValue() );
}
@@ -365,7 +376,7 @@ IMPL_LINK( SvxBitmapTabPage, ChangeBitmapHdl_Impl, void *, EMPTYARG )
sal_uInt32 nCol1(0xffffffff); // background
sal_uInt32 nCol2(0xffffffff); // pixel
BitmapReadAccess* pAccess = aBitmap.AcquireReadAccess();
- sal_Bool bValid(TRUE);
+ sal_Bool bValid(sal_True);
if(pAccess)
{
@@ -398,7 +409,7 @@ IMPL_LINK( SvxBitmapTabPage, ChangeBitmapHdl_Impl, void *, EMPTYARG )
else
{
// Third color detected
- bValid = FALSE;
+ bValid = sal_False;
}
}
else
@@ -421,7 +432,7 @@ IMPL_LINK( SvxBitmapTabPage, ChangeBitmapHdl_Impl, void *, EMPTYARG )
else
{
// no access -> no success
- bValid = FALSE;
+ bValid = sal_False;
}
if(bValid)
@@ -454,7 +465,7 @@ IMPL_LINK( SvxBitmapTabPage, ChangeBitmapHdl_Impl, void *, EMPTYARG )
if( pXOBitmap->GetBitmapType() == XBITMAP_IMPORT )
{
aCtlPixel.Reset();
- aCtlPixel.SetPaintable( FALSE );
+ aCtlPixel.SetPaintable( sal_False );
aCtlPixel.Disable();
aFtPixelEdit.Disable();
aFtColor.Disable();
@@ -466,7 +477,7 @@ IMPL_LINK( SvxBitmapTabPage, ChangeBitmapHdl_Impl, void *, EMPTYARG )
}
else if( pXOBitmap->GetBitmapType() == XBITMAP_8X8 )
{
- aCtlPixel.SetPaintable( TRUE );
+ aCtlPixel.SetPaintable( sal_True );
aCtlPixel.Enable();
aFtPixelEdit.Enable();
aFtColor.Enable();
@@ -515,7 +526,7 @@ IMPL_LINK( SvxBitmapTabPage, ChangeBitmapHdl_Impl, void *, EMPTYARG )
aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() );
aCtlPreview.Invalidate();
- bBmpChanged = FALSE;
+ bBmpChanged = sal_False;
delete pXOBitmap;
}
return 0L;
@@ -525,7 +536,7 @@ IMPL_LINK( SvxBitmapTabPage, ChangeBitmapHdl_Impl, void *, EMPTYARG )
long SvxBitmapTabPage::CheckChanges_Impl()
{
- USHORT nPos = aLbBitmaps.GetSelectEntryPos();
+ sal_uInt16 nPos = aLbBitmaps.GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
String aString = aLbBitmaps.GetSelectEntry();
@@ -586,18 +597,18 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
long nCount = pBitmapList->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 == pBitmapList->GetBitmap( i )->GetName() )
- bDifferent = FALSE;
+ bDifferent = sal_False;
}
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
@@ -605,17 +616,17 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
DBG_ASSERT(pDlg, "Dialogdiet fail!");
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 == pBitmapList->GetBitmap( i )->GetName() )
- bDifferent = FALSE;
+ bDifferent = sal_False;
if( bDifferent ) {
nError = 0;
@@ -652,7 +663,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
else // Es muss sich um eine nicht vorhandene importierte Bitmap handeln
{
const SfxPoolItem* pPoolItem = NULL;
- if( SFX_ITEM_SET == rOutAttrs.GetItemState( XATTR_FILLBITMAP, TRUE, &pPoolItem ) )
+ if( SFX_ITEM_SET == rOutAttrs.GetItemState( XATTR_FILLBITMAP, sal_True, &pPoolItem ) )
{
XOBitmap aXOBitmap( ( ( const XFillBitmapItem* ) pPoolItem )->GetBitmapValue() );
pEntry = new XBitmapEntry( aXOBitmap, aName );
@@ -671,7 +682,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
#ifdef WNT
// hack: #31355# W.P.
Rectangle aRect( aLbBitmaps.GetPosPixel(), aLbBitmaps.GetSizePixel() );
- if( TRUE ) { // ??? overlapped with pDlg
+ if( sal_True ) { // ??? overlapped with pDlg
// and srolling
Invalidate( aRect );
//aLbBitmaps.Invalidate();
@@ -739,12 +750,12 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG )
{
pDlg->GetName( aName );
- BOOL bDifferent = TRUE;
+ sal_Bool bDifferent = sal_True;
long nCount = pBitmapList->Count();
for( long i = 0; i < nCount && bDifferent; i++ )
if( aName == pBitmapList->GetBitmap( i )->GetName() )
- bDifferent = FALSE;
+ bDifferent = sal_False;
if( bDifferent ) {
nError = 0;
@@ -779,7 +790,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG )
#ifdef WNT
// hack: #31355# W.P.
Rectangle aRect( aLbBitmaps.GetPosPixel(), aLbBitmaps.GetSizePixel() );
- if( TRUE ) { // ??? overlapped with pDlg
+ if( sal_True ) { // ??? overlapped with pDlg
// and srolling
Invalidate( aRect );
}
@@ -809,7 +820,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG )
IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
{
- USHORT nPos = aLbBitmaps.GetSelectEntryPos();
+ sal_uInt16 nPos = aLbBitmaps.GetSelectEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
@@ -825,24 +836,24 @@ IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
DBG_ASSERT(pDlg, "Dialogdiet fail!");
long nCount = pBitmapList->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 == pBitmapList->GetBitmap( i )->GetName() &&
aName != aOldName )
- bDifferent = FALSE;
+ bDifferent = sal_False;
}
if( bDifferent )
{
- bLoop = FALSE;
+ bLoop = sal_False;
XBitmapEntry* pEntry = pBitmapList->GetBitmap( nPos );
pEntry->SetName( aName );
@@ -861,7 +872,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
// Flag fuer modifiziert setzen
*pnBitmapListState |= CT_MODIFIED;
- bBmpChanged = FALSE;
+ bBmpChanged = sal_False;
}
else
{
@@ -879,7 +890,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
IMPL_LINK( SvxBitmapTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
{
- USHORT nPos = aLbBitmaps.GetSelectEntryPos();
+ sal_uInt16 nPos = aLbBitmaps.GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
@@ -915,7 +926,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
IMPL_LINK( SvxBitmapTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
{
- USHORT nReturn = RET_YES;
+ sal_uInt16 nReturn = RET_YES;
ResMgr& rMgr = CUI_MGR();
if ( *pnBitmapListState & CT_MODIFIED )
@@ -1084,7 +1095,7 @@ IMPL_LINK( SvxBitmapTabPage, ChangePixelColorHdl_Impl, void *, EMPTYARG )
aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() );
aCtlPreview.Invalidate();
- bBmpChanged = TRUE;
+ bBmpChanged = sal_True;
return 0L;
}
@@ -1103,7 +1114,7 @@ IMPL_LINK( SvxBitmapTabPage, ChangeBackgrndColorHdl_Impl, void *, EMPTYARG )
aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() );
aCtlPreview.Invalidate();
- bBmpChanged = TRUE;
+ bBmpChanged = sal_True;
return 0L;
}
@@ -1121,7 +1132,7 @@ void SvxBitmapTabPage::PointChanged( Window* pWindow, RECT_POINT )
aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() );
aCtlPreview.Invalidate();
- bBmpChanged = TRUE;
+ bBmpChanged = sal_True;
}
}
generated by cgit (git 2.34.1) at 2024-07-17 01:31:22 +0000