openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o..@apache.org
Subject svn commit: r1546934 - in /openoffice/branches/ooxml-osba/main: sw/source/filter/xml/ xmloff/inc/xmloff/ xmloff/source/core/ xmloff/source/text/
Date Mon, 02 Dec 2013 09:28:11 GMT
Author: orw
Date: Mon Dec  2 09:28:11 2013
New Revision: 1546934

URL: http://svn.apache.org/r1546934
Log:
123771: ODF export: export annotation's author initials in own namespace only in ODF 1.2 (extended)
file format

        annotation's author initials is currently not standardized in ODF 1.2
	a corresponding proposal is available at the OASIS ODF TC - see JIRA isssue OFFICE-3776 at
OASIS


Modified:
    openoffice/branches/ooxml-osba/main/sw/source/filter/xml/xmliteme.cxx
    openoffice/branches/ooxml-osba/main/xmloff/inc/xmloff/xmlnmspe.hxx
    openoffice/branches/ooxml-osba/main/xmloff/inc/xmloff/xmltoken.hxx
    openoffice/branches/ooxml-osba/main/xmloff/source/core/xmlimp.cxx
    openoffice/branches/ooxml-osba/main/xmloff/source/core/xmltoken.cxx
    openoffice/branches/ooxml-osba/main/xmloff/source/text/txtflde.cxx
    openoffice/branches/ooxml-osba/main/xmloff/source/text/txtfldi.cxx

Modified: openoffice/branches/ooxml-osba/main/sw/source/filter/xml/xmliteme.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/filter/xml/xmliteme.cxx?rev=1546934&r1=1546933&r2=1546934&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/filter/xml/xmliteme.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/filter/xml/xmliteme.cxx Mon Dec  2 09:28:11
2013
@@ -236,6 +236,14 @@ void SwXMLExport::_InitItemExport()
 	xTableCellItemMap = new SvXMLItemMapEntries( aXMLTableCellItemMap );
 
 	pTableItemMapper = new SwXMLTableItemMapper_Impl( xTableItemMap, *this );
+
+    if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 )
+    {
+        _GetNamespaceMap().Add(
+            GetXMLToken(XML_NP_TEXT_EXT),
+            GetXMLToken(XML_N_TEXT_EXT),
+            XML_NAMESPACE_TEXT_EXT);
+    }
 }
 
 void SwXMLExport::_FinitItemExport()

Modified: openoffice/branches/ooxml-osba/main/xmloff/inc/xmloff/xmlnmspe.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/xmloff/inc/xmloff/xmlnmspe.hxx?rev=1546934&r1=1546933&r2=1546934&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/xmloff/inc/xmloff/xmlnmspe.hxx (original)
+++ openoffice/branches/ooxml-osba/main/xmloff/inc/xmloff/xmlnmspe.hxx Mon Dec  2 09:28:11
2013
@@ -85,8 +85,9 @@ XML_NAMESPACE_EXT( OFFICE,      37U )
 XML_NAMESPACE_EXT( TABLE,       38U )
 XML_NAMESPACE_EXT( CHART,       39U )
 XML_NAMESPACE_EXT( DRAW,		40U )
+XML_NAMESPACE_EXT( TEXT,        41U )
 
-#define _XML_OLD_NAMESPACE_BASE 41U
+#define _XML_OLD_NAMESPACE_BASE 42U
 
 // namespaces used in the technical preview (SO 5.2)
 XML_OLD_NAMESPACE( FO,		0U )

Modified: openoffice/branches/ooxml-osba/main/xmloff/inc/xmloff/xmltoken.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/xmloff/inc/xmloff/xmltoken.hxx?rev=1546934&r1=1546933&r2=1546934&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/xmloff/inc/xmloff/xmltoken.hxx (original)
+++ openoffice/branches/ooxml-osba/main/xmloff/inc/xmloff/xmltoken.hxx Mon Dec  2 09:28:11
2013
@@ -147,6 +147,9 @@ namespace xmloff { namespace token {
         XML_NP_DRAW_EXT,
         XML_N_DRAW_EXT,
 
+        XML_NP_TEXT_EXT,
+        XML_N_TEXT_EXT,
+
         // units
         XML_UNIT_MM,
         XML_UNIT_M,

Modified: openoffice/branches/ooxml-osba/main/xmloff/source/core/xmlimp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/xmloff/source/core/xmlimp.cxx?rev=1546934&r1=1546933&r2=1546934&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/xmloff/source/core/xmlimp.cxx (original)
+++ openoffice/branches/ooxml-osba/main/xmloff/source/core/xmlimp.cxx Mon Dec  2 09:28:11
2013
@@ -92,6 +92,7 @@ sal_Char __READONLY_DATA sXML_np__oooc[]
 sal_Char __READONLY_DATA sXML_np__of[] = "_of";
 sal_Char __READONLY_DATA sXML_np__style[] = "_style";
 sal_Char __READONLY_DATA sXML_np__text[] = "_text";
+sal_Char __READONLY_DATA sXML_np__text_ext[] = "_text_ooo";
 sal_Char __READONLY_DATA sXML_np__table[] = "_table";
 sal_Char __READONLY_DATA sXML_np__table_ext[] = "_table_ooo";
 sal_Char __READONLY_DATA sXML_np__draw[] = "_draw";
@@ -308,8 +309,7 @@ void SvXMLImport::_InitCtor()
 	if( mnImportFlags != 0 )
 	{
 		// implicit "xml" namespace prefix
-		mpNamespaceMap->Add( GetXMLToken(XML_XML), GetXMLToken(XML_N_XML),
-                            XML_NAMESPACE_XML );
+        mpNamespaceMap->Add( GetXMLToken(XML_XML), GetXMLToken(XML_N_XML), XML_NAMESPACE_XML
);
 		mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__office ) ),
 							GetXMLToken(XML_N_OFFICE),
 							XML_NAMESPACE_OFFICE );
@@ -323,6 +323,9 @@ void SvXMLImport::_InitCtor()
 		mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__text) ),
 							GetXMLToken(XML_N_TEXT),
 							XML_NAMESPACE_TEXT );
+        mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__text_ext
) ),
+            GetXMLToken(XML_N_TEXT_EXT),
+            XML_NAMESPACE_TEXT_EXT );
 		mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__table ) ),
 							GetXMLToken(XML_N_TABLE),
 							XML_NAMESPACE_TABLE );

Modified: openoffice/branches/ooxml-osba/main/xmloff/source/core/xmltoken.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/xmloff/source/core/xmltoken.cxx?rev=1546934&r1=1546933&r2=1546934&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/xmloff/source/core/xmltoken.cxx (original)
+++ openoffice/branches/ooxml-osba/main/xmloff/source/core/xmltoken.cxx Mon Dec  2 09:28:11
2013
@@ -155,6 +155,9 @@ namespace xmloff { namespace token {
         TOKEN( "drawooo", XML_NP_DRAW_EXT ),
         TOKEN( "http://openoffice.org/2010/draw", XML_N_DRAW_EXT ),
 
+        TOKEN( "textooo", XML_NP_TEXT_EXT ),
+        TOKEN( "http://openoffice.org/2013/office", XML_N_TEXT_EXT ),
+
         // units
         TOKEN( "mm",                              XML_UNIT_MM ),
         TOKEN( "m",                               XML_UNIT_M ),

Modified: openoffice/branches/ooxml-osba/main/xmloff/source/text/txtflde.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/xmloff/source/text/txtflde.cxx?rev=1546934&r1=1546933&r2=1546934&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/xmloff/source/text/txtflde.cxx (original)
+++ openoffice/branches/ooxml-osba/main/xmloff/source/text/txtflde.cxx Mon Dec  2 09:28:11
2013
@@ -1764,13 +1764,14 @@ void XMLTextFieldExport::ExportFieldHelp
 		}
 
         // initials
+        if ( GetExport().getDefaultVersion() > SvtSaveOptions::ODFVER_012 )
         {
             OUString aInitials( GetStringProperty(sPropertyInitials, rPropSet) );
             if ( aInitials.getLength() > 0 )
             {
                 SvXMLElementExport aCreatorElem(
                     GetExport(),
-                    XML_NAMESPACE_TEXT,
+                    XML_NAMESPACE_TEXT_EXT,
                     XML_SENDER_INITIALS,
                     sal_True,
                     sal_False );

Modified: openoffice/branches/ooxml-osba/main/xmloff/source/text/txtfldi.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/xmloff/source/text/txtfldi.cxx?rev=1546934&r1=1546933&r2=1546934&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/xmloff/source/text/txtfldi.cxx (original)
+++ openoffice/branches/ooxml-osba/main/xmloff/source/text/txtfldi.cxx Mon Dec  2 09:28:11
2013
@@ -3682,7 +3682,8 @@ SvXMLImportContext* XMLAnnotationImportC
                 new XMLStringBufferImportContext( GetImport(), nPrefix, rLocalName, aDateBuffer);
         }
     }
-    else if ( XML_NAMESPACE_TEXT == nPrefix )
+    else if ( XML_NAMESPACE_TEXT == nPrefix
+              || XML_NAMESPACE_TEXT_EXT == nPrefix )
     {
         if( IsXMLToken( rLocalName, XML_SENDER_INITIALS ) )
         {



Mime
View raw message