summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-03-07 21:18:52 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-03-08 13:42:32 +0000
commit6df8417b98a74f58638b5fce7459c64f18ddedb4 (patch)
tree61dad6b61b3b77e04ba0513abba809c81b0ebcac /sfx2
parent3e3dc223e0337f974123ba687cddb7e2e6df2b28 (diff)
set action and content area via their internal-child ids
rather than based on their names, which changes if there are more than one dialog in a .ui set them explicitly in the manual-build-dialog case of the SfxTabDialogs Change-Id: I293c77df05d9e11e3f1cf3b358a9dd27fe668b0f
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/dialog/tabdlg.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 4ec5a76e035b..adb3e68c29ab 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -584,6 +584,7 @@ void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const String* pUserButtonText,
{
m_pBox = new VclVBox(this, false, 7);
m_pBox->set_expand(true);
+ set_content_area(m_pBox);
}
m_pTabCtrl = m_pUIBuilder ? m_pUIBuilder->get<TabControl>("tabcontrol") : NULL;
@@ -597,7 +598,10 @@ void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const String* pUserButtonText,
m_pActionArea = get_action_area();
m_bOwnsActionArea = m_pActionArea == NULL;
if (m_bOwnsActionArea)
+ {
m_pActionArea = new VclHButtonBox(m_pBox);
+ set_action_area(m_pActionArea);
+ }
m_pOKBtn = m_pUIBuilder ? m_pUIBuilder->get<OKButton>("ok") : NULL;
m_bOwnsOKBtn = m_pOKBtn == NULL;