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

Miklos Vajna vmiklos at collabora.co.uk
Mon Jul 31 07:49:47 UTC 2017


 sw/source/core/access/accnotextframe.cxx |   14 +++++++-------
 sw/source/core/access/accnotextframe.hxx |    4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 436deb540d0109b5db07186de69744abff77a7c0
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Jul 31 08:21:19 2017 +0200

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

diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index c4e761e20c67..07cb5578e745 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -60,7 +60,7 @@ SwAccessibleNoTextFrame::SwAccessibleNoTextFrame(
         sal_Int16 nInitRole,
         const SwFlyFrame* pFlyFrame  ) :
     SwAccessibleFrameBase( pInitMap, nInitRole, pFlyFrame ),
-    aDepend( this, const_cast < SwNoTextNode * >( GetNoTextNode() ) ),
+    m_aDepend( this, const_cast < SwNoTextNode * >( GetNoTextNode() ) ),
     msTitle(),
     msDesc()
 {
@@ -102,7 +102,7 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem
         return;
 
     const SwNoTextNode *pNd = GetNoTextNode();
-    OSL_ENSURE( pNd == aDepend.GetRegisteredIn(), "invalid frame" );
+    OSL_ENSURE( pNd == m_aDepend.GetRegisteredIn(), "invalid frame" );
     switch( nWhich )
     {
         // #i73249#
@@ -164,8 +164,8 @@ void SwAccessibleNoTextFrame::Dispose(bool bRecursive, bool bCanSkipInvisible)
 {
     SolarMutexGuard aGuard;
 
-    if( aDepend.GetRegisteredIn() )
-        aDepend.GetRegisteredIn()->Remove( &aDepend );
+    if( m_aDepend.GetRegisteredIn() )
+        m_aDepend.GetRegisteredIn()->Remove( &m_aDepend );
 
     SwAccessibleFrameBase::Dispose(bRecursive, bCanSkipInvisible);
 }
@@ -317,12 +317,12 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL
 
     if( aURL.GetMap() || !aURL.GetURL().isEmpty() )
     {
-        if ( !alink.is() )
+        if ( !m_xHyperlink.is() )
         {
-            alink = new SwAccessibleNoTextHyperlink( this, GetFrame() );
+            m_xHyperlink = new SwAccessibleNoTextHyperlink( this, GetFrame() );
         }
 
-        return alink;
+        return m_xHyperlink;
     }
 
     return nullptr;
diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx
index 014effd850c0..431f16f87a3f 100644
--- a/sw/source/core/access/accnotextframe.hxx
+++ b/sw/source/core/access/accnotextframe.hxx
@@ -38,8 +38,8 @@ class SwAccessibleNoTextFrame : public  SwAccessibleFrameBase,
                                 public css::accessibility::XAccessibleHypertext//Added by yangzhh for HyperLink
 {
     friend class SwAccessibleNoTextHyperlink;
-    css::uno::Reference< css::accessibility::XAccessibleHyperlink > alink;
-    SwDepend        aDepend;
+    css::uno::Reference< css::accessibility::XAccessibleHyperlink > m_xHyperlink;
+    SwDepend        m_aDepend;
     OUString msTitle;
     OUString msDesc;
 


More information about the Libreoffice-commits mailing list