summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
Diffstat (limited to 'cui')
-rw-r--r--cui/source/inc/backgrnd.hxx5
-rw-r--r--cui/source/tabpages/backgrnd.cxx11
2 files changed, 11 insertions, 5 deletions
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 88131fa61b80..e25b2043cbc5 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -26,6 +26,8 @@
#include <editeng/brushitem.hxx>
#include <memory>
+#include "cuitabarea.hxx"
+
class BackgroundPreviewImpl;
class SvxOpenGraphicDialog;
struct SvxBackgroundTable_Impl;
@@ -139,11 +141,10 @@ private:
DECL_LINK( TblDestinationHdl_Impl, ListBox&, void );
};
-#include "cuitabarea.hxx"
-
class SvxBkgTabPage : public SvxAreaTabPage
{
VclPtr<ListBox> m_pTblLBox;
+ bool bHighlighting : 1;
public:
using SvxAreaTabPage::DeactivatePage;
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 );
}