summaryrefslogtreecommitdiff
path: root/cui/source/dialogs/cuigrfflt.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source/dialogs/cuigrfflt.cxx')
-rw-r--r--cui/source/dialogs/cuigrfflt.cxx54
1 files changed, 30 insertions, 24 deletions
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 8bbbfb5f8df2..eea084548b2b 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -44,10 +44,10 @@
// - SvxGraphicFilter -
// --------------------
/*
-ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject )
+sal_uLong SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject )
{
const Graphic& rGraphic = rFilterObject.GetGraphic();
- ULONG nRet;
+ sal_uLong nRet;
if( rGraphic.GetType() == GRAPHIC_BITMAP )
{
@@ -61,7 +61,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
case( SID_GRFFILTER_INVERT ):
{
if( pShell )
- pShell->SetWaitCursor( TRUE );
+ pShell->SetWaitCursor( sal_True );
if( rGraphic.IsAnimated() )
{
@@ -79,14 +79,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
}
if( pShell )
- pShell->SetWaitCursor( FALSE );
+ pShell->SetWaitCursor( sal_False );
}
break;
case( SID_GRFFILTER_SMOOTH ):
{
if( pShell )
- pShell->SetWaitCursor( TRUE );
+ pShell->SetWaitCursor( sal_True );
if( rGraphic.IsAnimated() )
{
@@ -104,14 +104,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
}
if( pShell )
- pShell->SetWaitCursor( FALSE );
+ pShell->SetWaitCursor( sal_False );
}
break;
case( SID_GRFFILTER_SHARPEN ):
{
if( pShell )
- pShell->SetWaitCursor( TRUE );
+ pShell->SetWaitCursor( sal_True );
if( rGraphic.IsAnimated() )
{
@@ -129,14 +129,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
}
if( pShell )
- pShell->SetWaitCursor( FALSE );
+ pShell->SetWaitCursor( sal_False );
}
break;
case( SID_GRFFILTER_REMOVENOISE ):
{
if( pShell )
- pShell->SetWaitCursor( TRUE );
+ pShell->SetWaitCursor( sal_True );
if( rGraphic.IsAnimated() )
{
@@ -154,14 +154,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
}
if( pShell )
- pShell->SetWaitCursor( FALSE );
+ pShell->SetWaitCursor( sal_False );
}
break;
case( SID_GRFFILTER_SOBEL ):
{
if( pShell )
- pShell->SetWaitCursor( TRUE );
+ pShell->SetWaitCursor( sal_True );
if( rGraphic.IsAnimated() )
{
@@ -179,13 +179,13 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
}
if( pShell )
- pShell->SetWaitCursor( FALSE );
+ pShell->SetWaitCursor( sal_False );
}
break;
case( SID_GRFFILTER_MOSAIC ):
{
- GraphicFilterMosaic aDlg( pWindow, rGraphic, 4, 4, FALSE );
+ GraphicFilterMosaic aDlg( pWindow, rGraphic, 4, 4, sal_False );
if( aDlg.Execute() == RET_OK )
aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 );
@@ -213,7 +213,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
case( SID_GRFFILTER_POPART ):
{
if( pShell )
- pShell->SetWaitCursor( TRUE );
+ pShell->SetWaitCursor( sal_True );
if( rGraphic.IsAnimated() )
{
@@ -231,7 +231,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
}
if( pShell )
- pShell->SetWaitCursor( FALSE );
+ pShell->SetWaitCursor( sal_False );
}
break;
@@ -246,7 +246,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
case( SID_GRFFILTER_SOLARIZE ):
{
- GraphicFilterSolarize aDlg( pWindow, rGraphic, 128, FALSE );
+ GraphicFilterSolarize aDlg( pWindow, rGraphic, 128, sal_False );
if( aDlg.Execute() == RET_OK )
aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 );
@@ -369,10 +369,10 @@ GraphicFilterDialog::GraphicFilterDialog( Window* pParent, const ResId& rResId,
mfScaleY ( 0.0 ),
maSizePixel ( LogicToPixel( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode() ) ),
maPreview ( this, CUI_RES( CTL_PREVIEW ) ),
- maFlParameter ( this, CUI_RES( FL_PARAMETER ) ),
maBtnOK ( this, CUI_RES( BTN_OK ) ),
maBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
- maBtnHelp ( this, CUI_RES( BTN_HELP ) )
+ maBtnHelp ( this, CUI_RES( BTN_HELP ) ),
+ maFlParameter ( this, CUI_RES( FL_PARAMETER ) )
{
const Size aPreviewSize( maPreview.GetOutputSizePixel() );
Size aGrfSize( maSizePixel );
@@ -446,7 +446,7 @@ IMPL_LINK( GraphicFilterDialog, ImplModifyHdl, void*, EMPTYARG )
// ----------------
GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic,
- USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges ) :
+ sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges ) :
GraphicFilterDialog( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_MOSAIC ), rGraphic ),
maFtWidth ( this, CUI_RES( DLG_FILTERMOSAIC_FT_WIDTH ) ),
maMtrWidth ( this, CUI_RES( DLG_FILTERMOSAIC_MTR_WIDTH ) ),
@@ -468,6 +468,12 @@ GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraph
maCbxEdges.SetToggleHdl( GetModifyHdl() );
maMtrWidth.GrabFocus();
+
+ maFtWidth.SetAccessibleRelationMemberOf(&maFlParameter);
+ maMtrWidth.SetAccessibleRelationMemberOf(&maFlParameter);
+ maFtHeight.SetAccessibleRelationMemberOf(&maFlParameter);
+ maMtrHeight.SetAccessibleRelationMemberOf(&maFlParameter);
+ maCbxEdges.SetAccessibleRelationMemberOf(&maFlParameter);
}
// -----------------------------------------------------------------------------
@@ -519,7 +525,7 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic,
// ------------------
GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic,
- BYTE cGreyThreshold, BOOL bInvert ) :
+ sal_uInt8 cGreyThreshold, sal_Bool bInvert ) :
GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SOLARIZE ), rGraphic ),
maFtThreshold ( this, CUI_RES( DLG_FILTERSOLARIZE_FT_THRESHOLD ) ),
maMtrThreshold ( this, CUI_RES( DLG_FILTERSOLARIZE_MTR_THRESHOLD ) ),
@@ -583,7 +589,7 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic,
// ----------------------
GraphicFilterSepia::GraphicFilterSepia( Window* pParent, const Graphic& rGraphic,
- USHORT nSepiaPercent ) :
+ sal_uInt16 nSepiaPercent ) :
GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SEPIA ), rGraphic ),
maFtSepia ( this, CUI_RES( DLG_FILTERSEPIA_FT_SEPIA ) ),
maMtrSepia ( this, CUI_RES( DLG_FILTERSEPIA_MTR_SEPIA ) )
@@ -633,7 +639,7 @@ Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic,
// -----------------------
GraphicFilterPoster::GraphicFilterPoster( Window* pParent, const Graphic& rGraphic,
- USHORT nPosterCount ) :
+ sal_uInt16 nPosterCount ) :
GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_POSTER ), rGraphic ),
maFtPoster ( this, CUI_RES( DLG_FILTERPOSTER_FT_POSTER ) ),
maNumPoster ( this, CUI_RES( DLG_FILTERPOSTER_NUM_POSTER ) )
@@ -659,7 +665,7 @@ Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic,
double /*fScaleX*/, double /*fScaleY*/ )
{
Graphic aRet;
- const USHORT nPosterCount = GetPosterColorCount();
+ const sal_uInt16 nPosterCount = GetPosterColorCount();
if( rGraphic.IsAnimated() )
{
@@ -719,7 +725,7 @@ Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic,
double /*fScaleX*/, double /*fScaleY*/ )
{
Graphic aRet;
- USHORT nAzim, nElev;
+ sal_uInt16 nAzim, nElev;
switch( maCtlLight.GetActualRP() )
{
generated by cgit (git 2.34.1) at 2024-08-20 19:35:26 +0000