summaryrefslogtreecommitdiff
path: root/slideshow/source/engine/slide
diff options
context:
space:
mode:
Diffstat (limited to 'slideshow/source/engine/slide')
-rw-r--r--slideshow/source/engine/slide/layermanager.cxx2
-rw-r--r--slideshow/source/engine/slide/layermanager.hxx12
-rw-r--r--slideshow/source/engine/slide/shapemanagerimpl.hxx28
-rw-r--r--slideshow/source/engine/slide/slideanimations.hxx3
-rw-r--r--slideshow/source/engine/slide/slideimpl.cxx3
-rw-r--r--slideshow/source/engine/slide/targetpropertiescreator.cxx2
6 files changed, 20 insertions, 30 deletions
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) )
generated by cgit (git 2.34.1) at 2025-05-05 20:51:04 +0000