summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2009-02-03 14:02:27 +0000
committerKurt Zenker <kz@openoffice.org>2009-02-03 14:02:27 +0000
commit678d81d09eb11c6960e3c757a17b292de5c1a5d2 (patch)
treec4c4ecfafdc3b359dea0bbe862e858c6818761ad
parentba3b4a3024b047c906da954301c1cdd7ad7730d0 (diff)
CWS-TOOLING: integrate CWS fwk100_OOO310
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)
-rw-r--r--framework/source/classes/fwktabwindow.cxx5
-rw-r--r--framework/source/services/tabwindowservice.cxx1
2 files changed, 4 insertions, 2 deletions
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index d933492e14..1966d50d85 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 0736f0cf49..2eb46a0810 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;
}
}