commit db12f068f849dc0e03d43ee6688ba342e985fa04
author Noel Grandin <noel@peralex.com> Thu Jun 23 14:45:22 2016 +0200
committer Noel Grandin <noelgrandin@gmail.com> Fri Jun 24 06:44:48 2016 +0000
tree 3a6ac684c7227c65ddc912ef80dd4ca509a92cbe
parent f02c1ca61c936ad555c33c16ccccadf0ce9674c2

loplugin:singlevalfields in editeng

Change-Id: I99c7ab28be7853535674cd7fab975da4252441f1
Reviewed-on: https://gerrit.libreoffice.org/26600
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

editeng/source/editeng/eertfpar.cxx

diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index 3f81d4d..136b903 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -57,11 +57,9 @@ EditRTFParser::EditRTFParser(
    aRTFMapMode(MAP_TWIP)
{
    aCurSel         = aSel;
    eDestCharSet    = RTL_TEXTENCODING_DONTKNOW;
    nDefFont        = 0;
    nDefTab         = 0;
    nLastAction     = 0;
    nDefFontHeight  = 0;

    SetInsPos(EditPosition(mpEditEngine, &aCurSel));

editeng/source/editeng/eertfpar.hxx

diff --git a/editeng/source/editeng/eertfpar.hxx b/editeng/source/editeng/eertfpar.hxx
index 5416dd1..d58ccb6 100644
--- a/editeng/source/editeng/eertfpar.hxx
+++ b/editeng/source/editeng/eertfpar.hxx
@@ -34,13 +34,11 @@ class EditRTFParser : public SvxRTFParser
private:
    EditSelection       aCurSel;
    EditEngine*         mpEditEngine;
    rtl_TextEncoding    eDestCharSet;
    MapMode             aRTFMapMode;
    MapMode             aEditMapMode;

    sal_uInt16              nDefFont;
    sal_uInt16              nDefTab;
    sal_uInt16              nDefFontHeight;
    sal_uInt8               nLastAction;

protected:

editeng/source/rtf/svxrtf.cxx

diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index c67fc84..a053a7e 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -1345,7 +1345,6 @@ RTFPlainAttrMapIds::RTFPlainAttrMapIds( const SfxItemPool& rPool )
    nCTLWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_WEIGHT, false );
    nEmphasis = rPool.GetTrueWhich( SID_ATTR_CHAR_EMPHASISMARK, false );
    nTwoLines = rPool.GetTrueWhich( SID_ATTR_CHAR_TWO_LINES, false );
    nRuby = 0; //rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_RUBY, sal_False );
    nCharScaleX = rPool.GetTrueWhich( SID_ATTR_CHAR_SCALEWIDTH, false );
    nHorzVert = rPool.GetTrueWhich( SID_ATTR_CHAR_ROTATED, false );
    nRelief = rPool.GetTrueWhich( SID_ATTR_CHAR_RELIEF, false );

include/editeng/numitem.hxx

diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 775e8f1..2d67dd1 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -317,7 +317,6 @@ class SvxNodeNum
    sal_uInt16 nLevelVal[ SVX_MAX_NUM ];    // Numbers of all levels
    sal_uInt16 nSetValue;                   // predetermined number
    sal_uInt8  nMyLevel;                     // Current Level
    bool       bStartNum;                     // Restart numbering

public:
    explicit inline SvxNodeNum( sal_uInt16 nSetVal = USHRT_MAX );
@@ -331,7 +330,7 @@ public:
};

SvxNodeNum::SvxNodeNum( sal_uInt16 nSetVal )
    : nSetValue( nSetVal ), nMyLevel( 0 ), bStartNum( false )
    : nSetValue( nSetVal ), nMyLevel( 0 )
{
    memset( nLevelVal, 0, sizeof( nLevelVal ) );
}
@@ -342,7 +341,6 @@ inline SvxNodeNum& SvxNodeNum::operator=( const SvxNodeNum& rCpy )
    {
        nSetValue = rCpy.nSetValue;
        nMyLevel = rCpy.nMyLevel;
        bStartNum = rCpy.bStartNum;

        memcpy( nLevelVal, rCpy.nLevelVal, sizeof( nLevelVal ) );
    }

include/editeng/svxrtf.hxx

diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 66c3c54..45dd362 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -148,7 +148,6 @@ struct RTFPlainAttrMapIds
            nTwoLines,
            nCharScaleX,
            nHorzVert,
            nRuby,
            nRelief,
            nHidden
            ;