summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-26 16:01:56 +0200
committerNoel Grandin <noel@peralex.com>2015-11-30 10:34:38 +0200
commitec3f72415850bd865eb030cf2b7edb55b99d4756 (patch)
treee63a41091957725506cbb107a272a9872081e3e5 /slideshow
parentd2df03574023b379ac09b1f71cae9e3ba3ac53e2 (diff)
loplugin:unusedfields
Change-Id: Icac4ac1a2614e72bc9ff070819533e09eeb1a864
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/slide/layer.cxx16
-rw-r--r--slideshow/source/engine/slide/layer.hxx30
-rw-r--r--slideshow/source/engine/slide/layermanager.cxx7
3 files changed, 12 insertions, 41 deletions
diff --git a/slideshow/source/engine/slide/layer.cxx b/slideshow/source/engine/slide/layer.cxx
index 48dc741b9cd0..8b2bc42437a7 100644
--- a/slideshow/source/engine/slide/layer.cxx
+++ b/slideshow/source/engine/slide/layer.cxx
@@ -34,23 +34,20 @@ namespace slideshow
{
namespace internal
{
- Layer::Layer( const basegfx::B2DRange& rMaxLayerBounds,
- Dummy ) :
+ Layer::Layer( Dummy ) :
maViewEntries(),
maBounds(),
maNewBounds(),
- maMaxBounds( rMaxLayerBounds ),
mbBoundsDirty(false),
mbBackgroundLayer(true),
mbClipSet(false)
{
}
- Layer::Layer( const basegfx::B2DRange& rMaxLayerBounds ) :
+ Layer::Layer() :
maViewEntries(),
maBounds(),
maNewBounds(),
- maMaxBounds( rMaxLayerBounds ),
mbBoundsDirty(false),
mbBackgroundLayer(false),
mbClipSet(false)
@@ -264,15 +261,14 @@ namespace slideshow
return maUpdateAreas.overlaps( rShape->getUpdateArea() );
}
- LayerSharedPtr Layer::createBackgroundLayer( const basegfx::B2DRange& rMaxLayerBounds )
+ LayerSharedPtr Layer::createBackgroundLayer()
{
- return LayerSharedPtr(new Layer( rMaxLayerBounds,
- BackgroundLayer ));
+ return LayerSharedPtr(new Layer( BackgroundLayer ));
}
- LayerSharedPtr Layer::createLayer( const basegfx::B2DRange& rMaxLayerBounds )
+ LayerSharedPtr Layer::createLayer( )
{
- return LayerSharedPtr( new Layer( rMaxLayerBounds ) );
+ return LayerSharedPtr( new Layer );
}
}
diff --git a/slideshow/source/engine/slide/layer.hxx b/slideshow/source/engine/slide/layer.hxx
index 666fa5227e58..8de60eaebdd8 100644
--- a/slideshow/source/engine/slide/layer.hxx
+++ b/slideshow/source/engine/slide/layer.hxx
@@ -70,26 +70,16 @@ namespace slideshow
This method will create a layer without a ViewLayer,
i.e. one that displays directly on the background.
-
- @param rMaxLayerBounds
- Maximal bounds of this layer, in user
- coordinates. This layer will never be larger or extend
- outside these bounds.
*/
- static ::boost::shared_ptr< Layer > createBackgroundLayer( const basegfx::B2DRange& rMaxLayerBounds );
+ static ::boost::shared_ptr< Layer > createBackgroundLayer();
/** Create non-background layer
This method will create a layer in front of the
background, to contain shapes that should appear in
front of animated objects.
-
- @param rMaxLayerBounds
- Maximal bounds of this layer, in user
- coordinates. This layer will never be larger or extend
- outside these bounds.
*/
- static ::boost::shared_ptr< Layer > createLayer( const basegfx::B2DRange& rMaxLayerBounds );
+ static ::boost::shared_ptr< Layer > createLayer();
@@ -227,30 +217,19 @@ namespace slideshow
ViewLayer, i.e. one that displays directly on the
background.
- @param rMaxLayerBounds
- Maximal bounds of this layer, in user
- coordinates. This layer will never be larger or extend
- outside these bounds.
-
@param eFlag
Dummy parameter, to disambiguate from normal layer
constructor
*/
- Layer( const basegfx::B2DRange& rMaxLayerBounds,
- Dummy eFlag );
+ Layer( Dummy eFlag );
/** Create non-background layer
This constructor will create a layer in front of the
background, to contain shapes that should appear in
front of animated objects.
-
- @param rMaxLayerBounds
- Maximal bounds of this layer, in user
- coordinates. This layer will never be larger or extend
- outside these bounds.
*/
- explicit Layer( const basegfx::B2DRange& rMaxLayerBounds );
+ explicit Layer();
struct ViewEntry
{
@@ -274,7 +253,6 @@ namespace slideshow
basegfx::B2DPolyRange maUpdateAreas;
basegfx::B2DRange maBounds;
basegfx::B2DRange maNewBounds;
- const basegfx::B2DRange maMaxBounds; // maBounds is clipped against this
bool mbBoundsDirty; // true, if view layers need resize
bool mbBackgroundLayer; // true, if this
// layer is the
diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx
index 7fb3fb0fac49..22a248c7549a 100644
--- a/slideshow/source/engine/slide/layermanager.cxx
+++ b/slideshow/source/engine/slide/layermanager.cxx
@@ -86,9 +86,7 @@ namespace slideshow
maLayers.reserve(4);
// create initial background layer
- maLayers.push_back(
- Layer::createBackgroundLayer(
- maPageBounds ));
+ maLayers.push_back( Layer::createBackgroundLayer() );
// init views
for( const auto& rView : mrViews )
@@ -700,8 +698,7 @@ namespace slideshow
{
OSL_ASSERT( mbActive );
- LayerSharedPtr pLayer( Layer::createLayer(
- maPageBounds ));
+ LayerSharedPtr pLayer( Layer::createLayer() );
// create ViewLayers for all registered views, and add to
// newly created layer.