diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-09-18 16:14:49 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-09-28 08:48:48 +0100 |
commit | 4d173556cfa07620c1ea7bd1ee044df02267879b (patch) | |
tree | 9d838af587c725fc00e1c1022577e6cb88f00ded /sfx2 | |
parent | d23a61c697a81174a74fcbd78b43bd4482562af3 (diff) |
convert hard-coded layout of two-lines tabpage to .ui
Change-Id: I87da59af50420993303111dae0ec4456ae15cc20
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/inc/sfx2/basedlgs.hxx | 2 | ||||
-rw-r--r-- | sfx2/inc/sfx2/tabdlg.hxx | 1 | ||||
-rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 11 |
3 files changed, 13 insertions, 1 deletions
diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx index a3cd1eff3a19..2251eaf01226 100644 --- a/sfx2/inc/sfx2/basedlgs.hxx +++ b/sfx2/inc/sfx2/basedlgs.hxx @@ -71,7 +71,7 @@ private: protected: SfxModalDialog(Window *pParent, const ResId& ); - SfxModalDialog(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription ); + SfxModalDialog(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription); SfxModalDialog(Window* pParent, sal_uInt32 nUniqueId, WinBits nWinStyle = WB_STDMODAL ); String& GetExtraData() { return aExtraData; } diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx index ab30a3e1fd58..fe244b853aff 100644 --- a/sfx2/inc/sfx2/tabdlg.hxx +++ b/sfx2/inc/sfx2/tabdlg.hxx @@ -222,6 +222,7 @@ private: protected: SfxTabPage( Window *pParent, const ResId &, const SfxItemSet &rAttrSet ); + SfxTabPage(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, const SfxItemSet &rAttrSet); SfxTabPage( Window *pParent, WinBits nStyle, const SfxItemSet &rAttrSet ); sal_uInt16 GetSlot( sal_uInt16 nWhich ) const diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 307e07ca53ba..5d883c7c2915 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -229,6 +229,17 @@ SfxTabPage::SfxTabPage( Window *pParent, { } + + +SfxTabPage::SfxTabPage(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, const SfxItemSet &rAttrSet) + : TabPage(pParent, rID, rUIXMLDescription) + , pSet ( &rAttrSet ) + , bHasExchangeSupport ( sal_False ) + , pTabDlg ( NULL ) + , pImpl ( new TabPageImpl ) +{ +} + // ----------------------------------------------------------------------- SfxTabPage:: SfxTabPage( Window *pParent, WinBits nStyle, const SfxItemSet &rAttrSet ) : TabPage(pParent, nStyle), |