[Libreoffice-commits] core.git: cui/source svx/source

[Libreoffice Gerrit user]

 cui/source/dialogs/srchxtra.cxx |    2 +-
 svx/source/dialog/srchdlg.cxx   |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 7eedbd6380d30de82427c159b05b9545bb57336d
Author:     Jim Raykowski <raykowj at gmail.com>
AuthorDate: Fri Jan 18 00:44:55 2019 -0900
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Fri Jan 18 22:50:36 2019 +0100

    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 at collabora.com>

diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index a63691256f19..ecd2b1697d35 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -44,7 +44,7 @@ SvxSearchFormatDialog::SvxSearchFormatDialog(weld::Window* pParent, const SfxIte
     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;
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index d005a1f5869a..4ab0bdf3147e 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 @@ IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl, Button*, void)
     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();