diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-14 09:44:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-14 12:00:40 +0200 |
| commit | f30ce25c3c5954eb90e126dd4904eee5454f044c (patch) | |
| tree | e21ccf7d1b782b7ad1a08913f2831ca662d87283 /svtools | |
| parent | 19a32ddfd2b9c1beb17641e99f139ac0d3dcaf96 (diff) | |
convert GRFILTER_I_FLAGS to scoped enum
Change-Id: Ic1cb9b32fe252706cd607abb2ae1fd5a00999901
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/filter/exportdialog.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/graphic/provider.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index 9d16cc0758e7..62eb286601ee 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -502,7 +502,7 @@ Bitmap ExportDialog::GetGraphicBitmap( SvStream& rInputStream ) Bitmap aRet; Graphic aGraphic; GraphicFilter aFilter( false ); - if ( aFilter.ImportGraphic( aGraphic, "", rInputStream, GRFILTER_FORMAT_NOTFOUND, NULL, 0, static_cast<com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >*>(NULL), NULL ) == GRFILTER_OK ) + if ( aFilter.ImportGraphic( aGraphic, "", rInputStream, GRFILTER_FORMAT_NOTFOUND, NULL, GraphicFilterImportFlags::NONE, static_cast<com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >*>(NULL), NULL ) == GRFILTER_OK ) { aRet = aGraphic.GetBitmap(); } diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index 9bfe0588770b..292945d96714 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -486,7 +486,7 @@ uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( co pExtHeader = &aExtHeader; if( ( rFilter.ImportGraphic( aVCLGraphic, aPath, *pIStm, - GRFILTER_FORMAT_DONTKNOW, NULL, 0, pExtHeader ) == GRFILTER_OK ) && + GRFILTER_FORMAT_DONTKNOW, NULL, GraphicFilterImportFlags::NONE, pExtHeader ) == GRFILTER_OK ) && ( aVCLGraphic.GetType() != GRAPHIC_NONE ) ) { ::unographic::Graphic* pUnoGraphic = new ::unographic::Graphic; |