Index: src/orca/scripts/StarOffice.py =================================================================== --- src/orca/scripts/StarOffice.py (revision 2358) +++ src/orca/scripts/StarOffice.py (working copy) @@ -374,24 +374,8 @@ return [regions, componentRegion] else: - # Check to see how many children this table cell has. If it's - # just one (or none), then pass it on to the superclass to be - # processed. - # - # If it's more than one, then get the braille regions for each - # child, and call this method again. - # - if obj.childCount <= 1: - brailleGen = braillegenerator.BrailleGenerator - regions = brailleGen._getBrailleRegionsForTableCell(self, obj) - else: - regions = [] - for i in range(0, obj.childCount): - child = obj.child(i) - [cellRegions, focusRegion] = \ - self._getBrailleRegionsForTableCell(child) - regions.extend(cellRegions) - return [regions, focusRegion] + brailleGen = braillegenerator.BrailleGenerator + regions = brailleGen._getBrailleRegionsForTableCell(self, obj) return regions @@ -578,23 +562,9 @@ nameList = obj.name.split() utterances.append(nameList[1]) else: - # Check to see how many children this table cell has. If it's - # just one (or none), then pass it on to the superclass to be - # processed. - # - # If it's more than one, then get the speech for each child, - # and call this method again. - # - if obj.childCount <= 1: - speechGen = speechgenerator.SpeechGenerator - utterances = speechGen._getSpeechForTableCell(self, obj, - already_focused) - else: - utterances = [] - for i in range(0, obj.childCount): - child = obj.child(i) - utterances.extend(self._getSpeechForTableCell(child, - already_focused)) + speechGen = speechgenerator.SpeechGenerator + utterances = speechGen._getSpeechForTableCell(self, obj, + already_focused) return utterances @@ -2064,8 +2034,7 @@ # if (event_string == "Up" or event_string == "Down"): if not settings.readTableCellRow: - if event.detail1 != -1: - self.speakCellName(event.source.parent.name) + self.speakCellName(event.source.parent.name) return # If we are moving left or right and we are in a new cell, just