[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source

[Caolán McNamara]

 sw/source/core/unocore/swunohelper.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit c9e0d9f57993a07bc4f03d922930cef2be7f9b69
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Apr 29 21:20:43 2015 +0100

    coverity#1296209 Logically dead code (gold)
    
    Change-Id: I68be0901ab0ee37caaa9338b6c499d0086c2c968
    (cherry picked from commit 3a6866c2953c17a55536fa434b9fceda670d0685)
    Reviewed-on: https://gerrit.libreoffice.org/15573
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index 45af6f3..c6f6729 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -282,7 +282,8 @@ bool needToMapFillItemsToSvxBrushItemTypes(const SfxItemSet& rSet,
     // here different FillStyles can be excluded for export; it will depend on the
     // quality these fallbacks can reach. That again is done in getSvxBrushItemFromSourceSet,
     // take a look there how the superset of DrawObject FillStyles is mapped to SvxBrushItem.
-    switch (pXFillStyleItem->GetValue())
+    const drawing::FillStyle eFill = pXFillStyleItem->GetValue();
+    switch (eFill)
     {
         case drawing::FillStyle_NONE:
             return false; // ignoring some extremely limited XFillColorItem eval
@@ -294,13 +295,13 @@ bool needToMapFillItemsToSvxBrushItemTypes(const SfxItemSet& rSet,
             {
                 case MID_BACK_COLOR:
                     // Gradient/Hatch always have emulated color
-                    return (drawing::FillStyle_SOLID != nMID)
+                    return (drawing::FillStyle_SOLID != eFill)
                         || SfxItemState::SET == rSet.GetItemState(XATTR_FILLCOLOR)
                         || SfxItemState::SET == rSet.GetItemState(XATTR_FILLTRANSPARENCE)
                         || SfxItemState::SET == rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE);
                 case MID_BACK_COLOR_R_G_B:
                     // Gradient/Hatch always have emulated color
-                    return (drawing::FillStyle_SOLID != nMID)
+                    return (drawing::FillStyle_SOLID != eFill)
                         || SfxItemState::SET == rSet.GetItemState(XATTR_FILLCOLOR);
                 case MID_BACK_COLOR_TRANSPARENCY:
                     return SfxItemState::SET == rSet.GetItemState(XATTR_FILLTRANSPARENCE)