summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2016-02-09 18:16:42 +1100
committerChris Sherlock <chris.sherlock79@gmail.com>2016-02-09 08:18:05 +0000
commita238b1f8d304bf1e2ffb357937f3ec888ee8ac89 (patch)
tree083c0582d4bf80e313ed256ca476ba8f69c7f7a6 /slideshow
parent538f276ae0414ea34ede6090b5f56e8fecd6fc65 (diff)
Remove excess newlines
A ridiculously fast way of doing this is: for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \ --exclude-dir=workdir --exclude-dir=instdir '^ {3,}' .) do perl -0777 -i -pe 's/^ {3,}/ /gm' $i done Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c Reviewed-on: https://gerrit.libreoffice.org/22224 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/color.cxx8
-rw-r--r--slideshow/source/engine/effectrewinder.cxx28
-rw-r--r--slideshow/source/engine/eventmultiplexer.cxx13
-rw-r--r--slideshow/source/engine/screenupdater.cxx4
-rw-r--r--slideshow/source/engine/shapes/appletshape.cxx11
-rw-r--r--slideshow/source/engine/shapes/backgroundshape.cxx4
-rw-r--r--slideshow/source/engine/shapes/drawinglayeranimation.cxx3
-rw-r--r--slideshow/source/engine/shapes/drawshape.cxx3
-rw-r--r--slideshow/source/engine/shapes/drawshapesubsetting.cxx4
-rw-r--r--slideshow/source/engine/shapes/externalshapebase.cxx16
-rw-r--r--slideshow/source/engine/shapes/gdimtftools.hxx1
-rw-r--r--slideshow/source/engine/shapes/intrinsicanimationactivity.cxx3
-rw-r--r--slideshow/source/engine/shapes/mediashape.cxx12
-rw-r--r--slideshow/source/engine/shapes/viewappletshape.cxx5
-rw-r--r--slideshow/source/engine/shapes/viewmediashape.cxx11
-rw-r--r--slideshow/source/engine/shapes/viewshape.cxx2
-rw-r--r--slideshow/source/engine/slide/layer.hxx6
-rw-r--r--slideshow/source/engine/slide/layermanager.hxx3
-rw-r--r--slideshow/source/engine/slide/shapemanagerimpl.cxx1
-rw-r--r--slideshow/source/engine/slide/slideimpl.cxx14
-rw-r--r--slideshow/source/engine/slideview.cxx7
-rw-r--r--slideshow/source/engine/smilfunctionparser.cxx1
-rw-r--r--slideshow/source/engine/sp_debug.cxx1
-rw-r--r--slideshow/source/engine/transitions/slidetransitionfactory.cxx1
-rw-r--r--slideshow/source/engine/unoviewcontainer.cxx1
-rw-r--r--slideshow/source/engine/usereventqueue.cxx1
-rw-r--r--slideshow/source/inc/listenercontainer.hxx2
-rw-r--r--slideshow/test/tests.hxx3
-rw-r--r--slideshow/test/testshape.cxx3
29 files changed, 0 insertions, 172 deletions
diff --git a/slideshow/source/engine/color.cxx b/slideshow/source/engine/color.cxx
index f31c36c5afbb..e979b9421812 100644
--- a/slideshow/source/engine/color.cxx
+++ b/slideshow/source/engine/color.cxx
@@ -152,7 +152,6 @@ namespace slideshow
}
-
// HSLColor
@@ -194,9 +193,6 @@ namespace slideshow
}
-
-
-
bool operator==( const HSLColor& rLHS, const HSLColor& rRHS )
{
return ( rLHS.getHue() == rRHS.getHue() &&
@@ -265,11 +261,9 @@ namespace slideshow
}
-
// RGBColor
-
RGBColor::RGBTriple::RGBTriple() :
mnRed(),
mnGreen(),
@@ -309,8 +303,6 @@ namespace slideshow
}
-
-
::cppcanvas::Color::IntSRGBA RGBColor::getIntegerColor() const
{
return ::cppcanvas::makeColor( colorToInt( getRed() ),
diff --git a/slideshow/source/engine/effectrewinder.cxx b/slideshow/source/engine/effectrewinder.cxx
index 6c55a1178253..9ac9898508b8 100644
--- a/slideshow/source/engine/effectrewinder.cxx
+++ b/slideshow/source/engine/effectrewinder.cxx
@@ -52,7 +52,6 @@ private:
};
-
class RewinderAnimationEventHandler : public AnimationEventHandler
{
public:
@@ -66,7 +65,6 @@ private:
};
-
} // end of anonymous namespace
@@ -91,8 +89,6 @@ EffectRewinder::EffectRewinder (
}
-
-
void EffectRewinder::initialize()
{
// Add some event handlers so that we are informed when
@@ -119,16 +115,12 @@ void EffectRewinder::initialize()
}
-
-
EffectRewinder::~EffectRewinder()
{
dispose();
}
-
-
void EffectRewinder::dispose()
{
if (mpAsynchronousRewindEvent)
@@ -157,8 +149,6 @@ void EffectRewinder::dispose()
}
-
-
void EffectRewinder::setRootAnimationNode (
const uno::Reference<animations::XAnimationNode>& xRootNode)
{
@@ -166,8 +156,6 @@ void EffectRewinder::setRootAnimationNode (
}
-
-
bool EffectRewinder::rewind (
const ::boost::shared_ptr<ScreenUpdater::UpdateLock>& rpPaintLock,
const ::std::function<void ()>& rSlideRewindFunctor,
@@ -225,8 +213,6 @@ bool EffectRewinder::rewind (
}
-
-
void EffectRewinder::skipAllMainSequenceEffects()
{
// Do not allow nested rewinds.
@@ -249,8 +235,6 @@ void EffectRewinder::skipAllMainSequenceEffects()
}
-
-
sal_Int32 EffectRewinder::countMainSequenceEffects()
{
// Determine the number of main sequence effects.
@@ -292,8 +276,6 @@ sal_Int32 EffectRewinder::countMainSequenceEffects()
}
-
-
void EffectRewinder::skipSingleMainSequenceEffects()
{
// This basically just starts the next effect and then skips over its
@@ -305,8 +287,6 @@ void EffectRewinder::skipSingleMainSequenceEffects()
}
-
-
bool EffectRewinder::resetEffectCount()
{
mnMainSequenceEffectCount = 0;
@@ -314,8 +294,6 @@ bool EffectRewinder::resetEffectCount()
}
-
-
bool EffectRewinder::notifyAnimationStart (const AnimationNodeSharedPtr& rpNode)
{
// This notification is only relevant for us when the rpNode belongs to
@@ -349,8 +327,6 @@ bool EffectRewinder::notifyAnimationStart (const AnimationNodeSharedPtr& rpNode)
}
-
-
void EffectRewinder::asynchronousRewind (
sal_Int32 nEffectCount,
const bool bRedisplayCurrentSlide,
@@ -395,8 +371,6 @@ void EffectRewinder::asynchronousRewind (
}
-
-
void EffectRewinder::asynchronousRewindToPreviousSlide (
const ::std::function<void ()>& rSlideRewindFunctor)
{
@@ -407,8 +381,6 @@ void EffectRewinder::asynchronousRewindToPreviousSlide (
}
-
-
} } // end of namespace ::slideshow::internal
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx
index c58734001eb0..1001d76a8230 100644
--- a/slideshow/source/engine/eventmultiplexer.cxx
+++ b/slideshow/source/engine/eventmultiplexer.cxx
@@ -97,8 +97,6 @@ public:
};
-
-
typedef cppu::WeakComponentImplHelper<
awt::XMouseListener,
awt::XMouseMotionListener > Listener_UnoBase;
@@ -153,9 +151,6 @@ private:
};
-
-
-
struct EventMultiplexerImpl
{
EventMultiplexerImpl( EventQueue& rEventQueue,
@@ -307,9 +302,6 @@ struct EventMultiplexerImpl
};
-
-
-
void SAL_CALL EventMultiplexerListener::disposing()
{
osl::MutexGuard const guard( m_aMutex );
@@ -403,9 +395,6 @@ void SAL_CALL EventMultiplexerListener::mouseMoved(
}
-
-
-
bool EventMultiplexerImpl::notifyAllAnimationHandlers( ImplAnimationHandlers const& rContainer,
AnimationNodeSharedPtr const& rNode )
{
@@ -691,8 +680,6 @@ bool EventMultiplexerImpl::notifyNextEffect()
}
-
-
EventMultiplexer::EventMultiplexer( EventQueue& rEventQueue,
UnoViewContainer const& rViewContainer ) :
mpImpl( new EventMultiplexerImpl(rEventQueue, rViewContainer) )
diff --git a/slideshow/source/engine/screenupdater.cxx b/slideshow/source/engine/screenupdater.cxx
index 0959fdb2db3d..4efd329012af 100644
--- a/slideshow/source/engine/screenupdater.cxx
+++ b/slideshow/source/engine/screenupdater.cxx
@@ -234,8 +234,6 @@ UpdateLock::UpdateLock (
}
-
-
UpdateLock::~UpdateLock()
{
if (mbIsActivated)
@@ -243,8 +241,6 @@ UpdateLock::~UpdateLock()
}
-
-
void UpdateLock::Activate()
{
if ( ! mbIsActivated)
diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx
index a034e28281a6..c9d97f9eb8c7 100644
--- a/slideshow/source/engine/shapes/appletshape.cxx
+++ b/slideshow/source/engine/shapes/appletshape.cxx
@@ -123,7 +123,6 @@ namespace slideshow
}
-
void AppletShape::implViewChanged( const UnoViewSharedPtr& rView )
{
const ::basegfx::B2DRectangle& rBounds = getBounds();
@@ -136,7 +135,6 @@ namespace slideshow
}
-
void AppletShape::implViewsChanged()
{
// resize all ViewShapes
@@ -146,7 +144,6 @@ namespace slideshow
}
-
void AppletShape::addViewLayer( const ViewLayerSharedPtr& rNewLayer,
bool bRedrawLayer )
{
@@ -175,7 +172,6 @@ namespace slideshow
}
-
bool AppletShape::removeViewLayer( const ViewLayerSharedPtr& rLayer )
{
const ViewAppletShapeVector::iterator aEnd( maViewAppletShapes.end() );
@@ -206,14 +202,12 @@ namespace slideshow
}
-
void AppletShape::clearAllViewLayers()
{
maViewAppletShapes.clear();
}
-
bool AppletShape::implRender( const ::basegfx::B2DRange& rCurrBounds ) const
{
// redraw all view shapes, by calling their update() method
@@ -233,7 +227,6 @@ namespace slideshow
}
-
bool AppletShape::implStartIntrinsicAnimation()
{
const ::basegfx::B2DRectangle& rBounds = getBounds();
@@ -246,7 +239,6 @@ namespace slideshow
}
-
bool AppletShape::implEndIntrinsicAnimation()
{
for( const auto& pViewAppletShape : maViewAppletShapes )
@@ -258,7 +250,6 @@ namespace slideshow
}
-
void AppletShape::implPauseIntrinsicAnimation()
{
// TODO(F1): any way of temporarily disabling/deactivating
@@ -266,14 +257,12 @@ namespace slideshow
}
-
bool AppletShape::implIsIntrinsicAnimationPlaying() const
{
return mbIsPlaying;
}
-
void AppletShape::implSetIntrinsicAnimationTime(double)
{
// No way of doing this, or?
diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx
index 80c15268a2cd..15de5c28632d 100644
--- a/slideshow/source/engine/shapes/backgroundshape.cxx
+++ b/slideshow/source/engine/shapes/backgroundshape.cxx
@@ -114,9 +114,6 @@ namespace slideshow
};
-
-
-
BackgroundShape::BackgroundShape( const uno::Reference< drawing::XDrawPage >& xDrawPage,
const uno::Reference< drawing::XDrawPage >& xMasterPage,
const SlideShowContext& rContext ) :
@@ -289,7 +286,6 @@ namespace slideshow
}
-
ShapeSharedPtr createBackgroundShape(
const uno::Reference< drawing::XDrawPage >& xDrawPage,
const uno::Reference< drawing::XDrawPage >& xMasterPage,
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
index 5a2a7f1cb0c4..cc6f61cacd2c 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
@@ -193,7 +193,6 @@ private:
double GetMixerState(sal_uInt32 nTime);
-
SlideShowContext maContext;
boost::shared_ptr<WakeupEvent> mpWakeupEvent;
boost::weak_ptr<DrawShape> mpParentDrawShape;
@@ -244,7 +243,6 @@ private:
};
-
class IntrinsicAnimationListener : public IntrinsicAnimationEventHandler,
private boost::noncopyable
{
@@ -262,7 +260,6 @@ private:
};
-
double ActivityImpl::GetMixerState( sal_uInt32 nTime )
{
if( meAnimKind == drawing::TextAnimationKind_BLINK )
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
index fb80f60984a7..1d58d8df3c68 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -77,7 +77,6 @@ namespace slideshow
// Private methods
-
GDIMetaFileSharedPtr DrawShape::forceScrollTextMetaFile()
{
if ((mnCurrMtfLoadFlags & MTF_LOAD_SCROLL_TEXT_MTF) != MTF_LOAD_SCROLL_TEXT_MTF)
@@ -512,11 +511,9 @@ namespace slideshow
}
-
// Public methods
-
DrawShapeSharedPtr DrawShape::create(
const uno::Reference< drawing::XShape >& xShape,
const uno::Reference< drawing::XDrawPage >& xContainingPage,
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index 183eaadf89a8..6f2fb5d976e5 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -42,11 +42,9 @@ namespace slideshow
{
-
// Private methods
-
void DrawShapeSubsetting::ensureInitializedNodeTree() const
{
ENSURE_OR_THROW( mpMtf,
@@ -218,11 +216,9 @@ namespace slideshow
}
-
// Public methods
-
DrawShapeSubsetting::DrawShapeSubsetting() :
maActionClassVector(),
mpMtf(),
diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx
index a193c49007bb..d181ab816991 100644
--- a/slideshow/source/engine/shapes/externalshapebase.cxx
+++ b/slideshow/source/engine/shapes/externalshapebase.cxx
@@ -100,7 +100,6 @@ namespace slideshow
}
-
ExternalShapeBase::~ExternalShapeBase()
{
try
@@ -118,56 +117,48 @@ namespace slideshow
}
-
uno::Reference< drawing::XShape > ExternalShapeBase::getXShape() const
{
return mxShape;
}
-
void ExternalShapeBase::play()
{
implStartIntrinsicAnimation();
}
-
void ExternalShapeBase::stop()
{
implEndIntrinsicAnimation();
}
-
void ExternalShapeBase::pause()
{
implPauseIntrinsicAnimation();
}
-
bool ExternalShapeBase::isPlaying() const
{
return implIsIntrinsicAnimationPlaying();
}
-
void ExternalShapeBase::setMediaTime(double fTime)
{
implSetIntrinsicAnimationTime(fTime);
}
-
bool ExternalShapeBase::update() const
{
return render();
}
-
bool ExternalShapeBase::render() const
{
if( maBounds.getRange().equalZero() )
@@ -181,49 +172,42 @@ namespace slideshow
}
-
bool ExternalShapeBase::isContentChanged() const
{
return true;
}
-
::basegfx::B2DRectangle ExternalShapeBase::getBounds() const
{
return maBounds;
}
-
::basegfx::B2DRectangle ExternalShapeBase::getDomBounds() const
{
return maBounds;
}
-
::basegfx::B2DRectangle ExternalShapeBase::getUpdateArea() const
{
return maBounds;
}
-
bool ExternalShapeBase::isVisible() const
{
return true;
}
-
double ExternalShapeBase::getPriority() const
{
return mnPriority;
}
-
bool ExternalShapeBase::isBackgroundDetached() const
{
// external shapes always have their own window/surface
diff --git a/slideshow/source/engine/shapes/gdimtftools.hxx b/slideshow/source/engine/shapes/gdimtftools.hxx
index 6fbc729bb5cf..ac7190515e3e 100644
--- a/slideshow/source/engine/shapes/gdimtftools.hxx
+++ b/slideshow/source/engine/shapes/gdimtftools.hxx
@@ -37,7 +37,6 @@ class GDIMetaFile;
class Graphic;
-
namespace slideshow
{
namespace internal
diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
index 64130e05f1dc..a1fd73b0f671 100644
--- a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
+++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
@@ -95,7 +95,6 @@ namespace slideshow
};
-
class IntrinsicAnimationListener : public IntrinsicAnimationEventHandler,
private boost::noncopyable
{
@@ -113,7 +112,6 @@ namespace slideshow
};
-
IntrinsicAnimationActivity::IntrinsicAnimationActivity( const SlideShowContext& rContext,
const DrawShapeSharedPtr& rDrawShape,
const WakeupEventSharedPtr& rWakeupEvent,
@@ -257,7 +255,6 @@ namespace slideshow
}
-
ActivitySharedPtr createIntrinsicAnimationActivity(
const SlideShowContext& rContext,
const DrawShapeSharedPtr& rDrawShape,
diff --git a/slideshow/source/engine/shapes/mediashape.cxx b/slideshow/source/engine/shapes/mediashape.cxx
index 2961be5d9fd3..4981117e4dc2 100644
--- a/slideshow/source/engine/shapes/mediashape.cxx
+++ b/slideshow/source/engine/shapes/mediashape.cxx
@@ -100,7 +100,6 @@ namespace slideshow
}
-
void MediaShape::implViewChanged( const UnoViewSharedPtr& rView )
{
const ::basegfx::B2DRectangle& rBounds = getBounds();
@@ -111,7 +110,6 @@ namespace slideshow
}
-
void MediaShape::implViewsChanged()
{
const ::basegfx::B2DRectangle& rBounds = getBounds();
@@ -121,7 +119,6 @@ namespace slideshow
}
-
void MediaShape::addViewLayer( const ViewLayerSharedPtr& rNewLayer,
bool bRedrawLayer )
{
@@ -139,7 +136,6 @@ namespace slideshow
}
-
bool MediaShape::removeViewLayer( const ViewLayerSharedPtr& rLayer )
{
const ViewMediaShapeVector::iterator aEnd( maViewMediaShapes.end() );
@@ -170,14 +166,12 @@ namespace slideshow
}
-
void MediaShape::clearAllViewLayers()
{
maViewMediaShapes.clear();
}
-
bool MediaShape::implRender( const ::basegfx::B2DRange& rCurrBounds ) const
{
// redraw all view shapes, by calling their update() method
@@ -197,7 +191,6 @@ namespace slideshow
}
-
bool MediaShape::implStartIntrinsicAnimation()
{
for( const auto& pViewMediaShape : maViewMediaShapes )
@@ -209,7 +202,6 @@ namespace slideshow
}
-
bool MediaShape::implEndIntrinsicAnimation()
{
for( const auto& pViewMediaShape : maViewMediaShapes )
@@ -221,7 +213,6 @@ namespace slideshow
}
-
void MediaShape::implPauseIntrinsicAnimation()
{
for( const auto& pViewMediaShape : maViewMediaShapes )
@@ -231,14 +222,12 @@ namespace slideshow
}
-
bool MediaShape::implIsIntrinsicAnimationPlaying() const
{
return mbIsPlaying;
}
-
void MediaShape::implSetIntrinsicAnimationTime(double fTime)
{
for( const auto& pViewMediaShape : maViewMediaShapes )
@@ -246,7 +235,6 @@ namespace slideshow
}
-
ShapeSharedPtr createMediaShape(
const uno::Reference< drawing::XShape >& xShape,
double nPrio,
diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx
index 495e24f7b8ef..47f8f78a698a 100644
--- a/slideshow/source/engine/shapes/viewappletshape.cxx
+++ b/slideshow/source/engine/shapes/viewappletshape.cxx
@@ -98,7 +98,6 @@ namespace slideshow
}
-
ViewAppletShape::~ViewAppletShape()
{
try
@@ -115,14 +114,12 @@ namespace slideshow
}
-
ViewLayerSharedPtr ViewAppletShape::getViewLayer() const
{
return mpViewLayer;
}
-
void ViewAppletShape::startApplet( const ::basegfx::B2DRectangle& rBounds )
{
ENSURE_OR_RETURN_VOID( mpViewLayer && mpViewLayer->getCanvas() && mpViewLayer->getCanvas()->getUNOCanvas().is(),
@@ -207,7 +204,6 @@ namespace slideshow
}
-
void ViewAppletShape::endApplet()
{
uno::Reference<util::XCloseable> xCloseable(
@@ -222,7 +218,6 @@ namespace slideshow
}
-
bool ViewAppletShape::render( const ::basegfx::B2DRectangle& rBounds ) const
{
::cppcanvas::CanvasSharedPtr pCanvas = mpViewLayer->getCanvas();
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index 05d5cf70b01b..4a21f1af49dc 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -95,7 +95,6 @@ namespace slideshow
}
-
ViewMediaShape::~ViewMediaShape()
{
try
@@ -112,14 +111,12 @@ namespace slideshow
}
-
ViewLayerSharedPtr ViewMediaShape::getViewLayer() const
{
return mpViewLayer;
}
-
void ViewMediaShape::startMedia()
{
if( !mxPlayer.is() )
@@ -130,7 +127,6 @@ namespace slideshow
}
-
void ViewMediaShape::endMedia()
{
// shutdown player window
@@ -162,7 +158,6 @@ namespace slideshow
}
-
void ViewMediaShape::pauseMedia()
{
if (mxPlayer.is())
@@ -170,7 +165,6 @@ namespace slideshow
}
-
void ViewMediaShape::setMediaTime(double fTime)
{
if (mxPlayer.is())
@@ -178,7 +172,6 @@ namespace slideshow
}
-
bool ViewMediaShape::render( const ::basegfx::B2DRectangle& rBounds ) const
{
#if !HAVE_FEATURE_AVMEDIA
@@ -296,7 +289,6 @@ namespace slideshow
}
-
bool ViewMediaShape::implInitialize( const ::basegfx::B2DRectangle& rBounds )
{
if( !mxPlayer.is() && mxShape.is() )
@@ -358,7 +350,6 @@ namespace slideshow
}
-
void ViewMediaShape::implSetMediaProperties( const uno::Reference< beans::XPropertySet >& rxProps )
{
if( mxPlayer.is() )
@@ -398,7 +389,6 @@ namespace slideshow
}
-
void ViewMediaShape::implInitializeMediaPlayer( const OUString& rMediaURL, const OUString& rMimeType )
{
#if !HAVE_FEATURE_AVMEDIA
@@ -428,7 +418,6 @@ namespace slideshow
}
-
void ViewMediaShape::implInitializePlayerWindow( const ::basegfx::B2DRectangle& rBounds,
const uno::Sequence< uno::Any >& rVCLDeviceParams,
const OUString& rMimeType )
diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx
index e9180a774701..a10d34602564 100644
--- a/slideshow/source/engine/shapes/viewshape.cxx
+++ b/slideshow/source/engine/shapes/viewshape.cxx
@@ -712,8 +712,6 @@ namespace slideshow
}
-
-
ViewShape::ViewShape( const ViewLayerSharedPtr& rViewLayer ) :
mpViewLayer( rViewLayer ),
maRenderers(),
diff --git a/slideshow/source/engine/slide/layer.hxx b/slideshow/source/engine/slide/layer.hxx
index 8de60eaebdd8..79b1c1c66395 100644
--- a/slideshow/source/engine/slide/layer.hxx
+++ b/slideshow/source/engine/slide/layer.hxx
@@ -82,9 +82,6 @@ namespace slideshow
static ::boost::shared_ptr< Layer > createLayer();
-
-
-
/** Predicate, whether this layer is the special
background layer
@@ -123,9 +120,6 @@ namespace slideshow
void setShapeViews( ShapeSharedPtr const& rShape ) const;
-
-
-
/** Change layer priority range.
The layer priority affects the position of the layer
diff --git a/slideshow/source/engine/slide/layermanager.hxx b/slideshow/source/engine/slide/layermanager.hxx
index 6426c79da8a4..97f5425fb251 100644
--- a/slideshow/source/engine/slide/layermanager.hxx
+++ b/slideshow/source/engine/slide/layermanager.hxx
@@ -250,9 +250,6 @@ namespace slideshow
typedef ::std::set< ShapeSharedPtr > ShapeUpdateSet;
-
-
-
/// Adds shape area to containing layer's damage area
void addUpdateArea( ShapeSharedPtr const& rShape );
diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx
index e74b1ffa2f6d..facc748cbc9f 100644
--- a/slideshow/source/engine/slide/shapemanagerimpl.cxx
+++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx
@@ -403,7 +403,6 @@ void ShapeManagerImpl::notifyIntrinsicAnimationsDisabled()
}
-
} // namespace internal
} // namespace presentation
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index e289ea6ce9d0..1894c7036501 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -68,7 +68,6 @@
using namespace ::com::sun::star;
-
namespace slideshow
{
namespace internal
@@ -285,9 +284,6 @@ private:
};
-
-
-
void slideRenderer( SlideImpl* pSlide, const UnoViewSharedPtr& rView )
{
// fully clear view content to background color
@@ -314,9 +310,6 @@ void slideRenderer( SlideImpl* pSlide, const UnoViewSharedPtr& rView )
}
-
-
-
SlideImpl::SlideImpl( const uno::Reference< drawing::XDrawPage >& xDrawPage,
const uno::Reference<drawing::XDrawPagesSupplier>& xDrawPages,
const uno::Reference< animations::XAnimationNode >& xRootNode,
@@ -442,7 +435,6 @@ void SlideImpl::show( bool bSlideBackgoundPainted )
mpShapeManager->activate( true );
-
// render slide to screen, if requested
if( !bSlideBackgoundPainted )
{
@@ -453,7 +445,6 @@ void SlideImpl::show( bool bSlideBackgoundPainted )
}
-
// fire up animations
const bool bIsAnimated( isAnimated() );
if( bIsAnimated )
@@ -494,18 +485,15 @@ void SlideImpl::hide()
return; // already hidden/disposed
-
// from now on, all animations are stopped
meAnimationState = FINAL_STATE;
-
// disable user paint overlay under all circumstances,
// this slide now ceases to be active.
deactivatePaintOverlay();
-
// switch off all shape-intrinsic animations.
endIntrinsicAnimations();
@@ -513,7 +501,6 @@ void SlideImpl::hide()
maAnimations.end();
-
// disable shape management & event broadcasting for shapes of this
// slide. Also disables LayerManager.
mpShapeManager->deactivate();
@@ -603,7 +590,6 @@ SlideBitmapSharedPtr SlideImpl::getCurrentSlideBitmap( const UnoViewSharedPtr& r
// private methods
-
void SlideImpl::viewAdded( const UnoViewSharedPtr& rView )
{
maSlideBitmaps.push_back(
diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx
index 53d161a0d271..65bee1bb446b 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -236,8 +236,6 @@ basegfx::B2IRange getLayerBoundsPixel( basegfx::B2DRange const& rLayerBounds
}
-
-
/** Container class for sprites issued by a ViewLayer
This class handles the sprite prioritization issues, that are
@@ -367,9 +365,6 @@ public:
};
-
-
-
/** This class provides layers for a slide view
Layers are used to render animations with the correct z order -
@@ -662,8 +657,6 @@ private:
};
-
-
typedef cppu::WeakComponentImplHelper<
css::util::XModifyListener,
css::awt::XPaintListener> SlideViewBase;
diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx
index 231884f1187f..148d5bbce137 100644
--- a/slideshow/source/engine/smilfunctionparser.cxx
+++ b/slideshow/source/engine/smilfunctionparser.cxx
@@ -47,7 +47,6 @@
#include <stack>
-
/* Implementation of SmilFunctionParser class */
namespace slideshow
diff --git a/slideshow/source/engine/sp_debug.cxx b/slideshow/source/engine/sp_debug.cxx
index e0ecd32c7821..664cfe297d7f 100644
--- a/slideshow/source/engine/sp_debug.cxx
+++ b/slideshow/source/engine/sp_debug.cxx
@@ -18,7 +18,6 @@
*/
-
// sp_collector.cpp
// Copyright (c) 2002, 2003 Peter Dimov
diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
index 3e674c397a53..9b6493dcf4a4 100644
--- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
@@ -47,7 +47,6 @@
#include <memory>
-
/***************************************************
*** ***
*** Slide Transition Effects ***
diff --git a/slideshow/source/engine/unoviewcontainer.cxx b/slideshow/source/engine/unoviewcontainer.cxx
index 692b1040a212..8306085ab5cc 100644
--- a/slideshow/source/engine/unoviewcontainer.cxx
+++ b/slideshow/source/engine/unoviewcontainer.cxx
@@ -28,7 +28,6 @@
using namespace ::com::sun::star;
-
namespace slideshow
{
namespace internal
diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx
index d38499628053..6c54c400244f 100644
--- a/slideshow/source/engine/usereventqueue.cxx
+++ b/slideshow/source/engine/usereventqueue.cxx
@@ -533,7 +533,6 @@ void UserEventQueue::registerEvent(
}
-
UserEventQueue::UserEventQueue( EventMultiplexer& rMultiplexer,
EventQueue& rEventQueue,
CursorManager& rCursorManager )
diff --git a/slideshow/source/inc/listenercontainer.hxx b/slideshow/source/inc/listenercontainer.hxx
index 4416c6aafdbf..91529069462f 100644
--- a/slideshow/source/inc/listenercontainer.hxx
+++ b/slideshow/source/inc/listenercontainer.hxx
@@ -419,7 +419,6 @@ private:
};
-
/** ListenerContainer variant that serialized access
This ListenerContainer is safe to use in a multi-threaded
@@ -436,7 +435,6 @@ class ThreadSafeListenerContainer : public ListenerContainerBase<ListenerT,
};
-
/** ListenerContainer variant that does not serialize access
This ListenerContainer version is not safe to use in a
diff --git a/slideshow/test/tests.hxx b/slideshow/test/tests.hxx
index 1cf44c831dd5..7ce77859903e 100644
--- a/slideshow/test/tests.hxx
+++ b/slideshow/test/tests.hxx
@@ -44,9 +44,6 @@ typedef boost::shared_ptr<TestView> TestViewSharedPtr;
TestViewSharedPtr createTestView();
-
-
-
class TestShape : public slideshow::internal::AnimatableShape
{
public:
diff --git a/slideshow/test/testshape.cxx b/slideshow/test/testshape.cxx
index 8eaf58e01ee9..bfa05fd00b44 100644
--- a/slideshow/test/testshape.cxx
+++ b/slideshow/test/testshape.cxx
@@ -108,9 +108,6 @@ private:
}
-
-
-
// Shape
virtual uno::Reference< drawing::XShape > getXShape() const
{