summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-05-19 12:08:26 +0200
committerFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-05-19 12:08:26 +0200
commitafe714cb4a899f6e264a5f60cf421c2396684999 (patch)
tree275e534ad8a1c1682f7c4363d8197c516640daf1
parent95a1ee178b4548a3471f9f1211608fbcbed5620b (diff)
slidecopy: fixed key navigation within titled controls
-rw-r--r--sd/source/ui/toolpanel/TitledControl.cxx13
1 files changed, 5 insertions, 8 deletions
diff --git a/sd/source/ui/toolpanel/TitledControl.cxx b/sd/source/ui/toolpanel/TitledControl.cxx
index 110e4097f684..4843102feb48 100644
--- a/sd/source/ui/toolpanel/TitledControl.cxx
+++ b/sd/source/ui/toolpanel/TitledControl.cxx
@@ -54,16 +54,13 @@ TitledControl::TitledControl (
mpUserData(NULL),
mpClickHandler(new ClickHandler(rClickHandler))
{
- if (pControl.get() != NULL)
- {
- mpControlContainer->AddControl (::std::auto_ptr<TreeNode> (
- new TitleBar (this, rTitle, eType, pControl->IsExpandable())));
- pControl->SetParentNode (this);
- }
+ mpControlContainer->AddControl (::std::auto_ptr<TreeNode> (
+ new TitleBar (this, rTitle, eType, pControl->IsExpandable())));
+ pControl->SetParentNode (this);
mpControlContainer->AddControl (pControl);
- FocusManager::Instance().RegisterDownLink(this, GetControl()->GetWindow());
- FocusManager::Instance().RegisterUpLink(GetControl()->GetWindow(), this);
+ FocusManager::Instance().RegisterDownLink( GetTitleBar()->GetWindow(), GetControl()->GetWindow() );
+ FocusManager::Instance().RegisterUpLink( GetControl()->GetWindow(), GetTitleBar()->GetWindow() );
SetBackground (Wallpaper());