diff options
Diffstat (limited to 'sd/source/ui/slidesorter')
34 files changed, 16 insertions, 544 deletions
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx index 677d1ea602a7..48f52a9ee015 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx @@ -184,14 +184,6 @@ void BitmapCache::Clear (void) -bool BitmapCache::IsEmpty (void) const -{ - return mpBitmapContainer->empty(); -} - - - - bool BitmapCache::IsFull (void) const { return mbIsFull; @@ -283,21 +275,6 @@ Bitmap BitmapCache::GetMarkedBitmap (const CacheKey& rKey) -void BitmapCache::ReleaseBitmap (const CacheKey& rKey) -{ - ::osl::MutexGuard aGuard (maMutex); - - CacheBitmapContainer::iterator aIterator (mpBitmapContainer->find(rKey)); - if (aIterator != mpBitmapContainer->end()) - { - UpdateCacheSize(aIterator->second, REMOVE); - mpBitmapContainer->erase(aIterator); - } -} - - - - bool BitmapCache::InvalidateBitmap (const CacheKey& rKey) { ::osl::MutexGuard aGuard (maMutex); @@ -388,20 +365,6 @@ void BitmapCache::SetMarkedBitmap ( -bool BitmapCache::IsPrecious (const CacheKey& rKey) -{ - ::osl::MutexGuard aGuard (maMutex); - - CacheBitmapContainer::iterator aIterator (mpBitmapContainer->find(rKey)); - if (aIterator != mpBitmapContainer->end()) - return aIterator->second.IsPrecious(); - else - return false; -} - - - - void BitmapCache::SetPrecious (const CacheKey& rKey, bool bIsPrecious) { ::osl::MutexGuard aGuard (maMutex); diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx index 845c8f15a90e..7e6b3f858b8d 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx @@ -85,10 +85,6 @@ public: */ void Clear (void); - /** Returns <TRUE/> when there is no preview bitmap in the cache. - */ - bool IsEmpty (void) const; - /** Return <TRUE/> when the cache is full, i.e. the cache compactor had to be run. */ @@ -116,11 +112,6 @@ public: */ Bitmap GetMarkedBitmap (const CacheKey& rKey); - /** Release the reference to the preview bitmap that is associated with - the given key. - */ - void ReleaseBitmap (const CacheKey& rKey); - /** Mark the specified preview bitmap as not being up-to-date anymore. @return @@ -147,11 +138,6 @@ public: const CacheKey& rKey, const Bitmap& rPreview); - /** Return whether the specified preview bitmap has been marked as - precious. - */ - bool IsPrecious (const CacheKey& rKey); - /** Mark the specified preview bitmap as precious, i.e. that it must not be compressed or otherwise removed from the cache. */ diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx index f71bddc2372d..0854a7786dfa 100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx @@ -263,11 +263,6 @@ bool GenericPageCache::InvalidatePreviewBitmap (const CacheKey aKey) return mpBitmapCache->InvalidateBitmap(mpCacheContext->GetPage(aKey)); else return false; -} - - - - void GenericPageCache::ReleasePreviewBitmap (const CacheKey aKey) { if (mpBitmapCache.get() != NULL) @@ -356,17 +351,6 @@ void GenericPageCache::SetPreciousFlag ( -bool GenericPageCache::IsEmpty (void) const -{ - if (mpBitmapCache.get() != NULL) - return mpBitmapCache->IsEmpty(); - else - return true; -} - - - - void GenericPageCache::Pause (void) { ProvideCacheAndProcessor(); diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx index 174e46dbd96a..6d29fe3e5f6e 100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx @@ -111,14 +111,9 @@ public: const CacheKey aKey, const bool bMayBeUpToDate = true); - /** Tell the cache to replace the bitmap associated with the given - request data with a new one that reflects recent changes in the - content of the page object. @return When the key is kown then return <TRUE/>. - */ bool InvalidatePreviewBitmap (const CacheKey aKey); - /** Call this method when a view-object-contact object is being deleted and does not need (a) its current bitmap in the cache and (b) a requested a new bitmap. @@ -138,10 +133,6 @@ public: */ void SetPreciousFlag (const CacheKey aKey, const bool bIsPrecious); - /** Return <TRUE/> when there is no preview bitmap in the cache. - */ - bool IsEmpty (void) const; - void Pause (void); void Resume (void); diff --git a/sd/source/ui/slidesorter/cache/SlsIdleDetector.cxx b/sd/source/ui/slidesorter/cache/SlsIdleDetector.cxx deleted file mode 100644 index 6df77bf52800..000000000000 --- a/sd/source/ui/slidesorter/cache/SlsIdleDetector.cxx +++ /dev/null @@ -1,66 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" - -#include "precompiled_sd.hxx" - -#include "SlsIdleDetector.hxx" - -#include "view/SlideSorterView.hxx" -#include "tools/IdleDetection.hxx" -#include "Window.hxx" - -namespace sd { namespace slidesorter { namespace cache { - -IdleDetector::IdleDetector ( - const ::Window* pWindow, - const bool bIsSuspendPreviewUpdatesDuringFullScreenPresentation) - : mpWindow(pWindow), - mbIsSuspendPreviewUpdatesDuringFullScreenPresentation( - bIsSuspendPreviewUpdatesDuringFullScreenPresentation) -{ -} - - - - -bool IdleDetector::operator() (void) -{ - // Determine whether the system is idle. - sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(mpWindow)); - if (nIdleState == tools::IdleDetection::IDET_IDLE) - return true; - else - return false; -} - - -} } } // end of namespace ::sd::slidesorter::cache - - - diff --git a/sd/source/ui/slidesorter/cache/SlsIdleDetector.hxx b/sd/source/ui/slidesorter/cache/SlsIdleDetector.hxx deleted file mode 100644 index a0ad5422496a..000000000000 --- a/sd/source/ui/slidesorter/cache/SlsIdleDetector.hxx +++ /dev/null @@ -1,51 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SD_SLIDESORTER_IDLE_DETECTOR_HXX -#define SD_SLIDESORTER_IDLE_DETECTOR_HXX - -class Window; - -namespace sd { namespace slidesorter { namespace cache { - -class IdleDetector -{ -public: - IdleDetector (const ::Window* pWindow, const bool bIsSuspendPreviewUpdatesDuringFullScreenPresentation); - bool operator() (void); - -private: - const ::Window* mpWindow; - const bool mbIsSuspendPreviewUpdatesDuringFullScreenPresentation; -}; - - - - -} } } // end of namespace ::sd::slidesorter::cache - -#endif diff --git a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx index 129aa649700f..ace5eddcc543 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx @@ -29,7 +29,6 @@ #include "SlsGenericPageCache.hxx" #include "SlsRequestFactory.hxx" -#include "SlsIdleDetector.hxx" #include "cache/SlsPageCache.hxx" #include "model/SlideSorterModel.hxx" #include <boost/bind.hpp> @@ -108,22 +107,10 @@ void PageCache::SetMarkedPreviewBitmap ( void PageCache::RequestPreviewBitmap (const CacheKey aKey) { return mpImplementation->RequestPreviewBitmap(aKey); -} - - - - -void PageCache::InvalidatePreviewBitmap ( const CacheKey aKey, const bool bRequestPreview) -{ if (mpImplementation->InvalidatePreviewBitmap(aKey) && bRequestPreview) RequestPreviewBitmap(aKey); -} - - - - void PageCache::ReleasePreviewBitmap (const CacheKey aKey) { mpImplementation->ReleasePreviewBitmap(aKey); diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index 2cc229aec5a9..86d20d6c8924 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -30,7 +30,6 @@ #include "SlsQueueProcessor.hxx" #include "SlsCacheConfiguration.hxx" #include "SlsRequestQueue.hxx" -#include "SlsIdleDetector.hxx" namespace sd { namespace slidesorter { namespace cache { diff --git a/sd/source/ui/slidesorter/cache/makefile.mk b/sd/source/ui/slidesorter/cache/makefile.mk index d9766e892992..58862a28645a 100644 --- a/sd/source/ui/slidesorter/cache/makefile.mk +++ b/sd/source/ui/slidesorter/cache/makefile.mk @@ -49,7 +49,6 @@ SLOFILES = \ $(SLO)$/SlsCacheCompactor.obj \ $(SLO)$/SlsCacheConfiguration.obj \ $(SLO)$/SlsGenericPageCache.obj \ - $(SLO)$/SlsIdleDetector.obj \ $(SLO)$/SlsPageCache.obj \ $(SLO)$/SlsPageCacheManager.obj \ $(SLO)$/SlsQueueProcessor.obj \ diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 8253db66ee61..eeded8da0601 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -204,15 +204,9 @@ SlideSorterController::~SlideSorterController (void) void SlideSorterController::Dispose (void) -{ mpInsertionIndicatorHandler->End(Animator::AM_Immediate); mpSelectionManager.reset(); mpAnimator->Dispose(); -} - - - - SlideSorter& SlideSorterController::GetSlideSorter (void) const { return mrSlideSorter; @@ -872,43 +866,6 @@ Rectangle SlideSorterController::Rearrange (bool bForce) -void SlideSorterController::SetZoom (long int nZoom) -{ - SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); - long int nCurrentZoom ((long int)( - pWindow->GetMapMode().GetScaleX().operator double() * 100)); - - if (nZoom > nCurrentZoom) - { - Size aPageSize (mrView.GetLayouter().GetPageObjectSize()); - Size aWindowSize (pWindow->PixelToLogic( - pWindow->GetOutputSizePixel())); - - // The zoom factor must not grow by more then the ratio of the - // widths of the output window and the page objects. - long nMaxFactor - = nCurrentZoom * aWindowSize.Width() / aPageSize.Width(); - // Apply rounding, so that a current zoom factor of 1 is still - // increased. - nMaxFactor = (nCurrentZoom * 18 + 5) / 10; - nZoom = Min(nMaxFactor, nZoom); - } - if (nZoom < 1) - nZoom = 1; - - { - SlideSorterView::DrawLock aLock (mrSlideSorter); - mrView.GetLayouter()._SetZoom(nZoom/100.0); - mrView.Layout(); - GetScrollBarManager().UpdateScrollBars (false); - mrView.GetPreviewCache()->InvalidateCache(); - mrView.RequestRepaint(); - } -} - - - - FunctionReference SlideSorterController::CreateSelectionFunction (SfxRequest& rRequest) { FunctionReference xFunc( SelectionFunction::Create(mrSlideSorter, rRequest) ); diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index ed6dea7e13d3..ea4d6f480aca 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -303,19 +303,4 @@ IMPL_LINK(CurrentSlideManager, SwitchPageCallback, void*, EMPTYARG) return 1; } - - - -SdPage* GetCurrentSdPage (SlideSorter& rSlideSorter) -{ - SharedPageDescriptor pDescriptor ( - rSlideSorter.GetController().GetCurrentSlideManager()->GetCurrentSlide()); - if (pDescriptor.get() == NULL) - return NULL; - else - return pDescriptor->GetPage(); -} - - - } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx index 8d84a57e5691..445354cd9830 100644 --- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx @@ -355,7 +355,7 @@ void FocusManager::SetFocusToToolBox (void) { PaneDockingWindow* pPaneDockingWindow = dynamic_cast<PaneDockingWindow*>(pDockingWindow); if (pPaneDockingWindow != NULL) - pPaneDockingWindow->GetTitleToolBox()->GrabFocus(); + pPaneDockingWindow->GetToolBox().GrabFocus(); } } } diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index fe2a85c20401..9f1218013e16 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -55,6 +55,7 @@ #include <com/sun/star/frame/FrameActionEvent.hpp> #include <com/sun/star/frame/FrameAction.hpp> #include <sfx2/viewfrm.hxx> +#include <tools/diagnose_ex.h> using namespace ::com::sun::star::accessibility; @@ -236,8 +237,7 @@ void Listener::ConnectToController (void) } catch (beans::UnknownPropertyException aEvent) { - OSL_TRACE ("caught exception in SlideSorterController::SetupListeners: %s", - ::rtl::OUStringToOString(aEvent.Message, RTL_TEXTENCODING_UTF8).getStr()); + DBG_UNHANDLED_EXCEPTION(); } try { @@ -245,8 +245,7 @@ void Listener::ConnectToController (void) } catch (beans::UnknownPropertyException aEvent) { - OSL_TRACE ("caught exception in SlideSorterController::SetupListeners: %s", - ::rtl::OUStringToOString(aEvent.Message, RTL_TEXTENCODING_UTF8).getStr()); + DBG_UNHANDLED_EXCEPTION(); } } @@ -294,9 +293,7 @@ void Listener::DisconnectFromController (void) } catch (beans::UnknownPropertyException aEvent) { - OSL_TRACE ("caught exception in destructor of SlideSorterController: %s", - ::rtl::OUStringToOString(aEvent.Message, - RTL_TEXTENCODING_UTF8).getStr()); + DBG_UNHANDLED_EXCEPTION(); } mbListeningToController = false; @@ -509,9 +506,7 @@ void SAL_CALL Listener::propertyChange ( } catch (beans::UnknownPropertyException aEvent) { - OSL_TRACE ("caught exception while accessing the page number of a slide: %s", - ::rtl::OUStringToOString(aEvent.Message, - RTL_TEXTENCODING_UTF8).getStr()); + DBG_UNHANDLED_EXCEPTION(); } catch (lang::DisposedException&) { diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx index d24f8a347646..687019954feb 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx @@ -54,18 +54,6 @@ SelectionCommand::SelectionCommand ( -void SelectionCommand::AddSlides ( - const ::boost::shared_ptr<PageSelector::PageSelection>& rpSelection) -{ - PageSelector::PageSelection::iterator iPage = rpSelection->begin(); - PageSelector::PageSelection::iterator iEnd = rpSelection->end(); - for (; iPage!=iEnd; ++iPage) - AddSlide(((*iPage)->GetPageNum()-1)/2); -} - - - - void SelectionCommand::AddSlide (USHORT nPageIndex) { maPagesToSelect.push_back(nPageIndex); @@ -74,14 +62,6 @@ void SelectionCommand::AddSlide (USHORT nPageIndex) -void SelectionCommand::SetCurrentSlide (USHORT nPageIndex) -{ - mnCurrentPageIndex = nPageIndex; -} - - - - void SelectionCommand::operator() (void) { OSL_ASSERT(mpCurrentSlideManager.get()!=NULL); diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx index 88ce0ea29b75..7a9d0f27369e 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx @@ -64,24 +64,11 @@ public: const ::boost::shared_ptr<controller::CurrentSlideManager>& rpCurrentSlideManager, const model::SlideSorterModel& rModel); - /** Add the pages in the given list of selected pages to those that will - be selected when this command is executed, i.e. its operator() - method is called. - The first page will be set as current page when the new current page - has not been specified previously. - */ - void AddSlides (const ::boost::shared_ptr<PageSelector::PageSelection>& rpSelection); - /** Remember the specified page to be selected when this command is executed. */ void AddSlide (USHORT nPageIndex); - /** Call this method to explicitly set the page that will be made the - current page when this command is executed. - */ - void SetCurrentSlide (USHORT nPageIndex); - /** Execute the command and select the pages added by previous calls to AddPages() and AddPage(). */ diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index fb1dd05c8861..547ecd7152c6 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -53,7 +53,6 @@ #include "view/SlsPageObjectLayouter.hxx" #include "view/SlsButtonBar.hxx" #include "framework/FrameworkHelper.hxx" -#include "showview.hxx" #include "ViewShellBase.hxx" #include "DrawController.hxx" #include "Window.hxx" diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx index 35dd45fa419c..d9062a4ef2b1 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx @@ -254,6 +254,7 @@ void SelectionManager::SelectionHasChanged (const bool bMakeSelectionVisible) pViewShell->Invalidate(SID_HIDE_SLIDE); pViewShell->Invalidate(SID_DELETE_PAGE); pViewShell->Invalidate(SID_DELETE_MASTER_PAGE); + pViewShell->Invalidate(SID_ASSIGN_LAYOUT); // StatusBar pViewShell->Invalidate (SID_STATUS_PAGE); diff --git a/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx index 27fe01c15bf1..1af831c2ad8a 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx @@ -53,12 +53,6 @@ SlideFunction::SlideFunction ( { } -FunctionReference SlideFunction::Create( SlideSorter& rSlideSorter, SfxRequest& rRequest ) -{ - FunctionReference xFunc( new SlideFunction( rSlideSorter, rRequest ) ); - return xFunc; -} - void SlideFunction::ScrollStart (void) { } diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index e49491f99599..2e2e370e0e5b 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -65,7 +65,6 @@ #include "ViewShellBase.hxx" #include "ViewShellImplementation.hxx" #include "sdattr.hxx" -#include "TaskPaneViewShell.hxx" #include "FrameView.hxx" #include "zoomlist.hxx" #include "sdpage.hxx" @@ -266,12 +265,7 @@ void SlotManager::FuTemporary (SfxRequest& rRequest) case SID_ASSIGN_LAYOUT: { - SFX_REQUEST_ARG (rRequest, pWhatPage, SfxUInt32Item, ID_VAL_WHATPAGE, FALSE); - SFX_REQUEST_ARG (rRequest, pWhatLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, FALSE); - pShell->mpImpl->AssignLayout( - pDocument->GetSdPage((USHORT)pWhatPage->GetValue(), - mrSlideSorter.GetModel().GetPageType()), - (AutoLayout)pWhatLayout->GetValue()); + pShell->mpImpl->AssignLayout( rRequest, mrSlideSorter.GetModel().GetPageType() ); rRequest.Done (); } break; @@ -522,68 +516,6 @@ void SlotManager::GetAttrState (SfxItemSet& rSet) } } - - - -void SlotManager::GetCtrlState (SfxItemSet& rSet) -{ - if (rSet.GetItemState(SID_RELOAD) != SFX_ITEM_UNKNOWN) - { - // "Letzte Version" vom SFx en/disablen lassen - ViewShell* pShell = mrSlideSorter.GetViewShell(); - if (pShell != NULL) - { - SfxViewFrame* pSlideViewFrame = pShell->GetViewFrame(); - DBG_ASSERT(pSlideViewFrame!=NULL, - "SlideSorterController::GetCtrlState: ViewFrame not found"); - pSlideViewFrame->GetSlotState (SID_RELOAD, NULL, &rSet); - } - } - - // Output quality. - if (rSet.GetItemState(SID_OUTPUT_QUALITY_COLOR)==SFX_ITEM_AVAILABLE - ||rSet.GetItemState(SID_OUTPUT_QUALITY_GRAYSCALE)==SFX_ITEM_AVAILABLE - ||rSet.GetItemState(SID_OUTPUT_QUALITY_BLACKWHITE)==SFX_ITEM_AVAILABLE - ||rSet.GetItemState(SID_OUTPUT_QUALITY_CONTRAST)==SFX_ITEM_AVAILABLE) - { - ULONG nMode = mrSlideSorter.GetContentWindow()->GetDrawMode(); - UINT16 nQuality = 0; - - switch (nMode) - { - case ::sd::ViewShell::OUTPUT_DRAWMODE_COLOR: - nQuality = 0; - break; - case ::sd::ViewShell::OUTPUT_DRAWMODE_GRAYSCALE: - nQuality = 1; - break; - case ::sd::ViewShell::OUTPUT_DRAWMODE_BLACKWHITE: - nQuality = 2; - break; - case ::sd::ViewShell::OUTPUT_DRAWMODE_CONTRAST: - nQuality = 3; - break; - } - - rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_COLOR, - (BOOL)(nQuality==0))); - rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_GRAYSCALE, - (BOOL)(nQuality==1))); - rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_BLACKWHITE, - (BOOL)(nQuality==2))); - rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_CONTRAST, - (BOOL)(nQuality==3))); - } - - if (rSet.GetItemState(SID_MAIL_SCROLLBODY_PAGEDOWN) == SFX_ITEM_AVAILABLE) - { - rSet.Put (SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, TRUE)); - } -} - - - - void SlotManager::GetMenuState (SfxItemSet& rSet) { EditMode eEditMode = mrSlideSorter.GetModel().GetEditMode(); @@ -1198,38 +1130,6 @@ void SlotManager::DuplicateSelectedSlides (SfxRequest& rRequest) _1)); } - - - -void SlotManager::AssignTransitionEffect (void) -{ - model::SlideSorterModel& rModel (mrSlideSorter.GetModel()); - - // We have to manually select the pages in the document that are - // selected in the slide sorter. - rModel.SynchronizeDocumentSelection(); - - // #i34011#: Needs review, AF's bugfix is removed here - //rShell.AssignFromSlideChangeWindow(rModel.GetEditMode()); - - // We have to remove the selection of master pages to not confuse the - // model. - if (rModel.GetEditMode() == EM_MASTERPAGE) - { - SdDrawDocument* pDocument = mrSlideSorter.GetModel().GetDocument(); - USHORT nMasterPageCount = pDocument->GetMasterSdPageCount(PK_STANDARD); - for (USHORT nIndex=0; nIndex<nMasterPageCount; nIndex++) - { - SdPage* pPage = pDocument->GetMasterSdPage(nIndex, PK_STANDARD); - if (pPage != NULL) - pPage->SetSelected (FALSE); - } - } -} - - - - void SlotManager::ExecuteCommandAsynchronously (::std::auto_ptr<Command> pCommand) { // Ownership of command is (implicitely) transferred to the queue. diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx index 48da4faf02e3..bd2b542c5d87 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx @@ -68,18 +68,11 @@ class RequestData; bitmaps and throw.</li> </p> - <p>There are three somewhat similar methods for requesting new previews: - a) GetPreviewBitmap() schedules a re-rendering (when necessary) and + <p>There is another somewhat similar methods for requesting new previews: + GetPreviewBitmap() schedules a re-rendering (when necessary) and returns the preview what is currently available, either as a preview of the preview or, when nothing has changed since the last call, as the final thing. - b) RequestPreviewBitmap() schedules, like GetPreviewBitmap(), a - re-rendering when the currently available preview is not up-to-date. It - does not, however, return anything. Use this if you can wait for the - preview. - c) InvalidatePreviewBitmap() does not schedule a re-rendering, but - remembers that one is necessary when one of the other two methods is - called. </p> */ class PageCache diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index a8c8deac2de2..b6309f80d0b4 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -109,8 +109,6 @@ public: */ Rectangle Rearrange (bool bForce = false); - SlideSorter& GetSlideSorter (void) const; - /** Return the descriptor of the page that is rendered under the given position. This takes the IsOnlyPreviewTriggersMouseOver property into account. @@ -184,14 +182,6 @@ public: */ void UpdateAllPages (void); - /** Set the zoom factor. The given value is clipped against an upper - bound. - @param nZoom - An integer percent value, i.e. nZoom/100 is the actual zoom - factor. - */ - void SetZoom (long int nZoom); - /** This factory method creates a selection function. */ virtual FunctionReference CreateSelectionFunction (SfxRequest& rRequest); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx index a8152d1789a8..fa2aae6111fb 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx @@ -276,13 +276,6 @@ private: void PlaceHorizontalScrollBar (const Rectangle& aArea); void PlaceVerticalScrollBar (const Rectangle& aArea); void PlaceFiller (const Rectangle& aArea); - - /** Make the height of the content window larger or smaller, so that the - - content size fits exactly in. This is achieved by changing the size - of the parent window and rely on the resulting resize. - */ - void AdaptWindowSize (const Rectangle& rArea); }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx index 843e6e82b45c..5b8c7d9a08b6 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx @@ -50,8 +50,6 @@ class SlideFunction public: TYPEINFO(); - static FunctionReference Create( SlideSorter& rSlideSorter, SfxRequest& rRequest ); - virtual BOOL MouseMove (const MouseEvent& rMEvt); virtual BOOL MouseButtonUp (const MouseEvent& rMEvt); virtual BOOL MouseButtonDown (const MouseEvent& rMEvt); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx index 7c9e38c3288b..d2c9f7481624 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx @@ -64,7 +64,6 @@ public: void FuTemporary (SfxRequest& rRequest); void FuPermanent (SfxRequest& rRequest); void FuSupport (SfxRequest& rRequest); - void GetCtrlState (SfxItemSet &rSet); void GetMenuState (SfxItemSet &rSet); void GetClipboardState (SfxItemSet &rSet); void GetStatusBarState (SfxItemSet& rSet); @@ -112,8 +111,6 @@ private: void DuplicateSelectedSlides (SfxRequest& rRequest); - void AssignTransitionEffect (void); - /** Use one of several ways to determine where to insert a new page. This can be the current selection or the insertion indicator. */ diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx index 276f1a7c10a7..705a438ba13a 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx @@ -90,14 +90,7 @@ public: */ css::uno::Reference<css::drawing::XDrawPage> GetXDrawPage (void) const; - /** Returns the index of the page as it is displayed in the view as page - number. The value may differ from the index returned by the - XDrawPage when there are hidden slides and the XIndexAccess used to - access the model filters them out. - */ - sal_Int32 GetPageIndex (void) const; void SetPageIndex (const sal_Int32 nIndex); - bool UpdateMasterPage (void); enum State { ST_Visible, ST_Selected, ST_WasSelected, diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx index a250688dd2e2..4d19e41e881b 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx @@ -82,7 +82,6 @@ public: ~Layouter (void); ::boost::shared_ptr<PageObjectLayouter> GetPageObjectLayouter (void) const; - /** Set the horizontal and vertical borders in pixel coordinates between the enclosing window and page objects. The borders may be painted larger then the given values when the space for the insertion marker @@ -103,13 +102,6 @@ public: void SetBorders (sal_Int32 nLeftBorder, sal_Int32 nRightBorder, sal_Int32 nTopBorder, sal_Int32 nBottomBorder); - /** Set the horizontal and vertical gaps between adjacent page objects. - These gaps are only relevant when there is more than one column or - more than one row. Negative values indicate that the respective gap - is not set. - */ - void SetGaps (sal_Int32 nHorizontalGap, sal_Int32 nVerticalGap); - /** Set the interval of valid column counts. When nMinimalColumnCount <= nMaximalColumnCount is not fullfilled then the call is ignored. @param nMinimalColumnCount @@ -164,12 +156,6 @@ public: sal_Int32 GetIndex (const sal_Int32 nRow, const sal_Int32 nColumn) const; - /** Returns whether the column count is fixed (<TRUE/>) or variable - (<FALSE/>). It is fixed if SetColumnCount() was called with the - same value for minimal and maximal column count. - */ - bool IsColumnCountFixed (void) const; - /** Return the scale factor that can be set at the map mode of the output window. */ diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx index c0083ff92d73..31899d3b3e44 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx @@ -69,8 +69,6 @@ public: SdrPageObj& GetPageObject (void) const; - Rectangle GetPageObjectBoundingBox (void) const; - virtual void ActionChanged (void); protected: diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index 2fb6a9577109..fe5259a8d85c 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -51,6 +51,8 @@ #include "sdpage.hxx" #include "FrameView.hxx" +#include <tools/diagnose_ex.h> + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -184,30 +186,6 @@ bool SlideSorterModel::SetEditMode (EditMode eEditMode) -bool SlideSorterModel::SetEditModeFromController (void) -{ - bool bIsMasterPageMode = false; - // Get the edit mode from the controller. - try - { - Reference<beans::XPropertySet> xSet (mrSlideSorter.GetXController(), UNO_QUERY_THROW); - Any aValue (xSet->getPropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsMasterPageMode")))); - aValue >>= bIsMasterPageMode; - } - catch (RuntimeException&) - { - // When the property is not supported then the master - // page mode is not supported, too. - bIsMasterPageMode = false; - } - - return SetEditMode(bIsMasterPageMode ? EM_MASTERPAGE : EM_PAGE); -} - - - - EditMode SlideSorterModel::GetEditMode (void) const { return meEditMode; @@ -281,13 +259,9 @@ sal_Int32 SlideSorterModel::GetIndex (const Reference<drawing::XDrawPage>& rxSli return nNumber; } } - catch (beans::UnknownPropertyException&) - { - OSL_ASSERT(false); - } - catch (lang::DisposedException&) + catch (uno::Exception&) { - OSL_ASSERT(false); + DBG_UNHANDLED_EXCEPTION(); } } diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx index 24d744e459d6..21211fd4d376 100644 --- a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx @@ -93,14 +93,6 @@ Reference<drawing::XDrawPage> PageDescriptor::GetXDrawPage (void) const -sal_Int32 PageDescriptor::GetPageIndex (void) const -{ - return mnIndex; -} - - - - void PageDescriptor::SetPageIndex (const sal_Int32 nNewIndex) { mnIndex = nNewIndex; diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index 241ca4ea3c79..89388734bf8c 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -627,18 +627,6 @@ void SlideSorterService::Resize (void) -void SlideSorterService::Rearrange (void) -{ - if (mxParentWindow.is()) - { - awt::Rectangle aWindowBox = mxParentWindow->getPosSize(); - mpSlideSorter->GetController().Rearrange(); - } -} - - - - void SlideSorterService::ThrowIfDisposed (void) throw (::com::sun::star::lang::DisposedException) { diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx index a502442ab9f2..9af239c64fd1 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx @@ -204,7 +204,6 @@ private: ::boost::scoped_ptr<cppu::IPropertyArrayHelper> mpPropertyArrayHelper; void Resize (void); - void Rearrange (void); /** This method throws a DisposedException when the object has already been disposed. diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 11b2af00191a..f8e7e13cdd2b 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -342,22 +342,6 @@ SfxUndoManager* SlideSorterViewShell::ImpGetUndoManager (void) const -SfxShell* SlideSorterViewShell::CreateInstance ( - sal_Int32, - SfxShell*, - void* pUserData, - ViewShellBase& rBase) -{ - return new SlideSorterViewShell ( - rBase.GetViewFrame(), - rBase, - static_cast< ::Window*>(pUserData), - NULL); -} - - - - void SlideSorterViewShell::GetFocus (void) { OSL_ASSERT(mpSlideSorter.get()!=NULL); diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 1e3b35a685cc..b786b0e50562 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -78,9 +78,11 @@ #include <canvas/elapsedtime.hxx> //#define DEBUG_TIMING +#include <svl/itempool.hxx> #ifdef DEBUG_TIMING #include <vector> #endif +#include <boost/foreach.hpp> using namespace std; diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index d1d30a7cf9a1..25ed8d612ebc 100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx @@ -334,11 +334,6 @@ Layouter::Layouter ( Layouter::~Layouter (void) { -} - - - - ::boost::shared_ptr<PageObjectLayouter> Layouter::GetPageObjectLayouter (void) const { return mpImplementation->mpPageObjectLayouter; |