diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 20:37:55 +0100 |
|---|---|---|
| committer | Thorsten Behrens <thb@documentfoundation.org> | 2014-02-25 21:22:48 +0100 |
| commit | 6f2691bb6c9cacf1df547c0e38225461f018f696 (patch) | |
| tree | 763ad0bb6ecca6acb33e076a0c74d6f2f26afb27 /slideshow | |
| parent | 13ae60336608d807fb8129a5b3f4f482ad57448a (diff) | |
Remove visual noise from slideshow
Change-Id: I87d07afbffa9d4633ed31bdb88f2dad660c25a18
Diffstat (limited to 'slideshow')
49 files changed, 164 insertions, 166 deletions
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m b/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m index 339c36cdcf63..fb25114a3d60 100644 --- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m +++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ /* Subclass should put initialisation code that can be performaned lazily (on first frame render) here */ initialised = TRUE; - + /* Create a GLU quadric, used for rendering certain geometry */ quadric = gluNewQuadric(); gluQuadricDrawStyle(quadric, GLU_FILL); @@ -77,13 +77,13 @@ GLint vertex_compiled; GLint fragment_compiled; GLint linked; - + /* Delete any existing program object */ if (program_object) { glDeleteObjectARB(program_object); program_object = NULL; } - + /* Load and compile both shaders */ if (vertexString) { vertex_shader = glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB); @@ -96,7 +96,7 @@ vertex_shader = NULL; vertex_compiled = 1; } - + if (fragmentString) { fragment_shader = glCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB); fragment_string = [fragmentString cStringUsingEncoding:NSASCIIStringEncoding]; @@ -108,7 +108,7 @@ fragment_shader = NULL; fragment_compiled = 1; } - + /* Ensure both shaders compiled */ if (!vertex_compiled || !fragment_compiled) { if (vertex_shader) { @@ -121,7 +121,7 @@ } return 1; } - + /* Create a program object and link both shaders */ program_object = glCreateProgramObjectARB(); if (vertex_shader != NULL) @@ -137,13 +137,13 @@ glLinkProgramARB(program_object); glGetObjectParameterivARB(program_object, GL_OBJECT_LINK_STATUS_ARB, &linked); /* TODO - Get info log */ - + if (!linked) { glDeleteObjectARB(program_object); program_object = NULL; return 1; } - + return 0; } @@ -185,7 +185,7 @@ int NextHighestPowerOf2(int n) { n--; - n |= n >> 1; + n |= n >> 1; n |= n >> 2; n |= n >> 4; n |= n >> 8; @@ -208,12 +208,12 @@ NSBitmapImageRep *LoadImage(NSString *path, int shouldFlipVertical) NSImage *image; image = [[[NSImage alloc] initWithContentsOfFile: path] autorelease]; bitmapimagerep = [[NSBitmapImageRep alloc] initWithData:[image TIFFRepresentation]]; - + if (shouldFlipVertical) { int bytesPerRow, lowRow, highRow; unsigned char *pixelData, *swapRow; - + bytesPerRow = [bitmapimagerep bytesPerRow]; pixelData = [bitmapimagerep bitmapData]; diff --git a/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m b/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m index afdfc9b23e30..ac0e6a2ad86f 100644 --- a/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m +++ b/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m @@ -14,7 +14,7 @@ + (NSOpenGLPixelFormat*)defaultPixelFormat { // first simple implementation (let's see later with more complex ) - NSOpenGLPixelFormatAttribute attributes [] = + NSOpenGLPixelFormatAttribute attributes [] = { NSOpenGLPFAWindow, NSOpenGLPFADoubleBuffer, // double buffered @@ -123,7 +123,7 @@ { // get context. will create if we don't have one yet NSOpenGLContext* context = [self openGLContext]; - + // make sure we are ready to draw [super lockFocus]; @@ -163,7 +163,7 @@ } -- (void)encodeWithCoder:(NSCoder *)coder +- (void)encodeWithCoder:(NSCoder *)coder { [super encodeWithCoder:coder]; @@ -174,7 +174,7 @@ } } -- (id)initWithCoder:(NSCoder *)coder +- (id)initWithCoder:(NSCoder *)coder { self = [super initWithCoder:coder]; @@ -184,9 +184,9 @@ } else { _pixelFormat = [[coder decodeObjectForKey:@"NSPixelFormat"] retain]; } - + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_surfaceNeedsUpdate:) name:NSViewGlobalFrameDidChangeNotification object:self]; - + return self; } diff --git a/slideshow/source/engine/activities/activitybase.cxx b/slideshow/source/engine/activities/activitybase.cxx index ed433b268126..a2aa47d67a20 100644 --- a/slideshow/source/engine/activities/activitybase.cxx +++ b/slideshow/source/engine/activities/activitybase.cxx @@ -160,36 +160,36 @@ namespace slideshow { /* // calc accelerated/decelerated time. - // + // We have three intervals: // 1 [0,a] // 2 [a,d] // 3 [d,1] (with a and d being acceleration/deceleration // fraction, resp.) - // + // The change rate during interval 1 is constantly // increasing, reaching 1 at a. It then stays at 1, // starting a linear decrease at d, ending with 0 at // time 1. The integral of this function is the // required new time nT'. - // + // As we arbitrarily assumed 1 as the upper value of // the change rate, the integral must be normalized to // reach nT'=1 at the end of the interval. This // normalization constant is: - // + // c = 1 - 0.5a - 0.5d - // + // The integral itself then amounts to: - // + // 0.5 nT^2 / a + (nT-a) + (nT - 0.5 nT^2 / d) - // + // (where each of the three summands correspond to the // three intervals above, and are applied only if nT // has reached the corresponding interval) - // + // The graph of the change rate is a trapezoid: - // + // | // 1| /--------------\ // | / \ @@ -197,7 +197,7 @@ namespace slideshow // | / \ // ----------------------------- // 0 a d 1 - // + //*/ const double nC( 1.0 - 0.5*mnAccelerationFraction - 0.5*mnDecelerationFraction ); diff --git a/slideshow/source/engine/activities/discreteactivitybase.cxx b/slideshow/source/engine/activities/discreteactivitybase.cxx index 3706333f6bb5..cc5c01c3e86c 100644 --- a/slideshow/source/engine/activities/discreteactivitybase.cxx +++ b/slideshow/source/engine/activities/discreteactivitybase.cxx @@ -144,17 +144,17 @@ namespace slideshow // repeat is handled locally, only apply acceleration/deceleration. // Scale time vector with simple duration, offset with full repeat // times. - // + // Somewhat condensed, the argument for setNextTimeout below could // be written as - // + // mnSimpleDuration*(nFullRepeats + calcAcceleratedTime( currentRepeatTime )), - // + // with currentRepeatTime = maDiscreteTimes[ currentRepeatIndex ] - // + // Note that calcAcceleratedTime() is only applied to the current repeat's value, // not to the total resulting time. This is in accordance with the SMIL spec. - // + mpWakeupEvent->setNextTimeout( mnSimpleDuration*( calcRepeatCount( diff --git a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx index 13e62fc1480d..347483a19712 100644 --- a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx +++ b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx @@ -75,12 +75,12 @@ namespace slideshow double(mnCurrPerformCalls) / mnMinNumberOfFrames ); // okay, so now, the decision is easy: - // + // If the fraction of time elapsed is smaller than the // number of calls required to be performed, then we calc // the position on the animation range according to // elapsed time. That is, we're so to say ahead of time. - // + // In contrary, if the fraction of time elapsed is larger, // then we're lagging, and we thus calc the position on // the animation time line according to the fraction of @@ -213,7 +213,7 @@ namespace slideshow // with modf, nRelativeSimpleTime will never // become 1.0, since nRepeats is incremented and // nRelativeSimpleTime set to 0.0 then. - // + // For the animation to reach its final value, // nRepeats must although become // maRepeats.getValue()-1.0, and diff --git a/slideshow/source/engine/animatedsprite.cxx b/slideshow/source/engine/animatedsprite.cxx index 5d421c21bf05..ec56736054af 100644 --- a/slideshow/source/engine/animatedsprite.cxx +++ b/slideshow/source/engine/animatedsprite.cxx @@ -77,7 +77,7 @@ namespace slideshow // (linear means: without translational components). The // only translation that is imposed at the view transform // is the local content pixel offset. - // + // We can apply that directly here, no need to call // aLinearTransform.translate(), since, as said above, the // last column of aLinearTransform is assumed [0 0 1] diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx index 2d3017260eff..4b0eb2130649 100644 --- a/slideshow/source/engine/animationfactory.cxx +++ b/slideshow/source/engine/animationfactory.cxx @@ -504,7 +504,7 @@ namespace slideshow // shape's hold state), or by the animation // node (then, it's a forced end, and we // _have_ to snap back). - // + // To reiterate: normally, we're called from // the Activity first, thus the // notifyShapeUpdate() below will update to diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx b/slideshow/source/engine/animationnodes/animationbasenode.cxx index fe0c804e4925..a15ec0138bec 100644 --- a/slideshow/source/engine/animationnodes/animationbasenode.cxx +++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx @@ -66,19 +66,19 @@ AnimationBaseNode::AnimationBaseNode( uno::UNO_QUERY ); // distinguish 5 cases: - // + // - plain shape target // (NodeContext.mpMasterShapeSubset full set) - // + // - parent-generated subset (generate an // independent subset) - // + // - parent-generated subset from iteration // (generate a dependent subset) - // + // - XShape target at the XAnimatioNode (generate // a plain shape target) - // + // - ParagraphTarget target at the XAnimationNode // (generate an independent shape subset) if( rContext.mpMasterShapeSubset ) @@ -271,7 +271,7 @@ void AnimationBaseNode::activate_st() // determine whether an // Activity::getUnderlyingValue() yields the // DOM value, or already a summed-up conglomerate) - // + // Note that this poses problems with our // hybrid activity duration (time or min number of frames), // since if activities diff --git a/slideshow/source/engine/animationnodes/animationnodefactory.cxx b/slideshow/source/engine/animationnodes/animationnodefactory.cxx index e109f18262fb..311cd05f7d57 100644 --- a/slideshow/source/engine/animationnodes/animationnodefactory.cxx +++ b/slideshow/source/engine/animationnodes/animationnodefactory.cxx @@ -138,7 +138,7 @@ public: // e.g. activity counting does not work - subset // would be removed after first animation node // disables it). - // + // NOTE: this is only a problem for animation // nodes that explicitly call // disableSubsetShape(). Independent shape subsets @@ -299,9 +299,9 @@ bool implCreateIteratedNodes( // method). For ONLY_TEXT effects, // we skip this part, to animate // only the text. - // + // OR - // + // prepend with subset animation for full // _paragraph_, from which the individual // paragraph subsets are subtracted. Note that the diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index 570401b04818..d9498ad5ac93 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -675,7 +675,7 @@ void BaseNode::setSelf( const BaseNodeSharedPtr& rSelf ) } // Debug -//========================================================================= + #if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) void BaseNode::showState() const diff --git a/slideshow/source/engine/animationnodes/nodetools.hxx b/slideshow/source/engine/animationnodes/nodetools.hxx index 919f3bb276a2..5b9528b7e6f8 100644 --- a/slideshow/source/engine/animationnodes/nodetools.hxx +++ b/slideshow/source/engine/animationnodes/nodetools.hxx @@ -42,7 +42,7 @@ namespace slideshow { // Tools - //========================================================================= + #if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) int& debugGetCurrentOffset(); diff --git a/slideshow/source/engine/color.cxx b/slideshow/source/engine/color.cxx index 967ff39a1a7c..ee9b94910bc9 100644 --- a/slideshow/source/engine/color.cxx +++ b/slideshow/source/engine/color.cxx @@ -154,7 +154,7 @@ namespace slideshow // HSLColor - // =============================================== + HSLColor::HSLTriple::HSLTriple() : mnHue(), @@ -286,7 +286,7 @@ namespace slideshow // RGBColor - // =============================================== + RGBColor::RGBTriple::RGBTriple() : diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx index 67625937317b..0901cfae52db 100644 --- a/slideshow/source/engine/eventmultiplexer.cxx +++ b/slideshow/source/engine/eventmultiplexer.cxx @@ -108,7 +108,7 @@ template<typename T> inline T* get_pointer(PrioritizedHandlerEntry<T> const& han -//////////////////////////////////////////////////////////////////////////// + typedef cppu::WeakComponentImplHelper2< @@ -163,7 +163,7 @@ private: }; -//////////////////////////////////////////////////////////////////////////// + struct EventMultiplexerImpl @@ -322,7 +322,7 @@ struct EventMultiplexerImpl }; -/////////////////////////////////////////////////////////////////////////// + void SAL_CALL EventMultiplexerListener::disposing() @@ -418,7 +418,7 @@ void SAL_CALL EventMultiplexerListener::mouseMoved( } -/////////////////////////////////////////////////////////////////////////// + bool EventMultiplexerImpl::notifyAllAnimationHandlers( ImplAnimationHandlers const& rContainer, @@ -717,7 +717,7 @@ bool EventMultiplexerImpl::notifyNextEffect() _1 )) ); } -////////////////////////////////////////////////////////////////////////// + EventMultiplexer::EventMultiplexer( EventQueue& rEventQueue, diff --git a/slideshow/source/engine/screenupdater.cxx b/slideshow/source/engine/screenupdater.cxx index 19d03eaa4e40..35213cd76275 100644 --- a/slideshow/source/engine/screenupdater.cxx +++ b/slideshow/source/engine/screenupdater.cxx @@ -110,15 +110,15 @@ namespace internal return; // cases: - // + // (a) no update necessary at all - // + // (b) no ViewUpdate-generated update // I. update all views requested -> for_each( mrViewContainer ) // II. update some views requested -> for_each( maViewUpdateRequests ) - // + // (c) ViewUpdate-triggered update - update all views - // + // any ViewUpdate-triggered updates? const bool bViewUpdatesNeeded( diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx index 674664ffdac9..b1d9fab72cad 100644 --- a/slideshow/source/engine/shapes/backgroundshape.cxx +++ b/slideshow/source/engine/shapes/backgroundshape.cxx @@ -121,7 +121,7 @@ namespace slideshow }; - //////////////////////////////////////////////////////////////////////////////// + BackgroundShape::BackgroundShape( const uno::Reference< drawing::XDrawPage >& xDrawPage, @@ -308,7 +308,7 @@ namespace slideshow return false; // we're not animatable } - ////////////////////////////////////////////////////////// + ShapeSharedPtr createBackgroundShape( const uno::Reference< drawing::XDrawPage >& xDrawPage, diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx index c1b6b0ed7d8f..f19e9d8fe6a5 100644 --- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx +++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx @@ -192,7 +192,7 @@ private: // calculate the MixerState value for given time double GetMixerState(sal_uInt32 nTime); - //////////////////////////////////////////////////////////////////// + SlideShowContext maContext; boost::shared_ptr<WakeupEvent> mpWakeupEvent; @@ -243,7 +243,7 @@ private: Rectangle maPaintRectangleLogic; }; -////////////////////////////////////////////////////////////////////// + class IntrinsicAnimationListener : public IntrinsicAnimationEventHandler, private boost::noncopyable @@ -261,7 +261,7 @@ private: ActivityImpl& mrActivity; }; -////////////////////////////////////////////////////////////////////// + double ActivityImpl::GetMixerState( sal_uInt32 nTime ) { @@ -615,9 +615,9 @@ void ActivityImpl::updateShapeAttributes( } else if(mpMetaFile) // scroll mode: { - // + // keep care: the below code is highly sensible to changes... - // + // rectangle of the pure text: double const fPaintWidth = maPaintRectangleLogic.GetWidth(); diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index 1bb3a29459c6..b0f12fd6e79b 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -75,11 +75,11 @@ namespace slideshow { namespace internal { - ////////////////////////////////////////////////////////////////////// - // + + // Private methods - // - ////////////////////////////////////////////////////////////////////// + + GDIMetaFileSharedPtr DrawShape::forceScrollTextMetaFile() { @@ -523,11 +523,11 @@ namespace slideshow // issue for this #i72828# } - ////////////////////////////////////////////////////////////////////// - // + + // Public methods - // - ////////////////////////////////////////////////////////////////////// + + DrawShapeSharedPtr DrawShape::create( const uno::Reference< drawing::XShape >& xShape, @@ -1053,7 +1053,7 @@ namespace slideshow // AnimatableShape methods - // ====================================================== + void DrawShape::enterAnimationMode() { @@ -1091,7 +1091,7 @@ namespace slideshow // AttributableShape methods - // ====================================================== + ShapeAttributeLayerSharedPtr DrawShape::createAttributeLayer() { diff --git a/slideshow/source/engine/shapes/drawshape.hxx b/slideshow/source/engine/shapes/drawshape.hxx index 034f12485536..a34c99821f52 100644 --- a/slideshow/source/engine/shapes/drawshape.hxx +++ b/slideshow/source/engine/shapes/drawshape.hxx @@ -125,7 +125,7 @@ namespace slideshow // View layer methods - //------------------------------------------------------------------ + virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer, bool bRedrawLayer ); @@ -133,7 +133,7 @@ namespace slideshow virtual bool clearAllViewLayers(); // attribute methods - //------------------------------------------------------------------ + virtual ShapeAttributeLayerSharedPtr createAttributeLayer(); virtual bool revokeAttributeLayer( const ShapeAttributeLayerSharedPtr& rLayer ); @@ -147,21 +147,21 @@ namespace slideshow // animation methods - //------------------------------------------------------------------ + virtual void enterAnimationMode(); virtual void leaveAnimationMode(); virtual bool isBackgroundDetached() const; // render methods - //------------------------------------------------------------------ + virtual bool update() const; virtual bool render() const; virtual bool isContentChanged() const; // Sub item specialities - //------------------------------------------------------------------ + virtual const DocTreeNodeSupplier& getTreeNodeSupplier() const; virtual DocTreeNodeSupplier& getTreeNodeSupplier(); @@ -174,7 +174,7 @@ namespace slideshow // DocTreeNodeSupplier methods - //------------------------------------------------------------------ + virtual sal_Int32 getNumberOfTreeNodes ( DocTreeNode::NodeType eNodeType ) const; // throw ShapeLoadFailedException; virtual DocTreeNode getTreeNode ( sal_Int32 nNodeIndex, @@ -186,14 +186,14 @@ namespace slideshow DocTreeNode::NodeType eNodeType ) const; // throw ShapeLoadFailedException; // HyperlinkArea methods - //------------------------------------------------------------------ + virtual HyperlinkRegions getHyperlinkRegions() const; virtual double getHyperlinkPriority() const; // intrinsic animation methods - //------------------------------------------------------------------ + /** Display next frame of an intrinsic animation. diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx index 8a98dc9d4f60..2b791c8ea350 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx @@ -46,11 +46,11 @@ namespace slideshow namespace internal { - ////////////////////////////////////////////////////////////////////// - // + + // Private methods - // - ////////////////////////////////////////////////////////////////////// + + void DrawShapeSubsetting::ensureInitializedNodeTree() const { @@ -226,11 +226,11 @@ namespace slideshow } } - ////////////////////////////////////////////////////////////////////// - // + + // Public methods - // - ////////////////////////////////////////////////////////////////////// + + DrawShapeSubsetting::DrawShapeSubsetting() : maActionClassVector(), @@ -392,7 +392,7 @@ namespace slideshow // update currently active subset for _our_ shape (the // part of this shape that is visible, i.e. not displayed // in subset shapes) - // ====================================================== + // init bounds mnMinSubsetActionIndex = SAL_MAX_INT32; diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.hxx b/slideshow/source/engine/shapes/drawshapesubsetting.hxx index 0f3f1d38cf65..6c45f65e99e9 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.hxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.hxx @@ -78,7 +78,7 @@ namespace slideshow void reset( const ::boost::shared_ptr< GDIMetaFile >& rMtf ); // Shape subsetting methods - // ======================================================== + /// Return subset node for this shape DocTreeNode getSubsetNode () const; @@ -109,7 +109,7 @@ namespace slideshow // Doc tree methods - // ======================================================== + /// Return overall number of nodes for given type sal_Int32 getNumberOfTreeNodes ( DocTreeNode::NodeType eNodeType ) const; @@ -128,7 +128,7 @@ namespace slideshow DocTreeNode::NodeType eNodeType ) const; // Helper - // ======================================================== + /** Return a vector of currently active subsets. diff --git a/slideshow/source/engine/shapes/externalshapebase.hxx b/slideshow/source/engine/shapes/externalshapebase.hxx index 58849e82b87f..cfff14924697 100644 --- a/slideshow/source/engine/shapes/externalshapebase.hxx +++ b/slideshow/source/engine/shapes/externalshapebase.hxx @@ -66,7 +66,7 @@ namespace slideshow ::com::sun::star::drawing::XShape > getXShape() const; // animation methods - //------------------------------------------------------------------ + virtual void play(); virtual void stop(); @@ -75,7 +75,7 @@ namespace slideshow virtual void setMediaTime(double); // render methods - //------------------------------------------------------------------ + virtual bool update() const; virtual bool render() const; @@ -83,7 +83,7 @@ namespace slideshow // Shape attributes - //------------------------------------------------------------------ + virtual ::basegfx::B2DRectangle getBounds() const; virtual ::basegfx::B2DRectangle getDomBounds() const; diff --git a/slideshow/source/engine/shapes/gdimtftools.hxx b/slideshow/source/engine/shapes/gdimtftools.hxx index 121fd92c8a4e..5ba4aeed6331 100644 --- a/slideshow/source/engine/shapes/gdimtftools.hxx +++ b/slideshow/source/engine/shapes/gdimtftools.hxx @@ -36,7 +36,7 @@ class MetaAction; class GDIMetaFile; class Graphic; -// ----------------------------------------------------------------------------- + namespace slideshow { diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx index 89d5137ba78b..af58d1093026 100644 --- a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx +++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx @@ -96,7 +96,7 @@ namespace slideshow bool mbIsActive; }; - ////////////////////////////////////////////////////////////////////// + class IntrinsicAnimationListener : public IntrinsicAnimationEventHandler, private boost::noncopyable @@ -114,7 +114,7 @@ namespace slideshow IntrinsicAnimationActivity& mrActivity; }; - ////////////////////////////////////////////////////////////////////// + IntrinsicAnimationActivity::IntrinsicAnimationActivity( const SlideShowContext& rContext, const DrawShapeSharedPtr& rDrawShape, @@ -258,7 +258,7 @@ namespace slideshow shared_from_this() ); } - ////////////////////////////////////////////////////////////////////// + ActivitySharedPtr createIntrinsicAnimationActivity( const SlideShowContext& rContext, diff --git a/slideshow/source/engine/shapes/viewappletshape.hxx b/slideshow/source/engine/shapes/viewappletshape.hxx index d852ebd9ef76..f11a04bd704d 100644 --- a/slideshow/source/engine/shapes/viewappletshape.hxx +++ b/slideshow/source/engine/shapes/viewappletshape.hxx @@ -90,7 +90,7 @@ namespace slideshow ViewLayerSharedPtr getViewLayer() const; // animation methods - //------------------------------------------------------------------ + /** Notify the ViewShape that an animation starts now @@ -113,7 +113,7 @@ namespace slideshow void endApplet(); // render methods - //------------------------------------------------------------------ + /** Render the ViewShape diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx index 3bf4997d16ef..94b05eb1dda0 100644 --- a/slideshow/source/engine/shapes/viewmediashape.hxx +++ b/slideshow/source/engine/shapes/viewmediashape.hxx @@ -77,7 +77,7 @@ namespace slideshow ViewLayerSharedPtr getViewLayer() const; // animation methods - //------------------------------------------------------------------ + /** Notify the ViewShape that an animation starts now @@ -111,7 +111,7 @@ namespace slideshow void setMediaTime(double fTime); // render methods - //------------------------------------------------------------------ + /** Render the ViewShape diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx index 6fc93cb21085..edbd66631a16 100644 --- a/slideshow/source/engine/shapes/viewshape.cxx +++ b/slideshow/source/engine/shapes/viewshape.cxx @@ -644,7 +644,7 @@ namespace slideshow // which happens to be the destination // canvas transformation without any // translational components. - // + // But then, the render transformation as // calculated by getShapeTransformation() // above outputs the shape at its real diff --git a/slideshow/source/engine/shapes/viewshape.hxx b/slideshow/source/engine/shapes/viewshape.hxx index 68419de32579..520d2902c83f 100644 --- a/slideshow/source/engine/shapes/viewshape.hxx +++ b/slideshow/source/engine/shapes/viewshape.hxx @@ -73,7 +73,7 @@ namespace slideshow // animation methods - //------------------------------------------------------------------ + /** Notify the ViewShape that an animation starts now @@ -101,7 +101,7 @@ namespace slideshow // render methods - //------------------------------------------------------------------ + enum UpdateFlags { diff --git a/slideshow/source/engine/slide/layer.hxx b/slideshow/source/engine/slide/layer.hxx index 8bc81218ac16..b27261a87eff 100644 --- a/slideshow/source/engine/slide/layer.hxx +++ b/slideshow/source/engine/slide/layer.hxx @@ -92,7 +92,7 @@ namespace slideshow static ::boost::shared_ptr< Layer > createLayer( const basegfx::B2DRange& rMaxLayerBounds ); - ///////////////////////////////////////////////////////////////////// + /** Predicate, whether this layer is the special @@ -133,7 +133,7 @@ namespace slideshow void setShapeViews( ShapeSharedPtr const& rShape ) const; - ///////////////////////////////////////////////////////////////////// + /** Change layer priority range. diff --git a/slideshow/source/engine/slide/layermanager.hxx b/slideshow/source/engine/slide/layermanager.hxx index ef404f44cb6a..d9abd554d84f 100644 --- a/slideshow/source/engine/slide/layermanager.hxx +++ b/slideshow/source/engine/slide/layermanager.hxx @@ -252,7 +252,7 @@ namespace slideshow typedef ::std::set< ShapeSharedPtr > ShapeUpdateSet; - //////////////////////////////////////////////////////////////////////// + /// Adds shape area to containing layer's damage area diff --git a/slideshow/source/engine/slide/shapemanagerimpl.hxx b/slideshow/source/engine/slide/shapemanagerimpl.hxx index b52ab564a847..b5046e382306 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.hxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.hxx @@ -85,14 +85,14 @@ public: void deactivate(); // Disposable interface - // --------------------------------------------------------------- + virtual void dispose(); private: // MouseEventHandler interface - // --------------------------------------------------------------- + virtual bool handleMousePressed( ::com::sun::star::awt::MouseEvent const& evt ); @@ -109,7 +109,7 @@ private: // ViewUpdate interface - // ------------------------------------------------------------------- + virtual bool update(); virtual bool update( ViewSharedPtr const& rView ); @@ -117,7 +117,7 @@ private: // ShapeManager interface - // --------------------------------------------------- + virtual void enterAnimationMode( const AnimatableShapeSharedPtr& rShape ); virtual void leaveAnimationMode( const AnimatableShapeSharedPtr& rShape ); @@ -130,7 +130,7 @@ private: // SubsettableShapeManager interface - // --------------------------------------------------- + virtual boost::shared_ptr<AttributableShape> getSubsetShape( const boost::shared_ptr<AttributableShape>& rOrigShape, @@ -148,7 +148,7 @@ private: // ShapeListenerEventHandler - // --------------------------------------------- + virtual bool listenerAdded( const ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XShapeEventListener>& xListener, @@ -161,7 +161,7 @@ private: ::com::sun::star::drawing::XShape>& xShape ); // ShapeCursorEventHandler interface - // --------------------------------------------------------------- + virtual bool cursorChanged( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& xShape, diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 09224861cf9d..1ba3723d2459 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -291,7 +291,7 @@ private: }; -////////////////////////////////////////////////////////////////////////////////// + class SlideRenderer @@ -332,7 +332,7 @@ private: }; -////////////////////////////////////////////////////////////////////////////////// + SlideImpl::SlideImpl( const uno::Reference< drawing::XDrawPage >& xDrawPage, diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index fa112f372e70..8e0d7f2443e8 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -2060,7 +2060,7 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout ) // TODO(Q3): remove need to call dequeued() from // activities. feels like a wart. - // + // Rationale for ActivitiesQueue::processDequeued(): when // an activity ends, it usually pushed the end state to // the animated shape in question, and ends the animation diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx index 9b77578c3459..ffb6d39e0c86 100644 --- a/slideshow/source/engine/slideview.cxx +++ b/slideshow/source/engine/slideview.cxx @@ -272,7 +272,7 @@ class LayerSpriteContainer // sprites, assign upper bound of individual sprite range as // sprite prio (the layer itself gets assigned the lower bound // of sprite 0's individual range): - // + // | layer 0 | layer 1 | ... // | sprite 0 | sprite 1 | sprite 0 | sprite 1 | ... return maLayerPrioRange.getMinimum() + maLayerPrioRange.getRange()*(nSpriteNum+1)/(maSprites.size()+1); diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx index b466a1ac4d41..47b4f8538725 100644 --- a/slideshow/source/engine/smilfunctionparser.cxx +++ b/slideshow/source/engine/smilfunctionparser.cxx @@ -356,16 +356,16 @@ namespace slideshow // Workaround for MSVC compiler anomaly (stack trashing) - // + // The default ureal_parser_policies implementation of parse_exp // triggers a really weird error in MSVC7 (Version 13.00.9466), in // that the real_parser_impl::parse_main() call of parse_exp() // overwrites the frame pointer _on the stack_ (EBP of the calling // function gets overwritten while lying on the stack). - // + // For the time being, our parser thus can only read the 1.0E10 // notation, not the 1.0e10 one. - // + // TODO(F1): Also handle the 1.0e10 case here. template< typename T > struct custom_real_parser_policies : public ::boost::spirit::ureal_parser_policies<T> { diff --git a/slideshow/source/engine/sp_debug.cxx b/slideshow/source/engine/sp_debug.cxx index 7dd5a2ea78a4..c481401c7077 100644 --- a/slideshow/source/engine/sp_debug.cxx +++ b/slideshow/source/engine/sp_debug.cxx @@ -18,16 +18,16 @@ */ -// + // sp_collector.cpp -// + // Copyright (c) 2002, 2003 Peter Dimov -// + // Permission to copy, use, modify, sell and distribute this software // is granted provided this copyright notice appears in all copies. // This software is provided "as is" without express or implied // warranty, and with no claim as to its suitability for any purpose. -// + #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS) diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx index 057c96e3bf92..9281c4cd5ce1 100644 --- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx @@ -862,7 +862,7 @@ NumberAnimationSharedPtr createSlideWipeTransition( // normal, 'forward' slide wipe effect. Since the old // content is still on screen (and does not move), we omit // the 'leaving' slide. - // ======================================================= + return NumberAnimationSharedPtr( new MovingSlideChange( @@ -880,7 +880,7 @@ NumberAnimationSharedPtr createSlideWipeTransition( // 'reversed' slide wipe effect. Reverse for slide wipes // means, that the new slide is in the back, statically, // and the old one is moving off in the foreground. - // ======================================================= + return NumberAnimationSharedPtr( new MovingSlideChange( leavingSlide, diff --git a/slideshow/source/engine/transitions/transitionfactorytab.cxx b/slideshow/source/engine/transitions/transitionfactorytab.cxx index 92bc67389056..1cec25dca37b 100644 --- a/slideshow/source/engine/transitions/transitionfactorytab.cxx +++ b/slideshow/source/engine/transitions/transitionfactorytab.cxx @@ -2083,12 +2083,12 @@ static const TransitionInfo lcl_transitionInfo[] = true // scale isotrophically to target size }, - ///////////////////////////////////////////////////////// + // NOTE: This entry MUST be the last, to keep // createSlideTransition() from infinite recursion. Because // getRandomTransitionInfo() below will exclude the last entry of // the table from the random number generation. - ///////////////////////////////////////////////////////// + { // specially handled animations::TransitionType::RANDOM, @@ -2101,9 +2101,9 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion true // scale isotrophically to target size } - ///////////////////////////////////////////////////////// + // NOTE: DON'T add after this entry! See comment above! - ///////////////////////////////////////////////////////// + }; } // anon namespace diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx index 5898f9171a1f..4a6c49164aed 100644 --- a/slideshow/source/engine/usereventqueue.cxx +++ b/slideshow/source/engine/usereventqueue.cxx @@ -639,8 +639,6 @@ void UserEventQueue::registerEvent( } -// Public methods -// ===================================================== UserEventQueue::UserEventQueue( EventMultiplexer& rMultiplexer, EventQueue& rEventQueue, diff --git a/slideshow/source/inc/animatableshape.hxx b/slideshow/source/inc/animatableshape.hxx index 086d7a76c233..4443a8bd361b 100644 --- a/slideshow/source/inc/animatableshape.hxx +++ b/slideshow/source/inc/animatableshape.hxx @@ -40,7 +40,7 @@ namespace slideshow { public: // Animation methods - //------------------------------------------------------------------ + /** Notify the Shape that an animation starts now diff --git a/slideshow/source/inc/attributableshape.hxx b/slideshow/source/inc/attributableshape.hxx index 502d89a7759c..43e9b95f6f2a 100644 --- a/slideshow/source/inc/attributableshape.hxx +++ b/slideshow/source/inc/attributableshape.hxx @@ -47,7 +47,7 @@ namespace slideshow { public: // Attribute layer methods - //------------------------------------------------------------------ + /** Create a new shape attribute layer. @@ -124,7 +124,7 @@ namespace slideshow virtual void setVisibility( bool bVisible ) = 0; // Sub-item handling - //------------------------------------------------------------------ + /** Retrieve interface for DocTreeNode creation. diff --git a/slideshow/source/inc/eventmultiplexer.hxx b/slideshow/source/inc/eventmultiplexer.hxx index 6c80c38a1ae7..a38e733e21be 100644 --- a/slideshow/source/inc/eventmultiplexer.hxx +++ b/slideshow/source/inc/eventmultiplexer.hxx @@ -181,7 +181,7 @@ public: ~EventMultiplexer(); // Management methods - // ========================================================= + /** Clear all registered handlers. */ @@ -189,7 +189,7 @@ public: // Automatic mode methods - // ========================================================= + /** Change automatic mode. @@ -217,7 +217,7 @@ public: double getAutomaticTimeout() const; // Handler registration methods - // ========================================================= + /** Register an event handler that will be called when views are changed. @@ -456,7 +456,7 @@ public: // External event notifications - // ========================================================= + /** View added. diff --git a/slideshow/source/inc/externalmediashape.hxx b/slideshow/source/inc/externalmediashape.hxx index f20fe4468a61..c55d0ba1f570 100644 --- a/slideshow/source/inc/externalmediashape.hxx +++ b/slideshow/source/inc/externalmediashape.hxx @@ -38,7 +38,7 @@ namespace slideshow { public: // Animation methods - //------------------------------------------------------------------ + /** Notify the Shape that it should start with playback diff --git a/slideshow/source/inc/listenercontainer.hxx b/slideshow/source/inc/listenercontainer.hxx index 463790cd481d..c5c77df58357 100644 --- a/slideshow/source/inc/listenercontainer.hxx +++ b/slideshow/source/inc/listenercontainer.hxx @@ -442,7 +442,7 @@ private: ContainerT maListeners; }; -//////////////////////////////////////////////////////////////////////////// + /** ListenerContainer variant that serialized access @@ -459,7 +459,7 @@ class ThreadSafeListenerContainer : public ListenerContainerBase<ListenerT, { }; -//////////////////////////////////////////////////////////////////////////// + /** ListenerContainer variant that does not serialize access diff --git a/slideshow/source/inc/shape.hxx b/slideshow/source/inc/shape.hxx index d31d9d35023f..4fb6c3cdc392 100644 --- a/slideshow/source/inc/shape.hxx +++ b/slideshow/source/inc/shape.hxx @@ -70,7 +70,7 @@ namespace slideshow // View layer methods - //------------------------------------------------------------------ + /** Add a new view layer. @@ -103,7 +103,7 @@ namespace slideshow virtual bool clearAllViewLayers() = 0; // render methods - //------------------------------------------------------------------ + /** Update the shape @@ -135,7 +135,7 @@ namespace slideshow // Shape attributes - //------------------------------------------------------------------ + /** Get the current shape position and size. @@ -206,7 +206,7 @@ namespace slideshow virtual bool isBackgroundDetached() const = 0; // Misc - //------------------------------------------------------------------ + /** Functor struct, for shape ordering @@ -229,10 +229,10 @@ namespace slideshow // which is basically a running counter during shape import (i.e. denotes // the order of shape import). This is the correct order, at least for the // current drawing core. - // + // If, someday, the above proposition is no longer true, one directly use // the shape's ZOrder property - // + static bool compare(const Shape* pLHS, const Shape* pRHS) { const double nPrioL( pLHS->getPriority() ); diff --git a/slideshow/source/inc/shapeattributelayer.hxx b/slideshow/source/inc/shapeattributelayer.hxx index cdecabc85cb7..d423b26085e3 100644 --- a/slideshow/source/inc/shapeattributelayer.hxx +++ b/slideshow/source/inc/shapeattributelayer.hxx @@ -103,7 +103,7 @@ namespace slideshow explicit ShapeAttributeLayer( const ShapeAttributeLayerSharedPtr& rChildLayer ); // Children management methods - //------------------------------------------------------------------ + /** Revoke the given layer. @@ -144,7 +144,7 @@ namespace slideshow void setAdditiveMode( sal_Int16 nMode ); // Attribute methods - //------------------------------------------------------------------ + /** Query whether the width attribute is valid. */ @@ -482,7 +482,7 @@ namespace slideshow void setCharScale( const double& rNewScale ); // State change query methods - // ========================== + State::StateId getTransformationState() const; State::StateId getClipState() const; diff --git a/slideshow/source/inc/slide.hxx b/slideshow/source/inc/slide.hxx index 9058ed0cc32a..1ab61daf8fb2 100644 --- a/slideshow/source/inc/slide.hxx +++ b/slideshow/source/inc/slide.hxx @@ -58,7 +58,7 @@ namespace slideshow { public: // Showing - // ------------------------------------------------------------------- + /** Prepares to show slide. @@ -91,7 +91,7 @@ namespace slideshow // Queries - // ------------------------------------------------------------------- + /** Query the size of this slide in user coordinates @@ -122,7 +122,7 @@ namespace slideshow virtual void update_settings( bool bUserPaintEnabled, RGBColor const& aUserPaintColor, double dUserPaintStrokeWidth ) = 0; // Slide bitmaps - // ------------------------------------------------------------------- + /** Request bitmap for current slide appearance. diff --git a/slideshow/source/inc/transitioninfo.hxx b/slideshow/source/inc/transitioninfo.hxx index 486462f36a1c..e489570c9854 100644 --- a/slideshow/source/inc/transitioninfo.hxx +++ b/slideshow/source/inc/transitioninfo.hxx @@ -30,14 +30,14 @@ struct TransitionInfo { // the following two member serve as the search key // for an incoming XTransitionFilter node - // + // { sal_Int16 mnTransitionType; sal_Int16 mnTransitionSubType; // } - // + /** This enum classifies a transition type */ diff --git a/slideshow/test/tests.hxx b/slideshow/test/tests.hxx index ec2286570b6c..14d905083ff0 100644 --- a/slideshow/test/tests.hxx +++ b/slideshow/test/tests.hxx @@ -44,7 +44,7 @@ typedef boost::shared_ptr<TestView> TestViewSharedPtr; TestViewSharedPtr createTestView(); -/////////////////////////////////////////////////////////////////////////////////////// + class TestShape : public slideshow::internal::AnimatableShape diff --git a/slideshow/test/testshape.cxx b/slideshow/test/testshape.cxx index 153aa7065014..687a953007e4 100644 --- a/slideshow/test/testshape.cxx +++ b/slideshow/test/testshape.cxx @@ -112,7 +112,7 @@ private: } - ////////////////////////////////////////////////////////////////////////// + // Shape |