diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-02-12 14:36:30 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-02-12 14:36:30 +0000 |
| commit | b64ae6cafc334fee914f2a68257cfac421e8bcdb (patch) | |
| tree | 54950db79160e45af130dd92836791fb0ae04694 /framework | |
| parent | 3036f2ff807c36acda761b58d0bdaf5895dd1d2a (diff) | |
CWS-TOOLING: integrate CWS fwk100
2009-01-20 15:34:21 +0100 as r266589 : #159095# dont activate tab pages if they will be created automaticaly; activate already created tab pages if its requested
2009-01-20 13:52:07 +0100 fs r266575 : #i87330# JavaCompatibleTextNotifications is not supported anymore
2009-01-20 13:51:36 +0100 fs r266574 : #i87330# in a multi line edit control's setText, use the proper notification method (which is disabled elsewhere when setText is called as part of setting the model's Text property)
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/classes/fwktabwindow.cxx | 5 | ||||
| -rw-r--r-- | framework/source/services/tabwindowservice.cxx | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx index 642b68e88714..e9aa87a3e058 100644 --- a/framework/source/classes/fwktabwindow.cxx +++ b/framework/source/classes/fwktabwindow.cxx @@ -288,7 +288,10 @@ IMPL_LINK( FwkTabWindow, ActivatePageHdl, TabControl *, EMPTYARG ) pTabPage->ActivatePage(); m_aTabCtrl.SetTabPage( nId, pTabPage ); } - } + }
+ else
+ pTabPage->ActivatePage(); + m_aTabCtrl.BroadcastEvent( VCLEVENT_TABPAGE_ACTIVATE ); return 1; } diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx index ae6eef12f80f..ce1b2cad520e 100644 --- a/framework/source/services/tabwindowservice.cxx +++ b/framework/source/services/tabwindowservice.cxx @@ -202,7 +202,6 @@ void SAL_CALL TabWindowService::setTabProps( ::sal_Int32 if (pTabWin) { pTabWin->AddTabPage(rInfo.m_nIndex, rInfo.m_lProperties); - pTabWin->ActivatePage (rInfo.m_nIndex); rInfo.m_bCreated = sal_True; } } |