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

[Michael Stahl]

 sw/source/core/crsr/findattr.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 41bfe11ef188cdefa843f5befb8c03eb60603c22
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Mar 2 15:08:46 2015 +0100

    sw: PVS V656 Variables initialized through call to same function
    
    (regression from c2ccd20c0fd92bddfff76447754541705e3eb8f3)
    
    Change-Id: I78ac92869b0e9b56df708aa7d2d35b45bfb5f751
    (cherry picked from commit 7d79ae437e16191a62dbe3ec81f9b82e79daf7ea)
    Reviewed-on: https://gerrit.libreoffice.org/14737
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index a0439d8..7c55fc3 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -65,8 +65,10 @@ bool CmpAttr( const SfxPoolItem& rItem1, const SfxPoolItem& rItem2 )
                                 static_cast<const SvxColorItem&>(rItem2).GetValue() );
     case RES_PAGEDESC:
         bool bNumOffsetEqual = false;
-        ::boost::optional<sal_uInt16> oNumOffset1 = static_cast<const SwFmtPageDesc&>(rItem1).GetNumOffset();
-        ::boost::optional<sal_uInt16> oNumOffset2 = static_cast<const SwFmtPageDesc&>(rItem1).GetNumOffset();
+        ::boost::optional<sal_uInt16> const oNumOffset1 =
+            static_cast<const SwFmtPageDesc&>(rItem1).GetNumOffset();
+        ::boost::optional<sal_uInt16> const oNumOffset2 =
+            static_cast<const SwFmtPageDesc&>(rItem2).GetNumOffset();
         if (!oNumOffset1 && !oNumOffset2)
         {
             bNumOffsetEqual = true;