diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-09 17:20:27 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-10 18:32:02 +0100 |
| commit | df808bec43ce5204b9b6730e91bef17bf1557ee9 (patch) | |
| tree | 0e9a17657a3db552adc43cf6b6bf07d325547777 | |
| parent | ee4e520d11bfb266c69c66511eee443d0bc7cc31 (diff) | |
Avoid reserved identifier
Change-Id: Iea66c7230f4570d6a2b88a514958788eb4105ffb
| -rw-r--r-- | include/svl/aeitem.hxx | 2 | ||||
| -rw-r--r-- | svl/source/items/aeitem.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx index 715d7419d40c..e0f4254b3c7e 100644 --- a/include/svl/aeitem.hxx +++ b/include/svl/aeitem.hxx @@ -32,7 +32,7 @@ class SVL_DLLPUBLIC SfxAllEnumItem: public SfxEnumItem std::vector<sal_uInt16>* pDisabledValues; protected: - sal_uInt16 _GetPosByValue( sal_uInt16 nValue ) const; + sal_uInt16 GetPosByValue_( sal_uInt16 nValue ) const; public: static SfxPoolItem* CreateDefault(); diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx index 2f391269007b..89fdad770c3a 100644 --- a/svl/source/items/aeitem.cxx +++ b/svl/source/items/aeitem.cxx @@ -118,7 +118,7 @@ SfxPoolItem* SfxAllEnumItem::Create( SvStream & rStream, 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. */ -sal_uInt16 SfxAllEnumItem::_GetPosByValue( sal_uInt16 nVal ) const +sal_uInt16 SfxAllEnumItem::GetPosByValue_( sal_uInt16 nVal ) const { if ( !pValues ) return 0; @@ -155,7 +155,7 @@ void SfxAllEnumItem::InsertValue( sal_uInt16 nValue, const OUString &rValue ) // remove when exists RemoveValue( nValue ); // 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 ) @@ -166,7 +166,7 @@ void SfxAllEnumItem::InsertValue( sal_uInt16 nValue ) if ( !pValues ) 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 ) |