mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid reserved identifiers

Browse Source 
Change-Id: I0505cf418688d568c0c110bc70b2552e2fb8265c
This commit is contained in:
Stephan Bergmann
2016-04-06 12:59:10 +02:00
parent 2a0d0e7e99
commit 308eee791f
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
editeng/source/rtf/svxrtf.cxx
View File

@@ -207,7 +207,7 @@ INSINGLECHAR:
break; break;
case '{': case '{':
if (bNewGroup) // Nesting! if (bNewGroup) // Nesting!
_GetAttrSet(); GetAttrSet_();
bNewGroup = true; bNewGroup = true;
break; break;
case '}': case '}':
@@ -803,7 +803,7 @@ const vcl::Font& SvxRTFParser::GetFont( sal_uInt16 nId )
return *pDfltFont; return *pDfltFont;
} }
SvxRTFItemStackType* SvxRTFParser::_GetAttrSet() SvxRTFItemStackType* SvxRTFParser::GetAttrSet_()
{ {
SvxRTFItemStackType* pAkt = aAttrStack.empty() ? nullptr : aAttrStack.back(); SvxRTFItemStackType* pAkt = aAttrStack.empty() ? nullptr : aAttrStack.back();
SvxRTFItemStackType* pNew; SvxRTFItemStackType* pNew;
@@ -820,7 +820,7 @@ SvxRTFItemStackType* SvxRTFParser::_GetAttrSet()
} }
void SvxRTFParser::_ClearStyleAttr( SvxRTFItemStackType& rStkType ) void SvxRTFParser::ClearStyleAttr_( SvxRTFItemStackType& rStkType )
{ {
// check attributes to the attributes of the stylesheet or to // check attributes to the attributes of the stylesheet or to
// the default attrs of the document // the default attrs of the document
@@ -957,8 +957,8 @@ void SvxRTFParser::AttrGroupEnd() // process the current, delete from Stack
if( IsChkStyleAttr() ) if( IsChkStyleAttr() )
{ {
_ClearStyleAttr( *pOld ); ClearStyleAttr_( *pOld );
_ClearStyleAttr( *pNew ); //#i10381#, methinks. ClearStyleAttr_( *pNew ); //#i10381#, methinks.
} }
if( pAkt ) if( pAkt )
@@ -994,7 +994,7 @@ void SvxRTFParser::AttrGroupEnd() // process the current, delete from Stack
redundant properties. redundant properties.
*/ */
if (IsChkStyleAttr() && !pAkt) if (IsChkStyleAttr() && !pAkt)
_ClearStyleAttr( *pOld ); ClearStyleAttr_( *pOld );
if( pAkt ) if( pAkt )
{ {

6
include/editeng/svxrtf.hxx
View File

@@ -223,8 +223,8 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser
void ClearStyleTbl(); void ClearStyleTbl();
void ClearAttrStack(); void ClearAttrStack();
SvxRTFItemStackType* _GetAttrSet(); // Create new ItemStackType:s SvxRTFItemStackType* GetAttrSet_(); // Create new ItemStackType:s
void _ClearStyleAttr( SvxRTFItemStackType& rStkType ); void ClearStyleAttr_( SvxRTFItemStackType& rStkType );
// Sets all the attributes that are different from the current // Sets all the attributes that are different from the current
void SetAttrSet( SvxRTFItemStackType &rSet ); void SetAttrSet( SvxRTFItemStackType &rSet );
@@ -393,7 +393,7 @@ inline SfxItemSet& SvxRTFParser::GetAttrSet()
{ {
SvxRTFItemStackType* pTmp; SvxRTFItemStackType* pTmp;
if( bNewGroup || nullptr == ( pTmp = aAttrStack.empty() ? nullptr : aAttrStack.back()) ) if( bNewGroup || nullptr == ( pTmp = aAttrStack.empty() ? nullptr : aAttrStack.back()) )
pTmp = _GetAttrSet(); pTmp = GetAttrSet_();
return pTmp->aAttrSet; return pTmp->aAttrSet;
} }