Author: kschenk
Date: Tue Sep 29 20:31:48 2015
New Revision: 1705924
URL: http://svn.apache.org/viewvc?rev=1705924&view=rev
Log:
#i125991# merged to AOO410
Modified:
openoffice/branches/AOO410/main/vcl/unx/gtk/window/ (props changed)
openoffice/branches/AOO410/main/vcl/unx/gtk/window/gtkframe.cxx
Propchange: openoffice/branches/AOO410/main/vcl/unx/gtk/window/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Sep 29 20:31:48 2015
@@ -0,0 +1,5 @@
+/openoffice/branches/AOO400/main/vcl/unx/gtk/window:1503684
+/openoffice/branches/ia2/main/vcl/unx/gtk/window:1417739-1541842
+/openoffice/branches/ooxml-osba/main/vcl/unx/gtk/window:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
+/openoffice/branches/rejuvenate01/main/vcl/unx/gtk/window:1480411,1534063,1534098,1536312,1549902,1560617
+/openoffice/trunk/main/vcl/unx/gtk/window:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1623847,1623849-1623850,1630814,1633294,1633297,1635806,1642300-1642302,1650314,1651591,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1695962,1697807,170
0078,1700135,1702894,1702898,1702986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542
Modified: openoffice/branches/AOO410/main/vcl/unx/gtk/window/gtkframe.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/vcl/unx/gtk/window/gtkframe.cxx?rev=1705924&r1=1705923&r2=1705924&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/vcl/unx/gtk/window/gtkframe.cxx (original)
+++ openoffice/branches/AOO410/main/vcl/unx/gtk/window/gtkframe.cxx Tue Sep 29
20:31:48 2015
@@ -3749,18 +3749,26 @@ uno::Reference<accessibility::XAccessibl
return
uno::Reference<accessibility::XAccessibleEditableText>(xContext,
uno::UNO_QUERY);
}
- for (sal_Int32 i = 0; i < xContext->getAccessibleChildCount(); ++i)
- {
- uno::Reference< accessibility::XAccessible > xChild =
xContext->getAccessibleChild(i);
- if (!xChild.is())
- continue;
- uno::Reference< accessibility::XAccessibleContext >
xChildContext = xChild->getAccessibleContext();
- if (!xChildContext.is())
- continue;
- uno::Reference< accessibility::XAccessibleEditableText > xText
= FindFocus(xChildContext);
- if (xText.is())
- return xText;
- }
+ try
+ {
+ for (sal_Int32 i = 0, n = xContext->getAccessibleChildCount(); i < n;
++i)
+ {
+ uno::Reference< accessibility::XAccessible > xChild =
xContext->getAccessibleChild(i);
+ if (!xChild.is())
+ continue;
+ uno::Reference< accessibility::XAccessibleContext >
xChildContext = xChild->getAccessibleContext();
+ if (!xChildContext.is())
+ continue;
+ uno::Reference< accessibility::XAccessibleEditableText > xText =
FindFocus(xChildContext);
+ if (xText.is())
+ return xText;
+ }
+ }
+ catch( lang::IndexOutOfBoundsException & e )
+ {
+ OSL_TRACE( "GtkFrame FindFocus, %s", ::rtl::OUStringToOString(
+ e.Message, RTL_TEXTENCODING_UTF8 ).pData->buffer );
+ }
return uno::Reference< accessibility::XAccessibleEditableText >();
}
