diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-29 20:23:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-30 06:41:53 +0000 |
| commit | 990082f37c31380d9fedd62c5dac1b5bff4c9636 (patch) | |
| tree | 8f567bbc9814fd8a5b610529d82610422da59910 /drawinglayer | |
| parent | 446d0887ff5421822e0296e20cbb36f08f1e6445 (diff) | |
Convert FontRelief to scoped enum
Change-Id: I545c83d742db27f1a004b66e5eb1ef768f62e011
Reviewed-on: https://gerrit.libreoffice.org/25626
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'drawinglayer')
| -rw-r--r-- | drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 6 | ||||
| -rw-r--r-- | drawinglayer/source/processor2d/vclprocessor2d.cxx | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index 70647cf11733..ff6d69426158 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -1293,7 +1293,7 @@ namespace || LINESTYLE_NONE != rFont.GetUnderline() || STRIKEOUT_NONE != rFont.GetStrikeout() || FontEmphasisMark::NONE != (rFont.GetEmphasisMark() & FontEmphasisMark::Style) - || RELIEF_NONE != rFont.GetRelief() + || FontRelief::NONE != rFont.GetRelief() || rFont.IsShadow() || bWordLineMode); @@ -1327,8 +1327,8 @@ namespace switch(rFont.GetRelief()) { - case RELIEF_EMBOSSED : eTextRelief = drawinglayer::primitive2d::TEXT_RELIEF_EMBOSSED; break; - case RELIEF_ENGRAVED : eTextRelief = drawinglayer::primitive2d::TEXT_RELIEF_ENGRAVED; break; + case FontRelief::Embossed : eTextRelief = drawinglayer::primitive2d::TEXT_RELIEF_EMBOSSED; break; + case FontRelief::Engraved : eTextRelief = drawinglayer::primitive2d::TEXT_RELIEF_ENGRAVED; break; default : break; // RELIEF_NONE, FontRelief_FORCE_EQUAL_SIZE } diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index 0d5c1186878c..62f7dce757c3 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -204,18 +204,18 @@ namespace drawinglayer } // set Relief attribute - FontRelief eFontRelief = RELIEF_NONE; + FontRelief eFontRelief = FontRelief::NONE; switch( pTCPP->getTextRelief() ) { default: SAL_WARN( "drawinglayer", "Unknown Relief style " << pTCPP->getTextRelief() ); SAL_FALLTHROUGH; - case primitive2d::TEXT_RELIEF_NONE: eFontRelief = RELIEF_NONE; break; - case primitive2d::TEXT_RELIEF_EMBOSSED: eFontRelief = RELIEF_EMBOSSED; break; - case primitive2d::TEXT_RELIEF_ENGRAVED: eFontRelief = RELIEF_ENGRAVED; break; + case primitive2d::TEXT_RELIEF_NONE: eFontRelief = FontRelief::NONE; break; + case primitive2d::TEXT_RELIEF_EMBOSSED: eFontRelief = FontRelief::Embossed; break; + case primitive2d::TEXT_RELIEF_ENGRAVED: eFontRelief = FontRelief::Engraved; break; } - if( eFontRelief != RELIEF_NONE ) + if( eFontRelief != FontRelief::NONE ) aFont.SetRelief( eFontRelief ); // set Shadow attribute |