When editing in Microsoft PowerPoint, pressing enter now reports automatically entere...

Fixes #5360.

diff --git a/source/appModules/powerpnt.py b/source/appModules/powerpnt.py
index 317ce2d..9dec9fc 100644 (file)
--- a/source/appModules/powerpnt.py
+++ b/source/appModules/powerpnt.py
@@ -1,6 +1,6 @@
 #appModules/powerpnt.py\r
 #A part of NonVisual Desktop Access (NVDA)\r
-#Copyright (C) 2012-2014 NV Access Limited\r
+#Copyright (C) 2012-2015 NV Access Limited\r
 #This file is covered by the GNU General Public License.\r
 #See the file COPYING for more details.\r
 \r
@@ -26,7 +26,7 @@ import eventHandler
 import appModuleHandler\r
 from NVDAObjects.IAccessible import IAccessible, getNVDAObjectFromEvent\r
 from NVDAObjects.window import Window\r
-from NVDAObjects.behaviors import EditableTextWithoutAutoSelectDetection\r
+from NVDAObjects.behaviors import EditableTextWithoutAutoSelectDetection, EditableText\r
 import braille\r
 from cursorManager import ReviewCursorManager\r
 import controlTypes\r
@@ -908,6 +908,10 @@ class TextFrame(EditableTextWithoutAutoSelectDetection,PpObject):
 \r
        def __init__(self,windowHandle=None,documentWindow=None,ppObject=None):\r
                super(TextFrame,self).__init__(windowHandle=windowHandle,documentWindow=documentWindow,ppObject=ppObject)\r
+               # EditableText* wasn't added as an overlay,\r
+               # so initOverlayClass doesn't get called automatically.\r
+               # #5360: EditableText.initOverlayClass gives us announcement of new line text.\r
+               EditableText.initOverlayClass(self)\r
                EditableTextWithoutAutoSelectDetection.initClass(self)\r
 \r
        def _isEqual(self,other):\r
@@ -915,6 +919,7 @@ class TextFrame(EditableTextWithoutAutoSelectDetection,PpObject):
 \r
        name=None\r
        role=controlTypes.ROLE_EDITABLETEXT\r
+       states = {controlTypes.STATE_MULTILINE}\r
 \r
        def _get_parent(self):\r
                parent=self.ppObject.parent\r

diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
index ff97aec..262c72f 100644 (file)
--- a/user_docs/en/changes.t2t
+++ b/user_docs/en/changes.t2t
@@ -54,6 +54,7 @@ Highlights of this release include performance improvements in Windows 10; inclu
 - Notifications are now reported correctly in Skype for Desktop 7.12 and later. (#5405)\r
 - NVDA now correctly reports the focus when dismissing a context menu in some applications such as Jart. (#5302)\r
 - In Windows 7 and later, Color is again reported in certain applications such as Wordpad. (#5352)\r
+- When editing in Microsoft PowerPoint, pressing enter now reports automatically entered text such as a bullet or number. (#5360)\r
 \r
 \r
 = 2015.3 =\r