diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2013-05-02 13:50:45 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-20 11:33:27 +0100 |
| commit | 256be018056fba834aff099baef452b59af586fc (patch) | |
| tree | ebfc5154991e44f5717abfe5c069cef469825736 /sc/source/ui/view | |
| parent | 862395f6a1b1df8762c315f7ae56e0623810ce05 (diff) | |
Resolves: #i122105# text property panel, underline style control
correct application of chosen underline style in Calc cells and Drawing objects
in Writer
(cherry picked from commit fd23db16149eb517de9b2b403ff28ed0d31c83d6)
Change-Id: Id77299c173eef99ea2eea0c0896e9bfd0bd9d1eb
Diffstat (limited to 'sc/source/ui/view')
| -rw-r--r-- | sc/source/ui/view/editsh.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index fd3418811b5c..66538712910f 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -920,7 +920,7 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) lcl_InvalidateUnder( rBindings ); break; - case SID_ATTR_CHAR_UNDERLINE: // Toggles + case SID_ATTR_CHAR_UNDERLINE: case SID_ULINE_VAL_SINGLE: case SID_ULINE_VAL_DOUBLE: case SID_ULINE_VAL_DOTTED: @@ -931,7 +931,15 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) switch (nSlot) { case SID_ATTR_CHAR_UNDERLINE: - eNew = ( eOld != UNDERLINE_NONE ) ? UNDERLINE_NONE : UNDERLINE_SINGLE; + if ( pArgs ) + { + const SvxTextLineItem& rTextLineItem = static_cast< const SvxTextLineItem& >( pArgs->Get( pArgs->GetPool()->GetWhich(nSlot) ) ); + eNew = rTextLineItem.GetLineStyle(); + } + else + { + eNew = ( eOld != UNDERLINE_NONE ) ? UNDERLINE_NONE : UNDERLINE_SINGLE; + } break; case SID_ULINE_VAL_SINGLE: eNew = ( eOld == UNDERLINE_SINGLE ) ? UNDERLINE_NONE : UNDERLINE_SINGLE; |