diff options
author | Michael Meeks <michael.meeks@suse.com> | 2013-04-09 16:11:41 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2013-04-09 16:11:41 +0100 |
commit | cfcb6b9c762a7043ecc79b49a835a14f45980de8 (patch) | |
tree | 68cacb701d614befb0d20740a7bd0ca4d76ae801 | |
parent | impress: wire up a new view - the slide jockey view. (diff) | |
download | core-cfcb6b9c762a7043ecc79b49a835a14f45980de8.tar.gz core-cfcb6b9c762a7043ecc79b49a835a14f45980de8.zip |
more excessive whitespace redux.
Change-Id: If7b03e5894b6ee8afbef756d866c0f605bb846ef
-rw-r--r-- | sd/source/ui/inc/SlideSorterChildWindow.hxx | 3 | ||||
-rw-r--r-- | sd/source/ui/inc/ViewShell.hxx | 3 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/shell/SlideSorter.cxx | 130 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/shell/SlideSorterService.cxx | 144 |
5 files changed, 5 insertions, 283 deletions
diff --git a/sd/source/ui/inc/SlideSorterChildWindow.hxx b/sd/source/ui/inc/SlideSorterChildWindow.hxx index f6916441de55..3ee58abe0c21 100644 --- a/sd/source/ui/inc/SlideSorterChildWindow.hxx +++ b/sd/source/ui/inc/SlideSorterChildWindow.hxx @@ -38,8 +38,7 @@ public: sal_uInt16, SfxBindings*, SfxChildWinInfo*); - - virtual ~SlideSorterChildWindow (void); + virtual ~SlideSorterChildWindow () {} SFX_DECL_CHILDWINDOW (SlideBrowserChildWindow); }; diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 67c7e8a552ec..2ee52b6fb280 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -587,9 +587,6 @@ private: void SetupRulers (void); }; - - - ::Window* ViewShell::GetParentWindow (void) const { return mpParentWindow; diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 791f9eb4e691..7d460534b426 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -69,9 +69,6 @@ private: }; } - - - //===== SlideSorter =========================================================== ::boost::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter( @@ -92,9 +89,6 @@ private: return pSlideSorter; } - - - ::boost::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter ( ViewShellBase& rBase, ViewShell* pViewShell, @@ -109,9 +103,6 @@ private: return pSlideSorter; } - - - SlideSorter::SlideSorter ( ViewShell& rViewShell, const ::boost::shared_ptr<sd::Window>& rpContentWindow, @@ -136,9 +127,6 @@ SlideSorter::SlideSorter ( { } - - - SlideSorter::SlideSorter ( ViewShellBase& rBase, ViewShell* pViewShell, @@ -161,9 +149,6 @@ SlideSorter::SlideSorter ( { } - - - void SlideSorter::Init (void) { if (mpViewShellBase != NULL) @@ -208,9 +193,6 @@ void SlideSorter::Init (void) } } - - - SlideSorter::~SlideSorter (void) { mbIsValid = false; @@ -245,78 +227,50 @@ SlideSorter::~SlideSorter (void) mpContentWindow.reset(); } - - - bool SlideSorter::IsValid (void) const { return mbIsValid; } - - - ::boost::shared_ptr<ScrollBar> SlideSorter::GetVerticalScrollBar (void) const { return mpVerticalScrollBar; } - - - - ::boost::shared_ptr<ScrollBar> SlideSorter::GetHorizontalScrollBar (void) const { return mpHorizontalScrollBar; } - - - ::boost::shared_ptr<ScrollBarBox> SlideSorter::GetScrollBarFiller (void) const { return mpScrollBarBox; } - - - model::SlideSorterModel& SlideSorter::GetModel (void) const { OSL_ASSERT(mpSlideSorterModel.get()!=NULL); return *mpSlideSorterModel; } - - - view::SlideSorterView& SlideSorter::GetView (void) const { OSL_ASSERT(mpSlideSorterView.get()!=NULL); return *mpSlideSorterView; } - - - controller::SlideSorterController& SlideSorter::GetController (void) const { OSL_ASSERT(mpSlideSorterController.get()!=NULL); return *mpSlideSorterController; } - - - Reference<frame::XController> SlideSorter::GetXController (void) const { Reference<frame::XController> xController(mxControllerWeak); return xController; } - - - void SlideSorter::Paint (const Rectangle& rRepaintArea) { GetController().Paint( @@ -324,42 +278,27 @@ void SlideSorter::Paint (const Rectangle& rRepaintArea) GetContentWindow().get()); } - - - ::SharedSdWindow SlideSorter::GetContentWindow (void) const { return mpContentWindow; } - - - ViewShellBase* SlideSorter::GetViewShellBase (void) const { return mpViewShellBase; } - - - ViewShell* SlideSorter::GetViewShell (void) const { return mpViewShell; } - - - void SlideSorter::SetupControls (::Window* ) { GetVerticalScrollBar()->Show(); mpSlideSorterController->GetScrollBarManager().LateInitialization(); } - - - void SlideSorter::SetupListeners (void) { SharedSdWindow pWindow (GetContentWindow()); @@ -387,9 +326,6 @@ void SlideSorter::SetupListeners (void) mpSlideSorterController->GetScrollBarManager().Connect(); } - - - void SlideSorter::ReleaseListeners (void) { mpSlideSorterController->GetScrollBarManager().Disconnect(); @@ -415,9 +351,6 @@ void SlideSorter::ReleaseListeners (void) WindowEventHandler)); } - - - void SlideSorter::CreateModelViewController (void) { mpSlideSorterModel.reset(CreateModel()); @@ -439,9 +372,6 @@ void SlideSorter::CreateModelViewController (void) mpSlideSorterView->Init(); } - - - model::SlideSorterModel* SlideSorter::CreateModel (void) { // Get pointers to the document. @@ -456,17 +386,11 @@ model::SlideSorterModel* SlideSorter::CreateModel (void) return NULL; } - - - view::SlideSorterView* SlideSorter::CreateView (void) { return new view::SlideSorterView (*this); } - - - controller::SlideSorterController* SlideSorter::CreateController (void) { controller::SlideSorterController* pController @@ -474,9 +398,6 @@ controller::SlideSorterController* SlideSorter::CreateController (void) return pController; } - - - void SlideSorter::ArrangeGUIElements ( const Point& rOffset, const Size& rSize) @@ -501,9 +422,6 @@ void SlideSorter::ArrangeGUIElements ( } } - - - SvBorder SlideSorter::GetBorder (void) { SvBorder aBorder; @@ -519,9 +437,6 @@ SvBorder SlideSorter::GetBorder (void) return aBorder; } - - - bool SlideSorter::RelocateToWindow (::Window* pParentWindow) { // Stop all animations for they have been started for the old window. @@ -549,9 +464,6 @@ bool SlideSorter::RelocateToWindow (::Window* pParentWindow) return true; } - - - void SlideSorter::SetCurrentFunction (const FunctionReference& rpFunction) { if (GetViewShell() != NULL) @@ -567,27 +479,18 @@ void SlideSorter::SetCurrentFunction (const FunctionReference& rpFunction) } } - - - ::boost::shared_ptr<controller::Properties> SlideSorter::GetProperties (void) const { OSL_ASSERT(mpProperties); return mpProperties; } - - - ::boost::shared_ptr<view::Theme> SlideSorter::GetTheme (void) const { OSL_ASSERT(mpTheme); return mpTheme; } - - - //===== ContentWindow ========================================================= namespace { @@ -603,91 +506,58 @@ ContentWindow::ContentWindow( SetStyle(GetStyle() | WB_NOPOINTERFOCUS); } - - - ContentWindow::~ContentWindow (void) { } - - - void ContentWindow::SetCurrentFunction (const FunctionReference& rpFunction) { mpCurrentFunction = rpFunction; } - - - void ContentWindow::Paint (const Rectangle& rRect) { mrSlideSorter.Paint(rRect); } - - - void ContentWindow::KeyInput (const KeyEvent& rEvent) { if (mpCurrentFunction.is()) mpCurrentFunction->KeyInput(rEvent); } - - - void ContentWindow::MouseMove (const MouseEvent& rEvent) { if (mpCurrentFunction.is()) mpCurrentFunction->MouseMove(rEvent); } - - - void ContentWindow::MouseButtonUp(const MouseEvent& rEvent) { if (mpCurrentFunction.is()) mpCurrentFunction->MouseButtonUp(rEvent); } - - - void ContentWindow::MouseButtonDown(const MouseEvent& rEvent) { if (mpCurrentFunction.is()) mpCurrentFunction->MouseButtonDown(rEvent); } - - - void ContentWindow::Command(const CommandEvent& rEvent) { if (mpCurrentFunction.is()) mpCurrentFunction->Command(rEvent); } - - - long ContentWindow::Notify (NotifyEvent& rEvent) { (void)rEvent; return 0; } - - } // end of anonymous namespace - - - - } } // end of namespace ::sd::slidesorter /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx b/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx index 25ece1f0c8ad..7dcec17a7021 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SlideSorterChildWindow.hxx" #include "app.hrc" @@ -44,13 +43,6 @@ SlideSorterChildWindow::SlideSorterChildWindow ( // SetHideNotDelete (sal_True); } - - - -SlideSorterChildWindow::~SlideSorterChildWindow (void) -{} - - SFX_IMPL_DOCKINGWINDOW(SlideSorterChildWindow, SID_SLIDE_BROWSER) } } // end of namespace ::sd::slidesorter diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index 5d9512156f3c..93982fe7c10f 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SlideSorterService.hxx" #include "controller/SlideSorterController.hxx" #include "controller/SlsProperties.hxx" @@ -53,9 +52,6 @@ namespace { }; } - - - //===== Service =============================================================== Reference<XInterface> SAL_CALL SlideSorterService_createInstance ( @@ -64,27 +60,18 @@ Reference<XInterface> SAL_CALL SlideSorterService_createInstance ( return Reference<XInterface>(static_cast<drawing::XDrawView*>(new SlideSorterService(rxContext))); } - - - OUString SlideSorterService_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.SlideSorter"); } - - - Sequence<OUString> SAL_CALL SlideSorterService_getSupportedServiceNames (void) throw (RuntimeException) { - static const OUString sServiceName("com.sun.star.drawing.SlideSorter"); + const OUString sServiceName("com.sun.star.drawing.SlideSorter"); return Sequence<OUString>(&sServiceName, 1); } - - - //===== SlideSorterService ========================================================== SlideSorterService::SlideSorterService (const Reference<XComponentContext>& rxContext) @@ -95,16 +82,10 @@ SlideSorterService::SlideSorterService (const Reference<XComponentContext>& rxCo (void)rxContext; } - - - SlideSorterService::~SlideSorterService (void) { } - - - void SAL_CALL SlideSorterService::disposing (void) { mpSlideSorter.reset(); @@ -115,9 +96,6 @@ void SAL_CALL SlideSorterService::disposing (void) } } - - - //----- XInitialization ------------------------------------------------------- void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments) @@ -168,9 +146,6 @@ void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments) } } - - - //----- XView ----------------------------------------------------------------- Reference<XResourceId> SAL_CALL SlideSorterService::getResourceId (void) @@ -179,18 +154,12 @@ Reference<XResourceId> SAL_CALL SlideSorterService::getResourceId (void) return mxViewId; } - - - sal_Bool SAL_CALL SlideSorterService::isAnchorOnly (void) throw (RuntimeException) { return sal_False; } - - - //----- XWindowListener ------------------------------------------------------- void SAL_CALL SlideSorterService::windowResized (const awt::WindowEvent& rEvent) @@ -202,19 +171,12 @@ void SAL_CALL SlideSorterService::windowResized (const awt::WindowEvent& rEvent) Resize(); } - - - - void SAL_CALL SlideSorterService::windowMoved (const awt::WindowEvent& rEvent) throw (RuntimeException) { (void)rEvent; } - - - void SAL_CALL SlideSorterService::windowShown (const lang::EventObject& rEvent) throw (RuntimeException) { @@ -223,9 +185,6 @@ void SAL_CALL SlideSorterService::windowShown (const lang::EventObject& rEvent) Resize(); } - - - void SAL_CALL SlideSorterService::windowHidden (const lang::EventObject& rEvent) throw (RuntimeException) { @@ -233,9 +192,6 @@ void SAL_CALL SlideSorterService::windowHidden (const lang::EventObject& rEvent) ThrowIfDisposed(); } - - - //----- lang::XEventListener -------------------------------------------------- void SAL_CALL SlideSorterService::disposing (const lang::EventObject& rEvent) @@ -245,9 +201,6 @@ void SAL_CALL SlideSorterService::disposing (const lang::EventObject& rEvent) mxParentWindow = NULL; } - - - //----- XDrawView ------------------------------------------------------------- void SAL_CALL SlideSorterService::setCurrentPage(const Reference<drawing::XDrawPage>& rxSlide) @@ -259,9 +212,6 @@ void SAL_CALL SlideSorterService::setCurrentPage(const Reference<drawing::XDrawP mpSlideSorter->GetModel().GetIndex(rxSlide)); } - - - Reference<drawing::XDrawPage> SAL_CALL SlideSorterService::getCurrentPage (void) throw (RuntimeException) { @@ -272,21 +222,14 @@ Reference<drawing::XDrawPage> SAL_CALL SlideSorterService::getCurrentPage (void) return NULL; } - - - //----- attributes ------------------------------------------------------------ - Reference<container::XIndexAccess> SAL_CALL SlideSorterService::getDocumentSlides (void) throw (RuntimeException) { return mpSlideSorter->GetModel().GetDocumentSlides(); } - - - void SAL_CALL SlideSorterService::setDocumentSlides ( const Reference<container::XIndexAccess >& rxSlides) throw (RuntimeException) @@ -296,9 +239,6 @@ void SAL_CALL SlideSorterService::setDocumentSlides ( mpSlideSorter->GetController().SetDocumentSlides(rxSlides); } - - - sal_Bool SAL_CALL SlideSorterService::getIsHighlightCurrentSlide (void) throw (RuntimeException) { @@ -309,9 +249,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsHighlightCurrentSlide (void) return mpSlideSorter->GetProperties()->IsHighlightCurrentSlide(); } - - - void SAL_CALL SlideSorterService::setIsHighlightCurrentSlide (sal_Bool bValue) throw (RuntimeException) { @@ -324,9 +261,6 @@ void SAL_CALL SlideSorterService::setIsHighlightCurrentSlide (sal_Bool bValue) } } - - - sal_Bool SAL_CALL SlideSorterService::getIsShowSelection (void) throw (RuntimeException) { @@ -337,9 +271,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsShowSelection (void) return mpSlideSorter->GetProperties()->IsShowSelection(); } - - - void SAL_CALL SlideSorterService::setIsShowSelection (sal_Bool bValue) throw (RuntimeException) { @@ -348,9 +279,6 @@ void SAL_CALL SlideSorterService::setIsShowSelection (sal_Bool bValue) mpSlideSorter->GetProperties()->SetShowSelection(bValue); } - - - sal_Bool SAL_CALL SlideSorterService::getIsShowFocus (void) throw (RuntimeException) { @@ -361,9 +289,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsShowFocus (void) return mpSlideSorter->GetProperties()->IsShowFocus(); } - - - void SAL_CALL SlideSorterService::setIsShowFocus (sal_Bool bValue) throw (RuntimeException) { @@ -372,9 +297,6 @@ void SAL_CALL SlideSorterService::setIsShowFocus (sal_Bool bValue) mpSlideSorter->GetProperties()->SetShowFocus(bValue); } - - - sal_Bool SAL_CALL SlideSorterService::getIsCenterSelection (void) throw (RuntimeException) { @@ -385,9 +307,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsCenterSelection (void) return mpSlideSorter->GetProperties()->IsCenterSelection(); } - - - void SAL_CALL SlideSorterService::setIsCenterSelection (sal_Bool bValue) throw (RuntimeException) { @@ -396,9 +315,6 @@ void SAL_CALL SlideSorterService::setIsCenterSelection (sal_Bool bValue) mpSlideSorter->GetProperties()->SetCenterSelection(bValue); } - - - sal_Bool SAL_CALL SlideSorterService::getIsSuspendPreviewUpdatesDuringFullScreenPresentation (void) throw (RuntimeException) { @@ -410,9 +326,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsSuspendPreviewUpdatesDuringFullScreen ->IsSuspendPreviewUpdatesDuringFullScreenPresentation(); } - - - void SAL_CALL SlideSorterService::setIsSuspendPreviewUpdatesDuringFullScreenPresentation ( sal_Bool bValue) throw (RuntimeException) @@ -423,9 +336,6 @@ void SAL_CALL SlideSorterService::setIsSuspendPreviewUpdatesDuringFullScreenPres ->SetSuspendPreviewUpdatesDuringFullScreenPresentation(bValue); } - - - sal_Bool SAL_CALL SlideSorterService::getIsOrientationVertical (void) throw (RuntimeException) { @@ -436,9 +346,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsOrientationVertical (void) return mpSlideSorter->GetView().GetOrientation() != Layouter::HORIZONTAL; } - - - void SAL_CALL SlideSorterService::setIsOrientationVertical (sal_Bool bValue) throw (RuntimeException) { @@ -449,9 +356,6 @@ void SAL_CALL SlideSorterService::setIsOrientationVertical (sal_Bool bValue) : Layouter::HORIZONTAL); } - - - sal_Bool SAL_CALL SlideSorterService::getIsSmoothScrolling (void) throw (RuntimeException) { @@ -462,9 +366,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsSmoothScrolling (void) return mpSlideSorter->GetProperties()->IsSmoothSelectionScrolling(); } - - - void SAL_CALL SlideSorterService::setIsSmoothScrolling (sal_Bool bValue) throw (RuntimeException) { @@ -473,9 +374,6 @@ void SAL_CALL SlideSorterService::setIsSmoothScrolling (sal_Bool bValue) mpSlideSorter->GetProperties()->SetSmoothSelectionScrolling(bValue); } - - - util::Color SAL_CALL SlideSorterService::getBackgroundColor (void) throw (RuntimeException) { @@ -487,9 +385,6 @@ util::Color SAL_CALL SlideSorterService::getBackgroundColor (void) mpSlideSorter->GetProperties()->GetBackgroundColor().GetColor()); } - - - void SAL_CALL SlideSorterService::setBackgroundColor (util::Color aBackgroundColor) throw (RuntimeException) { @@ -498,9 +393,6 @@ void SAL_CALL SlideSorterService::setBackgroundColor (util::Color aBackgroundCol mpSlideSorter->GetProperties()->SetBackgroundColor(Color(aBackgroundColor)); } - - - util::Color SAL_CALL SlideSorterService::getTextColor (void) throw (css::uno::RuntimeException) { @@ -512,9 +404,6 @@ util::Color SAL_CALL SlideSorterService::getTextColor (void) mpSlideSorter->GetProperties()->GetTextColor().GetColor()); } - - - void SAL_CALL SlideSorterService::setTextColor (util::Color aTextColor) throw (RuntimeException) { @@ -523,9 +412,6 @@ void SAL_CALL SlideSorterService::setTextColor (util::Color aTextColor) mpSlideSorter->GetProperties()->SetTextColor(Color(aTextColor)); } - - - util::Color SAL_CALL SlideSorterService::getSelectionColor (void) throw (RuntimeException) { @@ -537,9 +423,6 @@ util::Color SAL_CALL SlideSorterService::getSelectionColor (void) mpSlideSorter->GetProperties()->GetSelectionColor().GetColor()); } - - - void SAL_CALL SlideSorterService::setSelectionColor (util::Color aSelectionColor) throw (RuntimeException) { @@ -548,9 +431,6 @@ void SAL_CALL SlideSorterService::setSelectionColor (util::Color aSelectionColor mpSlideSorter->GetProperties()->SetSelectionColor(Color(aSelectionColor)); } - - - util::Color SAL_CALL SlideSorterService::getHighlightColor (void) throw (RuntimeException) { @@ -562,9 +442,6 @@ util::Color SAL_CALL SlideSorterService::getHighlightColor (void) mpSlideSorter->GetProperties()->GetHighlightColor().GetColor()); } - - - void SAL_CALL SlideSorterService::setHighlightColor (util::Color aHighlightColor) throw (RuntimeException) { @@ -573,8 +450,6 @@ void SAL_CALL SlideSorterService::setHighlightColor (util::Color aHighlightColor mpSlideSorter->GetProperties()->SetHighlightColor(Color(aHighlightColor)); } - - sal_Bool SAL_CALL SlideSorterService::getIsUIReadOnly (void) throw (RuntimeException) { @@ -585,9 +460,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsUIReadOnly (void) return mpSlideSorter->GetProperties()->IsUIReadOnly(); } - - - void SAL_CALL SlideSorterService::setIsUIReadOnly (sal_Bool bIsUIReadOnly) throw (RuntimeException) { @@ -596,11 +468,6 @@ void SAL_CALL SlideSorterService::setIsUIReadOnly (sal_Bool bIsUIReadOnly) mpSlideSorter->GetProperties()->SetUIReadOnly(bIsUIReadOnly); } - - - -//----------------------------------------------------------------------------- - void SlideSorterService::Resize (void) { if (mxParentWindow.is()) @@ -612,20 +479,17 @@ void SlideSorterService::Resize (void) } } - - - void SlideSorterService::ThrowIfDisposed (void) throw (::com::sun::star::lang::DisposedException) { - if (SlideSorterServiceInterfaceBase::rBHelper.bDisposed || SlideSorterServiceInterfaceBase::rBHelper.bInDispose) + if (SlideSorterServiceInterfaceBase::rBHelper.bDisposed || + SlideSorterServiceInterfaceBase::rBHelper.bInDispose) { throw lang::DisposedException ("SlideSorterService object has already been disposed", - static_cast<drawing::XDrawView*>(this)); + static_cast<drawing::XDrawView*>(this)); } } - } } // end of namespace ::sd::presenter /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |