openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1543021 [9/29] - in /openoffice/branches/rejuvenate01: ./ main/ main/accessibility/inc/accessibility/extended/ main/accessibility/inc/accessibility/helper/ main/accessibility/inc/accessibility/standard/ main/accessibility/source/extended/ ...
Date Mon, 18 Nov 2013 12:54:10 GMT
Modified: openoffice/branches/rejuvenate01/main/scp2/source/ooo/module_hidden_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/scp2/source/ooo/module_hidden_ooo.scp?rev=1543021&r1=1543020&r2=1543021&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/scp2/source/ooo/module_hidden_ooo.scp (original)
+++ openoffice/branches/rejuvenate01/main/scp2/source/ooo/module_hidden_ooo.scp Mon Nov 18 12:53:58 2013
@@ -388,6 +388,8 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Stdc_3,
 	gid_File_Lib_Stdc_5,
 	gid_File_Lib_Accessbridge,
+	gid_File_Lib_Winaccessibility,
+	gid_File_Lib_UAccCOM,
 	gid_File_Lib_Ado,
 	gid_File_Lib_Dl,
 	gid_File_Lib_Dnd,

Modified: openoffice/branches/rejuvenate01/main/scp2/source/ooo/ure.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/scp2/source/ooo/ure.scp?rev=1543021&r1=1543020&r2=1543021&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/scp2/source/ooo/ure.scp (original)
+++ openoffice/branches/rejuvenate01/main/scp2/source/ooo/ure.scp Mon Nov 18 12:53:58 2013
@@ -66,7 +66,6 @@ File gid_File_Exe_Uno
 //    Dir = gid_Dir_Ure_Bin;
     Name = EXENAME(uno);
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "C66A9E2B-B16D-46A9-B9EC-772D9D3837F5";
 End
 #endif
 
@@ -91,7 +90,6 @@ File gid_File_Exe_Regcomp
 //    Dir = gid_Dir_Ure_Bin;
     Name = EXENAME(regcomp);
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "D51FA672-7C24-4E24-A282-872C4BF690A1";
 End
 #endif
 
@@ -119,7 +117,6 @@ File gid_File_Exe_Regmerge
 //    Dir = gid_Dir_Ure_Bin;
     Name = EXENAME(regmerge);
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "881BCC1D-BA4A-4527-9C7D-D89157C2D03B";
 End
 
 File gid_File_Exe_Regview
@@ -132,7 +129,6 @@ File gid_File_Exe_Regview
 //    Dir = gid_Dir_Ure_Bin;
     Name = EXENAME(regview);
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "DAB09DCD-8491-4DC8-B153-2BA81A830AC2";
 End
 
 #if !defined MACOSX && !defined WNT && defined SOLAR_JAVA && !defined OS2
@@ -142,7 +138,6 @@ File gid_File_Exe_Javaldx
 //    Dir = gid_Dir_Ure_Bin;
     Name = EXENAME(javaldx);
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "291B5981-3E41-40E2-9C3F-115A7DF1C6A1";
 End
 #endif
 
@@ -159,7 +154,6 @@ File gid_File_Exe_StartupSh
 //    Dir = gid_Dir_Ure_Bin;
     Name = "/ure/startup.sh";
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "C86E816A-4EAE-47E9-BD1F-3E23C80F4EAE";
 End
 #endif
 
@@ -174,7 +168,6 @@ File gid_File_Exe_UnoBin
 //    Dir = gid_Dir_Ure_Bin;
     Name = "uno.bin";
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "4AE33B3E-B33E-4BA4-AADC-8D7ED303FDE9";
 End
 #endif
 
@@ -189,7 +182,6 @@ File gid_File_Exe_RegcompBin
 //    Dir = gid_Dir_Ure_Bin;
     Name = "regcomp.bin";
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "70FBE546-A228-455F-BCBB-716BF03AD5C6";
 End
 #endif
 
@@ -200,7 +192,6 @@ File gid_File_Dl_Cppu
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_UNO_VER("cppu", "3");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "36C01AC6-BB0A-4181-A8B8-50B793ADEDB7";
 End
 
 File gid_File_Dl_Cppuhelper
@@ -212,7 +203,6 @@ File gid_File_Dl_Cppuhelper
     Name = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "D2A191E6-2023-41F5-9032-B98C50C37964";
 End
 
 File gid_File_Dl_PurpEnvHelper
@@ -224,7 +214,6 @@ File gid_File_Dl_PurpEnvHelper
     Name = SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "C80146A8-A14C-44D1-AB9F-D9D8BF22277E";
 End
 
 File gid_File_Dl_Sal
@@ -232,7 +221,6 @@ File gid_File_Dl_Sal
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_UNO_VER("sal", "3");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "B1EF3AB6-611E-4027-958A-736583EB82E6";
 End
 
 File gid_File_Dl_Salhelper
@@ -244,25 +232,15 @@ File gid_File_Dl_Salhelper
     Name = SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "879B80E0-F6E1-4931-8EE6-7CF867CB6AA5";
 End
 
 // Private Dynamic Libraries:
 
-//File gid_File_Dl_Profile_Uno
-//    TXT_FILE_BODY;
-//    Dir = SCP2_URE_DL_DIR;
-//    Name = PROFILENAME(/ure/uno);
-//    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-//    // CompID = "4681F5C1-8F64-486F-B804-03B4D8CEB41F";
-//End
-
 File gid_File_Dl_Reg
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_VER("reg", "3");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "D5313B1F-D09F-401F-B180-891F70D489ED";
 End
 
 File gid_File_Dl_Store
@@ -270,7 +248,6 @@ File gid_File_Dl_Store
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_VER("store", "3");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "A5477BD7-89A3-44AF-8B42-9E28D55C8066";
 End
 
 File gid_File_Dl_Xmlreader
@@ -293,7 +270,6 @@ File gid_File_Dl_Jvmaccess
     Name = SCP2_URE_DL_COMID_VER("jvmaccess", "3");
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "F3D6F794-DA6F-4522-B3A7-C15593C1A577";
 End
 
 File gid_File_Dl_Jvmfwk
@@ -301,7 +277,6 @@ File gid_File_Dl_Jvmfwk
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_VER("jvmfwk", "3");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "4E128F82-FA30-4077-88DC-F745C3330093";
 End
 
 #if defined SOLAR_JAVA
@@ -314,7 +289,6 @@ File gid_File_Dl_Sunjavaplugin
     Name = SCP2_URE_DL_BARE("sunjavaplugin");
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "0AC6C688-876C-40C5-B24E-9257003FDC3E";
 End
 #endif
 
@@ -324,7 +298,6 @@ File gid_File_Dl_JrepropertiesClass
     Dir = SCP2_URE_DL_DIR;
     Name = "JREProperties.class";
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "0C4B8DCF-18D1-47D9-8BB7-A5C1D9268016";
 End
 #endif
 
@@ -333,7 +306,6 @@ File gid_File_Dl_Profile_Jvmfwk3rc
     Dir = SCP2_URE_DL_DIR;
     Name = PROFILENAME(/ure/jvmfwk3);
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "1124A984-F905-47DC-ACEF-EDEC037F9B38";
 End
 
 File gid_File_Dl_ComnameUno
@@ -341,7 +313,6 @@ File gid_File_Dl_ComnameUno
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_NORMAL(STRING(COMNAME) "_uno");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "3FAFBDCB-96FE-4D9E-B655-CA86FE674711";
 End
 
 #if defined SOLAR_JAVA
@@ -350,7 +321,6 @@ File gid_File_Dl_JavaUno
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_NORMAL("java_uno");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "5425A018-DAFD-4BC6-A550-377C899DC98A";
 End
 #endif
 
@@ -372,7 +342,6 @@ File gid_File_Dl_UnsafeUnoUno
     Name = SCP2_URE_DL_NORMAL("unsafe_uno_uno");
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "74C2909A-FDCF-430A-B0F4-CA6D15690D76";
 End
 
 File gid_File_Dl_AffineUnoUno
@@ -384,7 +353,6 @@ File gid_File_Dl_AffineUnoUno
     Name = SCP2_URE_DL_NORMAL("affine_uno_uno");
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "CF542EC3-7A51-4EAA-8480-65D5E8906D05";
 End
 
 File gid_File_Dl_LogUnoUno
@@ -614,7 +582,6 @@ File gid_File_Dl_Jpipe
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_JDL_NORMAL("jpipe");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "B1A60DD4-51D7-4898-B899-9BD05DE2DA8F";
 End
 #endif
 
@@ -633,7 +600,6 @@ File gid_File_Dl_Juh
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_NORMAL("juh");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "1A001FB0-C469-4517-A3D1-3FA56AD607AF";
 End
 #endif
 
@@ -643,7 +609,6 @@ File gid_File_Dl_Juhx
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_NORMAL("juhx");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "B152234F-A46A-40BE-B632-48F35A33A29A";
 End
 #endif
 
@@ -656,7 +621,6 @@ File gid_File_Dl_Acceptor
     Name = SCP2_URE_DL_BARE("acceptor.uno");
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "31183C51-C9A4-4D7A-A2F4-103252E1FEB0";
 End
 
 File gid_File_Dl_Binaryurp
@@ -679,7 +643,6 @@ File gid_File_Dl_Bootstrap
     Name = SCP2_URE_DL_BARE("bootstrap.uno");
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "2620B307-25DB-498F-B2B8-46D928165331";
 End
 
 File gid_File_Dl_Connector
@@ -691,7 +654,6 @@ File gid_File_Dl_Connector
     Name = SCP2_URE_DL_BARE("connector.uno");
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "EBCE77E7-E244-40F6-96E2-5319D6571C5D";
 End
 
 File gid_File_Dl_Introspection
@@ -703,7 +665,6 @@ File gid_File_Dl_Introspection
     Name = SCP2_URE_DL_BARE("introspection.uno");
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "E99960CF-FE59-4332-A2AC-47418C3A17C1";
 End
 
 File gid_File_Dl_Invocadapt
@@ -715,7 +676,6 @@ File gid_File_Dl_Invocadapt
     Name = SCP2_URE_DL_BARE("invocadapt.uno");
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "77DDC112-1994-49D5-A086-FB16D4328AB9";
 End
 
 File gid_File_Dl_Invocation
@@ -727,7 +687,6 @@ File gid_File_Dl_Invocation
     Name = SCP2_URE_DL_BARE("invocation.uno");
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "A79ACB80-DA65-47CA-81BA-7CD9E191C84C";
 End
 
 
@@ -741,7 +700,6 @@ File gid_File_Dl_Javaloader
     Name = SCP2_URE_DL_BARE("javaloader.uno");
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "19A20968-E654-4E2C-9F58-7B66F07CA346";
 End
 #endif
 
@@ -755,7 +713,6 @@ File gid_File_Dl_Javavm
     Name = SCP2_URE_DL_BARE("javavm.uno");
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "F1266B2B-80AD-4248-A921-9161759FA4DA";
 End
 #endif
 
@@ -768,7 +725,6 @@ File gid_File_Dl_Namingservice
     Name = SCP2_URE_DL_BARE("namingservice.uno");
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "DD22BE3A-AD21-447D-B3A3-89B0FCDB0B31";
 End
 
 File gid_File_Dl_Stocservices
@@ -780,7 +736,6 @@ File gid_File_Dl_Stocservices
     Name = SCP2_URE_DL_BARE("stocservices.uno");
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "EBF6BBDE-EC50-4FB8-A0D4-BEC58F1C8C07";
 End
 
 File gid_File_Dl_Proxyfac
@@ -792,7 +747,6 @@ File gid_File_Dl_Proxyfac
     Name = SCP2_URE_DL_BARE("proxyfac.uno");
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "A2CDDEC3-B9C7-48C9-AB35-65008777BC2F";
 End
 
 File gid_File_Dl_Reflection
@@ -804,7 +758,6 @@ File gid_File_Dl_Reflection
     Name = SCP2_URE_DL_BARE("reflection.uno");
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "601C7946-CFEB-4F56-9429-6D5963188DF3";
 End
 
 File gid_File_Dl_Streams
@@ -816,7 +769,6 @@ File gid_File_Dl_Streams
     Name = SCP2_URE_DL_BARE("streams.uno");
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "6028CF43-A9B7-40A8-8216-509CAB256A2B";
 End
 
 File gid_File_Dl_Textinstream
@@ -828,7 +780,6 @@ File gid_File_Dl_Textinstream
     Name = SCP2_URE_DL_BARE("textinstream.uno");
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "DAA39D01-D9C5-40C4-94EC-9E4B2F94EABA";
 End
 
 File gid_File_Dl_Textoutstream
@@ -840,7 +791,6 @@ File gid_File_Dl_Textoutstream
     Name = SCP2_URE_DL_BARE("textoutstream.uno");
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "DD01EB0C-A119-43AE-9100-F7A595D099E4";
 End
 
 File gid_File_Dl_Uuresolver
@@ -852,7 +802,6 @@ File gid_File_Dl_Uuresolver
     Name = SCP2_URE_DL_BARE("uuresolver.uno");
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "377090E1-5008-424F-B0F6-A9EFC9F11206";
 End
 
 #if !defined SYSTEM_LIBXML
@@ -871,7 +820,6 @@ File gid_File_Dl_Libxml2
     Name = SCP2_URE_DL_VER("xml2", "2");
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "BE6FAD97-F84C-43E3-8392-6FE2CDA04D8E";
 End
 #endif
 
@@ -912,7 +860,6 @@ File gid_File_Dl_Stlport
 #error "stlport dynamic library: unsupported platform"
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "D976338D-D2A5-4D29-B765-D3AC43181C7F";
 End
 #endif
 
@@ -923,7 +870,6 @@ File gid_File_Dl_GccS
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_VER("gcc_s", STRING(SHORTSTDC3));
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "C601D04B-2194-4F1B-BB09-7B4930D6E1DB";
 End
 #endif
 
@@ -934,7 +880,6 @@ File gid_File_Dl_Stdcpp
     TXT_FILE_BODY;
     Name = SCP2_URE_DL_VER("stdc++", STRING(SHORTSTDCPP3));
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "89740D6A-38EE-41AF-A6A2-A8F7ABBE4996";
 End
 #endif
 
@@ -944,7 +889,6 @@ File gid_File_Lib_Mingwm10_Ure
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_NORMAL("mingwm10");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "601FEC1D-8665-4476-9911-83BDCCE83025";
 End
 #endif
 
@@ -980,7 +924,6 @@ File gid_File_Dl_Uwinapi
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_NORMAL("uwinapi");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "EABC9FE3-B296-430F-8513-A3617FFB630D";
 End
 #endif
 
@@ -992,7 +935,6 @@ File gid_File_Java_UnoloaderJar
     Dir = gid_Dir_Ure_Java;
     Name = "unoloader.jar";
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "90F99ED3-814C-4B45-894B-D9248848CEB4";
 End
 #endif
 
@@ -1002,7 +944,6 @@ File gid_File_Java_JuhJar
     Dir = gid_Dir_Ure_Java;
     Name = "juh.jar";
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "E77CC8B5-0345-4B7F-ABED-5EB9DC94E492";
 End
 #endif
 
@@ -1012,7 +953,6 @@ File gid_File_Java_JurtJar
     Dir = gid_Dir_Ure_Java;
     Name = "jurt.jar";
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "EA63EDCC-9152-4560-AB7A-BFC367442E50";
 End
 #endif
 
@@ -1022,7 +962,6 @@ File gid_File_Java_RidlJar
     Dir = gid_Dir_Ure_Java;
     Name = "ridl.jar";
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "4A915C83-6BE3-41B9-BAF9-13AA27034955";
 End
 #endif
 
@@ -1034,7 +973,6 @@ File gid_File_Java_JavaUnoJar
     Dir = gid_Dir_Ure_Java;
     Name = "java_uno.jar";
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "ABDC8DDA-5D2B-424C-ABD8-FD22D59658FE";
 End
 #endif
 
@@ -1050,18 +988,9 @@ File gid_File_Misc_JavavendorsXml
 #endif
     Name = "javavendors.xml";
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "403FCCFE-545B-44F6-91D1-5C75F846E587";
 End
 #endif
 
-//#if defined MACOSX
-//Unixlink gid_Unixlink_Ure_Bin_Urelibs
-//    Dir = gid_Dir_Ure_Bin;
-//    Name = "urelibs";
-//    Target = "../lib";
-//End
-//#endif
-
 //Module
 
 Module gid_Module_Root_Ure_Hidden

Modified: openoffice/branches/rejuvenate01/main/sd/inc/drawdoc.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/inc/drawdoc.hxx?rev=1543021&r1=1543020&r2=1543021&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/inc/drawdoc.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/inc/drawdoc.hxx Mon Nov 18 12:53:58 2013
@@ -157,6 +157,18 @@ namespace sd
 class SdDrawDocument : public FmFormModel
 {
 private:
+//IAccessibility2 Implementation 2009-----
+	String msDocAccTitle;
+public:
+	virtual void setDocAccTitle( const String& rTitle ) { msDocAccTitle = rTitle; }
+	virtual const String getDocAccTitle() const { return msDocAccTitle; }
+private:	
+	sal_Bool bReadOnly;
+public:
+	virtual void setDocReadOnly( sal_Bool b){ bReadOnly = b; }
+	virtual sal_Bool getDocReadOnly() const { return bReadOnly; }
+private:
+//IAccessibility2 Implementation 2009-----
 	::sd::Outliner*		mpOutliner;		    // local outliner for outline mode
 	::sd::Outliner*		mpInternalOutliner;  // internal outliner for creation of text objects
 	Timer*			    mpWorkStartupTimer;
@@ -671,6 +683,9 @@ private:
 	// #109538#
 	virtual void PageListChanged();
 	virtual void MasterPageListChanged();
+//IAccessibility2 Implementation 2009-----
+	virtual ImageMap* GetImageMapForObject(SdrObject* pObj);
+//-----IAccessibility2 Implementation 2009
 };
 
 namespace sd

Modified: openoffice/branches/rejuvenate01/main/sd/inc/glob.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/inc/glob.hxx?rev=1543021&r1=1543020&r2=1543021&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/inc/glob.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/inc/glob.hxx Mon Nov 18 12:53:58 2013
@@ -38,6 +38,9 @@
 #define SD_IF_SDDRAWDOCSHELL            SFX_INTERFACE_SD_START + 1
 #define SD_IF_SDVIEWSHELL               SFX_INTERFACE_SD_START + 2
 #define SD_IF_SDDRAWVIEWSHELL           SFX_INTERFACE_SD_START + 3
+//IAccessibility2 Implementation 2009-----
+#define SD_IF_SDSLIDEVIEWSHELL          SFX_INTERFACE_SD_START + 4
+//-----IAccessibility2 Implementation 2009
 #define SD_IF_SDOUTLINEVIEWSHELL        SFX_INTERFACE_SD_START + 5
 #define SD_IF_SDDRAWSTDOBJECTBAR        SFX_INTERFACE_SD_START + 6
 #define SD_IF_SDDRAWTEXTOBJECTBAR       SFX_INTERFACE_SD_START + 7

Modified: openoffice/branches/rejuvenate01/main/sd/source/core/drawdoc.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/core/drawdoc.cxx?rev=1543021&r1=1543020&r2=1543021&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/core/drawdoc.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/core/drawdoc.cxx Mon Nov 18 12:53:58 2013
@@ -148,6 +148,7 @@ PresentationSettings::PresentationSettin
 
 SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
 : FmFormModel( SvtPathOptions().GetPalettePath(), NULL, pDrDocSh )
+, bReadOnly(sal_False)
 , mpOutliner(NULL)
 , mpInternalOutliner(NULL)
 , mpWorkStartupTimer(NULL)

Modified: openoffice/branches/rejuvenate01/main/sd/source/core/drawdoc2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/core/drawdoc2.cxx?rev=1543021&r1=1543020&r2=1543021&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/core/drawdoc2.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/core/drawdoc2.cxx Mon Nov 18 12:53:58 2013
@@ -1198,6 +1198,17 @@ IMapObject* SdDrawDocument::GetHitIMapOb
 	return pIMapObj;
 }
 
+//IAccessibility2 Implementation 2009-----
+ImageMap* SdDrawDocument::GetImageMapForObject(SdrObject* pObj)
+{
+	SdIMapInfo* pIMapInfo = GetIMapInfo( pObj );
+	if ( pIMapInfo )
+	{
+		return const_cast<ImageMap*>( &(pIMapInfo->GetImageMap()) );
+	}
+	return NULL;
+}
+//-----IAccessibility2 Implementation 2009
 /** this method enforces that the masterpages are in the currect order,
 	that is at position 1 is a PK_STANDARD masterpage followed by a
 	PK_NOTES masterpage and so on. #

Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx?rev=1543021&r1=1543020&r2=1543021&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx Mon Nov 18 12:53:58 2013
@@ -37,7 +37,10 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <rtl/ustring.h>
 #include<sfx2/viewfrm.hxx>
-
+//IAccessibility2 Implementation 2009-----
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <sfx2/objsh.hxx>
+//-----IAccessibility2 Implementation 2009
 #include <svx/AccessibleShape.hxx>
 
 #include <svx/svdobj.hxx>
@@ -46,8 +49,16 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include "Window.hxx"
 #include <vcl/svapp.hxx>
+//IAccessibility2 Implementation 2009-----
+#include "OutlineViewShell.hxx"
 
+#include "SlideViewShell.hxx"
 
+#include <svx/svdlayer.hxx>
+#include <editeng/editobj.hxx>
+#include "LayerTabBar.hxx"
+#include <svtools/colorcfg.hxx>
+//-----IAccessibility2 Implementation 2009
 #include "ViewShell.hxx"
 #include "View.hxx"
 #include <memory>
@@ -88,6 +99,9 @@ AccessibleDocumentViewBase::AccessibleDo
     maShapeTreeInfo.SetViewForwarder (&maViewForwarder);
 
     mxWindow = ::VCLUnoHelper::GetInterface (pSdWindow);
+//IAccessibility2 Implementation 2009-----
+	mpViewShell = pViewShell;
+//-----IAccessibility2 Implementation 2009
 }
 
 
@@ -159,6 +173,11 @@ void AccessibleDocumentViewBase::Init (v
             }
         }
     }
+//IAccessibility2 Implementation 2009-----
+	SfxObjectShell* pObjShell = mpViewShell->GetViewFrame()->GetObjectShell();
+	if(!pObjShell->IsReadOnly())
+		SetState(AccessibleStateType::EDITABLE);
+//-----IAccessibility2 Implementation 2009
 }
 
 
@@ -434,6 +453,10 @@ uno::Any SAL_CALL
             static_cast<beans::XPropertyChangeListener*>(this),
             static_cast<awt::XWindowListener*>(this),
             static_cast<awt::XFocusListener*>(this)
+//IAccessibility2 Implementation 2009-----
+		   ,static_cast<XAccessibleExtendedAttributes*>(this)
+		   ,static_cast<XAccessibleGetAccFlowTo*>(this)
+//-----IAccessibility2 Implementation 2009
             );
     return aReturn;
 }
@@ -835,4 +858,150 @@ void
 {
 }
 
+//IAccessibility2 Implementation 2009-----
+uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes() 
+		throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) 
+{
+	uno::Any anyAtrribute;
+	rtl::OUString sValue;
+	if (mpViewShell && mpViewShell->ISA(::sd::DrawViewShell))
+	{
+		::sd::DrawViewShell* pDrViewSh = (::sd::DrawViewShell*) mpViewShell;
+		rtl::OUString sName;
+		String sDisplay;
+			sName = rtl::OUString::createFromAscii("page-name:");
+			// MT IA2: Not used...
+			// SdPage*	pCurrPge = pDrViewSh->getCurrentPage();
+			SdDrawDocument* pDoc = pDrViewSh->GetDoc();
+			sDisplay = pDrViewSh->getCurrentPage()->GetName();
+			sDisplay.SearchAndReplace( String::CreateFromAscii( "\\" ), String::CreateFromAscii("\\\\" ));
+			sDisplay.SearchAndReplace( String::CreateFromAscii( "=" ), String::CreateFromAscii("\\=" ) );
+			sDisplay.SearchAndReplace( String::CreateFromAscii( ";" ), String::CreateFromAscii("\\;" ) );
+			sDisplay.SearchAndReplace( String::CreateFromAscii( "," ), String::CreateFromAscii("\\," ) );
+			sDisplay.SearchAndReplace( String::CreateFromAscii( ":" ), String::CreateFromAscii("\\:" ) );
+			sValue = sName + sDisplay ;
+			sName = rtl::OUString::createFromAscii(";page-number:");
+			sValue += sName;
+			sValue += String::CreateFromInt32((sal_Int16)((sal_uInt16)((pDrViewSh->getCurrentPage()->GetPageNum()-1)>>1) + 1)) ;
+			sName = rtl::OUString::createFromAscii(";total-pages:");
+			sValue += sName;
+			sValue += String::CreateFromInt32(pDrViewSh->GetPageTabControl()->GetPageCount()) ;
+			sValue +=  rtl::OUString::createFromAscii(";");
+		if(pDrViewSh->IsLayerModeActive() )
+		{
+			sName = rtl::OUString::createFromAscii("page-name:");
+			sValue = sName;
+			sDisplay = pDrViewSh->GetLayerTabControl()->GetPageText(pDrViewSh->GetLayerTabControl()->GetCurPageId());
+			if( pDoc )
+			{
+				SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
+				SdrLayer* aSdrLayer = rLayerAdmin.GetLayer(sDisplay, sal_False);
+				if( aSdrLayer )
+				{
+					String layerAltText = aSdrLayer->GetTitle();
+					if(  layerAltText.Len() > 0)
+					{
+						sName = rtl::OUString::createFromAscii(" ");
+						sDisplay = sDisplay + sName; 
+						sDisplay += layerAltText;
+					}
+				}
+			}
+			sDisplay.SearchAndReplace( String::CreateFromAscii( "\\" ), String::CreateFromAscii("\\\\" ));
+			sDisplay.SearchAndReplace( String::CreateFromAscii( "=" ), String::CreateFromAscii("\\=" ));
+			sDisplay.SearchAndReplace( String::CreateFromAscii( ";" ), String::CreateFromAscii("\\;" ));
+			sDisplay.SearchAndReplace( String::CreateFromAscii( "," ), String::CreateFromAscii("\\," ));
+			sDisplay.SearchAndReplace( String::CreateFromAscii( ":" ), String::CreateFromAscii("\\:" ));
+			sValue +=  sDisplay;
+			sName = rtl::OUString::createFromAscii(";page-number:");
+			sValue += sName;
+			sValue += String::CreateFromInt32(pDrViewSh->GetActiveTabLayerIndex()+1) ;
+			sName = rtl::OUString::createFromAscii(";total-pages:");
+			sValue += sName;
+			sValue += String::CreateFromInt32(pDrViewSh->GetLayerTabControl()->GetPageCount()) ;
+			sValue +=  rtl::OUString::createFromAscii(";");
+		}
+	}	
+	if (mpViewShell && mpViewShell->ISA(::sd::PresentationViewShell))
+	{
+		::sd::PresentationViewShell* pPresViewSh = (::sd::PresentationViewShell*) mpViewShell;
+		SdPage*	pCurrPge = pPresViewSh->getCurrentPage();
+		SdDrawDocument* pDoc = pPresViewSh->GetDoc();
+		SdPage*	pNotesPge = (SdPage*)pDoc->GetSdPage((pCurrPge->GetPageNum()-1)>>1, PK_NOTES);
+		if (pNotesPge)
+		{
+			SdrObject* pNotesObj = pNotesPge->GetPresObj(PRESOBJ_NOTES);
+			if (pNotesObj)
+			{
+				OutlinerParaObject* pPara = pNotesObj->GetOutlinerParaObject();
+				if (pPara)
+				{
+					sValue += rtl::OUString::createFromAscii("note:");
+					const EditTextObject& rEdit = pPara->GetTextObject();
+					for (sal_uInt16 i=0;i<rEdit.GetParagraphCount();i++)
+					{
+						String strNote = rEdit.GetText(i);
+						strNote.SearchAndReplace( String::CreateFromAscii( "\\" ), String::CreateFromAscii("\\\\" ));
+						strNote.SearchAndReplace( String::CreateFromAscii( "=" ), String::CreateFromAscii("\\=" ));
+						strNote.SearchAndReplace( String::CreateFromAscii( ";" ), String::CreateFromAscii("\\;" ));
+						strNote.SearchAndReplace( String::CreateFromAscii( "," ), String::CreateFromAscii("\\," ));
+						strNote.SearchAndReplace( String::CreateFromAscii( ":" ), String::CreateFromAscii("\\:" ));
+						sValue += rtl::OUString( strNote );
+						sValue += rtl::OUString::createFromAscii(";");//to divide each paragraph
+					}
+				}
+			}
+		}
+	}
+	if (mpViewShell && mpViewShell->ISA(::sd::OutlineViewShell) )
+	{
+		rtl::OUString sName;
+		String sDisplay;
+		SdPage*	pCurrPge = mpViewShell->GetActualPage();
+		SdDrawDocument* pDoc = mpViewShell->GetDoc();
+		if(pCurrPge && pDoc)
+		{
+			sName = rtl::OUString::createFromAscii("page-name:");
+			sDisplay = pCurrPge->GetName();
+			sDisplay.SearchAndReplace( String::CreateFromAscii( "=" ), String::CreateFromAscii("\\=" ) );
+			sDisplay.SearchAndReplace( String::CreateFromAscii( ";" ), String::CreateFromAscii("\\;" ) );
+			sDisplay.SearchAndReplace( String::CreateFromAscii( "," ), String::CreateFromAscii("\\," ) );
+			sDisplay.SearchAndReplace( String::CreateFromAscii( ":" ), String::CreateFromAscii("\\:" ) );
+			sValue = sName + sDisplay ;
+			sName = rtl::OUString::createFromAscii(";page-number:");
+			sValue += sName;
+			sValue += String::CreateFromInt32((sal_Int16)((sal_uInt16)((pCurrPge->GetPageNum()-1)>>1) + 1)) ;
+			sName = rtl::OUString::createFromAscii(";total-pages:");
+			sValue += sName;
+			sValue += String::CreateFromInt32(pDoc->GetSdPageCount(PK_STANDARD)) ;
+			sValue +=  rtl::OUString::createFromAscii(";");
+		}
+	}	
+	if (sValue.getLength())
+		anyAtrribute <<= sValue;
+	return anyAtrribute;	
+}
+::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
+		SAL_CALL AccessibleDocumentViewBase::get_AccFlowTo(const ::com::sun::star::uno::Any&, sal_Int32 )
+		throw ( ::com::sun::star::uno::RuntimeException )
+{
+	::com::sun::star::uno::Sequence< uno::Any> aRet;
+
+	return aRet;
+}
+
+sal_Int32 SAL_CALL AccessibleDocumentViewBase::getForeground(  )
+        throw (uno::RuntimeException)
+{
+    return COL_BLACK;
+}
+
+sal_Int32 SAL_CALL AccessibleDocumentViewBase::getBackground(  )
+        throw (uno::RuntimeException)
+{
+	 ThrowIfDisposed ();
+    ::osl::MutexGuard aGuard (maMutex);
+    return mpViewShell->GetView()->getColorConfig().GetColorValue( ::svtools::DOCCOLOR ).nColor;
+}
+//-----IAccessibility2 Implementation 2009
 } // end of namespace accessibility

Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx?rev=1543021&r1=1543020&r2=1543021&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx Mon Nov 18 12:53:58 2013
@@ -52,6 +52,14 @@
 
 #include "ViewShell.hxx"
 #include "View.hxx"
+//IAccessibility2 Implementation 2009-----
+#include "DrawDocShell.hxx"
+#include <drawdoc.hxx>
+#include <algorithm>
+#include "sdpage.hxx"
+#include "slideshow.hxx"
+#include "anminfo.hxx"
+//-----IAccessibility2 Implementation 2009
 #include <memory>
 
 #include "accessibility.hrc"
@@ -70,6 +78,22 @@ class SfxViewFrame;
 namespace accessibility {
 
 
+//IAccessibility2 Implementation 2009-----
+struct XShapePosCompareHelper
+{
+	bool operator() ( const uno::Reference<drawing::XShape>& xshape1, 
+		const uno::Reference<drawing::XShape>& xshape2 ) const
+	{
+		// modify the compare method to return the Z-Order, not layout order
+		SdrObject* pObj1 = GetSdrObjectFromXShape(xshape1);
+		SdrObject* pObj2 = GetSdrObjectFromXShape(xshape2);		
+		if(pObj1 && pObj2)
+			return pObj1->GetOrdNum() < pObj2->GetOrdNum();
+		else
+			return 0;
+	}
+};
+//-----IAccessibility2 Implementation 2009
 //=====  internal  ============================================================
 
 AccessibleDrawDocumentView::AccessibleDrawDocumentView (
@@ -78,6 +102,7 @@ AccessibleDrawDocumentView::AccessibleDr
     const uno::Reference<frame::XController>& rxController,
     const uno::Reference<XAccessible>& rxParent)
     : AccessibleDocumentViewBase (pSdWindow, pViewShell, rxController, rxParent),
+      mpSdViewSh( pViewShell ),
       mpChildrenManager (NULL)
 {
     OSL_TRACE ("AccessibleDrawDocumentView");
@@ -260,9 +285,44 @@ uno::Reference<XAccessible> SAL_CALL
             static_cast<uno::XWeak*>(this));
 }
 
+//IAccessibility2 Implementation 2009-----
+OUString SAL_CALL
+	AccessibleDrawDocumentView::getAccessibleName(void)
+	throw (::com::sun::star::uno::RuntimeException)
+{
+	OUString sName = String( SdResId(SID_SD_A11Y_D_PRESENTATION) );
+	::sd::View* pSdView = static_cast< ::sd::View* >( maShapeTreeInfo.GetSdrView() );
+	if ( pSdView )
+	{
+		SdDrawDocument* pDoc = pSdView->GetDoc();
+		if ( pDoc )
+		{
+			rtl::OUString sFileName = pDoc->getDocAccTitle();
+			if ( !sFileName.getLength() )
+			{
+				::sd::DrawDocShell* pDocSh = pSdView->GetDocSh();
+				if ( pDocSh )
+				{
+					sFileName = pDocSh->GetTitle( SFX_TITLE_APINAME );
+				}			
+			}
+
+			OUString sReadOnly;
+			if(pDoc->getDocReadOnly())
+			{				
+				sReadOnly = String(SdResId(SID_SD_A11Y_D_PRESENTATION_READONLY));				
+			}
+
+			if ( sFileName.getLength() )
+			{
+				sName = sFileName + sReadOnly + OUString(RTL_CONSTASCII_USTRINGPARAM(" - ")) + sName;
+			}			
+		}
+	}
 
-
-
+	return sName;
+}
+//-----IAccessibility2 Implementation 2009
 //=====  XEventListener  ======================================================
 
 void SAL_CALL
@@ -295,7 +355,9 @@ void SAL_CALL
     AccessibleDocumentViewBase::propertyChange (rEventObject);
 
     OSL_TRACE ("AccessibleDrawDocumentView::propertyChange");
-    if (rEventObject.PropertyName == OUString (RTL_CONSTASCII_USTRINGPARAM("CurrentPage")))
+    // add page switch event for slide show mode
+    if (rEventObject.PropertyName == OUString (RTL_CONSTASCII_USTRINGPARAM("CurrentPage")) ||
+		rEventObject.PropertyName == OUString (RTL_CONSTASCII_USTRINGPARAM("PageChange")) )
     {
         OSL_TRACE ("    current page changed");
 
@@ -329,6 +391,9 @@ void SAL_CALL
         }
         else
             OSL_TRACE ("View invalid");
+//IAccessibility2 Implementation 2009-----
+		CommitChange(AccessibleEventId::PAGE_CHANGED,rEventObject.NewValue,rEventObject.OldValue);
+//-----IAccessibility2 Implementation 2009
     }
     else if (rEventObject.PropertyName == OUString (RTL_CONSTASCII_USTRINGPARAM("VisibleArea")))
     {
@@ -338,6 +403,59 @@ void SAL_CALL
                 IAccessibleViewForwarderListener::VISIBLE_AREA, 
                 &maViewForwarder);
     }
+//IAccessibility2 Implementation 2009-----
+	else if (rEventObject.PropertyName == OUString (RTL_CONSTASCII_USTRINGPARAM("ActiveLayer")))
+	{
+		CommitChange(AccessibleEventId::PAGE_CHANGED,rEventObject.NewValue,rEventObject.OldValue);
+	}
+    else if (rEventObject.PropertyName == OUString (RTL_CONSTASCII_USTRINGPARAM("UpdateAcc")))
+    {
+        OSL_TRACE ("    acc on current page should be updated");
+
+        // The current page changed.  Update the children manager accordingly.
+        uno::Reference<drawing::XDrawView> xView (mxController, uno::UNO_QUERY);
+        if (xView.is() && mpChildrenManager!=NULL)
+        {
+            // Inform the children manager to forget all children and give
+            // him the new ones.
+            mpChildrenManager->ClearAccessibleShapeList ();
+			// update the slide show page's accessible info
+            //mpChildrenManager->SetShapeList (uno::Reference<drawing::XShapes> (
+            //    xView->getCurrentPage(), uno::UNO_QUERY));
+	    rtl::Reference< sd::SlideShow > xSlideshow( sd::SlideShow::GetSlideShow( mpSdViewSh->GetViewShellBase() ) );
+	    if( xSlideshow.is() && xSlideshow->isRunning() && xSlideshow->isFullScreen() )
+	    {
+		    ::com::sun::star::uno::Reference< drawing::XDrawPage > xSlide;
+			// MT IA2: Not used...
+			// sal_Int32 currentPageIndex = xSlideshow->getCurrentPageIndex();
+			::com::sun::star::uno::Reference< ::com::sun::star::presentation::XSlideShowController > mpSlideController = xSlideshow->getController();
+			if( mpSlideController.is() )
+			{
+				xSlide = mpSlideController->getCurrentSlide();
+				if (xSlide.is())
+				{
+					mpChildrenManager->SetShapeList (uno::Reference<drawing::XShapes> (
+				                xSlide, uno::UNO_QUERY));
+				}
+			}
+	    }			
+            // Create the page shape and initialize it.  The shape is
+            // acquired before initialization and released after
+            // transferring ownership to the children manager to prevent
+            // premature disposing of the shape.
+            AccessiblePageShape* pPage = CreateDrawPageShape ();
+            if (pPage != NULL)
+            {
+                pPage->acquire();
+                pPage->Init();
+                mpChildrenManager->AddAccessibleShape (
+                    std::auto_ptr<AccessibleShape>(pPage));
+                mpChildrenManager->Update (false);
+                pPage->release();
+            }
+	}
+    }
+//-----IAccessibility2 Implementation 2009
     else
     {
         OSL_TRACE ("  unhandled");
@@ -379,9 +497,137 @@ void SAL_CALL
     return aServiceNames;
 }
 
+//IAccessibility2 Implementation 2009-----
+//=====  XInterface  ==========================================================
+    
+uno::Any SAL_CALL
+    AccessibleDrawDocumentView::queryInterface (const uno::Type & rType)
+    throw (uno::RuntimeException)
+{
+    uno::Any aReturn = AccessibleDocumentViewBase::queryInterface (rType);
+    if ( ! aReturn.hasValue())
+        aReturn = ::cppu::queryInterface (rType,
+            static_cast<XAccessibleGroupPosition*>(this)
+            );
+    return aReturn;
+}
 
-        
-
+void SAL_CALL
+    AccessibleDrawDocumentView::acquire (void) 
+    throw ()
+{
+    AccessibleDocumentViewBase::acquire ();
+}
+void SAL_CALL
+    AccessibleDrawDocumentView::release (void)
+    throw ()
+{
+    AccessibleDocumentViewBase::release ();
+}
+//=====  XAccessibleGroupPosition  =========================================
+uno::Sequence< sal_Int32 > SAL_CALL
+    AccessibleDrawDocumentView::getGroupPosition( const uno::Any& rAny )
+    throw (uno::RuntimeException)
+{
+	// we will return the:
+	// [0] group level(always be 0 now)
+	// [1] similar items counts in the group
+	// [2] the position of the object in the group
+	uno::Sequence< sal_Int32 > aRet( 3 );
+	//get the xShape of the current selected drawing object
+	uno::Reference<XAccessibleContext> xAccContent;
+	rAny >>= xAccContent;
+	if ( !xAccContent.is() )
+	{
+		return aRet;
+	}
+	AccessibleShape* pAcc = AccessibleShape::getImplementation( xAccContent );
+	if ( !pAcc )
+	{
+		return aRet;
+	}
+	uno::Reference< drawing::XShape > xCurShape = pAcc->GetXShape();
+	if ( !xCurShape.is() )
+	{
+		return aRet;
+	}
+	//find all the child in the page, insert them into a vector and sort
+	if ( mpChildrenManager == NULL )
+	{
+		return aRet;
+	}
+	std::vector< uno::Reference<drawing::XShape> > vXShapes;
+	sal_Int32 nCount = mpChildrenManager->GetChildCount();
+	//get pointer of SdView & SdrPageView for further use.
+	SdrPageView* pPV = NULL;
+	::sd::View* pSdView = NULL;
+	if ( mpSdViewSh )
+	{
+		pSdView = mpSdViewSh->GetView();
+		pPV = pSdView->GetSdrPageView();
+	}
+	for ( sal_Int32 i = 0; i < nCount; i++ )
+	{
+		uno::Reference< drawing::XShape > xShape = mpChildrenManager->GetChildShape(i);
+		if ( xShape.is() )
+		{
+			//if the object is visable in the page, we add it into the group list.
+			SdrObject* pObj = GetSdrObjectFromXShape(xShape);
+			if ( pObj && pPV && pSdView && pSdView->IsObjMarkable( pObj, pPV ) )
+			{
+				vXShapes.push_back( xShape );
+			}
+		}
+	}
+	std::sort( vXShapes.begin(), vXShapes.end(), XShapePosCompareHelper() );
+	//get the the index of the selected object in the group
+	std::vector< uno::Reference<drawing::XShape> >::iterator aIter;
+	//we start counting position from 1
+	sal_Int32 nPos = 1;
+	for ( aIter = vXShapes.begin(); aIter != vXShapes.end(); aIter++, nPos++ )
+	{
+		if ( (*aIter).get() == xCurShape.get() )
+		{
+			sal_Int32* pArray = aRet.getArray();
+			pArray[0] = 1; //it should be 1 based, not 0 based.
+			pArray[1] = vXShapes.size();
+			pArray[2] = nPos;
+			break;
+		}
+	}
+	return aRet;
+}
+::rtl::OUString AccessibleDrawDocumentView::getObjectLink( const uno::Any& rAny )
+	throw (uno::RuntimeException)
+{
+	::rtl::OUString aRet;
+	//get the xShape of the current selected drawing object
+	uno::Reference<XAccessibleContext> xAccContent;
+	rAny >>= xAccContent;
+	if ( !xAccContent.is() )
+	{
+		return aRet;
+	}
+	AccessibleShape* pAcc = AccessibleShape::getImplementation( xAccContent );
+	if ( !pAcc )
+	{
+		return aRet;
+	}
+	uno::Reference< drawing::XShape > xCurShape = pAcc->GetXShape();
+	if ( !xCurShape.is() )
+	{
+		return aRet;
+	}
+	SdrObject* pObj = GetSdrObjectFromXShape(xCurShape);
+	if (pObj)
+	{
+		SdAnimationInfo* pInfo = SdDrawDocument::GetShapeUserData(*pObj);
+		if( pInfo && (pInfo->meClickAction == presentation::ClickAction_DOCUMENT) )
+			aRet = (::rtl::OUString)pInfo->GetBookmark();
+	}
+	return aRet;
+}
+//-----IAccessibility2 Implementation 2009
 ///	Create a name for this view.
 ::rtl::OUString
     AccessibleDrawDocumentView::CreateAccessibleName (void)
@@ -637,13 +883,25 @@ void AccessibleDrawDocumentView::Activat
 {
     if (mpChildrenManager != NULL)
     {
-        mpChildrenManager->UpdateSelection();
+//IAccessibility2 Implementation 2009-----
+        //mpChildrenManager->UpdateSelection();
+	sal_Bool bChange = sal_False;
+//-----IAccessibility2 Implementation 2009
         // When none of the children has the focus then claim it for the
         // view.
         if ( ! mpChildrenManager->HasFocus())
+	{
             SetState (AccessibleStateType::FOCUSED);
+	    bChange = sal_True;
+	}
         else
             ResetState (AccessibleStateType::FOCUSED);
+//IAccessibility2 Implementation 2009-----
+	mpChildrenManager->UpdateSelection();
+	// if the child gets focus in UpdateSelection(), needs to reset the focus on document.
+	if (mpChildrenManager->HasFocus() && bChange)
+		ResetState (AccessibleStateType::FOCUSED);
+//-----IAccessibility2 Implementation 2009
     }
 }
 
@@ -690,8 +948,158 @@ void SAL_CALL AccessibleDrawDocumentView
     AccessibleDocumentViewBase::disposing ();
 }
 
+//IAccessibility2 Implementation 2009-----
+::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
+		SAL_CALL AccessibleDrawDocumentView::get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
+		throw ( ::com::sun::star::uno::RuntimeException )
+{
+	const sal_Int32 SPELLCHECKFLOWTO = 1;
+	const sal_Int32 FINDREPLACEFLOWTO = 2;
+	if ( nType == SPELLCHECKFLOWTO )
+	{
+		uno::Reference< ::com::sun::star::drawing::XShape > xShape;
+		rAny >>= xShape;
+		if ( mpChildrenManager && xShape.is() )
+		{
+			uno::Reference < XAccessible > xAcc = mpChildrenManager->GetChild(xShape);
+			uno::Reference < XAccessibleSelection > xAccSelection( xAcc, uno::UNO_QUERY );
+			if ( xAccSelection.is() )
+			{
+				if ( xAccSelection->getSelectedAccessibleChildCount() ) 
+				{
+					uno::Reference < XAccessible > xSel = xAccSelection->getSelectedAccessibleChild( 0 );
+					if ( xSel.is() )
+					{
+						uno::Reference < XAccessibleContext > xSelContext( xSel->getAccessibleContext() );
+						if ( xSelContext.is() )
+						{
+							//if in sw we find the selected paragraph here
+							if ( xSelContext->getAccessibleRole() == AccessibleRole::PARAGRAPH )
+							{
+								uno::Sequence<uno::Any> aRet( 1 );
+								aRet[0] = uno::makeAny( xSel );
+								return aRet;							
+							}
+						}
+					}
+				}
+			}
+			uno::Reference<XAccessible> xPara = GetSelAccContextInTable();
+			if ( xPara.is() )
+			{
+				uno::Sequence<uno::Any> aRet( 1 );
+				aRet[0] = uno::makeAny( xPara );
+				return aRet;
+			}			
+		}
+		else
+		{
+			goto Rt;
+		}
+	}
+	else if ( nType == FINDREPLACEFLOWTO )
+	{
+		sal_Int32 nChildCount = getSelectedAccessibleChildCount();
+		if ( nChildCount )
+		{
+			uno::Reference < XAccessible > xSel = getSelectedAccessibleChild( 0 );
+			if ( xSel.is() )
+			{
+				uno::Reference < XAccessibleSelection > xAccChildSelection( xSel, uno::UNO_QUERY );
+				if ( xAccChildSelection.is() )
+				{
+					if ( xAccChildSelection->getSelectedAccessibleChildCount() )
+					{
+						uno::Reference < XAccessible > xChildSel = xAccChildSelection->getSelectedAccessibleChild( 0 );
+						if ( xChildSel.is() )
+						{
+							uno::Reference < XAccessibleContext > xChildSelContext( xChildSel->getAccessibleContext() );
+							if ( xChildSelContext.is() &&
+								xChildSelContext->getAccessibleRole() == AccessibleRole::PARAGRAPH )
+							{
+								uno::Sequence<uno::Any> aRet( 1 );
+								aRet[0] = uno::makeAny( xChildSel );
+								return aRet;
+							}
+						}
+					}
+				}
+			}
+		}
+		else
+		{
+			uno::Reference<XAccessible> xPara = GetSelAccContextInTable();
+			if ( xPara.is() )
+			{
+				uno::Sequence<uno::Any> aRet( 1 );
+				aRet[0] = uno::makeAny( xPara );
+				return aRet;
+			}
+		}
+	}
+	
+Rt:
+	::com::sun::star::uno::Sequence< uno::Any> aRet;
+	return aRet;
+}
+uno::Reference<XAccessible> AccessibleDrawDocumentView::GetSelAccContextInTable()
+{
+	uno::Reference<XAccessible> xRet;
+	sal_Int32 nCount = mpChildrenManager ? mpChildrenManager->GetChildCount() : 0;
+	if ( nCount )
+	{
+		for ( sal_Int32 i = 0; i < nCount; i++ )
+		{
+			try
+			{
+				uno::Reference<XAccessible> xObj = mpChildrenManager->GetChild(i);
+				if ( xObj.is() )
+				{
+					uno::Reference<XAccessibleContext> xObjContext( xObj, uno::UNO_QUERY );
+					if ( xObjContext.is() && xObjContext->getAccessibleRole() == AccessibleRole::TABLE )
+					{
+						uno::Reference<XAccessibleSelection> xObjSelection( xObj, uno::UNO_QUERY );
+						if ( xObjSelection.is() && xObjSelection->getSelectedAccessibleChildCount() )
+						{
+							uno::Reference<XAccessible> xCell = xObjSelection->getSelectedAccessibleChild(0);
+							if ( xCell.is() )
+							{
+								uno::Reference<XAccessibleSelection> xCellSel( xCell, uno::UNO_QUERY );
+								if ( xCellSel.is() && xCellSel->getSelectedAccessibleChildCount() )
+								{
+									uno::Reference<XAccessible> xPara = xCellSel->getSelectedAccessibleChild( 0 );
+									if ( xPara.is() )
+									{
+										uno::Reference<XAccessibleContext> xParaContext( xPara, uno::UNO_QUERY );
+										if ( xParaContext.is() &&
+											xParaContext->getAccessibleRole() == AccessibleRole::PARAGRAPH )
+										{
+											xRet = xPara;
+											return xRet;
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			catch ( lang::IndexOutOfBoundsException )
+			{
+				uno::Reference<XAccessible> xEmpty;
+				return xEmpty;
+			}
+			catch ( uno::RuntimeException )
+			{
+				uno::Reference<XAccessible> xEmpty;
+				return xEmpty;
+			}
+		}
+	}
 
-
+	return xRet;
+}
+//-----IAccessibility2 Implementation 2009
 
 void AccessibleDrawDocumentView::UpdateAccessibleName (void)
 {

Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx?rev=1543021&r1=1543020&r2=1543021&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx Mon Nov 18 12:53:58 2013
@@ -48,7 +48,8 @@ namespace accessibility 
           mViewForwarder( rOutlView )
     {       
         // register as listener - need to broadcast state change messages
-        rOutliner.SetNotifyHdl( LINK(this, AccessibleOutlineEditSource, NotifyHdl) );
+		// Moved to ::GetTextForwarder()
+        //rOutliner.SetNotifyHdl( LINK(this, AccessibleOutlineEditSource, NotifyHdl) );
         StartListening(rOutliner);
     }
 
@@ -61,14 +62,22 @@ namespace accessibility 
 
     SvxEditSource* AccessibleOutlineEditSource::Clone() const
     {
-        return NULL;
+		//IAccessibility2 Implementation 2009-----
+        /*return NULL;*/
+		return new AccessibleOutlineEditSource(*mpOutliner, mrView, *mpOutlinerView, mrWindow);
+		//-----IAccessibility2 Implementation 2009
     }
 
     SvxTextForwarder* AccessibleOutlineEditSource::GetTextForwarder()
     {
         // TODO: maybe suboptimal
         if( IsValid() )
+		{
+			// Moved here to make sure that 
+			// the NotifyHandler was set on the current object.
+			mpOutliner->SetNotifyHdl( LINK(this, AccessibleOutlineEditSource, NotifyHdl) );
             return &mTextForwarder;
+		}
         else
             return NULL;
     }

Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleOutlineView.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleOutlineView.cxx?rev=1543021&r1=1543020&r2=1543021&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleOutlineView.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleOutlineView.cxx Mon Nov 18 12:53:58 2013
@@ -150,6 +150,37 @@ uno::Reference<XAccessible> SAL_CALL
     return maTextHelper.GetChild(nIndex);
 }
 
+//IAccessibility2 Implementation 2009-----
+#include <drawdoc.hxx>
+::rtl::OUString SAL_CALL
+	AccessibleOutlineView::getAccessibleName(void)
+	throw (::com::sun::star::uno::RuntimeException)
+{
+	::rtl::OUString sName = String( SdResId(SID_SD_A11Y_D_PRESENTATION) );
+	::sd::View* pSdView = static_cast< ::sd::View* >( maShapeTreeInfo.GetSdrView() );
+	if ( pSdView )
+	{
+		SdDrawDocument* pDoc = pSdView->GetDoc();
+		if ( pDoc )
+		{
+			rtl::OUString sFileName = pDoc->getDocAccTitle();
+			if ( !sFileName.getLength() )
+			{
+				::sd::DrawDocShell* pDocSh = pSdView->GetDocSh();
+				if ( pDocSh )
+				{
+					sFileName = pDocSh->GetTitle( SFX_TITLE_APINAME );
+				}			
+			}
+			if ( sFileName.getLength() )
+			{
+				sName = sFileName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" - ")) + sName;
+			}
+		}
+	}
+	return sName;
+}
+//-----IAccessibility2 Implementation 2009
 //=====  XAccessibleEventBroadcaster  ========================================
 
 void SAL_CALL AccessibleOutlineView::addEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
@@ -157,6 +188,9 @@ void SAL_CALL AccessibleOutlineView::add
     // delegate listener handling to children manager.
     if ( ! IsDisposed())
         maTextHelper.AddEventListener(xListener);
+//IAccessibility2 Implementation 2009-----
+	AccessibleContextBase::addEventListener(xListener);
+//-----IAccessibility2 Implementation 2009
 }
 
 void SAL_CALL AccessibleOutlineView::removeEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
@@ -164,6 +198,9 @@ void SAL_CALL AccessibleOutlineView::rem
     // forward
     if ( ! IsDisposed())
         maTextHelper.RemoveEventListener(xListener);
+//IAccessibility2 Implementation 2009-----
+	AccessibleContextBase::removeEventListener(xListener);
+//-----IAccessibility2 Implementation 2009
 }
 
 //=====  XServiceInfo  ========================================================
@@ -228,12 +265,17 @@ void SAL_CALL
     AccessibleDocumentViewBase::propertyChange (rEventObject);
 
     OSL_TRACE ("AccessibleOutlineView::propertyChange");
-    if (rEventObject.PropertyName == ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("CurrentPage")))
+	//add page switch event for slide show mode
+    if (rEventObject.PropertyName == ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("CurrentPage")) ||
+		rEventObject.PropertyName == ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("PageChange")) )
     {
         OSL_TRACE ("    current page changed");
 
         // The current page changed. Update the children accordingly.
         UpdateChildren();
+//IAccessibility2 Implementation 2009-----
+    	CommitChange(AccessibleEventId::PAGE_CHANGED,rEventObject.NewValue,rEventObject.OldValue);
+//-----IAccessibility2 Implementation 2009
     }
     else if (rEventObject.PropertyName == ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("VisibleArea")))
     {

Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx?rev=1543021&r1=1543020&r2=1543021&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx Mon Nov 18 12:53:58 2013
@@ -119,5 +119,12 @@ AccessiblePresentationGraphicShape::~Acc
 
     return aDG();
 }
+//IAccessibility2 Implementation 2009-----
+sal_Int16 SAL_CALL AccessiblePresentationGraphicShape::getAccessibleRole () 
+	throw (::com::sun::star::uno::RuntimeException)
+{
 
+	return  AccessibleRole::GRAPHIC ;
+}
+//-----IAccessibility2 Implementation 2009
 } // end of namespace accessibility

Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx?rev=1543021&r1=1543020&r2=1543021&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx Mon Nov 18 12:53:58 2013
@@ -140,5 +140,13 @@ AccessiblePresentationOLEShape::~Accessi
 
     return aDG();
 }
+//IAccessibility2 Implementation 2009-----
+//	Return this object's role.
+sal_Int16 SAL_CALL AccessiblePresentationOLEShape::getAccessibleRole () 
+	throw (::com::sun::star::uno::RuntimeException)
+{
 
+	return  AccessibleRole::EMBEDDED_OBJECT ;
+}
+//-----IAccessibility2 Implementation 2009
 } // end of namespace accessibility

Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessiblePresentationShape.cxx?rev=1543021&r1=1543020&r2=1543021&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessiblePresentationShape.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessiblePresentationShape.cxx Mon Nov 18 12:53:58 2013
@@ -27,6 +27,11 @@
 
 #include "SdShapeTypes.hxx"
 
+//IAccessibility2 Implementation 2009-----
+#include "accessibility.hrc"
+#include "sdresid.hxx"
+#include <tools/string.hxx>
+//-----IAccessibility2 Implementation 2009
 #include <svx/DescriptionGenerator.hxx>
 #include <rtl/ustring.h>
 
@@ -77,38 +82,51 @@ AccessiblePresentationShape::~Accessible
     ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId (mxShape);
     switch (nShapeType)
     {
+    //IAccessibility2 Implementation 2009-----
         case PRESENTATION_TITLE:
-            sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressTitle"));
+            //sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressTitle"));
+            sName = ::rtl::OUString (String(SdResId(SID_SD_A11Y_P_TITLE_N)));
             break;
         case PRESENTATION_OUTLINER:
-            sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressOutliner"));
+            //sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressOutliner"));
+            sName = ::rtl::OUString (String(SdResId(SID_SD_A11Y_P_OUTLINER_N)));
             break;
         case PRESENTATION_SUBTITLE:
-            sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressSubtitle"));
+            //sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressSubtitle"));
+            sName = ::rtl::OUString (String(SdResId(SID_SD_A11Y_P_SUBTITLE_N)));
             break;
         case PRESENTATION_PAGE:
-            sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressPage"));
+            //sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressPage"));
+            sName = ::rtl::OUString (String(SdResId(SID_SD_A11Y_P_PAGE_N)));
             break;
         case PRESENTATION_NOTES:
-            sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressNotes"));
+            //sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressNotes"));
+            sName = ::rtl::OUString (String(SdResId(SID_SD_A11Y_P_NOTES_N)));
             break;
         case PRESENTATION_HANDOUT:
-            sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressHandout"));
+            //sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressHandout"));
+            sName = ::rtl::OUString (String(SdResId(SID_SD_A11Y_P_HANDOUT_N)));
             break;
 		case PRESENTATION_HEADER:
-            sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressHeader"));
+            //sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressHeader"));
+	    sName = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_HEADER_N)) );
             break;
 		case PRESENTATION_FOOTER:
-            sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressFooter"));
+            //sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressFooter"));
+	    sName = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_FOOTER_N)) );
             break;
 		case PRESENTATION_DATETIME:
-            sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressDateAndTime"));
+            //sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressDateAndTime"));
+	    sName = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_DATE_N)) );
             break;
 		case PRESENTATION_PAGENUMBER:
-            sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressPageNumber"));
+            //sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressPageNumber"));
+	    sName = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_NUMBER_N)) );
             break;
         default:
-            sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("UnknownAccessibleImpressShape"));
+            //sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("UnknownAccessibleImpressShape"));
+            sName = ::rtl::OUString (String(SdResId(SID_SD_A11Y_P_UNKNOWN_N)));
+	//-----IAccessibility2 Implementation 2009
             uno::Reference<drawing::XShapeDescriptor> xDescriptor (mxShape, uno::UNO_QUERY);
             if (xDescriptor.is())
                 sName += ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM(": "))
@@ -126,42 +144,67 @@ AccessiblePresentationShape::~Accessible
     throw (::com::sun::star::uno::RuntimeException)
 {
     //    return createAccessibleName ();
+    ::rtl::OUString sDescription;
     DescriptionGenerator aDG (mxShape);
     ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId (mxShape);
     switch (nShapeType)
     {
+    //IAccessibility2 Implementation 2009-----
         case PRESENTATION_TITLE:
-            aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationTitleShape"));
+            //aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationTitleShape"));
+	    sDescription = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_TITLE_D)) );
+	    aDG.Initialize (sDescription);		
             break;
         case PRESENTATION_OUTLINER:
-            aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationOutlinerShape"));
+            //aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationOutlinerShape"));
+	    sDescription = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_OUTLINER_D)) );
+	    aDG.Initialize (sDescription);				//PresentationOutlinerShape
             break;
         case PRESENTATION_SUBTITLE:
             aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationSubtitleShape"));
+ 	    sDescription = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_SUBTITLE_D)) );
+	    aDG.Initialize (sDescription);				//PresentationSubtitleShape
             break;
         case PRESENTATION_PAGE:
             aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationPageShape"));
+            sDescription = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_PAGE_D)) );
+	    aDG.Initialize (sDescription);				//PresentationPageShape
             break;
         case PRESENTATION_NOTES:
             aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationNotesShape"));
+	    sDescription = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_NOTES_D)) );
+	    aDG.Initialize (sDescription);				//PresentationNotesShape
             break;
         case PRESENTATION_HANDOUT:
             aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationHandoutShape"));
+	    sDescription = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_HANDOUT_D)) );
+	    aDG.Initialize (sDescription);				//PresentationHandoutShape
             break;
 		case PRESENTATION_HEADER:
-            aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationHeaderShape"));
+            //aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationHeaderShape"));
+	    sDescription = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_HEADER_D)) );
+	    aDG.Initialize (sDescription);				//PresentationHeaderShape
             break;
 		case PRESENTATION_FOOTER:
-            aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationFooterShape"));
+            //aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationFooterShape"));
+	    sDescription = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_FOOTER_D)) );
+	    aDG.Initialize (sDescription);				//PresentationFooterShape
             break;
 		case PRESENTATION_DATETIME:
-            aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationDateAndTimeShape"));
+            //aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationDateAndTimeShape"));
+	    sDescription = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_DATE_D)) );
+	    aDG.Initialize (sDescription);				//PresentationDateShape
             break;
 		case PRESENTATION_PAGENUMBER:
-            aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationPageNumberShape"));
+            //aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationPageNumberShape"));
+	    sDescription = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_NUMBER_D)) );
+	    aDG.Initialize (sDescription);				//PresentationNumberShape
             break;
         default:
-            aDG.Initialize (::rtl::OUString::createFromAscii ("Unknown accessible presentation shape"));
+            //aDG.Initialize (::rtl::OUString::createFromAscii ("Unknown accessible presentation shape"));
+	    sDescription = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_UNKNOWN_D)) );
+	    aDG.Initialize (sDescription);				//Unknown accessible presentation shape
+	    //-----IAccessibility2 Implementation 2009
             uno::Reference<drawing::XShapeDescriptor> xDescriptor (mxShape, uno::UNO_QUERY);
             if (xDescriptor.is())
             {
@@ -172,5 +215,54 @@ AccessiblePresentationShape::~Accessible
 
     return aDG();
 }
+//IAccessibility2 Implementation 2009-----
+::rtl::OUString AccessiblePresentationShape::GetStyle()
+{
+    ::rtl::OUString sName;
+
+    ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId (mxShape);
+    switch (nShapeType)
+    {
+        case PRESENTATION_TITLE:
+            sName = ::rtl::OUString (String(SdResId(SID_SD_A11Y_P_TITLE_N_STYLE)));
+            break;
+        case PRESENTATION_OUTLINER:
+            sName = ::rtl::OUString (String(SdResId(SID_SD_A11Y_P_OUTLINER_N_STYLE)));
+            break;
+        case PRESENTATION_SUBTITLE:
+            sName = ::rtl::OUString (String(SdResId(SID_SD_A11Y_P_SUBTITLE_N_STYLE)));
+            break;
+        case PRESENTATION_PAGE:
+            sName = ::rtl::OUString (String(SdResId(SID_SD_A11Y_P_PAGE_N_STYLE)));
+            break;
+        case PRESENTATION_NOTES:
+            sName = ::rtl::OUString (String(SdResId(SID_SD_A11Y_P_NOTES_N_STYLE)));
+            break;
+        case PRESENTATION_HANDOUT:
+            sName = ::rtl::OUString (String(SdResId(SID_SD_A11Y_P_HANDOUT_N_STYLE)));
+            break;
+        case PRESENTATION_FOOTER:
+		sName = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_FOOTER_N_STYLE)) );
+            break;
+	case PRESENTATION_HEADER:
+		sName = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_HEADER_N_STYLE)) );
+            break;
+        case PRESENTATION_DATETIME:
+			sName = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_DATE_N_STYLE)) );
+            break;
+        case PRESENTATION_PAGENUMBER:
+			sName = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_NUMBER_N_STYLE)) );
+            break;			
+        default:
+            sName = ::rtl::OUString (String(SdResId(SID_SD_A11Y_P_UNKNOWN_N_STYLE)));
+            uno::Reference<drawing::XShapeDescriptor> xDescriptor (mxShape, uno::UNO_QUERY);
+            if (xDescriptor.is())
+                sName += ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM(": "))
+                    + xDescriptor->getShapeType();
+    }
 
+    return sName;
+
+}
+//-----IAccessibility2 Implementation 2009
 } // end of namespace accessibility	

Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx?rev=1543021&r1=1543020&r2=1543021&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx Mon Nov 18 12:53:58 2013
@@ -199,7 +199,9 @@ sal_Int16 SAL_CALL AccessibleSlideSorter
     throw (uno::RuntimeException)
 {
     ThrowIfDisposed();
-    static sal_Int16 nRole = AccessibleRole::LIST_ITEM;
+    //set Role = Shape
+    //static sal_Int16 nRole = AccessibleRole::LIST_ITEM;
+    static sal_Int16 nRole = AccessibleRole::SHAPE;
     return nRole;
 }
 

Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx?rev=1543021&r1=1543020&r2=1543021&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx Mon Nov 18 12:53:58 2013
@@ -91,6 +91,7 @@ public:
     DECL_LINK(FocusChangeListener, void*);
     DECL_LINK(UpdateChildrenCallback, void*);
 
+    void Activated(void);
 private:
     AccessibleSlideSorterView& mrAccessibleSlideSorter;
     ::sd::slidesorter::SlideSorter& mrSlideSorter;
@@ -833,6 +834,11 @@ void AccessibleSlideSorterView::Implemen
 
 void AccessibleSlideSorterView::Implementation::UpdateChildren (void)
 {
+  	//By default, all children should be accessable. So here workaround is to make all children visible. 
+  	// MT: THis was in UpdateVisibility, which has some similarity, and hg merge automatically has put it here. Correct?!
+  	// In the IA2 CWS, also setting mnFirst/LastVisibleChild was commented out!
+  	mnLastVisibleChild = maPageObjects.size();
+
     if (mbModelChangeLocked)
     {
         // Do nothing right now.  When the flag is reset, this method is
@@ -1023,6 +1029,22 @@ void AccessibleSlideSorterView::Implemen
 }
 
 
+void AccessibleSlideSorterView::SwitchViewActivated (void)
+{
+	// Firstly, set focus to view
+	this->FireAccessibleEvent(AccessibleEventId::STATE_CHANGED,
+                    Any(),
+                    Any(AccessibleStateType::FOCUSED));
+	
+	mpImpl->Activated();
+}
+
+void AccessibleSlideSorterView::Implementation::Activated()
+{
+	mrSlideSorter.GetController().GetFocusManager().ShowFocus();
+
+}
+
 
 
 IMPL_LINK(AccessibleSlideSorterView::Implementation, WindowEventListener, VclWindowEvent*, pEvent)
@@ -1079,27 +1101,40 @@ IMPL_LINK(AccessibleSlideSorterView::Imp
     sal_Int32 nNewFocusedIndex (
         mrSlideSorter.GetController().GetFocusManager().GetFocusedPageIndex());
 
+    sal_Bool bHasFocus = mrSlideSorter.GetController().GetFocusManager().IsFocusShowing();
+    if (!bHasFocus)
+    	nNewFocusedIndex = -1;
+
+    // add a checker whether the focus event is sent out. Only after sent, the mnFocusedIndex should be updated. 
+    sal_Bool bSentFocus = sal_False;
     if (nNewFocusedIndex != mnFocusedIndex)
     {
         if (mnFocusedIndex >= 0)
         {
             AccessibleSlideSorterObject* pObject = GetAccessibleChild(mnFocusedIndex);
             if (pObject != NULL)
+			{
                 pObject->FireAccessibleEvent(
                     AccessibleEventId::STATE_CHANGED,
                     Any(AccessibleStateType::FOCUSED),
                     Any());
+				bSentFocus = sal_True;
+			}
         }
         if (nNewFocusedIndex >= 0)
         {
             AccessibleSlideSorterObject* pObject = GetAccessibleChild(nNewFocusedIndex);
             if (pObject != NULL)
+			{
                 pObject->FireAccessibleEvent(
                     AccessibleEventId::STATE_CHANGED,
                     Any(),
                     Any(AccessibleStateType::FOCUSED));
+				bSentFocus = sal_True;
+			}
         }
-        mnFocusedIndex = nNewFocusedIndex;
+		if (bSentFocus == sal_True)
+			mnFocusedIndex = nNewFocusedIndex;
     }
     return 1;
 }

Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/accessibility.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/accessibility.hrc?rev=1543021&r1=1543020&r2=1543021&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/accessibility.hrc (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/accessibility.hrc Mon Nov 18 12:53:58 2013
@@ -44,6 +44,46 @@
 #define SID_SD_A11Y_I_HANDOUTVIEW_N		(SID_SD_A11Y_START + 10)
 #define SID_SD_A11Y_I_HANDOUTVIEW_D		(SID_SD_A11Y_START + 11)
 
+//IAccessibility2 Implementation 2009-----
+#define SID_SD_A11Y_P_TITLE_N			(SID_SD_A11Y_START + 12)
+#define SID_SD_A11Y_P_TITLE_D			(SID_SD_A11Y_START + 13)
+#define SID_SD_A11Y_P_OUTLINER_N		(SID_SD_A11Y_START + 14)
+#define SID_SD_A11Y_P_OUTLINER_D		(SID_SD_A11Y_START + 15)
+#define SID_SD_A11Y_P_SUBTITLE_N		(SID_SD_A11Y_START + 16)
+#define SID_SD_A11Y_P_SUBTITLE_D		(SID_SD_A11Y_START + 17)
+#define SID_SD_A11Y_P_PAGE_N			(SID_SD_A11Y_START + 18)
+#define SID_SD_A11Y_P_PAGE_D			(SID_SD_A11Y_START + 19)
+#define SID_SD_A11Y_P_NOTES_N			(SID_SD_A11Y_START + 20)
+#define SID_SD_A11Y_P_NOTES_D			(SID_SD_A11Y_START + 21)
+#define SID_SD_A11Y_P_HANDOUT_N			(SID_SD_A11Y_START + 22)
+#define SID_SD_A11Y_P_HANDOUT_D			(SID_SD_A11Y_START + 23)
+#define SID_SD_A11Y_P_UNKNOWN_N			(SID_SD_A11Y_START + 24)
+#define SID_SD_A11Y_P_UNKNOWN_D			(SID_SD_A11Y_START + 25)
+#define SID_SD_A11Y_P_FOOTER_N			(SID_SD_A11Y_START + 26)
+#define SID_SD_A11Y_P_FOOTER_D			(SID_SD_A11Y_START + 27)
+#define SID_SD_A11Y_P_HEADER_N			(SID_SD_A11Y_START + 28)
+#define SID_SD_A11Y_P_HEADER_D			(SID_SD_A11Y_START + 29)
+#define SID_SD_A11Y_P_DATE_N			(SID_SD_A11Y_START + 30)
+#define SID_SD_A11Y_P_DATE_D			(SID_SD_A11Y_START + 31)
+#define SID_SD_A11Y_P_NUMBER_N			(SID_SD_A11Y_START + 32)
+#define SID_SD_A11Y_P_NUMBER_D			(SID_SD_A11Y_START + 33)
+#define SID_SD_A11Y_D_PRESENTATION		(SID_SD_A11Y_START + 34)
+#define   SID_SD_A11Y_P_TITLE_N_STYLE		(SID_SD_A11Y_START + 35)
+#define   SID_SD_A11Y_P_OUTLINER_N_STYLE	(SID_SD_A11Y_START + 36)
+#define   SID_SD_A11Y_P_SUBTITLE_N_STYLE	(SID_SD_A11Y_START + 37)
+#define   SID_SD_A11Y_P_PAGE_N_STYLE		(SID_SD_A11Y_START + 38)
+#define   SID_SD_A11Y_P_NOTES_N_STYLE 		(SID_SD_A11Y_START + 39)
+#define   SID_SD_A11Y_P_HANDOUT_N_STYLE		(SID_SD_A11Y_START + 40)
+#define   SID_SD_A11Y_P_UNKNOWN_N_STYLE		(SID_SD_A11Y_START + 41)
+#define   SID_SD_A11Y_P_FOOTER_N_STYLE		(SID_SD_A11Y_START + 42)
+#define   SID_SD_A11Y_P_HEADER_N_STYLE		(SID_SD_A11Y_START + 43)
+#define   SID_SD_A11Y_P_DATE_N_STYLE		(SID_SD_A11Y_START + 44)
+#define   SID_SD_A11Y_P_NUMBER_N_STYLE		(SID_SD_A11Y_START + 45)
 
+#define   SID_SD_A11Y_I_PREVIEW_N (SID_SD_A11Y_START + 46)
+#define   SID_SD_A11Y_I_PREVIEW_D (SID_SD_A11Y_START + 47)
+#define   SID_SD_A11Y_I_PREVIEW_SUFFIX (SID_SD_A11Y_START + 48)
+#define   SID_SD_A11Y_D_PRESENTATION_READONLY (SID_SD_A11Y_START + 49)
+//-----IAccessibility2 Implementation 2009
 #endif /* _SD_ACCESSIBILITY_HRC */
 

Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/accessibility.src
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/accessibility.src?rev=1543021&r1=1543020&r2=1543021&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/accessibility.src (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/accessibility.src Mon Nov 18 12:53:58 2013
@@ -87,25 +87,174 @@ String SID_SD_A11Y_I_HANDOUTVIEW_D
 	Text [ en-US ] = "This is where you decide on the layout for handouts.";
 };
 
+//IAccessibility2 Implementation 2009-----
+String SID_SD_A11Y_P_TITLE_N
+{
+	Text [ en-US ] = "PresentationTitle";
+};
 
+String SID_SD_A11Y_P_OUTLINER_N
+{
+	Text [ en-US ] = "PresentationOutliner";
+};
 
+String SID_SD_A11Y_P_SUBTITLE_N
+{
+	Text [ en-US ] = "PresentationSubtitle";
+};
 
+String SID_SD_A11Y_P_PAGE_N
+{
+	Text [ en-US ] = "PresentationPage";
+};
 
+String SID_SD_A11Y_P_NOTES_N
+{
+	Text [ en-US ] = "PresentationNotes";
+};
 
+String SID_SD_A11Y_P_HANDOUT_N
+{
+	Text [ en-US ] = "Handout";
+};
 
+String SID_SD_A11Y_P_UNKNOWN_N
+{
+	Text [ en-US ] = "UnknownAccessiblePresentationShape";
+};
 
+String SID_SD_A11Y_P_TITLE_D
+{
+	Text [ en-US ] = "PresentationTitleShape";
+};
 
+String SID_SD_A11Y_P_OUTLINER_D
+{
+	Text [ en-US ] = "PresentationOutlinerShape";
+};
 
+String SID_SD_A11Y_P_SUBTITLE_D
+{
+	Text [ en-US ] = "PresentationSubtitleShape";
+};
 
+String SID_SD_A11Y_P_PAGE_D
+{
+	Text [ en-US ] = "PresentationPageShape";
+};
 
+String SID_SD_A11Y_P_NOTES_D
+{
+	Text [ en-US ] = "PresentationNotesShape";
+};
 
+String SID_SD_A11Y_P_HANDOUT_D
+{
+	Text [ en-US ] = "PresentationHandoutShape";
+};
 
+String SID_SD_A11Y_P_UNKNOWN_D
+{
+	Text [ en-US ] = "Unknown accessible presentation shape";
+};
 
+String SID_SD_A11Y_P_FOOTER_N
+{
+	Text [ en-US ] = "PresentationFooter";
+};
+String SID_SD_A11Y_P_FOOTER_D
+{
+	Text [ en-US ] = "PresentationFooterShape";
+};
+String SID_SD_A11Y_P_HEADER_N
+{
+	Text [ en-US ] = "PresentationHeader";
+};
+String SID_SD_A11Y_P_HEADER_D
+{
+	Text [ en-US ] = "PresentationHeaderShape";
+};
+String SID_SD_A11Y_P_DATE_N
+{
+	Text [ en-US ] = "PresentationDateAndTime";
+};
+String SID_SD_A11Y_P_DATE_D
+{
+	Text [ en-US ] = "PresentationDateAndTimeShape";
+};
+String SID_SD_A11Y_P_NUMBER_N
+{
+	Text [ en-US ] = "PresentationPageNumber";
+};
+String SID_SD_A11Y_P_NUMBER_D
+{
+	Text [ en-US ] = "PresentationPageNumberShape";
+};
 
+String SID_SD_A11Y_D_PRESENTATION
+{
+	Text [ en-US ] = "%PRODUCTNAME Presentation";
+};
+String SID_SD_A11Y_P_TITLE_N_STYLE
+{
+	Text [ en-US ] = "Title";
+};
+String  SID_SD_A11Y_P_OUTLINER_N_STYLE
+{
+	Text [ en-US ] = "Outliner";
+};
+String  SID_SD_A11Y_P_SUBTITLE_N_STYLE
+{
+	Text [ en-US ] = "Sub Title";
+};
+String  SID_SD_A11Y_P_PAGE_N_STYLE
+{
+	Text [ en-US ] = "Page";
+};
+String  SID_SD_A11Y_P_NOTES_N_STYLE
+{
+	Text [ en-US ] = "Notes";
+};
+String  SID_SD_A11Y_P_HANDOUT_N_STYLE
+{
+	Text [ en-US ] = "Handout";
+};
+String  SID_SD_A11Y_P_UNKNOWN_N_STYLE
+{
+	Text [ en-US ] = "Unknown Accessible Presentation Shape";
+};
+String  SID_SD_A11Y_P_FOOTER_N_STYLE
+{
+	Text [ en-US ] = "Footer";
+};
+String  SID_SD_A11Y_P_HEADER_N_STYLE
+{
+	Text [ en-US ] = "Header";
+};
+String  SID_SD_A11Y_P_DATE_N_STYLE
+{
+	Text [ en-US ] = "Date";
+};
+String  SID_SD_A11Y_P_NUMBER_N_STYLE
+{
+	Text [ en-US ] = "Number";
+};
 
+String  SID_SD_A11Y_I_PREVIEW_N
+{
+	Text [ en-US ] = "Preview View";
+};
+String  SID_SD_A11Y_I_PREVIEW_D
+{
+	Text [ en-US ] = "This is where you print preview pages.";
+};
+String  SID_SD_A11Y_I_PREVIEW_SUFFIX
+{
+	Text [ en-US ] = "(Preview mode)";
+};
 
-
-
-
-
-
+String SID_SD_A11Y_D_PRESENTATION_READONLY
+{
+	Text [ en-US ] = "(read-only)";
+};
+//-----IAccessibility2 Implementation 2009

Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/dlg/navigatr.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/dlg/navigatr.cxx?rev=1543021&r1=1543020&r2=1543021&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/ui/dlg/navigatr.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/ui/dlg/navigatr.cxx Mon Nov 18 12:53:58 2013
@@ -119,6 +119,9 @@ SdNavigatorWin::SdNavigatorWin(
     // set focus to listbox, otherwise it is in the toolbox which is only useful
     // for keyboard navigation
     maTlbObjects.GrabFocus();
+//IAccessibility2 Implementation 2009-----
+       maTlbObjects.SetSdNavigatorWinFlag(sal_True);
+//-----IAccessibility2 Implementation 2009
 
     // DragTypeListBox
     maLbDocs.SetSelectHdl( LINK( this, SdNavigatorWin, SelectDocumentHdl ) );
@@ -175,6 +178,28 @@ SdNavigatorWin::~SdNavigatorWin()
 
 // -----------------------------------------------------------------------
 
+//IAccessibility2 Implementation 2009-----
+//Solution: when object is marked , fresh the corresponding entry tree .
+//==================================================
+void SdNavigatorWin::FreshTree( const SdDrawDocument* pDoc )
+{
+	SdDrawDocument* pNonConstDoc = (SdDrawDocument*) pDoc; // const as const can...
+	sd::DrawDocShell* pDocShell = pNonConstDoc->GetDocSh();
+	String aDocShName( pDocShell->GetName() );
+	String aDocName = pDocShell->GetMedium()->GetName();
+	maTlbObjects.SetSaveTreeItemStateFlag(sal_True); //Added by yanjun for sym2_6385
+	maTlbObjects.Clear();
+	maTlbObjects.Fill( pDoc, sal_False, aDocName ); // Nur normale Seiten
+	maTlbObjects.SetSaveTreeItemStateFlag(sal_False); //Added by yanjun for sym2_6385
+	RefreshDocumentLB();
+	maLbDocs.SelectEntry( aDocShName );
+}
+void SdNavigatorWin::FreshEntry( )
+{
+	maTlbObjects.FreshCurEntry();
+}
+//==================================================
+//-----IAccessibility2 Implementation 2009
 void SdNavigatorWin::InitTreeLB( const SdDrawDocument* pDoc )
 {
 	SdDrawDocument* pNonConstDoc = (SdDrawDocument*) pDoc; // const as const can...
@@ -245,7 +270,16 @@ NavigatorDragType SdNavigatorWin::GetNav
 }
 
 // -----------------------------------------------------------------------
-
+//IAccessibility2 Implementation 2009-----
+//Solution: Get  SdDrawDocShell 
+sd::DrawDocShell* SdNavigatorWin::GetDrawDocShell( const SdDrawDocument* pDoc )
+{
+	if( !pDoc )
+		return NULL; // const as const can...
+	sd::DrawDocShell* pDocShell = pDoc->GetDocSh();
+	return pDocShell;
+}
+//-----IAccessibility2 Implementation 2009
 
 IMPL_LINK( SdNavigatorWin, SelectToolboxHdl, void *, EMPTYARG )
 {
@@ -403,6 +437,10 @@ IMPL_LINK( SdNavigatorWin, ClickObjectHd
 				SfxStringItem aItem( SID_NAVIGATOR_OBJECT, aStr );
 				mpBindings->GetDispatcher()->Execute(
 					SID_NAVIGATOR_OBJECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L );
+//IAccessibility2 Implementation 2009-----
+				//Solution: set sign variable
+				maTlbObjects.MarkCurEntry(aStr);
+//-----IAccessibility2 Implementation 2009
 
                 // #98821# moved here from SetGetFocusHdl. Reset the
                 // focus only if something has been selected in the



Mime
View raw message