diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-06 19:25:04 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-06 19:25:04 +0200 |
| commit | f5b325a748f388bb9283a4dcd16d13670b40aa6f (patch) | |
| tree | 3ad86a7c44d99c3653061d7ac25802c828e40340 /sfx2 | |
| parent | 871f49e7fadb863b55c96c3f58ea7cc8fb033b40 (diff) | |
Avoid reserved identifiers
Change-Id: I3f077d9937a86b362942173e787dd7cc65a0bbce
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/EnumContext.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sfx2/source/sidebar/EnumContext.cxx b/sfx2/source/sidebar/EnumContext.cxx index c44e4347bd21..281e63fd6663 100644 --- a/sfx2/source/sidebar/EnumContext.cxx +++ b/sfx2/source/sidebar/EnumContext.cxx @@ -104,7 +104,7 @@ bool EnumContext::operator!= (const EnumContext& rOther) void EnumContext::AddEntry (const ::rtl::OUString& rsName, const Application eApplication) { maApplicationMap[rsName] = eApplication; - OSL_ASSERT(eApplication<=__LastApplicationEnum); + OSL_ASSERT(eApplication<=LastApplicationEnum); if (maApplicationVector.size() <= size_t(eApplication)) maApplicationVector.resize(eApplication+1); maApplicationVector[eApplication]=rsName; @@ -114,7 +114,7 @@ void EnumContext::ProvideApplicationContainers() { if (maApplicationMap.empty()) { - maApplicationVector.resize(static_cast<size_t>(EnumContext::__LastApplicationEnum)+1); + maApplicationVector.resize(static_cast<size_t>(EnumContext::LastApplicationEnum)+1); AddEntry("com.sun.star.text.TextDocument", EnumContext::Application_Writer); AddEntry("com.sun.star.text.GlobalDocument", EnumContext::Application_WriterGlobal); AddEntry("com.sun.star.text.WebDocument", EnumContext::Application_WriterWeb); @@ -148,7 +148,7 @@ const ::rtl::OUString& EnumContext::GetApplicationName (const Application eAppli ProvideApplicationContainers(); const sal_Int32 nIndex (eApplication); - if (nIndex<0 || nIndex>= __LastApplicationEnum) + if (nIndex<0 || nIndex>= LastApplicationEnum) return maApplicationVector[Application_None]; else return maApplicationVector[nIndex]; @@ -157,7 +157,7 @@ const ::rtl::OUString& EnumContext::GetApplicationName (const Application eAppli void EnumContext::AddEntry (const ::rtl::OUString& rsName, const Context eApplication) { maContextMap[rsName] = eApplication; - OSL_ASSERT(eApplication<=__LastContextEnum); + OSL_ASSERT(eApplication<=LastContextEnum); if (maContextVector.size() <= size_t(eApplication)) maContextVector.resize(eApplication+1); maContextVector[eApplication] = rsName; @@ -167,7 +167,7 @@ void EnumContext::ProvideContextContainers() { if (maContextMap.empty()) { - maContextVector.resize(static_cast<size_t>(__LastContextEnum)+1); + maContextVector.resize(static_cast<size_t>(LastContextEnum)+1); AddEntry("any", Context_Any); AddEntry("default", Context_Default); AddEntry("empty", Context_Empty); @@ -221,7 +221,7 @@ const ::rtl::OUString& EnumContext::GetContextName (const Context eContext) ProvideContextContainers(); const sal_Int32 nIndex (eContext); - if (nIndex<0 || nIndex>= __LastContextEnum) + if (nIndex<0 || nIndex>= LastContextEnum) return maContextVector[Context_Unknown]; else return maContextVector[nIndex]; |