diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-20 14:15:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-22 17:51:13 +0000 |
| commit | eaba47bce44a373116b0583dc293c8c3238b7bea (patch) | |
| tree | 3af5cb6724fcc1e2e61fd154eb616bc0a2f1ddd1 /sc | |
| parent | c093af75202f6c9d8e6ae7d8e933b82da6f2c11b (diff) | |
Convert XOUTBMP to scoped enum
Change-Id: I8d10cdc78ca73d86bdc9aa08fca591f6eb85eb9e
Reviewed-on: https://gerrit.libreoffice.org/25196
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/html/htmlexp.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/html/htmlexp2.cxx | 10 | ||||
| -rw-r--r-- | sc/source/filter/inc/htmlexp.hxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index cd43d570c210..bc47e99c7301 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -609,7 +609,7 @@ void ScHTMLExport::WriteBody() // Save graphic as (JPG) file aGrfNm = aStreamPath; sal_uInt16 nErr = XOutBitmap::WriteGraphic( *pGrf, aGrfNm, - "JPG", XOUTBMP_USE_NATIVE_IF_POSSIBLE ); + "JPG", XOutFlags::UseNativeIfPossible ); if( !nErr ) // Contains errors, as we have nothing to output { aGrfNm = URIHelper::SmartRel2Abs( diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx index aab92defefab..9c2113ecfd1c 100644 --- a/sc/source/filter/html/htmlexp2.cxx +++ b/sc/source/filter/html/htmlexp2.cxx @@ -140,11 +140,11 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE ) ( pGeo->bMirrored ? 3 : 4 ) : ( pGeo->bMirrored ? 2 : 1 )); bool bHMirr = ( ( nMirrorCase == 2 ) || ( nMirrorCase == 4 ) ); bool bVMirr = ( ( nMirrorCase == 3 ) || ( nMirrorCase == 4 ) ); - sal_uLong nXOutFlags = 0; + XOutFlags nXOutFlags = XOutFlags::NONE; if ( bHMirr ) - nXOutFlags |= XOUTBMP_MIRROR_HORZ; + nXOutFlags |= XOutFlags::MirrorHorz; if ( bVMirr ) - nXOutFlags |= XOUTBMP_MIRROR_VERT; + nXOutFlags |= XOutFlags::MirrorVert; OUString aLinkName; if ( pSGO->IsLinkedGraphic() ) aLinkName = pSGO->GetFileName(); @@ -175,7 +175,7 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE ) } void ScHTMLExport::WriteImage( OUString& rLinkName, const Graphic& rGrf, - const OString& rImgOptions, sal_uLong nXOutFlags ) + const OString& rImgOptions, XOutFlags nXOutFlags ) { // Embedded graphic -> create an image file if( rLinkName.isEmpty() ) @@ -184,7 +184,7 @@ void ScHTMLExport::WriteImage( OUString& rLinkName, const Graphic& rGrf, { // Save as a PNG OUString aGrfNm( aStreamPath ); - nXOutFlags |= XOUTBMP_USE_NATIVE_IF_POSSIBLE; + nXOutFlags |= XOutFlags::UseNativeIfPossible; sal_uInt16 nErr = XOutBitmap::WriteGraphic( rGrf, aGrfNm, "PNG", nXOutFlags ); diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx index 8e8513d68e0f..1be62ff5b2d5 100644 --- a/sc/source/filter/inc/htmlexp.hxx +++ b/sc/source/filter/inc/htmlexp.hxx @@ -137,7 +137,7 @@ class ScHTMLExport : public ScExportBase void WriteGraphEntry( ScHTMLGraphEntry* ); void WriteImage( OUString& rLinkName, const Graphic&, const OString& rImgOptions, - sal_uLong nXOutFlags = 0 ); + XOutFlags nXOutFlags = XOutFlags::NONE ); // nXOutFlags for XOutBitmap::WriteGraphic // write to stream if and only if URL fields in edit cell |