fixed compile errors after resync to m100

This commit is contained in:
Malte Timmermann [mt] 2011-02-15 18:50:56 +01:00
parent 1e8ae7f11c
commit bf3f4fe647
3 changed files with 7 additions and 6 deletions

View file

@ -216,7 +216,7 @@ struct ImplFrameData
struct ImplAccessibleInfos
{
USHORT nAccessibleRole;
sal_uInt16 nAccessibleRole;
String* pAccessibleName;
String* pAccessibleDescription;
Window* pLabeledByWindow;

View file

@ -1263,7 +1263,7 @@ Window* Window::GetAccessibleRelationMemberOf() const
// which are labeled only if the fixed line or group box
// is directly before the control
// get form start and form end and index of this control
USHORT nIndex, nFormStart, nFormEnd;
sal_uInt16 nIndex, nFormStart, nFormEnd;
Window* pSWindow = ::ImplFindDlgCtrlWindow( pFrameWindow,
const_cast<Window*>(this),
nIndex,
@ -1278,13 +1278,13 @@ Window* Window::GetAccessibleRelationMemberOf() const
{
nFormStart = nIndex-1;
}
for( USHORT nSearchIndex = nIndex-1; nSearchIndex >= nFormStart; nSearchIndex-- )
for( sal_uInt16 nSearchIndex = nIndex-1; nSearchIndex >= nFormStart; nSearchIndex-- )
{
USHORT nFoundIndex = 0;
sal_uInt16 nFoundIndex = 0;
pSWindow = ::ImplGetChildWindow( pFrameWindow,
nSearchIndex,
nFoundIndex,
FALSE );
sal_False );
if( pSWindow && pSWindow->IsVisible() &&
( pSWindow->GetType() == WINDOW_FIXEDLINE ||
pSWindow->GetType() == WINDOW_GROUPBOX ) )

View file

@ -9297,7 +9297,8 @@ sal_Bool Window::IsAccessibilityEventsSuppressed( sal_Bool bTraverseParentPath )
return sal_False;
}
}
void Window::SetAccessibilityEventsSuppressed(BOOL bSuppressed)
void Window::SetAccessibilityEventsSuppressed(sal_Bool bSuppressed)
{
mpWindowImpl->mbSuppressAccessibilityEvents = bSuppressed;
}