Kaydet (Commit) 079e5765 authored tarafından Caolán McNamara's avatar Caolán McNamara

coverity#982645 bMissingDefaultsToNormal is always true

Change-Id: Ica58be0b5512eb8f386e51ec6e84d0ec09c3027f
üst cc93bcf7
......@@ -334,15 +334,13 @@ PresenterBitmapContainer::BitmapDescriptor::BitmapDescriptor (
}
css::uno::Reference<css::rendering::XBitmap>
PresenterBitmapContainer::BitmapDescriptor::GetNormalBitmap (void) const
PresenterBitmapContainer::BitmapDescriptor::GetNormalBitmap() const
{
return mxNormalBitmap;
}
css::uno::Reference<css::rendering::XBitmap>
PresenterBitmapContainer::BitmapDescriptor::GetBitmap (
const Mode eMode,
const bool bMissingDefaultsToNormal) const
PresenterBitmapContainer::BitmapDescriptor::GetBitmap(const Mode eMode) const
{
switch (eMode)
{
......@@ -353,19 +351,19 @@ css::uno::Reference<css::rendering::XBitmap>
case MouseOver:
if (mxMouseOverBitmap.is())
return mxMouseOverBitmap;
else if (bMissingDefaultsToNormal)
else
return mxNormalBitmap;
case ButtonDown:
if (mxButtonDownBitmap.is())
return mxButtonDownBitmap;
else if (bMissingDefaultsToNormal)
else
return mxNormalBitmap;
case Disabled:
if (mxDisabledBitmap.is())
return mxDisabledBitmap;
else if (bMissingDefaultsToNormal)
else
return mxNormalBitmap;
case Mask:
......
......@@ -53,10 +53,8 @@ public:
BitmapDescriptor (const ::boost::shared_ptr<BitmapDescriptor>& rpDefault);
enum Mode {Normal, MouseOver, ButtonDown, Disabled, Mask};
css::uno::Reference<css::rendering::XBitmap> GetNormalBitmap (void) const;
css::uno::Reference<css::rendering::XBitmap> GetBitmap (
const Mode eMode,
const bool bMissingDefaultsToNormal = true) const;
css::uno::Reference<css::rendering::XBitmap> GetNormalBitmap() const;
css::uno::Reference<css::rendering::XBitmap> GetBitmap(const Mode eMode) const;
void SetBitmap (
const Mode eMode,
const css::uno::Reference<css::rendering::XBitmap>& rxBitmap);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment