Kaydet (Commit) 61fb299b authored tarafından Maxim Monastirsky's avatar Maxim Monastirsky Kaydeden (comit) Andras Timar

tdf#64027 sw: Make the text background color button work

Change-Id: I305163b691a8fa51ef5da0c940c59c3a3440a2dc
(cherry picked from commit 96d03636)
Reviewed-on: https://gerrit.libreoffice.org/19738Reviewed-by: 's avatarAdolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: 's avatarAdolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit f4b8ebbd)
üst a3a6ea6a
...@@ -237,6 +237,13 @@ interface _Annotation ...@@ -237,6 +237,13 @@ interface _Annotation
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; 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 SID_CHAR_DLG_EFFECT
[ [
ExecMethod = Exec ; ExecMethod = Exec ;
......
...@@ -656,6 +656,14 @@ interface TextDrawFont ...@@ -656,6 +656,14 @@ interface TextDrawFont
StateMethod = GetDrawTextCtrlState ; StateMethod = GetDrawTextCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; 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) SID_ATTR_CHAR_WORDLINEMODE // status(final|play)
[ [
ExecMethod = Execute ; ExecMethod = Execute ;
......
...@@ -319,6 +319,7 @@ void SwDLL::RegisterControls() ...@@ -319,6 +319,7 @@ void SwDLL::RegisterControls()
SvxColorToolBoxControl::RegisterControl(SID_ATTR_LINE_COLOR, pMod ); SvxColorToolBoxControl::RegisterControl(SID_ATTR_LINE_COLOR, pMod );
SvxLineEndToolBoxControl::RegisterControl(SID_ATTR_LINEEND_STYLE, pMod ); SvxLineEndToolBoxControl::RegisterControl(SID_ATTR_LINEEND_STYLE, pMod );
SvxColorToolBoxControl::RegisterControl(SID_ATTR_FILL_COLOR, pMod); SvxColorToolBoxControl::RegisterControl(SID_ATTR_FILL_COLOR, pMod);
SvxColorToolBoxControl::RegisterControl(SID_ATTR_CHAR_BACK_COLOR, pMod);
SvxFontNameToolBoxControl::RegisterControl(SID_ATTR_CHAR_FONT, pMod ); SvxFontNameToolBoxControl::RegisterControl(SID_ATTR_CHAR_FONT, pMod );
SvxColorToolBoxControl::RegisterControl(SID_ATTR_CHAR_COLOR, pMod ); SvxColorToolBoxControl::RegisterControl(SID_ATTR_CHAR_COLOR, pMod );
......
...@@ -260,6 +260,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) ...@@ -260,6 +260,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
break; break;
} }
case SID_ATTR_CHAR_COLOR: nEEWhich = EE_CHAR_COLOR; 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: case SID_ATTR_CHAR_UNDERLINE:
{ {
if( rReq.GetArgs() ) if( rReq.GetArgs() )
...@@ -696,6 +697,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet) ...@@ -696,6 +697,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet)
} }
break; break;
case SID_ATTR_CHAR_COLOR: nEEWhich = EE_CHAR_COLOR; 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_UNDERLINE: nEEWhich = EE_CHAR_UNDERLINE;break;
case SID_ATTR_CHAR_OVERLINE: nEEWhich = EE_CHAR_OVERLINE;break; case SID_ATTR_CHAR_OVERLINE: nEEWhich = EE_CHAR_OVERLINE;break;
case SID_ATTR_CHAR_CONTOUR: nEEWhich = EE_CHAR_OUTLINE; break; case SID_ATTR_CHAR_CONTOUR: nEEWhich = EE_CHAR_OUTLINE; break;
......
...@@ -169,6 +169,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) ...@@ -169,6 +169,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
break; break;
case SID_ATTR_CHAR_COLOR: nEEWhich = EE_CHAR_COLOR; 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: case SID_ATTR_CHAR_UNDERLINE:
{ {
...@@ -913,6 +914,7 @@ void SwDrawTextShell::GetDrawTextCtrlState(SfxItemSet& rSet) ...@@ -913,6 +914,7 @@ void SwDrawTextShell::GetDrawTextCtrlState(SfxItemSet& rSet)
} }
break; break;
case SID_ATTR_CHAR_COLOR: nEEWhich = EE_CHAR_COLOR; 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_UNDERLINE: nEEWhich = EE_CHAR_UNDERLINE;break;
case SID_ATTR_CHAR_OVERLINE: nEEWhich = EE_CHAR_OVERLINE;break; case SID_ATTR_CHAR_OVERLINE: nEEWhich = EE_CHAR_OVERLINE;break;
case SID_ATTR_CHAR_CONTOUR: nEEWhich = EE_CHAR_OUTLINE; break; case SID_ATTR_CHAR_CONTOUR: nEEWhich = EE_CHAR_OUTLINE; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment