summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-04-06 12:59:10 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-04-06 12:59:10 +0200
commit308eee791f084fe925a993cbda401db3e1211c22 (patch)
tree6a94d65a906a6826a9785b372e2451650e9a5ba6 /editeng
parent2a0d0e7e9940173f32092cd93c900449fe4d50eb (diff)
Avoid reserved identifiers
Change-Id: I0505cf418688d568c0c110bc70b2552e2fb8265c
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/rtf/svxrtf.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index b4b9d79ab6c3..0c5a4522c001 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -207,7 +207,7 @@ INSINGLECHAR:
break;
case '{':
if (bNewGroup) // Nesting!
- _GetAttrSet();
+ GetAttrSet_();
bNewGroup = true;
break;
case '}':
@@ -803,7 +803,7 @@ const vcl::Font& SvxRTFParser::GetFont( sal_uInt16 nId )
return *pDfltFont;
}
-SvxRTFItemStackType* SvxRTFParser::_GetAttrSet()
+SvxRTFItemStackType* SvxRTFParser::GetAttrSet_()
{
SvxRTFItemStackType* pAkt = aAttrStack.empty() ? nullptr : aAttrStack.back();
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
// the default attrs of the document
@@ -957,8 +957,8 @@ void SvxRTFParser::AttrGroupEnd() // process the current, delete from Stack
if( IsChkStyleAttr() )
{
- _ClearStyleAttr( *pOld );
- _ClearStyleAttr( *pNew ); //#i10381#, methinks.
+ ClearStyleAttr_( *pOld );
+ ClearStyleAttr_( *pNew ); //#i10381#, methinks.
}
if( pAkt )
@@ -994,7 +994,7 @@ void SvxRTFParser::AttrGroupEnd() // process the current, delete from Stack
redundant properties.
*/
if (IsChkStyleAttr() && !pAkt)
- _ClearStyleAttr( *pOld );
+ ClearStyleAttr_( *pOld );
if( pAkt )
{