diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-05 17:49:45 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-05 17:49:45 +0000 |
| commit | 35602b5f0bcbe13fe6896c62360c5bb68309d1df (patch) | |
| tree | ac8bc1c7c66f3ba84d1c59c5d6ea3ca914e46a87 /sc/source/ui/view/formatsh.cxx | |
| parent | 2c51de47a92dea4c6b65ad1852b736e4ef268c98 (diff) | |
CWS-TOOLING: integrate CWS overline3
2008-12-11 15:24:46 +0100 fredrikh r265314 : i97099
2008-12-11 15:20:37 +0100 fredrikh r265313 : i97099
2008-12-11 15:18:00 +0100 fredrikh r265312 : i97099
2008-12-11 15:17:00 +0100 fredrikh r265311 : i97099
2008-12-11 15:13:20 +0100 fredrikh r265309 : i97144
2008-12-11 15:06:24 +0100 fredrikh r265306 : i97099
2008-11-24 10:41:42 +0100 fme r264213 : #i5991# Overline support
2008-11-24 10:39:53 +0100 fme r264212 : #i5991# Overline support
2008-11-24 10:02:13 +0100 fme r264209 : #5991# Overline support
2008-11-24 10:01:26 +0100 fme r264208 : #5991# Overline support
2008-11-24 09:59:11 +0100 fme r264207 : #5991# Overline support
2008-11-24 09:57:11 +0100 fme r264206 : #5991# Overline support
2008-11-14 10:36:44 +0100 fme r263667 : CWS-TOOLING: rebase CWS overline3 to trunk@263288 (milestone: DEV300:m35)
2008-11-13 16:12:13 +0100 fme r263649 : #i5991# migrate CWS overline3 to SVN.
Diffstat (limited to 'sc/source/ui/view/formatsh.cxx')
| -rw-r--r-- | sc/source/ui/view/formatsh.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 9af0be53a4c4..2215cbd4d1af 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: formatsh.cxx,v $ - * $Revision: 1.41.24.1 $ + * $Revision: 1.41.142.1 $ * * This file is part of OpenOffice.org. * @@ -1224,13 +1224,13 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) } else { - SvxUnderlineItem aUnderline( (const SvxUnderlineItem&) + SvxUnderlineItem aUnderline( (const SvxUnderlineItem&) pAttrs->GetItem( ATTR_FONT_UNDERLINE ) ); - eUnderline = (UNDERLINE_NONE != aUnderline.GetUnderline()) + eUnderline = (UNDERLINE_NONE != aUnderline.GetLineStyle()) ? UNDERLINE_NONE : UNDERLINE_SINGLE; - aUnderline.SetUnderline( eUnderline ); + aUnderline.SetLineStyle( eUnderline ); pTabViewShell->ApplyAttr( aUnderline ); pNewSet->Put( aUnderline,aUnderline.Which() ); } @@ -1245,7 +1245,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) case SID_ULINE_VAL_DOTTED: { FontUnderline eOld = ((const SvxUnderlineItem&) - pAttrs->GetItem(ATTR_FONT_UNDERLINE)).GetUnderline(); + pAttrs->GetItem(ATTR_FONT_UNDERLINE)).GetLineStyle(); FontUnderline eNew = eOld; switch (nSlot) { @@ -1447,6 +1447,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq ) switch ( nSlot ) { + case SID_ATTR_CHAR_OVERLINE: case SID_ATTR_CHAR_STRIKEOUT: case SID_ATTR_ALIGN_LINEBREAK: case SID_ATTR_CHAR_COLOR: @@ -1751,7 +1752,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) else { FontUnderline eUnderline = ((const SvxUnderlineItem&) - rAttrSet.Get(ATTR_FONT_UNDERLINE)).GetUnderline(); + rAttrSet.Get(ATTR_FONT_UNDERLINE)).GetLineStyle(); USHORT nId = SID_ULINE_VAL_NONE; switch (eUnderline) { |