Changed namespaces of some elements

xmloff/source/text/XMLTextFrameContext.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMLTextFrameContext.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mib $ $Date: 2000-09-26 08:10:55 $
+ *  last change: $Author: mib $ $Date: 2000-09-29 13:33:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -508,7 +508,7 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext(
 {
     SvXMLImportContext *pContext = 0;
 
-    if( XML_NAMESPACE_OFFICE == nPrefix &&
+    if( XML_NAMESPACE_SVG == nPrefix &&
         rLocalName.equalsAsciiL( sXML_desc, sizeof(sXML_desc)-1 ) )
         pContext = new XMLTextFrameDescContext_Impl( GetImport(),
                                               nPrefix, rLocalName,

xmloff/source/text/XMLTextFrameHyperlinkContext.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMLTextFrameHyperlinkContext.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: mib $ $Date: 2000-09-26 08:09:42 $
+ *  last change: $Author: mib $ $Date: 2000-09-29 13:33:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -165,13 +165,13 @@ SvXMLImportContext *XMLTextFrameHyperlinkContext::CreateChildContext(
 {
     SvXMLImportContext *pContext = 0;
 
-    if( XML_NAMESPACE_TEXT == nPrefix &&
+    if( XML_NAMESPACE_DRAW == nPrefix &&
         rLocalName.equalsAsciiL( sXML_text_box, sizeof(sXML_text_box)-1 ) )
         pContext = new XMLTextFrameContext( GetImport(), nPrefix,
                                             rLocalName, xAttrList,
                                             eAnchorType,
                                             XML_TEXT_FRAME_TEXTBOX);
-    else if( XML_NAMESPACE_OFFICE == nPrefix &&
+    else if( XML_NAMESPACE_DRAW == nPrefix &&
         rLocalName.equalsAsciiL( sXML_image, sizeof(sXML_image)-1 ) )
         pContext = new XMLTextFrameContext( GetImport(), nPrefix,
                                             rLocalName, xAttrList,

xmloff/source/text/txtimp.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtimp.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: dvo $ $Date: 2000-09-27 15:58:45 $
+ *  last change: $Author: mib $ $Date: 2000-09-29 13:33:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -176,8 +176,8 @@ static __FAR_DATA SvXMLTokenMapEntry aTextElemTokenMap[] =
     { XML_NAMESPACE_TEXT, sXML_h,               XML_TOK_TEXT_H              },
     { XML_NAMESPACE_TEXT, sXML_ordered_list,    XML_TOK_TEXT_ORDERED_LIST   },
     { XML_NAMESPACE_TEXT, sXML_unordered_list,  XML_TOK_TEXT_UNORDERED_LIST },
-    { XML_NAMESPACE_TEXT, sXML_text_box,        XML_TOK_TEXT_TEXTBOX_PAGE },
-    { XML_NAMESPACE_OFFICE, sXML_image,         XML_TOK_TEXT_IMAGE_PAGE },
+    { XML_NAMESPACE_DRAW, sXML_text_box,        XML_TOK_TEXT_TEXTBOX_PAGE },
+    { XML_NAMESPACE_DRAW, sXML_image,       XML_TOK_TEXT_IMAGE_PAGE },
     { XML_NAMESPACE_DRAW, sXML_a,               XML_TOK_DRAW_A_PAGE },
     { XML_NAMESPACE_TABLE,sXML_table,           XML_TOK_TABLE_TABLE         },
 //  { XML_NAMESPACE_TABLE,sXML_sub_table,       XML_TOK_TABLE_SUBTABLE      },
@@ -208,8 +208,8 @@ static __FAR_DATA SvXMLTokenMapEntry aTextPElemTokenMap[] =
     { XML_NAMESPACE_TEXT, sXML_reference_mark_end,
       XML_TOK_TEXT_REFERENCE_END },
 
-    { XML_NAMESPACE_TEXT, sXML_text_box, XML_TOK_TEXT_TEXTBOX },
-    { XML_NAMESPACE_OFFICE, sXML_image, XML_TOK_TEXT_IMAGE },
+    { XML_NAMESPACE_DRAW, sXML_text_box, XML_TOK_TEXT_TEXTBOX },
+    { XML_NAMESPACE_DRAW, sXML_image, XML_TOK_TEXT_IMAGE },
     { XML_NAMESPACE_DRAW, sXML_a,               XML_TOK_DRAW_A },
 
     // sender fields
@@ -355,7 +355,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextListBlockElemTokenMap[] =
 static __FAR_DATA SvXMLTokenMapEntry aTextFrameAttrTokenMap[] =
 {
     { XML_NAMESPACE_DRAW, sXML_style_name, XML_TOK_TEXT_FRAME_STYLE_NAME },
-    { XML_NAMESPACE_TEXT, sXML_name, XML_TOK_TEXT_FRAME_NAME },
+    { XML_NAMESPACE_DRAW, sXML_name, XML_TOK_TEXT_FRAME_NAME },
     { XML_NAMESPACE_TEXT, sXML_anchor_type, XML_TOK_TEXT_FRAME_ANCHOR_TYPE },
     { XML_NAMESPACE_TEXT, sXML_anchor_page_number, XML_TOK_TEXT_FRAME_ANCHOR_PAGE_NUMBER },
     { XML_NAMESPACE_SVG, sXML_x, XML_TOK_TEXT_FRAME_X },
@@ -364,9 +364,9 @@ static __FAR_DATA SvXMLTokenMapEntry aTextFrameAttrTokenMap[] =
 //  { XML_NAMESPACE_FO, sXML_min_width, XML_TOK_TEXT_FRAME_MIN_WIDTH },
     { XML_NAMESPACE_SVG, sXML_height, XML_TOK_TEXT_FRAME_HEIGHT },
     { XML_NAMESPACE_FO, sXML_min_height, XML_TOK_TEXT_FRAME_MIN_HEIGHT },
-    { XML_NAMESPACE_TEXT, sXML_chain_next_name, XML_TOK_TEXT_FRAME_NEXT_CHAIN_NAME },
+    { XML_NAMESPACE_DRAW, sXML_chain_next_name, XML_TOK_TEXT_FRAME_NEXT_CHAIN_NAME },
     { XML_NAMESPACE_XLINK, sXML_href, XML_TOK_TEXT_FRAME_HREF },
-    { XML_NAMESPACE_TEXT, sXML_name, XML_TOK_TEXT_FRAME_FILTER_NAME },
+    { XML_NAMESPACE_DRAW, sXML_name, XML_TOK_TEXT_FRAME_FILTER_NAME },
     XML_TOKEN_MAP_END
 };
 

xmloff/source/text/txtparae.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtparae.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: dvo $ $Date: 2000-09-27 15:58:45 $
+ *  last change: $Author: mib $ $Date: 2000-09-29 13:33:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1055,10 +1055,10 @@ void XMLTextParagraphExport::exportTextMark(
 void XMLTextParagraphExport::addTextFrameAttributes(
     const Reference < XPropertySet >& rPropSet )
 {
-    // text:name
+    // draw:name
     Reference < XNamed > xNamed( rPropSet, UNO_QUERY );
     if( xNamed.is() )
-        GetExport().AddAttribute( XML_NAMESPACE_TEXT, sXML_name,
+        GetExport().AddAttribute( XML_NAMESPACE_DRAW, sXML_name,
                                   xNamed->getName() );
 
     Any aAny;
@@ -1205,18 +1205,18 @@ void XMLTextParagraphExport::_exportTextFrame(
                                   sAutoStyle );
     addTextFrameAttributes( rPropSet );
 
-    // text:chain-next-name
+    // draw:chain-next-name
     if( rPropSetInfo->hasPropertyByName( sChainNextName ) )
     {
         OUString sNext;
         aAny = rPropSet->getPropertyValue( sChainNextName );
         if( (aAny >>= sNext) && sNext.getLength() > 0 )
-            GetExport().AddAttribute( XML_NAMESPACE_TEXT,
+            GetExport().AddAttribute( XML_NAMESPACE_DRAW,
                                       sXML_chain_next_name,
                                       sNext );
     }
 
-    SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT,
+    SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_DRAW,
                               sXML_text_box, sal_False, sal_True );
     exportText( xTxt, sal_False );
 }
@@ -1287,12 +1287,12 @@ void XMLTextParagraphExport::_exportTextGraphic(
     GetExport().AddAttributeASCII( XML_NAMESPACE_XLINK, sXML_actuate,
                                    sXML_onRequest );
 
-    // office:filter-name
+    // draw:filter-name
     OUString sGrfFilter;
     aAny = rPropSet->getPropertyValue( sGraphicFilter );
     aAny >>= sGrfFilter;
     if( sGrfFilter.getLength() )
-        GetExport().AddAttribute( XML_NAMESPACE_OFFICE, sXML_filter_name,
+        GetExport().AddAttribute( XML_NAMESPACE_DRAW, sXML_filter_name,
                                   sGrfFilter );
 
     SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_OFFICE,
@@ -1304,7 +1304,7 @@ void XMLTextParagraphExport::_exportTextGraphic(
     aAny >>= sAltText;
     if( sAltText.getLength() )
     {
-        SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_OFFICE,
+        SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_SVG,
                                   sXML_desc, sal_True, sal_False );
         GetExport().GetDocHandler()->characters( sAltText );
     }