From 7299a3a10abe34fe72431c94a56c1c10ceb5eb72 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 6 Jun 2008 14:06:00 +0200 Subject: [PATCH] Oops, make just one (1) sort-options tab. --- sfx2/source/dialog/tabdlg.cxx | 14 +++++++------- toolkit/source/awt/vclxtabpage.cxx | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index c8fb513..7072344 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -1387,13 +1387,13 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl ) { int const nId = pTabCtrl->GetCurPageId(); OSL_TRACE ("%s: page: %d", __FUNCTION__, nId ); - if ( layout::CreateTabPage func = layoutPageFuncs[nId] ) - - { - layout::TabPage::global_parent = pTabCtrl; - layout::TabPage* page = (func) (pTabCtrl, *pSet); - AddTabPage( nId, page ); - } + if ( !layoutPages[nId] ) + if ( layout::CreateTabPage func = layoutPageFuncs[nId] ) + { + layout::TabPage::global_parent = pTabCtrl; + layout::TabPage* page = (func) (pTabCtrl, *pSet); + AddTabPage( nId, page ); + } if ( layout::TabPage* page = layoutPages[nId] ) { TabPage *vclPage = page->GetTabPage(); diff --git a/toolkit/source/awt/vclxtabpage.cxx b/toolkit/source/awt/vclxtabpage.cxx index a4e2218..a829e7c 100644 --- a/toolkit/source/awt/vclxtabpage.cxx +++ b/toolkit/source/awt/vclxtabpage.cxx @@ -92,7 +92,7 @@ void SAL_CALL VCLXTabPage::allocateArea( awt::Rectangle const& area ) && reqSize.Height > curSize.Height ) reqSize.Height = curSize.Height; - reqSize = awt::Size( 456, 291 ); + //reqSize = awt::Size( 456, 291 ); OSL_TRACE ("%s: ismousetransparent, %d", __FUNCTION__, GetWindow()->IsMouseTransparent() ); Size window = GetWindow()->GetSizePixel(); Size parent = GetWindow()->GetParent()->GetSizePixel(); -- 1.5.6.3.317.g5d44c9.dirty