diff options
| author | Jim Raykowski <raykowj@gmail.com> | 2018-01-26 17:31:35 -0900 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-04-12 10:20:25 +0200 |
| commit | cac80ccacf917e7e80f75c3574cc2a300f1d775a (patch) | |
| tree | 124cfed96e80d12a0601d2d30b83e1cae6e20831 /cui/source/tabpages/backgrnd.cxx | |
| parent | 24a57e2b854a1b8b3b8533ac72a6614ee29e374a (diff) | |
tdf#105225 A character highlighting tab page based on the area tab page
Change-Id: Icd76af14129ff742c77d7f19582c3cbc0520525e
Reviewed-on: https://gerrit.libreoffice.org/48737
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'cui/source/tabpages/backgrnd.cxx')
| -rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 6ef959108360..448599bebb2f 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -53,6 +53,8 @@ #include <vcl/GraphicObject.hxx> #include <comphelper/lok.hxx> +#include <svx/unobrushitemhelper.hxx> + using namespace css; // table background @@ -1442,11 +1444,10 @@ void SvxBackgroundTabPage::PageCreated(const SfxAllItemSet& aSet) } } -#include <svx/unobrushitemhelper.hxx> - SvxBkgTabPage::SvxBkgTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ) : SvxAreaTabPage( pParent, rInAttrs ), - m_pTblLBox(nullptr) + m_pTblLBox(nullptr), + bHighlighting(false) { VclPtr<vcl::Window> pBtn; get(pBtn, "btngradient"); pBtn->Hide(); @@ -1516,6 +1517,8 @@ bool SvxBkgTabPage::FillItemSet( SfxItemSet* rCoreSet ) break; } } + else if ( bHighlighting ) + nSlot = SID_ATTR_BRUSH_CHAR; sal_uInt16 nWhich = GetWhich(nSlot); @@ -1568,6 +1571,8 @@ void SvxBkgTabPage::PageCreated(const SfxAllItemSet& aSet) m_pTblLBox->SelectEntryPos(0); m_pTblLBox->Show(); } + else if (nFlags & SvxBackgroundTabFlags::SHOW_HIGHLIGHTING) + bHighlighting = bool(nFlags & SvxBackgroundTabFlags::SHOW_HIGHLIGHTING); } SvxAreaTabPage::PageCreated( aSet ); } |