diff options
| author | Noel Grandin <noel@peralex.com> | 2015-01-14 16:16:15 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-09 21:23:03 +0100 |
| commit | d380e713bc3f74868ccda548efea4509d78db0be (patch) | |
| tree | 78f617b5fb70a7217f385a047e98e9d62e38388f /basctl/source/basicide/layout.cxx | |
| parent | ed2cea3e5087b90cd3686d8fd9da7e74981c8da6 (diff) | |
vcl: VclPtr conversion in basctl
Change-Id: Ieea1ab9426ed025d7d0f8baba8a6d10cb454e93e
Diffstat (limited to 'basctl/source/basicide/layout.cxx')
| -rw-r--r-- | basctl/source/basicide/layout.cxx | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx index 961a7bde65e4..58db3a74dbb1 100644 --- a/basctl/source/basicide/layout.cxx +++ b/basctl/source/basicide/layout.cxx @@ -53,10 +53,6 @@ Layout::Layout (vcl::Window* pParent) : SetFont(aFont); } -// virtual dtor -Layout::~Layout() -{ } - // removes a docking window void Layout::Remove (DockingWindow* pWin) { @@ -166,9 +162,9 @@ Layout::SplittedSide::SplittedSide (Layout* pParent, Side eSide) : bVertical(eSide == Left || eSide == Right), bLower(eSide == Left || eSide == Top), nSize(0), - aSplitter(pParent, bVertical ? WB_HSCROLL : WB_VSCROLL) + aSplitter(new Splitter(pParent, bVertical ? WB_HSCROLL : WB_VSCROLL)) { - InitSplitter(aSplitter); + InitSplitter(*aSplitter.get()); } @@ -267,19 +263,19 @@ void Layout::SplittedSide::ArrangeIn (Rectangle const& rRect) // shown if any of the windows is docked if (!bEmpty) { - aSplitter.Show(); + aSplitter->Show(); // split position - aSplitter.SetSplitPosPixel((bLower ? nSize : nPos1) - nSplitThickness); + aSplitter->SetSplitPosPixel((bLower ? nSize : nPos1) - nSplitThickness); // the actual position and size - aSplitter.SetPosSizePixel( - MakePoint(nPos2, aSplitter.GetSplitPosPixel()), + aSplitter->SetPosSizePixel( + MakePoint(nPos2, aSplitter->GetSplitPosPixel()), MakeSize(nLength, nSplitThickness) ); // dragging rectangle - aSplitter.SetDragRectPixel(aRect); + aSplitter->SetDragRectPixel(aRect); } else - aSplitter.Hide(); + aSplitter->Hide(); // positioning separator lines and windows bool bPrevDocking = false; // is the previous window docked? @@ -350,7 +346,7 @@ IMPL_LINK(Layout::SplittedSide, SplitHdl, Splitter*, pSplitter) // checking margins CheckMarginsFor(pSplitter); // changing stored sizes - if (pSplitter == &aSplitter) + if (pSplitter == aSplitter.get()) { // nSize if (bLower) |