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

Avoid reserved identifier

Browse Source 
Change-Id: Iea66c7230f4570d6a2b88a514958788eb4105ffb
This commit is contained in:
Stephan Bergmann
2016-03-09 17:20:27 +01:00
parent ee4e520d11
commit df808bec43
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/svl/aeitem.hxx
View File

@@ -32,7 +32,7 @@ class SVL_DLLPUBLIC SfxAllEnumItem: public SfxEnumItem
std::vector<sal_uInt16>* pDisabledValues; std::vector<sal_uInt16>* pDisabledValues;
protected: protected:
sal_uInt16 _GetPosByValue( sal_uInt16 nValue ) const; sal_uInt16 GetPosByValue_( sal_uInt16 nValue ) const;
public: public:
static SfxPoolItem* CreateDefault(); static SfxPoolItem* CreateDefault();

6
svl/source/items/aeitem.cxx
View File

@@ -118,7 +118,7 @@ SfxPoolItem* SfxAllEnumItem::Create( SvStream & rStream, sal_uInt16 ) const
* In contrast to @see SfxEnumItemInterface::GetPosByValue(sal_uInt16) const * In contrast to @see SfxEnumItemInterface::GetPosByValue(sal_uInt16) const
* this internal method returns the position the value would be for non-present values. * this internal method returns the position the value would be for non-present values.
*/ */
sal_uInt16 SfxAllEnumItem::_GetPosByValue( sal_uInt16 nVal ) const sal_uInt16 SfxAllEnumItem::GetPosByValue_( sal_uInt16 nVal ) const
{ {
if ( !pValues ) if ( !pValues )
return 0; return 0;
@@ -155,7 +155,7 @@ void SfxAllEnumItem::InsertValue( sal_uInt16 nValue, const OUString &rValue )
// remove when exists // remove when exists
RemoveValue( nValue ); RemoveValue( nValue );
// then insert // then insert
pValues->insert(pValues->begin() + _GetPosByValue(nValue), aVal); // FIXME: Duplicates? pValues->insert(pValues->begin() + GetPosByValue_(nValue), aVal); // FIXME: Duplicates?
} }
void SfxAllEnumItem::InsertValue( sal_uInt16 nValue ) void SfxAllEnumItem::InsertValue( sal_uInt16 nValue )
@@ -166,7 +166,7 @@ void SfxAllEnumItem::InsertValue( sal_uInt16 nValue )
if ( !pValues ) if ( !pValues )
pValues = new SfxAllEnumValueArr; pValues = new SfxAllEnumValueArr;
pValues->insert(pValues->begin() + _GetPosByValue(nValue), aVal); // FIXME: Duplicates? pValues->insert(pValues->begin() + GetPosByValue_(nValue), aVal); // FIXME: Duplicates?
} }
void SfxAllEnumItem::DisableValue( sal_uInt16 nValue ) void SfxAllEnumItem::DisableValue( sal_uInt16 nValue )