[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - cui/source

[Lionel Elie Mamane]

 cui/source/customize/macropg.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bffd15ec2ee472b32672589240f8a11c2261dd60
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Wed Nov 25 16:21:19 2015 +0100

    assign macro dialog: correct event name "errorOccured"
    
    "errorOccured" is an English spelling mistake, but is the
    name of the event, which cannot / should not be changed for
    backwards compatibility reasons.
    
    Spelling was boguously "corrected" in:
    
      commit 60a9b5172bcbd90b5764125b76279c189dd5563c
      Author: Takeshi Abe <tabe at fixedpoint.jp>
      Date:   Sat Dec 4 12:56:38 2010 +0900
    
          Replace all occured, occurance etc.
    
    This was leading to impossibility of assigning a macro
    to that event, since it was not appearing in this dialog.
    
    Change-Id: Ib0373501cba8af8f4abb1c62faddf8d65c926a7e

diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 0944bb1..4861380 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -324,7 +324,7 @@ void _SvxMacroTabPage::InitResources()
     aDisplayNames.push_back( EventDisplayName( "approveCursorMove",     RID_SVXSTR_EVENT_POSITIONING ) );
     aDisplayNames.push_back( EventDisplayName( "cursorMoved",           RID_SVXSTR_EVENT_POSITIONED ) );
     aDisplayNames.push_back( EventDisplayName( "approveParameter",      RID_SVXSTR_EVENT_APPROVEPARAMETER ) );
-    aDisplayNames.push_back( EventDisplayName( "errorOccurred",          RID_SVXSTR_EVENT_ERROROCCURRED ) );
+    aDisplayNames.push_back( EventDisplayName( "errorOccured",          RID_SVXSTR_EVENT_ERROROCCURRED ) );
     aDisplayNames.push_back( EventDisplayName( "adjustmentValueChanged",   RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED ) );
 }