summaryrefslogtreecommitdiff
path: root/accessibility/inc/accessibility/standard
diff options
context:
space:
mode:
authorMalte Timmermann [mt] <malte.timmermann@oracle.com>2011-02-15 17:14:59 +0100
committerMalte Timmermann [mt] <malte.timmermann@oracle.com>2011-02-15 17:14:59 +0100
commitf42f3b496a1d956f72fad8aaf37da790e89ed803 (patch)
treeb6f9cea18fda9b1c8a0af9642958a9671de6f713 /accessibility/inc/accessibility/standard
parentde539c71865e6eec7b1db38031f661d7d8ad0714 (diff)
parent16680c16eb84b5315dbbeeb61b3693c4d567640a (diff)
accfixes: merged to m100
Diffstat (limited to 'accessibility/inc/accessibility/standard')
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx6
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx2
2 files changed, 4 insertions, 4 deletions
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
index dfebec17b4e9..f90cb286b4c4 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
@@ -156,7 +156,7 @@ protected:
/// Index in parent. This is settable from the outside.
sal_Int32 m_nIndexInParent;
sal_Int32 m_nLastTopEntry;
- USHORT m_nLastSelectedPos;
+ sal_uInt16 m_nLastSelectedPos;
bool m_bDisableProcessEvent;
bool m_bVisible;
@@ -215,8 +215,8 @@ private:
void adjustEntriesIndexInParent(ListItems::iterator& _aBegin,::std::mem_fun_t<bool,VCLXAccessibleListItem>& _rMemFun);
void UpdateEntryRange_Impl (void);
protected:
- void UpdateSelection_Impl (USHORT nPos = 0);
- BOOL checkEntrySelected(USHORT _nPos,
+ void UpdateSelection_Impl (sal_uInt16 nPos = 0);
+ sal_Bool checkEntrySelected(sal_uInt16 _nPos,
::com::sun::star::uno::Any& _rNewValue,
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxNewAcc);
private:
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
index 4e2073a47a89..2869e240227d 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
@@ -65,7 +65,7 @@ private:
VCLExternalSolarLock* m_pExternalLock;
sal_Int32 m_nIndexInParent;
sal_Int16 m_nRole;
- USHORT m_nItemId;
+ sal_uInt16 m_nItemId;
sal_Bool m_bHasFocus;
sal_Bool m_bIsChecked;
bool m_bIndeterminate;