diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-29 10:47:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-29 10:24:23 +0000 |
| commit | e195b2ec9559390c4d1172e0a1e4322dbc7dd45d (patch) | |
| tree | d8b1e6dc6f2e5af0bffe747abc649d1db99fe082 | |
| parent | 4092da68f5e71b3fb82382a8f3d31d2cd05289d7 (diff) | |
com::sun::star->css in slideshow
Change-Id: I7ae3c5198c22a3937e8c3ef87f48fa2a7e562c62
Reviewed-on: https://gerrit.libreoffice.org/19664
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
66 files changed, 249 insertions, 381 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index 691e504e2a74..e386a0888c3b 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx @@ -600,7 +600,7 @@ void OGLTransitionerImpl::createTexture( GLuint* texID, namespace { - class OGLColorSpace : public cppu::WeakImplHelper< com::sun::star::rendering::XIntegerBitmapColorSpace > + class OGLColorSpace : public cppu::WeakImplHelper< css::rendering::XIntegerBitmapColorSpace > { private: uno::Sequence< sal_Int8 > maComponentTags; diff --git a/slideshow/source/engine/animationnodes/animationaudionode.hxx b/slideshow/source/engine/animationnodes/animationaudionode.hxx index a30ece2a4eae..e56b3bcd6212 100644 --- a/slideshow/source/engine/animationnodes/animationaudionode.hxx +++ b/slideshow/source/engine/animationnodes/animationaudionode.hxx @@ -37,8 +37,7 @@ class AnimationAudioNode : public BaseNode, public AnimationEventHandler { public: AnimationAudioNode( - ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode> const& xNode, + css::uno::Reference<css::animations::XAnimationNode> const& xNode, ::boost::shared_ptr<BaseContainerNode> const& pParent, NodeContext const& rContext ); @@ -54,10 +53,9 @@ private: virtual bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode ) override; private: - ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAudio > mxAudioNode; - OUString maSoundURL; - mutable SoundPlayerSharedPtr mpPlayer; + css::uno::Reference<css::animations::XAudio > mxAudioNode; + OUString maSoundURL; + mutable SoundPlayerSharedPtr mpPlayer; void createPlayer() const; void resetPlayer() const; diff --git a/slideshow/source/engine/animationnodes/animationbasenode.hxx b/slideshow/source/engine/animationnodes/animationbasenode.hxx index 3d3f05668e18..8470b8827d9e 100644 --- a/slideshow/source/engine/animationnodes/animationbasenode.hxx +++ b/slideshow/source/engine/animationnodes/animationbasenode.hxx @@ -39,8 +39,7 @@ class AnimationBaseNode : public BaseNode { public: AnimationBaseNode( - ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode> const& xNode, + css::uno::Reference<css::animations::XAnimationNode> const& xNode, ::boost::shared_ptr<BaseContainerNode> const& pParent, NodeContext const& rContext ); @@ -51,8 +50,7 @@ public: protected: virtual void dispose() override; - ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimate> const& getXAnimateNode() const + css::uno::Reference<css::animations::XAnimate> const& getXAnimateNode() const { return mxAnimateNode; } /// Create parameter struct for ActivitiesFactory @@ -79,8 +77,7 @@ private: { return mpShapeSubset && !mbIsIndependentSubset; } private: - ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimate> mxAnimateNode; + css::uno::Reference<css::animations::XAnimate> mxAnimateNode; ShapeAttributeLayerHolder maAttributeLayerHolder; ::basegfx::B2DVector maSlideSize; AnimationActivitySharedPtr mpActivity; diff --git a/slideshow/source/engine/animationnodes/animationcolornode.hxx b/slideshow/source/engine/animationnodes/animationcolornode.hxx index ab05d632975c..4f5002d2c5e3 100644 --- a/slideshow/source/engine/animationnodes/animationcolornode.hxx +++ b/slideshow/source/engine/animationnodes/animationcolornode.hxx @@ -30,12 +30,11 @@ class AnimationColorNode : public AnimationBaseNode { public: AnimationColorNode( - ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode> const& xNode, + css::uno::Reference<css::animations::XAnimationNode> const& xNode, ::boost::shared_ptr<BaseContainerNode> const& pParent, NodeContext const& rContext ) : AnimationBaseNode( xNode, pParent, rContext ), - mxColorNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ) {} + mxColorNode( xNode, css::uno::UNO_QUERY_THROW ) {} #if defined(DBG_UTIL) virtual const char* getDescription() const override { return "AnimationColorNode"; } @@ -44,8 +43,7 @@ public: private: virtual AnimationActivitySharedPtr createActivity() const override; - ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimateColor > mxColorNode; + css::uno::Reference<css::animations::XAnimateColor > mxColorNode; }; } // namespace internal diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.cxx b/slideshow/source/engine/animationnodes/animationcommandnode.cxx index 47e4f961bb20..0ccc94fc7f68 100644 --- a/slideshow/source/engine/animationnodes/animationcommandnode.cxx +++ b/slideshow/source/engine/animationnodes/animationcommandnode.cxx @@ -33,14 +33,14 @@ using namespace com::sun::star; namespace slideshow { namespace internal { -namespace EffectCommands = com::sun::star::presentation::EffectCommands; +namespace EffectCommands = css::presentation::EffectCommands; AnimationCommandNode::AnimationCommandNode( uno::Reference<animations::XAnimationNode> const& xNode, ::boost::shared_ptr<BaseContainerNode> const& pParent, NodeContext const& rContext ) : BaseNode( xNode, pParent, rContext ), mpShape(), - mxCommandNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ) + mxCommandNode( xNode, css::uno::UNO_QUERY_THROW ) { uno::Reference< drawing::XShape > xShape( mxCommandNode->getTarget(), uno::UNO_QUERY ); diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.hxx b/slideshow/source/engine/animationnodes/animationcommandnode.hxx index 545e5821b29e..d252e23edce9 100644 --- a/slideshow/source/engine/animationnodes/animationcommandnode.hxx +++ b/slideshow/source/engine/animationnodes/animationcommandnode.hxx @@ -37,8 +37,7 @@ class AnimationCommandNode : public BaseNode { public: AnimationCommandNode( - ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode> const& xNode, + css::uno::Reference<css::animations::XAnimationNode> const& xNode, ::boost::shared_ptr<BaseContainerNode> const& pParent, NodeContext const& rContext ); @@ -51,8 +50,7 @@ private: private: IExternalMediaShapeBaseSharedPtr mpShape; - ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XCommand > mxCommandNode; + css::uno::Reference<css::animations::XCommand > mxCommandNode; }; } // namespace internal diff --git a/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx b/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx index 5954f5a7af64..ead89c7e22dc 100644 --- a/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx +++ b/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx @@ -29,12 +29,11 @@ class AnimationPathMotionNode : public AnimationBaseNode { public: AnimationPathMotionNode( - const ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode >& xNode, + const css::uno::Reference<css::animations::XAnimationNode >& xNode, const BaseContainerNodeSharedPtr& rParent, const NodeContext& rContext ) : AnimationBaseNode( xNode, rParent, rContext ), - mxPathMotionNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ) {} + mxPathMotionNode( xNode, css::uno::UNO_QUERY_THROW ) {} #if defined(DBG_UTIL) virtual const char* getDescription() const override @@ -47,8 +46,7 @@ protected: private: virtual AnimationActivitySharedPtr createActivity() const override; - ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimateMotion > mxPathMotionNode; + css::uno::Reference<css::animations::XAnimateMotion > mxPathMotionNode; }; } // namespace internal diff --git a/slideshow/source/engine/animationnodes/animationsetnode.hxx b/slideshow/source/engine/animationnodes/animationsetnode.hxx index 11771fd4d206..aa48843e4819 100644 --- a/slideshow/source/engine/animationnodes/animationsetnode.hxx +++ b/slideshow/source/engine/animationnodes/animationsetnode.hxx @@ -28,8 +28,7 @@ class AnimationSetNode : public AnimationBaseNode { public: AnimationSetNode( - ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode> const& xNode, + css::uno::Reference<css::animations::XAnimationNode> const& xNode, ::boost::shared_ptr<BaseContainerNode> const& pParent, NodeContext const& rContext ) : AnimationBaseNode( xNode, pParent, rContext ) {} diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.hxx b/slideshow/source/engine/animationnodes/animationtransformnode.hxx index 7f33847321cf..852eeb015aea 100644 --- a/slideshow/source/engine/animationnodes/animationtransformnode.hxx +++ b/slideshow/source/engine/animationnodes/animationtransformnode.hxx @@ -30,12 +30,11 @@ class AnimationTransformNode : public AnimationBaseNode { public: AnimationTransformNode( - ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode> const& xNode, + css::uno::Reference<css::animations::XAnimationNode> const& xNode, ::boost::shared_ptr<BaseContainerNode> const& pParent, NodeContext const& rContext ) : AnimationBaseNode( xNode, pParent, rContext ), - mxTransformNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ) {} + mxTransformNode( xNode, css::uno::UNO_QUERY_THROW ) {} #if defined(DBG_UTIL) virtual const char* getDescription() const override @@ -48,8 +47,7 @@ protected: private: virtual AnimationActivitySharedPtr createActivity() const override; - ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimateTransform > mxTransformNode; + css::uno::Reference<css::animations::XAnimateTransform > mxTransformNode; }; } // namespace internal diff --git a/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx b/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx index bf94f14580a7..38ea94d21d62 100644 --- a/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx +++ b/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx @@ -30,12 +30,11 @@ class AnimationTransitionFilterNode : public AnimationBaseNode { public: AnimationTransitionFilterNode( - ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode> const& xNode, + css::uno::Reference<css::animations::XAnimationNode> const& xNode, ::boost::shared_ptr<BaseContainerNode> const& pParent, NodeContext const& rContext ) : AnimationBaseNode( xNode, pParent, rContext ), - mxTransitionFilterNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW) + mxTransitionFilterNode( xNode, css::uno::UNO_QUERY_THROW) {} #if OSL_DEBUG_LEVEL >= 2 @@ -49,8 +48,7 @@ protected: private: virtual AnimationActivitySharedPtr createActivity() const override; - ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XTransitionFilter> mxTransitionFilterNode; + css::uno::Reference<css::animations::XTransitionFilter> mxTransitionFilterNode; }; } // namespace internal diff --git a/slideshow/source/engine/animationnodes/basecontainernode.hxx b/slideshow/source/engine/animationnodes/basecontainernode.hxx index 48e3e021a24b..7549039b7106 100644 --- a/slideshow/source/engine/animationnodes/basecontainernode.hxx +++ b/slideshow/source/engine/animationnodes/basecontainernode.hxx @@ -31,8 +31,7 @@ class BaseContainerNode : public BaseNode { public: BaseContainerNode( - ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode> const& xNode, + css::uno::Reference<css::animations::XAnimationNode> const& xNode, ::boost::shared_ptr<BaseContainerNode> const& pParent, NodeContext const& rContext ); diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index 998c1e0ccac9..56bfecf7b5f4 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -704,7 +704,7 @@ void BaseNode::showState() const if( !xTargetShape.is() ) { - ::com::sun::star::presentation::ParagraphTarget aTarget; + css::presentation::ParagraphTarget aTarget; // no shape provided. Maybe a ParagraphTarget? if( (xAnimate->getTarget() >>= aTarget) ) diff --git a/slideshow/source/engine/animationnodes/basenode.hxx b/slideshow/source/engine/animationnodes/basenode.hxx index 28322a5385af..25dd2b94fadc 100644 --- a/slideshow/source/engine/animationnodes/basenode.hxx +++ b/slideshow/source/engine/animationnodes/basenode.hxx @@ -78,8 +78,7 @@ class BaseNode : public AnimationNode, private ::boost::noncopyable { public: - BaseNode( ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode> const& xNode, + BaseNode( css::uno::Reference<css::animations::XAnimationNode> const& xNode, ::boost::shared_ptr<BaseContainerNode> const& pParent, NodeContext const& rContext ); @@ -110,8 +109,7 @@ public: virtual bool activate() override; virtual void deactivate() override; virtual void end() override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode> getXAnimationNode() const override; + virtual css::uno::Reference<css::animations::XAnimationNode> getXAnimationNode() const override; virtual NodeState getState() const override; virtual bool registerDeactivatingListener( const AnimationNodeSharedPtr& rNotifee ) override; @@ -192,8 +190,7 @@ private: typedef ::std::vector< AnimationNodeSharedPtr > ListenerVector; ListenerVector maDeactivatingListeners; - ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode > mxAnimationNode; + css::uno::Reference< css::animations::XAnimationNode > mxAnimationNode; ::boost::shared_ptr< BaseContainerNode > mpParent; ::boost::shared_ptr< BaseNode > mpSelf; const int* mpStateTransitionTable; diff --git a/slideshow/source/engine/animationnodes/generateevent.hxx b/slideshow/source/engine/animationnodes/generateevent.hxx index b59b3af6255f..10f66a195903 100644 --- a/slideshow/source/engine/animationnodes/generateevent.hxx +++ b/slideshow/source/engine/animationnodes/generateevent.hxx @@ -42,7 +42,7 @@ namespace internal { Additional delay, gets added on top of timeout. */ EventSharedPtr generateEvent( - ::com::sun::star::uno::Any const& rEventDescription, + css::uno::Any const& rEventDescription, Delay::FunctorT const& rFunctor, SlideShowContext const& rContext, double nAdditionalDelay ); diff --git a/slideshow/source/engine/animationnodes/nodetools.hxx b/slideshow/source/engine/animationnodes/nodetools.hxx index 984fe1581053..cf25d793226f 100644 --- a/slideshow/source/engine/animationnodes/nodetools.hxx +++ b/slideshow/source/engine/animationnodes/nodetools.hxx @@ -58,14 +58,13 @@ namespace slideshow it does not implement the AttributableShape interface. */ AttributableShapeSharedPtr lookupAttributableShape( const ShapeManagerSharedPtr& rShapeManager, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape ); + const css::uno::Reference< css::drawing::XShape >& xShape ); /** Predicate whether a Begin, Duration or End timing is indefinite, i.e. either contains no value, or the value Timing_INDEFINITE. */ - bool isIndefiniteTiming( const ::com::sun::star::uno::Any& rAny ); + bool isIndefiniteTiming( const css::uno::Any& rAny ); } } diff --git a/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx b/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx index ea9a97b8f554..b5e04c0b6b4e 100644 --- a/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx +++ b/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx @@ -32,8 +32,7 @@ class ParallelTimeContainer : public BaseContainerNode { public: ParallelTimeContainer( - const ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode >& xNode, + const css::uno::Reference< css::animations::XAnimationNode >& xNode, const BaseContainerNodeSharedPtr& rParent, const NodeContext& rContext ) : BaseContainerNode( xNode, rParent, rContext ) {} diff --git a/slideshow/source/engine/animationnodes/propertyanimationnode.hxx b/slideshow/source/engine/animationnodes/propertyanimationnode.hxx index da4ef57cd387..654cf85daa8a 100644 --- a/slideshow/source/engine/animationnodes/propertyanimationnode.hxx +++ b/slideshow/source/engine/animationnodes/propertyanimationnode.hxx @@ -28,8 +28,7 @@ class PropertyAnimationNode : public AnimationBaseNode { public: PropertyAnimationNode( - ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode> const& xNode, + css::uno::Reference<css::animations::XAnimationNode> const& xNode, ::boost::shared_ptr<BaseContainerNode> const& pParent, NodeContext const& rContext ) : AnimationBaseNode( xNode, pParent, rContext ) {} diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx index 900069e10d4c..76b7f6c313dc 100644 --- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx +++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx @@ -32,8 +32,7 @@ class SequentialTimeContainer : public BaseContainerNode { public: SequentialTimeContainer( - ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode> const& xNode, + css::uno::Reference<css::animations::XAnimationNode> const& xNode, BaseContainerNodeSharedPtr const& pParent, NodeContext const& rContext ) : BaseContainerNode( xNode, pParent, rContext ) {} diff --git a/slideshow/source/engine/pointersymbol.hxx b/slideshow/source/engine/pointersymbol.hxx index f577e51f20f7..4d5381e9ff7a 100644 --- a/slideshow/source/engine/pointersymbol.hxx +++ b/slideshow/source/engine/pointersymbol.hxx @@ -38,8 +38,7 @@ class PointerSymbol : public ViewEventHandler, private ::boost::noncopyable { public: - static PointerSymbolSharedPtr create( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XBitmap>& xBitmap, + static PointerSymbolSharedPtr create( const css::uno::Reference<css::rendering::XBitmap>& xBitmap, ScreenUpdater& rScreenUpdater, EventMultiplexer& rEventMultiplexer, const UnoViewContainer& rViewContainer ); @@ -47,11 +46,10 @@ public: /** Use this method to update the pointer's position */ void setVisible( const bool bVisible ); - void viewsChanged(const ::com::sun::star::geometry::RealPoint2D pos); + void viewsChanged(const css::geometry::RealPoint2D pos); private: - PointerSymbol( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XBitmap>& xBitmap, + PointerSymbol( const css::uno::Reference<css::rendering::XBitmap>& xBitmap, ScreenUpdater& rScreenUpdater, const UnoViewContainer& rViewContainer ); @@ -67,13 +65,12 @@ private: ::std::pair<UnoViewSharedPtr, cppcanvas::CustomSpriteSharedPtr> > ViewsVecT; - ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XBitmap> mxBitmap; + css::uno::Reference<css::rendering::XBitmap> mxBitmap; - ViewsVecT maViews; - ScreenUpdater& mrScreenUpdater; - ::com::sun::star::geometry::RealPoint2D maPos; - bool mbVisible; + ViewsVecT maViews; + ScreenUpdater& mrScreenUpdater; + css::geometry::RealPoint2D maPos; + bool mbVisible; }; } // namespace internal diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx index c631a80af675..bcdb38107900 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.cxx +++ b/slideshow/source/engine/rehearsetimingsactivity.cxx @@ -126,7 +126,7 @@ public: virtual bool handleMouseMoved( awt::MouseEvent const & evt ) override; private: - bool isInArea( com::sun::star::awt::MouseEvent const & evt ) const; + bool isInArea( css::awt::MouseEvent const & evt ) const; void updatePressedState( const bool pressedState ) const; RehearseTimingsActivity& mrActivity; diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx index 8321f43b1b82..5bf234780dd2 100644 --- a/slideshow/source/engine/shapes/appletshape.cxx +++ b/slideshow/source/engine/shapes/appletshape.cxx @@ -67,10 +67,9 @@ namespace slideshow @param nNumPropEntries Number of property table entries (in pPropCopyTable) */ - AppletShape( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape, + AppletShape( const css::uno::Reference< css::drawing::XShape >& xShape, double nPrio, - const OUString& rServiceName, + const OUString& rServiceName, const char** pPropCopyTable, sal_Size nNumPropEntries, const SlideShowContext& rContext ); // throw ShapeLoadFailedException; diff --git a/slideshow/source/engine/shapes/appletshape.hxx b/slideshow/source/engine/shapes/appletshape.hxx index 186c2f41b4f9..d444355c61c1 100644 --- a/slideshow/source/engine/shapes/appletshape.hxx +++ b/slideshow/source/engine/shapes/appletshape.hxx @@ -36,10 +36,9 @@ namespace slideshow class Shape; boost::shared_ptr<Shape> createAppletShape( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape, + const css::uno::Reference< css::drawing::XShape >& xShape, double nPrio, - const OUString& rServiceName, + const OUString& rServiceName, const char** pPropCopyTable, sal_Size nNumPropEntries, const SlideShowContext& rContext ); diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx index 3bb51a96e642..a0dcb61bce2e 100644 --- a/slideshow/source/engine/shapes/backgroundshape.cxx +++ b/slideshow/source/engine/shapes/backgroundshape.cxx @@ -67,14 +67,12 @@ namespace slideshow peculiarities of the draw API regarding background content. */ - BackgroundShape( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage >& xDrawPage, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage >& xMasterPage, + BackgroundShape( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage, + const css::uno::Reference< css::drawing::XDrawPage >& xMasterPage, const SlideShowContext& rContext ); // throw ShapeLoadFailedException; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape > getXShape() const override; + virtual css::uno::Reference< + css::drawing::XShape > getXShape() const override; // View layer methods diff --git a/slideshow/source/engine/shapes/backgroundshape.hxx b/slideshow/source/engine/shapes/backgroundshape.hxx index 4c3e77444789..0152ad59f88c 100644 --- a/slideshow/source/engine/shapes/backgroundshape.hxx +++ b/slideshow/source/engine/shapes/backgroundshape.hxx @@ -43,10 +43,8 @@ namespace slideshow the Shape interface are not implemented here. */ boost::shared_ptr<Shape> createBackgroundShape( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage >& xDrawPage, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage >& xMasterPage, + const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage, + const css::uno::Reference< css::drawing::XDrawPage >& xMasterPage, const SlideShowContext& rContext ); // throw ShapeLoadFailedException; } } diff --git a/slideshow/source/engine/shapes/drawshape.hxx b/slideshow/source/engine/shapes/drawshape.hxx index 377da5653438..b6f6cb24b41e 100644 --- a/slideshow/source/engine/shapes/drawshape.hxx +++ b/slideshow/source/engine/shapes/drawshape.hxx @@ -81,10 +81,8 @@ namespace slideshow pre-rendererd bitmap. */ static DrawShapeSharedPtr create( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage >& xContainingPage, + const css::uno::Reference< css::drawing::XShape >& xShape, + const css::uno::Reference< css::drawing::XDrawPage >& xContainingPage, double nPrio, bool bForeignSource, const SlideShowContext& rContext ); // throw ShapeLoadFailedException; @@ -110,16 +108,13 @@ namespace slideshow events. */ static DrawShapeSharedPtr create( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage >& xContainingPage, + const css::uno::Reference< css::drawing::XShape >& xShape, + const css::uno::Reference< css::drawing::XDrawPage >& xContainingPage, double nPrio, const Graphic& rGraphic, const SlideShowContext& rContext ); // throw ShapeLoadFailedException; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape > getXShape() const override; + virtual css::uno::Reference< css::drawing::XShape > getXShape() const override; virtual ~DrawShape(); @@ -229,10 +224,10 @@ namespace slideshow unsupported content, and, if necessary, returned as a pre-rendererd bitmap. */ - DrawShape( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage >& xContainingPage, + DrawShape( const css::uno::Reference< + css::drawing::XShape >& xShape, + const css::uno::Reference< + css::drawing::XDrawPage >& xContainingPage, double nPrio, bool bForeignSource, const SlideShowContext& rContext ); // throw ShapeLoadFailedException; @@ -257,10 +252,8 @@ namespace slideshow DrawShape will register itself for intrinsic animation events. */ - DrawShape( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage >& xContainingPage, + DrawShape( const css::uno::Reference< css::drawing::XShape >& xShape, + const css::uno::Reference< css::drawing::XDrawPage >& xContainingPage, double nPrio, const Graphic& rGraphic, const SlideShowContext& rContext ); // throw ShapeLoadFailedException; @@ -283,10 +276,8 @@ namespace slideshow void prepareHyperlinkIndices() const; /// The associated XShape - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape > mxShape; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage > mxPage; + css::uno::Reference< css::drawing::XShape > mxShape; + css::uno::Reference< css::drawing::XDrawPage > mxPage; /** A vector of metafiles actually representing the Shape. @@ -332,8 +323,7 @@ namespace slideshow typedef ::std::vector< ViewShapeSharedPtr > ViewShapeVector; ViewShapeVector maViewShapes; - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext> mxComponentContext; + css::uno::Reference< css::uno::XComponentContext> mxComponentContext; /// hyperlink support typedef ::std::pair<sal_Int32 /* mtf start */, diff --git a/slideshow/source/engine/shapes/externalshapebase.hxx b/slideshow/source/engine/shapes/externalshapebase.hxx index 16546ee0fa80..5e89d82ba345 100644 --- a/slideshow/source/engine/shapes/externalshapebase.hxx +++ b/slideshow/source/engine/shapes/externalshapebase.hxx @@ -56,14 +56,12 @@ namespace slideshow Externally-determined shape priority (used e.g. for paint ordering). This number _must be_ unique! */ - ExternalShapeBase( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape, + ExternalShapeBase( const css::uno::Reference< css::drawing::XShape >& xShape, double nPrio, const SlideShowContext& rContext ); // throw ShapeLoadFailedException; virtual ~ExternalShapeBase(); - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape > getXShape() const override; + virtual css::uno::Reference< css::drawing::XShape > getXShape() const override; // animation methods @@ -93,8 +91,7 @@ namespace slideshow virtual bool isBackgroundDetached() const override; protected: - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext> mxComponentContext; + const css::uno::Reference<css::uno::XComponentContext> mxComponentContext; private: class ExternalShapeBaseListener; friend class ExternalShapeBaseListener; @@ -120,7 +117,7 @@ namespace slideshow /// The associated XShape - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape; + css::uno::Reference< css::drawing::XShape > mxShape; boost::shared_ptr<ExternalShapeBaseListener> mpListener; diff --git a/slideshow/source/engine/shapes/gdimtftools.hxx b/slideshow/source/engine/shapes/gdimtftools.hxx index 0741b0238dc1..6fbc729bb5cf 100644 --- a/slideshow/source/engine/shapes/gdimtftools.hxx +++ b/slideshow/source/engine/shapes/gdimtftools.hxx @@ -95,12 +95,11 @@ namespace slideshow @param o_rMtf Metafile to extract shape content into */ - bool getMetaFile( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xSource, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xContainingPage, - GDIMetaFile& o_rMtf, - int mtfLoadFlags, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext ); + bool getMetaFile( const css::uno::Reference< css::lang::XComponent >& xSource, + const css::uno::Reference< css::drawing::XDrawPage >& xContainingPage, + GDIMetaFile& o_rMtf, + int mtfLoadFlags, + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); /** Gets the next action offset for iterating meta actions which is most often returns 1. diff --git a/slideshow/source/engine/shapes/mediashape.cxx b/slideshow/source/engine/shapes/mediashape.cxx index ea1a5022ed3d..00c029def801 100644 --- a/slideshow/source/engine/shapes/mediashape.cxx +++ b/slideshow/source/engine/shapes/mediashape.cxx @@ -56,8 +56,7 @@ namespace slideshow Externally-determined shape priority (used e.g. for paint ordering). This number _must be_ unique! */ - MediaShape( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape, + MediaShape( const css::uno::Reference< css::drawing::XShape >& xShape, double nPrio, const SlideShowContext& rContext ); // throw ShapeLoadFailedException; diff --git a/slideshow/source/engine/shapes/mediashape.hxx b/slideshow/source/engine/shapes/mediashape.hxx index f5afe5e197ab..ca20bce5590e 100644 --- a/slideshow/source/engine/shapes/mediashape.hxx +++ b/slideshow/source/engine/shapes/mediashape.hxx @@ -37,8 +37,7 @@ namespace slideshow class Shape; boost::shared_ptr<Shape> createMediaShape( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape, + const css::uno::Reference<css::drawing::XShape >& xShape, double nPrio, const SlideShowContext& rContext); } diff --git a/slideshow/source/engine/shapes/viewappletshape.hxx b/slideshow/source/engine/shapes/viewappletshape.hxx index 6751e6a07a59..f6e266e4640b 100644 --- a/slideshow/source/engine/shapes/viewappletshape.hxx +++ b/slideshow/source/engine/shapes/viewappletshape.hxx @@ -73,13 +73,11 @@ namespace slideshow Number of property table entries (in pPropCopyTable) */ ViewAppletShape( const ViewLayerSharedPtr& rViewLayer, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& rxShape, - const OUString& rServiceName, + const css::uno::Reference< css::drawing::XShape >& rxShape, + const OUString& rServiceName, const char** pPropCopyTable, sal_Size nNumPropEntries, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); /** destroy the object */ @@ -143,14 +141,14 @@ namespace slideshow ViewLayerSharedPtr mpViewLayer; /// the actual viewer component for this applet - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XSynchronousFrameLoader> mxViewer; + css::uno::Reference< + css::frame::XSynchronousFrameLoader> mxViewer; /// the frame containing the applet - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XFrame2> mxFrame; - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext> mxComponentContext; + css::uno::Reference< + css::frame::XFrame2> mxFrame; + css::uno::Reference< + css::uno::XComponentContext> mxComponentContext; }; typedef ::boost::shared_ptr< ViewAppletShape > ViewAppletShapeSharedPtr; diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.hxx b/slideshow/source/engine/shapes/viewbackgroundshape.hxx index 9722bd88715c..ff08c32eed6c 100644 --- a/slideshow/source/engine/shapes/viewbackgroundshape.hxx +++ b/slideshow/source/engine/shapes/viewbackgroundshape.hxx @@ -76,8 +76,7 @@ namespace slideshow ViewLayerSharedPtr mpViewLayer; /// Generated content bitmap, already with correct output size - mutable ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XBitmap > mxBitmap; + mutable css::uno::Reference< css::rendering::XBitmap > mxBitmap; /// The last metafile a render object was generated for mutable GDIMetaFileSharedPtr mpLastMtf; diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx index dc6d2844eb2c..d001ddadc1d8 100644 --- a/slideshow/source/engine/shapes/viewmediashape.hxx +++ b/slideshow/source/engine/shapes/viewmediashape.hxx @@ -64,11 +64,9 @@ namespace slideshow @param rView The associated View object. */ - ViewMediaShape( const ViewLayerSharedPtr& rViewLayer, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& rxShape, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext ); + ViewMediaShape( const ViewLayerSharedPtr& rViewLayer, + const css::uno::Reference< css::drawing::XShape >& rxShape, + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); /** destroy the object */ @@ -141,22 +139,22 @@ namespace slideshow private: bool implInitialize( const ::basegfx::B2DRectangle& rBounds ); - void implSetMediaProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rxProps ); + void implSetMediaProperties( const css::uno::Reference< css::beans::XPropertySet >& rxProps ); void implInitializeMediaPlayer( const OUString& rMediaURL, const OUString& rMimeType ); bool implInitializePlayerWindow( const ::basegfx::B2DRectangle& rBounds, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rVCLDeviceParams, - const OUString& rMimeType ); + const css::uno::Sequence< css::uno::Any >& rVCLDeviceParams, + const OUString& rMimeType ); ViewLayerSharedPtr mpViewLayer; VclPtr< SystemChildWindow > mpMediaWindow; VclPtr< vcl::Window > mpEventHandlerParent; - mutable ::com::sun::star::awt::Point maWindowOffset; + mutable css::awt::Point maWindowOffset; mutable ::basegfx::B2DRectangle maBounds; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape; - ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer; - ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow > mxPlayerWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> mxComponentContext; - bool mbIsSoundEnabled; + css::uno::Reference< css::drawing::XShape > mxShape; + css::uno::Reference< css::media::XPlayer > mxPlayer; + css::uno::Reference< css::media::XPlayerWindow > mxPlayerWindow; + css::uno::Reference< css::uno::XComponentContext> mxComponentContext; + bool mbIsSoundEnabled; }; typedef ::boost::shared_ptr< ViewMediaShape > ViewMediaShapeSharedPtr; diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx index 7b8cb636ca37..7fb3fb0fac49 100644 --- a/slideshow/source/engine/slide/layermanager.cxx +++ b/slideshow/source/engine/slide/layermanager.cxx @@ -584,7 +584,7 @@ namespace slideshow OSL_FAIL( "BitmapView::setPriority(): This method is not supposed to be called!" ); } - virtual ::com::sun::star::geometry::IntegerSize2D getTranslationOffset() const override + virtual css::geometry::IntegerSize2D getTranslationOffset() const override { return geometry::IntegerSize2D(0,0); } diff --git a/slideshow/source/engine/slide/layermanager.hxx b/slideshow/source/engine/slide/layermanager.hxx index 76a369e26ea9..6426c79da8a4 100644 --- a/slideshow/source/engine/slide/layermanager.hxx +++ b/slideshow/source/engine/slide/layermanager.hxx @@ -127,8 +127,7 @@ namespace slideshow The XShape object, for which the representing Shape should be looked up. */ - ShapeSharedPtr lookupShape( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape ) const; + ShapeSharedPtr lookupShape( const css::uno::Reference< css::drawing::XShape >& xShape ) const; /** Query a subset of the given original shape @@ -231,11 +230,10 @@ namespace slideshow Provides quicker lookup than ShapeSet for simple mappings */ typedef std::unordered_map< - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >, - ShapeSharedPtr, - hash< ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape > > > XShapeHash; + css::uno::Reference< css::drawing::XShape >, + ShapeSharedPtr, + hash< css::uno::Reference< css::drawing::XShape > > + > XShapeHash; class ShapeComparator { diff --git a/slideshow/source/engine/slide/shapemanagerimpl.hxx b/slideshow/source/engine/slide/shapemanagerimpl.hxx index 611f33d9d3d8..ea95070b748f 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.hxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.hxx @@ -95,13 +95,13 @@ private: virtual bool handleMousePressed( - ::com::sun::star::awt::MouseEvent const& evt ) override; + css::awt::MouseEvent const& evt ) override; virtual bool handleMouseReleased( - ::com::sun::star::awt::MouseEvent const& evt ) override; + css::awt::MouseEvent const& evt ) override; virtual bool handleMouseDragged( - ::com::sun::star::awt::MouseEvent const& evt ) override; + css::awt::MouseEvent const& evt ) override; virtual bool handleMouseMoved( - ::com::sun::star::awt::MouseEvent const& evt ) override; + css::awt::MouseEvent const& evt ) override; // ViewUpdate interface @@ -118,8 +118,7 @@ private: virtual void leaveAnimationMode( const AnimatableShapeSharedPtr& rShape ) override; virtual void notifyShapeUpdate( const ShapeSharedPtr& rShape ) override; virtual ShapeSharedPtr lookupShape( - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape > const & xShape ) const override; + css::uno::Reference< css::drawing::XShape > const & xShape ) const override; virtual void addHyperlinkArea( const boost::shared_ptr<HyperlinkArea>& rArea ) override; @@ -144,22 +143,17 @@ private: // ShapeListenerEventHandler - virtual bool listenerAdded( const ::com::sun::star::uno::Reference< - ::com::sun::star::presentation::XShapeEventListener>& xListener, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& xShape ) override; + virtual bool listenerAdded( const css::uno::Reference< css::presentation::XShapeEventListener>& xListener, + const css::uno::Reference< css::drawing::XShape>& xShape ) override; - virtual bool listenerRemoved( const ::com::sun::star::uno::Reference< - ::com::sun::star::presentation::XShapeEventListener>& xListener, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& xShape ) override; + virtual bool listenerRemoved( const css::uno::Reference< css::presentation::XShapeEventListener>& xListener, + const css::uno::Reference< css::drawing::XShape>& xShape ) override; // ShapeCursorEventHandler interface - bool cursorChanged( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& xShape, - sal_Int16 nCursor ); + bool cursorChanged( const css::uno::Reference< css::drawing::XShape>& xShape, + sal_Int16 nCursor ); OUString checkForHyperlink( ::basegfx::B2DPoint const& hitPos )const; diff --git a/slideshow/source/engine/slide/slideanimations.hxx b/slideshow/source/engine/slide/slideanimations.hxx index f8c738683a3b..89eca1ca5368 100644 --- a/slideshow/source/engine/slide/slideanimations.hxx +++ b/slideshow/source/engine/slide/slideanimations.hxx @@ -71,8 +71,7 @@ namespace slideshow XDrawPage's XAnimationNodeSupplier. */ - bool importAnimations( const ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode >& xRootAnimationNode ); + bool importAnimations( const css::uno::Reference< css::animations::XAnimationNode >& xRootAnimationNode ); /** Check, whether imported animations actually contain any effects. diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index bff4c491babf..690977ed5c5d 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -155,8 +155,7 @@ private: bool isAnimated(); /// Set all Shapes to their initial attributes for slideshow - bool applyInitialShapeAttributes( const ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode >& xRootAnimationNode ); + bool applyInitialShapeAttributes( const css::uno::Reference< css::animations::XAnimationNode >& xRootAnimationNode ); /// Renders current slide content to bitmap SlideBitmapSharedPtr createCurrentSlideBitmap( diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx index 5e44c8313304..927ee8fecf7c 100644 --- a/slideshow/source/engine/slide/targetpropertiescreator.cxx +++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx @@ -144,7 +144,7 @@ namespace internal if( !xTargetShape.is() ) { - ::com::sun::star::presentation::ParagraphTarget aTarget; + css::presentation::ParagraphTarget aTarget; // no shape provided. Maybe a ParagraphTarget? if( !(xIterNode->getTarget() >>= aTarget) ) diff --git a/slideshow/source/engine/slidebitmap.cxx b/slideshow/source/engine/slidebitmap.cxx index bce6e83b331b..cee3d8a91a3e 100644 --- a/slideshow/source/engine/slidebitmap.cxx +++ b/slideshow/source/engine/slidebitmap.cxx @@ -109,8 +109,7 @@ namespace slideshow maClipPoly = rClipPoly; } - ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XBitmap > SlideBitmap::getXBitmap() + css::uno::Reference< css::rendering::XBitmap > SlideBitmap::getXBitmap() { return mxBitmap; } diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 518afe330703..a7e540c8842e 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -176,7 +176,7 @@ private: With an instance of this class, it is possible to statically and dynamically show a presentation, as defined by the constructor-provided draw model (represented by a sequence - of ::com::sun::star::drawing::XDrawPage objects). + of css::drawing::XDrawPage objects). It is possible to show the presentation on multiple views simultaneously (e.g. for a multi-monitor setup). Since this @@ -205,8 +205,8 @@ typedef cppu::WeakComponentImplHelper<presentation::XSlideShow> SlideShowImplBas typedef ::std::vector< ::cppcanvas::PolyPolygonSharedPtr> PolyPolygonVector; /// Maps XDrawPage for annotations persistence -typedef ::std::map< ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage>, +typedef ::std::map< css::uno::Reference< + css::drawing::XDrawPage>, PolyPolygonVector> PolygonMap; class SlideShowImpl : private cppu::BaseMutex, @@ -293,7 +293,7 @@ private: uno::Reference<animations::XAnimationNode> const& xRootNode, uno::Sequence<beans::PropertyValue> const& rProperties ) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL registerUserPaintPolygons( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xDocFactory ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL registerUserPaintPolygons( const css::uno::Reference< css::lang::XMultiServiceFactory >& xDocFactory ) throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL setProperty( beans::PropertyValue const& rProperty ) throw (uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL addView( @@ -1445,7 +1445,7 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult { PolyPolygonVector aPolygons = rPoly.second; //Get shapes for the slide - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > Shapes(rPoly.first, ::com::sun::star::uno::UNO_QUERY); + css::uno::Reference< css::drawing::XShapes > Shapes(rPoly.first, css::uno::UNO_QUERY); //Retrieve polygons for one slide for( const auto pPolyPoly : aPolygons ) { @@ -1767,7 +1767,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) if ( rProperty.Name == "PointerPosition") { - ::com::sun::star::geometry::RealPoint2D pos; + css::geometry::RealPoint2D pos; if (! (rProperty.Value >>= pos)) return false; diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx index ce33ea8699c8..53d161a0d271 100644 --- a/slideshow/source/engine/slideview.cxx +++ b/slideshow/source/engine/slideview.cxx @@ -470,7 +470,7 @@ public: } } - virtual ::com::sun::star::geometry::IntegerSize2D getTranslationOffset() const override + virtual css::geometry::IntegerSize2D getTranslationOffset() const override { basegfx::B2DRectangle aTmpRect; canvas::tools::calcTransformedRectBounds( aTmpRect, @@ -665,8 +665,8 @@ private: typedef cppu::WeakComponentImplHelper< - ::com::sun::star::util::XModifyListener, - ::com::sun::star::awt::XPaintListener> SlideViewBase; + css::util::XModifyListener, + css::awt::XPaintListener> SlideViewBase; /** SlideView class diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx index 1a75df5c40b5..0f00991f326c 100644 --- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx @@ -196,8 +196,7 @@ AnimationActivitySharedPtr createShapeTransitionByType( const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XTransitionFilter > const& xTransition, + css::uno::Reference< css::animations::XTransitionFilter > const& xTransition, sal_Int16 nType, sal_Int16 nSubType ) { diff --git a/slideshow/source/engine/waitsymbol.hxx b/slideshow/source/engine/waitsymbol.hxx index fd3314dea1ba..41d2995d85a5 100644 --- a/slideshow/source/engine/waitsymbol.hxx +++ b/slideshow/source/engine/waitsymbol.hxx @@ -43,8 +43,7 @@ class WaitSymbol : public ViewEventHandler, private ::boost::noncopyable { public: - static WaitSymbolSharedPtr create( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XBitmap>& xBitmap, + static WaitSymbolSharedPtr create( const css::uno::Reference<css::rendering::XBitmap>& xBitmap, ScreenUpdater& rScreenUpdater, EventMultiplexer& rEventMultiplexer, const UnoViewContainer& rViewContainer ); @@ -58,8 +57,7 @@ public: void hide() { setVisible(false); } private: - WaitSymbol( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XBitmap>& xBitmap, + WaitSymbol( const css::uno::Reference<css::rendering::XBitmap>& xBitmap, ScreenUpdater& rScreenUpdater, const UnoViewContainer& rViewContainer ); @@ -76,8 +74,7 @@ private: ::std::pair<UnoViewSharedPtr, cppcanvas::CustomSpriteSharedPtr> > ViewsVecT; - ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XBitmap> mxBitmap; + css::uno::Reference<css::rendering::XBitmap> mxBitmap; ViewsVecT maViews; ScreenUpdater& mrScreenUpdater; diff --git a/slideshow/source/inc/activitiesfactory.hxx b/slideshow/source/inc/activitiesfactory.hxx index 587997d56512..57c8541d25b5 100644 --- a/slideshow/source/inc/activitiesfactory.hxx +++ b/slideshow/source/inc/activitiesfactory.hxx @@ -149,8 +149,7 @@ namespace ActivitiesFactory AnimationActivitySharedPtr createAnimateActivity( const CommonParameters& rParms, const NumberAnimationSharedPtr& rAnimator, - const ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimate >& xNode ); + const css::uno::Reference< css::animations::XAnimate >& xNode ); /** Create an activity from an XAnimate node. @@ -172,8 +171,7 @@ namespace ActivitiesFactory AnimationActivitySharedPtr createAnimateActivity( const CommonParameters& rParms, const EnumAnimationSharedPtr& rAnimator, - const ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimate >& xNode ); + const css::uno::Reference< css::animations::XAnimate >& xNode ); /** Create an activity from an XAnimate node. @@ -195,8 +193,7 @@ namespace ActivitiesFactory AnimationActivitySharedPtr createAnimateActivity( const CommonParameters& rParms, const ColorAnimationSharedPtr& rAnimator, - const ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimate >& xNode ); + const css::uno::Reference< css::animations::XAnimate >& xNode ); /** Create an activity from an XAnimate node. @@ -218,8 +215,7 @@ namespace ActivitiesFactory AnimationActivitySharedPtr createAnimateActivity( const CommonParameters& rParms, const HSLColorAnimationSharedPtr& rAnimator, - const ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimateColor >& xNode ); + const css::uno::Reference< css::animations::XAnimateColor >& xNode ); /** Create an activity from an XAnimate node. @@ -241,8 +237,7 @@ namespace ActivitiesFactory AnimationActivitySharedPtr createAnimateActivity( const CommonParameters& rParms, const PairAnimationSharedPtr& rAnimator, - const ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimate >& xNode ); + const css::uno::Reference< css::animations::XAnimate >& xNode ); /** Create an activity from an XAnimate node. @@ -264,8 +259,7 @@ namespace ActivitiesFactory AnimationActivitySharedPtr createAnimateActivity( const CommonParameters& rParms, const StringAnimationSharedPtr& rAnimator, - const ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimate >& xNode ); + const css::uno::Reference< css::animations::XAnimate >& xNode ); /** Create an activity from an XAnimate node. @@ -287,8 +281,7 @@ namespace ActivitiesFactory AnimationActivitySharedPtr createAnimateActivity( const CommonParameters& rParms, const BoolAnimationSharedPtr& rAnimator, - const ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimate >& xNode ); + const css::uno::Reference< css::animations::XAnimate >& xNode ); /** Create a simple activity for the given animator diff --git a/slideshow/source/inc/animationnode.hxx b/slideshow/source/inc/animationnode.hxx index 54f3c7e1306e..8eabe47e98be 100644 --- a/slideshow/source/inc/animationnode.hxx +++ b/slideshow/source/inc/animationnode.hxx @@ -53,8 +53,7 @@ public: /** Query the corresponding XAnimationNode. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode > + virtual css::uno::Reference< css::animations::XAnimationNode > getXAnimationNode() const = 0; /** Init this node diff --git a/slideshow/source/inc/animationnodefactory.hxx b/slideshow/source/inc/animationnodefactory.hxx index f0ab3135caf1..d7c9162824f4 100644 --- a/slideshow/source/inc/animationnodefactory.hxx +++ b/slideshow/source/inc/animationnodefactory.hxx @@ -44,10 +44,9 @@ namespace slideshow { /** Create an AnimationNode for the given XAnimationNode */ - AnimationNodeSharedPtr createAnimationNode( const ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode >& xNode, - const ::basegfx::B2DVector& rSlideSize, - const SlideShowContext& rContext ); + AnimationNodeSharedPtr createAnimationNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode, + const ::basegfx::B2DVector& rSlideSize, + const SlideShowContext& rContext ); #if defined(DBG_UTIL) diff --git a/slideshow/source/inc/eventmultiplexer.hxx b/slideshow/source/inc/eventmultiplexer.hxx index 6262bc7734f0..b92cd442ec18 100644 --- a/slideshow/source/inc/eventmultiplexer.hxx +++ b/slideshow/source/inc/eventmultiplexer.hxx @@ -135,8 +135,7 @@ class ShapeCursorEventHandler public: virtual ~ShapeCursorEventHandler() {} - virtual bool cursorChanged( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& xShape, + virtual bool cursorChanged( const css::uno::Reference< css::drawing::XShape>& xShape, sal_Int16 nCursor ) = 0; }; @@ -491,8 +490,7 @@ public: @param xView View that has changed */ - bool notifyViewChanged( const ::com::sun::star::uno::Reference< - ::com::sun::star::presentation::XSlideShowView>& xView ); + bool notifyViewChanged( const css::uno::Reference<css::presentation::XSlideShowView>& xView ); /** All Views changed @@ -510,8 +508,7 @@ public: @param xView View that has been clobbered */ - bool notifyViewClobbered( const ::com::sun::star::uno::Reference< - ::com::sun::star::presentation::XSlideShowView>& xView ); + bool notifyViewClobbered( const css::uno::Reference<css::presentation::XSlideShowView>& xView ); /** New shape event listener added @@ -521,10 +518,8 @@ public: @return true, if at least one handler successfully processed the notification. */ - bool notifyShapeListenerAdded( const ::com::sun::star::uno::Reference< - ::com::sun::star::presentation::XShapeEventListener>& xListener, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& xShape ); + bool notifyShapeListenerAdded( const css::uno::Reference<css::presentation::XShapeEventListener>& xListener, + const css::uno::Reference<css::drawing::XShape>& xShape ); /** A shape event listener was removed @@ -534,10 +529,8 @@ public: @return true, if at least one handler successfully processed the notification. */ - bool notifyShapeListenerRemoved( const ::com::sun::star::uno::Reference< - ::com::sun::star::presentation::XShapeEventListener>& xListener, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& xShape ); + bool notifyShapeListenerRemoved( const css::uno::Reference<css::presentation::XShapeEventListener>& xListener, + const css::uno::Reference<css::drawing::XShape>& xShape ); /** A new shape cursor was set @@ -547,8 +540,7 @@ public: @return true, if at least one handler successfully processed the notification. */ - bool notifyShapeCursorChange( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& xShape, + bool notifyShapeCursorChange( const css::uno::Reference<css::drawing::XShape>& xShape, sal_Int16 nPointerShape ); /** Notify a new user paint color diff --git a/slideshow/source/inc/mouseeventhandler.hxx b/slideshow/source/inc/mouseeventhandler.hxx index 5886f29a2b1e..2a7d716e1170 100644 --- a/slideshow/source/inc/mouseeventhandler.hxx +++ b/slideshow/source/inc/mouseeventhandler.hxx @@ -59,7 +59,7 @@ namespace slideshow false, possibly other, less prioritized handlers can be called, too. */ - virtual bool handleMousePressed( const ::com::sun::star::awt::MouseEvent& e ) = 0; + virtual bool handleMousePressed( const css::awt::MouseEvent& e ) = 0; /** Handle a mouse button released event. @@ -74,7 +74,7 @@ namespace slideshow false, possibly other, less prioritized handlers are called, too. */ - virtual bool handleMouseReleased( const ::com::sun::star::awt::MouseEvent& e ) = 0; + virtual bool handleMouseReleased( const css::awt::MouseEvent& e ) = 0; /** Handle a mouse was moved with a pressed button event. @@ -89,7 +89,7 @@ namespace slideshow false, possibly other, less prioritized handlers are called, too. */ - virtual bool handleMouseDragged( const ::com::sun::star::awt::MouseEvent& e ) = 0; + virtual bool handleMouseDragged( const css::awt::MouseEvent& e ) = 0; /** Handle a mouse was moved event. @@ -104,7 +104,7 @@ namespace slideshow false, possibly other, less prioritized handlers are called, too. */ - virtual bool handleMouseMoved( const ::com::sun::star::awt::MouseEvent& e ) = 0; + virtual bool handleMouseMoved( const css::awt::MouseEvent& e ) = 0; }; typedef ::boost::shared_ptr< MouseEventHandler > MouseEventHandlerSharedPtr; diff --git a/slideshow/source/inc/shape.hxx b/slideshow/source/inc/shape.hxx index 741e76ab3d7e..a0ed0d38d7ac 100644 --- a/slideshow/source/inc/shape.hxx +++ b/slideshow/source/inc/shape.hxx @@ -65,8 +65,7 @@ namespace slideshow direct corresponding XShape (the background comes to mind here). */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape > getXShape() const = 0; + virtual css::uno::Reference< css::drawing::XShape > getXShape() const = 0; // View layer methods diff --git a/slideshow/source/inc/shapeattributelayer.hxx b/slideshow/source/inc/shapeattributelayer.hxx index f2bed3498fba..c4b23db7fbdc 100644 --- a/slideshow/source/inc/shapeattributelayer.hxx +++ b/slideshow/source/inc/shapeattributelayer.hxx @@ -133,13 +133,13 @@ namespace slideshow layers are combined with this one (i.e. to overrule lower layers, or how to combine the values). The default is - ::com::sun::star::animations::AnimationAdditiveMode::BASE, + css::animations::AnimationAdditiveMode::BASE, which means, take the value of the underlying layers, or from the model shape itself. @param nMode Must be one of - ::com::sun::star::animations::AnimationAdditiveMode. + css::animations::AnimationAdditiveMode. */ void setAdditiveMode( sal_Int16 nMode ); @@ -410,14 +410,14 @@ namespace slideshow /** Get the current char weight value for the whole shape. @returns the value for the char weight. The value must - be out of the ::com::sun::star::awt::FontWeight + be out of the css::awt::FontWeight constant group. */ double getCharWeight() const; /** Set the char weight globally for the whole shape. The value must be out of the - ::com::sun::star::awt::FontWeight constant group. + css::awt::FontWeight constant group. */ void setCharWeight( const double& rStyle ); @@ -454,13 +454,13 @@ namespace slideshow /** Get the current text italic style for the whole shape. @returns the italic style. The value returned is one - of the ::com::sun::star::awt::FontSlant enums + of the css::awt::FontSlant enums */ sal_Int16 getCharPosture() const; /** Set the italic style globally for the whole shape. The value must be one of the - ::com::sun::star::awt::FontSlant enums. + css::awt::FontSlant enums. */ void setCharPosture( const sal_Int16& rStyle ); @@ -520,9 +520,9 @@ namespace slideshow double mnCharScale; double mnCharWeight; - ::com::sun::star::drawing::FillStyle meFillStyle; - ::com::sun::star::drawing::LineStyle meLineStyle; - ::com::sun::star::awt::FontSlant meCharPosture; + css::drawing::FillStyle meFillStyle; + css::drawing::LineStyle meLineStyle; + css::awt::FontSlant meCharPosture; sal_Int16 mnUnderlineMode; RGBColor maDimColor; diff --git a/slideshow/source/inc/shapeimporter.hxx b/slideshow/source/inc/shapeimporter.hxx index f05e4a01fba5..3c9b85b4ed47 100644 --- a/slideshow/source/inc/shapeimporter.hxx +++ b/slideshow/source/inc/shapeimporter.hxx @@ -67,12 +67,9 @@ public: When true, then the master page is imported. Otherwise, this object imports the draw page. */ - ShapeImporter( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage >& xPage, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage >& xActualPage, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPagesSupplier>& xPagesSupplier, + ShapeImporter( const css::uno::Reference< css::drawing::XDrawPage >& xPage, + const css::uno::Reference< css::drawing::XDrawPage >& xActualPage, + const css::uno::Reference< css::drawing::XDrawPagesSupplier>& xPagesSupplier, const SlideShowContext& rContext, sal_Int32 nOrdNumStart, bool bConvertingMasterPage ); @@ -97,45 +94,38 @@ public: double getImportedShapesCount() { return mnAscendingPrio; } private: - bool isSkip( ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> const& xPropSet, + bool isSkip( css::uno::Reference<css::beans::XPropertySet> const& xPropSet, OUString const& shapeType, - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XLayer> const& xLayer); + css::uno::Reference<css::drawing::XLayer> const& xLayer); ShapeSharedPtr createShape( - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape> const& xCurrShape, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> const& xPropSet, + css::uno::Reference<css::drawing::XShape> const& xCurrShape, + css::uno::Reference<css::beans::XPropertySet> const& xPropSet, OUString const& shapeType ) const; - void importPolygons(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > const& xPropSet) ; + void importPolygons(css::uno::Reference< css::beans::XPropertySet > const& xPropSet) ; struct XShapesEntry { ShapeSharedPtr const mpGroupShape; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes> const mxShapes; + css::uno::Reference<css::drawing::XShapes> const mxShapes; sal_Int32 const mnCount; sal_Int32 mnPos; explicit XShapesEntry( ShapeSharedPtr const& pGroupShape ) : mpGroupShape(pGroupShape), mxShapes( pGroupShape->getXShape(), - ::com::sun::star::uno::UNO_QUERY_THROW ), + css::uno::UNO_QUERY_THROW ), mnCount(mxShapes->getCount()), mnPos(0) {} - explicit XShapesEntry( ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes> const& xShapes ) + explicit XShapesEntry( css::uno::Reference< + css::drawing::XShapes> const& xShapes ) : mpGroupShape(), mxShapes(xShapes), mnCount(xShapes->getCount()), mnPos(0) {} }; typedef ::std::stack<XShapesEntry> XShapesStack; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage> mxPage; - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPagesSupplier> mxPagesSupplier; + css::uno::Reference<css::drawing::XDrawPage> mxPage; + css::uno::Reference<css::drawing::XDrawPagesSupplier> mxPagesSupplier; const SlideShowContext& mrContext; PolyPolygonVector maPolygons; XShapesStack maShapesStack; diff --git a/slideshow/source/inc/shapelistenereventhandler.hxx b/slideshow/source/inc/shapelistenereventhandler.hxx index 07125e8730a5..b52c3d2c9886 100644 --- a/slideshow/source/inc/shapelistenereventhandler.hxx +++ b/slideshow/source/inc/shapelistenereventhandler.hxx @@ -48,15 +48,11 @@ namespace slideshow public: virtual ~ShapeListenerEventHandler() {} - virtual bool listenerAdded( const ::com::sun::star::uno::Reference< - ::com::sun::star::presentation::XShapeEventListener>& xListener, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& xShape ) = 0; + virtual bool listenerAdded( const css::uno::Reference<css::presentation::XShapeEventListener>& xListener, + const css::uno::Reference<css::drawing::XShape>& xShape ) = 0; - virtual bool listenerRemoved( const ::com::sun::star::uno::Reference< - ::com::sun::star::presentation::XShapeEventListener>& xListener, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& xShape ) = 0; + virtual bool listenerRemoved( const css::uno::Reference<css::presentation::XShapeEventListener>& xListener, + const css::uno::Reference<css::drawing::XShape>& xShape ) = 0; }; typedef ::boost::shared_ptr< ShapeListenerEventHandler > ShapeListenerEventHandlerSharedPtr; diff --git a/slideshow/source/inc/shapemanager.hxx b/slideshow/source/inc/shapemanager.hxx index e0daad37b76d..1a81e024f7b5 100644 --- a/slideshow/source/inc/shapemanager.hxx +++ b/slideshow/source/inc/shapemanager.hxx @@ -89,8 +89,7 @@ namespace slideshow should be looked up. */ virtual boost::shared_ptr<Shape> lookupShape( - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape > const & xShape ) const = 0; + css::uno::Reference< css::drawing::XShape > const & xShape ) const = 0; /** Register given shape as a hyperlink target diff --git a/slideshow/source/inc/shapemaps.hxx b/slideshow/source/inc/shapemaps.hxx index dc937a993cd6..82607d5df675 100644 --- a/slideshow/source/inc/shapemaps.hxx +++ b/slideshow/source/inc/shapemaps.hxx @@ -38,14 +38,12 @@ namespace slideshow namespace internal { /// Maps XShape to shape listener - typedef ::std::map< ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>, + typedef ::std::map< css::uno::Reference< css::drawing::XShape>, boost::shared_ptr< ::cppu::OInterfaceContainerHelper > > ShapeEventListenerMap; /// Maps XShape to mouse cursor - typedef ::std::map< ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>, + typedef ::std::map< css::uno::Reference< css::drawing::XShape>, sal_Int16> ShapeCursorMap; } } diff --git a/slideshow/source/inc/slide.hxx b/slideshow/source/inc/slide.hxx index 8b4fad5d9688..8c3b40f9d4a9 100644 --- a/slideshow/source/inc/slide.hxx +++ b/slideshow/source/inc/slide.hxx @@ -100,12 +100,10 @@ namespace slideshow virtual basegfx::B2IVector getSlideSize() const = 0; /// Gets the underlying API page - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage > getXDrawPage() const = 0; + virtual css::uno::Reference< css::drawing::XDrawPage > getXDrawPage() const = 0; /// Gets the animation node. - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode > getXAnimationNode() const = 0; + virtual css::uno::Reference< css::animations::XAnimationNode > getXAnimationNode() const = 0; ///Gets the slide Polygons virtual PolyPolygonVector getPolygons() = 0; @@ -188,12 +186,9 @@ namespace slideshow @param rUserEventQueue UserEeventQueue */ - SlideSharedPtr createSlide( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage >& xDrawPage, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPagesSupplier >& xDrawPages, - const ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode >& xRootNode, + SlideSharedPtr createSlide( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage, + const css::uno::Reference< css::drawing::XDrawPagesSupplier >& xDrawPages, + const css::uno::Reference< css::animations::XAnimationNode >& xRootNode, EventQueue& rEventQueue, EventMultiplexer& rEventMultiplexer, ScreenUpdater& rScreenUpdater, @@ -201,8 +196,7 @@ namespace slideshow UserEventQueue& rUserEventQueue, CursorManager& rCursorManager, const UnoViewContainer& rViewContainer, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, const ShapeEventListenerMap& rShapeListenerMap, const ShapeCursorMap& rShapeCursorMap, const PolyPolygonVector& rPolyPolygonVector, diff --git a/slideshow/source/inc/slidebitmap.hxx b/slideshow/source/inc/slidebitmap.hxx index 63f6c3b1ee6f..cce00ae09c81 100644 --- a/slideshow/source/inc/slidebitmap.hxx +++ b/slideshow/source/inc/slidebitmap.hxx @@ -67,16 +67,14 @@ namespace slideshow void move( const ::basegfx::B2DPoint& rNewPos ); void clip( const ::basegfx::B2DPolyPolygon& rClipPoly ); - ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XBitmap > getXBitmap(); + css::uno::Reference< css::rendering::XBitmap > getXBitmap(); private: ::basegfx::B2DPoint maOutputPos; ::basegfx::B2DPolyPolygon maClipPoly; // TODO(Q2): Remove UNO bitmap as the transport medium - ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XBitmap > mxBitmap; + css::uno::Reference< css::rendering::XBitmap > mxBitmap; }; typedef ::boost::shared_ptr< SlideBitmap > SlideBitmapSharedPtr; diff --git a/slideshow/source/inc/slideshowcontext.hxx b/slideshow/source/inc/slideshowcontext.hxx index ff2d0bb7c4c2..19b0739afdf2 100644 --- a/slideshow/source/inc/slideshowcontext.hxx +++ b/slideshow/source/inc/slideshowcontext.hxx @@ -89,8 +89,7 @@ namespace slideshow UserEventQueue& rUserEventQueue, CursorManager& rCursorManager, const UnoViewContainer& rViewContainer, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext>& rComponentContext ); + const css::uno::Reference< css::uno::XComponentContext>& rComponentContext ); void dispose(); boost::shared_ptr<SubsettableShapeManager>& mpSubsettableShapeManager; @@ -101,8 +100,7 @@ namespace slideshow UserEventQueue& mrUserEventQueue; CursorManager& mrCursorManager; const UnoViewContainer& mrViewContainer; - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext> mxComponentContext; + css::uno::Reference< css::uno::XComponentContext> mxComponentContext; }; } } diff --git a/slideshow/source/inc/slideview.hxx b/slideshow/source/inc/slideview.hxx index 9b90487fd590..6296faebefd9 100644 --- a/slideshow/source/inc/slideview.hxx +++ b/slideshow/source/inc/slideview.hxx @@ -43,8 +43,7 @@ namespace slideshow Functor to call, when the UNO view signals a repaint. */ UnoViewSharedPtr createSlideView( - ::com::sun::star::uno::Reference< - ::com::sun::star::presentation::XSlideShowView> const& xView, + css::uno::Reference< css::presentation::XSlideShowView> const& xView, EventQueue& rEventQueue, EventMultiplexer& rEventMultiplexer ); } diff --git a/slideshow/source/inc/soundplayer.hxx b/slideshow/source/inc/soundplayer.hxx index c97298ca9806..1d6da3d0fbcf 100644 --- a/slideshow/source/inc/soundplayer.hxx +++ b/slideshow/source/inc/soundplayer.hxx @@ -57,15 +57,14 @@ namespace slideshow Reference to a component context, used to create the needed services - @throws ::com::sun::star::lang::NoSupportException, if + @throws css::lang::NoSupportException, if the sound file is invalid, or not supported by the player service. */ static ::boost::shared_ptr<SoundPlayer> create( EventMultiplexer & rEventMultiplexer, const OUString& rSoundURL, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext>& rComponentContext ); + const css::uno::Reference< css::uno::XComponentContext>& rComponentContext ); virtual ~SoundPlayer(); @@ -93,14 +92,13 @@ namespace slideshow SoundPlayer( EventMultiplexer & rEventMultiplexer, const OUString& rSoundURL, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext>& rComponentContext ); + const css::uno::Reference< css::uno::XComponentContext>& rComponentContext ); EventMultiplexer & mrEventMultiplexer; // TODO(Q3): obsolete when boost::enable_shared_ptr_from_this // is available ::boost::shared_ptr<SoundPlayer> mThis; - ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer; + css::uno::Reference< css::media::XPlayer > mxPlayer; }; typedef ::boost::shared_ptr< SoundPlayer > SoundPlayerSharedPtr; diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx index cc8a8d350b7a..e518cfcf10b6 100644 --- a/slideshow/source/inc/tools.hxx +++ b/slideshow/source/inc/tools.hxx @@ -92,13 +92,11 @@ namespace com { namespace sun { namespace star { namespace uno { template <typename T> inline ::std::size_t hash_value( - ::com::sun::star::uno::Reference<T> const& x ) + css::uno::Reference<T> const& x ) { // normalize to object root, because _only_ XInterface is defined // to be stable during object lifetime: - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface> const xRoot( - x, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::uno::XInterface> const xRoot( x, css::uno::UNO_QUERY ); return slideshow::internal::hash<void *>()(xRoot.get()); } @@ -124,49 +122,49 @@ namespace slideshow /// extract unary double value from Any bool extractValue( double& o_rValue, - const ::com::sun::star::uno::Any& rSourceAny, + const css::uno::Any& rSourceAny, const boost::shared_ptr<Shape>& rShape, const basegfx::B2DVector& rSlideBounds ); /// extract int from Any bool extractValue( sal_Int32& o_rValue, - const ::com::sun::star::uno::Any& rSourceAny, + const css::uno::Any& rSourceAny, const boost::shared_ptr<Shape>& rShape, const basegfx::B2DVector& rSlideBounds ); /// extract enum/constant group value from Any bool extractValue( sal_Int16& o_rValue, - const ::com::sun::star::uno::Any& rSourceAny, + const css::uno::Any& rSourceAny, const boost::shared_ptr<Shape>& rShape, const basegfx::B2DVector& rSlideBounds ); /// extract color value from Any bool extractValue( RGBColor& o_rValue, - const ::com::sun::star::uno::Any& rSourceAny, + const css::uno::Any& rSourceAny, const boost::shared_ptr<Shape>& rShape, const basegfx::B2DVector& rSlideBounds ); /// extract color value from Any bool extractValue( HSLColor& o_rValue, - const ::com::sun::star::uno::Any& rSourceAny, + const css::uno::Any& rSourceAny, const boost::shared_ptr<Shape>& rShape, const basegfx::B2DVector& rSlideBounds ); /// extract plain string from Any - bool extractValue( OUString& o_rValue, - const ::com::sun::star::uno::Any& rSourceAny, + bool extractValue( OUString& o_rValue, + const css::uno::Any& rSourceAny, const boost::shared_ptr<Shape>& rShape, const basegfx::B2DVector& rSlideBounds ); /// extract bool value from Any bool extractValue( bool& o_rValue, - const ::com::sun::star::uno::Any& rSourceAny, + const css::uno::Any& rSourceAny, const boost::shared_ptr<Shape>& rShape, const basegfx::B2DVector& rSlideBounds ); /// extract double 2-tuple from Any bool extractValue( basegfx::B2DTuple& o_rPair, - const ::com::sun::star::uno::Any& rSourceAny, + const css::uno::Any& rSourceAny, const boost::shared_ptr<Shape>& rShape, const basegfx::B2DVector& rSlideBounds ); @@ -175,9 +173,8 @@ namespace slideshow @return true, if the sequence contains the specified element. */ - bool findNamedValue( ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::NamedValue > const& rSequence, - const ::com::sun::star::beans::NamedValue& rSearchKey ); + bool findNamedValue( css::uno::Sequence< css::beans::NamedValue > const& rSequence, + const css::beans::NamedValue& rSearchKey ); basegfx::B2DRange calcRelativeShapeBounds( const basegfx::B2DVector& rPageSize, const basegfx::B2DRange& rShapeBounds ); @@ -313,12 +310,12 @@ namespace slideshow template <typename ValueType> inline bool getPropertyValue( ValueType & rValue, - com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> const & xPropSet, + css::uno::Reference< + css::beans::XPropertySet> const & xPropSet, OUString const & propName ) { try { - const com::sun::star::uno::Any& a( + const css::uno::Any& a( xPropSet->getPropertyValue( propName ) ); bool const bRet = (a >>= rValue); #if OSL_DEBUG_LEVEL > 0 @@ -332,11 +329,11 @@ namespace slideshow #endif return bRet; } - catch (com::sun::star::uno::RuntimeException &) + catch (css::uno::RuntimeException &) { throw; } - catch (com::sun::star::uno::Exception &) + catch (css::uno::Exception &) { return false; } @@ -344,17 +341,14 @@ namespace slideshow template <typename ValueType> inline bool getPropertyValue( - com::sun::star::uno::Reference< ValueType >& rIfc, - com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> const & xPropSet, + css::uno::Reference< ValueType >& rIfc, + css::uno::Reference< css::beans::XPropertySet> const & xPropSet, OUString const & propName ) { try { - const com::sun::star::uno::Any& a( - xPropSet->getPropertyValue( propName )); - rIfc.set( a, - com::sun::star::uno::UNO_QUERY ); + const css::uno::Any& a(xPropSet->getPropertyValue( propName )); + rIfc.set( a, css::uno::UNO_QUERY ); bool const bRet = rIfc.is(); #if OSL_DEBUG_LEVEL > 0 @@ -368,26 +362,24 @@ namespace slideshow #endif return bRet; } - catch (com::sun::star::uno::RuntimeException &) + catch (css::uno::RuntimeException &) { throw; } - catch (com::sun::star::uno::Exception &) + catch (css::uno::Exception &) { return false; } } /// Get the content of the BoundRect shape property - basegfx::B2DRange getAPIShapeBounds( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape ); + basegfx::B2DRange getAPIShapeBounds( const css::uno::Reference< css::drawing::XShape >& xShape ); /* TODO(F1): When ZOrder someday becomes usable enable this /// Get the content of the ZOrder shape property - double getAPIShapePrio( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape ); + double getAPIShapePrio( const css::uno::Reference< css::drawing::XShape >& xShape ); */ basegfx::B2IVector getSlideSizePixel( const basegfx::B2DVector& rSize, @@ -406,35 +398,34 @@ namespace slideshow @param rFunctor Functor to apply. The functor must have an appropriate - operator()( const ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode >& ) member. + operator()( const css::uno::Reference< css::animations::XAnimationNode >& ) member. @return true, if the functor was successfully applied to all children, false otherwise. */ - template< typename Functor > inline bool for_each_childNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, + template< typename Functor > inline bool for_each_childNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode, Functor& rFunctor ) { try { // get an XEnumerationAccess to the children - ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess > + css::uno::Reference< css::container::XEnumerationAccess > xEnumerationAccess( xNode, - ::com::sun::star::uno::UNO_QUERY_THROW ); - ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > + css::uno::UNO_QUERY_THROW ); + css::uno::Reference< css::container::XEnumeration > xEnumeration( xEnumerationAccess->createEnumeration(), - ::com::sun::star::uno::UNO_QUERY_THROW ); + css::uno::UNO_QUERY_THROW ); while( xEnumeration->hasMoreElements() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > + css::uno::Reference< css::animations::XAnimationNode > xChildNode( xEnumeration->nextElement(), - ::com::sun::star::uno::UNO_QUERY_THROW ); + css::uno::UNO_QUERY_THROW ); rFunctor( xChildNode ); } return true; } - catch( ::com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { return false; } diff --git a/slideshow/source/inc/transitionfactory.hxx b/slideshow/source/inc/transitionfactory.hxx index 9935740baf62..a2e50aa2b206 100644 --- a/slideshow/source/inc/transitionfactory.hxx +++ b/slideshow/source/inc/transitionfactory.hxx @@ -66,8 +66,7 @@ namespace slideshow const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XTransitionFilter > const& xTransition ); + css::uno::Reference< css::animations::XTransitionFilter > const& xTransition ); /** Create a transition effect for slides. @@ -103,8 +102,7 @@ namespace slideshow const UnoViewContainer& rViewContainer, ScreenUpdater& rScreenUpdater, EventMultiplexer& rEventMultiplexer, - const com::sun::star::uno::Reference< - com::sun::star::presentation::XTransitionFactory>& + const css::uno::Reference< css::presentation::XTransitionFactory>& xOptionalFactory, sal_Int16 nTransitionType, sal_Int16 nTransitionSubType, diff --git a/slideshow/source/inc/unoview.hxx b/slideshow/source/inc/unoview.hxx index 84b8655b1dec..a7a6c7b5fa2e 100644 --- a/slideshow/source/inc/unoview.hxx +++ b/slideshow/source/inc/unoview.hxx @@ -48,7 +48,7 @@ namespace slideshow public: /** Retrieve the underlying UNO slide view. */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XSlideShowView > getUnoView() const = 0; + virtual css::uno::Reference< css::presentation::XSlideShowView > getUnoView() const = 0; /** Dispose view diff --git a/slideshow/source/inc/unoviewcontainer.hxx b/slideshow/source/inc/unoviewcontainer.hxx index d7b0c6800504..a82e12eafc41 100644 --- a/slideshow/source/inc/unoviewcontainer.hxx +++ b/slideshow/source/inc/unoviewcontainer.hxx @@ -62,8 +62,7 @@ namespace slideshow removed, and an empty shared_ptr otherwise (e.g. if this view wasn't added in the first place) */ - UnoViewSharedPtr removeView( const ::com::sun::star::uno::Reference< - ::com::sun::star::presentation::XSlideShowView >& xView ); + UnoViewSharedPtr removeView( const css::uno::Reference<css::presentation::XSlideShowView >& xView ); /// Dispose all stored views. Implies clear(). void dispose(); diff --git a/slideshow/source/inc/usereventqueue.hxx b/slideshow/source/inc/usereventqueue.hxx index dd7ae4abf82b..00d6d955a64f 100644 --- a/slideshow/source/inc/usereventqueue.hxx +++ b/slideshow/source/inc/usereventqueue.hxx @@ -111,8 +111,7 @@ public: */ void registerAnimationStartEvent( const EventSharedPtr& rEvent, - const ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode>& xNode ); + const css::uno::Reference<css::animations::XAnimationNode>& xNode ); /** Register an event that will be fired when the given animation node ends its active duration. @@ -123,8 +122,7 @@ public: */ void registerAnimationEndEvent( const EventSharedPtr& rEvent, - const ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode>& xNode ); + const css::uno::Reference<css::animations::XAnimationNode>& xNode ); /** Register an event that will be fired when audio output stopped for the given animation node. @@ -135,8 +133,7 @@ public: */ void registerAudioStoppedEvent( const EventSharedPtr& rEvent, - const ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode>& xNode ); + const css::uno::Reference<css::animations::XAnimationNode>& xNode ); /** Register an event that is fired when a shape is clicked diff --git a/slideshow/source/inc/view.hxx b/slideshow/source/inc/view.hxx index 5264640d5993..bce9d0c75217 100644 --- a/slideshow/source/inc/view.hxx +++ b/slideshow/source/inc/view.hxx @@ -73,7 +73,7 @@ namespace slideshow /** Change the view's mouse cursor. @param nPointerShape - One of the ::com::sun::star::awt::SystemPointer + One of the css::awt::SystemPointer constant group members. */ virtual void setCursorShape( sal_Int16 nPointerShape ) = 0; diff --git a/slideshow/source/inc/viewlayer.hxx b/slideshow/source/inc/viewlayer.hxx index 5fa1cdb49a96..b3d3a8d647ad 100644 --- a/slideshow/source/inc/viewlayer.hxx +++ b/slideshow/source/inc/viewlayer.hxx @@ -129,7 +129,7 @@ namespace slideshow */ virtual basegfx::B2DHomMatrix getTransformation() const = 0; - virtual ::com::sun::star::geometry::IntegerSize2D getTranslationOffset() const = 0; + virtual css::geometry::IntegerSize2D getTranslationOffset() const = 0; /** Get the overall view transformation. |