sw/inc/authfld.hxx | 6 +++--- sw/inc/shellio.hxx | 4 ++-- sw/inc/splargs.hxx | 26 +++++++++++++------------- sw/inc/unochart.hxx | 6 +++--- sw/source/core/doc/docedt.cxx | 8 ++++---- sw/source/core/fields/authfld.cxx | 4 ++-- sw/source/core/txtnode/txtedt.cxx | 8 ++++---- sw/source/core/unocore/unochart.cxx | 26 +++++++++++++------------- sw/source/filter/basflt/fltini.cxx | 2 +- 9 files changed, 45 insertions(+), 45 deletions(-)
New commits: commit ed41cf71d09878766f7883e64efccc1dbaed13eb Author: Miklos Vajna <vmik...@collabora.com> AuthorDate: Mon Jan 27 09:05:44 2020 +0100 Commit: Miklos Vajna <vmik...@collabora.com> CommitDate: Mon Jan 27 11:09:01 2020 +0100 sw: prefix members of StgReader, SwAuthEntry, ... ... SwChartLockController_Helper and SwInterHyphInfo See tdf#94879 for motivation. Change-Id: I76b5380eefef63c2c02635ac31eca171906125b8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87486 Reviewed-by: Miklos Vajna <vmik...@collabora.com> Tested-by: Jenkins diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx index 356eddd86c39..fdbde3632a19 100644 --- a/sw/inc/authfld.hxx +++ b/sw/inc/authfld.hxx @@ -32,7 +32,7 @@ class SwAuthEntry final : public salhelper::SimpleReferenceObject { friend class SwAuthorityFieldType; - OUString aAuthFields[AUTH_FIELD_END]; + OUString m_aAuthFields[AUTH_FIELD_END]; public: SwAuthEntry() = default; SwAuthEntry( const SwAuthEntry& rCopy ); @@ -181,13 +181,13 @@ public: inline OUString const & SwAuthEntry::GetAuthorField(ToxAuthorityField ePos) const { SAL_WARN_IF(AUTH_FIELD_END <= ePos, "sw", "wrong index"); - return aAuthFields[ePos]; + return m_aAuthFields[ePos]; } inline void SwAuthEntry::SetAuthorField(ToxAuthorityField ePos, const OUString& rField) { SAL_WARN_IF(AUTH_FIELD_END <= ePos, "sw", "wrong index"); if(AUTH_FIELD_END > ePos) - aAuthFields[ePos] = rField; + m_aAuthFields[ePos] = rField; } #endif diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index a959136a5244..ad174afb3d61 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -296,11 +296,11 @@ public: class SW_DLLPUBLIC StgReader : public Reader { - OUString aFltName; + OUString m_aFltName; public: virtual SwReaderType GetReaderType() override; - const OUString& GetFltName() const { return aFltName; } + const OUString& GetFltName() const { return m_aFltName; } virtual void SetFltName( const OUString& r ) override; }; diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx index 122b9c7b09ac..2475470bf056 100644 --- a/sw/inc/splargs.hxx +++ b/sw/inc/splargs.hxx @@ -110,35 +110,35 @@ struct SwSpellArgs : SwArgsBase class SwInterHyphInfo { /// output: hyphenated word - css::uno::Reference<css::linguistic2::XHyphenatedWord> xHyphWord; + css::uno::Reference<css::linguistic2::XHyphenatedWord> m_xHyphWord; /// input: cursor point to locate the frame - const Point aCursorPos; + const Point m_aCursorPos; public: /// input: requested range to hyphenate - sal_Int32 nStart; - sal_Int32 nEnd; + sal_Int32 m_nStart; + sal_Int32 m_nEnd; /// output: found word - sal_Int32 nWordStart; - sal_Int32 nWordLen; + sal_Int32 m_nWordStart; + sal_Int32 m_nWordLen; SwInterHyphInfo( const Point &rCursorPos ) - : aCursorPos(rCursorPos) - , nStart(0) - , nEnd(SAL_MAX_INT32) - , nWordStart(0), nWordLen(0) + : m_aCursorPos(rCursorPos) + , m_nStart(0) + , m_nEnd(SAL_MAX_INT32) + , m_nWordStart(0), m_nWordLen(0) { } const Point *GetCursorPos() const { - return aCursorPos.X() || aCursorPos.Y() ? &aCursorPos : nullptr; + return m_aCursorPos.X() || m_aCursorPos.Y() ? &m_aCursorPos : nullptr; } void SetHyphWord(const css::uno::Reference< css::linguistic2::XHyphenatedWord > &rxHW) { - xHyphWord = rxHW; + m_xHyphWord = rxHW; } const css::uno::Reference< css::linguistic2::XHyphenatedWord >& GetHyphWord() const { - return xHyphWord; + return m_xHyphWord; } }; diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index d7c87a53db88..196e3f32dd3a 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -69,11 +69,11 @@ public: class SwChartLockController_Helper { - SwDoc *pDoc; + SwDoc *m_pDoc; DECL_LINK( DoUnlockAllCharts, Timer *, void ); - Timer aUnlockTimer; // timer to unlock chart controllers - bool bIsLocked; + Timer m_aUnlockTimer; // timer to unlock chart controllers + bool m_bIsLocked; SwChartLockController_Helper( const SwChartLockController_Helper & ) = delete; SwChartLockController_Helper & operator = ( const SwChartLockController_Helper & ) = delete; diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index b7dcdf724677..56d8f0ed01ad 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -750,8 +750,8 @@ SwHyphArgs::SwHyphArgs( const SwPaM *pPam, const Point &rCursorPos, inline void SwHyphArgs::SetRange( const SwNode *pNew ) { - nStart = pStart == pNew ? nPamStart : 0; - nEnd = pEnd == pNew ? nPamStart + nPamLen : SAL_MAX_INT32; + m_nStart = pStart == pNew ? nPamStart : 0; + m_nEnd = pEnd == pNew ? nPamStart + nPamLen : SAL_MAX_INT32; } void SwHyphArgs::SetPam( SwPaM *pPam ) const @@ -761,10 +761,10 @@ void SwHyphArgs::SetPam( SwPaM *pPam ) const else { pPam->GetPoint()->nNode = nNode; - pPam->GetPoint()->nContent.Assign( pNode->GetContentNode(), nWordStart ); + pPam->GetPoint()->nContent.Assign( pNode->GetContentNode(), m_nWordStart ); pPam->GetMark()->nNode = nNode; pPam->GetMark()->nContent.Assign( pNode->GetContentNode(), - nWordStart + nWordLen ); + m_nWordStart + m_nWordLen ); OSL_ENSURE( nNode == pNode->GetIndex(), "SwHyphArgs::SetPam: Pam disaster" ); } diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx index ecb3bc809500..4e85e2243353 100644 --- a/sw/source/core/fields/authfld.cxx +++ b/sw/source/core/fields/authfld.cxx @@ -50,13 +50,13 @@ SwAuthEntry::SwAuthEntry(const SwAuthEntry& rCopy) : SimpleReferenceObject() { for(int i = 0; i < AUTH_FIELD_END; ++i) - aAuthFields[i] = rCopy.aAuthFields[i]; + m_aAuthFields[i] = rCopy.m_aAuthFields[i]; } bool SwAuthEntry::operator==(const SwAuthEntry& rComp) { for(int i = 0; i < AUTH_FIELD_END; ++i) - if(aAuthFields[i] != rComp.aAuthFields[i]) + if(m_aAuthFields[i] != rComp.m_aAuthFields[i]) return false; return true; } diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 5880d2f03396..54af3640e13b 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -1584,8 +1584,8 @@ void SwTextFrame::CollectAutoCmplWrds(SwTextNode & rNode, sal_Int32 nActPos) SwInterHyphInfoTextFrame::SwInterHyphInfoTextFrame( SwTextFrame const& rFrame, SwTextNode const& rNode, SwInterHyphInfo const& rHyphInfo) - : m_nStart(rFrame.MapModelToView(&rNode, rHyphInfo.nStart)) - , m_nEnd(rFrame.MapModelToView(&rNode, rHyphInfo.nEnd)) + : m_nStart(rFrame.MapModelToView(&rNode, rHyphInfo.m_nStart)) + , m_nEnd(rFrame.MapModelToView(&rNode, rHyphInfo.m_nEnd)) , m_nWordStart(0) , m_nWordLen(0) { @@ -1601,8 +1601,8 @@ void SwInterHyphInfoTextFrame::UpdateTextNodeHyphInfo(SwTextFrame const& rFrame, SAL_WARN("sw.core", "UpdateTextNodeHyphInfo: outside of node"); return; } - o_rHyphInfo.nWordStart = wordStart.second; - o_rHyphInfo.nWordLen = wordEnd.second - wordStart.second; + o_rHyphInfo.m_nWordStart = wordStart.second; + o_rHyphInfo.m_nWordLen = wordEnd.second - wordStart.second; o_rHyphInfo.SetHyphWord(m_xHyphWord); } diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index 628322cc3732..4b0cf5738cea 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -81,43 +81,43 @@ void SwChartHelper::DoUpdateAllCharts( SwDoc* pDoc ) } SwChartLockController_Helper::SwChartLockController_Helper( SwDoc *pDocument ) : - pDoc( pDocument ) - , bIsLocked( false ) + m_pDoc( pDocument ) + , m_bIsLocked( false ) { - aUnlockTimer.SetTimeout( 1500 ); - aUnlockTimer.SetInvokeHandler( LINK( this, SwChartLockController_Helper, DoUnlockAllCharts )); - aUnlockTimer.SetDebugName( "sw::SwChartLockController_Helper aUnlockTimer" ); + m_aUnlockTimer.SetTimeout( 1500 ); + m_aUnlockTimer.SetInvokeHandler( LINK( this, SwChartLockController_Helper, DoUnlockAllCharts )); + m_aUnlockTimer.SetDebugName( "sw::SwChartLockController_Helper aUnlockTimer" ); } SwChartLockController_Helper::~SwChartLockController_Helper() COVERITY_NOEXCEPT_FALSE { - if (pDoc) // still connected? + if (m_pDoc) // still connected? Disconnect(); } void SwChartLockController_Helper::StartOrContinueLocking() { - if (!bIsLocked) + if (!m_bIsLocked) LockAllCharts(); - aUnlockTimer.Start(); // start or continue time of locking + m_aUnlockTimer.Start(); // start or continue time of locking } void SwChartLockController_Helper::Disconnect() { - aUnlockTimer.Stop(); + m_aUnlockTimer.Stop(); UnlockAllCharts(); - pDoc = nullptr; + m_pDoc = nullptr; } void SwChartLockController_Helper::LockUnlockAllCharts( bool bLock ) { - if (!pDoc) + if (!m_pDoc) return; uno::Reference< frame::XModel > xRes; SwOLENode *pONd; SwStartNode *pStNd; - SwNodeIndex aIdx( *pDoc->GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 ); + SwNodeIndex aIdx( *m_pDoc->GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 ); while( nullptr != (pStNd = aIdx.GetNode().GetStartNode()) ) { ++aIdx; @@ -140,7 +140,7 @@ void SwChartLockController_Helper::LockUnlockAllCharts( bool bLock ) aIdx.Assign( *pStNd->EndOfSectionNode(), + 1 ); } - bIsLocked = bLock; + m_bIsLocked = bLock; } IMPL_LINK_NOARG( SwChartLockController_Helper, DoUnlockAllCharts, Timer *, void ) diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 50db587e63be..eb89e87ffea1 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -266,7 +266,7 @@ void SwFilterOptions::Notify( const css::uno::Sequence< OUString >& ) {} void StgReader::SetFltName( const OUString& rFltNm ) { if( SwReaderType::Storage & GetReaderType() ) - aFltName = rFltNm; + m_aFltName = rFltNm; } SwRelNumRuleSpaces::SwRelNumRuleSpaces( SwDoc const & rDoc, bool bNDoc ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits