diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-02-27 09:57:52 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-02-27 03:23:34 -0600 |
| commit | 97197e881d609404288eaa903fa7db2c3b0c70b6 (patch) | |
| tree | 772ae9103a2c381c4ebda9861efa0bc8cc5439c9 | |
| parent | b88cb7b4f23dcd02177e6e3578e3b3ba14454c1c (diff) | |
fdo#73159 Make border dialog work again
It seems converting to SfxSingleTabDialog makes it work.
Similar conversions were made on master branch.
Change-Id: I49985bed56f12460d289c7f0d4e1c1435aa4674e
Reviewed-on: https://gerrit.libreoffice.org/8377
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | sw/source/ui/frmdlg/uiborder.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/inc/uiborder.hxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx index 2f4b1efc2f10..89257863e9e2 100644 --- a/sw/source/ui/frmdlg/uiborder.cxx +++ b/sw/source/ui/frmdlg/uiborder.cxx @@ -34,7 +34,7 @@ SwBorderDlg::SwBorderDlg(Window* pParent, SfxItemSet& rSet, sal_uInt16 nType) : - SfxNoLayoutSingleTabDialog(pParent, rSet, 0) + SfxSingleTabDialog(pParent, rSet) { SetText(SW_RESSTR(STR_FRMUI_BORDER)); @@ -45,13 +45,13 @@ SwBorderDlg::SwBorderDlg(Window* pParent, SfxItemSet& rSet, sal_uInt16 nType) : ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ); if ( fnCreatePage ) { - SfxTabPage* pNewPage = (*fnCreatePage)( this, rSet ); + SfxTabPage* pNewPage = (*fnCreatePage)( get_content_area(), rSet ); SfxAllItemSet aSet(*(rSet.GetPool())); aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,nType)); if(SW_BORDER_MODE_TABLE == nType) aSet.Put (SfxUInt32Item(SID_FLAG_TYPE,SVX_HIDESHADOWCTL)); pNewPage->PageCreated(aSet); - SetTabPage(pNewPage); + setTabPage(pNewPage); } } diff --git a/sw/source/ui/inc/uiborder.hxx b/sw/source/ui/inc/uiborder.hxx index 20e5e872de4a..a8890b408606 100644 --- a/sw/source/ui/inc/uiborder.hxx +++ b/sw/source/ui/inc/uiborder.hxx @@ -24,7 +24,7 @@ class Window; class SfxItemSet; -class SwBorderDlg : public SfxNoLayoutSingleTabDialog +class SwBorderDlg : public SfxSingleTabDialog { public: |