summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorAlexander Wilms <f.alexander.wilms@gmail.com>2014-02-22 21:20:15 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-02-23 03:38:49 +0000
commit0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch)
tree5024cba9f9ea5e3b23ea26025323f6aef39488d0 /slideshow
parentb81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff)
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb Reviewed-on: https://gerrit.libreoffice.org/8182 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/animationfactory.cxx12
-rw-r--r--slideshow/source/engine/animationnodes/animationnodefactory.cxx4
-rw-r--r--slideshow/source/engine/shapes/appletshape.cxx26
-rw-r--r--slideshow/source/engine/shapes/backgroundshape.cxx8
-rw-r--r--slideshow/source/engine/shapes/drawshape.cxx4
-rw-r--r--slideshow/source/engine/shapes/externalshapebase.cxx36
-rw-r--r--slideshow/source/engine/shapes/mediashape.cxx28
-rw-r--r--slideshow/source/engine/shapes/shapeimporter.cxx4
-rw-r--r--slideshow/source/engine/shapes/viewappletshape.cxx10
-rw-r--r--slideshow/source/engine/shapes/viewmediashape.cxx24
-rw-r--r--slideshow/source/engine/shapes/viewshape.cxx8
-rw-r--r--slideshow/source/engine/slide/layermanager.cxx2
-rw-r--r--slideshow/source/engine/slide/slideimpl.cxx36
-rw-r--r--slideshow/source/engine/slideshowimpl.cxx2
-rw-r--r--slideshow/source/engine/slideview.cxx8
-rw-r--r--slideshow/source/engine/transitions/clippingfunctor.cxx2
-rw-r--r--slideshow/source/engine/transitions/shapetransitionfactory.cxx4
-rw-r--r--slideshow/source/engine/unoviewcontainer.cxx2
-rw-r--r--slideshow/test/slidetest.cxx2
-rw-r--r--slideshow/test/views.cxx2
20 files changed, 112 insertions, 112 deletions
diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx
index d7877828e4fa..2d3017260eff 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -91,7 +91,7 @@ namespace slideshow
}
// Animation interface
- // -------------------
+
virtual void prefetch( const AnimatableShapeSharedPtr&,
const ShapeAttributeLayerSharedPtr& )
{}
@@ -137,7 +137,7 @@ namespace slideshow
}
// PairAnimation interface
- // -----------------------
+
virtual bool operator()( const ::basegfx::B2DTuple& rValue )
{
@@ -245,7 +245,7 @@ namespace slideshow
}
// Animation interface
- // -------------------
+
virtual void prefetch( const AnimatableShapeSharedPtr&,
const ShapeAttributeLayerSharedPtr& )
{}
@@ -300,7 +300,7 @@ namespace slideshow
}
// NumberAnimation interface
- // -----------------------
+
virtual bool operator()( double nValue )
{
@@ -443,7 +443,7 @@ namespace slideshow
}
// Animation interface
- // -------------------
+
virtual void prefetch( const AnimatableShapeSharedPtr&,
const ShapeAttributeLayerSharedPtr& )
{}
@@ -518,7 +518,7 @@ namespace slideshow
}
// Derived Animation interface
- // ---------------------------
+
/** For by-reference interfaces (B2DTuple, OUString)
*/
diff --git a/slideshow/source/engine/animationnodes/animationnodefactory.cxx b/slideshow/source/engine/animationnodes/animationnodefactory.cxx
index bdb6b90f5a36..e109f18262fb 100644
--- a/slideshow/source/engine/animationnodes/animationnodefactory.cxx
+++ b/slideshow/source/engine/animationnodes/animationnodefactory.cxx
@@ -365,7 +365,7 @@ bool implCreateIteratedNodes(
else
{
// setup iteration parameters
- // --------------------------
+
// iterate target is the whole shape (or the
// whole parent subshape), thus, can save
@@ -399,7 +399,7 @@ bool implCreateIteratedNodes(
// iterate node, generate copies of the children for each subset
- // -------------------------------------------------------------
+
// NodeContext::mnStartDelay contains additional node delay.
// This will make the duplicated nodes for each iteration start
diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx
index 57506f1da921..502bec2bf036 100644
--- a/slideshow/source/engine/shapes/appletshape.cxx
+++ b/slideshow/source/engine/shapes/appletshape.cxx
@@ -82,7 +82,7 @@ namespace slideshow
private:
// View layer methods
- //------------------------------------------------------------------
+
virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer,
bool bRedrawLayer );
@@ -91,7 +91,7 @@ namespace slideshow
// ExternalShapeBase methods
- //------------------------------------------------------------------
+
virtual bool implRender( const ::basegfx::B2DRange& rCurrBounds ) const;
virtual void implViewChanged( const UnoViewSharedPtr& rView );
@@ -127,7 +127,7 @@ namespace slideshow
{
}
- // ---------------------------------------------------------------------
+
void AppletShape::implViewChanged( const UnoViewSharedPtr& rView )
{
@@ -143,7 +143,7 @@ namespace slideshow
}
}
- // ---------------------------------------------------------------------
+
void AppletShape::implViewsChanged()
{
@@ -156,7 +156,7 @@ namespace slideshow
::boost::cref( AppletShape::getBounds())) );
}
- // ---------------------------------------------------------------------
+
void AppletShape::addViewLayer( const ViewLayerSharedPtr& rNewLayer,
bool bRedrawLayer )
@@ -185,7 +185,7 @@ namespace slideshow
}
}
- // ---------------------------------------------------------------------
+
bool AppletShape::removeViewLayer( const ViewLayerSharedPtr& rLayer )
{
@@ -219,7 +219,7 @@ namespace slideshow
return true;
}
- // ---------------------------------------------------------------------
+
bool AppletShape::clearAllViewLayers()
{
@@ -227,7 +227,7 @@ namespace slideshow
return true;
}
- // ---------------------------------------------------------------------
+
bool AppletShape::implRender( const ::basegfx::B2DRange& rCurrBounds ) const
{
@@ -248,7 +248,7 @@ namespace slideshow
return true;
}
- // ---------------------------------------------------------------------
+
bool AppletShape::implStartIntrinsicAnimation()
{
@@ -262,7 +262,7 @@ namespace slideshow
return true;
}
- // ---------------------------------------------------------------------
+
bool AppletShape::implEndIntrinsicAnimation()
{
@@ -275,7 +275,7 @@ namespace slideshow
return true;
}
- // ---------------------------------------------------------------------
+
bool AppletShape::implPauseIntrinsicAnimation()
{
@@ -284,14 +284,14 @@ namespace slideshow
return true;
}
- // ---------------------------------------------------------------------
+
bool AppletShape::implIsIntrinsicAnimationPlaying() const
{
return mbIsPlaying;
}
- // ---------------------------------------------------------------------
+
void AppletShape::implSetIntrinsicAnimationTime(double)
{
diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx
index 79b3817ac1f8..674664ffdac9 100644
--- a/slideshow/source/engine/shapes/backgroundshape.cxx
+++ b/slideshow/source/engine/shapes/backgroundshape.cxx
@@ -82,7 +82,7 @@ namespace slideshow
::com::sun::star::drawing::XShape > getXShape() const;
// View layer methods
- //------------------------------------------------------------------
+
virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer,
bool bRedrawLayer );
@@ -91,7 +91,7 @@ namespace slideshow
// attribute methods
- //------------------------------------------------------------------
+
virtual ::basegfx::B2DRectangle getBounds() const;
virtual ::basegfx::B2DRectangle getDomBounds() const;
@@ -102,7 +102,7 @@ namespace slideshow
// render methods
- //------------------------------------------------------------------
+
virtual bool update() const;
virtual bool render() const;
@@ -149,7 +149,7 @@ namespace slideshow
// there is a special background shape, add it
// as the first one
- // ---------------------------------------------------
+
sal_Int32 nDocWidth=0;
sal_Int32 nDocHeight=0;
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
index 76e60b4e13ef..1bb3a29459c6 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -207,7 +207,7 @@ namespace slideshow
// determine what has to be updated
- // --------------------------------
+
// do we have an attribute layer?
if( mpAttributeLayer )
@@ -327,7 +327,7 @@ namespace slideshow
// retrieve bounds for subset of whole metafile
- // --------------------------------------------
+
::basegfx::B2DRange aTotalBounds;
diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx
index d6375a9e1cdf..a6daaec7c2b0 100644
--- a/slideshow/source/engine/shapes/externalshapebase.cxx
+++ b/slideshow/source/engine/shapes/externalshapebase.cxx
@@ -54,7 +54,7 @@ namespace slideshow
private:
// ViewEventHandler
- // -------------------------------------------------
+
virtual void viewAdded( const UnoViewSharedPtr& ) {}
virtual void viewRemoved( const UnoViewSharedPtr& ) {}
@@ -69,7 +69,7 @@ namespace slideshow
// IntrinsicAnimationEventHandler
- // -------------------------------------------------
+
virtual bool enableAnimations()
{
@@ -101,7 +101,7 @@ namespace slideshow
mrEventMultiplexer.addViewHandler( mpListener );
}
- // ---------------------------------------------------------------------
+
ExternalShapeBase::~ExternalShapeBase()
{
@@ -119,56 +119,56 @@ 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
{
@@ -182,49 +182,49 @@ namespace slideshow
return implRender( maBounds );
}
- // ---------------------------------------------------------------------
+
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
{
diff --git a/slideshow/source/engine/shapes/mediashape.cxx b/slideshow/source/engine/shapes/mediashape.cxx
index c47b081c64ba..9c34049b400e 100644
--- a/slideshow/source/engine/shapes/mediashape.cxx
+++ b/slideshow/source/engine/shapes/mediashape.cxx
@@ -68,7 +68,7 @@ namespace slideshow
private:
// View layer methods
- //------------------------------------------------------------------
+
virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer,
bool bRedrawLayer );
@@ -77,7 +77,7 @@ namespace slideshow
// ExternalShapeBase methods
- //------------------------------------------------------------------
+
virtual bool implRender( const ::basegfx::B2DRange& rCurrBounds ) const;
virtual void implViewChanged( const UnoViewSharedPtr& rView );
@@ -104,7 +104,7 @@ namespace slideshow
{
}
- // ---------------------------------------------------------------------
+
void MediaShape::implViewChanged( const UnoViewSharedPtr& rView )
{
@@ -120,7 +120,7 @@ namespace slideshow
}
}
- // ---------------------------------------------------------------------
+
void MediaShape::implViewsChanged()
{
@@ -133,7 +133,7 @@ namespace slideshow
::boost::cref( getBounds())) );
}
- // ---------------------------------------------------------------------
+
void MediaShape::addViewLayer( const ViewLayerSharedPtr& rNewLayer,
bool bRedrawLayer )
@@ -151,7 +151,7 @@ namespace slideshow
maViewMediaShapes.back()->render( getBounds() );
}
- // ---------------------------------------------------------------------
+
bool MediaShape::removeViewLayer( const ViewLayerSharedPtr& rLayer )
{
@@ -185,7 +185,7 @@ namespace slideshow
return true;
}
- // ---------------------------------------------------------------------
+
bool MediaShape::clearAllViewLayers()
{
@@ -193,7 +193,7 @@ namespace slideshow
return true;
}
- // ---------------------------------------------------------------------
+
bool MediaShape::implRender( const ::basegfx::B2DRange& rCurrBounds ) const
{
@@ -214,7 +214,7 @@ namespace slideshow
return true;
}
- // ---------------------------------------------------------------------
+
bool MediaShape::implStartIntrinsicAnimation()
{
@@ -227,7 +227,7 @@ namespace slideshow
return true;
}
- // ---------------------------------------------------------------------
+
bool MediaShape::implEndIntrinsicAnimation()
{
@@ -240,7 +240,7 @@ namespace slideshow
return true;
}
- // ---------------------------------------------------------------------
+
bool MediaShape::implPauseIntrinsicAnimation()
{
@@ -253,14 +253,14 @@ namespace slideshow
return true;
}
- // ---------------------------------------------------------------------
+
bool MediaShape::implIsIntrinsicAnimationPlaying() const
{
return mbIsPlaying;
}
- // ---------------------------------------------------------------------
+
void MediaShape::implSetIntrinsicAnimationTime(double fTime)
{
@@ -270,7 +270,7 @@ namespace slideshow
_1, boost::cref(fTime)) );
}
- // ---------------------------------------------------------------------
+
ShapeSharedPtr createMediaShape(
const uno::Reference< drawing::XShape >& xShape,
diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx
index 5d1879fde006..2f1a8588d61f 100644
--- a/slideshow/source/engine/shapes/shapeimporter.cxx
+++ b/slideshow/source/engine/shapes/shapeimporter.cxx
@@ -356,7 +356,7 @@ ShapeSharedPtr ShapeImporter::createShape(
// now extract relevant shape attributes via API
- // ---------------------------------------------
+
drawing::ColorMode eColorMode( drawing::ColorMode_STANDARD );
sal_Int16 nLuminance(0);
@@ -400,7 +400,7 @@ ShapeSharedPtr ShapeImporter::createShape(
// fetch readily transformed and color-modified
// graphic
- // ---------------------------------------------
+
Graphic aGraphic(
aGraphicObject.GetTransformedGraphic(
diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx
index 87175eeb3d8a..00f2456c7c1e 100644
--- a/slideshow/source/engine/shapes/viewappletshape.cxx
+++ b/slideshow/source/engine/shapes/viewappletshape.cxx
@@ -100,7 +100,7 @@ namespace slideshow
}
}
- // ---------------------------------------------------------------------
+
ViewAppletShape::~ViewAppletShape()
{
@@ -117,14 +117,14 @@ namespace slideshow
}
}
- // ---------------------------------------------------------------------
+
ViewLayerSharedPtr ViewAppletShape::getViewLayer() const
{
return mpViewLayer;
}
- // ---------------------------------------------------------------------
+
bool ViewAppletShape::startApplet( const ::basegfx::B2DRectangle& rBounds )
{
@@ -213,7 +213,7 @@ namespace slideshow
return true;
}
- // ---------------------------------------------------------------------
+
void ViewAppletShape::endApplet()
{
@@ -228,7 +228,7 @@ namespace slideshow
}
}
- // ---------------------------------------------------------------------
+
bool ViewAppletShape::render( const ::basegfx::B2DRectangle& rBounds ) const
{
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index e4138c3230db..24873968703a 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -91,7 +91,7 @@ namespace slideshow
}
}
- // ---------------------------------------------------------------------
+
ViewMediaShape::~ViewMediaShape()
{
@@ -108,14 +108,14 @@ namespace slideshow
}
}
- // ---------------------------------------------------------------------
+
ViewLayerSharedPtr ViewMediaShape::getViewLayer() const
{
return mpViewLayer;
}
- // ---------------------------------------------------------------------
+
bool ViewMediaShape::startMedia()
{
@@ -128,7 +128,7 @@ namespace slideshow
return true;
}
- // ---------------------------------------------------------------------
+
void ViewMediaShape::endMedia()
{
@@ -159,7 +159,7 @@ namespace slideshow
}
}
- // ---------------------------------------------------------------------
+
void ViewMediaShape::pauseMedia()
{
@@ -167,7 +167,7 @@ namespace slideshow
mxPlayer->stop();
}
- // ---------------------------------------------------------------------
+
void ViewMediaShape::setMediaTime(double fTime)
{
@@ -175,7 +175,7 @@ namespace slideshow
mxPlayer->setMediaTime(fTime);
}
- // ---------------------------------------------------------------------
+
bool ViewMediaShape::render( const ::basegfx::B2DRectangle& rBounds ) const
{
@@ -278,7 +278,7 @@ namespace slideshow
return true;
}
- // ---------------------------------------------------------------------
+
bool ViewMediaShape::implInitialize( const ::basegfx::B2DRectangle& rBounds )
{
@@ -354,7 +354,7 @@ namespace slideshow
return mxPlayer.is() || mxPlayerWindow.is();
}
- // ---------------------------------------------------------------------
+
void ViewMediaShape::implSetMediaProperties( const uno::Reference< beans::XPropertySet >& rxProps )
{
@@ -394,7 +394,7 @@ namespace slideshow
}
}
- // ---------------------------------------------------------------------
+
void ViewMediaShape::implInitializeMediaPlayer( const OUString& rMediaURL )
{
@@ -421,7 +421,7 @@ namespace slideshow
}
}
- // ---------------------------------------------------------------------
+
bool ViewMediaShape::implInitializeVCLBasedPlayerWindow( const ::basegfx::B2DRectangle& rBounds,
const uno::Sequence< uno::Any >& rVCLDeviceParams)
@@ -509,7 +509,7 @@ namespace slideshow
return mxPlayerWindow.is();
}
- // ---------------------------------------------------------------------
+
bool ViewMediaShape::implInitializeDXBasedPlayerWindow( const ::basegfx::B2DRectangle& rBounds,
const uno::Sequence< uno::Any >& rDXDeviceParams )
diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx
index 6be622bc5a99..6fc93cb21085 100644
--- a/slideshow/source/engine/shapes/viewshape.cxx
+++ b/slideshow/source/engine/shapes/viewshape.cxx
@@ -231,7 +231,7 @@ namespace slideshow
else
{
// render subsets of whole metafile
- // --------------------------------
+
bool bRet(true);
VectorOfDocTreeNodes::const_iterator aIter( rSubsets.begin() );
@@ -556,7 +556,7 @@ namespace slideshow
// shape needs repaint - setup all that's needed
- // ---------------------------------------------
+
boost::optional<basegfx::B2DPolyPolygon> aClip;
@@ -580,7 +580,7 @@ namespace slideshow
// render with global alpha - have to prepare
// a bitmap, and render that with modulated
// alpha
- // -------------------------------------------
+
const ::basegfx::B2DHomMatrix aTransform(
getShapeTransformation( rBounds,
@@ -721,7 +721,7 @@ namespace slideshow
}
- // -------------------------------------------------------------------------------------
+
ViewShape::ViewShape( const ViewLayerSharedPtr& rViewLayer ) :
mpViewLayer( rViewLayer ),
diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx
index bbe45787836f..7640e086ed01 100644
--- a/slideshow/source/engine/slide/layermanager.cxx
+++ b/slideshow/source/engine/slide/layermanager.cxx
@@ -816,7 +816,7 @@ namespace slideshow
{
// discontinuity found - current shape needs to
// get into a new layer
- // --------------------------------------------
+
// commit changes to previous layer
commitLayerChanges(nCurrLayerIndex,
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index 4ed8b92171b3..09224861cf9d 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -74,7 +74,7 @@
using namespace ::com::sun::star;
-// -----------------------------------------------------------------------------
+
namespace slideshow
{
@@ -113,13 +113,13 @@ public:
// Disposable interface
- // -------------------------------------------------------------------
+
virtual void dispose();
// Slide interface
- // -------------------------------------------------------------------
+
virtual bool prefetch();
virtual bool show( bool );
@@ -464,7 +464,7 @@ bool SlideImpl::prefetch()
bool SlideImpl::show( bool bSlideBackgoundPainted )
{
- // ---------------------------------------------------------------
+
if( mbActive )
return true; // already active
@@ -472,14 +472,14 @@ bool SlideImpl::show( bool bSlideBackgoundPainted )
if( !mpShapeManager || !mpLayerManager )
return false; // disposed
- // ---------------------------------------------------------------
+
// set initial shape attributes (e.g. hide shapes that have
// 'appear' effect set)
if( !applyInitialShapeAttributes(mxRootNode) )
return false;
- // ---------------------------------------------------------------
+
// activate and take over view - clears view, if necessary
mbActive = true;
@@ -491,7 +491,7 @@ bool SlideImpl::show( bool bSlideBackgoundPainted )
// buffered slide bitmaps instead.
mpShapeManager->activate( true );
- // ---------------------------------------------------------------
+
// render slide to screen, if requested
if( !bSlideBackgoundPainted )
@@ -506,7 +506,7 @@ bool SlideImpl::show( bool bSlideBackgoundPainted )
maContext.mrScreenUpdater.notifyUpdate();
}
- // ---------------------------------------------------------------
+
// fire up animations
const bool bIsAnimated( isAnimated() );
@@ -534,12 +534,12 @@ bool SlideImpl::show( bool bSlideBackgoundPainted )
if( mbIntrinsicAnimationsAllowed )
startIntrinsicAnimations();
- // ---------------------------------------------------------------
+
// enable paint overlay, if maUserPaintColor is valid
activatePaintOverlay();
- // ---------------------------------------------------------------
+
// from now on, animations might be showing
meAnimationState = SHOWING_STATE;
@@ -552,18 +552,18 @@ void SlideImpl::hide()
if( !mbActive || !mpShapeManager )
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();
@@ -571,7 +571,7 @@ void SlideImpl::hide()
// force-end all SMIL animations, too
maAnimations.end();
- // ---------------------------------------------------------------
+
// disable shape management & event broadcasting for shapes of this
// slide. Also disables LayerManager.
@@ -581,7 +581,7 @@ void SlideImpl::hide()
resetCursor();
mbActive = false;
- // ---------------------------------------------------------------
+
}
basegfx::B2ISize SlideImpl::getSlideSize() const
@@ -666,7 +666,7 @@ SlideBitmapSharedPtr SlideImpl::getCurrentSlideBitmap( const UnoViewSharedPtr& r
// private methods
-//--------------------------------------------------------------------------------------------------------------
+
void SlideImpl::viewAdded( const UnoViewSharedPtr& rView )
@@ -1135,7 +1135,7 @@ bool SlideImpl::loadShapes()
try
{
// load the masterpage shapes
- // -------------------------------------------------------------------------
+
ShapeImporter aMPShapesFunctor( xMasterPage,
mxDrawPage,
mxDrawPagesSupplier,
@@ -1182,7 +1182,7 @@ bool SlideImpl::loadShapes()
try
{
// load the normal page shapes
- // -------------------------------------------------------------------------
+
ShapeImporter aShapesFunctor( mxDrawPage,
mxDrawPage,
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 79d13d6179f2..fa112f372e70 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -327,7 +327,7 @@ private:
throw (uno::RuntimeException);
// CursorManager
- // -----------------------------------------------------------
+
virtual bool requestCursor( sal_Int16 nCursorShape );
virtual void resetCursor();
diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx
index 5db492d1b3b9..9b77578c3459 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -242,7 +242,7 @@ basegfx::B2IRange getLayerBoundsPixel( basegfx::B2DRange const& rLayerBounds
}
-// ----------------------------------------------------------------
+
/** Container class for sprites issued by a ViewLayer
@@ -377,7 +377,7 @@ public:
};
-// ----------------------------------------------------------------
+
/** This class provides layers for a slide view
@@ -500,7 +500,7 @@ public:
private:
// ViewLayer interface
- // ----------------------------------------------
+
virtual cppcanvas::CustomSpriteSharedPtr createSprite(
const ::basegfx::B2DSize& rSpriteSizePixel,
@@ -672,7 +672,7 @@ private:
};
-// ---------------------------------------------------------
+
typedef cppu::WeakComponentImplHelper2<
::com::sun::star::util::XModifyListener,
diff --git a/slideshow/source/engine/transitions/clippingfunctor.cxx b/slideshow/source/engine/transitions/clippingfunctor.cxx
index 5050d4fc2efc..34ef3e95749b 100644
--- a/slideshow/source/engine/transitions/clippingfunctor.cxx
+++ b/slideshow/source/engine/transitions/clippingfunctor.cxx
@@ -61,7 +61,7 @@ namespace slideshow
// maBackgroundRect.transform( aMatrix );
// extract modification info from maTransitionInfo
- // -----------------------------------------------
+
// perform general transformations _before_ the reverse
// mode changes. This allows the Transition table to be
diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
index 3eed4b7d7aa2..123d62861b6d 100644
--- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
@@ -62,7 +62,7 @@ public:
~ClippingAnimation();
// Animation interface
- // -------------------
+
virtual void prefetch( const AnimatableShapeSharedPtr& rShape,
const ShapeAttributeLayerSharedPtr& rAttrLayer );
virtual void start( const AnimatableShapeSharedPtr& rShape,
@@ -70,7 +70,7 @@ public:
virtual void end();
// NumberAnimation interface
- // -----------------------
+
virtual bool operator()( double nValue );
virtual double getUnderlyingValue() const;
diff --git a/slideshow/source/engine/unoviewcontainer.cxx b/slideshow/source/engine/unoviewcontainer.cxx
index 0416089b7ab1..a54799769e00 100644
--- a/slideshow/source/engine/unoviewcontainer.cxx
+++ b/slideshow/source/engine/unoviewcontainer.cxx
@@ -28,7 +28,7 @@
using namespace ::com::sun::star;
-// -----------------------------------------------------------------------------
+
namespace slideshow
{
diff --git a/slideshow/test/slidetest.cxx b/slideshow/test/slidetest.cxx
index 8b5f0a28d691..5a72b6bbc469 100644
--- a/slideshow/test/slidetest.cxx
+++ b/slideshow/test/slidetest.cxx
@@ -360,7 +360,7 @@ public:
}; // class LayerManagerTest
-// -----------------------------------------------------------------------------
+
CPPUNIT_TEST_SUITE_REGISTRATION(LayerManagerTest);
} // namespace
diff --git a/slideshow/test/views.cxx b/slideshow/test/views.cxx
index 8cd7fbe9af55..4b751b237d2e 100644
--- a/slideshow/test/views.cxx
+++ b/slideshow/test/views.cxx
@@ -73,7 +73,7 @@ public:
}; // class UnoViewContainerTest
-// -----------------------------------------------------------------------------
+
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(UnoViewContainerTest, "UnoViewContainerTest");
} // namespace