loplugin:singlevalfields in lotuswordpro

Change-Id: Iac507cb050c93367a8d5dd4cc33106f54c5d462f
Reviewed-on: https://gerrit.libreoffice.org/61816
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

lotuswordpro/inc/xfilter/xfborders.hxx

@@ -116,7 +116,6 @@ private:
     friend class XFBorders;
 
 private:
-    double      m_fOffset;
     XFColor     m_aColor;
     bool    m_bDouble;
     bool    m_bSameWidth;

lotuswordpro/inc/xfilter/xfcellstyle.hxx

@@ -137,7 +137,6 @@ private:
     enumXFAlignType m_eHoriAlign;
     enumXFAlignType m_eVertAlign;
 
-    double      m_fTextIndent;
     XFColor     m_aBackColor;
     std::unique_ptr<XFBGImage> m_xBackImage;
     XFMargins   m_aMargin;
@@ -145,7 +144,6 @@ private:
     rtl::Reference<XFFont> m_pFont;
     XFShadow    m_aShadow;
     std::unique_ptr<XFBorders>  m_pBorders;
-    bool    m_bWrapText;
 };
 
 inline void XFCellStyle::SetAlignType(enumXFAlignType hori, enumXFAlignType vert)

lotuswordpro/inc/xfilter/xfdrawstyle.hxx

@@ -122,7 +122,6 @@ public:
 
 private:
     std::unique_ptr<XFFontWorkStyle> m_pFontWorkStyle;
-    enumXFWrap  m_eWrap;
     XFDrawLineStyle *m_pLineStyle;
     XFDrawAreaStyle *m_pAreaStyle;
     OUString   m_strArrowStart;

lotuswordpro/inc/xfilter/xffont.hxx

@@ -242,18 +242,10 @@ private:
 
     enumXFUnderline m_eUnderline;
     enumXFCrossout  m_eCrossout;
-    enumXFRelief    m_eRelief;
     enumXFTransform m_eTransform;
-    enumXFEmphasize m_eEmphasize;
     bool    m_bWordByWord;
-    bool    m_bEmphasizeTop;
-    bool    m_bOutline;
-    bool    m_bShadow;
-    bool    m_bBlink;
     sal_Int16   m_nPosition;
     sal_Int16   m_nScale;
-    double      m_fCharSpace;
-    sal_Int16   m_nWidthScale;
     XFColor     m_aColor;
     XFColor     m_aBackColor;
     //The flag defines which variable will be functional

lotuswordpro/inc/xfilter/xfnumberstyle.hxx

@@ -100,11 +100,8 @@ private:
 
     enumXFNumberType    m_eType;
     sal_Int32  m_nDecimalDigits;
-    sal_Int32  m_nMinInteger;
-    sal_Int32  m_nMinExponent;
     bool       m_bGroup;
     XFColor    m_aColor;
-    bool       m_bCurrencySymbolPost;
     OUString   m_strCurrencySymbol;
     OUString   m_strPrefix;
     OUString   m_strSuffix;

lotuswordpro/inc/xfilter/xfparastyle.hxx

@@ -221,9 +221,6 @@ public:
 protected:
     OUString   m_strMasterPage;
     enumXFAlignType m_eAlignType;
-    enumXFAlignType m_eLastLineAlign;
-    bool        m_bJustSingleWord;
-    bool        m_bKeepWithNext;
 
     double      m_fTextIndent;
     XFColor     m_aBackColor;
@@ -237,9 +234,6 @@ protected:
     XFDropcap   m_aDropcap;
     XFLineHeight m_aLineHeight;
     XFBreaks    m_aBreaks;
-    sal_Int32   m_nPageNumber;
-    bool    m_bNumberLines;
-    sal_Int32   m_nLineNumberRestart;
 
     sal_uInt32  m_nFlag;
     bool m_bNumberRight;

lotuswordpro/source/filter/xfilter/xfborders.cxx

@@ -61,7 +61,6 @@
 
 XFBorder::XFBorder()
 {
-    m_fOffset = 0;
     m_bDouble = false;
     m_bSameWidth = false;
     m_fWidthInner = 0;
@@ -154,8 +153,6 @@ OUString   XFBorder::ToString()
 
 bool operator==(XFBorder const & b1, XFBorder const & b2)
 {
-    if( b1.m_fOffset != b2.m_fOffset )
-        return false;
     if( b1.m_bDouble != b2.m_bDouble )
         return false;
     if( !b1.m_bDouble )

lotuswordpro/source/filter/xfilter/xfcellstyle.cxx

@@ -65,8 +65,6 @@
 XFCellStyle::XFCellStyle()
     : m_eHoriAlign(enumXFAlignNone)
     , m_eVertAlign(enumXFAlignNone)
-    , m_fTextIndent(0)
-    , m_bWrapText(false)
 {}
 
 XFCellStyle::~XFCellStyle()
@@ -124,8 +122,6 @@ bool    XFCellStyle::Equal(IXFStyle *pStyle)
 
     if( m_strParentStyleName != pOther->m_strParentStyleName )
         return false;
-    if( m_fTextIndent != pOther->m_fTextIndent )
-        return false;
 
     //align:
     if( m_eHoriAlign != pOther->m_eHoriAlign )
@@ -145,10 +141,6 @@ bool    XFCellStyle::Equal(IXFStyle *pStyle)
     if( m_aPadding != pOther->m_aPadding )
         return false;
 
-    //wrap:
-    if( m_bWrapText != pOther->m_bWrapText )
-        return false;
-
     //font:
     if( m_pFont.is() )
     {
@@ -210,11 +202,6 @@ void XFCellStyle::ToXml(IXFStream *pStrm)
     //Paragraph properties:
     pAttrList->Clear();
 
-    //text indent:
-    if( m_fTextIndent>FLOAT_MIN )
-    {
-        pAttrList->AddAttribute("fo:text-indent", OUString::number(m_fTextIndent) + "cm" );
-    }
     //padding:
     m_aPadding.ToXml(pStrm);
     //margin:
@@ -229,10 +216,6 @@ void XFCellStyle::ToXml(IXFStream *pStrm)
     if( m_eVertAlign != enumXFAlignNone )
         pAttrList->AddAttribute( "fo:vertical-align", GetAlignName(m_eVertAlign) );
 
-    //wrap text:
-    if( m_bWrapText )
-        pAttrList->AddAttribute( "fo:wrap-option", "wrap" );
-
     //shadow:
     m_aShadow.ToXml(pStrm);
     //borders:

lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx

@@ -64,8 +64,7 @@
 #include "xffontworkstyle.hxx"
 #include <lwpglobalmgr.hxx>
 XFDrawStyle::XFDrawStyle()
-    : m_eWrap(enumXFWrapNone)
-    , m_pLineStyle(nullptr)
+    : m_pLineStyle(nullptr)
     , m_pAreaStyle(nullptr)
     , m_fArrowStartSize(0.3)
     , m_fArrowEndSize(0.3)
@@ -165,27 +164,8 @@ void    XFDrawStyle::ToXml(IXFStream *pStrm)
 
     pAttrList->Clear();
 
-    if( m_eWrap == enumXFWrapBackground )
-    {
-        pAttrList->AddAttribute( "style:run-through", "background" );
-    }
-    else
-    {
-        pAttrList->AddAttribute( "style:run-through", "foreground" );
-
-        if( m_eWrap == enumXFWrapNone )
-            pAttrList->AddAttribute( "style:wrap", "none" );
-        else if( m_eWrap == enumXFWrapLeft )
-            pAttrList->AddAttribute( "style:wrap", "left" );
-        else if( m_eWrap == enumXFWrapRight )
-            pAttrList->AddAttribute( "style:wrap", "right" );
-        else if( m_eWrap == enumXFWrapParallel )
-            pAttrList->AddAttribute( "style:wrap", "parallel" );
-        else if( m_eWrap == enumXFWrapRunThrough )
-            pAttrList->AddAttribute( "style:wrap", "run-through" );
-        else if( m_eWrap == enumXFWrapBest )
-            pAttrList->AddAttribute( "style:wrap", "dynamic" );
-    }
+    pAttrList->AddAttribute( "style:run-through", "foreground" );
+    pAttrList->AddAttribute( "style:wrap", "none" );
 
     //line style:
     if( m_pLineStyle )

lotuswordpro/source/filter/xfilter/xffont.cxx

@@ -71,18 +71,10 @@ XFFont::XFFont()
     , m_bBoldComplex(false)
     , m_eUnderline(enumXFUnderlineNone)
     , m_eCrossout(enumXFCrossoutNone)
-    , m_eRelief(enumXFReliefNone)
     , m_eTransform(enumXFTransformNone)
-    , m_eEmphasize(enumXFEmphasizeNone)
     , m_bWordByWord(false)
-    , m_bEmphasizeTop(true)
-    , m_bOutline(false)
-    , m_bShadow(false)
-    , m_bBlink(false)
     , m_nPosition(33)
     , m_nScale(58)
-    , m_fCharSpace(0)
-    , m_nWidthScale(100)
     , m_nFlag(0)
     , m_bTransparent(false)
 {
@@ -154,47 +146,15 @@ bool operator==(XFFont const & f1, XFFont const & f2)
             return false;
     }
 
-    if( f1.m_nFlag&XFFONT_FLAG_RELIEF )
-    {
-        if( f1.m_eRelief != f2.m_eRelief )
-            return false;
-    }
-
     if( f1.m_nFlag&XFFONT_FLAG_TRANSFORM )
     {
         if( f1.m_eTransform != f2.m_eTransform )
             return false;
     }
 
-    if( f1.m_nFlag&XFFONT_FLAG_EMPHASIZE )
-    {
-        if( f1.m_eEmphasize != f2.m_eEmphasize )
-            return false;
-        if( f1.m_bEmphasizeTop != f2.m_bEmphasizeTop )
-            return false;
-    }
-
     if( f1.m_bWordByWord != f2.m_bWordByWord )
         return false;
 
-    if( f1.m_nFlag&XFFONT_FLAG_OUTLINE )
-    {
-        if( f1.m_bOutline != f2.m_bOutline )
-            return false;
-    }
-
-    if( f1.m_nFlag&XFFONT_FLAG_SHADOW )
-    {
-        if( f1.m_bShadow != f2.m_bShadow )
-            return false;
-    }
-
-    if( f1.m_nFlag&XFFONT_FLAG_BLINK )
-    {
-        if( f1.m_bBlink != f2.m_bBlink )
-            return false;
-    }
-
     if( f1.m_nFlag&XFFONT_FLAG_POSITION )
     {
         if( f1.m_nPosition != f2.m_nPosition )
@@ -207,18 +167,6 @@ bool operator==(XFFont const & f1, XFFont const & f2)
             return false;
     }
 
-    if( f1.m_nFlag&XFFONT_FLAG_CHARSPACE )
-    {
-        if( f1.m_fCharSpace != f2.m_fCharSpace )
-            return false;
-    }
-
-    if( f1.m_nFlag&XFFONT_FLAG_WIDTHSCALE )
-    {
-        if( f1.m_nWidthScale != f2.m_nWidthScale )
-            return false;
-    }
-
     if( f1.m_nFlag&XFFONT_FLAG_COLOR )
     {
         if( f1.m_aColor != f2.m_aColor )
@@ -331,11 +279,6 @@ void XFFont::ToXml(IXFStream *pStrm)
             pAttrList->AddAttribute("fo:score-spaces", "true" );
     }
 
-    if( (m_nFlag & XFFONT_FLAG_RELIEF) && m_eRelief )
-    {
-        pAttrList->AddAttribute("style:font-relief", GetReliefName(m_eRelief) );
-    }
-
     if( (m_nFlag & XFFONT_FLAG_TRANSFORM) && m_eTransform )
     {
         //enumTransformSmallCap is different:
@@ -345,30 +288,6 @@ void XFFont::ToXml(IXFStream *pStrm)
             pAttrList->AddAttribute("fo:text-transform", GetTransformName(m_eTransform) );
     }
 
-    if( (m_nFlag & XFFONT_FLAG_EMPHASIZE) && m_eEmphasize )
-    {
-        OUString empha = GetEmphasizeName(m_eEmphasize);
-        empha += " ";
-        if( m_bEmphasizeTop )
-            empha += "above";
-        pAttrList->AddAttribute("style:text-emphasize", empha );
-    }
-
-    if( (m_nFlag & XFFONT_FLAG_OUTLINE) && m_bOutline )
-    {
-        pAttrList->AddAttribute("style:text-outline", "true" );
-    }
-
-    if( (m_nFlag & XFFONT_FLAG_SHADOW) && m_bShadow )
-    {
-        pAttrList->AddAttribute("fo:text-shadow", "1pt 1pt" );
-    }
-
-    if( (m_nFlag & XFFONT_FLAG_BLINK) && m_bBlink )
-    {
-        pAttrList->AddAttribute("style:text-blinking", "true" );
-    }
-
     //position & scale:
     if( ((m_nFlag & XFFONT_FLAG_SCALE) && m_nScale>0 ) ||
         ((m_nFlag & XFFONT_FLAG_POSITION) && m_nPosition != 0)
@@ -380,17 +299,6 @@ void XFFont::ToXml(IXFStream *pStrm)
         pAttrList->AddAttribute("style:text-position", tmp );
     }
 
-    //char space:
-    if( (m_nFlag & XFFONT_FLAG_CHARSPACE) && m_fCharSpace != 0 )
-    {
-        pAttrList->AddAttribute("fo:letter-spacing", OUString::number(m_fCharSpace)+"cm" );
-    }
-
-    if( (m_nFlag&XFFONT_FLAG_WIDTHSCALE) && m_nWidthScale != 100 )
-    {
-        pAttrList->AddAttribute("style:text-scale", OUString::number(m_nWidthScale)+"%" );
-    }
-
     //Color:
     if( m_nFlag & XFFONT_FLAG_COLOR )
     {

lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx

@@ -62,11 +62,8 @@
 XFNumberStyle::XFNumberStyle()
     : m_eType(enumXFNumberNumber)
     , m_nDecimalDigits(0)
-    , m_nMinInteger(1)
-    , m_nMinExponent(2)
     , m_bGroup(false)
     , m_aColor(0,0,0)
-    , m_bCurrencySymbolPost(false)
     , m_bRedIfNegative(false)
     , m_aNegativeColor(255,0,0)
 {}
@@ -88,8 +85,6 @@ bool XFNumberStyle::Equal(IXFStyle *pStyle)
         return false;
     if( m_nDecimalDigits != pOther->m_nDecimalDigits )
         return false;
-    if( m_nMinInteger != pOther->m_nMinInteger )
-        return false;
     if( m_bRedIfNegative != pOther->m_bRedIfNegative )
         return false;
     if( m_bGroup != pOther->m_bGroup )
@@ -101,10 +96,6 @@ bool XFNumberStyle::Equal(IXFStyle *pStyle)
     if( m_strSuffix != pOther->m_strSuffix )
         return false;
 
-    //When category of number format is scientific, the number can not be displayed normally in table.
-    if ( m_nMinExponent != pOther->m_nMinExponent )
-        return false;
-
     if( m_bRedIfNegative )
     {
         if( m_aNegativeColor != pOther->m_aNegativeColor )
@@ -117,8 +108,6 @@ bool XFNumberStyle::Equal(IXFStyle *pStyle)
 
     if( m_eType == enuMXFNumberCurrency )
     {
-        if( m_bCurrencySymbolPost != pOther->m_bCurrencySymbolPost )
-            return false;
         if( m_strCurrencySymbol != pOther->m_strCurrencySymbol )
             return false;
     }
@@ -288,7 +277,7 @@ void XFNumberStyle::ToXml_Content(IXFStream *pStrm, bool nagetive)
         }
     }
 
-    if( m_eType == enuMXFNumberCurrency && !m_bCurrencySymbolPost )
+    if( m_eType == enuMXFNumberCurrency )
     {
         if( !m_strCurrencySymbol.isEmpty() )
         {
@@ -303,8 +292,8 @@ void XFNumberStyle::ToXml_Content(IXFStream *pStrm, bool nagetive)
     {
         pAttrList->Clear();
         pAttrList->AddAttribute("number:decimal-places", OUString::number(m_nDecimalDigits));
-        pAttrList->AddAttribute("number:min-integer-digits", OUString::number(m_nMinInteger));
-        pAttrList->AddAttribute("number:min-exponent-digits", OUString::number(m_nMinExponent));
+        pAttrList->AddAttribute("number:min-integer-digits", OUString::number(1));
+        pAttrList->AddAttribute("number:min-exponent-digits", OUString::number(2));
         pStrm->StartElement( "number:scientific-number" );
         pStrm->EndElement( "number:scientific-number" );
     }
@@ -312,7 +301,7 @@ void XFNumberStyle::ToXml_Content(IXFStream *pStrm, bool nagetive)
     {
         pAttrList->Clear();
         pAttrList->AddAttribute("number:decimal-places", OUString::number(m_nDecimalDigits));
-        pAttrList->AddAttribute("number:min-integer-digits", OUString::number(m_nMinInteger));
+        pAttrList->AddAttribute("number:min-integer-digits", OUString::number(1));
 
         if( m_bGroup )
             pAttrList->AddAttribute("number:grouping","true");
@@ -323,16 +312,6 @@ void XFNumberStyle::ToXml_Content(IXFStream *pStrm, bool nagetive)
         pStrm->EndElement( "number:number" );
     }
 
-    if( m_eType == enuMXFNumberCurrency && m_bCurrencySymbolPost )
-    {
-        if( !m_strCurrencySymbol.isEmpty() )
-        {
-            pStrm->StartElement( "number:currency-symbol" );
-            pStrm->Characters(m_strCurrencySymbol);
-            pStrm->EndElement( "number:currency-symbol" );
-        }
-    }
-
     if( !nagetive )
     {
         if( !m_strSuffix.isEmpty() )

lotuswordpro/source/filter/xfilter/xfparastyle.cxx

@@ -67,13 +67,7 @@
 
 XFParaStyle::XFParaStyle()
     : m_eAlignType(enumXFAlignNone)
-    , m_eLastLineAlign(enumXFAlignNone)
-    , m_bJustSingleWord(false)
-    , m_bKeepWithNext(false)
     , m_fTextIndent(0)
-    , m_nPageNumber(0)
-    , m_bNumberLines(true)
-    , m_nLineNumberRestart(0)
     , m_nFlag(0)
     , m_bNumberRight(false)
 {
@@ -83,9 +77,6 @@ XFParaStyle::XFParaStyle()
 XFParaStyle::XFParaStyle(const XFParaStyle& other)
     : XFStyle(other)
     , m_eAlignType(other.m_eAlignType)
-    , m_eLastLineAlign(other.m_eLastLineAlign)
-    , m_bJustSingleWord(other.m_bJustSingleWord)
-    , m_bKeepWithNext(other.m_bKeepWithNext)
     , m_fTextIndent(other.m_fTextIndent)
     , m_aBackColor(other.m_aBackColor)
     , m_aMargin(other.m_aMargin)
@@ -95,9 +86,6 @@ XFParaStyle::XFParaStyle(const XFParaStyle& other)
     , m_aDropcap(other.m_aDropcap)
     , m_aLineHeight(other.m_aLineHeight)
     , m_aBreaks(other.m_aBreaks)
-    , m_nPageNumber(other.m_nPageNumber)
-    , m_bNumberLines(other.m_bNumberLines)
-    , m_nLineNumberRestart(other.m_nLineNumberRestart)
     , m_nFlag(other.m_nFlag)
     , m_bNumberRight(other.m_bNumberRight)
 {
@@ -134,12 +122,7 @@ XFParaStyle& XFParaStyle::operator=(const XFParaStyle& other)
         m_strParentStyleName = other.m_strParentStyleName;
         m_nFlag = other.m_nFlag;
         m_eAlignType = other.m_eAlignType;
-        m_eLastLineAlign = other.m_eLastLineAlign;
-        m_bJustSingleWord = other.m_bJustSingleWord;
-        m_bKeepWithNext = other.m_bKeepWithNext;
         m_fTextIndent = other.m_fTextIndent;
-        m_bNumberLines = other.m_bNumberLines;
-        m_nLineNumberRestart = other.m_nLineNumberRestart;
         m_bNumberRight = other.m_bNumberRight;
 
         m_pFont = other.m_pFont;
@@ -301,21 +284,9 @@ bool    XFParaStyle::Equal(IXFStyle *pStyle)
         return false;
     if( m_fTextIndent != pOther->m_fTextIndent )
         return false;
-    if( m_bJustSingleWord != pOther->m_bJustSingleWord )
-        return false;
-    if( m_bKeepWithNext != pOther->m_bKeepWithNext )
-        return false;
-    //line number:
-    if( m_bNumberLines != pOther->m_bNumberLines )
-        return false;
-    if( m_nLineNumberRestart != pOther->m_nLineNumberRestart )
-        return false;
     //align:
     if( m_eAlignType != pOther->m_eAlignType )
         return false;
-    //last line align:
-    if( m_eLastLineAlign != pOther->m_eLastLineAlign )
-        return false;
 
     //shadow:
     if( m_aShadow != pOther->m_aShadow )
@@ -336,8 +307,6 @@ bool    XFParaStyle::Equal(IXFStyle *pStyle)
     //breaks:
     if( m_aBreaks != pOther->m_aBreaks )
         return false;
-    if( m_nPageNumber != pOther->m_nPageNumber )
-        return false;
     if( m_aTabs != pOther->m_aTabs )
         return false;
 
@@ -414,25 +383,9 @@ void    XFParaStyle::ToXml(IXFStream *pStrm)
     {
         pAttrList->AddAttribute("fo:text-align", GetAlignName(m_eAlignType) );
     }
-    //last line align:
-    if( m_eLastLineAlign != enumXFAlignNone )
-    {
-        pAttrList->AddAttribute("fo:fo:text-align-last", GetAlignName(m_eLastLineAlign) );
-        if( m_bJustSingleWord )
-            pAttrList->AddAttribute("style:justify-single-word", "true" );
-    }
     //line number:
-    if( m_bNumberLines )
-    {
-        pAttrList->AddAttribute( "text:number-lines", "true" );
-        pAttrList->AddAttribute( "text:line-number", OUString::number(m_nLineNumberRestart) );
-    }
-    else
-    {
-        pAttrList->AddAttribute( "text:number-lines", "false" );
-        assert(m_nLineNumberRestart>0);
-        pAttrList->AddAttribute( "text:line-number", "0" );
-    }
+    pAttrList->AddAttribute( "text:number-lines", "true" );
+    pAttrList->AddAttribute( "text:line-number", OUString::number(0) );
 
     //shadow:
     m_aShadow.ToXml(pStrm);
@@ -451,15 +404,9 @@ void    XFParaStyle::ToXml(IXFStream *pStrm)
     if( m_pFont.is() )
         m_pFont->ToXml(pStrm);
 
-    //page number:
-    if( m_nPageNumber )
-        pAttrList->AddAttribute("fo:page-number", OUString::number(m_nPageNumber) );
     //page breaks:
     m_aBreaks.ToXml(pStrm);
 
-    if( m_bKeepWithNext )
-        pAttrList->AddAttribute("fo:fo:keep-with-next", "true" );
-
     pStrm->StartElement("style:properties");
 
     //dropcap: