diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-03 14:08:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-04 07:17:23 +0100 |
| commit | 21e0d8162a0e683558c4d042ce688fc9a6833809 (patch) | |
| tree | 8c93a0158d7669b1e92a43c65b6b4a7a7eeca685 /sw | |
| parent | 5de151f0fd7b590ae13560086b46ea84e4d9cf9c (diff) | |
loplugin:unusedfields
fix the ReturnStmt check
Change-Id: I95076076bd1313d23798c4615ea12910c86ed9a8
Reviewed-on: https://gerrit.libreoffice.org/47309
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/hints.hxx | 6 | ||||
| -rw-r--r-- | sw/source/core/attr/hints.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/text/txtfrm.cxx | 20 | ||||
| -rw-r--r-- | sw/source/core/unocore/unostyle.cxx | 2 |
4 files changed, 2 insertions, 28 deletions
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx index 06904cbd311f..1c35871b611d 100644 --- a/sw/inc/hints.hxx +++ b/sw/inc/hints.hxx @@ -102,7 +102,6 @@ private: sal_Int32 m_nStart; sal_Int32 m_nEnd; sal_uInt16 m_nWhichAttr; - std::vector<sal_uInt16> m_aWhichFormatAttr; // attributes changed inside RES_TXTATR_AUTOFMT public: SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, sal_uInt16 nW ); @@ -121,11 +120,6 @@ public: { return m_nWhichAttr; } - - const std::vector<sal_uInt16>& getFormatAttr() const - { - return m_aWhichFormatAttr; - } }; /** SwRefMarkFieldUpdate is sent when the referencemarks should be updated. diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx index 4fa04d0c62d7..7a9af119c0e6 100644 --- a/sw/source/core/attr/hints.cxx +++ b/sw/source/core/attr/hints.cxx @@ -45,7 +45,7 @@ SwDelText::SwDelText( sal_Int32 nS, sal_Int32 nL ) } SwUpdateAttr::SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, sal_uInt16 nW ) - : SwMsgPoolItem( RES_UPDATE_ATTR ), m_nStart( nS ), m_nEnd( nE ), m_nWhichAttr( nW ), m_aWhichFormatAttr() + : SwMsgPoolItem( RES_UPDATE_ATTR ), m_nStart( nS ), m_nEnd( nE ), m_nWhichAttr( nW ) { } diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index 65dbf5193ce5..87b6d3721274 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -926,16 +926,6 @@ static bool isA11yRelevantAttribute(sal_uInt16 nWhich) return nWhich != RES_CHRATR_RSID; } -static bool hasA11yRelevantAttribute( const std::vector<sal_uInt16>& nWhich ) -{ - for( std::vector<sal_uInt16>::const_iterator nItr = nWhich.begin(); - nItr < nWhich.end(); ++nItr ) - if ( isA11yRelevantAttribute( *nItr ) ) - return true; - - return false; -} - void SwTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) { const sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; @@ -1056,16 +1046,6 @@ void SwTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) lcl_SetScriptInval( *this, nPos ); } } - - if( isA11yRelevantAttribute( static_cast<const SwUpdateAttr*>(pNew)->getWhichAttr() ) && - hasA11yRelevantAttribute( static_cast<const SwUpdateAttr*>(pNew)->getFormatAttr() ) ) - { - SwViewShell* pViewSh = getRootFrame() ? getRootFrame()->GetCurrShell() : nullptr; - if ( pViewSh ) - { - pViewSh->InvalidateAccessibleParaAttrs( *this ); - } - } } break; case RES_OBJECTDYING: diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index cb9b4c1d58ae..9365b12a26ef 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -2204,7 +2204,7 @@ template<> uno::Any SwXStyle::GetStyleProperty<FN_UNO_DISPLAY_NAME>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, SwStyleBase_Impl& rBase) { PrepareStyleBase(rBase); - return uno::makeAny(rBase.getNewBase()->GetDisplayName()); + return uno::makeAny(rBase.getNewBase()->GetName()); } template<> uno::Any SwXStyle::GetStyleProperty<FN_UNO_PARA_STYLE_CONDITIONS>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, SwStyleBase_Impl& rBase) |