Kaydet (Commit) 4dd62d9c authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Disambiguate needlessly overloaded SvDetachedEventDescriptor::hasByName

Change-Id: I951e95c4c81e7e0b4bfb2246c163809863fedac5
üst f2a0e403
...@@ -293,8 +293,7 @@ protected: ...@@ -293,8 +293,7 @@ protected:
/// return true: we have a macro for the event /// return true: we have a macro for the event
/// return false: no macro; getByName() will return an empty macro /// return false: no macro; getByName() will return an empty macro
/// IllegalArgumentException: the event is not supported /// IllegalArgumentException: the event is not supported
using SvBaseEventDescriptor::hasByName; bool hasById(
bool hasByName(
const sal_uInt16 nEvent ) const /// item ID of event const sal_uInt16 nEvent ) const /// item ID of event
throw( throw(
::com::sun::star::lang::IllegalArgumentException); ::com::sun::star::lang::IllegalArgumentException);
......
...@@ -497,7 +497,7 @@ void SvDetachedEventDescriptor::getByName( ...@@ -497,7 +497,7 @@ void SvDetachedEventDescriptor::getByName(
rMacro = (*aMacros[nIndex]); rMacro = (*aMacros[nIndex]);
} }
bool SvDetachedEventDescriptor::hasByName( bool SvDetachedEventDescriptor::hasById(
const sal_uInt16 nEvent ) const /// item ID of event const sal_uInt16 nEvent ) const /// item ID of event
throw(IllegalArgumentException) throw(IllegalArgumentException)
{ {
...@@ -545,7 +545,7 @@ void SvMacroTableEventDescriptor::copyMacrosIntoTable( ...@@ -545,7 +545,7 @@ void SvMacroTableEventDescriptor::copyMacrosIntoTable(
for(sal_Int16 i = 0; mpSupportedMacroItems[i].mnEvent != 0; i++) for(sal_Int16 i = 0; mpSupportedMacroItems[i].mnEvent != 0; i++)
{ {
const sal_uInt16 nEvent = mpSupportedMacroItems[i].mnEvent; const sal_uInt16 nEvent = mpSupportedMacroItems[i].mnEvent;
if (hasByName(nEvent)) if (hasById(nEvent))
{ {
SvxMacro& rMacro = rMacroTable.Insert(nEvent, SvxMacro(sEmpty, sEmpty)); SvxMacro& rMacro = rMacroTable.Insert(nEvent, SvxMacro(sEmpty, sEmpty));
getByName(rMacro, nEvent); getByName(rMacro, nEvent);
......
...@@ -134,7 +134,7 @@ void SwHyperlinkEventDescriptor::copyMacrosIntoINetFormat( ...@@ -134,7 +134,7 @@ void SwHyperlinkEventDescriptor::copyMacrosIntoINetFormat(
for(sal_uInt16 i = 0; mpSupportedMacroItems[i].mnEvent != 0; ++i) for(sal_uInt16 i = 0; mpSupportedMacroItems[i].mnEvent != 0; ++i)
{ {
const sal_uInt16 nEvent = mpSupportedMacroItems[i].mnEvent; const sal_uInt16 nEvent = mpSupportedMacroItems[i].mnEvent;
if (hasByName(nEvent)) if (hasById(nEvent))
{ {
SvxMacro aMacro(sEmpty, sEmpty); SvxMacro aMacro(sEmpty, sEmpty);
getByName(aMacro, nEvent); getByName(aMacro, nEvent);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment