diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-22 10:08:07 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-22 10:08:07 +0200 |
| commit | 85825e0fd54551735ef05b8484f71974734b9135 (patch) | |
| tree | 8bece458e55c1b5eab7559076579bf76cca8df68 /sw/source/core/graphic | |
| parent | fc233b52ce2acc1bcd7cecc3d51bcab870c81932 (diff) | |
Avoid reserved identifiers
Change-Id: I27ff0f4f0eb395d7e0a60dd604758c220a3134c4
Diffstat (limited to 'sw/source/core/graphic')
| -rw-r--r-- | sw/source/core/graphic/ndgrf.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index cf6df9a4453f..eabdb9f21bd6 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -563,8 +563,8 @@ bool SwGrfNode::SwapIn( bool bWaitForData ) try { const StreamAndStorageNames aNames = lcl_GetStreamStorageNames( maGrfObj.GetUserData() ); - uno::Reference < embed::XStorage > refPics = _GetDocSubstorageOrRoot( aNames.sStorage ); - SvStream* pStrm = _GetStreamForEmbedGrf( refPics, aNames.sStream ); + uno::Reference < embed::XStorage > refPics = GetDocSubstorageOrRoot( aNames.sStorage ); + SvStream* pStrm = GetStreamForEmbedGrf( refPics, aNames.sStream ); if ( pStrm ) { bRet = ImportGraphic( *pStrm ); @@ -857,7 +857,7 @@ void SwGrfNode::ScaleImageMap() A substorage with the specified name will be opened readonly. If the provided name is empty the root storage will be returned. */ -uno::Reference< embed::XStorage > SwGrfNode::_GetDocSubstorageOrRoot( const OUString& aStgName ) const +uno::Reference< embed::XStorage > SwGrfNode::GetDocSubstorageOrRoot( const OUString& aStgName ) const { uno::Reference < embed::XStorage > refStor = const_cast<SwGrfNode*>(this)->GetDoc()->GetDocStorage(); @@ -882,7 +882,7 @@ uno::Reference< embed::XStorage > SwGrfNode::_GetDocSubstorageOrRoot( const OUSt after the method returns, because its parent stream is closed and deleted. Proposed name of embedded graphic stream is also provided by parameter. */ -SvStream* SwGrfNode::_GetStreamForEmbedGrf( +SvStream* SwGrfNode::GetStreamForEmbedGrf( const uno::Reference< embed::XStorage >& _refPics, const OUString& rStreamName ) const { @@ -918,7 +918,7 @@ SvStream* SwGrfNode::_GetStreamForEmbedGrf( } else { - OSL_FAIL( "<SwGrfNode::_GetStreamForEmbedGrf(..)> - embedded graphic file not found!" ); + OSL_FAIL( "<SwGrfNode::GetStreamForEmbedGrf(..)> - embedded graphic file not found!" ); } } |