diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-06-02 11:55:40 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-06-03 17:25:53 +0000 |
| commit | c0e07bc592b7fe270514ae392eacb6ebde3df879 (patch) | |
| tree | 37bfdb135cfa3e836682ba36c5cdfb206f534e81 /sd | |
| parent | 7695e2eb2e4f62cb09e06512ffc44796dc975fe4 (diff) | |
tdf#88276: toolbar|sidebar button for text background colour
Change-Id: I547a562384d30b95b744673feb284ccbcf50a614
Reviewed-on: https://gerrit.libreoffice.org/16030
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>
Reviewed-by: Philippe Jung <phil.jung@free.fr>
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/sdi/_drvwsh.sdi | 5 | ||||
| -rw-r--r-- | sd/sdi/drtxtob.sdi | 6 | ||||
| -rw-r--r-- | sd/source/ui/app/sddll.cxx | 1 | ||||
| -rw-r--r-- | sd/uiconfig/sdraw/toolbar/textobjectbar.xml | 1 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/toolbar/textobjectbar.xml | 1 |
5 files changed, 14 insertions, 0 deletions
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index 38953ca2b1fc..263a8ed20e21 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -2722,6 +2722,11 @@ interface DrawView ExecMethod = ExecChar ; StateMethod = GetAttrState ; ] + SID_ATTR_CHAR_BACK_COLOR + [ + ExecMethod = ExecChar ; + StateMethod = GetAttrState ; + ] SID_ATTR_CHAR_KERNING [ ExecMethod = ExecChar ; diff --git a/sd/sdi/drtxtob.sdi b/sd/sdi/drtxtob.sdi index cc466e1a7c9f..3e975d4946da 100644 --- a/sd/sdi/drtxtob.sdi +++ b/sd/sdi/drtxtob.sdi @@ -44,6 +44,12 @@ shell TextObjectBar StateMethod = GetAttrState; ] + SID_ATTR_CHAR_BACK_COLOR // ole : ?, status : ? + [ + ExecMethod = Execute; + StateMethod = GetAttrState; + ] + SID_ATTR_CHAR_WEIGHT // ole : ?, status : ? [ ExecMethod = Execute; diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index 7da803a3ab44..1a4c79712532 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -215,6 +215,7 @@ void SdDLL::RegisterControllers() SvxStyleToolBoxControl::RegisterControl(0, pMod); SvxFontNameToolBoxControl::RegisterControl(0, pMod); SvxColorToolBoxControl::RegisterControl( SID_ATTR_CHAR_COLOR, pMod ); + SvxColorToolBoxControl::RegisterControl( SID_ATTR_CHAR_BACK_COLOR, pMod ); SvxGrafFilterToolBoxControl::RegisterControl( SID_GRFFILTER, pMod ); SvxGrafModeToolBoxControl::RegisterControl( SID_ATTR_GRAF_MODE, pMod ); diff --git a/sd/uiconfig/sdraw/toolbar/textobjectbar.xml b/sd/uiconfig/sdraw/toolbar/textobjectbar.xml index bfac926f77c8..32c2e63cbfb2 100644 --- a/sd/uiconfig/sdraw/toolbar/textobjectbar.xml +++ b/sd/uiconfig/sdraw/toolbar/textobjectbar.xml @@ -30,6 +30,7 @@ <toolbar:toolbaritem xlink:href=".uno:Shadowed" toolbar:helpid="10010"/> <toolbar:toolbaritem xlink:href=".uno:OutlineFont" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:Color" toolbar:helpid="10017"/> + <toolbar:toolbaritem xlink:href=".uno:CharBackColor" toolbar:style="dropdown"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="10028"/> <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="10030"/> diff --git a/sd/uiconfig/simpress/toolbar/textobjectbar.xml b/sd/uiconfig/simpress/toolbar/textobjectbar.xml index c014ba2caf38..6a593823baa0 100644 --- a/sd/uiconfig/simpress/toolbar/textobjectbar.xml +++ b/sd/uiconfig/simpress/toolbar/textobjectbar.xml @@ -30,6 +30,7 @@ <toolbar:toolbaritem xlink:href=".uno:Shadowed" toolbar:helpid="10010"/> <toolbar:toolbaritem xlink:href=".uno:OutlineFont" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:Color" toolbar:helpid="10017"/> + <toolbar:toolbaritem xlink:href=".uno:CharBackColor" toolbar:style="dropdown"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:helpid="10028"/> <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:helpid="10030"/> |