diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-07-02 09:08:15 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-07-02 11:32:47 +0200 |
| commit | 74b33394c45889b640a852ad156e31a5ba60e45b (patch) | |
| tree | b4275fb51b99644ce6666f26ae003a0be51bfcf2 /sw/inc | |
| parent | 9d2979a880f9a596b7ca9f164e948001a51c35f8 (diff) | |
sw: prefix members of SwAccSingleTableSelHander_Impl
Also use the 's_' prefix in sw::ClientIteratorBase, like it's done
almost everywhere else.
Change-Id: Id2c28037eb4f69ce1f27e0365e2b078ffc300935
Reviewed-on: https://gerrit.libreoffice.org/56798
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/calbck.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx index 967e4be6a314..25e815177f0a 100644 --- a/sw/inc/calbck.hxx +++ b/sw/inc/calbck.hxx @@ -285,13 +285,13 @@ namespace sw // is marked down to become the current object in the next step // this is necessary because iteration requires access to members of the current object WriterListener* m_pPosition; - static SW_DLLPUBLIC ClientIteratorBase* our_pClientIters; + static SW_DLLPUBLIC ClientIteratorBase* s_pClientIters; ClientIteratorBase( const SwModify& rModify ) : m_rRoot(rModify) { - MoveTo(our_pClientIters); - our_pClientIters = this; + MoveTo(s_pClientIters); + s_pClientIters = this; m_pCurrent = m_pPosition = m_rRoot.m_pWriterListeners; } WriterListener* GetLeftOfPos() { return m_pPosition->m_pLeft; } @@ -306,9 +306,9 @@ namespace sw } ~ClientIteratorBase() override { - assert(our_pClientIters); - if(our_pClientIters == this) - our_pClientIters = unique() ? nullptr : GetNextInRing(); + assert(s_pClientIters); + if(s_pClientIters == this) + s_pClientIters = unique() ? nullptr : GetNextInRing(); MoveTo(nullptr); } // return "true" if an object was removed from a client chain in iteration |