diff options
| author | Jim Raykowski <raykowj@gmail.com> | 2018-12-07 17:41:54 -0900 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-12-12 16:58:05 +0100 |
| commit | 03facb4bb75e4283c91de6f081ee96137ca4346c (patch) | |
| tree | 347a316156bc1e97fca388a31b966e97257175e8 /sw | |
| parent | 7612651a1c51c1c86788c637ef4ab2db7751cc10 (diff) | |
tdf#105225 New UNO and Writer Web background tab pages
Change-Id: Id3e7d1c24d086624f053085e3134792b95188c23
Reviewed-on: https://gerrit.libreoffice.org/64991
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/frmdlg/pattern.cxx | 9 | ||||
| -rw-r--r-- | sw/source/uibase/app/appopt.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/shells/basesh.cxx | 3 |
3 files changed, 12 insertions, 4 deletions
diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx index 2fccc5172b32..9cc2e271d7a3 100644 --- a/sw/source/ui/frmdlg/pattern.cxx +++ b/sw/source/ui/frmdlg/pattern.cxx @@ -29,9 +29,14 @@ SwBackgroundDlg::SwBackgroundDlg(weld::Window* pParent, const SfxItemSet& rSet) { m_xDialog->set_title(SwResId(STR_FRMUI_PATTERN)); SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ); + ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ); if ( fnCreatePage ) - SetTabPage((*fnCreatePage)(get_content_area(), this, &rSet)); + { + std::unique_ptr<SfxTabPage> xRet = (*fnCreatePage)(get_content_area(), this, &rSet); + xRet->PageCreated(rSet); + xRet->ActivatePage(rSet); + SetTabPage(std::move(xRet)); + } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx index f071b85997fe..90c04f18ae59 100644 --- a/sw/source/uibase/app/appopt.cxx +++ b/sw/source/uibase/app/appopt.cxx @@ -101,6 +101,7 @@ std::unique_ptr<SfxItemSet> SwModule::CreateItemSet( sal_uInt16 nId ) GetPool(), svl::Items< RES_BACKGROUND, RES_BACKGROUND, + XATTR_FILL_FIRST, XATTR_FILL_LAST, SID_PRINTPREVIEW, SID_PRINTPREVIEW, SID_ATTR_GRID_OPTIONS, SID_ATTR_GRID_OPTIONS, SID_HTML_MODE, SID_HTML_MODE, @@ -490,8 +491,9 @@ std::unique_ptr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, weld::Conta case RID_SW_TP_BACKGROUND: { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ); + ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ); xRet = (*fnCreatePage)( pPage, pController, &rSet ); + xRet->PageCreated( rSet ); break; } case RID_SW_TP_OPTCAPTION_PAGE: diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index e346600c0549..ff9598c84b37 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -2591,7 +2591,8 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq) case FN_FORMAT_BACKGROUND_DLG: { SfxItemSet aSet( rSh.GetAttrPool(), - svl::Items<RES_BACKGROUND, RES_BACKGROUND>{} ); + svl::Items<RES_BACKGROUND, RES_BACKGROUND, + XATTR_FILL_FIRST, XATTR_FILL_LAST>{} ); ScopedVclPtr<SfxAbstractDialog> pDlg; SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); |