diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-27 09:43:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-27 12:59:23 +0000 |
| commit | 850a8d27ca696f18ce0c529346f8bb8505499545 (patch) | |
| tree | 5641e81912760029683e1c544e01af25eee23523 /cui | |
| parent | 6c974272423ca19c94d8d5e182fec46836309d60 (diff) | |
Convert GRAPHIC to scoped enum
Change-Id: I1fd09a729cbda00f99841532e0dd3fa66bce7bea
Reviewed-on: https://gerrit.libreoffice.org/25534
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/dialogs/cuigrfflt.cxx | 4 | ||||
| -rw-r--r-- | cui/source/tabpages/grfpage.cxx | 4 | ||||
| -rw-r--r-- | cui/source/tabpages/tparea.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index bd694f2cd061..1a8774ba9219 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -99,7 +99,7 @@ void GraphicPreviewWindow::ScaleImageToFit() mpOrigGraphic->GetPrefMapMode())); Size aGrfSize(aSizePixel); - if( mpOrigGraphic->GetType() == GRAPHIC_BITMAP && + if( mpOrigGraphic->GetType() == GraphicType::Bitmap && aPreviewSize.Width() && aPreviewSize.Height() && aGrfSize.Width() && aGrfSize.Height() ) { @@ -147,7 +147,7 @@ GraphicFilterDialog::GraphicFilterDialog(vcl::Window* pParent, , maSizePixel(LogicToPixel(rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode())) { - bIsBitmap = rGraphic.GetType() == GRAPHIC_BITMAP; + bIsBitmap = rGraphic.GetType() == GraphicType::Bitmap; maTimer.SetTimeoutHdl( LINK( this, GraphicFilterDialog, ImplPreviewTimeoutHdl ) ); maTimer.SetTimeout( 5 ); diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 1ffd0b4ef5f2..e7cd0def4c93 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -234,7 +234,7 @@ void SvxGrfCropPage::Reset( const SfxItemSet *rSet ) if( pGrf ) { aOrigSize = GetGrfOrigSize( *pGrf ); - if (pGrf->GetType() == GRAPHIC_BITMAP && aOrigSize.Width() && aOrigSize.Height()) + if (pGrf->GetType() == GraphicType::Bitmap && aOrigSize.Width() && aOrigSize.Height()) { Bitmap aBitmap = pGrf->GetBitmap(); aOrigPixelSize = aBitmap.GetSizePixel(); @@ -388,7 +388,7 @@ void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet) { m_pExampleWN->SetGraphic( *pGrf ); aOrigSize = GetGrfOrigSize( *pGrf ); - if (pGrf->GetType() == GRAPHIC_BITMAP && aOrigSize.Width() > 1 && aOrigSize.Height() > 1) { + if (pGrf->GetType() == GraphicType::Bitmap && aOrigSize.Width() > 1 && aOrigSize.Height() > 1) { Bitmap aBitmap = pGrf->GetBitmap(); aOrigPixelSize = aBitmap.GetSizePixel(); } diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 431e10614e54..df35ae0f7df3 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -592,7 +592,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs ) case drawing::FillStyle_BITMAP: { //UUUU - if(mbDirectGraphicSet && GRAPHIC_NONE != maDirectGraphic.GetType()) + if(mbDirectGraphicSet && GraphicType::NONE != maDirectGraphic.GetType()) { const XFillBitmapItem aXBmpItem(maDirectName, maDirectGraphic); rAttrs->Put(XFillStyleItem(drawing::FillStyle_BITMAP)); @@ -1447,7 +1447,7 @@ IMPL_LINK_NOARG_TYPED( SvxAreaTabPage, ClickImportHdl_Impl, Button*, void ) const int nError(aDlg.GetGraphic(maDirectGraphic)); LeaveWait(); - if(!nError && GRAPHIC_NONE != maDirectGraphic.GetType()) + if(!nError && GraphicType::NONE != maDirectGraphic.GetType()) { // extract name from filename const INetURLObject aURL(aDlg.GetPath()); |