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

[Stephan Bergmann]

 include/sfx2/lnkbase.hxx            |    4 ++--
 sfx2/source/appl/lnkbase2.cxx       |   10 +++++-----
 sw/source/core/docnode/swbaslnk.cxx |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 165b087b19c644ad872dcaf84b1ca6b3dfedda68
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 6 14:20:04 2016 +0200

    Avoid reserved identifier
    
    Change-Id: Ica4dc147a49525f0ec65241c2a9f1d3eb75b7285

diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx
index 2a8bb22..9a98ddc 100644
--- a/include/sfx2/lnkbase.hxx
+++ b/include/sfx2/lnkbase.hxx
@@ -99,12 +99,12 @@ protected:
                     SvBaseLink( SfxLinkUpdateMode nLinkType, SotClipboardFormatId nContentType = SotClipboardFormatId::STRING );
     virtual         ~SvBaseLink();
 
-    void            _GetRealObject( bool bConnect = true );
+    void            GetRealObject_( bool bConnect = true );
 
     SvLinkSource*   GetRealObject()
                     {
                         if( !xObj.Is() )
-                            _GetRealObject();
+                            GetRealObject_();
                         return xObj;
                     }
 
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index ea424ae..6f86946 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -282,7 +282,7 @@ void SvBaseLink::SetLinkSourceName( const OUString & rLnkNm )
     aLinkName = rLnkNm;
 
     // New Connection
-    _GetRealObject();
+    GetRealObject_();
     ReleaseRef(); // should be superfluous
 }
 
@@ -296,7 +296,7 @@ void SvBaseLink::SetUpdateMode( SfxLinkUpdateMode nMode )
         Disconnect();
 
         pImplData->ClientType.nUpdateMode = nMode;
-        _GetRealObject();
+        GetRealObject_();
         ReleaseRef();
     }
 }
@@ -318,7 +318,7 @@ bool SvBaseLink::Update()
         AddNextRef();
         Disconnect();
 
-        _GetRealObject();
+        GetRealObject_();
         ReleaseRef();
         if( xObj.Is() )
         {
@@ -362,7 +362,7 @@ SfxLinkUpdateMode SvBaseLink::GetUpdateMode() const
 }
 
 
-void SvBaseLink::_GetRealObject( bool bConnect)
+void SvBaseLink::GetRealObject_( bool bConnect)
 {
     if( !pImpl->m_pLinkMgr )
         return;
@@ -455,7 +455,7 @@ void SvBaseLink::Edit( vcl::Window* pParent, const Link<SvBaseLink&,void>& rEndE
     pImpl->m_aEndEditLink = rEndEditHdl;
     pImpl->m_bIsConnect = xObj.Is();
     if( !pImpl->m_bIsConnect )
-        _GetRealObject( xObj.Is() );
+        GetRealObject_( xObj.Is() );
 
     bool bAsync = false;
     Link<const OUString&, void> aLink = LINK( this, SvBaseLink, EndEditHdl );
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index 8620fce..fbe68e4 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -376,7 +376,7 @@ bool SwBaseLink::SwapIn( bool bWaitForData, bool bNativFormat )
     if( !GetObj() && ( bNativFormat || ( !IsSynchron() && bWaitForData ) ))
     {
         AddNextRef();
-        _GetRealObject();
+        GetRealObject_();
         ReleaseRef();
     }