openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1555112 [17/18] - in /openoffice/branches/rejuvenate01: ./ main/ main/autodoc/source/parser_i/idoc/ main/dbaccess/source/shared/ main/helpcontent2/source/text/shared/01/ main/offapi/com/sun/star/accessibility/ main/offapi/com/sun/star/anim...
Date Fri, 03 Jan 2014 14:45:04 GMT
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/registry/XImplementationRegistration2.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/registry/XImplementationRegistration2.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/registry/XImplementationRegistration2.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/registry/XImplementationRegistration2.idl Fri Jan  3 14:44:44 2014
@@ -34,7 +34,7 @@
  
 /** extends the functionality of <type scope="com::sun::star::registry">XImplementationRegistration</type>. It can be useful to specify a complete Url to a component but register the components name only (library or jar name).
 
-    @since OOo 2.4
+    @since OpenOffice 2.4
  */
 interface XImplementationRegistration2: com::sun::star::registry::XImplementationRegistration
 { 

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/script/BasicErrorException.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/script/BasicErrorException.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/script/BasicErrorException.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/script/BasicErrorException.idl Fri Jan  3 14:44:44 2014
@@ -36,7 +36,7 @@ module com {  module sun {  module star 
  
 /** is thrown in order to transport an error to Basic.
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 published exception BasicErrorException: com::sun::star::uno::Exception
 { 

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/AccessControlException.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/AccessControlException.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/AccessControlException.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/AccessControlException.idl Fri Jan  3 14:44:44 2014
@@ -36,7 +36,7 @@ module com {  module sun {  module star 
 /** Exception notifying a lacking permission to access data or execute code
 	thus it is thrown if permission ought to be denied.
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
 */
 published exception AccessControlException : com::sun::star::uno::SecurityException
 {

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/AccessController.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/AccessController.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/AccessController.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/AccessController.idl Fri Jan  3 14:44:44 2014
@@ -46,7 +46,7 @@ module com {  module sun {  module star 
     to assure that permission checks are not corrupted via insecure inter-process
 	communication.
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
 */
 published service AccessController
 {

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/AllPermission.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/AllPermission.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/AllPermission.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/AllPermission.idl Fri Jan  3 14:44:44 2014
@@ -38,7 +38,7 @@ module com {  module sun {  module star 
     or in extremely rare cases where an application is completely trusted and
     adding the necessary permissions to the policy is prohibitively cumbersome.
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
 */
 published struct AllPermission
 {

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/Policy.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/Policy.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/Policy.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/Policy.idl Fri Jan  3 14:44:44 2014
@@ -32,7 +32,7 @@ module com {  module sun {  module star 
 /** Service for getting sets of permissions reading from some persistent
     storage.
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
 */
 published service Policy
 {

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/RuntimePermission.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/RuntimePermission.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/RuntimePermission.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/RuntimePermission.idl Fri Jan  3 14:44:44 2014
@@ -32,7 +32,7 @@ module com {  module sun {  module star 
     A RuntimePermission contains a name (also referred to as a "target name")
     but no actions list;  you either have the named permission or you don't.
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
 */
 published struct RuntimePermission
 {

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/XAccessControlContext.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/XAccessControlContext.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/XAccessControlContext.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/XAccessControlContext.idl Fri Jan  3 14:44:44 2014
@@ -48,7 +48,7 @@ module com {  module sun {  module star 
 	that of the current execution thread.
 	</p>
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
 */
 published interface XAccessControlContext : com::sun::star::uno::XInterface
 {

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/XAccessController.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/XAccessController.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/XAccessController.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/XAccessController.idl Fri Jan  3 14:44:44 2014
@@ -48,7 +48,7 @@ module com {  module sun {  module star 
 /** Interface for checking permissions and invoking privileged or restricted
     actions.
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
 */
 published interface XAccessController : com::sun::star::uno::XInterface
 {

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/XAction.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/XAction.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/XAction.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/XAction.idl Fri Jan  3 14:44:44 2014
@@ -39,7 +39,7 @@ module com {  module sun {  module star 
  
 /** Interface for running an action.
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
 */
 published interface XAction : com::sun::star::uno::XInterface
 {

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/XPolicy.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/XPolicy.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/XPolicy.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/security/XPolicy.idl Fri Jan  3 14:44:44 2014
@@ -34,7 +34,7 @@ module com {  module sun {  module star 
     
     @see com::sun::star::security::Policy
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
 */
 published interface XPolicy : com::sun::star::uno::XInterface
 {

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/task/XInteractionHandler2.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/task/XInteractionHandler2.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/task/XInteractionHandler2.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/task/XInteractionHandler2.idl Fri Jan  3 14:44:44 2014
@@ -40,7 +40,7 @@
       the way that a caller can determine whether an interaction request was
       actually handled by the interaction handler.</p>
 
-      @since OOo 3.2
+      @since OpenOffice 3.2
  */
 published interface XInteractionHandler2 : com::sun::star::task::XInteractionHandler
 {

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uno/DeploymentException.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uno/DeploymentException.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uno/DeploymentException.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uno/DeploymentException.idl Fri Jan  3 14:44:44 2014
@@ -36,7 +36,7 @@
  
 /** Exception signalling a deployment error.
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
 */
 published exception DeploymentException : com::sun::star::uno::RuntimeException
 {

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/ExternalUriReferenceTranslator.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/ExternalUriReferenceTranslator.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/ExternalUriReferenceTranslator.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/ExternalUriReferenceTranslator.idl Fri Jan  3 14:44:44 2014
@@ -31,7 +31,7 @@ published interface XExternalUriReferenc
 /**
    translates between external and internal URI references.
 
-   @since OOo 2.0
+   @since OpenOffice 2.0
  */
 published service ExternalUriReferenceTranslator:
     XExternalUriReferenceTranslator;

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/RelativeUriExcessParentSegments.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/RelativeUriExcessParentSegments.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/RelativeUriExcessParentSegments.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/RelativeUriExcessParentSegments.idl Fri Jan  3 14:44:44 2014
@@ -33,7 +33,7 @@ module com { module sun { module star { 
    @see com::sun::star::uri::XUriReferenceFactory::makeAbsolute
    for a method that uses this enumeration.
 
-   @since OOo 2.0
+   @since OpenOffice 2.0
  */
 published enum RelativeUriExcessParentSegments {
     /**

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/UriReferenceFactory.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/UriReferenceFactory.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/UriReferenceFactory.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/UriReferenceFactory.idl Fri Jan  3 14:44:44 2014
@@ -64,7 +64,7 @@ published interface XUriReferenceFactory
    service does not support
    <type scope="com::sun::star::uri">XUriSchemeParser</type>.</p>
 
-   @since OOo 2.0
+   @since OpenOffice 2.0
  */
 published service UriReferenceFactory: XUriReferenceFactory;
 

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/UriSchemeParser_vndDOTsunDOTstarDOTexpand.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/UriSchemeParser_vndDOTsunDOTstarDOTexpand.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/UriSchemeParser_vndDOTsunDOTstarDOTexpand.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/UriSchemeParser_vndDOTsunDOTstarDOTexpand.idl Fri Jan  3 14:44:44 2014
@@ -44,7 +44,7 @@ published interface XUriSchemeParser;
    Rather, it should be used indirectly through the
    <type scope="com::sun::star::uri">UriReferenceFactory</type> service.</p>
 
-   @since OOo 2.3
+   @since OpenOffice 2.3
  */
 published service UriSchemeParser_vndDOTsunDOTstarDOTexpand: XUriSchemeParser
 {};

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/UriSchemeParser_vndDOTsunDOTstarDOTscript.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/UriSchemeParser_vndDOTsunDOTstarDOTscript.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/UriSchemeParser_vndDOTsunDOTstarDOTscript.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/UriSchemeParser_vndDOTsunDOTstarDOTscript.idl Fri Jan  3 14:44:44 2014
@@ -44,7 +44,7 @@ published interface XUriSchemeParser;
    Rather, it should be used indirectly through the
    <type scope="com::sun::star::uri">UriReferenceFactory</type> service.</p>
 
-   @since OOo 2.0
+   @since OpenOffice 2.0
  */
 published service UriSchemeParser_vndDOTsunDOTstarDOTscript: XUriSchemeParser
 {};

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/VndSunStarPkgUrlReferenceFactory.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/VndSunStarPkgUrlReferenceFactory.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/VndSunStarPkgUrlReferenceFactory.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/VndSunStarPkgUrlReferenceFactory.idl Fri Jan  3 14:44:44 2014
@@ -31,7 +31,7 @@ published interface XVndSunStarPkgUrlRef
 /**
    creates &ldquo;vnd.sun.star.pkg&rdquo; URL references.
 
-   @since OOo 2.0
+   @since OpenOffice 2.0
  */
 published service VndSunStarPkgUrlReferenceFactory:
     XVndSunStarPkgUrlReferenceFactory;

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XExternalUriReferenceTranslator.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XExternalUriReferenceTranslator.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XExternalUriReferenceTranslator.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XExternalUriReferenceTranslator.idl Fri Jan  3 14:44:44 2014
@@ -50,7 +50,7 @@ module com { module sun { module star { 
    references (that do not include a scheme) are left unmodified by the
    translation process.</p>
 
-   @since OOo 2.0
+   @since OpenOffice 2.0
  */
 published interface XExternalUriReferenceTranslator {
     /**

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XUriReference.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XUriReference.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XUriReference.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XUriReference.idl Fri Jan  3 14:44:44 2014
@@ -43,7 +43,7 @@ module com { module sun { module star { 
    <type scope="com::sun::star::uri">XUriReference</type> and additional,
    scheme-specific interfaces.
 
-   @since OOo 2.0
+   @since OpenOffice 2.0
  */
 published interface XUriReference: com::sun::star::uno::XInterface {
     /**

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XUriReferenceFactory.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XUriReferenceFactory.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XUriReferenceFactory.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XUriReferenceFactory.idl Fri Jan  3 14:44:44 2014
@@ -36,7 +36,7 @@ module com { module sun { module star { 
    <p>See <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC&nbsp;2396</a> for a
    description of URI references and related terms.</p>
 
-   @since OOo 2.0
+   @since OpenOffice 2.0
  */
 published interface XUriReferenceFactory: com::sun::star::uno::XInterface {
     /**

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XUriSchemeParser.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XUriSchemeParser.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XUriSchemeParser.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XUriSchemeParser.idl Fri Jan  3 14:44:44 2014
@@ -35,7 +35,7 @@ module com { module sun { module star { 
    <p>See <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC&nbsp;2396</a> for a
    description of URIs and related terms.</p>
 
-   @since OOo 2.0
+   @since OpenOffice 2.0
  */
 published interface XUriSchemeParser: com::sun::star::uno::XInterface {
     /**

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XVndSunStarExpandUrl.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XVndSunStarExpandUrl.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XVndSunStarExpandUrl.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XVndSunStarExpandUrl.idl Fri Jan  3 14:44:44 2014
@@ -47,7 +47,7 @@ module com { module sun { module star { 
    <a href="http://www.ietf.org/rfc/rfc2234.txt">RFC&nbsp;2234</a> for
    details.</p>
 
-   @since OOo 2.3
+   @since OpenOffice 2.3
  */
 published interface XVndSunStarExpandUrl {
     /**

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XVndSunStarExpandUrlReference.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XVndSunStarExpandUrlReference.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XVndSunStarExpandUrlReference.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XVndSunStarExpandUrlReference.idl Fri Jan  3 14:44:44 2014
@@ -32,7 +32,7 @@ module com { module sun { module star { 
 /**
    represents absolute &ldquo;vnd.sun.star.expand&rdquo; URL references.
 
-   @since OOo 2.3
+   @since OpenOffice 2.3
  */
 published interface XVndSunStarExpandUrlReference {
     /**

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XVndSunStarPkgUrlReferenceFactory.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XVndSunStarPkgUrlReferenceFactory.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XVndSunStarPkgUrlReferenceFactory.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XVndSunStarPkgUrlReferenceFactory.idl Fri Jan  3 14:44:44 2014
@@ -33,7 +33,7 @@ published interface XUriReference;
 /**
    creates &ldquo;vnd.sun.star.pkg&rdquo; URL references.
 
-   @since OOo 2.0
+   @since OpenOffice 2.0
  */
 published interface XVndSunStarPkgUrlReferenceFactory {
     /**

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XVndSunStarScriptUrl.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XVndSunStarScriptUrl.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XVndSunStarScriptUrl.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/uri/XVndSunStarScriptUrl.idl Fri Jan  3 14:44:44 2014
@@ -57,7 +57,7 @@ module com { module sun { module star { 
    without considering case folding or normalization.  There may be multiple
    parameters with equal keys.</p>
 
-   @since OOo 2.0
+   @since OpenOffice 2.0
  */
 published interface XVndSunStarScriptUrl: com::sun::star::uno::XInterface {
     /**
@@ -77,7 +77,7 @@ published interface XVndSunStarScriptUrl
         @throws ::com::sun::star::lang::IllegalArgumentException
         if <arg>name</arg> is empty
 
-        @since OOo 3.0
+        @since OpenOffice 3.0
     */
     void   setName([in] string name)
         raises ( ::com::sun::star::lang::IllegalArgumentException );
@@ -122,7 +122,7 @@ published interface XVndSunStarScriptUrl
         @throws ::com::sun::star::lang::IllegalArgumentException
         if <arg>key</arg> is empty
 
-        @since OOo 3.0
+        @since OpenOffice 3.0
     */
     void setParameter( [in] string key, [in] string value )
         raises ( ::com::sun::star::lang::IllegalArgumentException );

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/BootstrapMacroExpander.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/BootstrapMacroExpander.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/BootstrapMacroExpander.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/BootstrapMacroExpander.idl Fri Jan  3 14:44:44 2014
@@ -49,7 +49,7 @@ module com {  module sun {  module star 
     
     @see theMacroExpander
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
 */
 published service BootstrapMacroExpander
 {

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/MacroExpander.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/MacroExpander.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/MacroExpander.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/MacroExpander.idl Fri Jan  3 14:44:44 2014
@@ -46,7 +46,7 @@ module com {  module sun {  module star 
     @see BootstrapMacroExpander
     @see theMacroExpander
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
 */
 published service MacroExpander
 {

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/XMacroExpander.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/XMacroExpander.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/XMacroExpander.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/XMacroExpander.idl Fri Jan  3 14:44:44 2014
@@ -40,7 +40,7 @@ module com {  module sun {  module star 
 
 /** Expands macro in expressions, i.e. substitudes macro names.
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
 */
 published interface XMacroExpander : com::sun::star::uno::XInterface
 {

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/logging/LogLevel.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/logging/LogLevel.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/logging/LogLevel.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/logging/LogLevel.idl Fri Jan  3 14:44:44 2014
@@ -33,7 +33,7 @@ module com { module sun { module star { 
 /** deprecated API - use <type scope="com::sun::star::logging">LogLevel</type> instead
 
     @deprecated
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
 */
 published constants LogLevel
 {

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/logging/Logger.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/logging/Logger.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/logging/Logger.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/logging/Logger.idl Fri Jan  3 14:44:44 2014
@@ -45,7 +45,7 @@ module com { module sun { module star { 
 /** deprecated API - use <type scope="com::sun::star::logging">LoggerPool</type> instead
 
     @deprecated
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
 */
 published service Logger
 {

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/logging/LoggerRemote.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/logging/LoggerRemote.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/logging/LoggerRemote.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/logging/LoggerRemote.idl Fri Jan  3 14:44:44 2014
@@ -45,7 +45,7 @@ module com { module sun { module star { 
     /** deprecated API - use <type scope="com::sun::star::logging">LoggerPool</type> instead
 
     @deprecated
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
 */
 published service LoggerRemote
 {

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/logging/XLogger.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/logging/XLogger.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/logging/XLogger.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/logging/XLogger.idl Fri Jan  3 14:44:44 2014
@@ -37,7 +37,7 @@ module com { module sun { module star { 
 /** deprecated API - use <type scope="com::sun::star::logging">XLogger</type> instead
 
     @deprecated
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
 */
 published interface XLogger: com::sun::star::uno::XInterface
 {

Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/logging/XLoggerRemote.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/logging/XLoggerRemote.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/logging/XLoggerRemote.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/util/logging/XLoggerRemote.idl Fri Jan  3 14:44:44 2014
@@ -41,7 +41,7 @@ module com { module sun { module star { 
 /** deprecated API - use <type scope="com::sun::star::logging">XLogger</type> instead
 
     @deprecated
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
 */
 published interface XLoggerRemote: com::sun::star::uno::XInterface
 {

Modified: openoffice/branches/rejuvenate01/main/vcl/Library_vcl.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/Library_vcl.mk?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/Library_vcl.mk (original)
+++ openoffice/branches/rejuvenate01/main/vcl/Library_vcl.mk Fri Jan  3 14:44:44 2014
@@ -161,8 +161,8 @@ $(eval $(call gb_Library_add_exception_o
     vcl/aqua/source/dtrans/PictToBmpFlt \
     vcl/aqua/source/dtrans/aqua_clipboard \
     vcl/aqua/source/dtrans/service_entry \
-    vcl/aqua/source/gdi/ctlayout \
-    vcl/aqua/source/gdi/ctfonts \
+    vcl/aqua/source/gdi/atslayout \
+    vcl/aqua/source/gdi/atsfonts \
     vcl/aqua/source/gdi/salbmp \
     vcl/aqua/source/gdi/salcolorutils \
     vcl/aqua/source/gdi/salgdi \

Modified: openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salgdi.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salgdi.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salgdi.cxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salgdi.cxx Fri Jan  3 14:44:44 2014
@@ -45,7 +45,7 @@
 #include "aqua/salframe.h"
 #include "aqua/salcolorutils.hxx"
 #ifdef USE_ATSU
-#include "aqua/salatsuifontutils.hxx"
+#include "atsfonts.hxx"
 #else // !USE_ATSU
 #include "ctfonts.hxx"
 #endif

Modified: openoffice/branches/rejuvenate01/main/vcl/unx/gtk/window/gtkframe.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/unx/gtk/window/gtkframe.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/unx/gtk/window/gtkframe.cxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/unx/gtk/window/gtkframe.cxx Fri Jan  3 14:44:44 2014
@@ -3553,6 +3553,11 @@ void GtkSalFrame::IMHandler::signalIMCom
     {
         GTK_YIELD_GRAB();
         
+        bool bWasPreedit =
+            (pThis->m_aInputEvent.mpTextAttr != 0) ||
+            pThis->m_bPreeditJustChanged;
+        pThis->m_bPreeditJustChanged = false;
+        
         pThis->m_aInputEvent.mnTime 			= 0;
         pThis->m_aInputEvent.mpTextAttr 		= 0;
         pThis->m_aInputEvent.maText 		    = String( pText, RTL_TEXTENCODING_UTF8 );
@@ -3576,9 +3581,7 @@ void GtkSalFrame::IMHandler::signalIMCom
          *  or because there never was a preedit.
          */
         bool bSingleCommit = false;
-        bool bWasPreedit =
-            (pThis->m_aInputEvent.mpTextAttr != 0) ||
-            pThis->m_bPreeditJustChanged;
+        
         if( ! bWasPreedit
             && pThis->m_aInputEvent.maText.Len() == 1
             && ! pThis->m_aPrevKeyPresses.empty()

Modified: openoffice/branches/rejuvenate01/main/writerfilter/inc/ooxml/OOXMLDocument.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/writerfilter/inc/ooxml/OOXMLDocument.hxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/writerfilter/inc/ooxml/OOXMLDocument.hxx (original)
+++ openoffice/branches/rejuvenate01/main/writerfilter/inc/ooxml/OOXMLDocument.hxx Fri Jan  3 14:44:44 2014
@@ -156,11 +156,11 @@ public:
 
        @param rStream       stream handler to resolve to
        @param rNoteType     type of footnote to resolve
-       @param rNoteId       id of the footnote to resolve
+       @param nIDForXNoteStream  id of the footnote to resolve
      */
     virtual void resolveFootnote(Stream & rStream,
                                  const Id & rNoteType,
-                                 const rtl::OUString & rNoteId) = 0;
+                                 const sal_Int32 nIDForXNoteStream ) = 0;
     /**
        Resolves an endnote to a stream handler.
 
@@ -168,21 +168,21 @@ public:
        note id matches.
 
        @param rStream       stream handler to resolve to
-       @param rNoteType     type of footnote to resolve
-       @param rNoteId       id of the endnote to resolve
+       @param rNoteType     type of endnote to resolve
+       @param nIDForXNoteStream  id of the endnote to resolve
      */
     virtual void resolveEndnote(Stream & rStream,
                                 const Id & rNoteType,
-                                const rtl::OUString & rNoteId) = 0;
+                                const sal_Int32 nIDForXNoteStream ) = 0;
 
     /**
        Resolves a comment to a stream handler.
 
        @param rStream       stream handler to resolve to
-       @param rComment      id of the comment to resolve
+       @param nIDForXNoteStream  id of the comment to resolve
      */
     virtual void resolveComment(Stream & rStream,
-                                const rtl::OUString & rCommentId) = 0;
+                                const sal_Int32 nIDForXNoteStream ) = 0;
 
     /**
        Resolves a picture to a stream handler.
@@ -239,12 +239,11 @@ public:
     virtual uno::Reference<drawing::XDrawPage> getDrawPage() = 0;
     virtual uno::Reference<io::XInputStream> getInputStream() = 0;
     virtual uno::Reference<io::XInputStream> getStorageStream() = 0;
-    virtual uno::Reference<io::XInputStream> getInputStreamForId
-    (const ::rtl::OUString & rId) = 0;
-    virtual void setXNoteId(const rtl::OUString & rId) = 0;
-    virtual const ::rtl::OUString & getXNoteId() const = 0;
-    virtual void setXNoteType(const Id & nId) = 0;
-    virtual const Id & getXNoteType() const = 0;
+    virtual uno::Reference<io::XInputStream> getInputStreamForId( const ::rtl::OUString & rId ) = 0;
+
+    virtual void setIDForXNoteStream( const sal_Int32 nID ) = 0;
+    virtual const sal_Int32 getIDForXNoteStream() const = 0;
+
     virtual const ::rtl::OUString & getTarget() const = 0;
 };
 

Modified: openoffice/branches/rejuvenate01/main/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx (original)
+++ openoffice/branches/rejuvenate01/main/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx Fri Jan  3 14:44:44 2014
@@ -298,7 +298,7 @@ public:
     /**
        Returns integer representation of the value.
      */
-    virtual int getInt() const = 0;
+    virtual sal_Int32 getInt() const = 0;
 
     /**
        Returns string representation of the value.

Modified: openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/DomainMapper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/DomainMapper.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/DomainMapper.cxx (original)
+++ openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/DomainMapper.cxx Fri Jan  3 14:44:44 2014
@@ -2074,6 +2074,15 @@ void DomainMapper::lcl_attribute(Id nNam
             /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
             m_pImpl->SetCurrentRedlineId( nIntValue );
         break;
+        case NS_ooxml::LN_CT_Comment_initials:
+            m_pImpl->SetCurrentRedlineInitials(sStringValue);
+        break;
+        case NS_ooxml::LN_EG_RangeMarkupElements_commentRangeStart:
+            m_pImpl->AddAnnotationPosition( true, nIntValue );
+        break;
+        case NS_ooxml::LN_EG_RangeMarkupElements_commentRangeEnd:
+            m_pImpl->AddAnnotationPosition( false, nIntValue );
+        break;
         case NS_ooxml::LN_token:
             /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
             m_pImpl->SetCurrentRedlineToken( nIntValue );

Modified: openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx (original)
+++ openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx Fri Jan  3 14:44:44 2014
@@ -148,6 +148,9 @@ DomainMapper_Impl::DomainMapper_Impl(
     m_bParaChanged( false ),
     m_bIsLastParaInSection( false ),
     m_bIsInComments( false )
+    , m_xAnnotationField()
+    , m_nAnnotationId( -1 )
+    , m_aAnnotationPositions()
 {
     appendTableManager( );
     GetBodyText();
@@ -1276,11 +1279,37 @@ void DomainMapper_Impl::PopFootOrEndnote
 void DomainMapper_Impl::PopAnnotation()
 {
     m_bIsInComments = false;
+
+    RemoveLastParagraph();
     m_aTextAppendStack.pop();
-    uno::Sequence< beans::PropertyValue > aEmptyProperties;
-    appendTextContent( uno::Reference< text::XTextContent >( m_xAnnotationField, uno::UNO_QUERY_THROW ), aEmptyProperties );
-    m_xAnnotationField.clear();
 
+    if ( m_nAnnotationId != -1 )
+    {
+        // See if the annotation will be a single position or a range.
+        AnnotationPosition& aAnnotationPosition = m_aAnnotationPositions[ m_nAnnotationId ];
+        if ( !aAnnotationPosition.m_xStart.is()
+             || !aAnnotationPosition.m_xEnd.is() )
+        {
+            uno::Sequence< beans::PropertyValue > aEmptyProperties;
+            appendTextContent( uno::Reference< text::XTextContent >( m_xAnnotationField, uno::UNO_QUERY_THROW ), aEmptyProperties );
+        }
+        else
+        {
+            // Create a range that points to the annotation start/end.
+            uno::Reference<text::XText> xText = aAnnotationPosition.m_xStart->getText();
+            uno::Reference<text::XTextCursor> xCursor = xText->createTextCursorByRange( aAnnotationPosition.m_xStart );
+            xCursor->gotoRange( aAnnotationPosition.m_xEnd, true );
+            uno::Reference<text::XTextRange> xTextRange(xCursor, uno::UNO_QUERY_THROW);
+
+            // Attach the annotation to the range.
+            uno::Reference<text::XTextAppend> xTextAppend = m_aTextAppendStack.top().xTextAppend;
+            xTextAppend->insertTextContent(xTextRange, uno::Reference<text::XTextContent>(m_xAnnotationField, uno::UNO_QUERY_THROW), !xCursor->isCollapsed());
+        }
+        m_aAnnotationPositions.erase( m_nAnnotationId );
+    }
+
+    m_xAnnotationField.clear();
+    m_nAnnotationId = -1;
 }
 
 void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape > xShape )
@@ -2890,6 +2919,34 @@ void DomainMapper_Impl::handleToc
     pContext->SetTOC( xTOC );
 }
 
+void DomainMapper_Impl::AddAnnotationPosition(
+    const bool bStart,
+    const sal_Int32 nAnnotationId )
+{
+    if (m_aTextAppendStack.empty())
+        return;
+
+    // Create a cursor, pointing to the current position.
+    uno::Reference<text::XTextAppend>  xTextAppend = m_aTextAppendStack.top().xTextAppend;
+    uno::Reference<text::XTextRange> xCurrent;
+    if (xTextAppend.is())
+    {
+        uno::Reference<text::XTextCursor> xCursor = xTextAppend->createTextCursorByRange(xTextAppend->getEnd());
+        xCurrent = xCursor->getStart();
+    }
+
+    // And save it, to be used by PopAnnotation() later.
+    AnnotationPosition& aAnnotationPosition = m_aAnnotationPositions[ nAnnotationId ];
+    if ( bStart )
+    {
+        aAnnotationPosition.m_xStart = xCurrent;
+    }
+    else
+    {
+        aAnnotationPosition.m_xEnd = xCurrent;
+    }
+    m_aAnnotationPositions[ nAnnotationId ] = aAnnotationPosition;
+}
 
 /*-- 29.01.2007 11:33:16---------------------------------------------------
 //the field command has to be closed (0x14 appeared)
@@ -3021,7 +3078,7 @@ void DomainMapper_Impl::CloseFieldComman
                         sal_Int32 nNumberingTypeIndex = pContext->GetCommand().indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\\p")));
                         xFieldProperties->setPropertyValue(
                                 rPropNameSupplier.GetName(PROP_FILE_FORMAT),
-                                uno::makeAny( nNumberingTypeIndex > 0 ? text::FilenameDisplayFormat::FULL : text::FilenameDisplayFormat::NAME ));
+                                uno::makeAny( nNumberingTypeIndex > 0 ? text::FilenameDisplayFormat::FULL : text::FilenameDisplayFormat::NAME_AND_EXT ));
                     }
                     break;
                     case FIELD_FILESIZE     : break;
@@ -3722,23 +3779,58 @@ sal_Int32 DomainMapper_Impl::GetCurrentR
 
 void DomainMapper_Impl::SetCurrentRedlineAuthor( rtl::OUString sAuthor )
 {
-    RedlineParamsPtr pCurrent( GetTopRedline(  ) );
-    if ( pCurrent.get(  ) )
-        pCurrent->m_sAuthor = sAuthor;
+    if (m_xAnnotationField.is())
+    {
+        m_xAnnotationField->setPropertyValue(
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Author")),
+            uno::makeAny(sAuthor) );
+    }
+    else
+    {
+        RedlineParamsPtr pCurrent( GetTopRedline(  ) );
+        if ( pCurrent.get(  ) )
+            pCurrent->m_sAuthor = sAuthor;
+    }
+}
+
+void DomainMapper_Impl::SetCurrentRedlineInitials( rtl::OUString sInitials )
+{
+    if (m_xAnnotationField.is())
+    {
+        m_xAnnotationField->setPropertyValue(
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Initials")),
+            uno::makeAny(sInitials) );
+    }
 }
 
 void DomainMapper_Impl::SetCurrentRedlineDate( rtl::OUString sDate )
 {
-    RedlineParamsPtr pCurrent( GetTopRedline(  ) );
-    if ( pCurrent.get(  ) )
-        pCurrent->m_sDate = sDate;
+    if (m_xAnnotationField.is())
+    {
+        m_xAnnotationField->setPropertyValue(
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateTimeValue")),
+            uno::makeAny( ConversionHelper::convertDateTime( sDate ) ) );
+    }
+    else
+    {
+        RedlineParamsPtr pCurrent( GetTopRedline(  ) );
+        if ( pCurrent.get(  ) )
+            pCurrent->m_sDate = sDate;
+    }
 }
 
 void DomainMapper_Impl::SetCurrentRedlineId( sal_Int32 sId )
 {
-    RedlineParamsPtr pCurrent( GetTopRedline(  ) );
-    if ( pCurrent.get(  ) )
-        pCurrent->m_nId = sId;
+    if (m_xAnnotationField.is())
+    {
+        m_nAnnotationId = sId;
+    }
+    else
+    {
+        RedlineParamsPtr pCurrent( GetTopRedline(  ) );
+        if ( pCurrent.get(  ) )
+            pCurrent->m_nId = sId;
+    }
 }
 
 void DomainMapper_Impl::SetCurrentRedlineToken( sal_Int32 nToken )

Modified: openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/DomainMapper_Impl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/DomainMapper_Impl.hxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/DomainMapper_Impl.hxx (original)
+++ openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/DomainMapper_Impl.hxx Fri Jan  3 14:44:44 2014
@@ -51,6 +51,7 @@
 #include <FFDataHandler.hxx>
 #include <FormControlHelper.hxx>
 #include <map>
+#include <hash_map>
 
 #include <string.h>
 
@@ -173,8 +174,10 @@ struct TextAppendContext
     ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextAppend >       xTextAppend;
     ParagraphPropertiesPtr                                                        pLastParagraphProperties;
 
-    TextAppendContext( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextAppend >& xAppend ) :
-        xTextAppend( xAppend ){}
+    TextAppendContext( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextAppend >& xAppend )
+        : xTextAppend( xAppend )
+    {
+    }
 };
 
 typedef boost::shared_ptr<FieldContext>  FieldContextPtr;
@@ -211,11 +214,16 @@ class FIB
 struct DeletableTabStop : public ::com::sun::star::style::TabStop
 {
     bool bDeleted;
-    DeletableTabStop() :
-        bDeleted( false ){}
-    DeletableTabStop( const ::com::sun::star::style::TabStop& rTabStop ) :
-        TabStop( rTabStop ),
-            bDeleted( false ){}
+
+    DeletableTabStop()
+        : TabStop()
+        , bDeleted( false )
+    {}
+
+    DeletableTabStop( const ::com::sun::star::style::TabStop& rTabStop )
+        : TabStop( rTabStop )
+        , bDeleted( false )
+    {}
 };
 /*-- 12.06.2007 07:15:31---------------------------------------------------
     /// helper to remember bookmark start position
@@ -225,13 +233,25 @@ struct BookmarkInsertPosition
     bool                                                                    m_bIsStartOfText;
     ::rtl::OUString                                                         m_sBookmarkName;
     ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >  m_xTextRange;
-    BookmarkInsertPosition(bool bIsStartOfText, const ::rtl::OUString& rName, ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >  xTextRange):
-        m_bIsStartOfText( bIsStartOfText ),
-        m_sBookmarkName( rName ),
-        m_xTextRange( xTextRange )
+
+    BookmarkInsertPosition(
+        bool bIsStartOfText,
+        const ::rtl::OUString& rName,
+        ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >  xTextRange )
+        : m_bIsStartOfText( bIsStartOfText )
+        , m_sBookmarkName( rName )
+        , m_xTextRange( xTextRange )
      {}
 };
 
+/// Stores the start/end positions of an annotation before its insertion.
+struct AnnotationPosition
+{
+    ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >  m_xStart;
+    ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >  m_xEnd;
+};
+typedef std::unordered_map< sal_Int32, AnnotationPosition > AnnotationPositions_t;
+
 struct RedlineParams
 {
     ::rtl::OUString m_sAuthor;
@@ -345,7 +365,9 @@ private:
     bool                            m_bIsInComments;
 
     //annotation import
-    uno::Reference< beans::XPropertySet >                                      m_xAnnotationField;
+    uno::Reference< beans::XPropertySet > m_xAnnotationField;
+    sal_Int32 m_nAnnotationId;
+    AnnotationPositions_t m_aAnnotationPositions;
 
     void                            GetCurrentLocale(::com::sun::star::lang::Locale& rLocale);
     void                            SetNumberFormat( const ::rtl::OUString& rCommand,
@@ -534,6 +556,10 @@ public:
 
     void AddBookmark( const ::rtl::OUString& rBookmarkName, const ::rtl::OUString& rId );
 
+    void AddAnnotationPosition(
+        const bool bStart,
+        const sal_Int32 nAnnotationId );
+
     DomainMapperTableManager& getTableManager()
     {
         boost::shared_ptr< DomainMapperTableManager > pMngr = m_aTableManagers.top();
@@ -585,7 +611,7 @@ public:
     void AddNewRedline( );
 
     RedlineParamsPtr GetTopRedline( );
-    
+
     sal_Int32 GetCurrentRedlineToken( ); 
     void SetCurrentRedlineAuthor( rtl::OUString sAuthor );
     void SetCurrentRedlineDate( rtl::OUString sDate );
@@ -593,7 +619,8 @@ public:
     void SetCurrentRedlineToken( sal_Int32 nToken );
     void RemoveCurrentRedline( );
     void ResetParaRedline( );
-    
+    void SetCurrentRedlineInitials( rtl::OUString sInitials );
+
     void ApplySettingsTable();
     SectionPropertyMap * GetSectionContext();
 };

Modified: openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/PropertyMap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/PropertyMap.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/PropertyMap.cxx (original)
+++ openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/PropertyMap.cxx Fri Jan  3 14:44:44 2014
@@ -995,19 +995,28 @@ void SectionPropertyMap::CloseSectionGro
                     uno::Reference< container::XEnumeration >  xEnum = xEnumAccess->createEnumeration( );
                     xRangeProperties = uno::Reference< beans::XPropertySet >( xEnum->nextElement( ), uno::UNO_QUERY_THROW );
                 }
-                else
+                else if( m_xStartingRange.is() )
+                {
                     xRangeProperties = uno::Reference< beans::XPropertySet >( m_xStartingRange, uno::UNO_QUERY_THROW );
-            /* break type
-            0 - No break 1 - New Column 2 - New page 3 - Even page 4 - odd page */
-                xRangeProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_PAGE_DESC_NAME ),
-                    uno::makeAny( m_bTitlePage ? m_sFirstPageStyleName : m_sFollowPageStyleName ));
-    //  todo: page breaks with odd/even page numbering are not available - find out current page number to check how to change the number
-    //  or add even/odd page break types
-                if(m_bPageNoRestart || m_nPageNumber >= 0)
+                }
+                if ( xRangeProperties.is() )
                 {
-                    sal_Int16 nPageNumber = m_nPageNumber >= 0 ? static_cast< sal_Int16 >(m_nPageNumber) : 1;
-                    xRangeProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_PAGE_NUMBER_OFFSET ),
-                        uno::makeAny( nPageNumber ));
+                    /* break type: 0 - No break 1 - New Column 2 - New page 3 - Even page 4 - odd page */
+                    uno::Reference< beans::XPropertySetInfo > xRangePropertiesInfo = xRangeProperties->getPropertySetInfo();
+                    if ( xRangePropertiesInfo->hasPropertyByName( rPropNameSupplier.GetName( PROP_PAGE_DESC_NAME ) ) )
+                    {
+                        xRangeProperties->setPropertyValue(
+                            rPropNameSupplier.GetName( PROP_PAGE_DESC_NAME ),
+                            uno::makeAny( m_bTitlePage ? m_sFirstPageStyleName : m_sFollowPageStyleName ) );
+                        //  todo: page breaks with odd/even page numbering are not available - find out current page number to check how to change the number
+                        //  or add even/odd page break types
+                        if ( m_bPageNoRestart || m_nPageNumber >= 0 )
+                        {
+                            sal_Int16 nPageNumber = m_nPageNumber >= 0 ? static_cast< sal_Int16 >(m_nPageNumber) : 1;
+                            xRangeProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_PAGE_NUMBER_OFFSET ),
+                                uno::makeAny( nPageNumber ));
+                        }
+                    }
                 }
             }
         }

Modified: openoffice/branches/rejuvenate01/main/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/writerfilter/source/doctok/WW8ResourceModelImpl.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/writerfilter/source/doctok/WW8ResourceModelImpl.cxx (original)
+++ openoffice/branches/rejuvenate01/main/writerfilter/source/doctok/WW8ResourceModelImpl.cxx Fri Jan  3 14:44:44 2014
@@ -316,7 +316,7 @@ string WW8Sprm::getName() const
     return (*SprmIdToString::Instance())(getId());
 }
 
-int WW8Value::getInt() const
+sal_Int32 WW8Value::getInt() const
 {
     return 0;
 }
@@ -351,7 +351,7 @@ writerfilter::Reference<BinaryObj>::Poin
     return writerfilter::Reference<BinaryObj>::Pointer_t();
 }
 
-int WW8IntValue::getInt() const
+sal_Int32 WW8IntValue::getInt() const
 {
     return mValue;
 }
@@ -389,7 +389,7 @@ WW8Value::Pointer_t createValue(WW8Value
     return value;
 }
 
-int WW8StringValue::getInt() const
+sal_Int32 WW8StringValue::getInt() const
 {
     return 0;
 }

Modified: openoffice/branches/rejuvenate01/main/writerfilter/source/doctok/WW8ResourceModelImpl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/writerfilter/source/doctok/WW8ResourceModelImpl.hxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/writerfilter/source/doctok/WW8ResourceModelImpl.hxx (original)
+++ openoffice/branches/rejuvenate01/main/writerfilter/source/doctok/WW8ResourceModelImpl.hxx Fri Jan  3 14:44:44 2014
@@ -158,7 +158,7 @@ public:
     virtual ~WW8Value() {}
 
     virtual string toString() const;
-    virtual int getInt() const;
+    virtual sal_Int32 getInt() const;
     virtual ::rtl::OUString getString() const;
     virtual uno::Any getAny() const;
     virtual writerfilter::Reference<Properties>::Pointer_t getProperties();
@@ -174,7 +174,7 @@ public:
     WW8IntValue(int value) : mValue(value) {}
     virtual ~WW8IntValue() {}
 
-    virtual int getInt() const;
+    virtual sal_Int32 getInt() const;
     virtual ::rtl::OUString getString() const;
     virtual uno::Any getAny() const;
 
@@ -200,7 +200,7 @@ public:
     WW8StringValue(::rtl::OUString string_) : mString(string_) {}
     virtual ~WW8StringValue() {}
 
-    virtual int getInt() const;
+    virtual sal_Int32 getInt() const;
     virtual ::rtl::OUString getString() const;
     virtual uno::Any getAny() const;
 

Modified: openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/Handler.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/Handler.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/Handler.cxx (original)
+++ openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/Handler.cxx Fri Jan  3 14:44:44 2014
@@ -46,7 +46,7 @@ void OOXMLFootnoteHandler::attribute(Id 
     switch (name)
     {
     case NS_ooxml::LN_CT_FtnEdnRef_id:
-        mpFastContext->resolveFootnote(val.getString());
+        mpFastContext->resolveFootnote(val.getInt());
         break;
     default:
         break;
@@ -74,7 +74,7 @@ void OOXMLEndnoteHandler::attribute(Id n
     switch (name)
     {
     case NS_ooxml::LN_CT_FtnEdnRef_id:
-        mpFastContext->resolveEndnote(val.getString());
+        mpFastContext->resolveEndnote(val.getInt());
         break;
     default:
         break;
@@ -102,7 +102,7 @@ void OOXMLCommentHandler::attribute(Id n
     switch (name)
     {
     case NS_ooxml::LN_CT_Markup_id:
-        mpFastContext->resolveComment(val.getString());
+        mpFastContext->resolveComment(val.getInt());
         break;
     default:
         ;

Modified: openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx (original)
+++ openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx Fri Jan  3 14:44:44 2014
@@ -45,9 +45,37 @@ TagLogger::Pointer_t debug_logger(TagLog
 
 using namespace ::std;
 
-OOXMLDocumentImpl::OOXMLDocumentImpl
-(OOXMLStream::Pointer_t pStream)
-: mpStream(pStream), mXNoteType(0), mbIsSubstream( false )
+OOXMLDocumentImpl::OOXMLDocumentImpl(
+    OOXMLStream::Pointer_t pStream )
+    : mpStream(pStream)
+    , mnIDForXNoteStream( -1 )
+    , mxModel()
+    , mxDrawPage()
+    , mbIsSubstream( false )
+{
+}
+
+OOXMLDocumentImpl::OOXMLDocumentImpl(
+    OOXMLStream::Pointer_t pStream,
+    uno::Reference<frame::XModel> xModel,
+    uno::Reference<drawing::XDrawPage> xDrawPage,
+    const bool bIsSubstream )
+    : mpStream(pStream)
+    , mnIDForXNoteStream( -1 )
+    , mxModel( xModel )
+    , mxDrawPage( xDrawPage )
+    , mbIsSubstream( bIsSubstream )
+{
+}
+
+OOXMLDocumentImpl::OOXMLDocumentImpl(
+    OOXMLStream::Pointer_t pStream,
+    const sal_Int32 nIDForXNoteStream )
+    : mpStream(pStream)
+    , mnIDForXNoteStream( nIDForXNoteStream )
+    , mxModel()
+    , mxDrawPage()
+    , mbIsSubstream( false )
 {
 }
 
@@ -68,8 +96,7 @@ void OOXMLDocumentImpl::resolveFastSubSt
     {
         uno::Reference<uno::XComponentContext> xContext(mpStream->getContext());
         OOXMLFastDocumentHandler * pDocHandler =
-            new OOXMLFastDocumentHandler(
-                xContext, &rStreamHandler, this, msXNoteId );
+            new OOXMLFastDocumentHandler( xContext, &rStreamHandler, this );
 
         uno::Reference < xml::sax::XFastDocumentHandler > xDocumentHandler
             (pDocHandler);
@@ -100,25 +127,16 @@ void OOXMLDocumentImpl::resolveFastSubSt
     rStream.substream(nId, pStream);
 }
 
-void OOXMLDocumentImpl::setXNoteId(const rtl::OUString & rId)
-{
-    msXNoteId = rId;
-}
-
-const rtl::OUString & OOXMLDocumentImpl::getXNoteId() const
+void OOXMLDocumentImpl::setIDForXNoteStream( const sal_Int32 nID )
 {
-    return msXNoteId;
+    mnIDForXNoteStream = nID;
 }
 
-void OOXMLDocumentImpl::setXNoteType(const Id & nId)
+const sal_Int32 OOXMLDocumentImpl::getIDForXNoteStream() const
 {
-    mXNoteType = nId;
+    return mnIDForXNoteStream;
 }
 
-const Id & OOXMLDocumentImpl::getXNoteType() const
-{
-    return mXNoteType;
-}
 
 const ::rtl::OUString & OOXMLDocumentImpl::getTarget() const
 {
@@ -131,17 +149,19 @@ OOXMLDocumentImpl::getSubStream(const rt
     OOXMLStream::Pointer_t pStream
         (OOXMLDocumentFactory::createStream(mpStream, rId));
 
-    OOXMLDocumentImpl * pTemp;
-    writerfilter::Reference<Stream>::Pointer_t pRet( pTemp = new OOXMLDocumentImpl(pStream) );
-    pTemp->setModel(mxModel);
-    pTemp->setDrawPage(mxDrawPage);
-    pTemp->setIsSubstream( true );
+    writerfilter::Reference<Stream>::Pointer_t pRet(
+        new OOXMLDocumentImpl(
+            pStream,
+            mxModel,
+            mxDrawPage,
+            true ) );
+
     return pRet;
 }
 
-writerfilter::Reference<Stream>::Pointer_t
-OOXMLDocumentImpl::getXNoteStream(OOXMLStream::StreamType_t nType, const Id & rType,
-                                  const rtl::OUString & rId)
+writerfilter::Reference<Stream>::Pointer_t OOXMLDocumentImpl::getXNoteStream(
+    OOXMLStream::StreamType_t nType,
+    const sal_Int32 nIDForXNoteStream )
 {
 #ifdef DEBUG_ELEMENT
     debug_logger->startElement("getXNoteStream");
@@ -151,19 +171,21 @@ OOXMLDocumentImpl::getXNoteStream(OOXMLS
 
     OOXMLStream::Pointer_t pStream =
         (OOXMLDocumentFactory::createStream(mpStream, nType));
-    OOXMLDocumentImpl * pDocument = new OOXMLDocumentImpl(pStream);
-    pDocument->setXNoteId(rId);
-    pDocument->setXNoteType(rType);
+    OOXMLDocumentImpl * pDocument =
+        new OOXMLDocumentImpl(
+            pStream,
+            nIDForXNoteStream );
 
     return writerfilter::Reference<Stream>::Pointer_t(pDocument);
 }
 
-void OOXMLDocumentImpl::resolveFootnote(Stream & rStream,
-                                        const Id & rType,
-                                        const rtl::OUString & rNoteId)
+void OOXMLDocumentImpl::resolveFootnote(
+    Stream & rStream,
+    const Id & rType,
+    const sal_Int32 nIDForXNoteStream )
 {
     writerfilter::Reference<Stream>::Pointer_t pStream =
-        getXNoteStream(OOXMLStream::FOOTNOTES, rType, rNoteId);
+        getXNoteStream( OOXMLStream::FOOTNOTES, nIDForXNoteStream );
 
     Id nId;
     switch (rType)
@@ -177,15 +199,16 @@ void OOXMLDocumentImpl::resolveFootnote(
         break;
     }
 
-    resolveFastSubStreamWithId(rStream, pStream, nId);
+    resolveFastSubStreamWithId( rStream, pStream, nId );
 }
 
-void OOXMLDocumentImpl::resolveEndnote(Stream & rStream,
-                                       const Id & rType,
-                                       const rtl::OUString & rNoteId)
+void OOXMLDocumentImpl::resolveEndnote(
+    Stream & rStream,
+    const Id & rType,
+    const sal_Int32 nIDForXNoteStream )
 {
     writerfilter::Reference<Stream>::Pointer_t pStream =
-        getXNoteStream(OOXMLStream::ENDNOTES, rType, rNoteId);
+        getXNoteStream( OOXMLStream::ENDNOTES, nIDForXNoteStream );
 
     Id nId;
     switch (rType)
@@ -199,16 +222,17 @@ void OOXMLDocumentImpl::resolveEndnote(S
         break;
     }
 
-    resolveFastSubStreamWithId(rStream, pStream, nId);
+    resolveFastSubStreamWithId( rStream, pStream, nId );
 }
 
-void OOXMLDocumentImpl::resolveComment(Stream & rStream,
-                                       const rtl::OUString & rId)
+void OOXMLDocumentImpl::resolveComment(
+    Stream & rStream,
+    const sal_Int32 nIDForXNoteStream )
 {
     writerfilter::Reference<Stream>::Pointer_t pStream =
-        getXNoteStream(OOXMLStream::COMMENTS, 0, rId);
+        getXNoteStream(OOXMLStream::COMMENTS, nIDForXNoteStream );
 
-    resolveFastSubStreamWithId(rStream, pStream, NS_rtf::LN_annotation);
+    resolveFastSubStreamWithId( rStream, pStream, NS_rtf::LN_annotation );
 }
 
 OOXMLPropertySet * OOXMLDocumentImpl::getPicturePropSet
@@ -315,8 +339,7 @@ void OOXMLDocumentImpl::resolve(Stream &
         uno::Reference<uno::XComponentContext> xContext(mpStream->getContext());
 
         OOXMLFastDocumentHandler * pDocHandler =
-            new OOXMLFastDocumentHandler(
-                xContext, &rStream, this, msXNoteId );
+            new OOXMLFastDocumentHandler( xContext, &rStream, this );
         pDocHandler->setIsSubstream( mbIsSubstream );
         uno::Reference < xml::sax::XFastDocumentHandler > xDocumentHandler
             (pDocHandler);
@@ -392,9 +415,8 @@ uno::Reference<io::XInputStream> OOXMLDo
     return mpStream->getStorageStream();
 }
 
-OOXMLDocument *
-OOXMLDocumentFactory::createDocument
-(OOXMLStream::Pointer_t pStream)
+OOXMLDocument * OOXMLDocumentFactory::createDocument(
+    OOXMLStream::Pointer_t pStream )
 {
     return new OOXMLDocumentImpl(pStream);
 }

Modified: openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx (original)
+++ openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx Fri Jan  3 14:44:44 2014
@@ -40,46 +40,64 @@ using namespace ::com::sun::star;
 class OOXMLDocumentImpl : public OOXMLDocument
 {
     OOXMLStream::Pointer_t mpStream;
-    rtl::OUString msXNoteId;
-    Id mXNoteType;
+    // ID for parsing certain item in a XNote stream
+    // used for footnotes, endnotes and comments streams
+    sal_Int32 mnIDForXNoteStream;
 
     uno::Reference<frame::XModel> mxModel;
     uno::Reference<drawing::XDrawPage> mxDrawPage;
 
-    bool mbIsSubstream;
+    const bool mbIsSubstream;
 
 protected:
-    virtual void resolveFastSubStream(Stream & rStream,
-                                      OOXMLStream::StreamType_t nType);
+    virtual void resolveFastSubStream(
+        Stream & rStream,
+        OOXMLStream::StreamType_t nType);
+
+    virtual void resolveFastSubStreamWithId(
+        Stream & rStream,
+        writerfilter::Reference<Stream>::Pointer_t pStream,
+        sal_uInt32 nId);
+
+    writerfilter::Reference<Stream>::Pointer_t getSubStream(
+        const rtl::OUString & rId );
+
+    writerfilter::Reference<Stream>::Pointer_t getXNoteStream(
+        OOXMLStream::StreamType_t nType,
+        const sal_Int32 nIDForXNoteStream );
 
-    virtual void resolveFastSubStreamWithId(Stream & rStream,
-                                      writerfilter::Reference<Stream>::Pointer_t pStream,
-				      sal_uInt32 nId);
-
-    writerfilter::Reference<Stream>::Pointer_t
-    getSubStream(const rtl::OUString & rId);
-
-    writerfilter::Reference<Stream>::Pointer_t
-    getXNoteStream(OOXMLStream::StreamType_t nType,
-                   const Id & rType,
-                   const rtl::OUString & rNoteId);
+public:
+    explicit OOXMLDocumentImpl(
+        OOXMLStream::Pointer_t pStream );
 
-    void setIsSubstream( bool bSubstream ) { mbIsSubstream = bSubstream; };
+    OOXMLDocumentImpl(
+        OOXMLStream::Pointer_t pStream,
+        uno::Reference<frame::XModel> xModel,
+        uno::Reference<drawing::XDrawPage> xDrawPage,
+        const bool bIsSubstream );
+
+    OOXMLDocumentImpl(
+        OOXMLStream::Pointer_t pStream,
+        const sal_Int32 nIDForXNoteStream );
 
-public:
-    OOXMLDocumentImpl(OOXMLStream::Pointer_t pStream);
     virtual ~OOXMLDocumentImpl();
 
     virtual void resolve(Stream & rStream);
 
     virtual string getType() const;
 
-    virtual void resolveFootnote(Stream & rStream,
-                                 const Id & rType,
-                                 const rtl::OUString & rNoteId);
-    virtual void resolveEndnote(Stream & rStream,
-                                const Id & rType,
-                                const rtl::OUString & rNoteId);
+    virtual void resolveFootnote(
+        Stream & rStream,
+        const Id & rType,
+        const sal_Int32 nIDForXNoteStream );
+    virtual void resolveEndnote(
+        Stream & rStream,
+        const Id & rType,
+        const sal_Int32 nIDForXNoteStream );
+    virtual void resolveComment(
+        Stream & rStream,
+        const sal_Int32 nIDForXNoteStream );
+
     virtual void resolveHeader(Stream & rStream,
                                const sal_Int32 type,
                                const rtl::OUString & rId);
@@ -87,8 +105,6 @@ public:
                                const sal_Int32 type,
                                const rtl::OUString & rId);
 
-    virtual void resolveComment(Stream & rStream, const rtl::OUString & rId);
-
     virtual OOXMLPropertySet * getPicturePropSet
     (const ::rtl::OUString & rId);
     virtual void resolvePicture(Stream & rStream, const rtl::OUString & rId);
@@ -102,10 +118,10 @@ public:
     virtual uno::Reference<io::XInputStream> getInputStream();
     virtual uno::Reference<io::XInputStream> getStorageStream();
     virtual uno::Reference<io::XInputStream> getInputStreamForId(const rtl::OUString & rId);
-    virtual void setXNoteId(const rtl::OUString & rId);
-    virtual const ::rtl::OUString & getXNoteId() const;
-    virtual void setXNoteType(const Id & rId);
-    virtual const Id & getXNoteType() const;
+
+    virtual void setIDForXNoteStream( const sal_Int32 nID );
+    virtual const sal_Int32 getIDForXNoteStream() const;
+
     virtual const ::rtl::OUString & getTarget() const;
 };
 }}

Modified: openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx (original)
+++ openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx Fri Jan  3 14:44:44 2014
@@ -1032,37 +1032,31 @@ bool OOXMLFastContextHandler::isForwardE
     return mpParserState->isForwardEvents();
 }
 
-void OOXMLFastContextHandler::setXNoteId(const ::rtl::OUString & rId)
-{
-    mpParserState->setXNoteId(rId);
-}
 
-void OOXMLFastContextHandler::setXNoteId(OOXMLValue::Pointer_t pValue)
+void OOXMLFastContextHandler::setIDForXNoteStream(OOXMLValue::Pointer_t pValue)
 {
-    mpParserState->setXNoteId(pValue->getString());
+    mpParserState->getDocument()->setIDForXNoteStream(pValue->getInt());
 }
 
-const rtl::OUString & OOXMLFastContextHandler::getXNoteId() const
-{
-    return mpParserState->getXNoteId();
-}
 
-void OOXMLFastContextHandler::resolveFootnote
-(const rtl::OUString & rId)
+void OOXMLFastContextHandler::resolveFootnote(
+    const sal_Int32 nIDForXNoteStream )
 {
     mpParserState->getDocument()->resolveFootnote
-        (*mpStream, 0, rId);
+        (*mpStream, 0, nIDForXNoteStream);
 }
 
-void OOXMLFastContextHandler::resolveEndnote(const rtl::OUString & rId)
+void OOXMLFastContextHandler::resolveEndnote(
+    const sal_Int32 nIDForXNoteStream )
 {
     mpParserState->getDocument()->resolveEndnote
-        (*mpStream, 0, rId);
+        (*mpStream, 0, nIDForXNoteStream);
 }
 
-void OOXMLFastContextHandler::resolveComment(const rtl::OUString & rId)
+void OOXMLFastContextHandler::resolveComment(
+    const sal_Int32 nIDForXNoteStream )
 {
-    mpParserState->getDocument()->resolveComment(*mpStream, rId);
+    mpParserState->getDocument()->resolveComment(*mpStream, nIDForXNoteStream);
 }
 
 void OOXMLFastContextHandler::resolvePicture(const rtl::OUString & rId)
@@ -1621,8 +1615,10 @@ void OOXMLFastContextHandlerTable::newPr
  */
 
 OOXMLFastContextHandlerXNote::OOXMLFastContextHandlerXNote
-(OOXMLFastContextHandler * pContext)
-: OOXMLFastContextHandler(pContext)
+    ( OOXMLFastContextHandler * pContext )
+    : OOXMLFastContextHandlerProperties( pContext )
+    , mbForwardEventsSaved( false )
+    , mnMyXNoteId( -1 )
 {
 }
 
@@ -1637,7 +1633,7 @@ void OOXMLFastContextHandlerXNote::lcl_s
 {
     mbForwardEventsSaved = isForwardEvents();
 
-    if (msMyXNoteId.compareTo(getXNoteId()) == 0)
+    if ( mnMyXNoteId == mpParserState->getDocument()->getIDForXNoteStream() )
         setForwardEvents(true);
     else
         setForwardEvents(false);
@@ -1649,7 +1645,8 @@ void OOXMLFastContextHandlerXNote::lcl_e
 (Token_t Element)
     throw (uno::RuntimeException, xml::sax::SAXException)
 {
-    endAction(Element);
+    // handle properties by calling parent class' method
+    OOXMLFastContextHandlerProperties::lcl_endFastElement( Element );
 
     setForwardEvents(mbForwardEventsSaved);
 }
@@ -1658,12 +1655,12 @@ void OOXMLFastContextHandlerXNote::check
 {
 #ifdef DEBUG_ELEMENT
     debug_logger->startElement("checkId");
-    debug_logger->attribute("myId", pValue->getString());
-    debug_logger->attribute("id", getXNoteId());
+    debug_logger->attribute("myId", pValue->getInt());
+    debug_logger->attribute("id", mpParserState->getDocument()->getXNoteId());
     debug_logger->endElement("checkId");
 #endif
 
-    msMyXNoteId = pValue->getString();
+    mnMyXNoteId = pValue->getInt();
 }
 
 /*

Modified: openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx (original)
+++ openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx Fri Jan  3 14:44:44 2014
@@ -59,11 +59,12 @@ public:
     enum ResourceEnum_t { UNKNOWN, STREAM, PROPERTIES, TABLE, SHAPE };
 
     OOXMLFastContextHandler();
-    explicit OOXMLFastContextHandler
-    (uno::Reference< uno::XComponentContext > const & context);
 
-    explicit OOXMLFastContextHandler
-    (OOXMLFastContextHandler * pContext);
+    explicit OOXMLFastContextHandler(
+        uno::Reference< uno::XComponentContext > const & context );
+
+    explicit OOXMLFastContextHandler(
+        OOXMLFastContextHandler * pContext );
 
     virtual ~OOXMLFastContextHandler();
 
@@ -141,9 +142,10 @@ public:
 
     void mark(const Id & rId, OOXMLValue::Pointer_t pVal);
 
-    void resolveFootnote(const rtl::OUString & rId);
-    void resolveEndnote(const rtl::OUString & rId);
-    void resolveComment(const rtl::OUString & rId);
+    void resolveFootnote( const sal_Int32 nIDForXNoteStream );
+    void resolveEndnote( const sal_Int32 nIDForXNoteStream );
+    void resolveComment( const sal_Int32 nIDForXNoteStream );
+
     void resolvePicture(const rtl::OUString & rId);
     void resolveHeader(const sal_Int32 type, 
                                 const rtl::OUString & rId);
@@ -160,9 +162,9 @@ public:
 
     void setDocument(OOXMLDocument * pDocument);
     OOXMLDocument * getDocument();
-    void setXNoteId(OOXMLValue::Pointer_t pValue);
-    void setXNoteId(const ::rtl::OUString & rId);
-    const rtl::OUString & getXNoteId() const;
+
+    void setIDForXNoteStream(OOXMLValue::Pointer_t pValue);
+
     void setForwardEvents(bool bForwardEvents);
     bool isForwardEvents() const;
     virtual void setParent(OOXMLFastContextHandler * pParent);
@@ -418,7 +420,7 @@ protected:
     void addCurrentChild();
 };
 
-class OOXMLFastContextHandlerXNote : public OOXMLFastContextHandler
+class OOXMLFastContextHandlerXNote : public OOXMLFastContextHandlerProperties
 {
 public:
     OOXMLFastContextHandlerXNote(OOXMLFastContextHandler * pContext);
@@ -430,7 +432,7 @@ public:
     
 private:
     bool mbForwardEventsSaved;    
-    ::rtl::OUString msMyXNoteId;
+    sal_Int32 mnMyXNoteId;
 
     virtual void lcl_startFastElement
     (Token_t Element, 

Modified: openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx (original)
+++ openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx Fri Jan  3 14:44:44 2014
@@ -42,15 +42,13 @@ using namespace ::std;
 OOXMLFastDocumentHandler::OOXMLFastDocumentHandler(
     uno::Reference< uno::XComponentContext > const & context,
     Stream* pStream,
-    OOXMLDocument* pDocument,
-    const ::rtl::OUString& rXNoteId )
+    OOXMLDocument* pDocument )
     : m_xContext(context)
     , mpStream( pStream )
 #ifdef DEBUG_ELEMENT
     , mpTmpStream()
 #endif
     , mpDocument( pDocument )
-    , msXNoteId( rXNoteId )
     , mpContextHandler()
 {
 #ifdef DEBUG_PROTOCOL
@@ -140,11 +138,10 @@ OOXMLFastDocumentHandler::getContextHand
 {
     if (mpContextHandler == OOXMLFastContextHandler::Pointer_t())
     {
-        mpContextHandler.reset
-        (new OOXMLFastContextHandler(m_xContext));
+        mpContextHandler.reset(
+            new OOXMLFastContextHandler(m_xContext) );
         mpContextHandler->setStream(mpStream);
         mpContextHandler->setDocument(mpDocument);
-        mpContextHandler->setXNoteId(msXNoteId);
         mpContextHandler->setForwardEvents(true);
     }
 
@@ -196,7 +193,7 @@ Name
 #endif
 
     return uno::Reference< xml::sax::XFastContextHandler >
-        ( new OOXMLFastDocumentHandler( m_xContext, 0, 0, ::rtl::OUString() ) );
+        ( new OOXMLFastDocumentHandler( m_xContext, 0, 0 ) );
 }
 
 void SAL_CALL OOXMLFastDocumentHandler::characters(const ::rtl::OUString & /*aChars*/) 

Modified: openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx (original)
+++ openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx Fri Jan  3 14:44:44 2014
@@ -47,8 +47,8 @@ public:
     OOXMLFastDocumentHandler(
         uno::Reference< uno::XComponentContext > const & context,
         Stream* pStream,
-        OOXMLDocument* pDocument,
-        const ::rtl::OUString& rXNoteId );
+        OOXMLDocument* pDocument );
+
     virtual ~OOXMLFastDocumentHandler() {}
 
     // ::com::sun::star::xml::sax::XFastDocumentHandler:
@@ -103,7 +103,6 @@ private:
     Stream::Pointer_t mpTmpStream;
 #endif
     OOXMLDocument * mpDocument;
-    ::rtl::OUString msXNoteId;
     mutable boost::shared_ptr<OOXMLFastContextHandler> mpContextHandler;
     boost::shared_ptr<OOXMLFastContextHandler> getContextHandler() const;
 };

Modified: openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLParserState.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLParserState.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLParserState.cxx (original)
+++ openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLParserState.cxx Fri Jan  3 14:44:44 2014
@@ -123,15 +123,6 @@ OOXMLDocument * OOXMLParserState::getDoc
     return mpDocument;
 }
 
-void OOXMLParserState::setXNoteId(const rtl::OUString & rId)
-{
-    mpDocument->setXNoteId(rId);
-}
-
-const rtl::OUString & OOXMLParserState::getXNoteId() const
-{
-    return mpDocument->getXNoteId();
-}
 
 const ::rtl::OUString & OOXMLParserState::getTarget() const
 {
@@ -308,9 +299,7 @@ XMLTag::Pointer_t OOXMLParserState::toTa
         sTmp += "-";
 
     pTag->addAttr("state", sTmp);
-    pTag->addAttr("XNoteId", 
-                  OUStringToOString(getXNoteId(), 
-                                    RTL_TEXTENCODING_ASCII_US).getStr());
+    pTag->addAttr("XNoteId", getDocument()->getIDForXNoteStream() );
     if (mpCharacterProps != OOXMLPropertySet::Pointer_t())
         pTag->chars(mpCharacterProps->toString());
 

Modified: openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLParserState.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLParserState.hxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLParserState.hxx (original)
+++ openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLParserState.hxx Fri Jan  3 14:44:44 2014
@@ -48,7 +48,6 @@ class OOXMLParserState
     unsigned int mnContexts;
     unsigned int mnHandle;
     OOXMLDocument * mpDocument;
-    rtl::OUString msXNoteId;
     rtl::OUString msTarget;
     OOXMLPropertySet::Pointer_t mpCharacterProps;
     stack<OOXMLPropertySet::Pointer_t> mCellProps;
@@ -85,9 +84,6 @@ public:
     void setDocument(OOXMLDocument * pDocument);
     OOXMLDocument * getDocument() const;
 
-    void setXNoteId(const rtl::OUString & rId);
-    const rtl::OUString & getXNoteId() const;
-
     const rtl::OUString & getTarget() const;
 
     void resolveCharacterProperties(Stream & rStream);

Modified: openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx (original)
+++ openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx Fri Jan  3 14:44:44 2014
@@ -201,7 +201,7 @@ bool OOXMLValue::getBool() const
     return false;
 }
 
-int OOXMLValue::getInt() const
+sal_Int32 OOXMLValue::getInt() const
 {
     return 0;
 }
@@ -301,7 +301,7 @@ bool OOXMLBooleanValue::getBool() const
     return mbValue;
 }
 
-int OOXMLBooleanValue::getInt() const
+sal_Int32 OOXMLBooleanValue::getInt() const
 {
     return mbValue ? 1 : 0;
 }
@@ -594,7 +594,7 @@ OOXMLIntegerValue::~OOXMLIntegerValue()
 {
 }
 
-int OOXMLIntegerValue::getInt() const
+sal_Int32 OOXMLIntegerValue::getInt() const
 {
     return mnValue;
 }
@@ -637,7 +637,7 @@ OOXMLHexValue::~OOXMLHexValue()
 {
 }
 
-int OOXMLHexValue::getInt() const
+sal_Int32 OOXMLHexValue::getInt() const
 {
     return mnValue;
 }

Modified: openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx (original)
+++ openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx Fri Jan  3 14:44:44 2014
@@ -47,7 +47,7 @@ public:
     OOXMLValue();
     virtual ~OOXMLValue();
 
-    virtual int getInt() const;
+    virtual sal_Int32 getInt() const;
     virtual bool getBool() const;
     virtual ::rtl::OUString getString() const;
     virtual uno::Any getAny() const;
@@ -108,7 +108,7 @@ public:
     explicit OOXMLBooleanValue(const rtl::OUString & rValue);
     virtual ~OOXMLBooleanValue();
 
-    virtual int getInt() const;
+    virtual sal_Int32 getInt() const;
     virtual bool getBool() const;
     virtual uno::Any getAny() const;
     virtual string toString() const;
@@ -197,7 +197,7 @@ public:
     explicit OOXMLIntegerValue(const rtl::OUString & rValue);
     virtual ~OOXMLIntegerValue();
 
-    virtual int getInt() const;
+    virtual sal_Int32 getInt() const;
     virtual uno::Any getAny() const;
     virtual string toString() const;
     virtual OOXMLValue * clone() const;
@@ -212,7 +212,7 @@ public:
     explicit OOXMLHexValue(const rtl::OUString & rValue);
     virtual ~OOXMLHexValue();
 
-    virtual int getInt() const;
+    virtual sal_Int32 getInt() const;
     virtual string toString() const;
     virtual OOXMLValue * clone() const;
 };

Modified: openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/model.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/model.xml?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/model.xml (original)
+++ openoffice/branches/rejuvenate01/main/writerfilter/source/ooxml/model.xml Fri Jan  3 14:44:44 2014
@@ -14439,12 +14439,14 @@
         </optional>
       </define>
       <define name="CT_MarkupRangeBookmark">
-        <attribute name="id">
-          <text/>
-          <xs:documentation>Annotation Identifier</xs:documentation>
-        </attribute>
         <ref name="CT_MarkupRange"/>
       </define>
+      <define name="CT_MarkupRangeCommentStart">
+        <ref name="CT_Markup"/>
+      </define>
+      <define name="CT_MarkupRangeCommentEnd">
+        <ref name="CT_Markup"/>
+      </define>
       <define name="CT_BookmarkRange">
         <ref name="CT_MarkupRangeBookmark"/>
         <optional>
@@ -14479,10 +14481,6 @@
         </attribute>
       </define>
       <define name="CT_Comment">
-        <attribute name="id">
-          <ref name="ST_DecimalNumber"/>
-          <xs:documentation>Annotation Identifier</xs:documentation>
-        </attribute>
         <ref name="CT_TrackChange"/>
         <zeroOrMore>
           <ref name="EG_BlockLevelElts"/>
@@ -14608,10 +14606,10 @@
             <ref name="CT_MarkupRange"/>
           </element>
           <element name="commentRangeStart">
-            <ref name="CT_MarkupRange"/>
+            <ref name="CT_MarkupRangeCommentStart"/>
           </element>
           <element name="commentRangeEnd">
-            <ref name="CT_MarkupRange"/>
+            <ref name="CT_MarkupRangeCommentEnd"/>
           </element>
           <element name="customXmlInsRangeStart">
             <ref name="CT_TrackChange"/>
@@ -18153,13 +18151,13 @@
           </attribute>
         </optional>
         <attribute name="id">
-          <text/>
+          <ref name="ST_DecimalNumber"/>
           <xs:documentation>Footnote/Endnote ID Reference</xs:documentation>
         </attribute>
       </define>
       <define name="CT_FtnEdnSepRef">
         <attribute name="id">
-          <text/>
+          <ref name="ST_DecimalNumber"/>
           <xs:documentation>Footnote/Endnote ID</xs:documentation>
         </attribute>
       </define>
@@ -18174,7 +18172,7 @@
           </attribute>
         </optional>
         <attribute name="id">
-          <text/>
+          <ref name="ST_DecimalNumber"/>
           <xs:documentation>Footnote/Endnote ID</xs:documentation>
         </attribute>
       </define>
@@ -21829,6 +21827,12 @@
     <resource name="CT_MarkupRangeBookmark" resource="Properties" tag="redline">
       <attribute name="id" tokenid="rtf:IBKL"/>
     </resource>
+    <resource name="CT_MarkupRangeCommentStart" resource="Properties" tag="content">
+      <attribute name="id" tokenid="ooxml:EG_RangeMarkupElements_commentRangeStart"/>
+    </resource>
+    <resource name="CT_MarkupRangeCommentEnd" resource="Properties" tag="content">
+      <attribute name="id" tokenid="ooxml:EG_RangeMarkupElements_commentRangeEnd"/>
+    </resource>
     <resource name="CT_BookmarkRange" resource="Properties" tag="reference">
       <type name="Bookmark"/>
       <attribute name="colFirst" tokenid="ooxml:CT_BookmarkRange_colFirst"/>
@@ -22847,7 +22851,7 @@
     </resource>
     <resource name="CT_FtnEdnRef" resource="Properties" tag="reference">
       <attribute name="customMarkFollows" tokenid="ooxml:CT_FtnEdnRef_customMarkFollows"/>
-      <attribute name="id" tokenid="ooxml:CT_FtnEdnRef_id" action="setXNoteId"/>
+      <attribute name="id" tokenid="ooxml:CT_FtnEdnRef_id" action="setIDForXNoteStream"/>
       <action name="end" action="handleXNotes"/>
     </resource>
     <resource name="CT_FtnEdnSepRef" resource="Properties" tag="reference">



Mime
View raw message