diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-15 08:48:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-17 08:25:06 +0200 |
| commit | 16690220ed6e68f2e9674a09b5008f38c5e6ed8d (patch) | |
| tree | 2f830b7ac23f136585e7dc4adf5d456f4995cc99 /writerfilter | |
| parent | 86d70dc840b88ed827d6d8febaf512264009951d (diff) | |
loplugin:singlevalfields
tighten up the handling of binary operators
Change-Id: I262ec57bf7142fa094d240738150a94d83fd15ee
Reviewed-on: https://gerrit.libreoffice.org/61777
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/GraphicImport.cxx | 6 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 5 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/PropertyMap.hxx | 1 |
3 files changed, 3 insertions, 9 deletions
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index f2f4761d5cea..1e070a3e2a2c 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -204,7 +204,6 @@ public: drawing::ColorMode eColorMode; GraphicBorderLine aBorders[4]; - sal_Int32 nCurrentBorderLine; bool bIsGraphic; @@ -259,7 +258,6 @@ public: ,nContrast(0) ,nBrightness(0) ,eColorMode( drawing::ColorMode_STANDARD ) - ,nCurrentBorderLine(BORDER_TOP) ,bIsGraphic(false) ,bSizeProtected(false) ,bPositionProtected(false) @@ -490,7 +488,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) //border properties case NS_ooxml::LN_CT_Border_sz: - m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].nLineWidth = nIntValue; + m_pImpl->aBorders[BORDER_TOP].nLineWidth = nIntValue; break; case NS_ooxml::LN_CT_Border_val: //graphic borders don't support different line types @@ -498,7 +496,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) case NS_ooxml::LN_CT_Border_space: break; case NS_ooxml::LN_CT_Border_shadow: - m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].bHasShadow = nIntValue != 0; + m_pImpl->aBorders[BORDER_TOP].bHasShadow = nIntValue != 0; break; case NS_ooxml::LN_CT_Border_frame: break; diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index ada5df34c839..35ae974dd7b8 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -1750,7 +1750,6 @@ ParagraphProperties::ParagraphProperties() , m_hRule( -1 ) , m_xAlign( -1 ) , m_yAlign( -1 ) - , m_bAnchorLock( false ) , m_nDropCapLength( 0 ) { } @@ -1773,8 +1772,7 @@ bool ParagraphProperties::operator==( const ParagraphProperties& rCompare ) m_vSpace == rCompare.m_vSpace && m_hRule == rCompare.m_hRule && m_xAlign == rCompare.m_xAlign && - m_yAlign == rCompare.m_yAlign && - m_bAnchorLock == rCompare.m_bAnchorLock ); + m_yAlign == rCompare.m_yAlign ); } void ParagraphProperties::ResetFrameProperties() @@ -1796,7 +1794,6 @@ void ParagraphProperties::ResetFrameProperties() m_hRule = -1; m_xAlign = -1; m_yAlign = -1; - m_bAnchorLock = false; m_nDropCapLength = 0; } diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx index c587bdad4242..d5d2073ddb26 100644 --- a/writerfilter/source/dmapper/PropertyMap.hxx +++ b/writerfilter/source/dmapper/PropertyMap.hxx @@ -399,7 +399,6 @@ private: sal_Int32 m_hRule; // from ST_HeightRule exact, atLeast, auto sal_Int32 m_xAlign; // from ST_XAlign center, inside, left, outside, right sal_Int32 m_yAlign; // from ST_YAlign bottom, center, inline, inside, outside, top - bool m_bAnchorLock; sal_Int8 m_nDropCapLength; // number of characters OUString m_sParaStyleName; |