summaryrefslogtreecommitdiff
path: root/sc/source/ui/view
diff options
context:
space:
mode:
authorJim Raykowski <raykowj@gmail.com>2018-06-05 23:02:20 -0800
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2018-06-25 01:11:54 +0200
commit76d9d6c9bf0167d4203d7e2f6867254687915caa (patch)
treece3a3e4dd73823e59ecd6db38d4f10c483668306 /sc/source/ui/view
parentb34ed105d5eead1cb7657d0a8fc23a524cf28d31 (diff)
tdf#105225 new background tab page for Calc Format Cells dialog
Change-Id: Iee26630fa47fedcfc134969cc4d3e13d939fbb77 Reviewed-on: https://gerrit.libreoffice.org/55357 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sc/source/ui/view')
-rw-r--r--sc/source/ui/view/tabvwsha.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 42a1245ef8c4..90c30f148695 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -64,6 +64,8 @@
#include <memory>
+#include <svx/unobrushitemhelper.hxx>
+
using namespace com::sun::star;
bool ScTabViewShell::GetFunction( OUString& rFuncStr, FormulaError nErrCode )
@@ -481,6 +483,12 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OString &rName
std::shared_ptr<SfxItemSet> pOldSet(new SfxItemSet(pOldAttrs->GetItemSet()));
std::shared_ptr<SvxNumberInfoItem> pNumberInfoItem;
+ pOldSet->MergeRange(XATTR_FILLCOLOR, XATTR_FILLCOLOR);
+
+ sal_uInt16 nWhich = pOldSet->GetPool()->GetWhich( SID_ATTR_BRUSH );
+ SvxBrushItem aBrushItem(static_cast<const SvxBrushItem&>(pOldSet->Get(nWhich)));
+ setSvxBrushItemAsFillAttributesToTargetSet(aBrushItem, *pOldSet);
+
pOldSet->MergeRange(SID_ATTR_BORDER_STYLES, SID_ATTR_BORDER_DEFAULT_WIDTH);
// We only allow these border line types.