Author: steve_y
Date: Mon Jan 7 06:04:58 2013
New Revision: 1429675
URL: http://svn.apache.org/viewvc?rev=1429675&view=rev
Log:
Resolved dependency for accessibility module
Modified:
openoffice/branches/ia2/main/svtools/inc/svtools/ivctrl.hxx
openoffice/branches/ia2/main/svtools/source/contnr/ivctrl.cxx
Modified: openoffice/branches/ia2/main/svtools/inc/svtools/ivctrl.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svtools/inc/svtools/ivctrl.hxx?rev=1429675&r1=1429674&r2=1429675&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svtools/inc/svtools/ivctrl.hxx (original)
+++ openoffice/branches/ia2/main/svtools/inc/svtools/ivctrl.hxx Mon Jan 7
06:04:58 2013
@@ -272,6 +272,9 @@ protected:
void CallImplEventListeners(sal_uLong
nEvent, void* pData);
public:
+//IAccessibility2 Implementation 2009-----
+ sal_Bool bCanBeFocused;
+//-----IAccessibility2 Implementation 2009
SvtIconChoiceCtrl( Window*
pParent, WinBits nWinStyle = WB_ICON | WB_BORDER );
SvtIconChoiceCtrl( Window*
pParent, const ResId& rResId );
Modified: openoffice/branches/ia2/main/svtools/source/contnr/ivctrl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svtools/source/contnr/ivctrl.cxx?rev=1429675&r1=1429674&r2=1429675&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svtools/source/contnr/ivctrl.cxx (original)
+++ openoffice/branches/ia2/main/svtools/source/contnr/ivctrl.cxx Mon Jan 7
06:04:58 2013
@@ -133,6 +133,9 @@ SvtIconChoiceCtrl::SvtIconChoiceCtrl( Wi
_pImp->SetGrid( Size( 100, 70 ) );
_pImp->InitSettings();
_pImp->SetPositionMode( IcnViewPositionModeAutoArrange );
+//IAccessibility2 Implementation 2009-----
+ bCanBeFocused = sal_True;
+//-----IAccessibility2 Implementation 2009
}
SvtIconChoiceCtrl::SvtIconChoiceCtrl( Window* pParent, const ResId& rResId ) :
@@ -148,6 +151,9 @@ SvtIconChoiceCtrl::SvtIconChoiceCtrl( Wi
_pImp->SetGrid( Size( 100, 70 ) );
_pImp->InitSettings();
_pImp->SetPositionMode( IcnViewPositionModeAutoArrange );
+//IAccessibility2 Implementation 2009-----
+ bCanBeFocused = sal_True;
+//-----IAccessibility2 Implementation 2009
}
SvtIconChoiceCtrl::~SvtIconChoiceCtrl()
@@ -306,6 +312,13 @@ void SvtIconChoiceCtrl::VisibleRectChang
void SvtIconChoiceCtrl::GetFocus()
{
+//IAccessibility2 Implementation 2009-----
+ if( !bCanBeFocused )
+ {
+ bCanBeFocused = sal_True;
+ return;
+ }
+//-----IAccessibility2 Implementation 2009
_pImp->GetFocus();
Control::GetFocus();
sal_uLong nPos;
