diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2015-10-27 14:20:03 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-11-03 18:10:30 +0100 |
| commit | 61fb299b76e2140b50e35150834357ba71b69159 (patch) | |
| tree | 921aee8d711b6de79f030ceec613230c7632f669 /sw | |
| parent | a3a6ea6a56430796117474b5f0171e9eebba0cd8 (diff) | |
tdf#64027 sw: Make the text background color button work
Change-Id: I305163b691a8fa51ef5da0c940c59c3a3440a2dc
(cherry picked from commit 96d03636a5f932151c7842ae34631258891fe807)
Reviewed-on: https://gerrit.libreoffice.org/19738
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit f4b8ebbd7838921cce837acb353f81df1a6d2996)
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/sdi/_annotsh.sdi | 7 | ||||
| -rw-r--r-- | sw/sdi/drwtxtsh.sdi | 8 | ||||
| -rw-r--r-- | sw/source/uibase/app/swmodule.cxx | 1 | ||||
| -rw-r--r-- | sw/source/uibase/shells/annotsh.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/shells/drwtxtex.cxx | 2 |
5 files changed, 20 insertions, 0 deletions
diff --git a/sw/sdi/_annotsh.sdi b/sw/sdi/_annotsh.sdi index 232388c69187..ed7b42735a45 100644 --- a/sw/sdi/_annotsh.sdi +++ b/sw/sdi/_annotsh.sdi @@ -237,6 +237,13 @@ interface _Annotation DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] + SID_ATTR_CHAR_BACK_COLOR // api: + [ + ExecMethod = Exec; + StateMethod = GetState ; + DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; + ] + SID_CHAR_DLG_EFFECT [ ExecMethod = Exec ; diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi index 4bdcea5e7135..d134e7d49fe4 100644 --- a/sw/sdi/drwtxtsh.sdi +++ b/sw/sdi/drwtxtsh.sdi @@ -656,6 +656,14 @@ interface TextDrawFont StateMethod = GetDrawTextCtrlState ; DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] + + SID_ATTR_CHAR_BACK_COLOR // api: + [ + ExecMethod = Execute ; + StateMethod = GetDrawTextCtrlState ; + DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; + ] + SID_ATTR_CHAR_WORDLINEMODE // status(final|play) [ ExecMethod = Execute ; diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index 1175968f15f1..9bf24ef5ce34 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -319,6 +319,7 @@ void SwDLL::RegisterControls() SvxColorToolBoxControl::RegisterControl(SID_ATTR_LINE_COLOR, pMod ); SvxLineEndToolBoxControl::RegisterControl(SID_ATTR_LINEEND_STYLE, pMod ); SvxColorToolBoxControl::RegisterControl(SID_ATTR_FILL_COLOR, pMod); + SvxColorToolBoxControl::RegisterControl(SID_ATTR_CHAR_BACK_COLOR, pMod); SvxFontNameToolBoxControl::RegisterControl(SID_ATTR_CHAR_FONT, pMod ); SvxColorToolBoxControl::RegisterControl(SID_ATTR_CHAR_COLOR, pMod ); diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index ba0a7f642c94..b2bb38d3d98a 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -260,6 +260,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) break; } case SID_ATTR_CHAR_COLOR: nEEWhich = EE_CHAR_COLOR; break; + case SID_ATTR_CHAR_BACK_COLOR: nEEWhich = EE_CHAR_BKGCOLOR; break; case SID_ATTR_CHAR_UNDERLINE: { if( rReq.GetArgs() ) @@ -696,6 +697,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet) } break; case SID_ATTR_CHAR_COLOR: nEEWhich = EE_CHAR_COLOR; break; + case SID_ATTR_CHAR_BACK_COLOR: nEEWhich = EE_CHAR_BKGCOLOR; break; case SID_ATTR_CHAR_UNDERLINE: nEEWhich = EE_CHAR_UNDERLINE;break; case SID_ATTR_CHAR_OVERLINE: nEEWhich = EE_CHAR_OVERLINE;break; case SID_ATTR_CHAR_CONTOUR: nEEWhich = EE_CHAR_OUTLINE; break; diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index 57a8b3cb7438..4a95d706996a 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -169,6 +169,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) break; case SID_ATTR_CHAR_COLOR: nEEWhich = EE_CHAR_COLOR; break; + case SID_ATTR_CHAR_BACK_COLOR: nEEWhich = EE_CHAR_BKGCOLOR; break; case SID_ATTR_CHAR_UNDERLINE: { @@ -913,6 +914,7 @@ void SwDrawTextShell::GetDrawTextCtrlState(SfxItemSet& rSet) } break; case SID_ATTR_CHAR_COLOR: nEEWhich = EE_CHAR_COLOR; break; + case SID_ATTR_CHAR_BACK_COLOR: nEEWhich = EE_CHAR_BKGCOLOR; break; case SID_ATTR_CHAR_UNDERLINE: nEEWhich = EE_CHAR_UNDERLINE;break; case SID_ATTR_CHAR_OVERLINE: nEEWhich = EE_CHAR_OVERLINE;break; case SID_ATTR_CHAR_CONTOUR: nEEWhich = EE_CHAR_OUTLINE; break; |