sw/source/core/docnode/ndtbl.cxx | 24 ++++++++++++++----------
sw/source/core/docnode/ndtbl1.cxx | 26 ++++++++++++++------------
sw/source/core/docnode/swthreadmanager.cxx | 6 +++---
sw/source/core/docnode/threadmanager.cxx | 6 +++---
sw/source/core/docnode/threadmanager.hxx | 2 +-
sw/source/core/inc/swthreadmanager.hxx | 2 +-
6 files changed, 36 insertions(+), 30 deletions(-)
New commits:
commit 284dbd865d1788ba8f31e736555dd9e9af8ffa7c
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Aug 31 09:08:37 2020 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Aug 31 09:55:30 2020 +0200
sw: prefix members of SplitTable_Para, SwTableFormatCmp, SwThreadManager ...
... and ThreadManager
See tdf#94879 for motivation.
Change-Id: Idfdba9e9d38310d2e38c6c72e5ecc0738a6b38fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101690
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index c0496469e95d..7ab1c5de313d 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -3273,27 +3273,31 @@ namespace {
class SplitTable_Para
{
- std::map<SwFrameFormat const *, SwFrameFormat*> aSrcDestMap;
- SwTableNode* pNewTableNd;
- SwTable& rOldTable;
+ std::map<SwFrameFormat const*, SwFrameFormat*> m_aSrcDestMap;
+ SwTableNode* m_pNewTableNode;
+ SwTable& m_rOldTable;
public:
- SplitTable_Para( SwTableNode* pNew, SwTable& rOld )
- : aSrcDestMap(), pNewTableNd( pNew ), rOldTable( rOld )
+ SplitTable_Para(SwTableNode* pNew, SwTable& rOld)
+ : m_aSrcDestMap()
+ , m_pNewTableNode(pNew)
+ , m_rOldTable(rOld)
{}
SwFrameFormat* GetDestFormat( SwFrameFormat* pSrcFormat ) const
{
- auto it = aSrcDestMap.find( pSrcFormat );
- return it == aSrcDestMap.end() ? nullptr : it->second;
+ auto it = m_aSrcDestMap.find(pSrcFormat);
+ return it == m_aSrcDestMap.end() ? nullptr : it->second;
}
void InsertSrcDest( SwFrameFormat const * pSrcFormat, SwFrameFormat*
pDestFormat )
- { aSrcDestMap[ pSrcFormat ] = pDestFormat; }
+ {
+ m_aSrcDestMap[pSrcFormat] = pDestFormat;
+ }
void ChgBox( SwTableBox* pBox )
{
- rOldTable.GetTabSortBoxes().erase( pBox );
- pNewTableNd->GetTable().GetTabSortBoxes().insert( pBox );
+ m_rOldTable.GetTabSortBoxes().erase(pBox);
+ m_pNewTableNode->GetTable().GetTabSortBoxes().insert(pBox);
}
};
diff --git a/sw/source/core/docnode/ndtbl1.cxx
b/sw/source/core/docnode/ndtbl1.cxx
index c9c4cd96b9c2..faeaeafac5ba 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -74,26 +74,28 @@ public:
SwFrameFormat const* pOld, sal_Int16
nType);
private:
- SwFrameFormat *pOld, *pNew;
- sal_Int16 nType;
+ SwFrameFormat *m_pOld, *m_pNew;
+ sal_Int16 m_nType;
};
}
-SwTableFormatCmp::SwTableFormatCmp( SwFrameFormat *pO, SwFrameFormat *pN,
sal_Int16 nT )
- : pOld ( pO ), pNew ( pN ), nType( nT )
+SwTableFormatCmp::SwTableFormatCmp(SwFrameFormat* pO, SwFrameFormat* pN,
sal_Int16 nT)
+ : m_pOld(pO)
+ , m_pNew(pN)
+ , m_nType(nT)
{
- if (pOld)
- pOld->Add(this);
+ if (m_pOld)
+ m_pOld->Add(this);
}
SwTableFormatCmp::~SwTableFormatCmp()
{
- if (pOld)
+ if (m_pOld)
{
- pOld->Remove(this);
- if (!pOld->HasWriterListeners())
- delete pOld;
+ m_pOld->Remove(this);
+ if (!m_pOld->HasWriterListeners())
+ delete m_pOld;
}
}
@@ -103,8 +105,8 @@ SwFrameFormat*
SwTableFormatCmp::FindNewFormat(std::vector<std::unique_ptr<SwTab
{
for (const auto& pCmp : rArr)
{
- if ( pCmp->pOld == pOld && pCmp->nType == nType )
- return pCmp->pNew;
+ if (pCmp->m_pOld == pOld && pCmp->m_nType == nType)
+ return pCmp->m_pNew;
}
return nullptr;
}
diff --git a/sw/source/core/docnode/swthreadmanager.cxx
b/sw/source/core/docnode/swthreadmanager.cxx
index 4b646e8b22df..0409e5a96200 100644
--- a/sw/source/core/docnode/swthreadmanager.cxx
+++ b/sw/source/core/docnode/swthreadmanager.cxx
@@ -26,13 +26,13 @@
#i73788#
*/
-bool SwThreadManager::mbThreadManagerInstantiated = false;
+bool SwThreadManager::sbThreadManagerInstantiated = false;
SwThreadManager::SwThreadManager()
: mpThreadManagerImpl( new ThreadManager(
SwThreadJoiner::GetThreadJoiner() ) )
{
mpThreadManagerImpl->Init();
- mbThreadManagerInstantiated = true;
+ sbThreadManagerInstantiated = true;
}
SwThreadManager::~SwThreadManager()
@@ -52,7 +52,7 @@ SwThreadManager& SwThreadManager::GetThreadManager()
bool SwThreadManager::ExistsThreadManager()
{
- return mbThreadManagerInstantiated;
+ return sbThreadManagerInstantiated;
}
oslInterlockedCount SwThreadManager::AddThread( const rtl::Reference<
ObservableThread >& rThread )
diff --git a/sw/source/core/docnode/threadmanager.cxx
b/sw/source/core/docnode/threadmanager.cxx
index 4834b25bfa17..186b5a91b743 100644
--- a/sw/source/core/docnode/threadmanager.cxx
+++ b/sw/source/core/docnode/threadmanager.cxx
@@ -33,7 +33,7 @@ using namespace ::com::sun::star;
#i73788#
*/
-const std::deque< ThreadManager::tThreadData >::size_type
ThreadManager::mnStartedSize = 10;
+const std::deque< ThreadManager::tThreadData >::size_type
ThreadManager::snStartedSize = 10;
ThreadManager::ThreadManager( uno::Reference< util::XJobManager > const &
rThreadJoiner )
: maMutex(),
@@ -92,7 +92,7 @@ oslInterlockedCount ThreadManager::AddThread(
}
// add thread to manager
- if ( maStartedThreads.size() < mnStartedSize &&
+ if ( maStartedThreads.size() < snStartedSize &&
!StartingOfThreadsSuspended() )
{
// Try to start thread
@@ -233,7 +233,7 @@ void ThreadManager::ResumeStartingOfThreads()
mbStartingOfThreadsSuspended = false;
- while ( maStartedThreads.size() < mnStartedSize &&
+ while ( maStartedThreads.size() < snStartedSize &&
!maWaitingForStartThreads.empty() )
{
if ( !StartWaitingThread() )
diff --git a/sw/source/core/docnode/threadmanager.hxx
b/sw/source/core/docnode/threadmanager.hxx
index cdadd4261c7b..87a3d8b0b93d 100644
--- a/sw/source/core/docnode/threadmanager.hxx
+++ b/sw/source/core/docnode/threadmanager.hxx
@@ -109,7 +109,7 @@ class ThreadManager final
private:
- static const std::deque< tThreadData >::size_type mnStartedSize;
+ static const std::deque< tThreadData >::size_type snStartedSize;
osl::Mutex maMutex;
diff --git a/sw/source/core/inc/swthreadmanager.hxx
b/sw/source/core/inc/swthreadmanager.hxx
index 28952683a8b6..6c478aec859e 100644
--- a/sw/source/core/inc/swthreadmanager.hxx
+++ b/sw/source/core/inc/swthreadmanager.hxx
@@ -68,7 +68,7 @@ class SwThreadManager
SwThreadManager(SwThreadManager const&) = delete;
SwThreadManager& operator=(SwThreadManager const&) = delete;
- static bool mbThreadManagerInstantiated;
+ static bool sbThreadManagerInstantiated;
std::unique_ptr<ThreadManager> mpThreadManagerImpl;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
