openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stev...@apache.org
Subject svn commit: r1463840 [1/6] - in /openoffice/branches/ia2/main: cui/source/customize/ cui/source/dialogs/ cui/source/inc/ cui/source/tabpages/ editeng/inc/editeng/ editeng/source/accessibility/ editeng/source/editeng/ editeng/source/misc/ editeng/source...
Date Wed, 03 Apr 2013 07:04:22 GMT
Author: steve_y
Date: Wed Apr  3 07:04:20 2013
New Revision: 1463840

URL: http://svn.apache.org/r1463840
Log:
IA2 migration for cui, editeng, svx

Added:
    openoffice/branches/ia2/main/editeng/inc/editeng/AccessibleSvxFindReplaceDialog.hxx
    openoffice/branches/ia2/main/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx
    openoffice/branches/ia2/main/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
Modified:
    openoffice/branches/ia2/main/cui/source/customize/cfg.cxx
    openoffice/branches/ia2/main/cui/source/customize/cfg.src
    openoffice/branches/ia2/main/cui/source/dialogs/cuigrfflt.cxx
    openoffice/branches/ia2/main/cui/source/dialogs/iconcdlg.cxx
    openoffice/branches/ia2/main/cui/source/inc/cuicharmap.hxx
    openoffice/branches/ia2/main/cui/source/tabpages/autocdlg.cxx
    openoffice/branches/ia2/main/cui/source/tabpages/autocdlg.src
    openoffice/branches/ia2/main/cui/source/tabpages/connect.hrc
    openoffice/branches/ia2/main/cui/source/tabpages/tabarea.src
    openoffice/branches/ia2/main/cui/source/tabpages/tparea.cxx
    openoffice/branches/ia2/main/editeng/inc/editeng/AccessibleEditableTextPara.hxx
    openoffice/branches/ia2/main/editeng/inc/editeng/editdata.hxx
    openoffice/branches/ia2/main/editeng/inc/editeng/editeng.hxx
    openoffice/branches/ia2/main/editeng/inc/editeng/editview.hxx
    openoffice/branches/ia2/main/editeng/inc/editeng/splwrap.hxx
    openoffice/branches/ia2/main/editeng/inc/editeng/unoedhlp.hxx
    openoffice/branches/ia2/main/editeng/inc/editeng/unoedprx.hxx
    openoffice/branches/ia2/main/editeng/inc/editeng/unoedsrc.hxx
    openoffice/branches/ia2/main/editeng/inc/editeng/unofored.hxx
    openoffice/branches/ia2/main/editeng/inc/editeng/unoforou.hxx
    openoffice/branches/ia2/main/editeng/inc/editeng/unotext.hxx
    openoffice/branches/ia2/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx
    openoffice/branches/ia2/main/editeng/source/accessibility/AccessibleHyperlink.cxx
    openoffice/branches/ia2/main/editeng/source/accessibility/AccessibleParaManager.cxx
    openoffice/branches/ia2/main/editeng/source/accessibility/AccessibleStaticTextBase.cxx
    openoffice/branches/ia2/main/editeng/source/editeng/editdoc.hxx
    openoffice/branches/ia2/main/editeng/source/editeng/edtspell.cxx
    openoffice/branches/ia2/main/editeng/source/editeng/impedit.cxx
    openoffice/branches/ia2/main/editeng/source/editeng/impedit.hxx
    openoffice/branches/ia2/main/editeng/source/editeng/impedit2.cxx
    openoffice/branches/ia2/main/editeng/source/editeng/impedit3.cxx
    openoffice/branches/ia2/main/editeng/source/misc/splwrap.cxx
    openoffice/branches/ia2/main/editeng/source/outliner/outliner.cxx
    openoffice/branches/ia2/main/editeng/source/outliner/outlvw.cxx
    openoffice/branches/ia2/main/editeng/source/uno/unoedhlp.cxx
    openoffice/branches/ia2/main/editeng/source/uno/unoedprx.cxx
    openoffice/branches/ia2/main/editeng/source/uno/unofored.cxx
    openoffice/branches/ia2/main/editeng/source/uno/unoforou.cxx
    openoffice/branches/ia2/main/editeng/source/uno/unonrule.cxx
    openoffice/branches/ia2/main/editeng/source/uno/unotext.cxx
    openoffice/branches/ia2/main/offapi/com/sun/star/accessibility/makefile.mk
    openoffice/branches/ia2/main/sfx2/inc/sfx2/viewsh.hxx
    openoffice/branches/ia2/main/starmath/source/accessibility.cxx
    openoffice/branches/ia2/main/starmath/source/accessibility.hxx
    openoffice/branches/ia2/main/svx/Library_svx.mk
    openoffice/branches/ia2/main/svx/inc/svx/AccessibleControlShape.hxx
    openoffice/branches/ia2/main/svx/inc/svx/AccessibleGraphicShape.hxx
    openoffice/branches/ia2/main/svx/inc/svx/AccessibleOLEShape.hxx
    openoffice/branches/ia2/main/svx/inc/svx/AccessibleShape.hxx
    openoffice/branches/ia2/main/svx/inc/svx/AccessibleTableShape.hxx
    openoffice/branches/ia2/main/svx/inc/svx/ChildrenManager.hxx
    openoffice/branches/ia2/main/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx
    openoffice/branches/ia2/main/svx/inc/svx/IAccessibleParent.hxx
    openoffice/branches/ia2/main/svx/inc/svx/ctredlin.hxx
    openoffice/branches/ia2/main/svx/inc/svx/dlgctrl.hxx
    openoffice/branches/ia2/main/svx/inc/svx/srchdlg.hxx
    openoffice/branches/ia2/main/svx/inc/svx/svdmodel.hxx
    openoffice/branches/ia2/main/svx/inc/svx/svdmrkv.hxx
    openoffice/branches/ia2/main/svx/inc/svx/svdoashp.hxx
    openoffice/branches/ia2/main/svx/inc/svx/svdobj.hxx
    openoffice/branches/ia2/main/svx/inc/svx/svdoole2.hxx
    openoffice/branches/ia2/main/svx/source/accessibility/AccessibleControlShape.cxx
    openoffice/branches/ia2/main/svx/source/accessibility/AccessibleEmptyEditSource.cxx
    openoffice/branches/ia2/main/svx/source/accessibility/AccessibleFrameSelector.cxx
    openoffice/branches/ia2/main/svx/source/accessibility/AccessibleGraphicShape.cxx
    openoffice/branches/ia2/main/svx/source/accessibility/AccessibleOLEShape.cxx
    openoffice/branches/ia2/main/svx/source/accessibility/AccessibleShape.cxx
    openoffice/branches/ia2/main/svx/source/accessibility/AccessibleTextHelper.cxx
    openoffice/branches/ia2/main/svx/source/accessibility/ChildrenManager.cxx
    openoffice/branches/ia2/main/svx/source/accessibility/ChildrenManagerImpl.cxx
    openoffice/branches/ia2/main/svx/source/accessibility/ChildrenManagerImpl.hxx
    openoffice/branches/ia2/main/svx/source/accessibility/ShapeTypeHandler.cxx
    openoffice/branches/ia2/main/svx/source/accessibility/charmapacc.cxx
    openoffice/branches/ia2/main/svx/source/accessibility/svxrectctaccessiblecontext.cxx
    openoffice/branches/ia2/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
    openoffice/branches/ia2/main/svx/source/dialog/_bmpmask.cxx
    openoffice/branches/ia2/main/svx/source/dialog/charmap.cxx
    openoffice/branches/ia2/main/svx/source/dialog/ctredlin.cxx
    openoffice/branches/ia2/main/svx/source/dialog/ctredlin.src
    openoffice/branches/ia2/main/svx/source/dialog/dlgctrl.cxx
    openoffice/branches/ia2/main/svx/source/dialog/frmsel.cxx
    openoffice/branches/ia2/main/svx/source/dialog/srchdlg.cxx
    openoffice/branches/ia2/main/svx/source/inc/AccessibleFrameSelector.hxx
    openoffice/branches/ia2/main/svx/source/inc/svxrectctaccessiblecontext.hxx
    openoffice/branches/ia2/main/svx/source/svdraw/svdoashp.cxx
    openoffice/branches/ia2/main/svx/source/svdraw/svdobj.cxx
    openoffice/branches/ia2/main/svx/source/svdraw/svdoole2.cxx
    openoffice/branches/ia2/main/svx/source/table/accessiblecell.cxx
    openoffice/branches/ia2/main/svx/source/table/accessiblecell.hxx
    openoffice/branches/ia2/main/svx/source/table/accessibletableshape.cxx
    openoffice/branches/ia2/main/svx/source/table/tablecontroller.cxx
    openoffice/branches/ia2/main/svx/source/table/tablecontroller.hxx
    openoffice/branches/ia2/main/svx/source/unodraw/unoprov.cxx
    openoffice/branches/ia2/main/svx/source/unodraw/unoshtxt.cxx

Modified: openoffice/branches/ia2/main/cui/source/customize/cfg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/cui/source/customize/cfg.cxx?rev=1463840&r1=1463839&r2=1463840&view=diff
==============================================================================
--- openoffice/branches/ia2/main/cui/source/customize/cfg.cxx (original)
+++ openoffice/branches/ia2/main/cui/source/customize/cfg.cxx Wed Apr  3 07:04:20 2013
@@ -1662,7 +1662,7 @@ SvxConfigPage::SvxConfigPage(
     aDescriptionField.SetControlBackground( GetSettings().GetStyleSettings().GetDialogColor()
);
     aDescriptionField.SetAutoScroll( sal_True );
     aDescriptionField.EnableCursor( sal_False );
-
+	//IAccessibility2 Implementation 2009-----
 	aMoveUpButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_UP)));
 	aMoveDownButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_DOWN)));
 	aMoveUpButton.SetAccessibleRelationMemberOf(&aContentsSeparator);
@@ -1671,6 +1671,7 @@ SvxConfigPage::SvxConfigPage(
 	aModifyTopLevelButton.SetAccessibleRelationMemberOf(&aTopLevelSeparator);
 	aAddCommandsButton.SetAccessibleRelationMemberOf(&aContentsSeparator);
 	aModifyCommandButton.SetAccessibleRelationMemberOf(&aContentsSeparator);
+	//-----IAccessibility2 Implementation 2009
 }
 
 SvxConfigPage::~SvxConfigPage()
@@ -2929,9 +2930,10 @@ SvxMainMenuOrganizerDialog::SvxMainMenuO
 		LINK( this, SvxMainMenuOrganizerDialog, MoveHdl) );
 	aMoveDownButton.SetClickHdl	(
 		LINK( this, SvxMainMenuOrganizerDialog, MoveHdl) );
-
+	//IAccessibility2 Implementation 2009-----
 	aMoveUpButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_UP)));
 	aMoveDownButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_DOWN)));
+	//-----IAccessibility2 Implementation 2009
 }
 
 IMPL_LINK(SvxMainMenuOrganizerDialog, ModifyHdl, Edit*, pEdit)

Modified: openoffice/branches/ia2/main/cui/source/customize/cfg.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/cui/source/customize/cfg.src?rev=1463840&r1=1463839&r2=1463840&view=diff
==============================================================================
--- openoffice/branches/ia2/main/cui/source/customize/cfg.src (original)
+++ openoffice/branches/ia2/main/cui/source/customize/cfg.src Wed Apr  3 07:04:20 2013
@@ -883,7 +883,7 @@ String RID_SVXSTR_RENAME_TOOLBAR
 	Text [ de ] = "Symbolleiste umbenennen";
 	Text [ en-US ] = "Rename Toolbar";
 };
-
+//IAccessibility2 Implementation 2009-----
 String BUTTON_STR_UP
 {
 	Text [ en-US ] = "Up";
@@ -892,4 +892,5 @@ String BUTTON_STR_DOWN
 {
 	Text [ en-US ] = "Down";
 };
+//-----IAccessibility2 Implementation 2009
 

Modified: openoffice/branches/ia2/main/cui/source/dialogs/cuigrfflt.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/cui/source/dialogs/cuigrfflt.cxx?rev=1463840&r1=1463839&r2=1463840&view=diff
==============================================================================
--- openoffice/branches/ia2/main/cui/source/dialogs/cuigrfflt.cxx (original)
+++ openoffice/branches/ia2/main/cui/source/dialogs/cuigrfflt.cxx Wed Apr  3 07:04:20 2013
@@ -535,7 +535,8 @@ GraphicFilterSolarize::GraphicFilterSola
 	maCbxInvert.Check( bInvert );
 	maCbxInvert.SetToggleHdl( GetModifyHdl() );
 
-	maMtrThreshold.GrabFocus();
+	// IAccessibility2 Implementation 2009
+	// maMtrThreshold.GrabFocus();
 }
 
 // -----------------------------------------------------------------------------
@@ -595,7 +596,8 @@ GraphicFilterSepia::GraphicFilterSepia( 
 	maMtrSepia.SetValue( nSepiaPercent );
 	maMtrSepia.SetModifyHdl( GetModifyHdl() );
 
-	maMtrSepia.GrabFocus();
+	// IAccessibility2 Implementation 2009
+	// maMtrSepia.GrabFocus();
 }
 
 // -----------------------------------------------------------------------------
@@ -646,7 +648,9 @@ GraphicFilterPoster::GraphicFilterPoster
     maNumPoster.SetLast( rGraphic.GetBitmapEx().GetBitCount() );
 	maNumPoster.SetValue( nPosterCount );
 	maNumPoster.SetModifyHdl( GetModifyHdl() );
-	maNumPoster.GrabFocus();
+
+	// IAccessibility2 Implementation 2009
+	// maNumPoster.GrabFocus();
 }
 
 // -----------------------------------------------------------------------------

Modified: openoffice/branches/ia2/main/cui/source/dialogs/iconcdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/cui/source/dialogs/iconcdlg.cxx?rev=1463840&r1=1463839&r2=1463840&view=diff
==============================================================================
--- openoffice/branches/ia2/main/cui/source/dialogs/iconcdlg.cxx (original)
+++ openoffice/branches/ia2/main/cui/source/dialogs/iconcdlg.cxx Wed Apr  3 07:04:20 2013
@@ -456,6 +456,11 @@ void IconChoiceDialog::ShowPage( sal_uIn
 	ActivatePageImpl( );
     if(bInvalidate)
         Invalidate();
+
+	// IA2 CWS. MT: I guess we want the event now, and not in Paint()?
+	IconChoicePageData* pData = GetPageData ( mnCurrentPageId );
+	if(pData)
+		ShowPageImpl ( pData );
 }
 
 /**********************************************************************

Modified: openoffice/branches/ia2/main/cui/source/inc/cuicharmap.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/cui/source/inc/cuicharmap.hxx?rev=1463840&r1=1463839&r2=1463840&view=diff
==============================================================================
--- openoffice/branches/ia2/main/cui/source/inc/cuicharmap.hxx (original)
+++ openoffice/branches/ia2/main/cui/source/inc/cuicharmap.hxx Wed Apr  3 07:04:20 2013
@@ -82,7 +82,12 @@ private:
 friend class SvxCharacterMap;
     SfxModalDialog* mpDialog;
 
+    FixedText       aFontText;
+    ListBox         aFontLB;
+    FixedText       aSubsetText;
+    ListBox         aSubsetLB;
     SvxShowCharSet  aShowSet;
+    FixedText       aSymbolText;
     SvxShowText     aShowText;
 //    SvxShowText     aShowShortcut;
     OKButton        aOKBtn;
@@ -90,11 +95,6 @@ friend class SvxCharacterMap;
     HelpButton      aHelpBtn;
     PushButton      aDeleteBtn;
 //    PushButton		aAssignBtn;
-    FixedText       aFontText;
-    ListBox         aFontLB;
-    FixedText       aSubsetText;
-    ListBox         aSubsetLB;
-    FixedText       aSymbolText;
     SvxShowText     aShowChar;
     FixedText       aCharCodeText;
 //	FixedText		aAssignText;

Modified: openoffice/branches/ia2/main/cui/source/tabpages/autocdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/cui/source/tabpages/autocdlg.cxx?rev=1463840&r1=1463839&r2=1463840&view=diff
==============================================================================
--- openoffice/branches/ia2/main/cui/source/tabpages/autocdlg.cxx (original)
+++ openoffice/branches/ia2/main/cui/source/tabpages/autocdlg.cxx Wed Apr  3 07:04:20 2013
@@ -2052,12 +2052,12 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window
 
     sStandard(CUI_RES(ST_STANDARD))
 {
-	aSglStandardPB.SetAccessibleName(String(CUI_RES(STR_PB_SGL_STD) ) );
-	aDblStandardPB.SetAccessibleName(String(CUI_RES(STR_PB_DBL_STD) ) );
-	aStartQuotePB.SetAccessibleName( String(CUI_RES(STR_PB_DBL_START) ));
-	aEndQuotePB.SetAccessibleName(String(CUI_RES(STR_PB_DBL_END) ));
-	aSglStartQuotePB.SetAccessibleName(String(CUI_RES(STR_PB_SGL_START) ));
-	aSglEndQuotePB.SetAccessibleName(String(CUI_RES(STR_PB_SGL_END) ) );
+	//aSglStandardPB.SetAccessibleName(String(CUI_RES(STR_PB_SGL_STD) ) );
+	//aDblStandardPB.SetAccessibleName(String(CUI_RES(STR_PB_DBL_STD) ) );
+	//aStartQuotePB.SetAccessibleName( String(CUI_RES(STR_PB_DBL_START) ));
+	//aEndQuotePB.SetAccessibleName(String(CUI_RES(STR_PB_DBL_END) ));
+	//aSglStartQuotePB.SetAccessibleName(String(CUI_RES(STR_PB_SGL_START) ));
+	//aSglEndQuotePB.SetAccessibleName(String(CUI_RES(STR_PB_SGL_END) ) );
 
 	FreeResource();
 	
@@ -2100,6 +2100,15 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window
 	aDblStandardPB.SetClickHdl(LINK(this, 	OfaQuoteTabPage, StdQuoteHdl));
 	aSglStandardPB.SetClickHdl(LINK(this, 	OfaQuoteTabPage, StdQuoteHdl));
 
+	//IAccessibility2 Implementation 2009-----
+	// Move down from the position before FreeResource() 
+	// For lost help ID issue
+	aSglStandardPB.SetAccessibleName(String(CUI_RES(STR_PB_SGL_STD) ) );
+	aDblStandardPB.SetAccessibleName(String(CUI_RES(STR_PB_DBL_STD) ) );
+	aStartQuotePB.SetAccessibleName( String(CUI_RES(STR_PB_DBL_START) ));
+	aEndQuotePB.SetAccessibleName(String(CUI_RES(STR_PB_DBL_END) ));
+	aSglStartQuotePB.SetAccessibleName(String(CUI_RES(STR_PB_SGL_START) ));
+	aSglEndQuotePB.SetAccessibleName(String(CUI_RES(STR_PB_SGL_END) ) );
 	aSglStartQuotePB.SetAccessibleRelationLabeledBy( &aSglStartQuoteFT );
 	aSglEndQuotePB.SetAccessibleRelationLabeledBy( &aSglEndQuoteFT );
 	aSglStartQuotePB.SetAccessibleRelationMemberOf( &aSingleFL );

Modified: openoffice/branches/ia2/main/cui/source/tabpages/autocdlg.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/cui/source/tabpages/autocdlg.src?rev=1463840&r1=1463839&r2=1463840&view=diff
==============================================================================
--- openoffice/branches/ia2/main/cui/source/tabpages/autocdlg.src (original)
+++ openoffice/branches/ia2/main/cui/source/tabpages/autocdlg.src Wed Apr  3 07:04:20 2013
@@ -495,6 +495,30 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
     {
         Text [ en-US ] = "Delete words with two initial capitals" ;
 	};
+	String STR_PB_SGL_STD
+    {
+        Text [ en-US ] = "Single quotes default" ;
+	};
+	String STR_PB_DBL_STD
+    {
+        Text [ en-US ] = "Double quotes default" ;
+	};
+	String STR_PB_SGL_START
+    {
+        Text [ en-US ] = "Start quote of single quotes" ;
+	};
+	String STR_PB_DBL_START
+    {
+        Text [ en-US ] = "Start quote of double quotes" ;
+	};
+	String STR_PB_SGL_END
+    {
+        Text [ en-US ] = "End quote of single quotes" ;
+	};
+	String STR_PB_DBL_END
+    {
+        Text [ en-US ] = "End quote of double quotes" ;
+	};
 };
 /**************************************************************************/
 /*                                                                        */
@@ -663,30 +687,6 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
     {
         Text [ en-US ] = "Default" ;
 	};
-	String STR_PB_SGL_STD
-    {
-        Text [ en-US ] = "Single quotes default" ;
-	};
-	String STR_PB_DBL_STD
-    {
-        Text [ en-US ] = "Double quotes default" ;
-	};
-	String STR_PB_SGL_START
-    {
-        Text [ en-US ] = "Start quote of single quotes" ;
-	};
-	String STR_PB_DBL_START
-    {
-        Text [ en-US ] = "Start quote of double quotes" ;
-	};
-	String STR_PB_SGL_END
-    {
-        Text [ en-US ] = "End quote of single quotes" ;
-	};
-	String STR_PB_DBL_END
-    {
-        Text [ en-US ] = "End quote of double quotes" ;
-	};
 };
 
 /**************************************************************************/

Modified: openoffice/branches/ia2/main/cui/source/tabpages/connect.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/cui/source/tabpages/connect.hrc?rev=1463840&r1=1463839&r2=1463840&view=diff
==============================================================================
--- openoffice/branches/ia2/main/cui/source/tabpages/connect.hrc (original)
+++ openoffice/branches/ia2/main/cui/source/tabpages/connect.hrc Wed Apr  3 07:04:20 2013
@@ -39,3 +39,5 @@
 #define FT_TYPE 8
 #define LB_TYPE 1
 #define CTL_PREVIEW 1
+//IAccessibility2 Implementation 2009-----
+#define STR_EXAMPLE 1

Modified: openoffice/branches/ia2/main/cui/source/tabpages/tabarea.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/cui/source/tabpages/tabarea.src?rev=1463840&r1=1463839&r2=1463840&view=diff
==============================================================================
--- openoffice/branches/ia2/main/cui/source/tabpages/tabarea.src (original)
+++ openoffice/branches/ia2/main/cui/source/tabpages/tabarea.src Wed Apr  3 07:04:20 2013
@@ -875,6 +875,9 @@ TabPage RID_SVXPAGE_BITMAP
         Pos = MAP_APPFONT ( 12 , 25  ) ;
 		Size = MAP_APPFONT ( 72 , 72 ) ;
 		TabStop = TRUE ;
+		//IAccessibility2 Implementation 2009-----
+		Text [ en-US ] = "Pattern Editor";
+		//-----IAccessibility2 Implementation 2009
 	};
     FixedText FT_COLOR
 	{
@@ -1316,12 +1319,18 @@ TabPage RID_SVXPAGE_COLOR
         Border = TRUE;
         Pos = MAP_APPFONT ( 157 , 14  ) ;
         Size = MAP_APPFONT ( 34 , 25 ) ;
+        // IAccessibility2 implementation 2009. ------
+		Text [ en-US ] = "Old Color" ;
+		// ------ IAccessibility2 implementation 2009.
 	};
 	Control CTL_PREVIEW_NEW
 	{
         Border = TRUE;
         Pos = MAP_APPFONT ( 157, 39  ) ;
         Size = MAP_APPFONT ( 34 , 25 ) ;
+        // IAccessibility2 implementation 2009. ------
+        Text [ en-US ] = "New Color" ;
+        // ------ IAccessibility2 implementation 2009.
 	};
     ListBox LB_COLORMODEL
 	{

Modified: openoffice/branches/ia2/main/cui/source/tabpages/tparea.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/cui/source/tabpages/tparea.cxx?rev=1463840&r1=1463839&r2=1463840&view=diff
==============================================================================
--- openoffice/branches/ia2/main/cui/source/tabpages/tparea.cxx (original)
+++ openoffice/branches/ia2/main/cui/source/tabpages/tparea.cxx Wed Apr  3 07:04:20 2013
@@ -2217,6 +2217,11 @@ IMPL_LINK( SvxAreaTabPage, ClickBitmapHd
 	aMtrFldYOffset.Show();
     aFlPosition.Show();
 	aRbtRow.Show();
+//IAccessible2 Implementation 2009-----
+	//Solution:Check one when initializing.
+	if(!aRbtRow.IsChecked()&&!aRbtColumn.IsChecked())
+	        aRbtRow.Check();
+//-----IAccessible2 Implementation 2009
 	aRbtColumn.Show();
 	aMtrFldOffset.Show();
     aFlOffset.Show();

Modified: openoffice/branches/ia2/main/editeng/inc/editeng/AccessibleEditableTextPara.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/editeng/inc/editeng/AccessibleEditableTextPara.hxx?rev=1463840&r1=1463839&r2=1463840&view=diff
==============================================================================
--- openoffice/branches/ia2/main/editeng/inc/editeng/AccessibleEditableTextPara.hxx (original)
+++ openoffice/branches/ia2/main/editeng/inc/editeng/AccessibleEditableTextPara.hxx Wed Apr
 3 07:04:20 2013
@@ -373,6 +373,13 @@ namespace accessibility
         /// Check whether 0<=nStart<=n and 0<=nEnd<=n
         void CheckRange( sal_Int32 nStart, sal_Int32 nEnd ) SAL_THROW((::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException));
 
+//IAccessibility2 Implementation 2009-----
+		void _correctValues( const sal_Int32 nIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue
>& rValues );
+	 	sal_Int32 SkipField(sal_Int32 nIndex, sal_Bool bForward);
+	 // get overlapped field, extend return string. Only extend forward for now
+		sal_Bool ExtendByField( ::com::sun::star::accessibility::TextSegment& Segment );
+		String GetFieldTypeNameAtIndex(sal_Int32 nIndex);
+//-----IAccessibility2 Implementation 2009
         // the paragraph index in the edit engine (guarded by solar mutex)
         sal_Int32	mnParagraphIndex;
 
@@ -400,6 +407,14 @@ namespace accessibility
 
         /// Our listeners (guarded by maMutex)
         int mnNotifierClientId;
+	//IAccessibility2 Implementation 2009-----
+public:
+		void SetParagraphBackColorAccessible(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible
> & ref)
+		{ m_xAccInfo = ref ;}		
+private:
+		::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
m_xAccInfo;
+        //virtual sal_Bool IsShapeParaFocusable( );
+	//-----IAccessibility2 Implementation 2009
 
         // --> OD 2006-01-11 #i27138#
         // the paragraph manager, which created this instance - is NULL, if

Added: openoffice/branches/ia2/main/editeng/inc/editeng/AccessibleSvxFindReplaceDialog.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/editeng/inc/editeng/AccessibleSvxFindReplaceDialog.hxx?rev=1463840&view=auto
==============================================================================
--- openoffice/branches/ia2/main/editeng/inc/editeng/AccessibleSvxFindReplaceDialog.hxx (added)
+++ openoffice/branches/ia2/main/editeng/inc/editeng/AccessibleSvxFindReplaceDialog.hxx Wed
Apr  3 07:04:20 2013
@@ -0,0 +1,71 @@
+/*************************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+*  Copyright IBM Corporation 2010.
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+************************************************************************/
+#ifndef _ACCESSIBLESVXFINDREPLACEDIALOG_HXX_
+#define _ACCESSIBLESVXFINDREPLACEDIALOG_HXX_
+#ifndef _TOOLKIT_AWT_VCLXWINDOW_HXX_
+#include <toolkit/awt/vclxwindow.hxx>
+#endif
+#ifndef _TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX_
+#include <toolkit/awt/vclxaccessiblecomponent.hxx>
+#endif
+
+#ifndef _TOOLKIT_AWT_VCLXWINDOWS_HXX_
+#include <toolkit/awt/vclxwindows.hxx>
+#endif
+
+
+class VCLXAccessibleSvxFindReplaceDialog : public VCLXAccessibleComponent
+{
+public:
+	VCLXAccessibleSvxFindReplaceDialog(VCLXWindow* pVCLXindow);
+	virtual ~VCLXAccessibleSvxFindReplaceDialog();
+	virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet
);
+	// XServiceInfo
+	virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+	virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
+
+};
+
+
+class VCLXSvxFindReplaceDialog : public VCLXDialog
+{
+public:
+	VCLXSvxFindReplaceDialog(Window* pSplDlg)
+	{
+		SetWindow(pSplDlg);
+	}
+	virtual ~VCLXSvxFindReplaceDialog()
+	{};
+private:	
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessibleContext >  CreateAccessibleContext()
+	{
+		return new VCLXAccessibleSvxFindReplaceDialog(this);		 
+	}
+};
+#endif // _ACCESSIBLESVXFINDREPLACEDIALOG_HXX_

Modified: openoffice/branches/ia2/main/editeng/inc/editeng/editdata.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/editeng/inc/editeng/editdata.hxx?rev=1463840&r1=1463839&r2=1463840&view=diff
==============================================================================
--- openoffice/branches/ia2/main/editeng/inc/editeng/editdata.hxx (original)
+++ openoffice/branches/ia2/main/editeng/inc/editeng/editdata.hxx Wed Apr  3 07:04:20 2013
@@ -363,7 +363,10 @@ enum EENotifyType
     EE_NOTIFY_INPUT_START,
 
     /// Denotes the end of a high-level action triggered by a key press
-    EE_NOTIFY_INPUT_END
+    EE_NOTIFY_INPUT_END,
+//IAccessibility2 Implementation 2009-----
+	EE_NOTIFY_TEXTVIEWSELECTIONCHANGED_ENDD_PARA
+//-----IAccessibility2 Implementation 2009
 };
 
 struct EENotify

Modified: openoffice/branches/ia2/main/editeng/inc/editeng/editeng.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/editeng/inc/editeng/editeng.hxx?rev=1463840&r1=1463839&r2=1463840&view=diff
==============================================================================
--- openoffice/branches/ia2/main/editeng/inc/editeng/editeng.hxx (original)
+++ openoffice/branches/ia2/main/editeng/inc/editeng/editeng.hxx Wed Apr  3 07:04:20 2013
@@ -108,6 +108,9 @@ const sal_uInt8 EditEngineAttribs_OnlyHa
 #define GETATTRIBS_CHARATTRIBS  (sal_uInt8)0x04
 #define GETATTRIBS_ALL          (sal_uInt8)0xFF
 
+//IAccessibility2 Implementation 2009-----
+class SdrObject;
+//-----IAccessibility2 Implementation 2009
 class EDITENG_DLLPUBLIC EditEngine
 {
 	friend class EditView;
@@ -145,6 +148,9 @@ public:
 
 	void			SetUpdateMode( sal_Bool bUpdate );
 	sal_Bool			GetUpdateMode() const;
+	//IAccessible2 migration fix
+	void					SetUpdateModeForAcc( sal_Bool bUp);
+	sal_Bool				GetUpdateModeForAcc( ) const;
 
 	void			SetBackgroundColor( const Color& rColor );
 	Color			GetBackgroundColor() const;
@@ -469,7 +475,9 @@ public:
 	static void		ImportBulletItem( SvxNumBulletItem& rNumBullet, sal_uInt16 nLevel, const
SvxBulletItem* pOldBullet, const SvxLRSpaceItem* pOldLRSpace );
 	static sal_Bool 	IsPrintable( sal_Unicode c ) { return ( ( c >= 32 ) && ( c !=
127 ) ); }
     static sal_Bool     HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable
>& rTransferable );
-
+	//IAccessibility2 Implementation 2009-----
+	virtual SdrObject* GetCurTextObj() { return NULL; }
+	//-----IAccessibility2 Implementation 2009
 	/** sets a link that is called at the beginning of a drag operation at an edit view */
 	void			SetBeginDropHdl( const Link& rLink );
 	Link			GetBeginDropHdl() const;

Modified: openoffice/branches/ia2/main/editeng/inc/editeng/editview.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/editeng/inc/editeng/editview.hxx?rev=1463840&r1=1463839&r2=1463840&view=diff
==============================================================================
--- openoffice/branches/ia2/main/editeng/inc/editeng/editview.hxx (original)
+++ openoffice/branches/ia2/main/editeng/inc/editeng/editview.hxx Wed Apr  3 07:04:20 2013
@@ -219,6 +219,10 @@ public:
 
 	sal_Bool			IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong = sal_False );
 	sal_Bool			IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong =
sal_False );
+	//IAccessibility2 Implementation 2009-----
+    	sal_Bool IsShapeParaFocusable( ) ;
+    sal_Bool WrongSpelledBreakPara(sal_Int32 nPara,sal_uInt16& nStartIndex, sal_uInt16&
nEndIndex,sal_Int32 nIndex);
+	//-----IAccessibility2 Implementation 2009
 	void			SpellIgnoreWord();
 	void			ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack = 0 );
 

Modified: openoffice/branches/ia2/main/editeng/inc/editeng/splwrap.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/editeng/inc/editeng/splwrap.hxx?rev=1463840&r1=1463839&r2=1463840&view=diff
==============================================================================
--- openoffice/branches/ia2/main/editeng/inc/editeng/splwrap.hxx (original)
+++ openoffice/branches/ia2/main/editeng/inc/editeng/splwrap.hxx Wed Apr  3 07:04:20 2013
@@ -39,7 +39,8 @@ namespace com { namespace sun { namespac
 }}}}
 
 class Window;
-
+//IAccessibility2 Impplementaton 2009-----
+class SdrObject;
 // misc functions ---------------------------------------------------------------
 
 void EDITENG_DLLPUBLIC SvxPrepareAutoCorrect( String &rOldText, String &rNewText
);
@@ -61,6 +62,8 @@ private:
 		::com::sun::star::linguistic2::XSpellChecker1 > xSpell;
 	::com::sun::star::uno::Reference<
 		::com::sun::star::linguistic2::XHyphenator > 	xHyph;
+//IAccessibility2 Impplementaton 2009-----
+	SdrObject* mpTextObj;
 	sal_uInt16 	nOldLang; 		// Sprache merken, nur bei Aenderung SetLanguage rufen
 	sal_Bool 	bOtherCntnt : 1; // gesetzt => Sonderbereiche zunaechst pruefen
 	sal_Bool 	bDialog		: 1; // Ist pWin der Svx...Dialog?
@@ -151,6 +154,10 @@ protected:
 	virtual void AutoCorrect( const String& rAktStr, const String& rNewStr );
 	virtual void InsertHyphen( const sal_uInt16 nPos ); // Hyphen einfuegen
 
+//IAccessibility2 Impplementaton 2009-----
+	void SetCurTextObj( SdrObject* pObj ) { mpTextObj = pObj; }
+	SdrObject* GetCurTextObj() { return mpTextObj; }
+//-----IAccessibility2 Impplementaton 2009
 };
 
 #endif

Modified: openoffice/branches/ia2/main/editeng/inc/editeng/unoedhlp.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/editeng/inc/editeng/unoedhlp.hxx?rev=1463840&r1=1463839&r2=1463840&view=diff
==============================================================================
--- openoffice/branches/ia2/main/editeng/inc/editeng/unoedhlp.hxx (original)
+++ openoffice/branches/ia2/main/editeng/inc/editeng/unoedhlp.hxx Wed Apr  3 07:04:20 2013
@@ -60,7 +60,17 @@ public:
 	void	SetStartValue( sal_uLong n );
 	void	SetEndValue( sal_uLong n );
 };
-
+//IAccessibility2 Implementation 2009-----
+class SvxEditSourceHintEndPara :public SvxEditSourceHint
+{
+public:
+	TYPEINFO();
+	SvxEditSourceHintEndPara( sal_uInt32 nId )
+		:SvxEditSourceHint(nId) {}
+	SvxEditSourceHintEndPara( sal_uInt32 nId, sal_uInt32 nValue, sal_uInt32 nStart=0, sal_uInt32
nEnd=0 )
+		:SvxEditSourceHint(nId,nValue,nStart){ (void)nEnd; }
+};
+//-----IAccessibility2 Implementation 2009
 /** Helper class for common functionality in edit sources
  */
 class EDITENG_DLLPUBLIC SvxEditSourceHelper
@@ -97,7 +107,10 @@ public:
 
         @return sal_True, if the range has been successfully determined
      */
-    static sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex,
const EditEngine& rEE, sal_uInt16 nPara, sal_uInt16 nIndex );
+	//IAccessibility2 Implementation 2009-----
+    //static sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, const
EditEngine& rEE, USHORT nPara, USHORT nIndex );
+    static sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex,
const EditEngine& rEE, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell=sal_False
);
+	//-----IAccessibility2 Implementation 2009
 
     /** Convert point from edit engine to user coordinate space
 

Modified: openoffice/branches/ia2/main/editeng/inc/editeng/unoedprx.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/editeng/inc/editeng/unoedprx.hxx?rev=1463840&r1=1463839&r2=1463840&view=diff
==============================================================================
--- openoffice/branches/ia2/main/editeng/inc/editeng/unoedprx.hxx (original)
+++ openoffice/branches/ia2/main/editeng/inc/editeng/unoedprx.hxx Wed Apr  3 07:04:20 2013
@@ -74,9 +74,12 @@ public:
 	virtual OutputDevice*	GetRefDevice() const;
     virtual sal_Bool		GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16&
nIndex ) const;
     virtual sal_Bool		GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16&
nStart, sal_uInt16& nEnd ) const;
-    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex,
sal_uInt16 nPara, sal_uInt16 nIndex ) const;
-    virtual sal_uInt16			GetLineCount( sal_uInt16 nPara ) const;
-    virtual sal_uInt16			GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;
+	//IAccessibility2 Implementation 2009-----
+	virtual void	SetUpdateModeForAcc( sal_Bool bUp);
+	virtual sal_Bool	GetUpdateModeForAcc() const;
+    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex,
sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const;
+    virtual sal_uInt16		GetLineCount( sal_uInt16 nPara ) const;
+    virtual sal_uInt16		GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;
     virtual void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16
&rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
     virtual sal_uInt16          GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex
) const;
     

Modified: openoffice/branches/ia2/main/editeng/inc/editeng/unoedsrc.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/editeng/inc/editeng/unoedsrc.hxx?rev=1463840&r1=1463839&r2=1463840&view=diff
==============================================================================
--- openoffice/branches/ia2/main/editeng/inc/editeng/unoedsrc.hxx (original)
+++ openoffice/branches/ia2/main/editeng/inc/editeng/unoedsrc.hxx Wed Apr  3 07:04:20 2013
@@ -219,7 +219,12 @@ public:
         Index of paragraph to query bullet info on
      */
     virtual EBulletInfo     GetBulletInfo( sal_uInt16 nPara ) const = 0;
-
+//IAccessibility2 Implementation 2009-----
+     virtual String       GetNumStr(sal_uInt16) const { return XubString();};
+    //IAccessible2 migration fix
+    virtual void					SetUpdateModeForAcc( sal_Bool ) {};
+	virtual sal_Bool					GetUpdateModeForAcc() const { return sal_True; };
+//-----IAccessibility2 Implementation 2009
     /** Query the bounding rectangle of the given character
 
         @param nPara[0 .. n]
@@ -331,7 +336,10 @@ public:
 
         @return sal_True, if the range has been successfully determined
      */
-    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex,
sal_uInt16 nPara, sal_uInt16 nIndex ) const = 0;
+	//IAccessibility2 Implementation 2009-----
+//    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex,
sal_uInt16 nPara, sal_uInt16 nIndex ) const = 0;
+    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex,
sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const = 0;
+	//-----IAccessibility2 Implementation 2009
 
     /** Query number of lines in the formatted paragraph
 
@@ -542,6 +550,11 @@ public:
      */
     virtual sal_Bool Paste() = 0;
 
+//IAccessibility2 Implementation 2009-----
+    virtual sal_Bool IsWrongSpelledWordAtPos( sal_Int32, sal_Int32 ) { return sal_False;
};
+    virtual sal_Bool IsShapeParaFocusable( ) { return sal_True; };
+    virtual sal_Bool BreakParaWrongList(sal_Int32, sal_uInt16&, sal_uInt16&, sal_Int32){
return sal_False; };
+//-----IAccessibility2 Implementation 2009
 };
 
 #endif

Modified: openoffice/branches/ia2/main/editeng/inc/editeng/unofored.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/editeng/inc/editeng/unofored.hxx?rev=1463840&r1=1463839&r2=1463840&view=diff
==============================================================================
--- openoffice/branches/ia2/main/editeng/inc/editeng/unofored.hxx (original)
+++ openoffice/branches/ia2/main/editeng/inc/editeng/unofored.hxx Wed Apr  3 07:04:20 2013
@@ -72,7 +72,10 @@ public:
 	virtual OutputDevice*	GetRefDevice() const;
     virtual sal_Bool		GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16&
nIndex ) const;
     virtual sal_Bool		GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16&
nStart, sal_uInt16& nEnd ) const;
-    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex,
sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+	//IAccessibility2 Implementation 2009-----
+//    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex,
sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex,
sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const;
+	//-----IAccessibility2 Implementation 2009
     virtual sal_uInt16			GetLineCount( sal_uInt16 nPara ) const;
     virtual sal_uInt16			GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;
     virtual void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16
&rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const;

Modified: openoffice/branches/ia2/main/editeng/inc/editeng/unoforou.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/editeng/inc/editeng/unoforou.hxx?rev=1463840&r1=1463839&r2=1463840&view=diff
==============================================================================
--- openoffice/branches/ia2/main/editeng/inc/editeng/unoforou.hxx (original)
+++ openoffice/branches/ia2/main/editeng/inc/editeng/unoforou.hxx Wed Apr  3 07:04:20 2013
@@ -93,7 +93,10 @@ public:
 	virtual OutputDevice*	GetRefDevice() const;
     virtual sal_Bool		GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16&
nIndex ) const;
     virtual sal_Bool		GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16&
nStart, sal_uInt16& nEnd ) const;
-    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex,
sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+	//IAccessibility2 Implementation 2009-----
+//    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex,
sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex,
sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const;
+	//-----IAccessibility2 Implementation 2009
     virtual sal_uInt16			GetLineCount( sal_uInt16 nPara ) const;
     virtual sal_uInt16			GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;
     virtual void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16
&rEnd, sal_uInt16 nPara, sal_uInt16 nLine ) const;

Modified: openoffice/branches/ia2/main/editeng/inc/editeng/unotext.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/editeng/inc/editeng/unotext.hxx?rev=1463840&r1=1463839&r2=1463840&view=diff
==============================================================================
--- openoffice/branches/ia2/main/editeng/inc/editeng/unotext.hxx (original)
+++ openoffice/branches/ia2/main/editeng/inc/editeng/unotext.hxx Wed Apr  3 07:04:20 2013
@@ -218,7 +218,10 @@ public:
 	virtual OutputDevice*	GetRefDevice() const;
     virtual sal_Bool		GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16&
nIndex ) const;
     virtual sal_Bool		GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16&
nStart, sal_uInt16& nEnd ) const;
-    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex,
sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+	//IAccessibility2 Implementation 2009-----
+//    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex,
sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex,
sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const;
+	//-----IAccessibility2 Implementation 2009
     virtual sal_uInt16			GetLineCount( sal_uInt16 nPara ) const;
     virtual sal_uInt16			GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;
     virtual void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16
&rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const;



Mime
View raw message