[Libreoffice-commits] core.git: sw/inc sw/source

[Miklos Vajna]

 sw/inc/unostyle.hxx                 |    2 +-
 sw/source/core/unocore/unostyle.cxx |   22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit a5d273d66d222cdcaf6edb63c82a886e19963357
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Oct 20 16:07:32 2015 +0200

    sw: prefix members of SwXAutoStylesEnumerator
    
    Change-Id: I9302aeb9f6ac6003e546e5a96e595dcad161187b
    Reviewed-on: https://gerrit.libreoffice.org/19490
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index 573b9fab..7b7930c 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -380,7 +380,7 @@ public:
 class SwXAutoStylesEnumerator : public cppu::WeakImplHelper< ::com::sun::star::container::XEnumeration >,
     public SwClient
 {
-    SwAutoStylesEnumImpl *pImpl;
+    SwAutoStylesEnumImpl *m_pImpl;
 public:
     SwXAutoStylesEnumerator( SwDoc* pDoc, IStyleAccess::SwAutoStyleFamily eFam );
     virtual ~SwXAutoStylesEnumerator();
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 4252058..508758b 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -4443,7 +4443,7 @@ SwAutoStylesEnumImpl::SwAutoStylesEnumImpl( SwDoc* pInitDoc, IStyleAccess::SwAut
 }
 
 SwXAutoStylesEnumerator::SwXAutoStylesEnumerator( SwDoc* pDoc, IStyleAccess::SwAutoStyleFamily eFam )
-: pImpl( new SwAutoStylesEnumImpl( pDoc, eFam ) )
+: m_pImpl( new SwAutoStylesEnumImpl( pDoc, eFam ) )
 {
     // Register ourselves as a listener to the document (via the page descriptor)
     pDoc->getIDocumentStylePoolAccess().GetPageDescFromPool(RES_POOLPAGE_STANDARD)->Add(this);
@@ -4451,7 +4451,7 @@ SwXAutoStylesEnumerator::SwXAutoStylesEnumerator( SwDoc* pDoc, IStyleAccess::SwA
 
 SwXAutoStylesEnumerator::~SwXAutoStylesEnumerator()
 {
-    delete pImpl;
+    delete m_pImpl;
 }
 
 void SwXAutoStylesEnumerator::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew)
@@ -4459,30 +4459,30 @@ void SwXAutoStylesEnumerator::Modify( const SfxPoolItem* pOld, const SfxPoolItem
     ClientModify(this, pOld, pNew);
     if(!GetRegisteredIn())
     {
-        delete pImpl;
-        pImpl = 0;
+        delete m_pImpl;
+        m_pImpl = 0;
     }
 }
 
 sal_Bool SwXAutoStylesEnumerator::hasMoreElements(  )
     throw (uno::RuntimeException, std::exception)
 {
-    if( !pImpl )
+    if( !m_pImpl )
         throw uno::RuntimeException();
-    return pImpl->hasMoreElements();
+    return m_pImpl->hasMoreElements();
 }
 
 uno::Any SwXAutoStylesEnumerator::nextElement(  )
     throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
-    if( !pImpl )
+    if( !m_pImpl )
         throw uno::RuntimeException();
     uno::Any aRet;
-    if( pImpl->hasMoreElements() )
+    if( m_pImpl->hasMoreElements() )
     {
-        SfxItemSet_Pointer_t pNextSet = pImpl->nextElement();
-        uno::Reference< style::XAutoStyle > xAutoStyle = new SwXAutoStyle(pImpl->getDoc(),
-                                                        pNextSet, pImpl->getFamily());
+        SfxItemSet_Pointer_t pNextSet = m_pImpl->nextElement();
+        uno::Reference< style::XAutoStyle > xAutoStyle = new SwXAutoStyle(m_pImpl->getDoc(),
+                                                        pNextSet, m_pImpl->getFamily());
         aRet.setValue(&xAutoStyle, cppu::UnoType<style::XAutoStyle>::get());
     }
     return aRet;