Commits

Anonymous committed 5b75a1d Merge

accstuff: pulled and merged latest changes from CWS accfixes2

Comments (0)

Files changed (3)

accessibility/source/helper/accessiblestrings.src

 {
 	Text [ en-US ] = "Uncheck";
 };
+<<<<<<< local
 String RID_STR_ACC_ACTION_DOUBLE_CLICK
 {
 	Text [ en-US ] = "Double click";
 };
 
+=======
+>>>>>>> other
 String RID_STR_ACC_SCROLLBAR_NAME_VERTICAL
 {
 	Text [ en-US ] = "Vertical scroll bar";
 {
 	Text [ en-US ] = "Horizontal scroll bar";
 };
+<<<<<<< local
 
 //Modify by Zijie Jia [12/31/2006] SODC_6571
 String RID_STR_ACC_PANEL_DESCRIPTION
 	Text [ en-US ] = "Please press enter to go into child control for more operations";
 };
 
+=======
+>>>>>>> other
 String RID_STR_ACC_DESC_PANELDECL_TABBAR
 {
     Text [ en-US ] = "Panel Deck Tab Bar";

svtools/inc/svtools/accessibleruler.hxx

 
 	//=====  XAccessibleContext  ==============================================
 
-	virtual long SAL_CALL
+	virtual sal_Int32 SAL_CALL
 		getAccessibleChildCount( void ) throw( ::com::sun::star::uno::RuntimeException );
 
 	virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
-		getAccessibleChild( long nIndex )
+		getAccessibleChild( sal_Int32 nIndex )
 			throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException );
 
 	virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL

svtools/inc/svtools/svlbox.hxx

 	sal_uInt16		GetFlags() const { return nEntryFlags; }
 	void		SetFlags( sal_uInt16 nFlags ) { nEntryFlags = nFlags; }
 
-	// MT: Introduced with IA2 CWS, not sure if this is really needed/wanted (3 similar looking implementations in sd/sc/sw use it)
     // sal_Bool	IsMarked() const { return bIsMarked ; }
 	// void		SetMarked( sal_Bool IsMarked ) { bIsMarked = IsMarked ; }
-
-	// MT: Just for getting sd/sc/sw compiled, until we know that we want it...
-	// Once somebody decides that we need it, introduce member bIsMarked, init with sal_False.
-    sal_Bool	IsMarked() const { return sal_False ; }
-	void		SetMarked( sal_Bool /*IsMarked*/ ) { ; }
 };
 
 // *********************************************************************