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 /sd | |
| 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 'sd')
| -rw-r--r-- | sd/source/core/drawdoc4.cxx | 2 | ||||
| -rw-r--r-- | sd/source/core/stlpool.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index e151b8bcbae7..c19c67013d02 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -217,7 +217,7 @@ void SdDrawDocument::CreateLayoutTemplates() rISet.Put(SvxCrossedOutItem(STRIKEOUT_NONE, EE_CHAR_STRIKEOUT )); rISet.Put(SvxCaseMapItem(SVX_CASEMAP_NOT_MAPPED, EE_CHAR_CASEMAP )); rISet.Put(SvxEmphasisMarkItem(FontEmphasisMark::NONE, EE_CHAR_EMPHASISMARK)); - rISet.Put(SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF)); + rISet.Put(SvxCharReliefItem(FontRelief::NONE, EE_CHAR_RELIEF)); rISet.Put(SvxColorItem(Color(COL_AUTO), EE_CHAR_COLOR )); // Paragraph attributes (Edit Engine) diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index e21fa7feafed..90ce2f7905b4 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -245,7 +245,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool rSet.Put( SvxShadowedItem(false, EE_CHAR_SHADOW ) ); rSet.Put( SvxContourItem(false, EE_CHAR_OUTLINE ) ); rSet.Put( SvxEmphasisMarkItem(FontEmphasisMark::NONE, EE_CHAR_EMPHASISMARK ) ); - rSet.Put( SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF) ); + rSet.Put( SvxCharReliefItem(FontRelief::NONE, EE_CHAR_RELIEF) ); rSet.Put( SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR) ); rSet.Put( SvxBackgroundColorItem( Color (COL_AUTO), EE_CHAR_BKGCOLOR ) ); rSet.Put( XLineStyleItem(css::drawing::LineStyle_NONE) ); @@ -363,7 +363,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool rTitleSet.Put(SvxShadowedItem(false, EE_CHAR_SHADOW )); rTitleSet.Put(SvxContourItem(false, EE_CHAR_OUTLINE )); rTitleSet.Put( SvxEmphasisMarkItem(FontEmphasisMark::NONE, EE_CHAR_EMPHASISMARK ) ); - rTitleSet.Put( SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF ) ); + rTitleSet.Put( SvxCharReliefItem(FontRelief::NONE, EE_CHAR_RELIEF ) ); rTitleSet.Put(SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR )); rTitleSet.Put(SvxBackgroundColorItem( Color(COL_AUTO), EE_CHAR_BKGCOLOR )); rTitleSet.Put(SvxAdjustItem(SVX_ADJUST_CENTER, EE_PARA_JUST )); @@ -409,7 +409,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool rSubtitleSet.Put(SvxShadowedItem(false, EE_CHAR_SHADOW )); rSubtitleSet.Put(SvxContourItem(false, EE_CHAR_OUTLINE )); rSubtitleSet.Put( SvxEmphasisMarkItem(FontEmphasisMark::NONE, EE_CHAR_EMPHASISMARK ) ); - rSubtitleSet.Put( SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF ) ); + rSubtitleSet.Put( SvxCharReliefItem(FontRelief::NONE, EE_CHAR_RELIEF ) ); rSubtitleSet.Put(SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR )); rSubtitleSet.Put(SvxBackgroundColorItem( Color(COL_AUTO), EE_CHAR_BKGCOLOR )); rSubtitleSet.Put(SvxAdjustItem(SVX_ADJUST_CENTER, EE_PARA_JUST )); @@ -458,7 +458,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool rNotesSet.Put( SvxShadowedItem(false, EE_CHAR_SHADOW ) ); rNotesSet.Put( SvxContourItem(false, EE_CHAR_OUTLINE ) ); rNotesSet.Put( SvxEmphasisMarkItem(FontEmphasisMark::NONE, EE_CHAR_EMPHASISMARK ) ); - rNotesSet.Put( SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF) ); + rNotesSet.Put( SvxCharReliefItem(FontRelief::NONE, EE_CHAR_RELIEF) ); rNotesSet.Put( SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR ) ); rNotesSet.Put( SvxBackgroundColorItem( Color(COL_AUTO), EE_CHAR_BKGCOLOR ) ); rNotesSet.Put( SvxLRSpaceItem( 0, 0, 600, -600, EE_PARA_LRSPACE ) ); |