Update from master repository (DEV300_m81).

1 files changed, 25 insertions, 1 deletions

diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx
index cff065777235..cae08c76ca39 100644..100755
--- a/sd/source/ui/toolpanel/ScrollPanel.cxx
+++ b/sd/source/ui/toolpanel/ScrollPanel.cxx
@@ -56,6 +56,30 @@ ScrollPanel::ScrollPanel (
       mnVerticalGap(3),
       mnHorizontalBorder(2)
 {
+    Construct();
+}
+
+ScrollPanel::ScrollPanel (
+    ::Window& i_rParentWindow)
+    : Control (&i_rParentWindow, WB_DIALOGCONTROL),
+      TreeNode(NULL),
+      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();
+}
+
+void ScrollPanel::Construct()
+{
     SetAccessibleName (
         ::rtl::OUString::createFromAscii("Sub Task Panel"));
     mpControlContainer->SetMultiSelection (true);
@@ -95,7 +119,7 @@ ScrollPanel::~ScrollPanel (void)
         // control instead of pNode directly.
         TitledControl* pTitledControl = static_cast<TitledControl*>(pNode);
         if (pTitledControl != NULL)
-            pControl = pTitledControl->GetControl(false);
+            pControl = pTitledControl->GetControl();
 
         // Remove this object as listener from the control.
         if (pControl != NULL && pControl->GetWindow()!=NULL)