diff options
Diffstat (limited to 'slideshow/source/engine/transitions')
25 files changed, 48 insertions, 80 deletions
diff --git a/slideshow/source/engine/transitions/barndoorwipe.hxx b/slideshow/source/engine/transitions/barndoorwipe.hxx index cb43fb92c5ed..decc63dab0ef 100644 --- a/slideshow/source/engine/transitions/barndoorwipe.hxx +++ b/slideshow/source/engine/transitions/barndoorwipe.hxx @@ -26,8 +26,7 @@ #include "transitiontools.hxx" -namespace slideshow { -namespace internal { +namespace slideshow::internal { /// Generate a barn door wipe or double barn door wipe: class BarnDoorWipe : public ParametricPolyPolygon @@ -41,7 +40,7 @@ private: const bool m_doubled; }; -} + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_BARNDOORWIPE_HXX diff --git a/slideshow/source/engine/transitions/barwipepolypolygon.hxx b/slideshow/source/engine/transitions/barwipepolypolygon.hxx index 62ba19f44042..610e50857f04 100644 --- a/slideshow/source/engine/transitions/barwipepolypolygon.hxx +++ b/slideshow/source/engine/transitions/barwipepolypolygon.hxx @@ -24,8 +24,7 @@ #include "transitiontools.hxx" -namespace slideshow { -namespace internal { +namespace slideshow::internal { /// Generates a horizontal, left-to-right bar wipe: class BarWipePolyPolygon : public ParametricPolyPolygon @@ -41,7 +40,7 @@ private: const ::basegfx::B2DPolygon m_unitRect; }; -} + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_BARWIPEPOLYPOLYGON_HXX diff --git a/slideshow/source/engine/transitions/boxwipe.hxx b/slideshow/source/engine/transitions/boxwipe.hxx index 720720864e81..d542e3e56793 100644 --- a/slideshow/source/engine/transitions/boxwipe.hxx +++ b/slideshow/source/engine/transitions/boxwipe.hxx @@ -24,8 +24,7 @@ #include "transitiontools.hxx" -namespace slideshow { -namespace internal { +namespace slideshow::internal { /// Generates a default topleft to right bottom box wipe class BoxWipe : public ParametricPolyPolygon @@ -40,7 +39,7 @@ private: const ::basegfx::B2DPolyPolygon m_unitRect; }; -} + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_BOXWIPE_HXX diff --git a/slideshow/source/engine/transitions/checkerboardwipe.hxx b/slideshow/source/engine/transitions/checkerboardwipe.hxx index ee206e5dd9fa..e3d70f68dfa3 100644 --- a/slideshow/source/engine/transitions/checkerboardwipe.hxx +++ b/slideshow/source/engine/transitions/checkerboardwipe.hxx @@ -26,8 +26,7 @@ #include "parametricpolypolygon.hxx" -namespace slideshow { -namespace internal { +namespace slideshow::internal { /// Generate a check board wipe (across) class CheckerBoardWipe : public ParametricPolyPolygon @@ -43,7 +42,7 @@ private: const ::basegfx::B2DPolyPolygon m_unitRect; }; -} + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_CHECKERBOARDWIPE_HXX diff --git a/slideshow/source/engine/transitions/clippingfunctor.hxx b/slideshow/source/engine/transitions/clippingfunctor.hxx index bc3e7b61ab12..666aef63bf18 100644 --- a/slideshow/source/engine/transitions/clippingfunctor.hxx +++ b/slideshow/source/engine/transitions/clippingfunctor.hxx @@ -26,9 +26,7 @@ #include "parametricpolypolygon.hxx" -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Generates the final clipping polygon. @@ -79,7 +77,7 @@ namespace slideshow bool mbFlip; }; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_CLIPPINGFUNCTOR_HXX diff --git a/slideshow/source/engine/transitions/clockwipe.hxx b/slideshow/source/engine/transitions/clockwipe.hxx index cd54086f6925..437f308285f3 100644 --- a/slideshow/source/engine/transitions/clockwipe.hxx +++ b/slideshow/source/engine/transitions/clockwipe.hxx @@ -24,8 +24,7 @@ #include "parametricpolypolygon.hxx" -namespace slideshow { -namespace internal { +namespace slideshow::internal { /// Generates a clockWiseTwelve clock wipe: class ClockWipe : public ParametricPolyPolygon @@ -36,7 +35,7 @@ public: virtual ::basegfx::B2DPolyPolygon operator () ( double t ) override; }; -} + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_CLOCKWIPE_HXX diff --git a/slideshow/source/engine/transitions/combtransition.hxx b/slideshow/source/engine/transitions/combtransition.hxx index 37b288ae67fd..c9648e59d2a1 100644 --- a/slideshow/source/engine/transitions/combtransition.hxx +++ b/slideshow/source/engine/transitions/combtransition.hxx @@ -22,8 +22,7 @@ #include "slidechangebase.hxx" -namespace slideshow { -namespace internal { +namespace slideshow::internal { /** Comb transition class. @@ -57,8 +56,7 @@ private: void renderComb( double t, const ViewEntry& rViewEntry ) const; }; -} // namespace internal -} // namespace presentation +} // namespace presentation::internal #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_COMBTRANSITION_HXX diff --git a/slideshow/source/engine/transitions/doublediamondwipe.hxx b/slideshow/source/engine/transitions/doublediamondwipe.hxx index eee6e32e5179..eca5d865c0ef 100644 --- a/slideshow/source/engine/transitions/doublediamondwipe.hxx +++ b/slideshow/source/engine/transitions/doublediamondwipe.hxx @@ -25,8 +25,7 @@ #include "parametricpolypolygon.hxx" -namespace slideshow { -namespace internal { +namespace slideshow::internal { /// Generates a double diamond wipe: class DoubleDiamondWipe : public ParametricPolyPolygon @@ -36,7 +35,7 @@ public: virtual ::basegfx::B2DPolyPolygon operator()( double x ) override; }; -} + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_DOUBLEDIAMONDWIPE_HXX diff --git a/slideshow/source/engine/transitions/ellipsewipe.hxx b/slideshow/source/engine/transitions/ellipsewipe.hxx index 9a86469a5d06..41b488664a9c 100644 --- a/slideshow/source/engine/transitions/ellipsewipe.hxx +++ b/slideshow/source/engine/transitions/ellipsewipe.hxx @@ -23,8 +23,7 @@ #include "parametricpolypolygon.hxx" -namespace slideshow { -namespace internal { +namespace slideshow::internal { /// Generate an iris wipe class EllipseWipe : public ParametricPolyPolygon @@ -36,7 +35,7 @@ private: sal_Int32 mnSubType; }; -} + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_ELLIPSEWIPE_HXX diff --git a/slideshow/source/engine/transitions/fanwipe.hxx b/slideshow/source/engine/transitions/fanwipe.hxx index dc457c0d2fb1..99434082edb6 100644 --- a/slideshow/source/engine/transitions/fanwipe.hxx +++ b/slideshow/source/engine/transitions/fanwipe.hxx @@ -23,8 +23,7 @@ #include "parametricpolypolygon.hxx" -namespace slideshow { -namespace internal { +namespace slideshow::internal { /// Generates a centerTop (center=true) or double fan wipe: class FanWipe : public ParametricPolyPolygon @@ -37,7 +36,7 @@ private: bool m_center, m_single, m_fanIn; }; -} + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_FANWIPE_HXX diff --git a/slideshow/source/engine/transitions/figurewipe.hxx b/slideshow/source/engine/transitions/figurewipe.hxx index f5dc91bde155..742d2dde29da 100644 --- a/slideshow/source/engine/transitions/figurewipe.hxx +++ b/slideshow/source/engine/transitions/figurewipe.hxx @@ -23,8 +23,7 @@ #include "parametricpolypolygon.hxx" -namespace slideshow { -namespace internal { +namespace slideshow::internal { class FigureWipe : public ParametricPolyPolygon { @@ -41,7 +40,7 @@ private: const ::basegfx::B2DPolygon m_figure; }; -} + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_FIGUREWIPE_HXX diff --git a/slideshow/source/engine/transitions/fourboxwipe.hxx b/slideshow/source/engine/transitions/fourboxwipe.hxx index 3f2843bdbfc8..b2a501da7033 100644 --- a/slideshow/source/engine/transitions/fourboxwipe.hxx +++ b/slideshow/source/engine/transitions/fourboxwipe.hxx @@ -25,8 +25,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> -namespace slideshow { -namespace internal { +namespace slideshow::internal { /// Generate a 4-box wipe class FourBoxWipe : public ParametricPolyPolygon @@ -41,7 +40,7 @@ private: const ::basegfx::B2DPolygon m_unitRect; }; -} + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_FOURBOXWIPE_HXX diff --git a/slideshow/source/engine/transitions/iriswipe.hxx b/slideshow/source/engine/transitions/iriswipe.hxx index 966badee58bc..f818568e9ad6 100644 --- a/slideshow/source/engine/transitions/iriswipe.hxx +++ b/slideshow/source/engine/transitions/iriswipe.hxx @@ -25,8 +25,7 @@ #include "transitiontools.hxx" -namespace slideshow { -namespace internal { +namespace slideshow::internal { /// Generate an iris wipe class IrisWipe : public ParametricPolyPolygon @@ -38,7 +37,7 @@ private: const ::basegfx::B2DPolyPolygon m_unitRect; }; -} + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_IRISWIPE_HXX diff --git a/slideshow/source/engine/transitions/parametricpolypolygon.hxx b/slideshow/source/engine/transitions/parametricpolypolygon.hxx index f35b0cc76184..4e2ebb98ec67 100644 --- a/slideshow/source/engine/transitions/parametricpolypolygon.hxx +++ b/slideshow/source/engine/transitions/parametricpolypolygon.hxx @@ -26,9 +26,7 @@ /* Definition of ParametricPolyPolygon interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Interface defining a parametric poly-polygon. @@ -84,7 +82,6 @@ namespace slideshow typedef ::std::shared_ptr< ParametricPolyPolygon > ParametricPolyPolygonSharedPtr; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_PARAMETRICPOLYPOLYGON_HXX diff --git a/slideshow/source/engine/transitions/parametricpolypolygonfactory.hxx b/slideshow/source/engine/transitions/parametricpolypolygonfactory.hxx index 2b188c4a1425..7a0e7aacd1fe 100644 --- a/slideshow/source/engine/transitions/parametricpolypolygonfactory.hxx +++ b/slideshow/source/engine/transitions/parametricpolypolygonfactory.hxx @@ -22,9 +22,7 @@ #include "parametricpolypolygon.hxx" -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /* Definition of Transitionfactory class */ @@ -33,7 +31,7 @@ namespace slideshow ParametricPolyPolygonSharedPtr createClipPolyPolygon( sal_Int16 nTransitionType, sal_Int16 nTransitionSubType ); } - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_PARAMETRICPOLYPOLYGONFACTORY_HXX diff --git a/slideshow/source/engine/transitions/pinwheelwipe.hxx b/slideshow/source/engine/transitions/pinwheelwipe.hxx index 1a353a64fb83..d1daae12623a 100644 --- a/slideshow/source/engine/transitions/pinwheelwipe.hxx +++ b/slideshow/source/engine/transitions/pinwheelwipe.hxx @@ -23,8 +23,7 @@ #include "parametricpolypolygon.hxx" -namespace slideshow { -namespace internal { +namespace slideshow::internal { /// Generates a n-blade pinWheel wipe: class PinWheelWipe : public ParametricPolyPolygon @@ -36,7 +35,7 @@ private: sal_Int32 m_blades; }; -} + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_PINWHEELWIPE_HXX diff --git a/slideshow/source/engine/transitions/randomwipe.hxx b/slideshow/source/engine/transitions/randomwipe.hxx index b6df2bb8fde9..3bc2364792b1 100644 --- a/slideshow/source/engine/transitions/randomwipe.hxx +++ b/slideshow/source/engine/transitions/randomwipe.hxx @@ -27,8 +27,7 @@ #include "parametricpolypolygon.hxx" -namespace slideshow { -namespace internal { +namespace slideshow::internal { class RandomWipe : public ParametricPolyPolygon { @@ -43,7 +42,7 @@ private: ::basegfx::B2DPolygon m_rect; }; -} + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_RANDOMWIPE_HXX diff --git a/slideshow/source/engine/transitions/slidechangebase.hxx b/slideshow/source/engine/transitions/slidechangebase.hxx index 492bc597128c..e80145df6a4b 100644 --- a/slideshow/source/engine/transitions/slidechangebase.hxx +++ b/slideshow/source/engine/transitions/slidechangebase.hxx @@ -36,8 +36,7 @@ namespace cppcanvas class CustomSprite; } -namespace slideshow { -namespace internal { +namespace slideshow::internal { /** Base class for all slide change effects. @@ -197,8 +196,7 @@ private: bool mbPrefetched; }; -} // namespace internal -} // namespace presentation +} // namespace presentation::internal #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_SLIDECHANGEBASE_HXX diff --git a/slideshow/source/engine/transitions/snakewipe.hxx b/slideshow/source/engine/transitions/snakewipe.hxx index ec71f4f83629..3da6918b9840 100644 --- a/slideshow/source/engine/transitions/snakewipe.hxx +++ b/slideshow/source/engine/transitions/snakewipe.hxx @@ -23,8 +23,7 @@ #include "parametricpolypolygon.hxx" -namespace slideshow { -namespace internal { +namespace slideshow::internal { /// Generates a snake wipe: class SnakeWipe : public ParametricPolyPolygon @@ -59,7 +58,7 @@ private: const bool m_opposite; }; -} + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_SNAKEWIPE_HXX diff --git a/slideshow/source/engine/transitions/spiralwipe.hxx b/slideshow/source/engine/transitions/spiralwipe.hxx index fe89c0c8eda1..73f6a59c5668 100644 --- a/slideshow/source/engine/transitions/spiralwipe.hxx +++ b/slideshow/source/engine/transitions/spiralwipe.hxx @@ -23,8 +23,7 @@ #include "parametricpolypolygon.hxx" -namespace slideshow { -namespace internal { +namespace slideshow::internal { /// Generates a topLeftClockWise or /// bottomLeftCounterClockWise (flipOnYAxis=true) spiral wipe: @@ -52,7 +51,7 @@ private: const bool m_fourBox; }; -} + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_SPIRALWIPE_HXX diff --git a/slideshow/source/engine/transitions/sweepwipe.hxx b/slideshow/source/engine/transitions/sweepwipe.hxx index acc10e67e11b..e010a554377a 100644 --- a/slideshow/source/engine/transitions/sweepwipe.hxx +++ b/slideshow/source/engine/transitions/sweepwipe.hxx @@ -23,8 +23,7 @@ #include "parametricpolypolygon.hxx" -namespace slideshow { -namespace internal { +namespace slideshow::internal { class SweepWipe : public ParametricPolyPolygon { @@ -39,7 +38,7 @@ private: const bool m_center, m_single, m_oppositeVertical, m_flipOnYAxis; }; -} + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_SWEEPWIPE_HXX diff --git a/slideshow/source/engine/transitions/transitiontools.hxx b/slideshow/source/engine/transitions/transitiontools.hxx index 53b3b4f46cb7..4f6c4915cf1f 100644 --- a/slideshow/source/engine/transitions/transitiontools.hxx +++ b/slideshow/source/engine/transitions/transitiontools.hxx @@ -24,8 +24,7 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> -namespace slideshow { -namespace internal { +namespace slideshow::internal { /// Create a unit rect. ::basegfx::B2DPolygon createUnitRect(); @@ -39,7 +38,6 @@ namespace internal { ::basegfx::B2DPolyPolygon const & polypoly ); } -} #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_TRANSITIONTOOLS_HXX diff --git a/slideshow/source/engine/transitions/veewipe.hxx b/slideshow/source/engine/transitions/veewipe.hxx index 537fd79e005d..e17d86771e0a 100644 --- a/slideshow/source/engine/transitions/veewipe.hxx +++ b/slideshow/source/engine/transitions/veewipe.hxx @@ -25,8 +25,7 @@ #include "parametricpolypolygon.hxx" -namespace slideshow { -namespace internal { +namespace slideshow::internal { /// Generate a vee wipe class VeeWipe : public ParametricPolyPolygon @@ -36,7 +35,7 @@ public: virtual ::basegfx::B2DPolyPolygon operator()( double x ) override; }; -} + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_VEEWIPE_HXX diff --git a/slideshow/source/engine/transitions/waterfallwipe.hxx b/slideshow/source/engine/transitions/waterfallwipe.hxx index 6f397058cd43..821c9b7a2993 100644 --- a/slideshow/source/engine/transitions/waterfallwipe.hxx +++ b/slideshow/source/engine/transitions/waterfallwipe.hxx @@ -24,8 +24,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> -namespace slideshow { -namespace internal { +namespace slideshow::internal { /// Generate a vertical left waterfall wipe class WaterfallWipe : public ParametricPolyPolygon @@ -38,7 +37,7 @@ private: ::basegfx::B2DPolygon m_waterfall; }; -} + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_WATERFALLWIPE_HXX diff --git a/slideshow/source/engine/transitions/zigzagwipe.hxx b/slideshow/source/engine/transitions/zigzagwipe.hxx index ca927ba44b44..2126483eb859 100644 --- a/slideshow/source/engine/transitions/zigzagwipe.hxx +++ b/slideshow/source/engine/transitions/zigzagwipe.hxx @@ -24,8 +24,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> -namespace slideshow { -namespace internal { +namespace slideshow::internal { /// Generates a left to right zigZag wipe: class ZigZagWipe : public ParametricPolyPolygon @@ -46,7 +45,7 @@ public: virtual ::basegfx::B2DPolyPolygon operator () ( double t ) override; }; -} + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_ZIGZAGWIPE_HXX |