diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-02-20 16:38:47 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-02-20 16:39:22 +0000 |
| commit | dd9336e89f809712b86f596f796cef6125917fff (patch) | |
| tree | c5196179e48155c3362fc9b8283ec2ad96ea4ec5 | |
| parent | a1234aa42f6d1a5cbfde23682946a14fddb4652e (diff) | |
make top of format->background align with the other tabs
Change-Id: I11c6271ebee62938f89c03c82e02adc2e0d3a1f4
| -rw-r--r-- | cui/source/inc/backgrnd.hxx | 1 | ||||
| -rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 6 | ||||
| -rw-r--r-- | cui/uiconfig/ui/backgroundpage.ui | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index a413b72a31ab..b5967f7022a0 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -74,6 +74,7 @@ private: SvxBackgroundTabPage( Window* pParent, const SfxItemSet& rCoreSet ); ~SvxBackgroundTabPage(); + VclContainer* m_pAsGrid; FixedText* m_pSelectTxt; ListBox* m_pLbSelect; FixedText* m_pTblDesc; diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 5631316770d0..5d155555a3c9 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -351,6 +351,7 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(Window* pParent, const SfxItemSet& rC , pTableBck_Impl(NULL) , pParaBck_Impl(NULL) { + get(m_pAsGrid, "asgrid"); get(m_pSelectTxt, "asft"); get(m_pLbSelect, "selectlb"); get(m_pTblDesc, "forft"); @@ -1104,6 +1105,7 @@ void SvxBackgroundTabPage::ShowSelector() { if( bAllowShowSelector) { + m_pAsGrid->Show(); m_pSelectTxt->Show(); m_pLbSelect->Show(); m_pLbSelect->SetSelectHdl( HDL(SelectHdl_Impl) ); @@ -1622,6 +1624,7 @@ void SvxBackgroundTabPage::ShowTblControl() m_pTblLBox->SelectEntryPos(0); m_pTblDesc->Show(); m_pTblLBox->Show(); + m_pAsGrid->Show(); } //----------------------------------------------------------------------- @@ -1630,10 +1633,11 @@ void SvxBackgroundTabPage::ShowParaControl(sal_Bool bCharOnly) { m_pParaLBox->SetSelectHdl(HDL(ParaDestinationHdl_Impl)); m_pParaLBox->SelectEntryPos(0); - if(!bCharOnly) + if (!bCharOnly) { m_pTblDesc->Show(); m_pParaLBox->Show(); + m_pAsGrid->Show(); } m_pParaLBox->SetData(m_pParaLBox); // here it can be recognized that this mode is turned on } diff --git a/cui/uiconfig/ui/backgroundpage.ui b/cui/uiconfig/ui/backgroundpage.ui index 645853793ddc..eaff48f7024c 100644 --- a/cui/uiconfig/ui/backgroundpage.ui +++ b/cui/uiconfig/ui/backgroundpage.ui @@ -14,9 +14,9 @@ <property name="border_width">6</property> <property name="row_spacing">6</property> <child> - <object class="GtkGrid" id="grid2"> - <property name="visible">True</property> + <object class="GtkGrid" id="asgrid"> <property name="can_focus">False</property> + <property name="no_show_all">True</property> <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="asft"> |