diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 10:31:56 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 10:31:56 +0000 |
| commit | 5aca70b2c9c4e9d4cebf95275179fae961d9bee3 (patch) | |
| tree | 22b8cd7e96a0524474de26600d5c99c3d0a98764 /sd/source/ui/toolpanel/SubToolPanel.cxx | |
| parent | d06e8986159606ff56e72cb2fc2455b8a2a244bc (diff) | |
INTEGRATION: CWS impress57 (1.4.68); FILE MERGED
2005/07/20 08:31:09 af 1.4.68.2: RESYNC: (1.4-1.5); FILE MERGED
2005/06/10 12:48:39 af 1.4.68.1: #i41224# Setting the help id at the TitledControl instead of its TitleBar child.
Diffstat (limited to 'sd/source/ui/toolpanel/SubToolPanel.cxx')
| -rw-r--r-- | sd/source/ui/toolpanel/SubToolPanel.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sd/source/ui/toolpanel/SubToolPanel.cxx b/sd/source/ui/toolpanel/SubToolPanel.cxx index 0f06e0dae6e0..e9ccd468964d 100644 --- a/sd/source/ui/toolpanel/SubToolPanel.cxx +++ b/sd/source/ui/toolpanel/SubToolPanel.cxx @@ -4,9 +4,9 @@ * * $RCSfile: SubToolPanel.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2005-09-09 06:32:35 $ + * last change: $Author: hr $ $Date: 2005-09-23 11:31:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -119,7 +119,7 @@ void SubToolPanel::AddControl ( rTitle, TitleBar::TBT_SUB_CONTROL_HEADLINE); pTitledControl->GetWindow()->SetParent(this); - pTitledControl->GetTitleBar()->SetHelpId(nHelpId); + pTitledControl->GetWindow()->SetHelpId(nHelpId); ::std::auto_ptr<TreeNode> pChild (pTitledControl); // Add a down link only for the first control so that when @@ -129,7 +129,6 @@ void SubToolPanel::AddControl ( FocusManager::Instance().RegisterUpLink(pTitledControl->GetWindow(), GetParent()); mpControlContainer->AddControl (pChild); - } @@ -147,7 +146,6 @@ void SubToolPanel::AddControl (::std::auto_ptr<TreeNode> pControl) FocusManager::Instance().RegisterUpLink(pControl->GetWindow(), GetParent()); mpControlContainer->AddControl (pControl); - } |