diff options
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/dialog/_bmpmask.cxx | 6 | ||||
| -rw-r--r-- | svx/source/dialog/_contdlg.cxx | 4 | ||||
| -rw-r--r-- | svx/source/gallery2/galbrws2.cxx | 2 | ||||
| -rw-r--r-- | svx/source/gallery2/galctrl.cxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdfmtf.cxx | 2 | ||||
| -rw-r--r-- | svx/source/tbxctrls/itemwin.cxx | 2 | ||||
| -rw-r--r-- | svx/source/xoutdev/xtabbtmp.cxx | 2 | ||||
| -rw-r--r-- | svx/source/xoutdev/xtabptrn.cxx | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 2515a8850408..a74e6273d4e2 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -614,8 +614,8 @@ BitmapEx SvxBmpMask::ImpMaskTransparent( const BitmapEx& rBitmapEx, const Color& BitmapEx aBmpEx; Bitmap aMask( rBitmapEx.GetBitmap().CreateMask( rColor, nTol ) ); - if( rBitmapEx.IsTransparent() ) - aMask.CombineSimple( rBitmapEx.GetMask(), BmpCombine::Or ); + if( rBitmapEx.IsAlpha() ) + aMask.CombineSimple( rBitmapEx.GetAlpha(), BmpCombine::Or ); aBmpEx = BitmapEx( rBitmapEx.GetBitmap(), aMask ); LeaveWait(); @@ -995,7 +995,7 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic ) { ImpMask( aBitmapEx ); if ( aGraphic.IsTransparent() ) - aGraphic = Graphic( BitmapEx( aBitmapEx.GetBitmap(), aBitmapEx.GetMask() ) ); + aGraphic = Graphic( BitmapEx( aBitmapEx.GetBitmap(), aBitmapEx.GetAlpha() ) ); else aGraphic = aBitmapEx; } diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index bba90c16a1a0..616f8774050d 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -115,7 +115,7 @@ tools::PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic, } } else if( rGraphic.IsTransparent() ) - aBmp = rGraphic.GetBitmapEx().GetMask(); + aBmp = rGraphic.GetBitmapEx().GetAlpha(); else { aBmp = rGraphic.GetBitmapEx().GetBitmap(); @@ -634,7 +634,7 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow&, rWnd, void ) Bitmap aMask = aGraphic.GetBitmapEx().GetBitmap().CreateMask( rColor, nTol ); if( aGraphic.IsTransparent() ) - aMask.CombineSimple( aGraphic.GetBitmapEx().GetMask(), BmpCombine::Or ); + aMask.CombineSimple( aGraphic.GetBitmapEx().GetAlpha(), BmpCombine::Or ); if( !aMask.IsEmpty() ) { diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 1d388203a2a9..cd3d943ec5e4 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -869,7 +869,7 @@ void GalleryBrowser2::UpdateRows(bool bVisibleOnly) mxDev->Erase(); - if (aBitmapEx.IsTransparent()) + if (aBitmapEx.IsAlpha()) { // draw checkered background GalleryIconView::drawTransparenceBackground(*mxDev, aPos, aBitmapExSizePixel); diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 78da9c640cf1..819f115cf3f4 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -357,7 +357,7 @@ void GalleryIconView::UserDraw(const UserDrawEvent& rUDEvt) ((aSize.Height() - aBitmapExSizePixel.Height()) >> 1) + rRect.Top()); OutputDevice* pDev = rUDEvt.GetRenderContext(); - if(aBitmapEx.IsTransparent()) + if(aBitmapEx.IsAlpha()) { // draw checkered background for full rectangle. GalleryIconView::drawTransparenceBackground(*pDev, rRect.TopLeft(), rRect.GetSize()); diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 5f8185f93325..eb60ff92fa56 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -1609,7 +1609,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaFloatTransparentAction const & rAct) if(bHasNewMask || bFixedTransparence) { - if(!aBitmapEx.IsAlpha() && !aBitmapEx.IsTransparent()) + if(!aBitmapEx.IsAlpha()) { // no transparence yet, apply new one if(bFixedTransparence) diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 89a428986efd..f9612fe008d7 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -197,7 +197,7 @@ namespace ScopedVclPtrInstance< VirtualDevice > pVirtualDevice; pVirtualDevice->SetOutputSizePixel(rSize); - if(rBitmapEx.IsTransparent()) + if(rBitmapEx.IsAlpha()) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx index 2d3adb4c067e..fd1b7dfdadb7 100644 --- a/svx/source/xoutdev/xtabbtmp.cxx +++ b/svx/source/xoutdev/xtabbtmp.cxx @@ -54,7 +54,7 @@ BitmapEx XBitmapList::CreateBitmap( tools::Long nIndex, const Size& rSize ) cons ScopedVclPtrInstance< VirtualDevice > pVirtualDevice; pVirtualDevice->SetOutputSizePixel(rSize); - if(rBitmapEx.IsTransparent()) + if(rBitmapEx.IsAlpha()) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); diff --git a/svx/source/xoutdev/xtabptrn.cxx b/svx/source/xoutdev/xtabptrn.cxx index 96e1d4b919c3..8d461167a87a 100644 --- a/svx/source/xoutdev/xtabptrn.cxx +++ b/svx/source/xoutdev/xtabptrn.cxx @@ -89,7 +89,7 @@ BitmapEx XPatternList::CreateBitmap( tools::Long nIndex, const Size& rSize ) con ScopedVclPtrInstance< VirtualDevice > pVirtualDevice; pVirtualDevice->SetOutputSizePixel(rSize); - if(rBitmapEx.IsTransparent()) + if(rBitmapEx.IsAlpha()) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); |