From 482949bcfa4231540def562e7ba5315a0a18b4be Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Fri, 12 Apr 2013 17:31:58 +0100 Subject: infernal vspace wasteage removal. Change-Id: Ice0437cac9cd01b484174b1ce16c3118fb76e3e0 --- sd/source/ui/slidesorter/view/SlideSorterView.cxx | 140 --------------------- .../ui/slidesorter/view/SlsPageObjectLayouter.cxx | 11 -- .../ui/slidesorter/view/SlsPageObjectPainter.cxx | 29 ----- 3 files changed, 180 deletions(-) diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 1bbe97bb533a..06e15d6c66ab 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "slidehack.hxx" #include "view/SlideSorterView.hxx" @@ -74,12 +73,10 @@ #endif #include - using namespace std; using namespace ::sd::slidesorter::model; using namespace ::drawinglayer::primitive2d; - namespace sd { namespace slidesorter { namespace view { namespace { @@ -106,8 +103,6 @@ namespace { }; } - - class BackgroundPainter : public ILayerPainter, public ::boost::noncopyable @@ -131,8 +126,6 @@ private: Color maBackgroundColor; }; - - TYPEINIT1(SlideSorterView, ::sd::View); SlideSorterView::SlideSorterView (SlideSorter& rSlideSorter) @@ -183,9 +176,6 @@ SlideSorterView::SlideSorterView (SlideSorter& rSlideSorter) mpLayeredDevice->RegisterPainter(pPainter, 1); } - - - SlideSorterView::~SlideSorterView (void) { if ( ! mbIsDisposed) @@ -195,17 +185,11 @@ SlideSorterView::~SlideSorterView (void) } } - - - void SlideSorterView::Init (void) { HandleModelChange(); } - - - void SlideSorterView::Dispose (void) { mpSelectionPainter.reset(); @@ -228,9 +212,6 @@ void SlideSorterView::Dispose (void) mbIsDisposed = true; } - - - sal_Int32 SlideSorterView::GetPageIndexAtPoint (const Point& rWindowPosition) const { sal_Int32 nIndex (-1); @@ -248,35 +229,23 @@ sal_Int32 SlideSorterView::GetPageIndexAtPoint (const Point& rWindowPosition) co return nIndex; } - - - Layouter& SlideSorterView::GetLayouter (void) { return *mpLayouter.get(); } - - - void SlideSorterView::ModelHasChanged (void) { // Ignore this call. Rely on hints sent by the model to get informed of // model changes. } - - - void SlideSorterView::PreModelChange (void) { // Reset the slide under the mouse. It will be re-set in PostModelChange(). SetPageUnderMouse(SharedPageDescriptor()); } - - - void SlideSorterView::PostModelChange (void) { // In PreModelChange() the page objects have been released. Here we @@ -291,9 +260,6 @@ void SlideSorterView::PostModelChange (void) RequestRepaint(); } - - - /** At the moment for every model change all page objects are destroyed and re-created again. This can be optimized by accepting hints that describe the type of change so that existing page objects can be @@ -305,9 +271,6 @@ void SlideSorterView::HandleModelChange (void) PostModelChange(); } - - - void SlideSorterView::HandleDrawModeChange (void) { // Replace the preview cache with a new and empty one. The @@ -319,9 +282,6 @@ void SlideSorterView::HandleDrawModeChange (void) RequestRepaint(); } - - - void SlideSorterView::HandleDataChangeEvent (void) { GetPageObjectPainter()->SetTheme(mrSlideSorter.GetTheme()); @@ -335,9 +295,6 @@ void SlideSorterView::HandleDataChangeEvent (void) RequestRepaint(); } - - - void SlideSorterView::Resize (void) { UpdateOrientation(); @@ -346,18 +303,12 @@ void SlideSorterView::Resize (void) RequestRearrange(); } - - - void SlideSorterView::RequestRearrange (void) { mbIsRearrangePending = true; Rearrange(); } - - - void SlideSorterView::Rearrange (void) { if ( ! mbIsRearrangePending) @@ -387,9 +338,6 @@ void SlideSorterView::Rearrange (void) } } - - - void SlideSorterView::UpdateOrientation (void) { // The layout of slides depends on whether the slide sorter is @@ -458,9 +406,6 @@ void SlideSorterView::UpdateOrientation (void) } } - - - void SlideSorterView::Layout () { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); @@ -502,17 +447,11 @@ void SlideSorterView::Layout () InvalidatePageObjectVisibilities (); } - - - void SlideSorterView::InvalidatePageObjectVisibilities (void) { mbPageObjectVisibilitiesValid = false; } - - - void SlideSorterView::DeterminePageObjectVisibilities (void) { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); @@ -571,9 +510,6 @@ void SlideSorterView::DeterminePageObjectVisibilities (void) } } - - - void SlideSorterView::UpdatePreciousFlags (void) { if (mbPreciousFlagUpdatePending) @@ -606,9 +542,6 @@ void SlideSorterView::UpdatePreciousFlags (void) } } - - - bool SlideSorterView::SetOrientation (const Layouter::Orientation eOrientation) { if (meOrientation != eOrientation) @@ -620,17 +553,11 @@ bool SlideSorterView::SetOrientation (const Layouter::Orientation eOrientation) return false; } - - - Layouter::Orientation SlideSorterView::GetOrientation (void) const { return meOrientation; } - - - void SlideSorterView::RequestRepaint (void) { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); @@ -644,18 +571,12 @@ void SlideSorterView::RequestRepaint (void) } } - - - void SlideSorterView::RequestRepaint (const model::SharedPageDescriptor& rpDescriptor) { if (rpDescriptor) RequestRepaint(rpDescriptor->GetBoundingBox()); } - - - void SlideSorterView::RequestRepaint (const Rectangle& rRepaintBox) { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); @@ -666,8 +587,6 @@ void SlideSorterView::RequestRepaint (const Rectangle& rRepaintBox) } } - - void SlideSorterView::RequestRepaint (const Region& rRepaintRegion) { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); @@ -678,15 +597,11 @@ void SlideSorterView::RequestRepaint (const Region& rRepaintRegion) } } - - - Rectangle SlideSorterView::GetModelArea (void) { return mpLayouter->GetTotalBoundingBox(); } - #ifdef DEBUG_TIMING static ::canvas::tools::ElapsedTime gaTimer; static const size_t gFrameTimeCount (10); @@ -753,9 +668,6 @@ void SlideSorterView::CompleteRedraw ( #endif } - - - void SlideSorterView::Paint ( OutputDevice& rDevice, const Rectangle& rRepaintArea) @@ -795,9 +707,6 @@ void SlideSorterView::Paint ( } } - - - void SlideSorterView::ConfigurationChanged ( utl::ConfigurationBroadcaster* pBroadcaster, sal_uInt32 nHint) @@ -811,9 +720,6 @@ void SlideSorterView::ConfigurationChanged ( } - - - ::boost::shared_ptr SlideSorterView::GetPreviewCache (void) { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); @@ -829,9 +735,6 @@ void SlideSorterView::ConfigurationChanged ( return mpPreviewCache; } - - - Pair SlideSorterView::GetVisiblePageRange (void) { if ( ! mbPageObjectVisibilitiesValid) @@ -839,9 +742,6 @@ Pair SlideSorterView::GetVisiblePageRange (void) return maVisiblePageRange; } - - - void SlideSorterView::AddVisibilityChangeListener (const Link& rListener) { if (::std::find ( @@ -853,9 +753,6 @@ void SlideSorterView::AddVisibilityChangeListener (const Link& rListener) } } - - - void SlideSorterView::RemoveVisibilityChangeListener(const Link&rListener) { maVisibilityChangeListeners.erase ( @@ -865,18 +762,12 @@ void SlideSorterView::RemoveVisibilityChangeListener(const Link&rListener) rListener)); } - - - ToolTip& SlideSorterView::GetToolTip (void) const { OSL_ASSERT(mpToolTip); return *mpToolTip; } - - - void SlideSorterView::DragFinished (sal_Int8 nDropAction) { mrSlideSorter.GetController().GetClipboard().DragFinished(nDropAction); @@ -884,9 +775,6 @@ void SlideSorterView::DragFinished (sal_Int8 nDropAction) View::DragFinished(nDropAction); } - - - void SlideSorterView::Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint) { ::sd::DrawDocShell* pDocShell = mrModel.GetDocument()->GetDocSh(); @@ -896,9 +784,6 @@ void SlideSorterView::Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint ::sd::View::Notify(rBroadcaster, rHint); } - - - void SlideSorterView::UpdatePageUnderMouse () { ::boost::shared_ptr pVScrollBar (mrSlideSorter.GetVerticalScrollBar()); @@ -927,18 +812,12 @@ void SlideSorterView::UpdatePageUnderMouse () SetPageUnderMouse(SharedPageDescriptor()); } - - - void SlideSorterView::UpdatePageUnderMouse ( const Point& rMousePosition) { SetPageUnderMouse(mrSlideSorter.GetController().GetPageAt(rMousePosition)); } - - - void SlideSorterView::SetPageUnderMouse ( const model::SharedPageDescriptor& rpDescriptor) { @@ -958,9 +837,6 @@ void SlideSorterView::SetPageUnderMouse ( } } - - - bool SlideSorterView::SetState ( const model::SharedPageDescriptor& rpDescriptor, const PageDescriptor::State eState, @@ -987,9 +863,6 @@ bool SlideSorterView::SetState ( return bModified; } - - - ::boost::shared_ptr SlideSorterView::GetPageObjectPainter (void) { if ( ! mpPageObjectPainter) @@ -997,17 +870,11 @@ bool SlideSorterView::SetState ( return mpPageObjectPainter; } - - - ::boost::shared_ptr SlideSorterView::GetLayeredDevice (void) const { return mpLayeredDevice; } - - - //===== SlideSorterView::DrawLock ============================================= SlideSorterView::DrawLock::DrawLock (SlideSorter& rSlideSorter) @@ -1019,9 +886,6 @@ SlideSorterView::DrawLock::DrawLock (SlideSorter& rSlideSorter) ++mrView.mnLockRedrawSmph; } - - - SlideSorterView::DrawLock::~DrawLock (void) { OSL_ASSERT(mrView.mnLockRedrawSmph>0); @@ -1034,15 +898,11 @@ SlideSorterView::DrawLock::~DrawLock (void) } } - - - void SlideSorterView::DrawLock::Dispose (void) { mpWindow.reset(); } - } } } // end of namespace ::sd::slidesorter::view /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx index 21c42ad78591..684061041c6a 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "view/SlsPageObjectLayouter.hxx" #include "model/SlsPageDescriptor.hxx" @@ -86,16 +85,10 @@ PageObjectLayouter::PageObjectLayouter ( aIconSize); } - - - PageObjectLayouter::~PageObjectLayouter(void) { } - - - Rectangle PageObjectLayouter::CalculatePreviewBoundingBox ( Size& rPageObjectSize, const Size& rPageSize, @@ -264,15 +257,11 @@ Size PageObjectLayouter::GetPageNumberAreaSize (const int nPageCount) return aSize; } - - - Image PageObjectLayouter::GetTransitionEffectIcon (void) const { return maTransitionEffectIcon; } - } } } // end of namespace ::sd::slidesorter::view /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx index 9bf75e6148f2..b3c2b660b010 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx @@ -68,16 +68,10 @@ PageObjectPainter::PageObjectPainter ( mpFocusBorderPainter->AdaptColor(aColor, true); } - - - PageObjectPainter::~PageObjectPainter (void) { } - - - void PageObjectPainter::PaintPageObject ( OutputDevice& rDevice, const model::SharedPageDescriptor& rpDescriptor) @@ -104,9 +98,6 @@ void PageObjectPainter::PaintPageObject ( rDevice.SetAntialiasing(nSavedAntialiasingMode); } - - - void PageObjectPainter::NotifyResize (const bool bForce) { mpPageObjectLayouter = mrLayouter.GetPageObjectLayouter(); @@ -125,9 +116,6 @@ void PageObjectPainter::NotifyResize (const bool bForce) } } - - - void PageObjectPainter::InvalidateBitmaps (void) { maNormalBackground.SetEmpty(); @@ -178,9 +166,6 @@ void PageObjectPainter::PaintBackground ( } } - - - void PageObjectPainter::PaintPreview ( OutputDevice& rDevice, const model::SharedPageDescriptor& rpDescriptor) const @@ -206,9 +191,6 @@ void PageObjectPainter::PaintPreview ( } } - - - Bitmap PageObjectPainter::CreateMarkedPreview ( const Size& rSize, const Bitmap& rPreview, @@ -236,9 +218,6 @@ Bitmap PageObjectPainter::CreateMarkedPreview ( return pDevice->GetBitmap(Point(0,0), rSize); } - - - Bitmap PageObjectPainter::GetPreviewBitmap ( const model::SharedPageDescriptor& rpDescriptor, const OutputDevice* pReferenceDevice) const @@ -270,9 +249,6 @@ Bitmap PageObjectPainter::GetPreviewBitmap ( } } - - - void PageObjectPainter::PaintPageNumber ( OutputDevice& rDevice, const model::SharedPageDescriptor& rpDescriptor) const @@ -325,9 +301,6 @@ void PageObjectPainter::PaintPageNumber ( rDevice.DrawText(aBox, sPageNumber, TEXT_DRAW_RIGHT | TEXT_DRAW_VCENTER); } - - - void PageObjectPainter::PaintTransitionEffect ( OutputDevice& rDevice, const model::SharedPageDescriptor& rpDescriptor) const @@ -541,8 +514,6 @@ void PageObjectPainter::PaintBorder ( } } - - } } } // end of namespace sd::slidesorter::view /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit