diff options
| author | Jim Raykowski <raykowj@gmail.com> | 2018-06-05 23:02:20 -0800 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-06-25 01:11:54 +0200 |
| commit | 76d9d6c9bf0167d4203d7e2f6867254687915caa (patch) | |
| tree | ce3a3e4dd73823e59ecd6db38d4f10c483668306 /sc/source/ui | |
| parent | b34ed105d5eead1cb7657d0a8fc23a524cf28d31 (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')
| -rw-r--r-- | sc/source/ui/attrdlg/attrdlg.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/view/tabvwsha.cxx | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx index 3ad3c86f8747..16163f7473b0 100644 --- a/sc/source/ui/attrdlg/attrdlg.cxx +++ b/sc/source/ui/attrdlg/attrdlg.cxx @@ -57,8 +57,8 @@ ScAttrDlg::ScAttrDlg(vcl::Window* pParent, const SfxItemSet* pCellAttrs) RemoveTabPage( "asiantypography" ); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!"); AddTabPage( "borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), nullptr ); - OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!"); - AddTabPage( "background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), nullptr ); + OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), "GetTabPageCreatorFunc fail!"); + AddTabPage( "background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr ); AddTabPage( "cellprotection" , ScTabPageProtection::Create, nullptr ); } 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. |