editeng/source/misc/txtrange.cxx | 10 +++++-----
editeng/source/rtf/svxrtf.cxx | 12 ++++++------
include/editeng/svxrtf.hxx | 6 +++---
3 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit fb411e93aead3458d7a3e1f262311330f69a157e
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Apr 6 13:06:38 2016 +0200
Avoid reserved identifier
Change-Id: Ia2af17bbf08cebc9e3c8f772583a61bde194328f
diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx
index cbf3e0c..e5b798c 100644
--- a/editeng/source/misc/txtrange.cxx
+++ b/editeng/source/misc/txtrange.cxx
@@ -121,9 +121,9 @@ class SvxBoundArgs
void NoteRange( bool bToggle );
long Cut( long nY, const Point& rPt1, const Point& rPt2 );
void Add();
- void _NoteFarPoint( long nPx, long nPyDiff, long nDiff );
+ void NoteFarPoint_( long nPx, long nPyDiff, long nDiff );
void NoteFarPoint( long nPx, long nPyDiff, long nDiff )
- { if( nDiff ) _NoteFarPoint( nPx, nPyDiff, nDiff ); }
+ { if( nDiff ) NoteFarPoint_( nPx, nPyDiff, nDiff ); }
long CalcMax( const Point& rPt1, const Point& rPt2, long nRange, long nFar
);
void CheckCut( const Point& rLst, const Point& rNxt );
inline long A( const Point& rP ) const { return bRotate ? rP.Y() : rP.X();
}
@@ -222,18 +222,18 @@ void SvxBoundArgs::CheckCut( const Point& rLst, const
Point& rNxt )
{
nYps = CalcMax( rLst, rNxt, nBottom, nLower );
if( nYps )
- _NoteFarPoint( Cut( nYps, rLst, rNxt ), nLower-nYps, nLowDiff
);
+ NoteFarPoint_( Cut( nYps, rLst, rNxt ), nLower-nYps, nLowDiff
);
}
if( nUpDiff && ( ( nCut & 2 ) || nLast == 2 || nNext == 2 ) )
{
nYps = CalcMax( rLst, rNxt, nTop, nUpper );
if( nYps )
- _NoteFarPoint( Cut( nYps, rLst, rNxt ), nYps-nUpper, nUpDiff );
+ NoteFarPoint_( Cut( nYps, rLst, rNxt ), nYps-nUpper, nUpDiff );
}
}
}
-void SvxBoundArgs::_NoteFarPoint( long nPa, long nPbDiff, long nDiff )
+void SvxBoundArgs::NoteFarPoint_( long nPa, long nPbDiff, long nDiff )
{
long nTmpA;
double nQuot = 2 * nDiff - nPbDiff;
commit 308eee791f084fe925a993cbda401db3e1211c22
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Apr 6 12:59:10 2016 +0200
Avoid reserved identifiers
Change-Id: I0505cf418688d568c0c110bc70b2552e2fb8265c
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index b4b9d79..0c5a452 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 081eaf7..66c3c54 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;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
