commit 7eedbd6380d30de82427c159b05b9545bb57336d
author Jim Raykowski <raykowj@gmail.com> Fri Jan 18 00:44:55 2019 -0900
committer Mike Kaganski <mike.kaganski@collabora.com> Fri Jan 18 22:50:36 2019 +0100
tree f995ee20369e6d805d6e90f61102c5e065088322
parent 58aa6a55e5bc795a94ac732cf16a4a270db7fe21

tdf#105225 New background tab page for Search for formatting dialog

Change-Id: I3642ea9e474c06943ea8bfb88e4209749db1fd83
Reviewed-on: https://gerrit.libreoffice.org/66578
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

cui/source/dialogs/srchxtra.cxx

diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index a6369125..ecd2b16 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -44,7 +44,7 @@
    AddTabPage("labelTP_PARA_ALIGN", SvxParaAlignTabPage::Create, nullptr);
    AddTabPage("labelTP_PARA_EXT", SvxExtParagraphTabPage::Create, nullptr);
    AddTabPage("labelTP_PARA_ASIAN", SvxAsianTabPage::Create, nullptr );
    AddTabPage("background", SvxBackgroundTabPage::Create, nullptr);
    AddTabPage("background", SvxBkgTabPage::Create, nullptr);

    // remove asian tabpages if necessary
    SvtCJKOptions aCJKOptions;

svx/source/dialog/srchdlg.cxx

diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index d005a1f..4ab0bdf 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -73,6 +73,8 @@
#include <cstdlib>
#include <memory>

#include <svx/xdef.hxx>

using namespace com::sun::star::i18n;
using namespace com::sun::star::uno;
using namespace com::sun::star::accessibility;
@@ -2007,6 +2009,8 @@
    sal_uInt16 nBrushWhich = pSh->GetPool().GetWhich(SID_ATTR_BRUSH);
    aSet.MergeRange(nBrushWhich, nBrushWhich);

    aSet.MergeRange(XATTR_FILL_FIRST, XATTR_FILL_LAST);

    OUString aTxt;

    aSet.InvalidateAllItems();