From 80d0be076d0415ace6b899b0d1437f740dabb01e Mon Sep 17 00:00:00 2001
From: "Philipp Lohmann [pl]" <Philipp.Lohmann@Sun.COM>
Date: Fri, 4 Jun 2010 13:46:22 +0200
Subject: changehid: #i111874# remove SmartId, make HID of type rtl::OString,
 fill in dummies for all explicit help ids

---
 sd/source/ui/toolpanel/ScrollPanel.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sd/source/ui/toolpanel/ScrollPanel.cxx')

diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx
index cff065777235..a257c0e9597f 100644
--- a/sd/source/ui/toolpanel/ScrollPanel.cxx
+++ b/sd/source/ui/toolpanel/ScrollPanel.cxx
@@ -132,7 +132,8 @@ TitledControl* ScrollPanel::AddControl (
         rTitle,
         TitledControlStandardClickHandler(GetControlContainer(), ControlContainer::ES_TOGGLE),
         TitleBar::TBT_SUB_CONTROL_HEADLINE);
-    pTitledControl->GetTitleBar()->SetHelpId(nHelpId);
+    // FIXME: HELPID
+    pTitledControl->GetTitleBar()->SetHelpId(""/*nHelpId*/);
 
     AddControl(::std::auto_ptr<TreeNode>(pTitledControl));
 
-- 
cgit 


From 6a85eaf9ed3188b991c11d2eb2660939a990d04f Mon Sep 17 00:00:00 2001
From: "Philipp Lohmann [pl]" <Philipp.Lohmann@Sun.COM>
Date: Sat, 5 Jun 2010 13:58:32 +0200
Subject: fix warnings

---
 sd/source/ui/toolpanel/ScrollPanel.cxx | 1 +
 1 file changed, 1 insertion(+)

(limited to 'sd/source/ui/toolpanel/ScrollPanel.cxx')

diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx
index a257c0e9597f..72b40e57e611 100644
--- a/sd/source/ui/toolpanel/ScrollPanel.cxx
+++ b/sd/source/ui/toolpanel/ScrollPanel.cxx
@@ -134,6 +134,7 @@ TitledControl* ScrollPanel::AddControl (
         TitleBar::TBT_SUB_CONTROL_HEADLINE);
     // FIXME: HELPID
     pTitledControl->GetTitleBar()->SetHelpId(""/*nHelpId*/);
+    (void)nHelpId;
 
     AddControl(::std::auto_ptr<TreeNode>(pTitledControl));
 
-- 
cgit 


From e2280d56bfd8f963b4caea5b200a83be8664d5a3 Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Sat, 10 Jul 2010 18:21:24 +0200
Subject: CWS changehid: #i111874#: change code to support HelpIds as byte
 strings

---
 sd/source/ui/toolpanel/ScrollPanel.cxx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'sd/source/ui/toolpanel/ScrollPanel.cxx')

diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx
index 72b40e57e611..582c975dfbb8 100644
--- a/sd/source/ui/toolpanel/ScrollPanel.cxx
+++ b/sd/source/ui/toolpanel/ScrollPanel.cxx
@@ -122,7 +122,7 @@ void ScrollPanel::ListHasChanged (void)
 TitledControl* ScrollPanel::AddControl (
     ::std::auto_ptr<TreeNode> pControl,
     const String& rTitle,
-    ULONG nHelpId)
+    const rtl::OString& rHelpId)
 {
     // We are interested only in the title.  The control itself is
     // managed by the content object.
@@ -132,9 +132,7 @@ TitledControl* ScrollPanel::AddControl (
         rTitle,
         TitledControlStandardClickHandler(GetControlContainer(), ControlContainer::ES_TOGGLE),
         TitleBar::TBT_SUB_CONTROL_HEADLINE);
-    // FIXME: HELPID
-    pTitledControl->GetTitleBar()->SetHelpId(""/*nHelpId*/);
-    (void)nHelpId;
+    pTitledControl->GetTitleBar()->SetHelpId(rHelpId);
 
     AddControl(::std::auto_ptr<TreeNode>(pTitledControl));
 
-- 
cgit 


From d1684121929ba6881eb37ac0b45b1eead14ab427 Mon Sep 17 00:00:00 2001
From: Christian Lippka <christian.lippka@oracle.com>
Date: Tue, 21 Sep 2010 15:27:38 +0200
Subject: impress201: #i112507# remove unused code

---
 sd/source/ui/toolpanel/ScrollPanel.cxx | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'sd/source/ui/toolpanel/ScrollPanel.cxx')

diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx
index 6b10ed889424..33fd325313a3 100755
--- a/sd/source/ui/toolpanel/ScrollPanel.cxx
+++ b/sd/source/ui/toolpanel/ScrollPanel.cxx
@@ -40,25 +40,6 @@
 
 namespace sd { namespace toolpanel {
 
-ScrollPanel::ScrollPanel (
-    TreeNode* pParent)
-    : Control (pParent->GetWindow(), WB_DIALOGCONTROL),
-      TreeNode(pParent),
-      maScrollWindow(this, WB_DIALOGCONTROL),
-      maVerticalScrollBar(this, WB_VERT),
-      maHorizontalScrollBar(this, WB_HORZ),
-      maScrollBarFiller(this),
-      maScrollWindowFiller(&maScrollWindow),
-      mbIsRearrangePending(true),
-      mbIsLayoutPending(true),
-      mnChildrenWidth(0),
-      mnVerticalBorder(2),
-      mnVerticalGap(3),
-      mnHorizontalBorder(2)
-{
-    Construct();
-}
-
 ScrollPanel::ScrollPanel (
     ::Window& i_rParentWindow)
     : Control (&i_rParentWindow, WB_DIALOGCONTROL),
-- 
cgit