summaryrefslogtreecommitdiff
path: root/slideshow/source/engine/slide
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-03-04 08:57:28 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-03-05 12:12:26 +0100
commit191f85df5851473af270be486f95f940e3091fef (patch)
tree753d9513ccda8ee2a132bdad74eedc47bd71b179 /slideshow/source/engine/slide
parent983566119c926d0e2478f74548f00a789de55c15 (diff)
re-land "new loplugin typedefparam""
This reverts commit c9bb48386bad7d2a40e6958883328145ae439cad, and adds a bunch more fixes. Change-Id: Ib584d302a73125528eba85fa1e722cb6fc41538a Reviewed-on: https://gerrit.libreoffice.org/68680 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'slideshow/source/engine/slide')
-rw-r--r--slideshow/source/engine/slide/layer.hxx11
-rw-r--r--slideshow/source/engine/slide/layermanager.cxx2
-rw-r--r--slideshow/source/engine/slide/shapemanagerimpl.hxx12
3 files changed, 13 insertions, 12 deletions
diff --git a/slideshow/source/engine/slide/layer.hxx b/slideshow/source/engine/slide/layer.hxx
index ae2add70a5bf..95a5f7d4402c 100644
--- a/slideshow/source/engine/slide/layer.hxx
+++ b/slideshow/source/engine/slide/layer.hxx
@@ -35,6 +35,10 @@ namespace slideshow
namespace internal
{
class LayerEndUpdate;
+ class Layer;
+ typedef ::std::shared_ptr< Layer > LayerSharedPtr;
+ typedef ::std::weak_ptr< Layer > LayerWeakPtr;
+
/* Definition of Layer class */
@@ -71,7 +75,7 @@ namespace slideshow
This method will create a layer without a ViewLayer,
i.e. one that displays directly on the background.
*/
- static ::std::shared_ptr< Layer > createBackgroundLayer();
+ static LayerSharedPtr createBackgroundLayer();
/** Create non-background layer
@@ -79,7 +83,7 @@ namespace slideshow
background, to contain shapes that should appear in
front of animated objects.
*/
- static ::std::shared_ptr< Layer > createLayer();
+ static LayerSharedPtr createLayer();
/** Predicate, whether this layer is the special
@@ -255,9 +259,6 @@ namespace slideshow
bool mbClipSet; // true, if beginUpdate set a clip
};
- typedef ::std::shared_ptr< Layer > LayerSharedPtr;
- typedef ::std::weak_ptr< Layer > LayerWeakPtr;
-
}
}
diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx
index 84be4b5d6e2c..caca994dabe4 100644
--- a/slideshow/source/engine/slide/layermanager.cxx
+++ b/slideshow/source/engine/slide/layermanager.cxx
@@ -546,7 +546,7 @@ namespace slideshow
{
}
- virtual bool isOnView(std::shared_ptr<View> const& /*rView*/) const override
+ virtual bool isOnView(ViewSharedPtr const& /*rView*/) const override
{
return true; // visible on all views
}
diff --git a/slideshow/source/engine/slide/shapemanagerimpl.hxx b/slideshow/source/engine/slide/shapemanagerimpl.hxx
index 6fb693c75818..e4634064bc0c 100644
--- a/slideshow/source/engine/slide/shapemanagerimpl.hxx
+++ b/slideshow/source/engine/slide/shapemanagerimpl.hxx
@@ -119,18 +119,18 @@ private:
virtual void notifyShapeUpdate( const ShapeSharedPtr& rShape ) override;
virtual ShapeSharedPtr lookupShape(
css::uno::Reference< css::drawing::XShape > const & xShape ) const override;
- virtual void addHyperlinkArea( const std::shared_ptr<HyperlinkArea>& rArea ) override;
+ virtual void addHyperlinkArea( const HyperlinkAreaSharedPtr& rArea ) override;
// SubsettableShapeManager interface
- virtual std::shared_ptr<AttributableShape> getSubsetShape(
- const std::shared_ptr<AttributableShape>& rOrigShape,
- const DocTreeNode& rTreeNode ) override;
+ virtual AttributableShapeSharedPtr getSubsetShape(
+ const AttributableShapeSharedPtr& rOrigShape,
+ const DocTreeNode& rTreeNode ) override;
virtual void revokeSubset(
- const std::shared_ptr<AttributableShape>& rOrigShape,
- const std::shared_ptr<AttributableShape>& rSubsetShape ) override;
+ const AttributableShapeSharedPtr& rOrigShape,
+ const AttributableShapeSharedPtr& rSubsetShape ) override;
virtual void addIntrinsicAnimationHandler(
const IntrinsicAnimationEventHandlerSharedPtr& rHandler ) override;