summaryrefslogtreecommitdiff
path: root/svtools/source/graphic
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-06-23 15:43:34 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-06-24 06:45:07 +0000
commit24ca187b6370ca56c8acd92bc405028dd9deb5f2 (patch)
tree07fa9921bc8f6b101500e152fdad0b18b1d3397b /svtools/source/graphic
parentdb12f068f849dc0e03d43ee6688ba342e985fa04 (diff)
loplugin:singlevalfields in svtools
Change-Id: I80fe1d4646af2b8d8e6362a25f6cda4b7ac29eab Reviewed-on: https://gerrit.libreoffice.org/26603 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svtools/source/graphic')
-rw-r--r--svtools/source/graphic/descriptor.cxx7
-rw-r--r--svtools/source/graphic/descriptor.hxx1
2 files changed, 3 insertions, 5 deletions
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index 3606681177f1..f4d268c6117e 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -60,8 +60,7 @@ GraphicDescriptor::GraphicDescriptor() :
meType( GraphicType::NONE ),
mnBitsPerPixel ( 0 ),
mbTransparent ( false ),
- mbAlpha( false ),
- mbAnimated( false )
+ mbAlpha( false )
{
}
@@ -150,7 +149,7 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const OUString* pURL )
maSize100thMM = aDescriptor.GetSize_100TH_MM();
mnBitsPerPixel = aDescriptor.GetBitsPerPixel();
mbTransparent = ( graphic::GraphicType::VECTOR == cType );
- mbAlpha = mbAnimated = false;
+ mbAlpha = false;
}
}
}
@@ -425,7 +424,7 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
case UnoGraphicProperty::Animated:
{
- *pValues <<= mpGraphic ? mpGraphic->IsAnimated() : mbAnimated;
+ *pValues <<= mpGraphic && mpGraphic->IsAnimated();
}
break;
}
diff --git a/svtools/source/graphic/descriptor.hxx b/svtools/source/graphic/descriptor.hxx
index 24045bd9263c..026bd4a30918 100644
--- a/svtools/source/graphic/descriptor.hxx
+++ b/svtools/source/graphic/descriptor.hxx
@@ -110,7 +110,6 @@ private:
sal_uInt16 mnBitsPerPixel;
bool mbTransparent;
bool mbAlpha;
- bool mbAnimated;
GraphicDescriptor( const GraphicDescriptor& rDescriptor ) = delete;