[Libreoffice-commits] core.git: extensions/source sc/source

[Julien Nabet]

 extensions/source/propctrlr/propertyhandler.cxx |    2 -
 sc/source/filter/xml/xmlstyli.cxx               |   42 ++++++++++++------------
 2 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit 3bd165efe6f3765d741bc8b7ef350fdea08317f4
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Jan 24 09:38:05 2015 +0100

    cppcheck: fix redundantPointerOp reports
    
    Change-Id: Ida4bf3bf03d49856eb16329c4f88b9507f330c6f
    Reviewed-on: https://gerrit.libreoffice.org/14150
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx
index 5c0927f..701752a 100644
--- a/extensions/source/propctrlr/propertyhandler.cxx
+++ b/extensions/source/propctrlr/propertyhandler.cxx
@@ -270,7 +270,7 @@ namespace pcr
             FindPropertyByHandle( _nPropId )
         );
         if ( pFound != m_aSupportedProperties.end() )
-            return &(*pFound);
+            return pFound;
         return NULL;
     }
 
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index 89087e0..1181628 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -113,27 +113,27 @@ void ScXMLCellImportPropertyMapper::finished(::std::vector< XMLPropertyState >&
             sal_Int16 nContextID = getPropertySetMapper()->GetEntryContextId(property->mnIndex);
             switch (nContextID)
             {
-                case CTF_SC_ALLPADDING                  : pAllPaddingProperty = &*property; break;
-                case CTF_SC_LEFTPADDING                 : pPadding[XML_LINE_LEFT] = &*property; break;
-                case CTF_SC_RIGHTPADDING                : pPadding[XML_LINE_RIGHT] = &*property; break;
-                case CTF_SC_TOPPADDING                  : pPadding[XML_LINE_TOP] = &*property; break;
-                case CTF_SC_BOTTOMPADDING               : pPadding[XML_LINE_BOTTOM] = &*property; break;
-                case CTF_SC_ALLBORDER                   : pAllBorderProperty = &*property; break;
-                case CTF_SC_LEFTBORDER                  : pBorders[XML_LINE_LEFT] = &*property; break;
-                case CTF_SC_RIGHTBORDER                 : pBorders[XML_LINE_RIGHT] = &*property; break;
-                case CTF_SC_TOPBORDER                   : pBorders[XML_LINE_TOP] = &*property; break;
-                case CTF_SC_BOTTOMBORDER                : pBorders[XML_LINE_BOTTOM] = &*property; break;
-                case CTF_SC_ALLBORDERWIDTH              : pAllBorderWidthProperty = &*property; break;
-                case CTF_SC_LEFTBORDERWIDTH             : pBorderWidths[XML_LINE_LEFT] = &*property; break;
-                case CTF_SC_RIGHTBORDERWIDTH            : pBorderWidths[XML_LINE_RIGHT] = &*property; break;
-                case CTF_SC_TOPBORDERWIDTH              : pBorderWidths[XML_LINE_TOP] = &*property; break;
-                case CTF_SC_BOTTOMBORDERWIDTH           : pBorderWidths[XML_LINE_BOTTOM] = &*property; break;
-                case CTF_SC_DIAGONALTLBR                : pDiagBorders[XML_LINE_TLBR] = &*property; break;
-                case CTF_SC_DIAGONALBLTR                : pDiagBorders[XML_LINE_BLTR] = &*property; break;
-                case CTF_SC_DIAGONALTLBRWIDTH           : pOldDiagBorderWidths[XML_LINE_TLBR] = &*property; break;
-                case CTF_SC_DIAGONALTLBRWIDTHS          : pDiagBorderWidths[XML_LINE_TLBR] = &*property; break;
-                case CTF_SC_DIAGONALBLTRWIDTH           : pOldDiagBorderWidths[XML_LINE_BLTR] = &*property; break;
-                case CTF_SC_DIAGONALBLTRWIDTHS          : pDiagBorderWidths[XML_LINE_BLTR] = &*property; break;
+                case CTF_SC_ALLPADDING                  : pAllPaddingProperty = property; break;
+                case CTF_SC_LEFTPADDING                 : pPadding[XML_LINE_LEFT] = property; break;
+                case CTF_SC_RIGHTPADDING                : pPadding[XML_LINE_RIGHT] = property; break;
+                case CTF_SC_TOPPADDING                  : pPadding[XML_LINE_TOP] = property; break;
+                case CTF_SC_BOTTOMPADDING               : pPadding[XML_LINE_BOTTOM] = property; break;
+                case CTF_SC_ALLBORDER                   : pAllBorderProperty = property; break;
+                case CTF_SC_LEFTBORDER                  : pBorders[XML_LINE_LEFT] = property; break;
+                case CTF_SC_RIGHTBORDER                 : pBorders[XML_LINE_RIGHT] = property; break;
+                case CTF_SC_TOPBORDER                   : pBorders[XML_LINE_TOP] = property; break;
+                case CTF_SC_BOTTOMBORDER                : pBorders[XML_LINE_BOTTOM] = property; break;
+                case CTF_SC_ALLBORDERWIDTH              : pAllBorderWidthProperty = property; break;
+                case CTF_SC_LEFTBORDERWIDTH             : pBorderWidths[XML_LINE_LEFT] = property; break;
+                case CTF_SC_RIGHTBORDERWIDTH            : pBorderWidths[XML_LINE_RIGHT] = property; break;
+                case CTF_SC_TOPBORDERWIDTH              : pBorderWidths[XML_LINE_TOP] = property; break;
+                case CTF_SC_BOTTOMBORDERWIDTH           : pBorderWidths[XML_LINE_BOTTOM] = property; break;
+                case CTF_SC_DIAGONALTLBR                : pDiagBorders[XML_LINE_TLBR] = property; break;
+                case CTF_SC_DIAGONALBLTR                : pDiagBorders[XML_LINE_BLTR] = property; break;
+                case CTF_SC_DIAGONALTLBRWIDTH           : pOldDiagBorderWidths[XML_LINE_TLBR] = property; break;
+                case CTF_SC_DIAGONALTLBRWIDTHS          : pDiagBorderWidths[XML_LINE_TLBR] = property; break;
+                case CTF_SC_DIAGONALBLTRWIDTH           : pOldDiagBorderWidths[XML_LINE_BLTR] = property; break;
+                case CTF_SC_DIAGONALBLTRWIDTHS          : pDiagBorderWidths[XML_LINE_BLTR] = property; break;
             }
         }
     }