summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-07-03 13:10:00 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-07-03 16:03:34 +0200
commite037381f85413fe6329c54e49ccfcac88dd71048 (patch)
tree78bce79b46f2f5415d70214555ceccc84897dfbf /slideshow
parentca4701fec182d928ab3d39f2183dafecf90e430b (diff)
loplugin:unusedfields in slideshow..svtools
Change-Id: I74d5a4b8cfc4b18267f99648a3112b163c91fd8c Reviewed-on: https://gerrit.libreoffice.org/39474 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/shapes/drawshapesubsetting.cxx21
-rw-r--r--slideshow/source/inc/doctreenode.hxx11
2 files changed, 10 insertions, 22 deletions
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index dccca64df6cf..b94624681233 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -186,22 +186,18 @@ namespace slideshow
// non-subsetted node, with some child subsets
// that subtract from it
maCurrentSubsets.push_back( DocTreeNode( 0,
- mnMinSubsetActionIndex,
- DocTreeNode::NodeType::Invalid ) );
+ mnMinSubsetActionIndex ) );
maCurrentSubsets.push_back( DocTreeNode( mnMaxSubsetActionIndex,
- maActionClassVector.size(),
- DocTreeNode::NodeType::Invalid ) );
+ maActionClassVector.size() ) );
}
else
{
// subsetted node, from which some further child
// subsets subtract content
maCurrentSubsets.push_back( DocTreeNode( maSubset.getStartIndex(),
- mnMinSubsetActionIndex,
- DocTreeNode::NodeType::Invalid ) );
+ mnMinSubsetActionIndex ) );
maCurrentSubsets.push_back( DocTreeNode( mnMaxSubsetActionIndex,
- maSubset.getEndIndex(),
- DocTreeNode::NodeType::Invalid ) );
+ maSubset.getEndIndex() ) );
}
}
else
@@ -717,14 +713,12 @@ namespace slideshow
DocTreeNode makeTreeNode( const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& rBegin,
const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& rStart,
- const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& rEnd,
- DocTreeNode::NodeType eNodeType )
+ const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& rEnd )
{
return DocTreeNode( ::std::distance(rBegin,
rStart),
::std::distance(rBegin,
- rEnd),
- eNodeType );
+ rEnd) );
}
}
@@ -750,8 +744,7 @@ namespace slideshow
iterateActionClassifications( aFunctor, rBegin, rEnd );
return makeTreeNode( maActionClassVector.begin(),
- aLastBegin, aLastEnd,
- eNodeType );
+ aLastBegin, aLastEnd );
}
DocTreeNode DrawShapeSubsetting::getTreeNode( sal_Int32 nNodeIndex,
diff --git a/slideshow/source/inc/doctreenode.hxx b/slideshow/source/inc/doctreenode.hxx
index f619a4b87659..5cd3fe6fe07c 100644
--- a/slideshow/source/inc/doctreenode.hxx
+++ b/slideshow/source/inc/doctreenode.hxx
@@ -63,8 +63,7 @@ namespace slideshow
*/
DocTreeNode() :
mnStartIndex(-1),
- mnEndIndex(-1),
- meType(NodeType::Invalid)
+ mnEndIndex(-1)
{
}
@@ -82,11 +81,9 @@ namespace slideshow
Node type
*/
DocTreeNode( sal_Int32 nStartIndex,
- sal_Int32 nEndIndex,
- NodeType eType ) :
+ sal_Int32 nEndIndex ) :
mnStartIndex(nStartIndex),
- mnEndIndex(nEndIndex),
- meType(eType)
+ mnEndIndex(nEndIndex)
{
}
@@ -100,13 +97,11 @@ namespace slideshow
{
mnStartIndex = -1;
mnEndIndex = -1;
- meType = NodeType::Invalid;
}
private:
sal_Int32 mnStartIndex;
sal_Int32 mnEndIndex;
- NodeType meType;
};