diff options
| -rw-r--r-- | editeng/source/rtf/svxrtf.cxx | 12 | ||||
| -rw-r--r-- | include/editeng/svxrtf.hxx | 6 |
2 files changed, 9 insertions, 9 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 ) { diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx index 081eaf7e5af5..66c3c548408c 100644 --- a/include/editeng/svxrtf.hxx +++ b/include/editeng/svxrtf.hxx @@ -223,8 +223,8 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser void ClearStyleTbl(); void ClearAttrStack(); - SvxRTFItemStackType* _GetAttrSet(); // Create new ItemStackType:s - void _ClearStyleAttr( SvxRTFItemStackType& rStkType ); + SvxRTFItemStackType* GetAttrSet_(); // Create new ItemStackType:s + void ClearStyleAttr_( SvxRTFItemStackType& rStkType ); // Sets all the attributes that are different from the current void SetAttrSet( SvxRTFItemStackType &rSet ); @@ -393,7 +393,7 @@ inline SfxItemSet& SvxRTFParser::GetAttrSet() { SvxRTFItemStackType* pTmp; if( bNewGroup || nullptr == ( pTmp = aAttrStack.empty() ? nullptr : aAttrStack.back()) ) - pTmp = _GetAttrSet(); + pTmp = GetAttrSet_(); return pTmp->aAttrSet; } |