diff options
| author | Jim Raykowski <raykowj@gmail.com> | 2018-11-25 17:23:42 -0900 |
|---|---|---|
| committer | Jim Raykowski <raykowj@gmail.com> | 2019-02-02 05:05:06 +0100 |
| commit | 5439b1e4d504c9afa71a707743d219222790d6ac (patch) | |
| tree | 0e3ae691a673bc709d2554082b5d8af8d305d96a | |
| parent | 6850fcef74f7d3d82dc17143dd1befdf250977d7 (diff) | |
tdf#105225 New background tab page for header and footer Border
and Background dialog
Change-Id: I21979884b89a496ae36d5f1e48763680ae5da817
Reviewed-on: https://gerrit.libreoffice.org/64016
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>
| -rw-r--r-- | cui/source/tabpages/bbdlg.cxx | 10 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/HeaderFooterWin.cxx | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx index a17122b0f66b..c4f77b1e9aa5 100644 --- a/cui/source/tabpages/bbdlg.cxx +++ b/cui/source/tabpages/bbdlg.cxx @@ -46,7 +46,7 @@ SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(weld::Window *pParent, } else { - AddTabPage("background", SvxBackgroundTabPage::Create, nullptr ); + AddTabPage("background", SvxBkgTabPage::Create, nullptr ); } } @@ -54,11 +54,11 @@ void SvxBorderBackgroundDlg::PageCreated(const OString& rPageId, SfxTabPage& rTa { if (rPageId == "background") { + SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); // allow switching between Color/graphic - if(mbEnableBackgroundSelector) - { - static_cast< SvxBackgroundTabPage& >(rTabPage).ShowSelector(); - } + if (mbEnableBackgroundSelector) + aSet.Put(SfxUInt32Item(SID_FLAG_TYPE, static_cast<sal_uInt32>(SvxBackgroundTabFlags::SHOW_SELECTOR))); + rTabPage.PageCreated(aSet); } // inits for Area and Transparency TabPages // The selection attribute lists (XPropertyList derivates, e.g. XColorList for diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx index dd658ad3920c..2d1fca27f4f3 100644 --- a/sw/source/uibase/docvw/HeaderFooterWin.cxx +++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx @@ -38,6 +38,7 @@ #include <drawinglayer/primitive2d/textlayoutdevice.hxx> #include <drawinglayer/primitive2d/textprimitive2d.hxx> #include <editeng/boxitem.hxx> +#include <editeng/brushitem.hxx> #include <svx/hdft.hxx> #include <sfx2/dispatch.hxx> #include <drawinglayer/processor2d/processorfromoutputdevice.hxx> @@ -428,10 +429,13 @@ void SwHeaderFooterWin::ExecuteCommand(const OString& rIdent) *pPool, svl::Items< RES_BACKGROUND, RES_SHADOW, + XATTR_FILL_FIRST, XATTR_FILL_LAST, SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER>{}); aSet.Put( pHFFormat->GetAttrSet() ); + aSet.Put( pHFFormat->makeBackgroundBrushItem() ); + // Create a box info item... needed by the dialog SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER ); const SfxPoolItem *pBoxInfo; |