diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 23:45:44 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 06:53:03 -0600 |
commit | 2ef9df8aee696993d9eb235fd36caa4cbcfd3624 (patch) | |
tree | 7b9a351a3362f45a909299c93192bd11a2fd0c4e /sd/source/ui/slideshow | |
parent | 7e92d9881f039899262882633712ec0a3de01474 (diff) |
Remove visual noise from sd
Change-Id: I0957cabd66ddc4e25c7e6ff54ec2a555eda0792c
Reviewed-on: https://gerrit.libreoffice.org/8306
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd/source/ui/slideshow')
-rw-r--r-- | sd/source/ui/slideshow/showwin.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshow.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.hxx | 8 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowviewimpl.cxx | 24 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowviewimpl.hxx | 20 |
6 files changed, 20 insertions, 38 deletions
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 006919aae283..aa4ae8760461 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -43,7 +43,7 @@ namespace sd { static const sal_uLong HIDE_MOUSE_TIMEOUT = 10000; static const sal_uLong SHOW_MOUSE_TIMEOUT = 1000; -// ============================================================================= + ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, ::Window* pParent ) : ::sd::Window( pParent ) diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index de376763bcba..849b2a7d36fe 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -101,7 +101,7 @@ namespace { } -////////////////////////////////////////////////////////////////////////////// + const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap() diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index eee338483171..9424c114c7d5 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -3629,7 +3629,7 @@ void PresentationSettingsEx::SetPropertyValue( const OUString& rProperty, const throw IllegalArgumentException(); } -//////////////////////////////// + // XAnimationListener diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index d4eeabb5fbe1..17584c78797a 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -87,7 +87,7 @@ class SlideShowView; class AnimationSlideController; class PaneHider; -// -------------------------------------------------------------------- + struct PresentationSettingsEx : public PresentationSettings { @@ -105,7 +105,7 @@ struct PresentationSettingsEx : public PresentationSettings void SetPropertyValue( const OUString& rProperty, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException); }; -// -------------------------------------------------------------------- + struct WrappedShapeEventImpl { @@ -118,7 +118,7 @@ struct WrappedShapeEventImpl typedef boost::shared_ptr< WrappedShapeEventImpl > WrappedShapeEventImplPtr; typedef std::map< css::uno::Reference< css::drawing::XShape >, WrappedShapeEventImplPtr > WrappedShapeEventImplMap; -// -------------------------------------------------------------------- + class SlideShowListenerProxy : private ::cppu::BaseMutex, public ::cppu::WeakImplHelper2< css::presentation::XSlideShowListener, css::presentation::XShapeEventListener > @@ -162,7 +162,7 @@ public: css::uno::Reference< css::presentation::XSlideShow > mxSlideShow; }; -// -------------------------------------------------------------------- + typedef ::cppu::WeakComponentImplHelper2< css::presentation::XSlideShowController, css::container::XIndexAccess > SlideshowImplBase; diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index 2eed17d46b69..48a782585c50 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -50,10 +50,8 @@ using namespace ::com::sun::star; namespace sd { -/////////////////////////////////////////////////////////////////////// -// SlideShowViewListeners -/////////////////////////////////////////////////////////////////////// +// SlideShowViewListeners SlideShowViewListeners::SlideShowViewListeners( ::osl::Mutex& rMutex ) : mrMutex( rMutex ) { @@ -114,10 +112,8 @@ void SlideShowViewListeners::disposing( const lang::EventObject& _rEventSource ) maListeners.clear(); } -/////////////////////////////////////////////////////////////////////// -// SlideShowViewPaintListeners -/////////////////////////////////////////////////////////////////////// +// SlideShowViewPaintListeners SlideShowViewPaintListeners::SlideShowViewPaintListeners( ::osl::Mutex& rMutex ) : SlideShowViewPaintListeners_Base( rMutex ) { @@ -130,10 +126,8 @@ bool SlideShowViewPaintListeners::implTypedNotify( const Reference< awt::XPaintL return true; // continue calling listeners } -/////////////////////////////////////////////////////////////////////// -// SlideShowViewMouseListeners -/////////////////////////////////////////////////////////////////////// +// SlideShowViewMouseListeners SlideShowViewMouseListeners::SlideShowViewMouseListeners( ::osl::Mutex& rMutex ) : SlideShowViewMouseListeners_Base( rMutex ) { @@ -164,10 +158,8 @@ bool SlideShowViewMouseListeners::implTypedNotify( const Reference< awt::XMouseL return true; // continue calling listeners } -/////////////////////////////////////////////////////////////////////// -// SlideShowViewMouseMotionListeners -/////////////////////////////////////////////////////////////////////// +// SlideShowViewMouseMotionListeners SlideShowViewMouseMotionListeners::SlideShowViewMouseMotionListeners( ::osl::Mutex& rMutex ) : SlideShowViewMouseMotionListeners_Base( rMutex ) { @@ -190,9 +182,9 @@ bool SlideShowViewMouseMotionListeners::implTypedNotify( const Reference< awt::X return true; // continue calling listeners } -/////////////////////////////////////////////////////////////////////// + // SlideShowView -/////////////////////////////////////////////////////////////////////// + SlideShowView::SlideShowView( ShowWindow& rOutputWindow, SdDrawDocument* pDoc, @@ -223,7 +215,7 @@ SlideShowView::SlideShowView( ShowWindow& rOutputWindow, mTranslationOffset.Height = 0; } -/// Dispose all internal references +// Dispose all internal references void SAL_CALL SlideShowView::dispose() throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -250,7 +242,7 @@ void SAL_CALL SlideShowView::dispose() throw (RuntimeException) WeakComponentImplHelperBase::dispose(); } -/// Disposing our broadcaster +// Disposing our broadcaster void SAL_CALL SlideShowView::disposing( const lang::EventObject& ) throw(RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx index 27d543d45257..c6d674d7117c 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.hxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx @@ -98,10 +98,8 @@ struct WrappedMouseMotionEvent : public ::com::sun::star::lang::EventObject ::com::sun::star::awt::MouseEvent maEvent; }; -/////////////////////////////////////////////////////////////////////// -// SlideShowViewListeners -/////////////////////////////////////////////////////////////////////// +// SlideShowViewListeners typedef std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::util::XModifyListener > > ViewListenerVector; class SlideShowViewListeners { @@ -120,10 +118,8 @@ protected: typedef ::std::auto_ptr< SlideShowViewListeners > SlideShowViewListenersPtr; -/////////////////////////////////////////////////////////////////////// -// SlideShowViewPaintListeners -/////////////////////////////////////////////////////////////////////// +// SlideShowViewPaintListeners typedef ::comphelper::OListenerContainerBase< ::com::sun::star::awt::XPaintListener, ::com::sun::star::awt::PaintEvent > SlideShowViewPaintListeners_Base; @@ -137,10 +133,8 @@ protected: }; typedef ::std::auto_ptr< SlideShowViewPaintListeners > SlideShowViewPaintListenersPtr; -/////////////////////////////////////////////////////////////////////// -// SlideShowViewMouseListeners -/////////////////////////////////////////////////////////////////////// +// SlideShowViewMouseListeners typedef ::comphelper::OListenerContainerBase< ::com::sun::star::awt::XMouseListener, WrappedMouseEvent > SlideShowViewMouseListeners_Base; class SlideShowViewMouseListeners : public SlideShowViewMouseListeners_Base @@ -156,10 +150,8 @@ protected: typedef ::std::auto_ptr< SlideShowViewMouseListeners > SlideShowViewMouseListenersPtr; -/////////////////////////////////////////////////////////////////////// -// SlideShowViewMouseMotionListeners -/////////////////////////////////////////////////////////////////////// +// SlideShowViewMouseMotionListeners typedef ::comphelper::OListenerContainerBase< ::com::sun::star::awt::XMouseMotionListener, WrappedMouseMotionEvent > SlideShowViewMouseMotionListeners_Base; @@ -175,10 +167,8 @@ protected: typedef ::std::auto_ptr< SlideShowViewMouseMotionListeners > SlideShowViewMouseMotionListenersPtr; -/////////////////////////////////////////////////////////////////////// -// SlideShowView -/////////////////////////////////////////////////////////////////////// +// SlideShowView class ShowWindow; class SlideshowImpl; |