diff options
Diffstat (limited to 'xmloff/source/draw')
25 files changed, 880 insertions, 884 deletions
diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx index 1ca1bfea62c0..a15f31c6f4bb 100644 --- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx +++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLGraphicsDefaultStyle.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: cl $ $Date: 2001-03-04 23:07:53 $ + * last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,8 +79,8 @@ #include "xmlnmspe.hxx" #endif -#ifndef _XMLOFF_XMLKYWD_HXX -#include "xmlkywd.hxx" +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" #endif #ifndef _XMLOFF_FAMILIES_HXX @@ -102,6 +102,9 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::xml::sax; +using ::xmloff::token::IsXMLToken; +using ::xmloff::token::XML_PROPERTIES; + // --------------------------------------------------------------------- TYPEINIT1( XMLGraphicsDefaultStyle, XMLPropStyleContext ); @@ -119,7 +122,7 @@ SvXMLImportContext *XMLGraphicsDefaultStyle::CreateChildContext( sal_uInt16 nPre { SvXMLImportContext *pContext = 0; - if( XML_NAMESPACE_STYLE == nPrefix && rLocalName.compareToAscii( sXML_properties ) == 0 ) + if( XML_NAMESPACE_STYLE == nPrefix && IsXMLToken( rLocalName, XML_PROPERTIES ) ) { UniReference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper( GetFamily() ); if( xImpPrMap.is() ) diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx index 1d94bcb04eb8..c27dae7b7203 100644 --- a/xmloff/source/draw/XMLImageMapContext.cxx +++ b/xmloff/source/draw/XMLImageMapContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLImageMapContext.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mib $ $Date: 2001-06-27 08:20:39 $ + * last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -99,8 +99,8 @@ #include <com/sun/star/awt/Rectangle.hpp> #endif -#ifndef _XMLOFF_XMLKYWD_HXX -#include "xmlkywd.hxx" +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" #endif #ifndef _XMLOFF_XMLIMP_HXX @@ -344,14 +344,14 @@ SvXMLImportContext* XMLImageMapObjectContext::CreateChildContext( const Reference<XAttributeList> & xAttrList ) { if ( (XML_NAMESPACE_OFFICE == nPrefix) && - (rLocalName.equalsAsciiL(sXML_events, sizeof(sXML_events)-1)) ) + IsXMLToken(rLocalName, XML_EVENTS) ) { Reference<XEventsSupplier> xEvents( xMapEntry, UNO_QUERY ); return new XMLEventsImportContext( GetImport(), nPrefix, rLocalName, xEvents); } else if ( (XML_NAMESPACE_SVG == nPrefix) && - (rLocalName.equalsAsciiL(sXML_desc, sizeof(sXML_desc)-1)) ) + IsXMLToken(rLocalName, XML_DESC) ) { return new XMLStringBufferImportContext( GetImport(), nPrefix, rLocalName, sDescriptionBuffer); @@ -377,8 +377,7 @@ void XMLImageMapObjectContext::ProcessAttribute( break; case XML_TOK_IMAP_NOHREF: - bIsActive = ! rValue.equalsAsciiL(sXML_nohref, - sizeof(sXML_nohref)-1); + bIsActive = ! IsXMLToken(rValue, XML_NOHREF); break; case XML_TOK_IMAP_NAME: @@ -763,20 +762,17 @@ SvXMLImportContext *XMLImageMapContext::CreateChildContext( if ( XML_NAMESPACE_DRAW == nPrefix ) { - if ( rLocalName.equalsAsciiL(sXML_area_rectangle, - sizeof(sXML_area_rectangle)-1) ) + if ( IsXMLToken(rLocalName, XML_AREA_RECTANGLE) ) { pContext = new XMLImageMapRectangleContext( GetImport(), nPrefix, rLocalName, xImageMap); } - else if ( rLocalName.equalsAsciiL(sXML_area_polygon, - sizeof(sXML_area_polygon)-1) ) + else if ( IsXMLToken(rLocalName, XML_AREA_POLYGON) ) { pContext = new XMLImageMapPolygonContext( GetImport(), nPrefix, rLocalName, xImageMap); } - else if ( rLocalName.equalsAsciiL(sXML_area_circle, - sizeof(sXML_area_circle)-1) ) + else if ( IsXMLToken(rLocalName, XML_AREA_CIRCLE) ) { pContext = new XMLImageMapCircleContext( GetImport(), nPrefix, rLocalName, xImageMap); diff --git a/xmloff/source/draw/XMLImageMapExport.cxx b/xmloff/source/draw/XMLImageMapExport.cxx index 449e1e532aa6..5dcc43dc91c4 100644 --- a/xmloff/source/draw/XMLImageMapExport.cxx +++ b/xmloff/source/draw/XMLImageMapExport.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLImageMapExport.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: mib $ $Date: 2001-06-27 08:20:39 $ + * last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -123,8 +123,8 @@ #include "xmlnmspe.hxx" #endif -#ifndef _XMLOFF_XMLKYWD_HXX -#include "xmlkywd.hxx" +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" #endif #ifndef _XMLOFF_XMLEVENTEXPORT_HXX @@ -142,6 +142,7 @@ using namespace ::com::sun::star; +using namespace ::xmloff::token; using ::rtl::OUString; using ::rtl::OUStringBuffer; @@ -204,8 +205,7 @@ void XMLImageMapExport::Export( { // image map container element SvXMLElementExport aImageMapElement( - rExport, - XML_NAMESPACE_DRAW, sXML_image_map, + rExport, XML_NAMESPACE_DRAW, XML_IMAGE_MAP, bWhiteSpace, bWhiteSpace); // iterate over image map elements and call ExportMapEntry(...) @@ -230,26 +230,13 @@ void XMLImageMapExport::Export( } -enum MapEntryType -{ - RECTANGLE, - CIRCLE, - POLYGON, - INVALID -}; - void XMLImageMapExport::ExportMapEntry( const Reference<XPropertySet> & rPropertySet) { - OUString sAreaRectangle(RTL_CONSTASCII_USTRINGPARAM(sXML_area_rectangle)); - OUString sAreaCircle(RTL_CONSTASCII_USTRINGPARAM(sXML_area_circle)); - OUString sAreaPolygon(RTL_CONSTASCII_USTRINGPARAM(sXML_area_polygon)); - - Reference<XServiceInfo> xServiceInfo(rPropertySet, UNO_QUERY); if (xServiceInfo.is()) { - enum MapEntryType eType = INVALID; + enum XMLTokenEnum eType = XML_TOKEN_INVALID; // distinguish map entries by their service name Sequence<OUString> sServiceNames = @@ -263,27 +250,27 @@ void XMLImageMapExport::ExportMapEntry( if ( rName.equalsAsciiL(sAPI_ImageMapRectangleObject, sizeof(sAPI_ImageMapRectangleObject)-1) ) { - eType = RECTANGLE; + eType = XML_AREA_RECTANGLE; break; } else if ( rName.equalsAsciiL(sAPI_ImageMapCircleObject, sizeof(sAPI_ImageMapCircleObject)-1) ) { - eType = CIRCLE; + eType = XML_AREA_CIRCLE; break; } else if ( rName.equalsAsciiL(sAPI_ImageMapPolygonObject, sizeof(sAPI_ImageMapPolygonObject)-1)) { - eType = POLYGON; + eType = XML_AREA_POLYGON; break; } } // return from method if no proper service is found! - DBG_ASSERT(INVALID != eType, + DBG_ASSERT(XML_TOKEN_INVALID != eType, "Image map element doesn't support appropriate service!"); - if (INVALID == eType) + if (XML_TOKEN_INVALID == eType) return; // now: handle ImageMapObject properties (those for all types) @@ -294,10 +281,9 @@ void XMLImageMapExport::ExportMapEntry( aAny >>= sHref; if (sHref.getLength() > 0) { - rExport.AddAttribute(XML_NAMESPACE_XLINK, sXML_href, rExport.GetRelativeReference(sHref)); + rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, rExport.GetRelativeReference(sHref)); } - rExport.AddAttributeASCII( XML_NAMESPACE_XLINK, sXML_type, - sXML_simple ); + rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); // Target property (and xlink:show) aAny = rPropertySet->getPropertyValue(sTarget); @@ -306,12 +292,12 @@ void XMLImageMapExport::ExportMapEntry( if (sTargt.getLength() > 0) { rExport.AddAttribute( - XML_NAMESPACE_OFFICE, sXML_target_frame_name, sTargt); + XML_NAMESPACE_OFFICE, XML_TARGET_FRAME_NAME, sTargt); - rExport.AddAttributeASCII( - XML_NAMESPACE_XLINK, sXML_show, + rExport.AddAttribute( + XML_NAMESPACE_XLINK, XML_SHOW, sTargt.equalsAsciiL( "_blank", sizeof("_blank")-1 ) - ? sXML_new : sXML_replace ); + ? XML_NEW : XML_REPLACE ); } // name @@ -320,40 +306,35 @@ void XMLImageMapExport::ExportMapEntry( aAny >>= sItemName; if (sItemName.getLength() > 0) { - rExport.AddAttribute(XML_NAMESPACE_OFFICE, sXML_name, sItemName); + rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_NAME, sItemName); } // is-active aAny = rPropertySet->getPropertyValue(sIsActive); if (! *(sal_Bool*)aAny.getValue()) { - rExport.AddAttributeASCII(XML_NAMESPACE_DRAW, sXML_nohref, - sXML_nohref); + rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_NOHREF, XML_NOHREF); } // call specific rectangle/circle/... method // also prepare element name - OUString* pElementName = NULL; switch (eType) { - case RECTANGLE: + case XML_AREA_RECTANGLE: ExportRectangle(rPropertySet); - pElementName = &sAreaRectangle; break; - case CIRCLE: + case XML_AREA_CIRCLE: ExportCircle(rPropertySet); - pElementName = &sAreaCircle; break; - case POLYGON: + case XML_AREA_POLYGON: ExportPolygon(rPropertySet); - pElementName = &sAreaPolygon; break; } // write element - DBG_ASSERT(NULL != pElementName, "No name?! How did this happen?"); - SvXMLElementExport aAreaElement(rExport, - XML_NAMESPACE_DRAW, *pElementName, + DBG_ASSERT(XML_TOKEN_INVALID != eType, + "No name?! How did this happen?"); + SvXMLElementExport aAreaElement(rExport, XML_NAMESPACE_DRAW, eType, bWhiteSpace, bWhiteSpace); // description property (as <svg:desc> element) @@ -362,7 +343,7 @@ void XMLImageMapExport::ExportMapEntry( aAny >>= sDescription; if (sDescription.getLength() > 0) { - SvXMLElementExport aDesc(rExport, XML_NAMESPACE_SVG, sXML_desc, + SvXMLElementExport aDesc(rExport, XML_NAMESPACE_SVG, XML_DESC, bWhiteSpace, sal_False); rExport.GetDocHandler()->characters(sDescription); } @@ -385,16 +366,16 @@ void XMLImageMapExport::ExportRectangle( // parameters svg:x, svg:y, svg:width, svg:height OUStringBuffer aBuffer; rExport.GetMM100UnitConverter().convertMeasure(aBuffer, aRectangle.X); - rExport.AddAttribute( XML_NAMESPACE_SVG, sXML_x, + rExport.AddAttribute( XML_NAMESPACE_SVG, XML_X, aBuffer.makeStringAndClear() ); rExport.GetMM100UnitConverter().convertMeasure(aBuffer, aRectangle.Y); - rExport.AddAttribute( XML_NAMESPACE_SVG, sXML_y, + rExport.AddAttribute( XML_NAMESPACE_SVG, XML_Y, aBuffer.makeStringAndClear() ); rExport.GetMM100UnitConverter().convertMeasure(aBuffer, aRectangle.Width); - rExport.AddAttribute( XML_NAMESPACE_SVG, sXML_width, + rExport.AddAttribute( XML_NAMESPACE_SVG, XML_WIDTH, aBuffer.makeStringAndClear() ); rExport.GetMM100UnitConverter().convertMeasure(aBuffer, aRectangle.Height); - rExport.AddAttribute( XML_NAMESPACE_SVG, sXML_height, + rExport.AddAttribute( XML_NAMESPACE_SVG, XML_HEIGHT, aBuffer.makeStringAndClear() ); } @@ -409,10 +390,10 @@ void XMLImageMapExport::ExportCircle( // parameters svg:cx, svg:cy OUStringBuffer aBuffer; rExport.GetMM100UnitConverter().convertMeasure(aBuffer, aCenter.X); - rExport.AddAttribute( XML_NAMESPACE_SVG, sXML_cx, + rExport.AddAttribute( XML_NAMESPACE_SVG, XML_CX, aBuffer.makeStringAndClear() ); rExport.GetMM100UnitConverter().convertMeasure(aBuffer, aCenter.Y); - rExport.AddAttribute( XML_NAMESPACE_SVG, sXML_cy, + rExport.AddAttribute( XML_NAMESPACE_SVG, XML_CY, aBuffer.makeStringAndClear() ); // radius @@ -420,7 +401,7 @@ void XMLImageMapExport::ExportCircle( sal_Int32 nRadius; aAny >>= nRadius; rExport.GetMM100UnitConverter().convertMeasure(aBuffer, nRadius); - rExport.AddAttribute( XML_NAMESPACE_SVG, sXML_r, + rExport.AddAttribute( XML_NAMESPACE_SVG, XML_R, aBuffer.makeStringAndClear() ); } @@ -457,18 +438,18 @@ void XMLImageMapExport::ExportPolygon( // parameters svg:x, svg:y, svg:width, svg:height OUStringBuffer aBuffer; - rExport.AddAttributeASCII( XML_NAMESPACE_SVG, sXML_x, "0" ); - rExport.AddAttributeASCII( XML_NAMESPACE_SVG, sXML_y, "0" ); + rExport.AddAttribute( XML_NAMESPACE_SVG, XML_X, XML_0 ); + rExport.AddAttribute( XML_NAMESPACE_SVG, XML_Y, XML_0 ); rExport.GetMM100UnitConverter().convertMeasure(aBuffer, nWidth); - rExport.AddAttribute( XML_NAMESPACE_SVG, sXML_width, + rExport.AddAttribute( XML_NAMESPACE_SVG, XML_WIDTH, aBuffer.makeStringAndClear() ); rExport.GetMM100UnitConverter().convertMeasure(aBuffer, nHeight); - rExport.AddAttribute( XML_NAMESPACE_SVG, sXML_height, + rExport.AddAttribute( XML_NAMESPACE_SVG, XML_HEIGHT, aBuffer.makeStringAndClear() ); // svg:viewbox SdXMLImExViewBox aViewBox(0, 0, nWidth, nHeight); - rExport.AddAttribute(XML_NAMESPACE_SVG, sXML_viewBox, + rExport.AddAttribute(XML_NAMESPACE_SVG, XML_VIEWBOX, aViewBox.GetExportString(rExport.GetMM100UnitConverter())); // export point sequence @@ -476,6 +457,6 @@ void XMLImageMapExport::ExportPolygon( awt::Size aSize(nWidth, nHeight); SdXMLImExPointsElement aPoints( &aPoly, aViewBox, aPoint, aSize, rExport.GetMM100UnitConverter() ); - rExport.AddAttribute( XML_NAMESPACE_SVG, sXML_points, + rExport.AddAttribute( XML_NAMESPACE_SVG, XML_POINTS, aPoints.GetExportString()); } diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx index d20c66a46a91..0189481e72a2 100644 --- a/xmloff/source/draw/XMLNumberStyles.cxx +++ b/xmloff/source/draw/XMLNumberStyles.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLNumberStyles.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: cl $ $Date: 2001-05-11 09:19:17 $ + * last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,15 +83,19 @@ #include "nmspmap.hxx" #endif -#include "xmlkywd.hxx" +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" +#endif + #include "sdxmlexp_impl.hxx" #include "sdxmlimp_impl.hxx" using namespace rtl; +using namespace ::xmloff::token; struct SdXMLDataStyleNumber { - const char* mpNumberStyle; + enum XMLTokenEnum meNumberStyle; sal_Bool mbLong; sal_Bool mbTextual; sal_Bool mbDecimal02; @@ -99,26 +103,26 @@ struct SdXMLDataStyleNumber } aSdXMLDataStyleNumbers[] = { - { sXML_day, sal_False, sal_False, sal_False, NULL }, - { sXML_day, sal_True, sal_False, sal_False, NULL }, - { sXML_month, sal_True, sal_False, sal_False, NULL }, - { sXML_month, sal_False, sal_True, sal_False, NULL }, - { sXML_month, sal_True, sal_True, sal_False, NULL }, - { sXML_year, sal_False, sal_False, sal_False, NULL }, - { sXML_year, sal_True, sal_False, sal_False, NULL }, - { sXML_day_of_week, sal_False, sal_False, sal_False, NULL }, - { sXML_day_of_week, sal_True, sal_False, sal_False, NULL }, - { sXML_text, sal_False, sal_False, sal_False, "." }, - { sXML_text, sal_False, sal_False, sal_False, " " }, - { sXML_text, sal_False, sal_False, sal_False, ", " }, - { sXML_text, sal_False, sal_False, sal_False, ". " }, - { sXML_hours, sal_False, sal_False, sal_False, NULL }, - { sXML_minutes, sal_False, sal_False, sal_False, NULL }, - { sXML_text, sal_False, sal_False, sal_False, ":" }, - { sXML_am_pm, sal_False, sal_False, sal_False, NULL }, - { sXML_seconds, sal_False, sal_False, sal_False, NULL }, - { sXML_seconds, sal_False, sal_False, sal_True, NULL }, - { NULL } + { XML_DAY, sal_False, sal_False, sal_False, NULL }, + { XML_DAY, sal_True, sal_False, sal_False, NULL }, + { XML_MONTH, sal_True, sal_False, sal_False, NULL }, + { XML_MONTH, sal_False, sal_True, sal_False, NULL }, + { XML_MONTH, sal_True, sal_True, sal_False, NULL }, + { XML_YEAR, sal_False, sal_False, sal_False, NULL }, + { XML_YEAR, sal_True, sal_False, sal_False, NULL }, + { XML_DAY_OF_WEEK, sal_False, sal_False, sal_False, NULL }, + { XML_DAY_OF_WEEK, sal_True, sal_False, sal_False, NULL }, + { XML_TEXT, sal_False, sal_False, sal_False, "." }, + { XML_TEXT, sal_False, sal_False, sal_False, " " }, + { XML_TEXT, sal_False, sal_False, sal_False, ", " }, + { XML_TEXT, sal_False, sal_False, sal_False, ". " }, + { XML_HOURS, sal_False, sal_False, sal_False, NULL }, + { XML_MINUTES, sal_False, sal_False, sal_False, NULL }, + { XML_TEXT, sal_False, sal_False, sal_False, ":" }, + { XML_AM_PM, sal_False, sal_False, sal_False, NULL }, + { XML_SECONDS, sal_False, sal_False, sal_False, NULL }, + { XML_SECONDS, sal_False, sal_False, sal_True, NULL }, + { XML_TOKEN_INVALID, NULL } }; // date @@ -376,19 +380,18 @@ static void SdXMLExportStyle( SdXMLExport& rExport, const SdXMLFixedDataStyle* p // name sAttrValue = OUString::createFromAscii( pStyle->mpName ); - rExport.AddAttribute( XML_NAMESPACE_STYLE, sXML_name, sAttrValue ); + rExport.AddAttribute( XML_NAMESPACE_STYLE, XML_NAME, sAttrValue ); // family sAttrValue = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("data-style")); - rExport.AddAttribute( XML_NAMESPACE_STYLE, sXML_family, sAttrValue ); + rExport.AddAttribute( XML_NAMESPACE_STYLE, XML_FAMILY, sAttrValue ); if( pStyle->mbAutomatic ) { - sAttrValue = OUString::createFromAscii( sXML_true ); - rExport.AddAttribute( XML_NAMESPACE_NUMBER, sXML_automatic_order, sAttrValue ); + rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_AUTOMATIC_ORDER, XML_TRUE ); } - SvXMLElementExport aElement( rExport, XML_NAMESPACE_NUMBER, pStyle->mbDateStyle ? sXML_date_style : sXML_time_style, sal_True, sal_True ); + SvXMLElementExport aElement( rExport, XML_NAMESPACE_NUMBER, pStyle->mbDateStyle ? XML_DATE_STYLE : XML_TIME_STYLE, sal_True, sal_True ); const sal_uInt8* pElements = (const sal_uInt8*)&pStyle->mpFormat[0]; @@ -398,23 +401,20 @@ static void SdXMLExportStyle( SdXMLExport& rExport, const SdXMLFixedDataStyle* p if( rElement.mbDecimal02 ) { - sAttrValue = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")); - rExport.AddAttribute( XML_NAMESPACE_NUMBER, sXML_decimal_places, sAttrValue ); + rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_DECIMAL_PLACES, XML_2 ); } if( rElement.mbLong ) { - sAttrValue = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_long)); - rExport.AddAttribute( XML_NAMESPACE_NUMBER, sXML_style, sAttrValue ); + rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_STYLE, XML_LONG ); } if( rElement.mbTextual ) { - sAttrValue = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_true)); - rExport.AddAttribute( XML_NAMESPACE_NUMBER, sXML_textual, sAttrValue ); + rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_TEXTUAL, XML_TRUE ); } - SvXMLElementExport aNumberStyle( rExport, XML_NAMESPACE_NUMBER, rElement.mpNumberStyle, sal_True, sal_False ); + SvXMLElementExport aNumberStyle( rExport, XML_NAMESPACE_NUMBER, rElement.meNumberStyle, sal_True, sal_False ); if( rElement.mpText ) { sAttrValue = OUString::createFromAscii( rElement.mpText ); @@ -518,17 +518,17 @@ SdXMLNumberFormatMemberImportContext::SdXMLNumberFormatMemberImportContext( SvXM if( nPrefix == XML_NAMESPACE_NUMBER ) { - if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_decimal_places ) ) ) + if( IsXMLToken( aLocalName, XML_DECIMAL_PLACES ) ) { - mbDecimal02 = sValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("2") ); + mbDecimal02 = IsXMLToken( sValue, XML_2 ); } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_style ) ) ) + else if( IsXMLToken( aLocalName, XML_STYLE ) ) { - mbLong = sValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_long ) ); + mbLong = IsXMLToken( sValue, XML_LONG ); } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_textual ) ) ) + else if( IsXMLToken( aLocalName, XML_TEXTUAL ) ) { - mbTextual = sValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_true ) ); + mbTextual = IsXMLToken( sValue, XML_TRUE ); } } } @@ -557,7 +557,7 @@ SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport& rIm : SvXMLStyleContext(rImport, nPrfx, rLocalName, xAttrList), mbAutomatic( sal_False ), mnIndex(0), mrImport( rImport ), mnKey( -1 ) { - mbTimeStyle = rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_time_style ) ); + mbTimeStyle = IsXMLToken( rLocalName, XML_TIME_STYLE ); const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for(sal_Int16 i=0; i < nAttrCount; i++) @@ -569,9 +569,9 @@ SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport& rIm if( nPrefix == XML_NAMESPACE_NUMBER ) { - if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_automatic_order ) ) ) + if( IsXMLToken( aLocalName, XML_AUTOMATIC_ORDER ) ) { - mbAutomatic = sValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_true ) ); + mbAutomatic = IsXMLToken( sValue, XML_TRUE ); } } } @@ -590,9 +590,9 @@ void SdXMLNumberFormatImportContext::add( OUString& rNumberStyle, sal_Bool bLong } const SdXMLDataStyleNumber* pStyleMember = aSdXMLDataStyleNumbers; - for( sal_uInt8 nIndex = 0; pStyleMember->mpNumberStyle; nIndex++, pStyleMember++ ) + for( sal_uInt8 nIndex = 0; pStyleMember->meNumberStyle != XML_TOKEN_INVALID; nIndex++, pStyleMember++ ) { - if( ((rNumberStyle.compareToAscii( pStyleMember->mpNumberStyle ) == 0) && + if( (IsXMLToken(rNumberStyle, pStyleMember->meNumberStyle) && (pStyleMember->mbLong == bLong) && (pStyleMember->mbTextual == bTextual) && (pStyleMember->mbDecimal02 == bDecimal02) && diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx index f8dd500d591b..06232539b914 100644 --- a/xmloff/source/draw/XMLShapeStyleContext.cxx +++ b/xmloff/source/draw/XMLShapeStyleContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLShapeStyleContext.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: fs $ $Date: 2001-05-28 15:07:00 $ + * last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,8 +61,6 @@ #include <tools/debug.hxx> -#include "xmlkywd.hxx" - #ifndef _XMLOFF_XMLSHAPESTYLECONTEXT_HXX #include "XMLShapeStyleContext.hxx" #endif @@ -95,6 +93,8 @@ using namespace ::rtl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; +using ::xmloff::token::IsXMLToken; +using ::xmloff::token::XML_PROPERTIES; ////////////////////////////////////////////////////////////////////////////// @@ -135,7 +135,7 @@ SvXMLImportContext *XMLShapeStyleContext::CreateChildContext( SvXMLImportContext *pContext = 0; if( XML_NAMESPACE_STYLE == nPrefix && - rLocalName.compareToAscii( sXML_properties ) == 0 ) + IsXMLToken( rLocalName, XML_PROPERTIES ) ) { UniReference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper( GetFamily() ); diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx index 36e7c05bbd5c..4f24a31d150b 100644 --- a/xmloff/source/draw/animexp.cxx +++ b/xmloff/source/draw/animexp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: animexp.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: cl $ $Date: 2001-06-27 13:56:27 $ + * last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,7 +78,9 @@ #include <tools/color.hxx> #endif -#include "xmlkywd.hxx" +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" +#endif #ifndef _XMLOFF_XMLNMSPE_HXX #include "xmlnmspe.hxx" @@ -539,7 +541,7 @@ void XMLAnimationsExporter::exportAnimations( SvXMLExport& rExport ) if( aIter != aEnd ) { - SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, sXML_animations, sal_True, sal_True ); + SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, XML_ANIMATIONS, sal_True, sal_True ); do { @@ -547,26 +549,26 @@ void XMLAnimationsExporter::exportAnimations( SvXMLExport& rExport ) DBG_ASSERT( rEffect.mnShapeId != -1, "shape id creation failed for animation effect?" ); - rExport.AddAttribute( XML_NAMESPACE_DRAW, sXML_shape_id, OUString::valueOf( rEffect.mnShapeId ) ); + rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_SHAPE_ID, OUString::valueOf( rEffect.mnShapeId ) ); if( rEffect.meKind == XMLE_DIM ) { // export a dim action; SvXMLUnitConverter::convertColor( sTmp, rEffect.maDimColor ); - rExport.AddAttribute( XML_NAMESPACE_DRAW, sXML_color, sTmp.makeStringAndClear() ); + rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_COLOR, sTmp.makeStringAndClear() ); - SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, sXML_dim, sal_True, sal_True ); + SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, XML_DIM, sal_True, sal_True ); } else if( rEffect.meKind == XMLE_PLAY ) { if( rEffect.meSpeed != AnimationSpeed_MEDIUM ) { SvXMLUnitConverter::convertEnum( sTmp, rEffect.meSpeed, aXML_AnimationSpeed_EnumMap ); - rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, sXML_speed, sTmp.makeStringAndClear() ); + rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_SPEED, sTmp.makeStringAndClear() ); } - SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, sXML_play, sal_True, sal_True ); + SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, XML_PLAY, sal_True, sal_True ); } else { @@ -574,59 +576,59 @@ void XMLAnimationsExporter::exportAnimations( SvXMLExport& rExport ) if( rEffect.meEffect != EK_none ) { SvXMLUnitConverter::convertEnum( sTmp, rEffect.meEffect, aXML_AnimationEffect_EnumMap ); - rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, sXML_effect, sTmp.makeStringAndClear() ); + rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_EFFECT, sTmp.makeStringAndClear() ); } if( rEffect.meDirection != ED_none ) { SvXMLUnitConverter::convertEnum( sTmp, rEffect.meDirection, aXML_AnimationDirection_EnumMap ); - rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, sXML_direction, sTmp.makeStringAndClear() ); + rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_DIRECTION, sTmp.makeStringAndClear() ); } if( rEffect.mnStartScale != -1 ) { SvXMLUnitConverter::convertPercent( sTmp, rEffect.mnStartScale ); - rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, sXML_start_scale, sTmp.makeStringAndClear() ); + rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_START_SCALE, sTmp.makeStringAndClear() ); } if( rEffect.meSpeed != AnimationSpeed_MEDIUM ) { SvXMLUnitConverter::convertEnum( sTmp, rEffect.meSpeed, aXML_AnimationSpeed_EnumMap ); - rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, sXML_speed, sTmp.makeStringAndClear() ); + rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_SPEED, sTmp.makeStringAndClear() ); } if( rEffect.mnPathShapeId != -1 ) { - rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, sXML_path_id, OUString::valueOf( rEffect.mnPathShapeId ) ); + rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_PATH_ID, OUString::valueOf( rEffect.mnPathShapeId ) ); } - char *pLocalName; + enum XMLTokenEnum eLocalName; if( rEffect.meKind == XMLE_SHOW ) { if( rEffect.mbTextEffect ) - pLocalName = sXML_show_text; + eLocalName = XML_SHOW_TEXT; else - pLocalName = sXML_show_shape; + eLocalName = XML_SHOW_SHAPE; } else { if( rEffect.mbTextEffect ) - pLocalName = sXML_hide_text; + eLocalName = XML_HIDE_TEXT; else - pLocalName = sXML_hide_shape; + eLocalName = XML_HIDE_SHAPE; } - SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, pLocalName, sal_True, sal_True ); + SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, eLocalName, sal_True, sal_True ); if( rEffect.maSoundURL.getLength() != 0 ) { - rExport.AddAttribute(XML_NAMESPACE_XLINK, sXML_href, rExport.GetRelativeReference(rEffect.maSoundURL) ); - rExport.AddAttributeASCII( XML_NAMESPACE_XLINK, sXML_type, sXML_simple ); - rExport.AddAttributeASCII( XML_NAMESPACE_XLINK, sXML_show, sXML_new ); - rExport.AddAttributeASCII( XML_NAMESPACE_XLINK, sXML_actuate, sXML_onRequest ); + rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, rExport.GetRelativeReference(rEffect.maSoundURL) ); + rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); + rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_NEW ); + rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONREQUEST ); if( rEffect.mbPlayFull ) - rExport.AddAttributeASCII( XML_NAMESPACE_PRESENTATION, sXML_play_full, sXML_true ); + rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_PLAY_FULL, XML_TRUE ); - SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, sXML_sound, sal_True, sal_True ); + SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, XML_SOUND, sal_True, sal_True ); } } diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx index c20044ea48f6..19860ccbea4d 100644 --- a/xmloff/source/draw/animimp.cxx +++ b/xmloff/source/draw/animimp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: animimp.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: cl $ $Date: 2001-06-27 13:58:03 $ + * last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,7 +87,9 @@ #include <comphelper/extract.hxx> #endif -#include "xmlkywd.hxx" +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" +#endif #ifndef _XMLOFF_XMLIMP_HXX #include "xmlimp.hxx" @@ -129,6 +131,7 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::presentation; +using namespace ::xmloff::token; AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirection, sal_Int16 nStartScale, sal_Bool bIn ) { @@ -433,7 +436,7 @@ TYPEINIT1( XMLAnimationsSoundContext, SvXMLImportContext ); XMLAnimationsSoundContext::XMLAnimationsSoundContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, XMLAnimationsEffectContext* pParent ) : SvXMLImportContext( rImport, nPrfx, rLocalName ), mpParent( pParent ) { - if( mpParent && nPrfx == XML_NAMESPACE_PRESENTATION && rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_sound ) ) ) + if( mpParent && nPrfx == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_SOUND ) ) { const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for(sal_Int16 i=0; i < nAttrCount; i++) @@ -446,15 +449,15 @@ XMLAnimationsSoundContext::XMLAnimationsSoundContext( SvXMLImport& rImport, sal_ switch( nPrefix ) { case XML_NAMESPACE_XLINK: - if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_href ) ) ) + if( IsXMLToken( aLocalName, XML_HREF ) ) { mpParent->maSoundURL = rImport.GetAbsoluteReference(sValue); } break; case XML_NAMESPACE_PRESENTATION: - if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_play_full ) ) ) + if( IsXMLToken( aLocalName, XML_PLAY_FULL ) ) { - mpParent->mbPlayFull = sValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_true ) ); + mpParent->mbPlayFull = IsXMLToken( sValue, XML_TRUE ); } } } @@ -475,29 +478,29 @@ XMLAnimationsEffectContext::XMLAnimationsEffectContext( SvXMLImport& rImport, s meEffect( EK_none ), meDirection( ED_none ), mnStartScale( 100 ), meSpeed( AnimationSpeed_MEDIUM ), maDimColor(0), mbPlayFull( sal_False ) { - if( rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_show_shape ) ) ) + if( IsXMLToken( rLocalName, XML_SHOW_SHAPE ) ) { meKind = XMLE_SHOW; } - else if( rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_show_text ) ) ) + else if( IsXMLToken( rLocalName, XML_SHOW_TEXT ) ) { meKind = XMLE_SHOW; mbTextEffect = sal_True; } - else if( rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_hide_shape ) ) ) + else if( IsXMLToken( rLocalName, XML_HIDE_SHAPE ) ) { meKind = XMLE_HIDE; } - else if( rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_hide_text ) ) ) + else if( IsXMLToken( rLocalName, XML_HIDE_TEXT ) ) { meKind = XMLE_HIDE; mbTextEffect = sal_True; } - else if( rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_dim ) ) ) + else if( IsXMLToken( rLocalName, XML_DIM ) ) { meKind = XMLE_DIM; } - else if( rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_play ) ) ) + else if( IsXMLToken( rLocalName, XML_PLAY ) ) { meKind = XMLE_PLAY; } @@ -519,42 +522,42 @@ XMLAnimationsEffectContext::XMLAnimationsEffectContext( SvXMLImport& rImport, s switch( nPrefix ) { case XML_NAMESPACE_DRAW: - if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_shape_id ) ) ) + if( IsXMLToken( aLocalName, XML_SHAPE_ID ) ) { SvXMLUnitConverter::convertNumber(mnShapeId, sValue); } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_color ) ) ) + else if( IsXMLToken( aLocalName, XML_COLOR ) ) { SvXMLUnitConverter::convertColor(maDimColor, sValue); } break; case XML_NAMESPACE_PRESENTATION: - if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_effect ) ) ) + if( IsXMLToken( aLocalName, XML_EFFECT ) ) { USHORT eEnum; if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_AnimationEffect_EnumMap ) ) meEffect = (XMLEffect)eEnum; } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_direction ) ) ) + else if( IsXMLToken(aLocalName, XML_DIRECTION ) ) { USHORT eEnum; if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_AnimationDirection_EnumMap ) ) meDirection = (XMLEffectDirection)eEnum; } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_start_scale ) ) ) + else if( IsXMLToken( aLocalName, XML_START_SCALE ) ) { sal_Int32 nScale; if( SvXMLUnitConverter::convertPercent( nScale, sValue ) ) mnStartScale = (sal_Int16)nScale; } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_speed ) ) ) + else if( IsXMLToken( aLocalName, XML_SPEED ) ) { USHORT eEnum; if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_AnimationSpeed_EnumMap ) ) meSpeed = (AnimationSpeed)eEnum; } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_path_id ) ) ) + else if( IsXMLToken( aLocalName, XML_PATH_ID ) ) { SvXMLUnitConverter::convertNumber(mnPathShapeId, sValue); } diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index 4f573cf7dd21..cbd3c9d35e5d 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: eventimp.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: cl $ $Date: 2001-06-27 14:02:50 $ + * last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,7 +84,9 @@ #include <comphelper/extract.hxx> #endif -#include "xmlkywd.hxx" +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" +#endif #ifndef _XMLOFF_XMLIMP_HXX #include "xmlimp.hxx" @@ -197,7 +199,7 @@ TYPEINIT1( XMLEventSoundContext, SvXMLImportContext ); XMLEventSoundContext::XMLEventSoundContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, SdXMLEventContext* pParent ) : SvXMLImportContext( rImport, nPrfx, rLocalName ), mpParent( pParent ) { - if( mpParent && nPrfx == XML_NAMESPACE_PRESENTATION && rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_sound ) ) ) + if( mpParent && nPrfx == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_SOUND ) ) { const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for(sal_Int16 i=0; i < nAttrCount; i++) @@ -210,15 +212,15 @@ XMLEventSoundContext::XMLEventSoundContext( SvXMLImport& rImport, sal_uInt16 nPr switch( nPrefix ) { case XML_NAMESPACE_XLINK: - if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_href ) ) ) + if( IsXMLToken( aLocalName, XML_HREF ) ) { mpParent->msSoundURL = rImport.GetAbsoluteReference(sValue); } break; case XML_NAMESPACE_PRESENTATION: - if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_play_full ) ) ) + if( IsXMLToken( aLocalName, XML_PLAY_FULL ) ) { - mpParent->mbPlayFull = sValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_true ) ); + mpParent->mbPlayFull = IsXMLToken( sValue, XML_TRUE ); } } } @@ -241,11 +243,11 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImport, sal_uInt16 nPrfx, c { const OUString msXMLEventName( RTL_CONSTASCII_USTRINGPARAM( "on-click" ) ); - if( nPrfx == XML_NAMESPACE_PRESENTATION && rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_event ) ) ) + if( nPrfx == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_EVENT ) ) { mbValid = sal_True; } - else if( nPrfx == XML_NAMESPACE_SCRIPT && rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_event ) ) ) + else if( nPrfx == XML_NAMESPACE_SCRIPT && IsXMLToken( rLocalName, XML_EVENT ) ) { mbScript = sal_True; mbValid = sal_True; @@ -267,64 +269,64 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImport, sal_uInt16 nPrfx, c switch( nPrefix ) { case XML_NAMESPACE_PRESENTATION: - if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_action ) ) ) + if( IsXMLToken( aLocalName, XML_ACTION ) ) { USHORT eEnum; if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_EventActions_EnumMap ) ) meClickAction = (ClickAction)eEnum; } - if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_effect ) ) ) + if( IsXMLToken( aLocalName, XML_EFFECT ) ) { USHORT eEnum; if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_AnimationEffect_EnumMap ) ) meEffect = (XMLEffect)eEnum; } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_direction ) ) ) + else if( IsXMLToken( aLocalName, XML_DIRECTION ) ) { USHORT eEnum; if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_AnimationDirection_EnumMap ) ) meDirection = (XMLEffectDirection)eEnum; } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_start_scale ) ) ) + else if( IsXMLToken( aLocalName, XML_START_SCALE ) ) { sal_Int32 nScale; if( SvXMLUnitConverter::convertPercent( nScale, sValue ) ) mnStartScale = (sal_Int16)nScale; } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_speed ) ) ) + else if( IsXMLToken( aLocalName, XML_SPEED ) ) { USHORT eEnum; if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_AnimationSpeed_EnumMap ) ) meSpeed = (AnimationSpeed)eEnum; } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_verb ) ) ) + else if( IsXMLToken( aLocalName, XML_VERB ) ) { SvXMLUnitConverter::convertNumber( mnVerb, sValue ); } break; case XML_NAMESPACE_SCRIPT: - if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_event_name ) ) ) + if( IsXMLToken( aLocalName, XML_EVENT_NAME ) ) { msEventName = sValue; mbValid = msEventName == msXMLEventName; } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_language ) ) ) + else if( IsXMLToken( aLocalName, XML_LANGUAGE ) ) { msLanguage = sValue; } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_macro_name ) ) ) + else if( IsXMLToken( aLocalName, XML_MACRO_NAME ) ) { msMacroName = sValue; } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_library ) ) ) + else if( IsXMLToken( aLocalName, XML_LIBRARY ) ) { msLibrary = sValue; } break; case XML_NAMESPACE_XLINK: - if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_href ) ) ) + if( IsXMLToken( aLocalName, XML_HREF ) ) { msBookmark = rImport.GetAbsoluteReference(sValue); } diff --git a/xmloff/source/draw/layerexp.cxx b/xmloff/source/draw/layerexp.cxx index 4afc669ddf6c..aad3e03211bc 100644 --- a/xmloff/source/draw/layerexp.cxx +++ b/xmloff/source/draw/layerexp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: layerexp.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: cl $ $Date: 2001-05-14 11:35:10 $ + * last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,7 +73,9 @@ #include <com/sun/star/beans/XPropertySet.hpp> #endif -#include "xmlkywd.hxx" +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" +#endif #ifndef _XMLOFF_XMLNMSPE_HXX #include "xmlnmspe.hxx" @@ -103,7 +105,7 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; - +using namespace ::xmloff::token; void SdXMLayerExporter::exportLayer( SvXMLExport& rExport ) { @@ -125,7 +127,7 @@ void SdXMLayerExporter::exportLayer( SvXMLExport& rExport ) OUStringBuffer sTmp; OUString aName; - SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, sXML_layer_set, sal_True, sal_True ); + SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, XML_LAYER_SET, sal_True, sal_True ); for( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ ) { @@ -135,10 +137,10 @@ void SdXMLayerExporter::exportLayer( SvXMLExport& rExport ) { if( xLayer->getPropertyValue( strName ) >>= aName ) { - rExport.AddAttribute( XML_NAMESPACE_DRAW, sXML_name, aName ); + rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aName ); } - SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, sXML_layer, sal_True, sal_True ); + SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, XML_LAYER, sal_True, sal_True ); } } } diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx index 47be200c355d..d5082ea7ecd1 100644 --- a/xmloff/source/draw/layerimp.cxx +++ b/xmloff/source/draw/layerimp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: layerimp.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: cl $ $Date: 2001-05-11 07:38:35 $ + * last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,7 +78,9 @@ #include <comphelper/extract.hxx> #endif -#include "xmlkywd.hxx" +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" +#endif #ifndef _XMLOFF_XMLIMP_HXX #include "xmlimp.hxx" @@ -111,6 +113,9 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; +using ::xmloff::token::IsXMLToken; +using ::xmloff::token::XML_NAME; + TYPEINIT1( SdXMLLayerSetContext, SvXMLImportContext ); @@ -145,7 +150,7 @@ SvXMLImportContext * SdXMLLayerSetContext::CreateChildContext( USHORT nPrefix, c { const OUString sValue( xAttrList->getValueByIndex( i ) ); - if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_name ) ) ) + if( IsXMLToken( aLocalName, XML_NAME ) ) { aName = sValue; } diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 6d8d6b44d083..c78a5184f756 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sdpropls.cxx,v $ * - * $Revision: 1.45 $ + * $Revision: 1.46 $ * - * last change: $Author: cl $ $Date: 2001-06-27 14:10:29 $ + * last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -165,8 +165,8 @@ #include "ControlBorderHandler.hxx" #endif -#ifndef _XMLOFF_XMLKYWD_HXX -#include <xmlkywd.hxx> +#ifndef _XMLOFF_XMLTOKEN_HXX +#include <xmltoken.hxx> #endif #ifndef _SDPROPLS_HXX @@ -227,182 +227,182 @@ using namespace ::xmloff::token; const XMLPropertyMapEntry aXMLSDProperties[] = { // stroke attributes - { "LineStyle", XML_NAMESPACE_DRAW, sXML_stroke, XML_SD_TYPE_STROKE, 0 }, - { "LineDashName", XML_NAMESPACE_DRAW, sXML_stroke_dash, XML_TYPE_STRING, CTF_DASHNAME }, - { "LineWidth", XML_NAMESPACE_SVG, sXML_stroke_width, XML_TYPE_MEASURE, 0 }, - { "LineColor", XML_NAMESPACE_SVG, sXML_stroke_color, XML_TYPE_COLOR, 0 }, - { "LineStartName", XML_NAMESPACE_DRAW, sXML_marker_start, XML_TYPE_STRING, CTF_LINESTARTNAME }, - { "LineStartWidth", XML_NAMESPACE_DRAW, sXML_marker_start_width, XML_TYPE_MEASURE, 0 }, - { "LineStartCenter", XML_NAMESPACE_DRAW, sXML_marker_start_center, XML_TYPE_BOOL, 0 }, - { "LineEndName", XML_NAMESPACE_DRAW, sXML_marker_end, XML_TYPE_STRING, CTF_LINEENDNAME }, - { "LineEndWidth", XML_NAMESPACE_DRAW, sXML_marker_end_width, XML_TYPE_MEASURE, 0 }, - { "LineEndCenter", XML_NAMESPACE_DRAW, sXML_marker_end_center, XML_TYPE_BOOL, 0 }, - { "LineTransparence", XML_NAMESPACE_SVG, sXML_stroke_opacity, XML_SD_TYPE_OPACITY, 0 }, - { "LineJoint", XML_NAMESPACE_SVG, sXML_stroke_linejoin, XML_SD_TYPE_LINEJOIN, 0 }, + { "LineStyle", XML_NAMESPACE_DRAW, XML_STROKE, XML_SD_TYPE_STROKE, 0 }, + { "LineDashName", XML_NAMESPACE_DRAW, XML_STROKE_DASH, XML_TYPE_STRING, CTF_DASHNAME }, + { "LineWidth", XML_NAMESPACE_SVG, XML_STROKE_WIDTH, XML_TYPE_MEASURE, 0 }, + { "LineColor", XML_NAMESPACE_SVG, XML_STROKE_COLOR, XML_TYPE_COLOR, 0 }, + { "LineStartName", XML_NAMESPACE_DRAW, XML_MARKER_START, XML_TYPE_STRING, CTF_LINESTARTNAME }, + { "LineStartWidth", XML_NAMESPACE_DRAW, XML_MARKER_START_WIDTH, XML_TYPE_MEASURE, 0 }, + { "LineStartCenter", XML_NAMESPACE_DRAW, XML_MARKER_START_CENTER, XML_TYPE_BOOL, 0 }, + { "LineEndName", XML_NAMESPACE_DRAW, XML_MARKER_END, XML_TYPE_STRING, CTF_LINEENDNAME }, + { "LineEndWidth", XML_NAMESPACE_DRAW, XML_MARKER_END_WIDTH, XML_TYPE_MEASURE, 0 }, + { "LineEndCenter", XML_NAMESPACE_DRAW, XML_MARKER_END_CENTER, XML_TYPE_BOOL, 0 }, + { "LineTransparence", XML_NAMESPACE_SVG, XML_STROKE_OPACITY, XML_SD_TYPE_OPACITY, 0 }, + { "LineJoint", XML_NAMESPACE_SVG, XML_STROKE_LINEJOIN, XML_SD_TYPE_LINEJOIN, 0 }, // fill attributes - { "FillStyle", XML_NAMESPACE_DRAW, sXML_fill, XML_SD_TYPE_FILLSTYLE, 0 }, - { "FillColor", XML_NAMESPACE_DRAW, sXML_fill_color, XML_TYPE_COLOR, 0 }, - { "FillGradientName", XML_NAMESPACE_DRAW, sXML_fill_gradient_name, XML_TYPE_STRING, CTF_FILLGRADIENTNAME }, - { "FillGradientStepCount", XML_NAMESPACE_DRAW, sXML_gradient_step_count, XML_TYPE_NUMBER, 0 }, - { "FillHatchName", XML_NAMESPACE_DRAW, sXML_fill_hatch_name, XML_TYPE_STRING, CTF_FILLHATCHNAME }, - { "FillBackground", XML_NAMESPACE_DRAW, sXML_fill_hatch_solid, XML_TYPE_BOOL, 0 }, - { "FillBitmapName", XML_NAMESPACE_DRAW, sXML_fill_image_name, XML_TYPE_STRING, CTF_FILLBITMAPNAME }, - { "FillTransparence", XML_NAMESPACE_DRAW, sXML_transparency, XML_TYPE_PERCENT16|MID_FLAG_MULTI_PROPERTY, 0 }, // exists in SW, too - { "FillTransparenceGradientName", XML_NAMESPACE_DRAW, sXML_transparency_name, XML_TYPE_STRING, CTF_FILLTRANSNAME }, - - { "FillBitmapSizeX", XML_NAMESPACE_DRAW, sXML_fill_image_width, XML_SD_TYPE_FILLBITMAPSIZE|MID_FLAG_MULTI_PROPERTY, 0 }, - { "FillBitmapLogicalSize", XML_NAMESPACE_DRAW, sXML_fill_image_width, XML_SD_TYPE_LOGICAL_SIZE|MID_FLAG_MULTI_PROPERTY, 0 }, - { "FillBitmapSizeY", XML_NAMESPACE_DRAW, sXML_fill_image_height, XML_SD_TYPE_FILLBITMAPSIZE|MID_FLAG_MULTI_PROPERTY, 0 }, - { "FillBitmapLogicalSize", XML_NAMESPACE_DRAW, sXML_fill_image_height, XML_SD_TYPE_LOGICAL_SIZE|MID_FLAG_MULTI_PROPERTY, 0 }, - { "FillBitmapMode", XML_NAMESPACE_STYLE,sXML_repeat, XML_SD_TYPE_BITMAP_MODE, 0 }, - { "FillBitmapPositionOffsetX", XML_NAMESPACE_DRAW, sXML_fill_image_ref_point_x,XML_TYPE_PERCENT, 0 }, - { "FillBitmapPositionOffsetY", XML_NAMESPACE_DRAW, sXML_fill_image_ref_point_y,XML_TYPE_PERCENT, 0 }, - { "FillBitmapRectanglePoint", XML_NAMESPACE_DRAW, sXML_fill_image_ref_point, XML_SD_TYPE_BITMAP_REFPOINT, 0 }, - { "FillBitmapOffsetX", XML_NAMESPACE_DRAW, sXML_tile_repeat_offset, XML_SD_TYPE_BITMAPREPOFFSETX|MID_FLAG_MULTI_PROPERTY, CTF_REPEAT_OFFSET_X }, - { "FillBitmapOffsetY", XML_NAMESPACE_DRAW, sXML_tile_repeat_offset, XML_SD_TYPE_BITMAPREPOFFSETY|MID_FLAG_MULTI_PROPERTY, CTF_REPEAT_OFFSET_Y }, + { "FillStyle", XML_NAMESPACE_DRAW, XML_FILL, XML_SD_TYPE_FILLSTYLE, 0 }, + { "FillColor", XML_NAMESPACE_DRAW, XML_FILL_COLOR, XML_TYPE_COLOR, 0 }, + { "FillGradientName", XML_NAMESPACE_DRAW, XML_FILL_GRADIENT_NAME, XML_TYPE_STRING, CTF_FILLGRADIENTNAME }, + { "FillGradientStepCount", XML_NAMESPACE_DRAW, XML_GRADIENT_STEP_COUNT, XML_TYPE_NUMBER, 0 }, + { "FillHatchName", XML_NAMESPACE_DRAW, XML_FILL_HATCH_NAME, XML_TYPE_STRING, CTF_FILLHATCHNAME }, + { "FillBackground", XML_NAMESPACE_DRAW, XML_FILL_HATCH_SOLID, XML_TYPE_BOOL, 0 }, + { "FillBitmapName", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_NAME, XML_TYPE_STRING, CTF_FILLBITMAPNAME }, + { "FillTransparence", XML_NAMESPACE_DRAW, XML_TRANSPARENCY, XML_TYPE_PERCENT16|MID_FLAG_MULTI_PROPERTY, 0 }, // exists in SW, too + { "FillTransparenceGradientName", XML_NAMESPACE_DRAW, XML_TRANSPARENCY_NAME, XML_TYPE_STRING, CTF_FILLTRANSNAME }, + + { "FillBitmapSizeX", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_WIDTH, XML_SD_TYPE_FILLBITMAPSIZE|MID_FLAG_MULTI_PROPERTY, 0 }, + { "FillBitmapLogicalSize", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_WIDTH, XML_SD_TYPE_LOGICAL_SIZE|MID_FLAG_MULTI_PROPERTY, 0 }, + { "FillBitmapSizeY", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_HEIGHT, XML_SD_TYPE_FILLBITMAPSIZE|MID_FLAG_MULTI_PROPERTY, 0 }, + { "FillBitmapLogicalSize", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_HEIGHT, XML_SD_TYPE_LOGICAL_SIZE|MID_FLAG_MULTI_PROPERTY, 0 }, + { "FillBitmapMode", XML_NAMESPACE_STYLE,XML_REPEAT, XML_SD_TYPE_BITMAP_MODE, 0 }, + { "FillBitmapPositionOffsetX", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_REF_POINT_X, XML_TYPE_PERCENT, 0 }, + { "FillBitmapPositionOffsetY", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_REF_POINT_Y, XML_TYPE_PERCENT, 0 }, + { "FillBitmapRectanglePoint", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_REF_POINT, XML_SD_TYPE_BITMAP_REFPOINT, 0 }, + { "FillBitmapOffsetX", XML_NAMESPACE_DRAW, XML_TILE_REPEAT_OFFSET, XML_SD_TYPE_BITMAPREPOFFSETX|MID_FLAG_MULTI_PROPERTY, CTF_REPEAT_OFFSET_X }, + { "FillBitmapOffsetY", XML_NAMESPACE_DRAW, XML_TILE_REPEAT_OFFSET, XML_SD_TYPE_BITMAPREPOFFSETY|MID_FLAG_MULTI_PROPERTY, CTF_REPEAT_OFFSET_Y }, // text frame attributes - { "TextHorizontalAdjust", XML_NAMESPACE_DRAW, sXML_textarea_horizontal_align, XML_SD_TYPE_TEXT_ALIGN, 0 }, - { "TextVerticalAdjust", XML_NAMESPACE_DRAW, sXML_textarea_vertical_align, XML_SD_TYPE_VERTICAL_ALIGN, 0 }, - { "TextAutoGrowHeight", XML_NAMESPACE_DRAW, sXML_auto_grow_width, XML_TYPE_BOOL, 0 }, - { "TextAutoGrowWidth", XML_NAMESPACE_DRAW, sXML_auto_grow_height, XML_TYPE_BOOL, 0 }, - { "TextFitToSize", XML_NAMESPACE_DRAW, sXML_fit_to_size, XML_SD_TYPE_FITTOSIZE, 0 }, - { "TextContourFrame", XML_NAMESPACE_DRAW, sXML_fit_to_contour, XML_TYPE_BOOL, 0 }, - { "TextMaximumFrameHeight", XML_NAMESPACE_FO, sXML_max_height, XML_TYPE_MEASURE, 0 }, - { "TextMaximumFrameWidth", XML_NAMESPACE_FO, sXML_max_width, XML_TYPE_MEASURE, 0 }, - { "TextMinimumFrameHeight", XML_NAMESPACE_FO, sXML_min_height, XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, 0 }, // exists in SW, too - { "TextMinimumFrameWidth", XML_NAMESPACE_FO, sXML_min_width, XML_TYPE_MEASURE, 0 }, - { "TextUpperDistance", XML_NAMESPACE_FO, sXML_padding_top, XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, 0 }, // exists in SW, too - { "TextLowerDistance", XML_NAMESPACE_FO, sXML_padding_bottom, XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, 0 }, // exists in SW, too - { "TextLeftDistance", XML_NAMESPACE_FO, sXML_padding_left, XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, 0 }, // exists in SW, too - { "TextRightDistance", XML_NAMESPACE_FO, sXML_padding_right, XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, 0 }, // exists in SW, too - { "TextWritingMode", XML_NAMESPACE_DRAW, sXML_writing_mode, XML_SD_TYPE_WRITINGMODE, CTF_WRITINGMODE }, - { "NumberingRules", XML_NAMESPACE_TEXT, sXML_list_style, XML_SD_TYPE_NUMBULLET|MID_FLAG_ELEMENT_ITEM, CTF_NUMBERINGRULES }, - { "NumberingRules", XML_NAMESPACE_TEXT, sXML_list_style_name, XML_TYPE_STRING, CTF_NUMBERINGRULES_NAME }, + { "TextHorizontalAdjust", XML_NAMESPACE_DRAW, XML_TEXTAREA_HORIZONTAL_ALIGN, XML_SD_TYPE_TEXT_ALIGN, 0 }, + { "TextVerticalAdjust", XML_NAMESPACE_DRAW, XML_TEXTAREA_VERTICAL_ALIGN, XML_SD_TYPE_VERTICAL_ALIGN, 0 }, + { "TextAutoGrowHeight", XML_NAMESPACE_DRAW, XML_AUTO_GROW_WIDTH, XML_TYPE_BOOL, 0 }, + { "TextAutoGrowWidth", XML_NAMESPACE_DRAW, XML_AUTO_GROW_HEIGHT, XML_TYPE_BOOL, 0 }, + { "TextFitToSize", XML_NAMESPACE_DRAW, XML_FIT_TO_SIZE, XML_SD_TYPE_FITTOSIZE, 0 }, + { "TextContourFrame", XML_NAMESPACE_DRAW, XML_FIT_TO_CONTOUR, XML_TYPE_BOOL, 0 }, + { "TextMaximumFrameHeight", XML_NAMESPACE_FO, XML_MAX_HEIGHT, XML_TYPE_MEASURE, 0 }, + { "TextMaximumFrameWidth", XML_NAMESPACE_FO, XML_MAX_WIDTH, XML_TYPE_MEASURE, 0 }, + { "TextMinimumFrameHeight", XML_NAMESPACE_FO, XML_MIN_HEIGHT, XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, 0 }, // exists in SW, too + { "TextMinimumFrameWidth", XML_NAMESPACE_FO, XML_MIN_WIDTH, XML_TYPE_MEASURE, 0 }, + { "TextUpperDistance", XML_NAMESPACE_FO, XML_PADDING_TOP, XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, 0 }, // exists in SW, too + { "TextLowerDistance", XML_NAMESPACE_FO, XML_PADDING_BOTTOM, XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, 0 }, // exists in SW, too + { "TextLeftDistance", XML_NAMESPACE_FO, XML_PADDING_LEFT, XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, 0 }, // exists in SW, too + { "TextRightDistance", XML_NAMESPACE_FO, XML_PADDING_RIGHT, XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, 0 }, // exists in SW, too + { "TextWritingMode", XML_NAMESPACE_DRAW, XML_WRITING_MODE, XML_SD_TYPE_WRITINGMODE, CTF_WRITINGMODE }, + { "NumberingRules", XML_NAMESPACE_TEXT, XML_LIST_STYLE, XML_SD_TYPE_NUMBULLET|MID_FLAG_ELEMENT_ITEM, CTF_NUMBERINGRULES }, + { "NumberingRules", XML_NAMESPACE_TEXT, XML_LIST_STYLE_NAME, XML_TYPE_STRING, CTF_NUMBERINGRULES_NAME }, // shadow attributes - { "Shadow", XML_NAMESPACE_DRAW, sXML_shadow, XML_SD_TYPE_SHADOW, 0 }, - { "ShadowXDistance", XML_NAMESPACE_DRAW, sXML_shadow_offset_x, XML_TYPE_MEASURE, 0 }, - { "ShadowYDistance", XML_NAMESPACE_DRAW, sXML_shadow_offset_y, XML_TYPE_MEASURE, 0 }, - { "ShadowColor", XML_NAMESPACE_DRAW, sXML_shadow_color, XML_TYPE_COLOR, 0 }, - { "ShadowTransparence", XML_NAMESPACE_DRAW, sXML_shadow_transparency, XML_TYPE_PERCENT, 0 }, + { "Shadow", XML_NAMESPACE_DRAW, XML_SHADOW, XML_SD_TYPE_SHADOW, 0 }, + { "ShadowXDistance", XML_NAMESPACE_DRAW, XML_SHADOW_OFFSET_X, XML_TYPE_MEASURE, 0 }, + { "ShadowYDistance", XML_NAMESPACE_DRAW, XML_SHADOW_OFFSET_Y, XML_TYPE_MEASURE, 0 }, + { "ShadowColor", XML_NAMESPACE_DRAW, XML_SHADOW_COLOR, XML_TYPE_COLOR, 0 }, + { "ShadowTransparence", XML_NAMESPACE_DRAW, XML_SHADOW_TRANSPARENCY, XML_TYPE_PERCENT, 0 }, // graphic attributes - { "GraphicColorMode", XML_NAMESPACE_DRAW, sXML_color_mode, XML_TYPE_COLOR_MODE, 0 }, // exists in SW, too, with same property name - { "AdjustLuminance", XML_NAMESPACE_DRAW, sXML_luminance, XML_TYPE_PERCENT16, 0 }, // signed? exists in SW, too, with same property name - { "AdjustContrast", XML_NAMESPACE_DRAW, sXML_contrast, XML_TYPE_PERCENT16, 0 }, // signed? exists in SW, too, with same property name - { "Gamma", XML_NAMESPACE_DRAW, sXML_gamma, XML_TYPE_DOUBLE, 0 }, // signed? exists in SW, too, with same property name - { "AdjustRed", XML_NAMESPACE_DRAW, sXML_red, XML_TYPE_PERCENT16, 0 }, // signed? exists in SW, too, with same property name - { "AdjustGreen", XML_NAMESPACE_DRAW, sXML_green, XML_TYPE_PERCENT16, 0 }, // signed? exists in SW, too, with same property name - { "AdjustBlue", XML_NAMESPACE_DRAW, sXML_blue, XML_TYPE_PERCENT16, 0 }, // signed? exists in SW, too, with same property name - { "GraphicCrop", XML_NAMESPACE_FO, sXML_clip, XML_TYPE_TEXT_CLIP, 0 }, // exists in SW, too, with same property name + { "GraphicColorMode", XML_NAMESPACE_DRAW, XML_COLOR_MODE, XML_TYPE_COLOR_MODE, 0 }, // exists in SW, too, with same property name + { "AdjustLuminance", XML_NAMESPACE_DRAW, XML_LUMINANCE, XML_TYPE_PERCENT16, 0 }, // signed? exists in SW, too, with same property name + { "AdjustContrast", XML_NAMESPACE_DRAW, XML_CONTRAST, XML_TYPE_PERCENT16, 0 }, // signed? exists in SW, too, with same property name + { "Gamma", XML_NAMESPACE_DRAW, XML_GAMMA, XML_TYPE_DOUBLE, 0 }, // signed? exists in SW, too, with same property name + { "AdjustRed", XML_NAMESPACE_DRAW, XML_RED, XML_TYPE_PERCENT16, 0 }, // signed? exists in SW, too, with same property name + { "AdjustGreen", XML_NAMESPACE_DRAW, XML_GREEN, XML_TYPE_PERCENT16, 0 }, // signed? exists in SW, too, with same property name + { "AdjustBlue", XML_NAMESPACE_DRAW, XML_BLUE, XML_TYPE_PERCENT16, 0 }, // signed? exists in SW, too, with same property name + { "GraphicCrop", XML_NAMESPACE_FO, XML_CLIP, XML_TYPE_TEXT_CLIP, 0 }, // exists in SW, too, with same property name // animation text attributes - { "TextAnimationKind", XML_NAMESPACE_STYLE,sXML_text_blinking, XML_TYPE_TEXT_ANIMATION_BLINKING, CTF_TEXTANIMATION_BLINKING }, - { "TextAnimationKind", XML_NAMESPACE_TEXT, sXML_animation, XML_TYPE_TEXT_ANIMATION, CTF_TEXTANIMATION_KIND }, - { "TextAnimationDirection", XML_NAMESPACE_TEXT, sXML_animation_direction, XML_TYPE_TEXT_ANIMATION_DIRECTION, 0 }, - { "TextAnimationStartInside", XML_NAMESPACE_TEXT, sXML_animation_start_inside,XML_TYPE_BOOL, 0 }, - { "TextAnimationStopInside", XML_NAMESPACE_TEXT, sXML_animation_stop_inside, XML_TYPE_BOOL, 0 }, - { "TextAnimationCount", XML_NAMESPACE_TEXT, sXML_animation_repeat, XML_TYPE_NUMBER16, 0 }, - { "TextAnimationDelay", XML_NAMESPACE_TEXT, sXML_animation_delay, XML_TYPE_DURATION16_MS, 0 }, - { "TextAnimationAmount", XML_NAMESPACE_TEXT, sXML_animation_steps, XML_TYPE_TEXT_ANIMATION_STEPS, 0 }, + { "TextAnimationKind", XML_NAMESPACE_STYLE,XML_TEXT_BLINKING, XML_TYPE_TEXT_ANIMATION_BLINKING, CTF_TEXTANIMATION_BLINKING }, + { "TextAnimationKind", XML_NAMESPACE_TEXT, XML_ANIMATION, XML_TYPE_TEXT_ANIMATION, CTF_TEXTANIMATION_KIND }, + { "TextAnimationDirection", XML_NAMESPACE_TEXT, XML_ANIMATION_DIRECTION, XML_TYPE_TEXT_ANIMATION_DIRECTION, 0 }, + { "TextAnimationStartInside", XML_NAMESPACE_TEXT, XML_ANIMATION_START_INSIDE, XML_TYPE_BOOL, 0 }, + { "TextAnimationStopInside", XML_NAMESPACE_TEXT, XML_ANIMATION_STOP_INSIDE, XML_TYPE_BOOL, 0 }, + { "TextAnimationCount", XML_NAMESPACE_TEXT, XML_ANIMATION_REPEAT, XML_TYPE_NUMBER16, 0 }, + { "TextAnimationDelay", XML_NAMESPACE_TEXT, XML_ANIMATION_DELAY, XML_TYPE_DURATION16_MS, 0 }, + { "TextAnimationAmount", XML_NAMESPACE_TEXT, XML_ANIMATION_STEPS, XML_TYPE_TEXT_ANIMATION_STEPS, 0 }, // connector attributes - { "EdgeNode1HorzDist", XML_NAMESPACE_DRAW, sXML_start_line_spacing_horizontal, XML_TYPE_MEASURE, 0 }, - { "EdgeNode1VertDist", XML_NAMESPACE_DRAW, sXML_start_line_spacing_vertical, XML_TYPE_MEASURE, 0 }, - { "EdgeNode2HorzDist", XML_NAMESPACE_DRAW, sXML_end_line_spacing_horizontal, XML_TYPE_MEASURE, 0 }, - { "EdgeNode2VertDist", XML_NAMESPACE_DRAW, sXML_end_line_spacing_vertical, XML_TYPE_MEASURE, 0 }, + { "EdgeNode1HorzDist", XML_NAMESPACE_DRAW, XML_START_LINE_SPACING_HORIZONTAL, XML_TYPE_MEASURE, 0 }, + { "EdgeNode1VertDist", XML_NAMESPACE_DRAW, XML_START_LINE_SPACING_VERTICAL, XML_TYPE_MEASURE, 0 }, + { "EdgeNode2HorzDist", XML_NAMESPACE_DRAW, XML_END_LINE_SPACING_HORIZONTAL, XML_TYPE_MEASURE, 0 }, + { "EdgeNode2VertDist", XML_NAMESPACE_DRAW, XML_END_LINE_SPACING_VERTICAL, XML_TYPE_MEASURE, 0 }, // measure attributes - { "MeasureLineDistance", XML_NAMESPACE_DRAW, sXML_line_distance, XML_TYPE_MEASURE, 0 }, - { "MeasureHelpLineOverhang", XML_NAMESPACE_DRAW, sXML_guide_overhang, XML_TYPE_MEASURE, 0 }, - { "MeasureHelpLineDistance", XML_NAMESPACE_DRAW, sXML_guide_distance, XML_TYPE_MEASURE, 0 }, - { "MeasureHelpLine1Length", XML_NAMESPACE_DRAW, sXML_start_guide, XML_TYPE_MEASURE, 0 }, - { "MeasureHelpLine2Length", XML_NAMESPACE_DRAW, sXML_end_guide, XML_TYPE_MEASURE, 0 }, - { "MeasureTextHorizontalPosition", XML_NAMESPACE_DRAW, sXML_measure_align, XML_SD_TYPE_MEASURE_HALIGN, 0 }, - { "MeasureTextVerticalPosition", XML_NAMESPACE_DRAW, sXML_measure_vertical_align,XML_SD_TYPE_MEASURE_VALIGN, 0 }, - { "MeasureUnit", XML_NAMESPACE_DRAW, sXML_unit, XML_SD_TYPE_MEASURE_UNIT, 0 }, - { "MeasureShowUnit", XML_NAMESPACE_DRAW, sXML_show_unit, XML_TYPE_BOOL, 0 }, - { "MeasureBelowReferenceEdge", XML_NAMESPACE_DRAW, sXML_placing, XML_SD_TYPE_MEASURE_PLACING, 0 }, - { "MeasureTextRotate90", XML_NAMESPACE_DRAW, sXML_parallel, XML_TYPE_BOOL, 0 }, + { "MeasureLineDistance", XML_NAMESPACE_DRAW, XML_LINE_DISTANCE, XML_TYPE_MEASURE, 0 }, + { "MeasureHelpLineOverhang", XML_NAMESPACE_DRAW, XML_GUIDE_OVERHANG, XML_TYPE_MEASURE, 0 }, + { "MeasureHelpLineDistance", XML_NAMESPACE_DRAW, XML_GUIDE_DISTANCE, XML_TYPE_MEASURE, 0 }, + { "MeasureHelpLine1Length", XML_NAMESPACE_DRAW, XML_START_GUIDE, XML_TYPE_MEASURE, 0 }, + { "MeasureHelpLine2Length", XML_NAMESPACE_DRAW, XML_END_GUIDE, XML_TYPE_MEASURE, 0 }, + { "MeasureTextHorizontalPosition", XML_NAMESPACE_DRAW, XML_MEASURE_ALIGN, XML_SD_TYPE_MEASURE_HALIGN, 0 }, + { "MeasureTextVerticalPosition", XML_NAMESPACE_DRAW, XML_MEASURE_VERTICAL_ALIGN, XML_SD_TYPE_MEASURE_VALIGN, 0 }, + { "MeasureUnit", XML_NAMESPACE_DRAW, XML_UNIT, XML_SD_TYPE_MEASURE_UNIT, 0 }, + { "MeasureShowUnit", XML_NAMESPACE_DRAW, XML_SHOW_UNIT, XML_TYPE_BOOL, 0 }, + { "MeasureBelowReferenceEdge", XML_NAMESPACE_DRAW, XML_PLACING, XML_SD_TYPE_MEASURE_PLACING, 0 }, + { "MeasureTextRotate90", XML_NAMESPACE_DRAW, XML_PARALLEL, XML_TYPE_BOOL, 0 }, // 3D geometry attributes - { "D3DHorizontalSegments", XML_NAMESPACE_DR3D, sXML_horizontal_segments, XML_TYPE_NUMBER, 0 }, - { "D3DVerticalSegments", XML_NAMESPACE_DR3D, sXML_vertical_segments, XML_TYPE_NUMBER, 0 }, - { "D3DPercentDiagonal", XML_NAMESPACE_DR3D, sXML_edge_rounding, XML_TYPE_PERCENT, 0 }, - { "D3DBackscale", XML_NAMESPACE_DR3D, sXML_back_scale, XML_TYPE_PERCENT, 0 }, - { "D3DEndAngle", XML_NAMESPACE_DR3D, sXML_end_angle, XML_TYPE_NUMBER, 0 }, - { "D3DDepth", XML_NAMESPACE_DR3D, sXML_depth, XML_TYPE_MEASURE, 0 }, - { "D3DDoubleSided", XML_NAMESPACE_DR3D, sXML_backface_culling, XML_SD_TYPE_BACKFACE_CULLING, 0 }, + { "D3DHorizontalSegments", XML_NAMESPACE_DR3D, XML_HORIZONTAL_SEGMENTS, XML_TYPE_NUMBER, 0 }, + { "D3DVerticalSegments", XML_NAMESPACE_DR3D, XML_VERTICAL_SEGMENTS, XML_TYPE_NUMBER, 0 }, + { "D3DPercentDiagonal", XML_NAMESPACE_DR3D, XML_EDGE_ROUNDING, XML_TYPE_PERCENT, 0 }, + { "D3DBackscale", XML_NAMESPACE_DR3D, XML_BACK_SCALE, XML_TYPE_PERCENT, 0 }, + { "D3DEndAngle", XML_NAMESPACE_DR3D, XML_END_ANGLE, XML_TYPE_NUMBER, 0 }, + { "D3DDepth", XML_NAMESPACE_DR3D, XML_DEPTH, XML_TYPE_MEASURE, 0 }, + { "D3DDoubleSided", XML_NAMESPACE_DR3D, XML_BACKFACE_CULLING, XML_SD_TYPE_BACKFACE_CULLING, 0 }, // 3D lighting attributes - { "D3DNormalsKind", XML_NAMESPACE_DR3D, sXML_normals_kind, XML_SD_TYPE_NORMALS_KIND, 0 }, - { "D3DNormalsInvert", XML_NAMESPACE_DR3D, sXML_normals_direction, XML_SD_TYPE_NORMALS_DIRECTION, 0 }, + { "D3DNormalsKind", XML_NAMESPACE_DR3D, XML_NORMALS_KIND, XML_SD_TYPE_NORMALS_KIND, 0 }, + { "D3DNormalsInvert", XML_NAMESPACE_DR3D, XML_NORMALS_DIRECTION, XML_SD_TYPE_NORMALS_DIRECTION, 0 }, // 3D texture attributes - { "D3DTextureProjectionX", XML_NAMESPACE_DR3D, sXML_tex_generation_mode_x, XML_SD_TYPE_TEX_GENERATION_MODE_X, 0 }, - { "D3DTextureProjectionY", XML_NAMESPACE_DR3D, sXML_tex_generation_mode_y, XML_SD_TYPE_TEX_GENERATION_MODE_Y, 0 }, - { "D3DTextureKind", XML_NAMESPACE_DR3D, sXML_tex_kind, XML_SD_TYPE_TEX_KIND, 0 }, - { "D3DTextureMode", XML_NAMESPACE_DR3D, sXML_tex_mode, XML_SD_TYPE_TEX_MODE, 0 }, - { "D3DTextureFilter", XML_NAMESPACE_DR3D, sXML_tex_filter, XML_SD_TYPE_BACKFACE_CULLING, 0 }, + { "D3DTextureProjectionX", XML_NAMESPACE_DR3D, XML_TEX_GENERATION_MODE_X, XML_SD_TYPE_TEX_GENERATION_MODE_X, 0 }, + { "D3DTextureProjectionY", XML_NAMESPACE_DR3D, XML_TEX_GENERATION_MODE_Y, XML_SD_TYPE_TEX_GENERATION_MODE_Y, 0 }, + { "D3DTextureKind", XML_NAMESPACE_DR3D, XML_TEX_KIND, XML_SD_TYPE_TEX_KIND, 0 }, + { "D3DTextureMode", XML_NAMESPACE_DR3D, XML_TEX_MODE, XML_SD_TYPE_TEX_MODE, 0 }, + { "D3DTextureFilter", XML_NAMESPACE_DR3D, XML_TEX_FILTER, XML_SD_TYPE_BACKFACE_CULLING, 0 }, // 3D material attributes - { "D3DMaterialColor", XML_NAMESPACE_DR3D, sXML_diffuse_color, XML_TYPE_COLOR, 0 }, - { "D3DMaterialEmission", XML_NAMESPACE_DR3D, sXML_emissive_color, XML_TYPE_COLOR, 0 }, - { "D3DMaterialSpecular", XML_NAMESPACE_DR3D, sXML_specular_color, XML_TYPE_COLOR, 0 }, - { "D3DMaterialSpecularIntensity", XML_NAMESPACE_DR3D, sXML_shininess, XML_TYPE_PERCENT, 0 }, + { "D3DMaterialColor", XML_NAMESPACE_DR3D, XML_DIFFUSE_COLOR, XML_TYPE_COLOR, 0 }, + { "D3DMaterialEmission", XML_NAMESPACE_DR3D, XML_EMISSIVE_COLOR, XML_TYPE_COLOR, 0 }, + { "D3DMaterialSpecular", XML_NAMESPACE_DR3D, XML_SPECULAR_COLOR, XML_TYPE_COLOR, 0 }, + { "D3DMaterialSpecularIntensity", XML_NAMESPACE_DR3D, XML_SHININESS, XML_TYPE_PERCENT, 0 }, // 3D shadow attributes - { "D3DShadow3D", XML_NAMESPACE_DR3D, sXML_shadow, XML_SD_TYPE_SHADOW, 0 }, + { "D3DShadow3D", XML_NAMESPACE_DR3D, XML_SHADOW, XML_SD_TYPE_SHADOW, 0 }, // #FontWork# attributes - { "FontWorkStyle", XML_NAMESPACE_DRAW, sXML_fontwork_style, XML_SD_TYPE_FONTWORK_STYLE, CTF_FONTWORK_STYLE }, - { "FontWorkAdjust", XML_NAMESPACE_DRAW, sXML_fontwork_adjust, XML_SD_TYPE_FONTWORK_ADJUST,CTF_FONTWORK_ADJUST }, - { "FontWorkDistance", XML_NAMESPACE_DRAW, sXML_fontwork_distance, XML_TYPE_MEASURE, CTF_FONTWORK_DISTANCE }, - { "FontWorkStart", XML_NAMESPACE_DRAW, sXML_fontwork_start, XML_TYPE_MEASURE, CTF_FONTWORK_START }, - { "FontWorkMirror", XML_NAMESPACE_DRAW, sXML_fontwork_mirror, XML_TYPE_BOOL, CTF_FONTWORK_MIRROR }, - { "FontWorkOutline", XML_NAMESPACE_DRAW, sXML_fontwork_outline, XML_TYPE_BOOL, CTF_FONTWORK_OUTLINE }, - { "FontWorkShadow", XML_NAMESPACE_DRAW, sXML_fontwork_shadow, XML_SD_TYPE_FONTWORK_SHADOW,CTF_FONTWORK_SHADOW }, - { "FontWorkShadowColor", XML_NAMESPACE_DRAW, sXML_fontwork_shadow_color, XML_TYPE_COLOR, CTF_FONTWORK_SHADOWCOLOR }, - { "FontWorkShadowOffsetX", XML_NAMESPACE_DRAW, sXML_fontwork_shadow_offset_x, XML_TYPE_MEASURE, CTF_FONTWORK_SHADOWOFFSETX }, - { "FontWorkShadowOffsetY", XML_NAMESPACE_DRAW, sXML_fontwork_shadow_offset_y, XML_TYPE_MEASURE, CTF_FONTWORK_SHADOWOFFSETY }, - { "FontWorkForm", XML_NAMESPACE_DRAW, sXML_fontwork_form, XML_SD_TYPE_FONTWORK_FORM, CTF_FONTWORK_FORM }, - { "FontWorkHideForm", XML_NAMESPACE_DRAW, sXML_fontwork_hide_form, XML_TYPE_BOOL, CTF_FONTWORK_HIDEFORM }, - { "FontWorkShadowTransparence", XML_NAMESPACE_DRAW, sXML_fontwork_shadow_transparence, XML_TYPE_PERCENT, CTF_FONTWORK_SHADOWTRANSPARENCE }, + { "FontWorkStyle", XML_NAMESPACE_DRAW, XML_FONTWORK_STYLE, XML_SD_TYPE_FONTWORK_STYLE, CTF_FONTWORK_STYLE }, + { "FontWorkAdjust", XML_NAMESPACE_DRAW, XML_FONTWORK_ADJUST, XML_SD_TYPE_FONTWORK_ADJUST,CTF_FONTWORK_ADJUST }, + { "FontWorkDistance", XML_NAMESPACE_DRAW, XML_FONTWORK_DISTANCE, XML_TYPE_MEASURE, CTF_FONTWORK_DISTANCE }, + { "FontWorkStart", XML_NAMESPACE_DRAW, XML_FONTWORK_START, XML_TYPE_MEASURE, CTF_FONTWORK_START }, + { "FontWorkMirror", XML_NAMESPACE_DRAW, XML_FONTWORK_MIRROR, XML_TYPE_BOOL, CTF_FONTWORK_MIRROR }, + { "FontWorkOutline", XML_NAMESPACE_DRAW, XML_FONTWORK_OUTLINE, XML_TYPE_BOOL, CTF_FONTWORK_OUTLINE }, + { "FontWorkShadow", XML_NAMESPACE_DRAW, XML_FONTWORK_SHADOW, XML_SD_TYPE_FONTWORK_SHADOW,CTF_FONTWORK_SHADOW }, + { "FontWorkShadowColor", XML_NAMESPACE_DRAW, XML_FONTWORK_SHADOW_COLOR, XML_TYPE_COLOR, CTF_FONTWORK_SHADOWCOLOR }, + { "FontWorkShadowOffsetX", XML_NAMESPACE_DRAW, XML_FONTWORK_SHADOW_OFFSET_X, XML_TYPE_MEASURE, CTF_FONTWORK_SHADOWOFFSETX }, + { "FontWorkShadowOffsetY", XML_NAMESPACE_DRAW, XML_FONTWORK_SHADOW_OFFSET_Y, XML_TYPE_MEASURE, CTF_FONTWORK_SHADOWOFFSETY }, + { "FontWorkForm", XML_NAMESPACE_DRAW, XML_FONTWORK_FORM, XML_SD_TYPE_FONTWORK_FORM, CTF_FONTWORK_FORM }, + { "FontWorkHideForm", XML_NAMESPACE_DRAW, XML_FONTWORK_HIDE_FORM, XML_TYPE_BOOL, CTF_FONTWORK_HIDEFORM }, + { "FontWorkShadowTransparence", XML_NAMESPACE_DRAW, XML_FONTWORK_SHADOW_TRANSPARENCE, XML_TYPE_PERCENT, CTF_FONTWORK_SHADOWTRANSPARENCE }, // control attributes (border exists one mor time for the text additions of shapes) - { "ControlBackground", XML_NAMESPACE_FO, sXML_background_color, XML_TYPE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 }, - { "ControlBorder", XML_NAMESPACE_FO, sXML_border, XML_SD_TYPE_CONTROL_BORDER|MID_FLAG_MULTI_PROPERTY, 0 }, - { "ControlDataStyle", XML_NAMESPACE_STYLE,sXML_data_style_name, XML_TYPE_STRING|MID_FLAG_NO_PROPERTY_EXPORT|MID_FLAG_SPECIAL_ITEM, CTF_SD_CONTROL_SHAPE_DATA_STYLE }, - { "ControlTextEmphasis", XML_NAMESPACE_STYLE,sXML_text_emphasize, XML_TYPE_CONTROL_TEXT_EMPHASIZE, 0 }, + { "ControlBackground", XML_NAMESPACE_FO, XML_BACKGROUND_COLOR, XML_TYPE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 }, + { "ControlBorder", XML_NAMESPACE_FO, XML_BORDER, XML_SD_TYPE_CONTROL_BORDER|MID_FLAG_MULTI_PROPERTY, 0 }, + { "ControlDataStyle", XML_NAMESPACE_STYLE,XML_DATA_STYLE_NAME, XML_TYPE_STRING|MID_FLAG_NO_PROPERTY_EXPORT|MID_FLAG_SPECIAL_ITEM, CTF_SD_CONTROL_SHAPE_DATA_STYLE }, + { "ControlTextEmphasis", XML_NAMESPACE_STYLE,XML_TEXT_EMPHASIZE, XML_TYPE_CONTROL_TEXT_EMPHASIZE, 0 }, // special entries for floating frames - { "FrameIsAutoScroll", XML_NAMESPACE_DRAW, sXML_frame_display_scrollbar, XML_TYPE_BOOL|MID_FLAG_MULTI_PROPERTY, CTF_FRAME_DISPLAY_SCROLLBAR }, - { "FrameIsBorder", XML_NAMESPACE_DRAW, sXML_frame_display_border, XML_TYPE_BOOL|MID_FLAG_MULTI_PROPERTY, CTF_FRAME_DISPLAY_BORDER }, - { "FrameMarginWidth", XML_NAMESPACE_DRAW, sXML_frame_margin_horizontal, XML_TYPE_MEASURE_PX|MID_FLAG_MULTI_PROPERTY, CTF_FRAME_MARGIN_HORI }, - { "FrameMarginHeight", XML_NAMESPACE_DRAW, sXML_frame_margin_vertical, XML_TYPE_MEASURE_PX|MID_FLAG_MULTI_PROPERTY, CTF_FRAME_MARGIN_VERT }, - { "VisibleArea", XML_NAMESPACE_DRAW, sXML_visible_area_left, XML_TYPE_RECTANGLE_LEFT|MID_FLAG_MERGE_PROPERTY|MID_FLAG_MULTI_PROPERTY, CTF_SD_OLE_VIS_AREA_LEFT }, - { "VisibleArea", XML_NAMESPACE_DRAW, sXML_visible_area_top, XML_TYPE_RECTANGLE_TOP|MID_FLAG_MERGE_PROPERTY|MID_FLAG_MULTI_PROPERTY, CTF_SD_OLE_VIS_AREA_TOP }, - { "VisibleArea", XML_NAMESPACE_DRAW, sXML_visible_area_width, XML_TYPE_RECTANGLE_WIDTH|MID_FLAG_MERGE_PROPERTY|MID_FLAG_MULTI_PROPERTY, CTF_SD_OLE_VIS_AREA_WIDTH }, - { "VisibleArea", XML_NAMESPACE_DRAW, sXML_visible_area_height, XML_TYPE_RECTANGLE_HEIGHT|MID_FLAG_MERGE_PROPERTY|MID_FLAG_MULTI_PROPERTY, CTF_SD_OLE_VIS_AREA_HEIGHT }, - { "IsInternal", XML_NAMESPACE_DRAW, NULL, XML_TYPE_BUILDIN_CMP_ONLY, CTF_SD_OLE_ISINTERNAL }, + { "FrameIsAutoScroll", XML_NAMESPACE_DRAW, XML_FRAME_DISPLAY_SCROLLBAR, XML_TYPE_BOOL|MID_FLAG_MULTI_PROPERTY, CTF_FRAME_DISPLAY_SCROLLBAR }, + { "FrameIsBorder", XML_NAMESPACE_DRAW, XML_FRAME_DISPLAY_BORDER, XML_TYPE_BOOL|MID_FLAG_MULTI_PROPERTY, CTF_FRAME_DISPLAY_BORDER }, + { "FrameMarginWidth", XML_NAMESPACE_DRAW, XML_FRAME_MARGIN_HORIZONTAL, XML_TYPE_MEASURE_PX|MID_FLAG_MULTI_PROPERTY, CTF_FRAME_MARGIN_HORI }, + { "FrameMarginHeight", XML_NAMESPACE_DRAW, XML_FRAME_MARGIN_VERTICAL, XML_TYPE_MEASURE_PX|MID_FLAG_MULTI_PROPERTY, CTF_FRAME_MARGIN_VERT }, + { "VisibleArea", XML_NAMESPACE_DRAW, XML_VISIBLE_AREA_LEFT, XML_TYPE_RECTANGLE_LEFT|MID_FLAG_MERGE_PROPERTY|MID_FLAG_MULTI_PROPERTY, CTF_SD_OLE_VIS_AREA_LEFT }, + { "VisibleArea", XML_NAMESPACE_DRAW, XML_VISIBLE_AREA_TOP, XML_TYPE_RECTANGLE_TOP|MID_FLAG_MERGE_PROPERTY|MID_FLAG_MULTI_PROPERTY, CTF_SD_OLE_VIS_AREA_TOP }, + { "VisibleArea", XML_NAMESPACE_DRAW, XML_VISIBLE_AREA_WIDTH, XML_TYPE_RECTANGLE_WIDTH|MID_FLAG_MERGE_PROPERTY|MID_FLAG_MULTI_PROPERTY, CTF_SD_OLE_VIS_AREA_WIDTH }, + { "VisibleArea", XML_NAMESPACE_DRAW, XML_VISIBLE_AREA_HEIGHT, XML_TYPE_RECTANGLE_HEIGHT|MID_FLAG_MERGE_PROPERTY|MID_FLAG_MULTI_PROPERTY, CTF_SD_OLE_VIS_AREA_HEIGHT }, + { "IsInternal", XML_NAMESPACE_DRAW, XML__EMPTY, XML_TYPE_BUILDIN_CMP_ONLY, CTF_SD_OLE_ISINTERNAL }, // caption properties - { "CaptionType", XML_NAMESPACE_DRAW, sXML_caption_type, XML_SD_TYPE_CAPTION_TYPE, 0 }, - { "CaptionIsFixedAngle", XML_NAMESPACE_DRAW, sXML_caption_angle_type, XML_SD_TYPE_CAPTION_ANGLE_TYPE, 0 }, - { "CaptionAngle", XML_NAMESPACE_DRAW, sXML_caption_angle, XML_TYPE_NUMBER, 0 }, - { "CaptionGap", XML_NAMESPACE_DRAW, sXML_caption_gap, XML_TYPE_MEASURE, 0 }, - { "CaptionEscapeDirection", XML_NAMESPACE_DRAW, sXML_caption_escape_direction, XML_SD_TYPE_CAPTION_ESC_DIR, 0 }, - { "CaptionIsEscapeRelative", XML_NAMESPACE_DRAW, sXML_caption_escape, XML_SD_TYPE_CAPTION_IS_ESC_REL|MID_FLAG_MULTI_PROPERTY, CTF_CAPTION_ISESCREL }, - { "CaptionEscapeRelative", XML_NAMESPACE_DRAW, sXML_caption_escape, XML_SD_TYPE_CAPTION_ESC_REL|MID_FLAG_MULTI_PROPERTY, CTF_CAPTION_ESCREL }, - { "CaptionEscapeAbsolute", XML_NAMESPACE_DRAW, sXML_caption_escape, XML_SD_TYPE_CAPTION_ESC_ABS|MID_FLAG_MULTI_PROPERTY, CTF_CAPTION_ESCABS }, - { "CaptionLineLength", XML_NAMESPACE_DRAW, sXML_caption_line_length, XML_TYPE_MEASURE, 0 }, - { "CaptionIsFitLineLength", XML_NAMESPACE_DRAW, sXML_caption_fit_line_length, XML_TYPE_BOOL, 0 }, + { "CaptionType", XML_NAMESPACE_DRAW, XML_CAPTION_TYPE, XML_SD_TYPE_CAPTION_TYPE, 0 }, + { "CaptionIsFixedAngle", XML_NAMESPACE_DRAW, XML_CAPTION_ANGLE_TYPE, XML_SD_TYPE_CAPTION_ANGLE_TYPE, 0 }, + { "CaptionAngle", XML_NAMESPACE_DRAW, XML_CAPTION_ANGLE, XML_TYPE_NUMBER, 0 }, + { "CaptionGap", XML_NAMESPACE_DRAW, XML_CAPTION_GAP, XML_TYPE_MEASURE, 0 }, + { "CaptionEscapeDirection", XML_NAMESPACE_DRAW, XML_CAPTION_ESCAPE_DIRECTION, XML_SD_TYPE_CAPTION_ESC_DIR, 0 }, + { "CaptionIsEscapeRelative", XML_NAMESPACE_DRAW, XML_CAPTION_ESCAPE, XML_SD_TYPE_CAPTION_IS_ESC_REL|MID_FLAG_MULTI_PROPERTY, CTF_CAPTION_ISESCREL }, + { "CaptionEscapeRelative", XML_NAMESPACE_DRAW, XML_CAPTION_ESCAPE, XML_SD_TYPE_CAPTION_ESC_REL|MID_FLAG_MULTI_PROPERTY, CTF_CAPTION_ESCREL }, + { "CaptionEscapeAbsolute", XML_NAMESPACE_DRAW, XML_CAPTION_ESCAPE, XML_SD_TYPE_CAPTION_ESC_ABS|MID_FLAG_MULTI_PROPERTY, CTF_CAPTION_ESCABS }, + { "CaptionLineLength", XML_NAMESPACE_DRAW, XML_CAPTION_LINE_LENGTH, XML_TYPE_MEASURE, 0 }, + { "CaptionIsFitLineLength", XML_NAMESPACE_DRAW, XML_CAPTION_FIT_LINE_LENGTH, XML_TYPE_BOOL, 0 }, // misc object properties - { "MoveProtect", XML_NAMESPACE_DRAW, sXML_move_protect, XML_TYPE_BOOL, CTF_SD_MOVE_PROTECT }, - { "SizeProtect", XML_NAMESPACE_DRAW, sXML_size_protect, XML_TYPE_BOOL, CTF_SD_SIZE_PROTECT }, + { "MoveProtect", XML_NAMESPACE_DRAW, XML_MOVE_PROTECT, XML_TYPE_BOOL, CTF_SD_MOVE_PROTECT }, + { "SizeProtect", XML_NAMESPACE_DRAW, XML_SIZE_PROTECT, XML_TYPE_BOOL, CTF_SD_SIZE_PROTECT }, { 0L } }; @@ -411,34 +411,34 @@ const XMLPropertyMapEntry aXMLSDProperties[] = const XMLPropertyMapEntry aXMLSDPresPageProps[] = { - { "Change", XML_NAMESPACE_PRESENTATION, "transition-type", XML_SD_TYPE_PRESPAGE_TYPE, CTF_PAGE_TRANS_TYPE }, - { "Effect", XML_NAMESPACE_PRESENTATION, "transition-style", XML_SD_TYPE_PRESPAGE_STYLE, CTF_PAGE_TRANS_STYLE }, - { "Speed", XML_NAMESPACE_PRESENTATION, "transition-speed", XML_SD_TYPE_PRESPAGE_SPEED, CTF_PAGE_TRANS_SPEED }, - { "Duration", XML_NAMESPACE_PRESENTATION, "duration", XML_SD_TYPE_PRESPAGE_DURATION, CTF_PAGE_TRANS_DURATION }, - { "Visible", XML_NAMESPACE_PRESENTATION, "visibility", XML_SD_TYPE_PRESPAGE_VISIBILITY, CTF_PAGE_VISIBLE }, - { "Sound", XML_NAMESPACE_PRESENTATION, "sound", XML_TYPE_STRING|MID_FLAG_ELEMENT_ITEM, CTF_PAGE_SOUND_URL }, - { "BackgroundFullSize", XML_NAMESPACE_DRAW, "background-size", XML_SD_TYPE_PRESPAGE_BACKSIZE, CTF_PAGE_BACKSIZE }, - - { "IsBackgroundVisible", XML_NAMESPACE_PRESENTATION, sXML_background_visible, XML_TYPE_BOOL, 0 }, - { "IsBackgroundObjectsVisible", XML_NAMESPACE_PRESENTATION, sXML_background_objects_visible, XML_TYPE_BOOL, 0 }, - - { "FillStyle", XML_NAMESPACE_DRAW, sXML_fill, XML_SD_TYPE_FILLSTYLE, 0 }, - { "FillColor", XML_NAMESPACE_DRAW, sXML_fill_color, XML_TYPE_COLOR, 0 }, - { "FillGradientName", XML_NAMESPACE_DRAW, sXML_fill_gradient_name, XML_TYPE_STRING, 0 }, - { "FillGradientStepCount", XML_NAMESPACE_DRAW, sXML_gradient_step_count, XML_TYPE_NUMBER, 0 }, - { "FillHatchName", XML_NAMESPACE_DRAW, sXML_fill_hatch_name, XML_TYPE_STRING, 0 }, - { "FillBitmapName", XML_NAMESPACE_DRAW, sXML_fill_image_name, XML_TYPE_STRING, 0 }, - { "FillTransparenceName", XML_NAMESPACE_DRAW, sXML_transparency_name, XML_TYPE_STRING, 0 }, - { "FillBitmapSizeX", XML_NAMESPACE_DRAW, sXML_fill_image_width, XML_SD_TYPE_FILLBITMAPSIZE|MID_FLAG_MULTI_PROPERTY, 0 }, - { "FillBitmapLogicalSize", XML_NAMESPACE_DRAW, sXML_fill_image_width, XML_SD_TYPE_LOGICAL_SIZE|MID_FLAG_MULTI_PROPERTY, 0 }, - { "FillBitmapSizeY", XML_NAMESPACE_DRAW, sXML_fill_image_height, XML_SD_TYPE_FILLBITMAPSIZE|MID_FLAG_MULTI_PROPERTY, 0 }, - { "FillBitmapLogicalSize", XML_NAMESPACE_DRAW, sXML_fill_image_height, XML_SD_TYPE_LOGICAL_SIZE|MID_FLAG_MULTI_PROPERTY, 0 }, - { "FillBitmapMode", XML_NAMESPACE_STYLE,sXML_repeat, XML_SD_TYPE_BITMAP_MODE, 0 }, - { "FillBitmapPositionOffsetX", XML_NAMESPACE_DRAW, sXML_fill_image_ref_point_x,XML_TYPE_PERCENT, 0 }, - { "FillBitmapPositionOffsetY", XML_NAMESPACE_DRAW, sXML_fill_image_ref_point_y,XML_TYPE_PERCENT, 0 }, - { "FillBitmapRectanglePoint", XML_NAMESPACE_DRAW, sXML_fill_image_ref_point, XML_SD_TYPE_BITMAP_REFPOINT, 0 }, - { "FillBitmapOffsetX", XML_NAMESPACE_DRAW, sXML_tile_repeat_offset, XML_SD_TYPE_BITMAPREPOFFSETX|MID_FLAG_MULTI_PROPERTY, CTF_REPEAT_OFFSET_X }, - { "FillBitmapOffsetY", XML_NAMESPACE_DRAW, sXML_tile_repeat_offset, XML_SD_TYPE_BITMAPREPOFFSETY|MID_FLAG_MULTI_PROPERTY, CTF_REPEAT_OFFSET_Y }, + { "Change", XML_NAMESPACE_PRESENTATION, XML_TRANSITION_TYPE, XML_SD_TYPE_PRESPAGE_TYPE, CTF_PAGE_TRANS_TYPE }, + { "Effect", XML_NAMESPACE_PRESENTATION, XML_TRANSITION_STYLE, XML_SD_TYPE_PRESPAGE_STYLE, CTF_PAGE_TRANS_STYLE }, + { "Speed", XML_NAMESPACE_PRESENTATION, XML_TRANSITION_SPEED, XML_SD_TYPE_PRESPAGE_SPEED, CTF_PAGE_TRANS_SPEED }, + { "Duration", XML_NAMESPACE_PRESENTATION, XML_DURATION, XML_SD_TYPE_PRESPAGE_DURATION, CTF_PAGE_TRANS_DURATION }, + { "Visible", XML_NAMESPACE_PRESENTATION, XML_VISIBILITY, XML_SD_TYPE_PRESPAGE_VISIBILITY, CTF_PAGE_VISIBLE }, + { "Sound", XML_NAMESPACE_PRESENTATION, XML_SOUND, XML_TYPE_STRING|MID_FLAG_ELEMENT_ITEM, CTF_PAGE_SOUND_URL }, + { "BackgroundFullSize", XML_NAMESPACE_DRAW, XML_BACKGROUND_SIZE, XML_SD_TYPE_PRESPAGE_BACKSIZE, CTF_PAGE_BACKSIZE }, + + { "IsBackgroundVisible", XML_NAMESPACE_PRESENTATION, XML_BACKGROUND_VISIBLE, XML_TYPE_BOOL, 0 }, + { "IsBackgroundObjectsVisible", XML_NAMESPACE_PRESENTATION, XML_BACKGROUND_OBJECTS_VISIBLE, XML_TYPE_BOOL, 0 }, + + { "FillStyle", XML_NAMESPACE_DRAW, XML_FILL, XML_SD_TYPE_FILLSTYLE, 0 }, + { "FillColor", XML_NAMESPACE_DRAW, XML_FILL_COLOR, XML_TYPE_COLOR, 0 }, + { "FillGradientName", XML_NAMESPACE_DRAW, XML_FILL_GRADIENT_NAME, XML_TYPE_STRING, 0 }, + { "FillGradientStepCount", XML_NAMESPACE_DRAW, XML_GRADIENT_STEP_COUNT, XML_TYPE_NUMBER, 0 }, + { "FillHatchName", XML_NAMESPACE_DRAW, XML_FILL_HATCH_NAME, XML_TYPE_STRING, 0 }, + { "FillBitmapName", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_NAME, XML_TYPE_STRING, 0 }, + { "FillTransparenceName", XML_NAMESPACE_DRAW, XML_TRANSPARENCY_NAME, XML_TYPE_STRING, 0 }, + { "FillBitmapSizeX", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_WIDTH, XML_SD_TYPE_FILLBITMAPSIZE|MID_FLAG_MULTI_PROPERTY, 0 }, + { "FillBitmapLogicalSize", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_WIDTH, XML_SD_TYPE_LOGICAL_SIZE|MID_FLAG_MULTI_PROPERTY, 0 }, + { "FillBitmapSizeY", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_HEIGHT, XML_SD_TYPE_FILLBITMAPSIZE|MID_FLAG_MULTI_PROPERTY, 0 }, + { "FillBitmapLogicalSize", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_HEIGHT, XML_SD_TYPE_LOGICAL_SIZE|MID_FLAG_MULTI_PROPERTY, 0 }, + { "FillBitmapMode", XML_NAMESPACE_STYLE,XML_REPEAT, XML_SD_TYPE_BITMAP_MODE, 0 }, + { "FillBitmapPositionOffsetX", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_REF_POINT_X, XML_TYPE_PERCENT, 0 }, + { "FillBitmapPositionOffsetY", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_REF_POINT_Y, XML_TYPE_PERCENT, 0 }, + { "FillBitmapRectanglePoint", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_REF_POINT, XML_SD_TYPE_BITMAP_REFPOINT, 0 }, + { "FillBitmapOffsetX", XML_NAMESPACE_DRAW, XML_TILE_REPEAT_OFFSET, XML_SD_TYPE_BITMAPREPOFFSETX|MID_FLAG_MULTI_PROPERTY, CTF_REPEAT_OFFSET_X }, + { "FillBitmapOffsetY", XML_NAMESPACE_DRAW, XML_TILE_REPEAT_OFFSET, XML_SD_TYPE_BITMAPREPOFFSETY|MID_FLAG_MULTI_PROPERTY, CTF_REPEAT_OFFSET_Y }, { 0L } }; @@ -818,9 +818,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy } case XML_SD_TYPE_SHADOW : { - const OUString aTrueStr( OUString::createFromAscii(sXML_visible) ); - const OUString aFalseStr( OUString::createFromAscii(sXML_hidden) ); - pHdl = new XMLNamedBoolPropertyHdl( aTrueStr, aFalseStr ); + pHdl = new XMLNamedBoolPropertyHdl( GetXMLToken(XML_VISIBLE), GetXMLToken(XML_HIDDEN) ); break; } case XML_SD_TYPE_PRESPAGE_STYLE : @@ -840,9 +838,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy } case XML_SD_TYPE_TEXT_CROSSEDOUT : { - const OUString aTrueStr( OUString::createFromAscii(sXML_crossedout_single) ); - const OUString aFalseStr( OUString::createFromAscii(sXML_none) ); - pHdl = new XMLNamedBoolPropertyHdl( aTrueStr, aFalseStr ); + pHdl = new XMLNamedBoolPropertyHdl( GetXMLToken(XML_CROSSEDOUT_SINGLE), GetXMLToken(XML_NONE) ); break; } case XML_SD_TYPE_OPACITY : @@ -857,16 +853,12 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy } case XML_SD_TYPE_PRESPAGE_VISIBILITY : { - const OUString aTrueStr( OUString::createFromAscii(sXML_visible) ); - const OUString aFalseStr( OUString::createFromAscii(sXML_hidden) ); - pHdl = new XMLNamedBoolPropertyHdl( aTrueStr, aFalseStr ); + pHdl = new XMLNamedBoolPropertyHdl( GetXMLToken(XML_VISIBLE), GetXMLToken(XML_HIDDEN) ); break; } case XML_SD_TYPE_PRESPAGE_BACKSIZE: { - const OUString aTrueStr( OUString::createFromAscii(sXML_full) ); - const OUString aFalseStr( OUString::createFromAscii(sXML_border) ); - pHdl = new XMLNamedBoolPropertyHdl( aTrueStr, aFalseStr ); + pHdl = new XMLNamedBoolPropertyHdl( GetXMLToken(XML_FULL), GetXMLToken(XML_BORDER) ); break; } @@ -878,9 +870,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy // #87922# DoubleSided -> BackfaceCulling // This BOOL needs to be flipped, DoubleSided TRUE -> NO Backface culling // and vice versa. - const OUString aTrueStr( OUString::createFromAscii(sXML_disabled) ); - const OUString aFalseStr( OUString::createFromAscii(sXML_enabled) ); - pHdl = new XMLNamedBoolPropertyHdl( aTrueStr, aFalseStr ); + pHdl = new XMLNamedBoolPropertyHdl( GetXMLToken(XML_DISABLED), GetXMLToken(XML_ENABLED) ); break; } @@ -891,9 +881,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy } case XML_SD_TYPE_NORMALS_DIRECTION: { - const OUString aTrueStr( OUString::createFromAscii(sXML_normal) ); - const OUString aFalseStr( OUString::createFromAscii(sXML_inverse) ); - pHdl = new XMLNamedBoolPropertyHdl( aTrueStr, aFalseStr ); + pHdl = new XMLNamedBoolPropertyHdl( GetXMLToken(XML_NORMAL), GetXMLToken(XML_INVERSE) ); break; } case XML_SD_TYPE_TEX_GENERATION_MODE_X: @@ -984,9 +972,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy break; case XML_SD_TYPE_MEASURE_PLACING: { - const OUString aTrueStr( OUString::createFromAscii(sXML_below) ); - const OUString aFalseStr( OUString::createFromAscii(sXML_above) ); - pHdl = new XMLNamedBoolPropertyHdl( aTrueStr, aFalseStr ); + pHdl = new XMLNamedBoolPropertyHdl( GetXMLToken(XML_BELOW), GetXMLToken(XML_ABOVE) ); } break; case XML_TYPE_TEXT_CLIP: @@ -1016,9 +1002,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy case XML_SD_TYPE_CAPTION_ANGLE_TYPE: { - const OUString aTrueStr( OUString::createFromAscii(sXML_fixed) ); - const OUString aFalseStr( OUString::createFromAscii(sXML_free) ); - pHdl = new XMLNamedBoolPropertyHdl( aTrueStr, aFalseStr ); + pHdl = new XMLNamedBoolPropertyHdl( GetXMLToken(XML_FIXED), GetXMLToken(XML_FREE) ); break; } case XML_SD_TYPE_CAPTION_IS_ESC_REL: @@ -1063,9 +1047,9 @@ XMLShapeExportPropertyMapper::XMLShapeExportPropertyMapper( const UniReference< mpListAutoPool( pListAutoPool ), mrExport( rExport ), maNumRuleExp( rExport ), - msCDATA( rtl::OUString::createFromAscii( sXML_CDATA )), - msTrue( rtl::OUString::createFromAscii( sXML_true )), - msFalse( rtl::OUString::createFromAscii( sXML_false )), + msCDATA( GetXMLToken(XML_CDATA)), + msTrue( GetXMLToken(XML_TRUE)), + msFalse( GetXMLToken(XML_FALSE)), mbIsInAutoStyles( sal_False ) { } @@ -1167,7 +1151,7 @@ void XMLShapeExportPropertyMapper::ContextFilter( case CTF_FILLHATCHNAME: case CTF_FILLBITMAPNAME: // #85953# take out this case to allow writing empty -// sXML_transparency_name entries. This is used to represent +// XML_TRANSPARENCY_NAME entries. This is used to represent // disabled FillTransparencyItems. // case CTF_FILLTRANSNAME: { @@ -1390,7 +1374,7 @@ XMLPagePropertySetMapper::~XMLPagePropertySetMapper() XMLPageExportPropertyMapper::XMLPageExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport ) : SvXMLExportPropertyMapper( rMapper ), mrExport( rExport ), - msCDATA( rtl::OUString::createFromAscii( sXML_CDATA )) + msCDATA( GetXMLToken(XML_CDATA)) { } @@ -1495,11 +1479,11 @@ void XMLPageExportPropertyMapper::handleElementItem( OUString aSoundURL; if( (rProperty.maValue >>= aSoundURL) && aSoundURL.getLength() != 0 ) { - mrExport.AddAttribute(XML_NAMESPACE_XLINK, sXML_href, mrExport.GetRelativeReference(aSoundURL) ); - mrExport.AddAttributeASCII( XML_NAMESPACE_XLINK, sXML_type, sXML_simple ); - mrExport.AddAttributeASCII( XML_NAMESPACE_XLINK, sXML_show, sXML_new ); - mrExport.AddAttributeASCII( XML_NAMESPACE_XLINK, sXML_actuate, sXML_onRequest ); - SvXMLElementExport aElem( mrExport, XML_NAMESPACE_PRESENTATION, sXML_sound, sal_True, sal_True ); + mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, mrExport.GetRelativeReference(aSoundURL) ); + mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); + mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_NEW ); + mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONREQUEST ); + SvXMLElementExport aElem( mrExport, XML_NAMESPACE_PRESENTATION, XML_SOUND, sal_True, sal_True ); } } break; diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 5a266dac7178..433d0d708eb0 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sdxmlexp.cxx,v $ * - * $Revision: 1.69 $ + * $Revision: 1.70 $ * - * last change: $Author: dvo $ $Date: 2001-06-18 15:08:13 $ + * last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,10 +73,6 @@ #include "xmluconv.hxx" #endif -#ifndef _XMLOFF_XMLKYWD_HXX -#include "xmlkywd.hxx" -#endif - #ifndef _XMLOFF_XMLTOKEN_HXX #include "xmltoken.hxx" #endif @@ -556,7 +552,7 @@ SdXMLExport::SdXMLExport( sal_Bool bIsDraw, sal_uInt16 nExportFlags ) mbIsDraw(bIsDraw), mbFamilyGraphicUsed(FALSE), mbFamilyPresentationUsed(FALSE), - msZIndex( RTL_CONSTASCII_USTRINGPARAM(sXML_zindex) ), + msZIndex( GetXMLToken(XML_ZINDEX) ), msEmptyPres( RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ), msModel( RTL_CONSTASCII_USTRINGPARAM("Model") ), msStartShape( RTL_CONSTASCII_USTRINGPARAM("StartShape") ), @@ -697,7 +693,8 @@ void SAL_CALL SdXMLExport::setSourceDocument( const uno::Reference< lang::XCompo // add namespaces _GetNamespaceMap().AddAtIndex( - XML_NAMESPACE_PRESENTATION, sXML_np_presentation, sXML_n_presentation, XML_NAMESPACE_PRESENTATION); + XML_NAMESPACE_PRESENTATION, GetXMLToken(XML_NP_PRESENTATION), + GetXMLToken(XML_N_PRESENTATION), XML_NAMESPACE_PRESENTATION); GetShapeExport()->enableLayerExport(); } @@ -856,10 +853,10 @@ void SdXMLExport::ImpWriteObjGraphicStyleInfos() if( !xDefaults.is() ) return; - aStEx.exportDefaultStyle( xDefaults, XML_STYLE_FAMILY_SD_GRAPHICS_NAME, aMapperRef ); + aStEx.exportDefaultStyle( xDefaults, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), aMapperRef ); // write graphic family styles - aStEx.exportStyleFamily(XML_STYLE_FAMILY_SD_GRAPHICS_NAME, XML_STYLE_FAMILY_SD_GRAPHICS_NAME, aMapperRef, FALSE, XML_STYLE_FAMILY_SD_GRAPHICS_ID); + aStEx.exportStyleFamily(XML_STYLE_FAMILY_SD_GRAPHICS_NAME, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), aMapperRef, FALSE, XML_STYLE_FAMILY_SD_GRAPHICS_ID); } ////////////////////////////////////////////////////////////////////////////// @@ -975,10 +972,10 @@ void SdXMLExport::ImpWriteAutoLayoutInfos() if(pInfo) { // prepare presentation-page layout attributes, style-name - AddAttribute(XML_NAMESPACE_STYLE, sXML_name, pInfo->GetLayoutName()); + AddAttribute(XML_NAMESPACE_STYLE, XML_NAME, pInfo->GetLayoutName()); // write draw-style attributes - SvXMLElementExport aDSE(*this, XML_NAMESPACE_STYLE, sXML_presentation_page_layout, sal_True, sal_True); + SvXMLElementExport aDSE(*this, XML_NAMESPACE_STYLE, XML_PRESENTATION_PAGE_LAYOUT, sal_True, sal_True); // write presentation placeholders switch(pInfo->GetLayoutType()) @@ -1322,27 +1319,27 @@ void SdXMLExport::ImpWriteAutoLayoutPlaceholder(XmlPlaceholder ePl, const Rectan case XmlPlaceholderVerticalOutline: aStr = OUString(RTL_CONSTASCII_USTRINGPARAM("vertical_outline")); break; } - AddAttribute(XML_NAMESPACE_PRESENTATION, sXML_object, aStr); + AddAttribute(XML_NAMESPACE_PRESENTATION, XML_OBJECT, aStr); // svg:x,y,width,height GetMM100UnitConverter().convertMeasure(sStringBuffer, rRect.Left()); aStr = sStringBuffer.makeStringAndClear(); - AddAttribute(XML_NAMESPACE_SVG, sXML_x, aStr); + AddAttribute(XML_NAMESPACE_SVG, XML_X, aStr); GetMM100UnitConverter().convertMeasure(sStringBuffer, rRect.Top()); aStr = sStringBuffer.makeStringAndClear(); - AddAttribute(XML_NAMESPACE_SVG, sXML_y, aStr); + AddAttribute(XML_NAMESPACE_SVG, XML_Y, aStr); GetMM100UnitConverter().convertMeasure(sStringBuffer, rRect.GetWidth()); aStr = sStringBuffer.makeStringAndClear(); - AddAttribute(XML_NAMESPACE_SVG, sXML_width, aStr); + AddAttribute(XML_NAMESPACE_SVG, XML_WIDTH, aStr); GetMM100UnitConverter().convertMeasure(sStringBuffer, rRect.GetHeight()); aStr = sStringBuffer.makeStringAndClear(); - AddAttribute(XML_NAMESPACE_SVG, sXML_height, aStr); + AddAttribute(XML_NAMESPACE_SVG, XML_HEIGHT, aStr); // write presentation-placeholder - SvXMLElementExport aPPL(*this, XML_NAMESPACE_PRESENTATION, sXML_placeholder, sal_True, sal_True); + SvXMLElementExport aPPL(*this, XML_NAMESPACE_PRESENTATION, XML_PLACEHOLDER, sal_True, sal_True); } ////////////////////////////////////////////////////////////////////////////// @@ -1405,43 +1402,43 @@ void SdXMLExport::ImpWritePageMasterInfos() OUStringBuffer sStringBuffer; sString = sNewName; - AddAttribute(XML_NAMESPACE_STYLE, sXML_name, sString); + AddAttribute(XML_NAMESPACE_STYLE, XML_NAME, sString); // write page-master - SvXMLElementExport aPME(*this, XML_NAMESPACE_STYLE, sXML_page_master, sal_True, sal_True); + SvXMLElementExport aPME(*this, XML_NAMESPACE_STYLE, XML_PAGE_MASTER, sal_True, sal_True); // prepare style:properties inside page-master GetMM100UnitConverter().convertMeasure(sStringBuffer, pInfo->GetBorderTop()); sString = sStringBuffer.makeStringAndClear(); - AddAttribute(XML_NAMESPACE_FO, sXML_margin_top, sString); + AddAttribute(XML_NAMESPACE_FO, XML_MARGIN_TOP, sString); GetMM100UnitConverter().convertMeasure(sStringBuffer, pInfo->GetBorderBottom()); sString = sStringBuffer.makeStringAndClear(); - AddAttribute(XML_NAMESPACE_FO, sXML_margin_bottom, sString); + AddAttribute(XML_NAMESPACE_FO, XML_MARGIN_BOTTOM, sString); GetMM100UnitConverter().convertMeasure(sStringBuffer, pInfo->GetBorderLeft()); sString = sStringBuffer.makeStringAndClear(); - AddAttribute(XML_NAMESPACE_FO, sXML_margin_left, sString); + AddAttribute(XML_NAMESPACE_FO, XML_MARGIN_LEFT, sString); GetMM100UnitConverter().convertMeasure(sStringBuffer, pInfo->GetBorderRight()); sString = sStringBuffer.makeStringAndClear(); - AddAttribute(XML_NAMESPACE_FO, sXML_margin_right, sString); + AddAttribute(XML_NAMESPACE_FO, XML_MARGIN_RIGHT, sString); GetMM100UnitConverter().convertMeasure(sStringBuffer, pInfo->GetWidth()); sString = sStringBuffer.makeStringAndClear(); - AddAttribute(XML_NAMESPACE_FO, sXML_page_width, sString); + AddAttribute(XML_NAMESPACE_FO, XML_PAGE_WIDTH, sString); GetMM100UnitConverter().convertMeasure(sStringBuffer, pInfo->GetHeight()); sString = sStringBuffer.makeStringAndClear(); - AddAttribute(XML_NAMESPACE_FO, sXML_page_height, sString); + AddAttribute(XML_NAMESPACE_FO, XML_PAGE_HEIGHT, sString); if(pInfo->GetOrientation() == view::PaperOrientation_PORTRAIT) - AddAttributeASCII(XML_NAMESPACE_STYLE, sXML_print_orientation, sXML_portrait); + AddAttribute(XML_NAMESPACE_STYLE, XML_PRINT_ORIENTATION, XML_PORTRAIT); else - AddAttributeASCII(XML_NAMESPACE_STYLE, sXML_print_orientation, sXML_landscape); + AddAttribute(XML_NAMESPACE_STYLE, XML_PRINT_ORIENTATION, XML_LANDSCAPE); // write style:properties - SvXMLElementExport aPMF(*this, XML_NAMESPACE_STYLE, sXML_properties, sal_True, sal_True); + SvXMLElementExport aPMF(*this, XML_NAMESPACE_STYLE, XML_PROPERTIES, sal_True, sal_True); } } } @@ -1624,7 +1621,8 @@ void SdXMLExport::ImpWritePresentationStyles() OUString aPrefix = xNamed->getName(); aPrefix += OUString(RTL_CONSTASCII_USTRINGPARAM("-")); aStEx.exportStyleFamily(xNamed->getName(), - XML_STYLE_FAMILY_SD_PRESENTATION_NAME, aMapperRef, FALSE, + OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_PRESENTATION_NAME)), + aMapperRef, FALSE, XML_STYLE_FAMILY_SD_PRESENTATION_ID, &aPrefix); } } @@ -1657,13 +1655,13 @@ void SdXMLExport::_ExportMeta() if(mnObjectCount) { GetMM100UnitConverter().convertNumber(sBuffer, mnObjectCount); - AddAttribute(XML_NAMESPACE_META, sXML_object_count, sBuffer.makeStringAndClear()); + AddAttribute(XML_NAMESPACE_META, XML_OBJECT_COUNT, sBuffer.makeStringAndClear()); bContentUsed = TRUE; } // when there is data, export it if(bContentUsed) - SvXMLElementExport aElemStat(*this, XML_NAMESPACE_META, sXML_document_statistic, sal_True, sal_True); + SvXMLElementExport aElemStat(*this, XML_NAMESPACE_META, XML_DOCUMENT_STATISTIC, sal_True, sal_True); } ////////////////////////////////////////////////////////////////////////////// @@ -1683,14 +1681,14 @@ void SdXMLExport::_ExportContent() // prepare page attributes, name of page uno::Reference < container::XNamed > xNamed(xDrawPage, uno::UNO_QUERY); if(xNamed.is()) - AddAttribute(XML_NAMESPACE_DRAW, sXML_name, xNamed->getName()); + AddAttribute(XML_NAMESPACE_DRAW, XML_NAME, xNamed->getName()); // draw:style-name (presentation page attributes AND background attributes) if( maDrawPagesStyleNames[nPageInd].getLength() ) - AddAttribute(XML_NAMESPACE_DRAW, sXML_style_name, maDrawPagesStyleNames[nPageInd]); + AddAttribute(XML_NAMESPACE_DRAW, XML_STYLE_NAME, maDrawPagesStyleNames[nPageInd]); if( IsImpress() ) - AddAttribute(XML_NAMESPACE_DRAW, sXML_id, OUString::valueOf( sal_Int32( nPageInd + 1 ) ) ); + AddAttribute(XML_NAMESPACE_DRAW, XML_ID, OUString::valueOf( sal_Int32( nPageInd + 1 ) ) ); // draw:master-page-name uno::Reference < drawing::XMasterPageTarget > xMasterPageInt(xDrawPage, uno::UNO_QUERY); @@ -1702,7 +1700,7 @@ void SdXMLExport::_ExportContent() uno::Reference < container::XNamed > xMasterNamed(xUsedMasterPage, uno::UNO_QUERY); if(xMasterNamed.is()) { - AddAttribute(XML_NAMESPACE_DRAW, sXML_master_page_name, xMasterNamed->getName()); + AddAttribute(XML_NAMESPACE_DRAW, XML_MASTER_PAGE_NAME, xMasterNamed->getName()); } } } @@ -1710,11 +1708,11 @@ void SdXMLExport::_ExportContent() // presentation:page-layout-name if( IsImpress() && maDrawPagesAutoLayoutNames[nPageInd+1].getLength()) { - AddAttribute(XML_NAMESPACE_PRESENTATION, sXML_presentation_page_layout_name, maDrawPagesAutoLayoutNames[nPageInd+1]); + AddAttribute(XML_NAMESPACE_PRESENTATION, XML_PRESENTATION_PAGE_LAYOUT_NAME, maDrawPagesAutoLayoutNames[nPageInd+1]); } // write page - SvXMLElementExport aDPG(*this, XML_NAMESPACE_DRAW, sXML_page, sal_True, sal_True); + SvXMLElementExport aDPG(*this, XML_NAMESPACE_DRAW, XML_PAGE, sal_True, sal_True); // write optional office:forms exportFormsElement( xDrawPage ); @@ -1753,7 +1751,7 @@ void SdXMLExport::_ExportContent() if(xShapes.is() && xShapes->getCount()) { // write presentation notes - SvXMLElementExport aPSY(*this, XML_NAMESPACE_PRESENTATION, sXML_notes, sal_True, sal_True); + SvXMLElementExport aPSY(*this, XML_NAMESPACE_PRESENTATION, XML_NOTES, sal_True, sal_True); // write optional office:forms exportFormsElement( xNotesPage ); @@ -1797,7 +1795,7 @@ void SdXMLExport::exportPresentationSettings() xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "FirstPage" ) ) ) >>= aFirstPage; if( aFirstPage.getLength() ) { - AddAttribute(XML_NAMESPACE_PRESENTATION, sXML_start_page, aFirstPage ); + AddAttribute(XML_NAMESPACE_PRESENTATION, XML_START_PAGE, aFirstPage ); bHasAttr = sal_True; } else @@ -1806,7 +1804,7 @@ void SdXMLExport::exportPresentationSettings() xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "CustomShow" ) ) ) >>= aCustomShow; if( aCustomShow.getLength() ) { - AddAttribute(XML_NAMESPACE_PRESENTATION, sXML_show, aCustomShow ); + AddAttribute(XML_NAMESPACE_PRESENTATION, XML_SHOW, aCustomShow ); bHasAttr = sal_True; } } @@ -1815,7 +1813,7 @@ void SdXMLExport::exportPresentationSettings() xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsEndless" ) ) ) >>= bTemp; if( bTemp ) { - AddAttributeASCII(XML_NAMESPACE_PRESENTATION, sXML_endless, sXML_true ); + AddAttribute(XML_NAMESPACE_PRESENTATION, XML_ENDLESS, XML_TRUE ); bHasAttr = sal_True; sal_Int32 nPause; @@ -1825,69 +1823,69 @@ void SdXMLExport::exportPresentationSettings() OUStringBuffer aOut; SvXMLUnitConverter::convertTime( aOut, aTime ); - AddAttribute(XML_NAMESPACE_PRESENTATION, sXML_pause, aOut.makeStringAndClear() ); + AddAttribute(XML_NAMESPACE_PRESENTATION, XML_PAUSE, aOut.makeStringAndClear() ); } xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "AllowAnimations" ) ) ) >>= bTemp; if( !bTemp ) { - AddAttributeASCII(XML_NAMESPACE_PRESENTATION, sXML_animations, sXML_disabled ); + AddAttribute(XML_NAMESPACE_PRESENTATION, XML_ANIMATIONS, XML_DISABLED ); bHasAttr = sal_True; } xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsAlwaysOnTop" ) ) ) >>= bTemp; if( bTemp ) { - AddAttributeASCII(XML_NAMESPACE_PRESENTATION, sXML_stay_on_top, sXML_true ); + AddAttribute(XML_NAMESPACE_PRESENTATION, XML_STAY_ON_TOP, XML_TRUE ); bHasAttr = sal_True; } xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsAutomatic" ) ) ) >>= bTemp; if( bTemp ) { - AddAttributeASCII(XML_NAMESPACE_PRESENTATION, sXML_force_manual, sXML_true ); + AddAttribute(XML_NAMESPACE_PRESENTATION, XML_FORCE_MANUAL, XML_TRUE ); bHasAttr = sal_True; } xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFullScreen" ) ) ) >>= bTemp; if( !bTemp ) { - AddAttributeASCII(XML_NAMESPACE_PRESENTATION, sXML_full_screen, sXML_false ); + AddAttribute(XML_NAMESPACE_PRESENTATION, XML_FULL_SCREEN, XML_FALSE ); bHasAttr = sal_True; } xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsMouseVisible" ) ) ) >>= bTemp; if( !bTemp ) { - AddAttributeASCII(XML_NAMESPACE_PRESENTATION, sXML_mouse_visible, sXML_false ); + AddAttribute(XML_NAMESPACE_PRESENTATION, XML_MOUSE_VISIBLE, XML_FALSE ); bHasAttr = sal_True; } xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "StartWithNavigator" ) ) ) >>= bTemp; if( bTemp ) { - AddAttributeASCII(XML_NAMESPACE_PRESENTATION, sXML_start_with_navigator, sXML_true ); + AddAttribute(XML_NAMESPACE_PRESENTATION, XML_START_WITH_NAVIGATOR, XML_TRUE ); bHasAttr = sal_True; } xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "UsePen" ) ) ) >>= bTemp; if( bTemp ) { - AddAttributeASCII(XML_NAMESPACE_PRESENTATION, sXML_mouse_as_pen, sXML_true ); + AddAttribute(XML_NAMESPACE_PRESENTATION, XML_MOUSE_AS_PEN, XML_TRUE ); bHasAttr = sal_True; } xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsTransitionOnClick" ) ) ) >>= bTemp; if( !bTemp ) { - AddAttributeASCII(XML_NAMESPACE_PRESENTATION, sXML_transition_on_click, sXML_disabled ); + AddAttribute(XML_NAMESPACE_PRESENTATION, XML_TRANSITION_ON_CLICK, XML_DISABLED ); bHasAttr = sal_True; } xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsShowLogo" ) ) ) >>= bTemp; if( bTemp ) { - AddAttributeASCII(XML_NAMESPACE_PRESENTATION, sXML_show_logo, sXML_true ); + AddAttribute(XML_NAMESPACE_PRESENTATION, XML_SHOW_LOGO, XML_TRUE ); bHasAttr = sal_True; } @@ -1910,7 +1908,7 @@ void SdXMLExport::exportPresentationSettings() if( bHasAttr || nShowCount != 0 ) { - SvXMLElementExport aSettings(*this, XML_NAMESPACE_PRESENTATION, sXML_settings, sal_True, sal_True); + SvXMLElementExport aSettings(*this, XML_NAMESPACE_PRESENTATION, XML_SETTINGS, sal_True, sal_True); if( nShowCount == 0 ) return; @@ -1922,7 +1920,7 @@ void SdXMLExport::exportPresentationSettings() for( sal_Int32 nIndex = 0; nIndex < nShowCount; nIndex++, pShowNames++ ) { - AddAttribute(XML_NAMESPACE_PRESENTATION, sXML_name, *pShowNames ); + AddAttribute(XML_NAMESPACE_PRESENTATION, XML_NAME, *pShowNames ); xShows->getByName( *pShowNames ) >>= xShow; DBG_ASSERT( xShow.is(), "invalid custom show!" ); @@ -1944,9 +1942,9 @@ void SdXMLExport::exportPresentationSettings() } if( sTmp.getLength() ) - AddAttribute(XML_NAMESPACE_PRESENTATION, sXML_pages, sTmp.makeStringAndClear() ); + AddAttribute(XML_NAMESPACE_PRESENTATION, XML_PAGES, sTmp.makeStringAndClear() ); - SvXMLElementExport aShows(*this, XML_NAMESPACE_PRESENTATION, sXML_show, sal_True, sal_True); + SvXMLElementExport aShows(*this, XML_NAMESPACE_PRESENTATION, XML_SHOW, sal_True, sal_True); } } } @@ -2191,11 +2189,11 @@ void SdXMLExport::_ExportMasterStyles() // presentation:page-layout-name if( IsImpress() && maDrawPagesAutoLayoutNames[0].getLength()) { - AddAttribute(XML_NAMESPACE_PRESENTATION, sXML_presentation_page_layout_name, maDrawPagesAutoLayoutNames[0]); + AddAttribute(XML_NAMESPACE_PRESENTATION, XML_PRESENTATION_PAGE_LAYOUT_NAME, maDrawPagesAutoLayoutNames[0]); } // write masterpage - SvXMLElementExport aMPG(*this, XML_NAMESPACE_STYLE, sXML_handout_master, sal_True, sal_True); + SvXMLElementExport aMPG(*this, XML_NAMESPACE_STYLE, XML_HANDOUT_MASTER, sal_True, sal_True); // write graphic objects on this master page (if any) uno::Reference< drawing::XShapes > xShapes(xHandoutPage, uno::UNO_QUERY); @@ -2219,22 +2217,22 @@ void SdXMLExport::_ExportMasterStyles() if(xNamed.is()) { sMasterPageName = xNamed->getName(); - AddAttribute(XML_NAMESPACE_STYLE, sXML_name, sMasterPageName); + AddAttribute(XML_NAMESPACE_STYLE, XML_NAME, sMasterPageName); } ImpXMLEXPPageMasterInfo* pInfo = mpPageMaterUsageList->GetObject(nMPageId); if(pInfo) { OUString sString = pInfo->GetName(); - AddAttribute(XML_NAMESPACE_STYLE, sXML_page_master_name, sString); + AddAttribute(XML_NAMESPACE_STYLE, XML_PAGE_MASTER_NAME, sString); } // draw:style-name (background attributes) if( maMasterPagesStyleNames[nMPageId].getLength() ) - AddAttribute(XML_NAMESPACE_DRAW, sXML_style_name, maMasterPagesStyleNames[nMPageId]); + AddAttribute(XML_NAMESPACE_DRAW, XML_STYLE_NAME, maMasterPagesStyleNames[nMPageId]); // write masterpage - SvXMLElementExport aMPG(*this, XML_NAMESPACE_STYLE, sXML_master_page, sal_True, sal_True); + SvXMLElementExport aMPG(*this, XML_NAMESPACE_STYLE, XML_MASTER_PAGE, sal_True, sal_True); // write optional office:forms exportFormsElement( xMasterPage ); @@ -2257,7 +2255,7 @@ void SdXMLExport::_ExportMasterStyles() if(xShapes.is() && xShapes->getCount()) { // write presentation notes - SvXMLElementExport aPSY(*this, XML_NAMESPACE_PRESENTATION, sXML_notes, sal_True, sal_True); + SvXMLElementExport aPSY(*this, XML_NAMESPACE_PRESENTATION, XML_NOTES, sal_True, sal_True); // write optional office:forms exportFormsElement( xNotesPage ); @@ -2299,7 +2297,7 @@ void SdXMLExport::GetViewSettings(uno::Sequence<beans::PropertyValue>& rProps) beans::PropertyValue* pProps = rProps.getArray(); if(pProps) { -// SvXMLElementExport aViewSettingsElem(*this, XML_NAMESPACE_DRAW, sXML_view_settings, sal_True, sal_True); +// SvXMLElementExport aViewSettingsElem(*this, XML_NAMESPACE_DRAW, XML_VIEW_SETTINGS, sal_True, sal_True); uno::Reference< beans::XPropertySet > xPropSet( GetModel(), uno::UNO_QUERY ); if( !xPropSet.is() ) diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index befd68bad24c..aceecf9f29f3 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sdxmlimp.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: dvo $ $Date: 2001-06-15 17:13:27 $ + * last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,10 +89,6 @@ #include "xmlnmspe.hxx" #endif -#ifndef _XMLOFF_XMLKYWD_HXX -#include "xmlkywd.hxx" -#endif - #ifndef _XMLOFF_XMLTOKEN_HXX #include "xmltoken.hxx" #endif @@ -565,7 +561,8 @@ SdXMLImport::SdXMLImport( sal_Bool bIsDraw, sal_uInt16 nImportFlags ) { // add namespaces GetNamespaceMap().AddAtIndex( - XML_NAMESPACE_PRESENTATION, sXML_np_presentation, sXML_n_presentation, XML_NAMESPACE_PRESENTATION); + XML_NAMESPACE_PRESENTATION, GetXMLToken(XML_NP_PRESENTATION), + GetXMLToken(XML_N_PRESENTATION), XML_NAMESPACE_PRESENTATION); } // XImporter @@ -774,11 +771,11 @@ SvXMLImportContext *SdXMLImport::CreateContext(USHORT nPrefix, SvXMLImportContext* pContext = 0; if(XML_NAMESPACE_OFFICE == nPrefix && - ( 0 == rLocalName.compareToAscii(sXML_document) || - 0 == rLocalName.compareToAscii(sXML_document_meta) || - 0 == rLocalName.compareToAscii(sXML_document_styles) || - 0 == rLocalName.compareToAscii(sXML_document_content) || - 0 == rLocalName.compareToAscii(sXML_document_settings) )) + ( IsXMLToken( rLocalName, XML_DOCUMENT ) || + IsXMLToken( rLocalName, XML_DOCUMENT_META ) || + IsXMLToken( rLocalName, XML_DOCUMENT_STYLES ) || + IsXMLToken( rLocalName, XML_DOCUMENT_CONTENT ) || + IsXMLToken( rLocalName, XML_DOCUMENT_SETTINGS ) )) { pContext = new SdXMLDocContext_Impl(*this, nPrefix, rLocalName, xAttrList); } diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 95dc1ee5f747..6a050e0814df 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -2,9 +2,9 @@ * * $RCSfile: shapeexport.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: cl $ $Date: 2001-06-27 16:31:05 $ + * last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -107,7 +107,14 @@ #include "contextid.hxx" #endif -#include "xmlkywd.hxx" +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" +#endif + +#ifndef _STRING_HXX //autogen +#include <tools/string.hxx> +#endif + #include "xmlnmspe.hxx" using namespace ::rtl; @@ -452,7 +459,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape { const OUString aName( xNamed->getName() ); if( aName.getLength() ) - rExport.AddAttribute(XML_NAMESPACE_DRAW, sXML_name, aName ); + rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_NAME, aName ); } } @@ -462,9 +469,9 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape if( aShapeInfo.msStyleName.getLength() != 0 ) { if(XML_STYLE_FAMILY_SD_GRAPHICS_ID == aShapeInfo.mnFamily) - rExport.AddAttribute(XML_NAMESPACE_DRAW, sXML_style_name, aShapeInfo.msStyleName); + rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_STYLE_NAME, aShapeInfo.msStyleName); else - rExport.AddAttribute(XML_NAMESPACE_PRESENTATION, sXML_style_name, aShapeInfo.msStyleName); + rExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_STYLE_NAME, aShapeInfo.msStyleName); } // ------------------ @@ -472,7 +479,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape // ------------------ if( aShapeInfo.msTextStyleName.getLength() != 0 ) { - rExport.AddAttribute(XML_NAMESPACE_DRAW, sXML_text_style_name, aShapeInfo.msTextStyleName); + rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_TEXT_STYLE_NAME, aShapeInfo.msTextStyleName); } // -------------------------- @@ -483,7 +490,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape if( nShapeId != -1 ) { const OUString sId( OUString::valueOf( nShapeId ) ); - rExport.AddAttribute(XML_NAMESPACE_DRAW, sXML_id, sId ); + rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_ID, sId ); } } @@ -501,7 +508,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY ); OUString aLayerName; xProps->getPropertyValue( OUString::createFromAscii( "LayerName" ) ) >>= aLayerName; - rExport.AddAttribute(XML_NAMESPACE_DRAW, sXML_layer, aLayerName ); + rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_LAYER, aLayerName ); } catch( uno::Exception e ) @@ -979,27 +986,27 @@ void XMLShapeExport::ImpExportGluePoints( const uno::Reference< drawing::XShape // export only user defined glue points const OUString sId( OUString::valueOf( nIdentifier ) ); - rExport.AddAttribute(XML_NAMESPACE_DRAW, sXML_id, sId ); + rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_ID, sId ); rExport.GetMM100UnitConverter().convertMeasure(msBuffer, aGluePoint.Position.X); - rExport.AddAttribute(XML_NAMESPACE_SVG, sXML_x, msBuffer.makeStringAndClear()); + rExport.AddAttribute(XML_NAMESPACE_SVG, XML_X, msBuffer.makeStringAndClear()); rExport.GetMM100UnitConverter().convertMeasure(msBuffer, aGluePoint.Position.Y); - rExport.AddAttribute(XML_NAMESPACE_SVG, sXML_y, msBuffer.makeStringAndClear()); + rExport.AddAttribute(XML_NAMESPACE_SVG, XML_Y, msBuffer.makeStringAndClear()); if( !aGluePoint.IsRelative ) { SvXMLUnitConverter::convertEnum( msBuffer, aGluePoint.PositionAlignment, aXML_GlueAlignment_EnumMap ); - rExport.AddAttribute( XML_NAMESPACE_DRAW, sXML_align, msBuffer.makeStringAndClear() ); + rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_ALIGN, msBuffer.makeStringAndClear() ); } if( aGluePoint.Escape != drawing::EscapeDirection_SMART ) { SvXMLUnitConverter::convertEnum( msBuffer, aGluePoint.Escape, aXML_GlueEscapeDirection_EnumMap ); - rExport.AddAttribute( XML_NAMESPACE_DRAW, sXML_escape_direction, msBuffer.makeStringAndClear() ); + rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_ESCAPE_DIRECTION, msBuffer.makeStringAndClear() ); } - SvXMLElementExport aEventsElemt(rExport, XML_NAMESPACE_DRAW, sXML_glue_point, sal_True, sal_True); + SvXMLElementExport aEventsElemt(rExport, XML_NAMESPACE_DRAW, XML_GLUE_POINT, sal_True, sal_True); } } } diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx index 5ac207e69df8..24d2d31ec664 100644 --- a/xmloff/source/draw/shapeexport2.cxx +++ b/xmloff/source/draw/shapeexport2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: shapeexport2.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: cl $ $Date: 2001-06-27 14:40:42 $ + * last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -135,12 +135,16 @@ #include <vcl/salbtype.hxx> // FRound #endif +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" +#endif + -#include "xmlkywd.hxx" #include "xmlnmspe.hxx" using namespace ::rtl; using namespace ::com::sun::star; +using namespace ::xmloff::token; ////////////////////////////////////////////////////////////////////////////// @@ -203,14 +207,14 @@ void XMLShapeExport::ImpExportNewTrans_FeaturesAndWrite(Vector2D& rTRScale, doub aTRScale.X() = 1.0; rExport.GetMM100UnitConverter().convertMeasure(sStringBuffer, FRound(aTRScale.X())); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_SVG, sXML_width, aStr); + rExport.AddAttribute(XML_NAMESPACE_SVG, XML_WIDTH, aStr); // svg: height if(!(nFeatures & SEF_EXPORT_HEIGHT)) aTRScale.Y() = 1.0; rExport.GetMM100UnitConverter().convertMeasure(sStringBuffer, FRound(aTRScale.Y())); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_SVG, sXML_height, aStr); + rExport.AddAttribute(XML_NAMESPACE_SVG, XML_HEIGHT, aStr); // decide if transformation is neccessary BOOL bTransformationIsNeccessary(fTRShear != 0.0 || fTRRotate != 0.0); @@ -226,7 +230,7 @@ void XMLShapeExport::ImpExportNewTrans_FeaturesAndWrite(Vector2D& rTRScale, doub // does transformation need to be exported? if(aTransform.NeedsAction()) - rExport.AddAttribute(XML_NAMESPACE_DRAW, sXML_transform, aTransform.GetExportString(rExport.GetMM100UnitConverter())); + rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_TRANSFORM, aTransform.GetExportString(rExport.GetMM100UnitConverter())); } else { @@ -236,7 +240,7 @@ void XMLShapeExport::ImpExportNewTrans_FeaturesAndWrite(Vector2D& rTRScale, doub // svg: x rExport.GetMM100UnitConverter().convertMeasure(sStringBuffer, FRound(rTRTranslate.X())); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_SVG, sXML_x, aStr); + rExport.AddAttribute(XML_NAMESPACE_SVG, XML_X, aStr); } if(nFeatures & SEF_EXPORT_Y) @@ -244,7 +248,7 @@ void XMLShapeExport::ImpExportNewTrans_FeaturesAndWrite(Vector2D& rTRScale, doub // svg: y rExport.GetMM100UnitConverter().convertMeasure(sStringBuffer, FRound(rTRTranslate.Y())); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_SVG, sXML_y, aStr); + rExport.AddAttribute(XML_NAMESPACE_SVG, XML_Y, aStr); } } } @@ -258,7 +262,7 @@ sal_Bool XMLShapeExport::ImpExportPresentationAttributes( const uno::Reference< OUStringBuffer sStringBuffer; // write presentation class entry - rExport.AddAttribute(XML_NAMESPACE_PRESENTATION, sXML_class, rClass); + rExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_CLASS, rClass); if( xPropSet.is() ) { @@ -271,7 +275,7 @@ sal_Bool XMLShapeExport::ImpExportPresentationAttributes( const uno::Reference< { xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject"))) >>= bIsEmpty; if( bIsEmpty ) - rExport.AddAttribute(XML_NAMESPACE_PRESENTATION, sXML_placeholder, OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_true))); + rExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_PLACEHOLDER, XML_TRUE); } // is user-transformed? @@ -279,7 +283,7 @@ sal_Bool XMLShapeExport::ImpExportPresentationAttributes( const uno::Reference< { xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent"))) >>= bTemp; if(!bTemp) - rExport.AddAttribute(XML_NAMESPACE_PRESENTATION, sXML_user_transformed, OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_true))); + rExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_USER_TRANSFORMED, XML_TRUE); } } @@ -416,31 +420,31 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x if( eClickAction == presentation::ClickAction_NONE ) break; - SvXMLElementExport aEventsElemt(rExport, XML_NAMESPACE_OFFICE, sXML_events, sal_True, sal_True); + SvXMLElementExport aEventsElemt(rExport, XML_NAMESPACE_OFFICE, XML_EVENTS, sal_True, sal_True); - OUString aStrAction; + enum XMLTokenEnum eStrAction; switch( eClickAction ) { - case presentation::ClickAction_PREVPAGE: aStrAction = OUString( RTL_CONSTASCII_USTRINGPARAM( sXML_previous_page ) ); break; - case presentation::ClickAction_NEXTPAGE: aStrAction = OUString( RTL_CONSTASCII_USTRINGPARAM( sXML_next_page ) ); break; - case presentation::ClickAction_FIRSTPAGE: aStrAction = OUString( RTL_CONSTASCII_USTRINGPARAM( sXML_first_page ) ); break; - case presentation::ClickAction_LASTPAGE: aStrAction = OUString( RTL_CONSTASCII_USTRINGPARAM( sXML_last_page ) ); break; - case presentation::ClickAction_INVISIBLE: aStrAction = OUString( RTL_CONSTASCII_USTRINGPARAM( sXML_hide ) ); break; - case presentation::ClickAction_STOPPRESENTATION:aStrAction = OUString( RTL_CONSTASCII_USTRINGPARAM( sXML_stop ) ); break; - case presentation::ClickAction_PROGRAM: aStrAction = OUString( RTL_CONSTASCII_USTRINGPARAM( sXML_execute ) ); break; - case presentation::ClickAction_BOOKMARK: aStrAction = OUString( RTL_CONSTASCII_USTRINGPARAM( sXML_show ) ); break; - case presentation::ClickAction_DOCUMENT: aStrAction = OUString( RTL_CONSTASCII_USTRINGPARAM( sXML_show ) ); break; - case presentation::ClickAction_MACRO: aStrAction = OUString( RTL_CONSTASCII_USTRINGPARAM( sXML_execute_macro ) ); break; - case presentation::ClickAction_VERB: aStrAction = OUString( RTL_CONSTASCII_USTRINGPARAM( sXML_verb ) ); break; - case presentation::ClickAction_VANISH: aStrAction = OUString( RTL_CONSTASCII_USTRINGPARAM( sXML_fade_out ) ); break; - case presentation::ClickAction_SOUND: aStrAction = OUString( RTL_CONSTASCII_USTRINGPARAM( sXML_sound ) ); break; + case presentation::ClickAction_PREVPAGE: eStrAction = XML_PREVIOUS_PAGE; break; + case presentation::ClickAction_NEXTPAGE: eStrAction = XML_NEXT_PAGE; break; + case presentation::ClickAction_FIRSTPAGE: eStrAction = XML_FIRST_PAGE; break; + case presentation::ClickAction_LASTPAGE: eStrAction = XML_LAST_PAGE; break; + case presentation::ClickAction_INVISIBLE: eStrAction = XML_HIDE; break; + case presentation::ClickAction_STOPPRESENTATION:eStrAction = XML_STOP; break; + case presentation::ClickAction_PROGRAM: eStrAction = XML_EXECUTE; break; + case presentation::ClickAction_BOOKMARK: eStrAction = XML_SHOW; break; + case presentation::ClickAction_DOCUMENT: eStrAction = XML_SHOW; break; + case presentation::ClickAction_MACRO: eStrAction = XML_EXECUTE_MACRO; break; + case presentation::ClickAction_VERB: eStrAction = XML_VERB; break; + case presentation::ClickAction_VANISH: eStrAction = XML_FADE_OUT; break; + case presentation::ClickAction_SOUND: eStrAction = XML_SOUND; break; default: DBG_ERROR( "unknown presentation::ClickAction found!" ); } - rExport.AddAttribute( XML_NAMESPACE_SCRIPT, sXML_event_name, OUString( RTL_CONSTASCII_USTRINGPARAM( "on-click" ) ) ); - rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, sXML_action, aStrAction ); + rExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, OUString( RTL_CONSTASCII_USTRINGPARAM( "on-click" ) ) ); + rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_ACTION, eStrAction ); if( eClickAction == presentation::ClickAction_VANISH ) { @@ -456,19 +460,19 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x if( eEffect != EK_none ) { SvXMLUnitConverter::convertEnum( msBuffer, eKind, aXML_AnimationEffect_EnumMap ); - rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, sXML_effect, msBuffer.makeStringAndClear() ); + rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_EFFECT, msBuffer.makeStringAndClear() ); } if( eDirection != ED_none ) { SvXMLUnitConverter::convertEnum( msBuffer, eDirection, aXML_AnimationDirection_EnumMap ); - rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, sXML_direction, msBuffer.makeStringAndClear() ); + rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_DIRECTION, msBuffer.makeStringAndClear() ); } if( nStartScale != -1 ) { SvXMLUnitConverter::convertPercent( msBuffer, nStartScale ); - rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, sXML_start_scale, msBuffer.makeStringAndClear() ); + rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_START_SCALE, msBuffer.makeStringAndClear() ); } } @@ -477,7 +481,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x if( eSpeed != presentation::AnimationSpeed_MEDIUM ) { SvXMLUnitConverter::convertEnum( msBuffer, eSpeed, aXML_AnimationSpeed_EnumMap ); - rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, sXML_speed, msBuffer.makeStringAndClear() ); + rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_SPEED, msBuffer.makeStringAndClear() ); } } } @@ -490,32 +494,32 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x msBuffer.append( sal_Unicode('#') ); msBuffer.append( aStrBookmark ); - rExport.AddAttribute(XML_NAMESPACE_XLINK, sXML_href, GetExport().GetRelativeReference(msBuffer.makeStringAndClear()) ); - rExport.AddAttributeASCII( XML_NAMESPACE_XLINK, sXML_type, sXML_simple ); - rExport.AddAttributeASCII( XML_NAMESPACE_XLINK, sXML_show, sXML_new ); - rExport.AddAttributeASCII( XML_NAMESPACE_XLINK, sXML_actuate, sXML_onRequest ); + rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(msBuffer.makeStringAndClear()) ); + rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); + rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_NEW ); + rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONREQUEST ); } if( ( nFound & FOUND_VERB ) && eClickAction == presentation::ClickAction_VERB ) { msBuffer.append( nVerb ); - rExport.AddAttribute(XML_NAMESPACE_PRESENTATION, sXML_verb, msBuffer.makeStringAndClear()); + rExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_VERB, msBuffer.makeStringAndClear()); } - SvXMLElementExport aEventElemt(rExport, XML_NAMESPACE_PRESENTATION, sXML_event, sal_True, sal_True); + SvXMLElementExport aEventElemt(rExport, XML_NAMESPACE_PRESENTATION, XML_EVENT, sal_True, sal_True); if( eClickAction == presentation::ClickAction_VANISH || eClickAction == presentation::ClickAction_SOUND ) { if( ( nFound & FOUND_SOUNDURL ) && aStrSoundURL.getLength() != 0 ) { - rExport.AddAttribute(XML_NAMESPACE_XLINK, sXML_href, GetExport().GetRelativeReference(aStrSoundURL) ); - rExport.AddAttributeASCII( XML_NAMESPACE_XLINK, sXML_type, sXML_simple ); - rExport.AddAttributeASCII( XML_NAMESPACE_XLINK, sXML_show, sXML_new ); - rExport.AddAttributeASCII( XML_NAMESPACE_XLINK, sXML_actuate, sXML_onRequest ); + rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(aStrSoundURL) ); + rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); + rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_NEW ); + rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONREQUEST ); if( nFound & FOUND_PLAYFULL && bPlayFull ) - rExport.AddAttributeASCII( XML_NAMESPACE_PRESENTATION, sXML_play_full, sXML_true ); + rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_PLAY_FULL, XML_TRUE ); - SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, sXML_sound, sal_True, sal_True ); + SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, XML_SOUND, sal_True, sal_True ); } } break; @@ -524,16 +528,16 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x { if( nFound & FOUND_MACRO ) { - SvXMLElementExport aEventsElemt(rExport, XML_NAMESPACE_OFFICE, sXML_events, sal_True, sal_True); + SvXMLElementExport aEventsElemt(rExport, XML_NAMESPACE_OFFICE, XML_EVENTS, sal_True, sal_True); - rExport.AddAttribute( XML_NAMESPACE_SCRIPT, sXML_language, OUString( RTL_CONSTASCII_USTRINGPARAM( "starbasic" ) ) ); - rExport.AddAttribute( XML_NAMESPACE_SCRIPT, sXML_event_name, OUString( RTL_CONSTASCII_USTRINGPARAM( "on-click" ) ) ); - rExport.AddAttribute( XML_NAMESPACE_SCRIPT, sXML_macro_name, aStrMacro ); + rExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE, OUString( RTL_CONSTASCII_USTRINGPARAM( "starbasic" ) ) ); + rExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, OUString( RTL_CONSTASCII_USTRINGPARAM( "on-click" ) ) ); + rExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_MACRO_NAME, aStrMacro ); if( nFound & FOUND_LIBRARY ) - rExport.AddAttribute( XML_NAMESPACE_SCRIPT, sXML_library, aStrLibrary ); + rExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_LIBRARY, aStrLibrary ); - SvXMLElementExport aEventElemt(rExport, XML_NAMESPACE_SCRIPT, sXML_event, sal_True, sal_True); + SvXMLElementExport aEventElemt(rExport, XML_NAMESPACE_SCRIPT, XML_EVENT, sal_True, sal_True); } } } @@ -548,7 +552,7 @@ void XMLShapeExport::ImpExportGroupShape( const uno::Reference< drawing::XShape if(xShapes.is() && xShapes->getCount()) { // write group shape - SvXMLElementExport aPGR(rExport, XML_NAMESPACE_DRAW, sXML_g, sal_True, sal_True); + SvXMLElementExport aPGR(rExport, XML_NAMESPACE_DRAW, XML_G, sal_True, sal_True); ImpExportEvents( xShape ); ImpExportGluePoints( xShape ); @@ -578,25 +582,25 @@ void XMLShapeExport::ImpExportTextBoxShape( { case XmlShapeTypePresSubtitleShape: { - aStr = OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_presentation_subtitle)); + aStr = GetXMLToken(XML_PRESENTATION_SUBTITLE); bIsPresShape = TRUE; break; } case XmlShapeTypePresTitleTextShape: { - aStr = OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_presentation_title)); + aStr = GetXMLToken(XML_PRESENTATION_TITLE); bIsPresShape = TRUE; break; } case XmlShapeTypePresOutlinerShape: { - aStr = OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_presentation_outline)); + aStr = GetXMLToken(XML_PRESENTATION_OUTLINE); bIsPresShape = TRUE; break; } case XmlShapeTypePresNotesShape: { - aStr = OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_presentation_notes)); + aStr = GetXMLToken(XML_PRESENTATION_NOTES); bIsPresShape = TRUE; break; } @@ -609,7 +613,7 @@ void XMLShapeExport::ImpExportTextBoxShape( bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, aStr ); // write text-box - SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, sXML_text_box, sal_True, sal_True); + SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, XML_TEXT_BOX, sal_True, sal_True); ImpExportEvents( xShape ); ImpExportGluePoints( xShape ); @@ -637,11 +641,11 @@ void XMLShapeExport::ImpExportRectangleShape( { OUStringBuffer sStringBuffer; rExport.GetMM100UnitConverter().convertMeasure(sStringBuffer, nCornerRadius); - rExport.AddAttribute(XML_NAMESPACE_DRAW, sXML_corner_radius, sStringBuffer.makeStringAndClear()); + rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_CORNER_RADIUS, sStringBuffer.makeStringAndClear()); } // write rectangle - SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, sXML_rect, sal_True, sal_True); + SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, XML_RECT, sal_True, sal_True); ImpExportEvents( xShape ); ImpExportGluePoints( xShape ); @@ -719,7 +723,7 @@ void XMLShapeExport::ImpExportLineShape( // svg: x1 rExport.GetMM100UnitConverter().convertMeasure(sStringBuffer, aStart.X); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_SVG, sXML_x1, aStr); + rExport.AddAttribute(XML_NAMESPACE_SVG, XML_X1, aStr); } else { @@ -731,7 +735,7 @@ void XMLShapeExport::ImpExportLineShape( // svg: y1 rExport.GetMM100UnitConverter().convertMeasure(sStringBuffer, aStart.Y); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_SVG, sXML_y1, aStr); + rExport.AddAttribute(XML_NAMESPACE_SVG, XML_Y1, aStr); } else { @@ -741,15 +745,15 @@ void XMLShapeExport::ImpExportLineShape( // svg: x2 rExport.GetMM100UnitConverter().convertMeasure(sStringBuffer, aEnd.X); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_SVG, sXML_x2, aStr); + rExport.AddAttribute(XML_NAMESPACE_SVG, XML_X2, aStr); // svg: y2 rExport.GetMM100UnitConverter().convertMeasure(sStringBuffer, aEnd.Y); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_SVG, sXML_y2, aStr); + rExport.AddAttribute(XML_NAMESPACE_SVG, XML_Y2, aStr); // write line - SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, sXML_line, sal_True, sal_True); + SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, XML_LINE, sal_True, sal_True); ImpExportEvents( xShape ); ImpExportGluePoints( xShape ); @@ -790,21 +794,21 @@ void XMLShapeExport::ImpExportEllipseShape( // export circle kind SvXMLUnitConverter::convertEnum( sStringBuffer, (USHORT)eKind, aXML_CircleKind_EnumMap ); - rExport.AddAttribute(XML_NAMESPACE_DRAW, sXML_kind, sStringBuffer.makeStringAndClear() ); + rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_KIND, sStringBuffer.makeStringAndClear() ); // export start angle SvXMLUnitConverter::convertDouble( sStringBuffer, dStartAngle ); - rExport.AddAttribute(XML_NAMESPACE_DRAW, sXML_start_angle, sStringBuffer.makeStringAndClear() ); + rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_START_ANGLE, sStringBuffer.makeStringAndClear() ); // export end angle SvXMLUnitConverter::convertDouble( sStringBuffer, dEndAngle ); - rExport.AddAttribute(XML_NAMESPACE_DRAW, sXML_end_angle, sStringBuffer.makeStringAndClear() ); + rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_END_ANGLE, sStringBuffer.makeStringAndClear() ); } if(bCircle) { // write circle - SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, sXML_circle, sal_True, sal_True); + SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, XML_CIRCLE, sal_True, sal_True); ImpExportEvents( xShape ); ImpExportGluePoints( xShape ); @@ -813,7 +817,7 @@ void XMLShapeExport::ImpExportEllipseShape( else { // write ellipse - SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, sXML_ellipse, sal_True, sal_True); + SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, XML_ELLIPSE, sal_True, sal_True); ImpExportEvents( xShape ); ImpExportGluePoints( xShape ); @@ -854,7 +858,7 @@ void XMLShapeExport::ImpExportPolygonShape( awt::Point aPoint(0, 0); awt::Size aSize(FRound(aTRScale.X()), FRound(aTRScale.Y())); SdXMLImExViewBox aViewBox(0, 0, aSize.Width, aSize.Height); - rExport.AddAttribute(XML_NAMESPACE_SVG, sXML_viewBox, aViewBox.GetExportString(rExport.GetMM100UnitConverter())); + rExport.AddAttribute(XML_NAMESPACE_SVG, XML_VIEWBOX, aViewBox.GetExportString(rExport.GetMM100UnitConverter())); if(bBezier) { @@ -887,11 +891,11 @@ void XMLShapeExport::ImpExportPolygonShape( } // write point array - rExport.AddAttribute(XML_NAMESPACE_SVG, sXML_d, aSvgDElement.GetExportString()); + rExport.AddAttribute(XML_NAMESPACE_SVG, XML_D, aSvgDElement.GetExportString()); } // write object now - SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, sXML_path, sal_True, sal_True); + SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, XML_PATH, sal_True, sal_True); ImpExportEvents( xShape ); ImpExportGluePoints( xShape ); @@ -917,12 +921,12 @@ void XMLShapeExport::ImpExportPolygonShape( SdXMLImExPointsElement aPoints(pSequence, aViewBox, aPoint, aSize, rExport.GetMM100UnitConverter()); // write point array - rExport.AddAttribute(XML_NAMESPACE_DRAW, sXML_points, aPoints.GetExportString()); + rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_POINTS, aPoints.GetExportString()); } // write object now SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, - bClosed ? sXML_polygon : sXML_polyline , sal_True, sal_True); + bClosed ? XML_POLYGON : XML_POLYLINE , sal_True, sal_True); ImpExportEvents( xShape ); ImpExportGluePoints( xShape ); @@ -948,11 +952,11 @@ void XMLShapeExport::ImpExportPolygonShape( } // write point array - rExport.AddAttribute(XML_NAMESPACE_SVG, sXML_d, aSvgDElement.GetExportString()); + rExport.AddAttribute(XML_NAMESPACE_SVG, XML_D, aSvgDElement.GetExportString()); } // write object now - SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, sXML_path, sal_True, sal_True); + SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, XML_PATH, sal_True, sal_True); ImpExportEvents( xShape ); ImpExportGluePoints( xShape ); @@ -979,7 +983,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape( ImpExportNewTrans(xPropSet, nFeatures, pRefPoint); if(eShapeType == XmlShapeTypePresGraphicObjectShape) - bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_presentation_graphic)) ); + bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_GRAPHIC) ); if( !bIsEmptyPresObj ) { @@ -988,7 +992,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape( xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicURL"))) >>= aStr; aStr = GetExport().GetRelativeReference( rExport.AddEmbeddedGraphicObject( aStr ) ); - rExport.AddAttribute(XML_NAMESPACE_XLINK, sXML_href, aStr ); + rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, aStr ); if( aStr.getLength() && aStr[ 0 ] == '#' ) { @@ -1001,17 +1005,14 @@ void XMLShapeExport::ImpExportGraphicObjectShape( aAny <<= aStreamURL; xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicStreamURL")), aAny ); - aStr = OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_simple)); - rExport.AddAttribute(XML_NAMESPACE_XLINK, sXML_type, aStr ); + rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); - aStr = OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_embed)); - rExport.AddAttribute(XML_NAMESPACE_XLINK, sXML_show, aStr ); + rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED ); - aStr = OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_onLoad)); - rExport.AddAttribute(XML_NAMESPACE_XLINK, sXML_actuate, aStr ); + rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD ); } // write graphic object - SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, sXML_image, sal_True, sal_True); + SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, XML_IMAGE, sal_True, sal_True); ImpExportEvents( xShape ); ImpExportGluePoints( xShape ); ImpExportText( xShape ); @@ -1045,7 +1046,7 @@ void XMLShapeExport::ImpExportChartShape( else { // write chart object (fake for now, replace later) - SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_CHART, sXML_chart, sal_True, sal_True); + SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_CHART, XML_CHART, sal_True, sal_True); } } */ @@ -1081,11 +1082,11 @@ void XMLShapeExport::ImpExportControlShape( DBG_ASSERT( xControlModel.is(), "Control shape has not XControlModel" ); if( xControlModel.is() ) { - rExport.AddAttribute( XML_NAMESPACE_FORM, sXML_id, rExport.GetFormExport()->getControlId( xControlModel ) ); + rExport.AddAttribute( XML_NAMESPACE_FORM, XML_ID, rExport.GetFormExport()->getControlId( xControlModel ) ); } } - SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, sXML_control, sal_True, sal_True); + SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, XML_CONTROL, sal_True, sal_True); } ////////////////////////////////////////////////////////////////////////////// @@ -1108,7 +1109,7 @@ void XMLShapeExport::ImpExportConnectorShape( { SvXMLUnitConverter::convertEnum( sStringBuffer, (sal_uInt16)eType, aXML_ConnectionKind_EnumMap ); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_DRAW, sXML_type, aStr); + rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_TYPE, aStr); } // export line skew @@ -1137,7 +1138,7 @@ void XMLShapeExport::ImpExportConnectorShape( } aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_DRAW, sXML_line_skew, aStr); + rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_LINE_SKEW, aStr); } // export start and end point @@ -1160,7 +1161,7 @@ void XMLShapeExport::ImpExportConnectorShape( // svg: x1 rExport.GetMM100UnitConverter().convertMeasure(sStringBuffer, aStart.X); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_SVG, sXML_x1, aStr); + rExport.AddAttribute(XML_NAMESPACE_SVG, XML_X1, aStr); } else { @@ -1172,7 +1173,7 @@ void XMLShapeExport::ImpExportConnectorShape( // svg: y1 rExport.GetMM100UnitConverter().convertMeasure(sStringBuffer, aStart.Y); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_SVG, sXML_y1, aStr); + rExport.AddAttribute(XML_NAMESPACE_SVG, XML_Y1, aStr); } else { @@ -1182,12 +1183,12 @@ void XMLShapeExport::ImpExportConnectorShape( // svg: x2 rExport.GetMM100UnitConverter().convertMeasure(sStringBuffer, aEnd.X); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_SVG, sXML_x2, aStr); + rExport.AddAttribute(XML_NAMESPACE_SVG, XML_X2, aStr); // svg: y2 rExport.GetMM100UnitConverter().convertMeasure(sStringBuffer, aEnd.Y); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_SVG, sXML_y2, aStr); + rExport.AddAttribute(XML_NAMESPACE_SVG, XML_Y2, aStr); uno::Reference< drawing::XShape > xTempShape; @@ -1196,7 +1197,7 @@ void XMLShapeExport::ImpExportConnectorShape( if( aAny >>= xTempShape ) { sal_Int32 nShapeId = rExport.GetShapeExport()->getShapeId( xTempShape ); - rExport.AddAttribute(XML_NAMESPACE_DRAW, sXML_start_shape, OUString::valueOf( nShapeId )); + rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_START_SHAPE, OUString::valueOf( nShapeId )); aAny = xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("StartGluePointIndex")) ); sal_Int32 nGluePointId; @@ -1204,7 +1205,7 @@ void XMLShapeExport::ImpExportConnectorShape( { if( nGluePointId != -1 ) { - rExport.AddAttribute(XML_NAMESPACE_DRAW, sXML_start_glue_point, OUString::valueOf( nGluePointId )); + rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_START_GLUE_POINT, OUString::valueOf( nGluePointId )); } } } @@ -1215,7 +1216,7 @@ void XMLShapeExport::ImpExportConnectorShape( { sal_Int32 nShapeId = rExport.GetShapeExport()->getShapeId( xTempShape ); - rExport.AddAttribute(XML_NAMESPACE_DRAW, sXML_end_shape, OUString::valueOf( nShapeId )); + rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_END_SHAPE, OUString::valueOf( nShapeId )); aAny = xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("EndGluePointIndex")) ); sal_Int32 nGluePointId; @@ -1223,13 +1224,13 @@ void XMLShapeExport::ImpExportConnectorShape( { if( nGluePointId != -1 ) { - rExport.AddAttribute(XML_NAMESPACE_DRAW, sXML_end_glue_point, OUString::valueOf( nGluePointId )); + rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_END_GLUE_POINT, OUString::valueOf( nGluePointId )); } } } // write connector shape. Add Export later. - SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, sXML_connector, sal_True, sal_True); + SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, XML_CONNECTOR, sal_True, sal_True); ImpExportEvents( xShape ); ImpExportGluePoints( xShape ); @@ -1270,7 +1271,7 @@ void XMLShapeExport::ImpExportMeasureShape( // svg: x1 rExport.GetMM100UnitConverter().convertMeasure(sStringBuffer, aStart.X); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_SVG, sXML_x1, aStr); + rExport.AddAttribute(XML_NAMESPACE_SVG, XML_X1, aStr); } else { @@ -1282,7 +1283,7 @@ void XMLShapeExport::ImpExportMeasureShape( // svg: y1 rExport.GetMM100UnitConverter().convertMeasure(sStringBuffer, aStart.Y); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_SVG, sXML_y1, aStr); + rExport.AddAttribute(XML_NAMESPACE_SVG, XML_Y1, aStr); } else { @@ -1292,15 +1293,15 @@ void XMLShapeExport::ImpExportMeasureShape( // svg: x2 rExport.GetMM100UnitConverter().convertMeasure(sStringBuffer, aEnd.X); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_SVG, sXML_x2, aStr); + rExport.AddAttribute(XML_NAMESPACE_SVG, XML_X2, aStr); // svg: y2 rExport.GetMM100UnitConverter().convertMeasure(sStringBuffer, aEnd.Y); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_SVG, sXML_y2, aStr); + rExport.AddAttribute(XML_NAMESPACE_SVG, XML_Y2, aStr); // write measure shape - SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, sXML_measure, sal_True, sal_True); + SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, XML_MEASURE, sal_True, sal_True); ImpExportEvents( xShape ); ImpExportGluePoints( xShape ); @@ -1329,11 +1330,11 @@ void XMLShapeExport::ImpExportOLE2Shape( // presentation settings if(eShapeType == XmlShapeTypePresOLE2Shape) - bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_presentation_object))); + bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_OBJECT) ); else if(eShapeType == XmlShapeTypePresChartShape) - bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_presentation_chart)) ); + bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_CHART) ); else if(eShapeType == XmlShapeTypePresTableShape) - bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_presentation_table)) ); + bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_TABLE) ); OUString sClassId; @@ -1350,18 +1351,18 @@ void XMLShapeExport::ImpExportOLE2Shape( xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID"))) >>= sClassId; if( sClassId.getLength() ) - rExport.AddAttribute(XML_NAMESPACE_DRAW, sXML_class_id, sClassId ); + rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_CLASS_ID, sClassId ); sURL = rExport.AddEmbeddedObject( sURL ); - rExport.AddAttribute(XML_NAMESPACE_XLINK, sXML_href, GetExport().GetRelativeReference(sURL) ); - rExport.AddAttributeASCII( XML_NAMESPACE_XLINK, sXML_type, sXML_simple ); - rExport.AddAttributeASCII( XML_NAMESPACE_XLINK, sXML_show, sXML_embed ); - rExport.AddAttributeASCII( XML_NAMESPACE_XLINK, sXML_actuate, sXML_onLoad ); + rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(sURL) ); + rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); + rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED ); + rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD ); } - const sal_Char *pElem = sClassId.getLength() ? sXML_object_ole : sXML_object; - SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, pElem, sal_False, sal_True ); + enum XMLTokenEnum eElem = sClassId.getLength() ? XML_OBJECT_OLE : XML_OBJECT; + SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, eElem, sal_False, sal_True ); // see if we need to export a thumbnail bitmap OUString aStr; @@ -1369,18 +1370,15 @@ void XMLShapeExport::ImpExportOLE2Shape( if( aStr.getLength() ) { aStr = rExport.AddEmbeddedGraphicObject( GetExport().GetRelativeReference(aStr) ); - rExport.AddAttribute(XML_NAMESPACE_XLINK, sXML_href, aStr ); + rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, aStr ); - aStr = OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_simple)); - rExport.AddAttribute(XML_NAMESPACE_XLINK, sXML_type, aStr ); + rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); - aStr = OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_embed)); - rExport.AddAttribute(XML_NAMESPACE_XLINK, sXML_show, aStr ); + rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED ); - aStr = OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_onLoad)); - rExport.AddAttribute(XML_NAMESPACE_XLINK, sXML_actuate, aStr ); + rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD ); - SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, sXML_thumbnail, sal_True, sal_True ); + SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, XML_THUMBNAIL, sal_True, sal_True ); } ImpExportEvents( xShape ); @@ -1407,7 +1405,7 @@ void XMLShapeExport::ImpExportPageShape( { sal_Int32 nPageNumber = 0; xPropSet->getPropertyValue(aPageNumberStr) >>= nPageNumber; - rExport.AddAttribute(XML_NAMESPACE_DRAW, sXML_page_number, OUString::valueOf(nPageNumber)); + rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_PAGE_NUMBER, OUString::valueOf(nPageNumber)); } // a presentation page shape, normally used on notes pages only. If @@ -1415,12 +1413,12 @@ void XMLShapeExport::ImpExportPageShape( // copy-paste exchange between draw and impress (this IS possible...) if(eShapeType == XmlShapeTypePresPageShape) { - rExport.AddAttribute(XML_NAMESPACE_PRESENTATION, sXML_class, - OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_presentation_page))); + rExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_CLASS, + XML_PRESENTATION_PAGE); } // write Page shape - SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, sXML_page_thumbnail, sal_True, sal_True); + SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, XML_PAGE_THUMBNAIL, sal_True, sal_True); } } @@ -1443,7 +1441,7 @@ void XMLShapeExport::ImpExportCaptionShape( { OUStringBuffer sStringBuffer; rExport.GetMM100UnitConverter().convertMeasure(sStringBuffer, nCornerRadius); - rExport.AddAttribute(XML_NAMESPACE_DRAW, sXML_corner_radius, sStringBuffer.makeStringAndClear()); + rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_CORNER_RADIUS, sStringBuffer.makeStringAndClear()); } awt::Point aCaptionPoint; @@ -1457,12 +1455,12 @@ void XMLShapeExport::ImpExportCaptionShape( } rExport.GetMM100UnitConverter().convertMeasure(msBuffer, aCaptionPoint.X); - rExport.AddAttribute( XML_NAMESPACE_DRAW, sXML_caption_point_x, msBuffer.makeStringAndClear() ); + rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CAPTION_POINT_X, msBuffer.makeStringAndClear() ); rExport.GetMM100UnitConverter().convertMeasure(msBuffer, aCaptionPoint.Y); - rExport.AddAttribute( XML_NAMESPACE_DRAW, sXML_caption_point_y, msBuffer.makeStringAndClear() ); + rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CAPTION_POINT_Y, msBuffer.makeStringAndClear() ); // write Caption shape. Add export later. - SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, sXML_caption, sal_True, sal_True); + SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, XML_CAPTION, sal_True, sal_True); ImpExportEvents( xShape ); ImpExportGluePoints( xShape ); @@ -1485,18 +1483,18 @@ void XMLShapeExport::ImpExportFrameShape( // export frame url OUString aStr; xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "FrameURL" ) ) ) >>= aStr; - rExport.AddAttribute ( XML_NAMESPACE_XLINK, sXML_href, GetExport().GetRelativeReference(aStr) ); - rExport.AddAttributeASCII ( XML_NAMESPACE_XLINK, sXML_type, sXML_simple ); - rExport.AddAttributeASCII ( XML_NAMESPACE_XLINK, sXML_show, sXML_embed ); - rExport.AddAttributeASCII ( XML_NAMESPACE_XLINK, sXML_actuate, sXML_onLoad ); + rExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(aStr) ); + rExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); + rExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED ); + rExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD ); // export name xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "FrameName" ) ) ) >>= aStr; if( aStr.getLength() ) - rExport.AddAttribute( XML_NAMESPACE_DRAW, sXML_frame_name, aStr ); + rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_FRAME_NAME, aStr ); // write floating frame - SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, sXML_floating_frame, sal_True, sal_True); + SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, XML_FLOATING_FRAME, sal_True, sal_True); } } @@ -1515,27 +1513,27 @@ void XMLShapeExport::ImpExportAppletShape( // export frame url OUString aStr; xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "AppletCodeBase" ) ) ) >>= aStr; - rExport.AddAttribute ( XML_NAMESPACE_XLINK, sXML_href, GetExport().GetRelativeReference(aStr) ); - rExport.AddAttributeASCII ( XML_NAMESPACE_XLINK, sXML_type, sXML_simple ); - rExport.AddAttributeASCII ( XML_NAMESPACE_XLINK, sXML_show, sXML_embed ); - rExport.AddAttributeASCII ( XML_NAMESPACE_XLINK, sXML_actuate, sXML_onLoad ); + rExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(aStr) ); + rExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); + rExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED ); + rExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD ); // export draw:applet-name xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "AppletName" ) ) ) >>= aStr; if( aStr.getLength() ) - rExport.AddAttribute( XML_NAMESPACE_DRAW, sXML_applet_name, aStr ); + rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_APPLET_NAME, aStr ); // export draw:code xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "AppletCode" ) ) ) >>= aStr; - rExport.AddAttribute( XML_NAMESPACE_DRAW, sXML_code, aStr ); + rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CODE, aStr ); // export draw:may-script sal_Bool bIsScript; xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "AppletIsScript" ) ) ) >>= bIsScript; - rExport.AddAttributeASCII( XML_NAMESPACE_DRAW, sXML_may_script, bIsScript ? sXML_true : sXML_false ); + rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MAY_SCRIPT, bIsScript ? XML_TRUE : XML_FALSE ); // write applet - SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, sXML_applet, sal_True, sal_True); + SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, XML_APPLET, sal_True, sal_True); // export parameters uno::Sequence< beans::PropertyValue > aCommands; @@ -1544,9 +1542,9 @@ void XMLShapeExport::ImpExportAppletShape( for( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ ) { aCommands[nIndex].Value >>= aStr; - rExport.AddAttribute( XML_NAMESPACE_DRAW, sXML_name, aCommands[nIndex].Name ); - rExport.AddAttribute( XML_NAMESPACE_DRAW, sXML_value, aStr ); - SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, sXML_param, sal_False, sal_True ); + rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aCommands[nIndex].Name ); + rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, aStr ); + SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True ); } } } @@ -1566,18 +1564,19 @@ void XMLShapeExport::ImpExportPluginShape( // export plugin url OUString aStr; xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "PluginURL" ) ) ) >>= aStr; - rExport.AddAttribute ( XML_NAMESPACE_XLINK, sXML_href, GetExport().GetRelativeReference(aStr) ); - rExport.AddAttributeASCII ( XML_NAMESPACE_XLINK, sXML_type, sXML_simple ); - rExport.AddAttributeASCII ( XML_NAMESPACE_XLINK, sXML_show, sXML_embed ); - rExport.AddAttributeASCII ( XML_NAMESPACE_XLINK, sXML_actuate, sXML_onLoad ); + rExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(aStr) ); + rExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); + rExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED ); + rExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD ); + // export mime-type xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "PluginMimeType" ) ) ) >>= aStr; if(aStr.getLength()) - rExport.AddAttribute( XML_NAMESPACE_DRAW, sXML_mime_type, aStr ); + rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MIME_TYPE, aStr ); // write plugin - SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, sXML_plugin, sal_True, sal_True); + SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, XML_PLUGIN, sal_True, sal_True); // export parameters uno::Sequence< beans::PropertyValue > aCommands; @@ -1586,9 +1585,9 @@ void XMLShapeExport::ImpExportPluginShape( for( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ ) { aCommands[nIndex].Value >>= aStr; - rExport.AddAttribute( XML_NAMESPACE_DRAW, sXML_name, aCommands[nIndex].Name ); - rExport.AddAttribute( XML_NAMESPACE_DRAW, sXML_value, aStr ); - SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, sXML_param, sal_False, sal_True ); + rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aCommands[nIndex].Name ); + rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, aStr ); + SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True ); } } } diff --git a/xmloff/source/draw/shapeexport3.cxx b/xmloff/source/draw/shapeexport3.cxx index de1729e20e92..1d0cff60948a 100644 --- a/xmloff/source/draw/shapeexport3.cxx +++ b/xmloff/source/draw/shapeexport3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: shapeexport3.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: cl $ $Date: 2001-03-28 11:19:11 $ + * last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -123,11 +123,15 @@ #include "xexptran.hxx" #endif -#include "xmlkywd.hxx" +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" +#endif + #include "xmlnmspe.hxx" using namespace ::rtl; using namespace ::com::sun::star; +using namespace ::xmloff::token; ////////////////////////////////////////////////////////////////////////////// @@ -154,7 +158,7 @@ void XMLShapeExport::ImpExport3DSceneShape( const uno::Reference< drawing::XShap export3DSceneAttributes( xPropSet ); // write 3DScene shape - SvXMLElementExport aOBJ( rExport, XML_NAMESPACE_DR3D, sXML_scene, sal_True, sal_True); + SvXMLElementExport aOBJ( rExport, XML_NAMESPACE_DR3D, XML_SCENE, sal_True, sal_True); ImpExportEvents( xShape ); @@ -186,14 +190,14 @@ void XMLShapeExport::ImpExport3DShape( SdXMLImExTransform3D aTransform; aTransform.AddHomogenMatrix(xHomMat); if(aTransform.NeedsAction()) - rExport.AddAttribute(XML_NAMESPACE_DR3D, sXML_transform, aTransform.GetExportString(rExport.GetMM100UnitConverter())); + rExport.AddAttribute(XML_NAMESPACE_DR3D, XML_TRANSFORM, aTransform.GetExportString(rExport.GetMM100UnitConverter())); switch(eShapeType) { case XmlShapeTypeDraw3DCubeObject: { // write 3DCube shape - SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DR3D, sXML_cube, sal_True, sal_True); + SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DR3D, XML_CUBE, sal_True, sal_True); // minEdge aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DPosition"))); @@ -215,7 +219,7 @@ void XMLShapeExport::ImpExport3DShape( { rExport.GetMM100UnitConverter().convertVector3D(sStringBuffer, aPos3D); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_DR3D, sXML_min_edge, aStr); + rExport.AddAttribute(XML_NAMESPACE_DR3D, XML_MIN_EDGE, aStr); } // write maxEdge @@ -223,7 +227,7 @@ void XMLShapeExport::ImpExport3DShape( { rExport.GetMM100UnitConverter().convertVector3D(sStringBuffer, aDir3D); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_DR3D, sXML_max_edge, aStr); + rExport.AddAttribute(XML_NAMESPACE_DR3D, XML_MAX_EDGE, aStr); } break; @@ -231,7 +235,7 @@ void XMLShapeExport::ImpExport3DShape( case XmlShapeTypeDraw3DSphereObject: { // write 3DSphere shape - SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DR3D, sXML_sphere, sal_True, sal_True); + SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DR3D, XML_SPHERE, sal_True, sal_True); // Center aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DPosition"))); @@ -250,7 +254,7 @@ void XMLShapeExport::ImpExport3DShape( { rExport.GetMM100UnitConverter().convertVector3D(sStringBuffer, aPos3D); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_DR3D, sXML_center, aStr); + rExport.AddAttribute(XML_NAMESPACE_DR3D, XML_CENTER, aStr); } // write Size @@ -258,7 +262,7 @@ void XMLShapeExport::ImpExport3DShape( { rExport.GetMM100UnitConverter().convertVector3D(sStringBuffer, aDir3D); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_DR3D, sXML_size, aStr); + rExport.AddAttribute(XML_NAMESPACE_DR3D, XML_SIZE, aStr); } break; @@ -320,7 +324,7 @@ void XMLShapeExport::ImpExport3DShape( awt::Size aMaxSize(FRound(fXMax) - aMinPoint.X, FRound(fYMax) - aMinPoint.Y); SdXMLImExViewBox aViewBox( aMinPoint.X, aMinPoint.Y, aMaxSize.Width, aMaxSize.Height); - rExport.AddAttribute(XML_NAMESPACE_SVG, sXML_viewBox, + rExport.AddAttribute(XML_NAMESPACE_SVG, XML_VIEWBOX, aViewBox.GetExportString(rExport.GetMM100UnitConverter())); // prepare svx:d element export @@ -359,17 +363,17 @@ void XMLShapeExport::ImpExport3DShape( } // write point array - rExport.AddAttribute(XML_NAMESPACE_SVG, sXML_d, aSvgDElement.GetExportString()); + rExport.AddAttribute(XML_NAMESPACE_SVG, XML_D, aSvgDElement.GetExportString()); if(eShapeType == XmlShapeTypeDraw3DLatheObject) { // write 3DLathe shape - SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DR3D, sXML_rotate, sal_True, sal_True); + SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DR3D, XML_ROTATE, sal_True, sal_True); } else { // write 3DExtrude shape - SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DR3D, sXML_extrude, sal_True, sal_True); + SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DR3D, XML_EXTRUDE, sal_True, sal_True); } break; } @@ -392,7 +396,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen SdXMLImExTransform3D aTransform; aTransform.AddHomogenMatrix(xHomMat); if(aTransform.NeedsAction()) - rExport.AddAttribute(XML_NAMESPACE_DR3D, sXML_transform, aTransform.GetExportString(rExport.GetMM100UnitConverter())); + rExport.AddAttribute(XML_NAMESPACE_DR3D, XML_TRANSFORM, aTransform.GetExportString(rExport.GetMM100UnitConverter())); // VRP, VPN, VUP aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DCameraGeometry"))); @@ -404,7 +408,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen { rExport.GetMM100UnitConverter().convertVector3D(sStringBuffer, aVRP); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_DR3D, sXML_vrp, aStr); + rExport.AddAttribute(XML_NAMESPACE_DR3D, XML_VRP, aStr); } Vector3D aVPN(aCamGeo.vpn.DirectionX, aCamGeo.vpn.DirectionY, aCamGeo.vpn.DirectionZ); @@ -412,7 +416,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen { rExport.GetMM100UnitConverter().convertVector3D(sStringBuffer, aVPN); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_DR3D, sXML_vpn, aStr); + rExport.AddAttribute(XML_NAMESPACE_DR3D, XML_VPN, aStr); } Vector3D aVUP(aCamGeo.vup.DirectionX, aCamGeo.vup.DirectionY, aCamGeo.vup.DirectionZ); @@ -420,7 +424,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen { rExport.GetMM100UnitConverter().convertVector3D(sStringBuffer, aVUP); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_DR3D, sXML_vup, aStr); + rExport.AddAttribute(XML_NAMESPACE_DR3D, XML_VUP, aStr); } // projection "D3DScenePerspective" drawing::ProjectionMode @@ -428,10 +432,10 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen drawing::ProjectionMode xPrjMode; aAny >>= xPrjMode; if(xPrjMode == drawing::ProjectionMode_PARALLEL) - aStr = OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_parallel)); + aStr = GetXMLToken(XML_PARALLEL); else - aStr = OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_perspective)); - rExport.AddAttribute(XML_NAMESPACE_DR3D, sXML_projection, aStr); + aStr = GetXMLToken(XML_PERSPECTIVE); + rExport.AddAttribute(XML_NAMESPACE_DR3D, XML_PROJECTION, aStr); // distance aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneDistance"))); @@ -439,7 +443,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen aAny >>= nDistance; rExport.GetMM100UnitConverter().convertMeasure(sStringBuffer, nDistance); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_DR3D, sXML_distance, aStr); + rExport.AddAttribute(XML_NAMESPACE_DR3D, XML_DISTANCE, aStr); // focalLength aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneFocalLength"))); @@ -447,7 +451,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen aAny >>= nFocalLength; rExport.GetMM100UnitConverter().convertMeasure(sStringBuffer, nFocalLength); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_DR3D, sXML_focal_length, aStr); + rExport.AddAttribute(XML_NAMESPACE_DR3D, XML_FOCAL_LENGTH, aStr); // shadowSlant aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneShadowSlant"))); @@ -455,7 +459,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen aAny >>= nShadowSlant; rExport.GetMM100UnitConverter().convertNumber(sStringBuffer, (sal_Int32)nShadowSlant); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_DR3D, sXML_shadow_slant, aStr); + rExport.AddAttribute(XML_NAMESPACE_DR3D, XML_SHADOW_SLANT, aStr); // shadeMode aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneShadeMode"))); @@ -463,20 +467,20 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen if(aAny >>= xShadeMode) { if(xShadeMode == drawing::ShadeMode_FLAT) - aStr = OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_flat)); + aStr = GetXMLToken(XML_FLAT); else if(xShadeMode == drawing::ShadeMode_PHONG) - aStr = OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_phong)); + aStr = GetXMLToken(XML_PHONG); else if(xShadeMode == drawing::ShadeMode_SMOOTH) - aStr = OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_gouraud)); + aStr = GetXMLToken(XML_GOURAUD); else - aStr = OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_draft)); + aStr = GetXMLToken(XML_DRAFT); } else { // ShadeMode enum not there, write default - aStr = OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_gouraud)); + aStr = GetXMLToken(XML_GOURAUD); } - rExport.AddAttribute(XML_NAMESPACE_DR3D, sXML_shade_mode, aStr); + rExport.AddAttribute(XML_NAMESPACE_DR3D, XML_SHADE_MODE, aStr); // ambientColor aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneAmbientColor"))); @@ -485,7 +489,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen aAny >>= aColTemp; aAmbientColor.SetColor(aColTemp); rExport.GetMM100UnitConverter().convertColor(sStringBuffer, aAmbientColor); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_DR3D, sXML_ambient_color, aStr); + rExport.AddAttribute(XML_NAMESPACE_DR3D, XML_AMBIENT_COLOR, aStr); // lightingMode aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneTwoSidedLighting"))); @@ -493,7 +497,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen aAny >>= bTwoSidedLighting; rExport.GetMM100UnitConverter().convertBool(sStringBuffer, bTwoSidedLighting); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_DR3D, sXML_lighting_mode, aStr); + rExport.AddAttribute(XML_NAMESPACE_DR3D, XML_LIGHTING_MODE, aStr); } /** helper for chart that exports all lamps from the propertyset */ @@ -525,7 +529,7 @@ void XMLShapeExport::export3DLamps( const com::sun::star::uno::Reference< com::s aLightColor.SetColor(aColTemp); rExport.GetMM100UnitConverter().convertColor(sStringBuffer, aLightColor); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_DR3D, sXML_diffuse_color, aStr); + rExport.AddAttribute(XML_NAMESPACE_DR3D, XML_DIFFUSE_COLOR, aStr); // lightdirection aPropName = aDirectionPropName; @@ -534,7 +538,7 @@ void XMLShapeExport::export3DLamps( const com::sun::star::uno::Reference< com::s aLightDirection = Vector3D(xLightDir.DirectionX, xLightDir.DirectionY, xLightDir.DirectionZ); rExport.GetMM100UnitConverter().convertVector3D(sStringBuffer, aLightDirection); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_DR3D, sXML_direction, aStr); + rExport.AddAttribute(XML_NAMESPACE_DR3D, XML_DIRECTION, aStr); // lighton aPropName = aLightOnPropName; @@ -542,15 +546,14 @@ void XMLShapeExport::export3DLamps( const com::sun::star::uno::Reference< com::s xPropSet->getPropertyValue(aPropName) >>= bLightOnOff; rExport.GetMM100UnitConverter().convertBool(sStringBuffer, bLightOnOff); aStr = sStringBuffer.makeStringAndClear(); - rExport.AddAttribute(XML_NAMESPACE_DR3D, sXML_enabled, aStr); + rExport.AddAttribute(XML_NAMESPACE_DR3D, XML_ENABLED, aStr); // specular - rExport.AddAttribute(XML_NAMESPACE_DR3D, sXML_specular, - nLamp == 1 ? OUString( RTL_CONSTASCII_USTRINGPARAM( sXML_true ) ) : - OUString( RTL_CONSTASCII_USTRINGPARAM( sXML_false ) ) ); + rExport.AddAttribute(XML_NAMESPACE_DR3D, XML_SPECULAR, + nLamp == 1 ? XML_TRUE : XML_FALSE); // write light entry - SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DR3D, sXML_light, sal_True, sal_True); + SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DR3D, XML_LIGHT, sal_True, sal_True); } } diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 0d9238c30247..076456132a2c 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -2,9 +2,9 @@ * * $RCSfile: shapeimport.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: cl $ $Date: 2001-06-19 14:51:55 $ + * last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,8 +81,8 @@ #include "xmlnmspe.hxx" #endif -#ifndef _XMLOFF_XMLKYWD_HXX -#include "xmlkywd.hxx" +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" #endif #ifndef _XIMPSTYLE_HXX diff --git a/xmloff/source/draw/viewcontext.cxx b/xmloff/source/draw/viewcontext.cxx index fc956f5d6e97..410005e93e5f 100644 --- a/xmloff/source/draw/viewcontext.cxx +++ b/xmloff/source/draw/viewcontext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewcontext.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: cl $ $Date: 2001-02-21 18:04:45 $ + * last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,8 +66,8 @@ #include "sdxmlimp_impl.hxx" #endif -#ifndef _XMLOFF_XMLKYWD_HXX -#include "xmlkywd.hxx" +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" #endif #ifndef _XMLOFF_XMLNMSPE_HXX #include "xmlnmspe.hxx" @@ -81,6 +81,9 @@ using namespace com::sun::star; using namespace rtl; +using ::xmloff::token::IsXMLToken; + +using ::xmloff::token::XML_EMBEDDED_VISIBLE_AREA; //------------------------------------------------------------------ @@ -102,7 +105,7 @@ SvXMLImportContext *SdXMLViewSettingsContext::CreateChildContext( USHORT nPrefix if (nPrefix == XML_NAMESPACE_OFFICE) { - if (rLocalName.compareToAscii(sXML_embedded_visible_area) == 0) + if ( IsXMLToken( rLocalName, XML_EMBEDDED_VISIBLE_AREA ) ) { sal_Int16 nMeasureUnit = 0; diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx index f2cfaa9b80d9..b82dd3b626e1 100644 --- a/xmloff/source/draw/ximp3dobject.cxx +++ b/xmloff/source/draw/ximp3dobject.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ximp3dobject.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: cl $ $Date: 2001-05-18 08:40:43 $ + * last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -105,8 +105,8 @@ #include "ximpstyl.hxx" #endif -#ifndef _XMLOFF_XMLKYWD_HXX -#include "xmlkywd.hxx" +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" #endif #ifndef _COM_SUN_STAR_DRAWING_POLYPOLYGONSHAPE3D_HPP_ diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx index ddb0eff54fa1..eea181e431f2 100644 --- a/xmloff/source/draw/ximp3dscene.cxx +++ b/xmloff/source/draw/ximp3dscene.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ximp3dscene.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: cl $ $Date: 2001-05-18 08:40:43 $ + * last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,8 +73,8 @@ #include "xexptran.hxx" #endif -#ifndef _XMLOFF_XMLKYWD_HXX -#include "xmlkywd.hxx" +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" #endif #ifndef _XMLOFF_XMLNMSPE_HXX @@ -91,6 +91,7 @@ using namespace ::rtl; using namespace ::com::sun::star; +using namespace ::xmloff::token; ////////////////////////////////////////////////////////////////////////////// // dr3d:3dlight context @@ -222,7 +223,7 @@ SvXMLImportContext* SdXML3DSceneShapeContext::CreateChildContext( USHORT nPrefix // look for local light context first if(nPrefix == XML_NAMESPACE_DR3D - && rLocalName.equals(OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_light)))) + && IsXMLToken( rLocalName, XML_LIGHT ) ) { // dr3d:light inside dr3d:scene context pContext = create3DLightContext( nPrefix, rLocalName, xAttrList ); @@ -293,14 +294,14 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, co { if( XML_NAMESPACE_DR3D == nPrefix ) { - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_transform)) ) + if( IsXMLToken( rLocalName, XML_TRANSFORM ) ) { SdXMLImExTransform3D aTransform(rValue, mrImport.GetMM100UnitConverter()); if(aTransform.NeedsAction()) mbSetTransform = aTransform.GetFullHomogenTransform(mxHomMat); return; } - else if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_vrp)) ) + else if( IsXMLToken( rLocalName, XML_VRP ) ) { Vector3D aNewVec; mrImport.GetMM100UnitConverter().convertVector3D(aNewVec, rValue); @@ -312,7 +313,7 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, co } return; } - else if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_vpn)) ) + else if( IsXMLToken( rLocalName, XML_VPN ) ) { Vector3D aNewVec; mrImport.GetMM100UnitConverter().convertVector3D(aNewVec, rValue); @@ -324,7 +325,7 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, co } return; } - else if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_vup)) ) + else if( IsXMLToken( rLocalName, XML_VUP ) ) { Vector3D aNewVec; mrImport.GetMM100UnitConverter().convertVector3D(aNewVec, rValue); @@ -336,47 +337,47 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, co } return; } - else if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_projection)) ) + else if( IsXMLToken( rLocalName, XML_PROJECTION ) ) { - if(rValue.equals(OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_parallel)))) + if( IsXMLToken( rValue, XML_PARALLEL ) ) mxPrjMode = drawing::ProjectionMode_PARALLEL; else mxPrjMode = drawing::ProjectionMode_PERSPECTIVE; return; } - else if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_distance)) ) + else if( IsXMLToken( rLocalName, XML_DISTANCE ) ) { mrImport.GetMM100UnitConverter().convertMeasure(mnDistance, rValue); return; } - else if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_focal_length)) ) + else if( IsXMLToken( rLocalName, XML_FOCAL_LENGTH ) ) { mrImport.GetMM100UnitConverter().convertMeasure(mnFocalLength, rValue); return; } - else if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_shadow_slant)) ) + else if( IsXMLToken( rLocalName, XML_SHADOW_SLANT ) ) { mrImport.GetMM100UnitConverter().convertNumber(mnShadowSlant, rValue); return; } - else if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_shade_mode)) ) + else if( IsXMLToken( rLocalName, XML_SHADE_MODE ) ) { - if(rValue.equals(OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_flat)))) + if( IsXMLToken( rValue, XML_FLAT ) ) mxShadeMode = drawing::ShadeMode_FLAT; - else if(rValue.equals(OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_phong)))) + else if( IsXMLToken( rValue, XML_PHONG ) ) mxShadeMode = drawing::ShadeMode_PHONG; - else if(rValue.equals(OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_gouraud)))) + else if( IsXMLToken( rValue, XML_GOURAUD ) ) mxShadeMode = drawing::ShadeMode_SMOOTH; else mxShadeMode = drawing::ShadeMode_DRAFT; return; } - else if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_ambient_color)) ) + else if( IsXMLToken( rLocalName, XML_AMBIENT_COLOR ) ) { mrImport.GetMM100UnitConverter().convertColor(maAmbientColor, rValue); return; } - else if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_lighting_mode)) ) + else if( IsXMLToken( rLocalName, XML_LIGHTING_MODE ) ) { mrImport.GetMM100UnitConverter().convertBool(mbLightingMode, rValue); return; diff --git a/xmloff/source/draw/ximpgrp.cxx b/xmloff/source/draw/ximpgrp.cxx index e58089fe796b..f9a5a915eee3 100644 --- a/xmloff/source/draw/ximpgrp.cxx +++ b/xmloff/source/draw/ximpgrp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ximpgrp.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: cl $ $Date: 2001-05-08 12:47:11 $ + * last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,8 +69,8 @@ #include "ximpgrp.hxx" #endif -#ifndef _XMLOFF_XMLKYWD_HXX -#include "xmlkywd.hxx" +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" #endif #ifndef _XIMPSHAPE_HXX @@ -83,6 +83,8 @@ using namespace ::rtl; using namespace ::com::sun::star; +using ::xmloff::token::IsXMLToken; +using ::xmloff::token::XML_EVENTS; ////////////////////////////////////////////////////////////////////////////// @@ -111,7 +113,7 @@ SvXMLImportContext* SdXMLGroupShapeContext::CreateChildContext( USHORT nPrefix, { SvXMLImportContext* pContext = 0L; - if( nPrefix == XML_NAMESPACE_OFFICE && rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_events ) ) ) + if( nPrefix == XML_NAMESPACE_OFFICE && IsXMLToken( rLocalName, XML_EVENTS ) ) { pContext = new SdXMLEventsContext( GetImport(), nPrefix, rLocalName, xAttrList, mxShape ); } diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index cc400362132c..de2d1badeab4 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ximppage.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: cl $ $Date: 2001-05-28 13:32:20 $ + * last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,7 +61,9 @@ #pragma hdrstop -#include "xmlkywd.hxx" +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" +#endif #ifndef _XMLOFF_XMLSTYLE_HXX #include "xmlstyle.hxx" @@ -97,6 +99,7 @@ using namespace ::rtl; using namespace ::com::sun::star; +using namespace ::xmloff::token; ////////////////////////////////////////////////////////////////////////////// @@ -136,11 +139,11 @@ SvXMLImportContext* SdXMLGenericPageContext::CreateChildContext( USHORT nPrefix, { SvXMLImportContext* pContext = 0L; - if( nPrefix == XML_NAMESPACE_PRESENTATION && rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_animations ) ) ) + if( nPrefix == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_ANIMATIONS ) ) { pContext = new XMLAnimationsContext( GetImport(), nPrefix, rLocalName, xAttrList ); } - else if( nPrefix == XML_NAMESPACE_OFFICE && rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_forms ) ) ) + else if( nPrefix == XML_NAMESPACE_OFFICE && IsXMLToken( rLocalName, XML_FORMS ) ) { if( GetImport().IsFormsSupported() ) pContext = GetImport().GetFormImport()->createOfficeFormsContext( GetImport(), nPrefix, rLocalName ); diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 2d902661cdd1..901d455e2616 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ximpshap.cxx,v $ * - * $Revision: 1.53 $ + * $Revision: 1.54 $ * - * last change: $Author: cl $ $Date: 2001-06-27 14:56:38 $ + * last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -167,8 +167,8 @@ #include"xmlnmspe.hxx" #endif -#ifndef _XMLOFF_XMLKYWD_HXX -#include "xmlkywd.hxx" +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" #endif #ifndef _XMLOFF_XMLIMAGEMAPCONTEXT_HXX_ @@ -185,6 +185,7 @@ using namespace ::rtl; using namespace ::com::sun::star; +using namespace ::xmloff::token; extern SvXMLEnumMapEntry aXML_GlueAlignment_EnumMap[]; extern SvXMLEnumMapEntry aXML_GlueEscapeDirection_EnumMap[]; @@ -241,15 +242,15 @@ SvXMLImportContext *SdXMLShapeContext::CreateChildContext( USHORT nPrefix, { SvXMLImportContext * pContext = NULL; - if( nPrefix == XML_NAMESPACE_OFFICE && rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_events ) ) ) + if( nPrefix == XML_NAMESPACE_OFFICE && IsXMLToken( rLocalName, XML_EVENTS ) ) { pContext = new SdXMLEventsContext( GetImport(), nPrefix, rLocalName, xAttrList, mxShape ); } - else if( nPrefix == XML_NAMESPACE_DRAW && rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_glue_point ) ) ) + else if( nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_GLUE_POINT ) ) { addGluePoint( xAttrList ); } - else if( nPrefix == XML_NAMESPACE_DRAW && rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_thumbnail ) ) ) + else if( nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_THUMBNAIL ) ) { // search attributes for xlink:href sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; @@ -261,7 +262,7 @@ SvXMLImportContext *SdXMLShapeContext::CreateChildContext( USHORT nPrefix, if( nPrefix == XML_NAMESPACE_XLINK ) { - if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_href ) ) ) + if( IsXMLToken( aLocalName, XML_HREF ) ) { maThumbnailURL = GetImport().GetAbsoluteReference(xAttrList->getValueByIndex( i )); break; @@ -337,22 +338,22 @@ void SdXMLShapeContext::addGluePoint( const uno::Reference< xml::sax::XAttribute if( nPrefix == XML_NAMESPACE_SVG ) { - if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_x ) ) ) + if( IsXMLToken( aLocalName, XML_X ) ) { GetImport().GetMM100UnitConverter().convertMeasure(aGluePoint.Position.X, sValue); } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_y ) ) ) + else if( IsXMLToken( aLocalName, XML_Y ) ) { GetImport().GetMM100UnitConverter().convertMeasure(aGluePoint.Position.Y, sValue); } } else if( nPrefix == XML_NAMESPACE_DRAW ) { - if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_id ) ) ) + if( IsXMLToken( aLocalName, XML_ID ) ) { nId = sValue.toInt32(); } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_align ) ) ) + else if( IsXMLToken( aLocalName, XML_ALIGN ) ) { USHORT eKind; if( SvXMLUnitConverter::convertEnum( eKind, sValue, aXML_GlueAlignment_EnumMap ) ) @@ -361,7 +362,7 @@ void SdXMLShapeContext::addGluePoint( const uno::Reference< xml::sax::XAttribute aGluePoint.IsRelative = sal_False; } } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_escape_direction ) ) ) + else if( IsXMLToken( aLocalName, XML_ESCAPE_DIRECTION ) ) { USHORT eKind; if( SvXMLUnitConverter::convertEnum( eKind, sValue, aXML_GlueEscapeDirection_EnumMap ) ) @@ -697,50 +698,50 @@ void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUStr { if( XML_NAMESPACE_DRAW == nPrefix ) { - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_zindex)) ) + if( IsXMLToken( rLocalName, XML_ZINDEX ) ) { mnZOrder = rValue.toInt32(); } - else if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_id)) ) + else if( IsXMLToken( rLocalName, XML_ID ) ) { mnShapeId = rValue.toInt32(); } - else if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_name)) ) + else if( IsXMLToken( rLocalName, XML_NAME ) ) { maShapeName = rValue; } - else if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_style_name)) ) + else if( IsXMLToken( rLocalName, XML_STYLE_NAME ) ) { maDrawStyleName = rValue; } - else if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_text_style_name)) ) + else if( IsXMLToken( rLocalName, XML_TEXT_STYLE_NAME ) ) { maTextStyleName = rValue; } - else if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_layer)) ) + else if( IsXMLToken( rLocalName, XML_LAYER ) ) { maLayerName = rValue; } - else if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_transform)) ) + else if( IsXMLToken( rLocalName, XML_TRANSFORM ) ) { mnTransform.SetString(rValue, GetImport().GetMM100UnitConverter()); } } else if( XML_NAMESPACE_PRESENTATION == nPrefix ) { - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_user_transformed)) ) + if( IsXMLToken( rLocalName, XML_USER_TRANSFORMED ) ) { - mbIsUserTransformed = rValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_true)); + mbIsUserTransformed = IsXMLToken( rValue, XML_TRUE ); } - else if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_placeholder)) ) + else if( IsXMLToken( rLocalName, XML_PLACEHOLDER ) ) { - mbIsPlaceholder = rValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_true)); + mbIsPlaceholder = IsXMLToken( rValue, XML_TRUE ); } - else if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_class)) ) + else if( IsXMLToken( rLocalName, XML_CLASS ) ) { maPresentationClass = rValue; } - else if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_style_name)) ) + else if( IsXMLToken( rLocalName, XML_STYLE_NAME ) ) { maDrawStyleName = rValue; mnStyleFamily = XML_STYLE_FAMILY_SD_PRESENTATION_ID; @@ -748,23 +749,23 @@ void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUStr } else if( XML_NAMESPACE_SVG == nPrefix ) { - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_x)) ) + if( IsXMLToken( rLocalName, XML_X ) ) { GetImport().GetMM100UnitConverter().convertMeasure(maPosition.X, rValue); } - else if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_y)) ) + else if( IsXMLToken( rLocalName, XML_Y ) ) { GetImport().GetMM100UnitConverter().convertMeasure(maPosition.Y, rValue); } - else if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_width)) ) + else if( IsXMLToken( rLocalName, XML_WIDTH ) ) { GetImport().GetMM100UnitConverter().convertMeasure(maSize.Width, rValue); } - else if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_height)) ) + else if( IsXMLToken( rLocalName, XML_HEIGHT ) ) { GetImport().GetMM100UnitConverter().convertMeasure(maSize.Height, rValue); } - else if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_transform)) ) + else if( IsXMLToken( rLocalName, XML_TRANSFORM ) ) { // because of #85127# take svg:transform into account and hanle like // draw:transform for compatibility @@ -802,7 +803,7 @@ void SdXMLRectShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::O { if( XML_NAMESPACE_DRAW == nPrefix ) { - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_corner_radius)) ) + if( IsXMLToken( rLocalName, XML_CORNER_RADIUS ) ) { GetImport().GetMM100UnitConverter().convertMeasure(mnRadius, rValue); return; @@ -874,22 +875,22 @@ void SdXMLLineShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::O { if( XML_NAMESPACE_SVG == nPrefix ) { - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_x1)) ) + if( IsXMLToken( rLocalName, XML_X1 ) ) { GetImport().GetMM100UnitConverter().convertMeasure(mnX1, rValue); return; } - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_y1)) ) + if( IsXMLToken( rLocalName, XML_Y1 ) ) { GetImport().GetMM100UnitConverter().convertMeasure(mnY1, rValue); return; } - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_x2)) ) + if( IsXMLToken( rLocalName, XML_X2 ) ) { GetImport().GetMM100UnitConverter().convertMeasure(mnX2, rValue); return; } - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_y2)) ) + if( IsXMLToken( rLocalName, XML_Y2 ) ) { GetImport().GetMM100UnitConverter().convertMeasure(mnY2, rValue); return; @@ -998,27 +999,27 @@ void SdXMLEllipseShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl { if( XML_NAMESPACE_SVG == nPrefix ) { - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_rx)) ) + if( IsXMLToken( rLocalName, XML_RX ) ) { GetImport().GetMM100UnitConverter().convertMeasure(mnRX, rValue); return; } - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_ry)) ) + if( IsXMLToken( rLocalName, XML_RY ) ) { GetImport().GetMM100UnitConverter().convertMeasure(mnRY, rValue); return; } - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_cx)) ) + if( IsXMLToken( rLocalName, XML_CX ) ) { GetImport().GetMM100UnitConverter().convertMeasure(mnCX, rValue); return; } - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_cy)) ) + if( IsXMLToken( rLocalName, XML_CY ) ) { GetImport().GetMM100UnitConverter().convertMeasure(mnCY, rValue); return; } - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_r)) ) + if( IsXMLToken( rLocalName, XML_R ) ) { // single radius, it's a circle and both radii are the same GetImport().GetMM100UnitConverter().convertMeasure(mnRX, rValue); @@ -1028,7 +1029,7 @@ void SdXMLEllipseShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl } else if( XML_NAMESPACE_DRAW == nPrefix ) { - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_kind)) ) + if( IsXMLToken( rLocalName, XML_KIND ) ) { USHORT eKind; if( SvXMLUnitConverter::convertEnum( eKind, rValue, aXML_CircleKind_EnumMap ) ) @@ -1037,14 +1038,14 @@ void SdXMLEllipseShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl } return; } - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_start_angle)) ) + if( IsXMLToken( rLocalName, XML_START_ANGLE ) ) { double dStartAngle; if( SvXMLUnitConverter::convertDouble( dStartAngle, rValue ) ) mnStartAngle = (sal_Int32)(dStartAngle * 100.0); return; } - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_end_angle)) ) + if( IsXMLToken( rLocalName, XML_END_ANGLE ) ) { double dEndAngle; if( SvXMLUnitConverter::convertDouble( dEndAngle, rValue ) ) @@ -1115,7 +1116,7 @@ void SdXMLPolygonShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl { if( XML_NAMESPACE_SVG == nPrefix ) { - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_viewBox)) ) + if( IsXMLToken( rLocalName, XML_VIEWBOX ) ) { maViewBox = rValue; return; @@ -1123,7 +1124,7 @@ void SdXMLPolygonShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl } else if( XML_NAMESPACE_DRAW == nPrefix ) { - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_points)) ) + if( IsXMLToken( rLocalName, XML_POINTS ) ) { maPoints = rValue; return; @@ -1210,12 +1211,12 @@ void SdXMLPathShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::O { if( XML_NAMESPACE_SVG == nPrefix ) { - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_viewBox)) ) + if( IsXMLToken( rLocalName, XML_VIEWBOX ) ) { maViewBox = rValue; return; } - else if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_d)) ) + else if( IsXMLToken( rLocalName, XML_D ) ) { maD = rValue; return; @@ -1339,22 +1340,22 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt if(maPresentationClass.getLength()) { - if(maPresentationClass.equals(OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_presentation_subtitle)))) + if( IsXMLToken( maPresentationClass, XML_PRESENTATION_SUBTITLE )) { // XmlShapeTypePresSubtitleShape pService = "com.sun.star.presentation.SubtitleShape"; } - else if(maPresentationClass.equals(OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_presentation_outline)))) + else if( IsXMLToken( maPresentationClass, XML_PRESENTATION_OUTLINE ) ) { // XmlShapeTypePresOutlinerShape pService = "com.sun.star.presentation.OutlinerShape"; } - else if(maPresentationClass.equals(OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_presentation_notes)))) + else if( IsXMLToken( maPresentationClass, XML_PRESENTATION_NOTES ) ) { // XmlShapeTypePresNotesShape pService = "com.sun.star.presentation.NotesShape"; } - else // if(maPresentationClass.equals(OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_presentation_title)))) + else // IsXMLToken( maPresentationClass, XML_PRESENTATION_TITLE ) ) { // XmlShapeTypePresTitleTextShape pService = "com.sun.star.presentation.TitleTextShape"; @@ -1437,7 +1438,7 @@ void SdXMLControlShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl { if( XML_NAMESPACE_FORM == nPrefix ) { - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_id)) ) + if( IsXMLToken( rLocalName, XML_ID ) ) { maFormId = rValue; return; @@ -1520,27 +1521,27 @@ void SdXMLConnectorShapeContext::processAttribute( sal_uInt16 nPrefix, const ::r { case XML_NAMESPACE_DRAW: { - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_start_shape)) ) + if( IsXMLToken( rLocalName, XML_START_SHAPE ) ) { mnStartShapeId = rValue.toInt32(); return; } - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_start_glue_point)) ) + if( IsXMLToken( rLocalName, XML_START_GLUE_POINT ) ) { mnStartGlueId = rValue.toInt32(); return; } - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_end_shape)) ) + if( IsXMLToken( rLocalName, XML_END_SHAPE ) ) { mnEndShapeId = rValue.toInt32(); return; } - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_end_glue_point)) ) + if( IsXMLToken( rLocalName, XML_END_GLUE_POINT ) ) { mnEndGlueId = rValue.toInt32(); return; } - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_line_skew)) ) + if( IsXMLToken( rLocalName, XML_LINE_SKEW ) ) { SvXMLTokenEnumerator aTokenEnum( rValue ); OUString aToken; @@ -1558,7 +1559,7 @@ void SdXMLConnectorShapeContext::processAttribute( sal_uInt16 nPrefix, const ::r } return; } - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_type)) ) + if( IsXMLToken( rLocalName, XML_TYPE ) ) { SvXMLUnitConverter::convertEnum( mnType, rValue, aXML_ConnectionKind_EnumMap ); return; @@ -1566,22 +1567,22 @@ void SdXMLConnectorShapeContext::processAttribute( sal_uInt16 nPrefix, const ::r } case XML_NAMESPACE_SVG: { - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_x1)) ) + if( IsXMLToken( rLocalName, XML_X1 ) ) { GetImport().GetMM100UnitConverter().convertMeasure(maStart.X, rValue); return; } - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_y1)) ) + if( IsXMLToken( rLocalName, XML_Y1 ) ) { GetImport().GetMM100UnitConverter().convertMeasure(maStart.Y, rValue); return; } - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_x2)) ) + if( IsXMLToken( rLocalName, XML_X2 ) ) { GetImport().GetMM100UnitConverter().convertMeasure(maEnd.X, rValue); return; } - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_y2)) ) + if( IsXMLToken( rLocalName, XML_Y2 ) ) { GetImport().GetMM100UnitConverter().convertMeasure(maEnd.Y, rValue); return; @@ -1666,22 +1667,22 @@ void SdXMLMeasureShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl { case XML_NAMESPACE_SVG: { - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_x1)) ) + if( IsXMLToken( rLocalName, XML_X1 ) ) { GetImport().GetMM100UnitConverter().convertMeasure(maStart.X, rValue); return; } - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_y1)) ) + if( IsXMLToken( rLocalName, XML_Y1 ) ) { GetImport().GetMM100UnitConverter().convertMeasure(maStart.Y, rValue); return; } - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_x2)) ) + if( IsXMLToken( rLocalName, XML_X2 ) ) { GetImport().GetMM100UnitConverter().convertMeasure(maEnd.X, rValue); return; } - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_y2)) ) + if( IsXMLToken( rLocalName, XML_Y2 ) ) { GetImport().GetMM100UnitConverter().convertMeasure(maEnd.Y, rValue); return; @@ -1777,7 +1778,7 @@ void SdXMLPageShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::O { if( XML_NAMESPACE_DRAW == nPrefix ) { - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_page_number)) ) + if( IsXMLToken( rLocalName, XML_PAGE_NUMBER ) ) { mnPageNumber = rValue.toInt32(); return; @@ -1795,7 +1796,7 @@ void SdXMLPageShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib // add, set style and properties from base shape // #86163# take into account which type of PageShape needs to - // be constructed. It's an pres shape if presentation:sXML_class == sXML_presentation_page. + // be constructed. It's an pres shape if presentation:XML_CLASS == XML_PRESENTATION_PAGE. sal_Bool bIsPresentation(maPresentationClass.getLength() != 0); uno::Reference< lang::XServiceInfo > xInfo( mxShapes, uno::UNO_QUERY ); @@ -1808,7 +1809,7 @@ void SdXMLPageShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib else { if(bIsPresentation - && !maPresentationClass.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_presentation_page))) + && !IsXMLToken( maPresentationClass, XML_PRESENTATION_PAGE ) ) { bIsPresentation = FALSE; } @@ -1907,17 +1908,17 @@ void SdXMLCaptionShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl { if( XML_NAMESPACE_DRAW == nPrefix ) { - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_caption_point_x)) ) + if( IsXMLToken( rLocalName, XML_CAPTION_POINT_X ) ) { GetImport().GetMM100UnitConverter().convertMeasure(maCaptionPoint.X, rValue); return; } - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_caption_point_y)) ) + if( IsXMLToken( rLocalName, XML_CAPTION_POINT_Y ) ) { GetImport().GetMM100UnitConverter().convertMeasure(maCaptionPoint.Y, rValue); return; } - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_corner_radius)) ) + if( IsXMLToken( rLocalName, XML_CORNER_RADIUS ) ) { GetImport().GetMM100UnitConverter().convertMeasure(mnRadius, rValue); return; @@ -1949,7 +1950,7 @@ void SdXMLGraphicObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const { if( XML_NAMESPACE_XLINK == nPrefix ) { - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_href)) ) + if( IsXMLToken( rLocalName, XML_HREF ) ) { maURL = GetImport().GetAbsoluteReference(rValue); return; @@ -1966,7 +1967,7 @@ void SdXMLGraphicObjectShapeContext::StartElement( const ::com::sun::star::uno:: // create graphic object shape char *pService; - if(maPresentationClass.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_graphic ) ) ) + if( IsXMLToken( maPresentationClass, XML_GRAPHIC ) ) { pService = "com.sun.star.presentation.GraphicObjectShape"; } @@ -2036,7 +2037,7 @@ SvXMLImportContext* SdXMLGraphicObjectShapeContext::CreateChildContext( SvXMLImportContext* pContext = NULL; if ( (XML_NAMESPACE_DRAW == nPrefix) && - rLocalName.equalsAsciiL(sXML_image_map, sizeof(sXML_image_map)-1) ) + IsXMLToken( rLocalName, XML_IMAGE_MAP ) ) { uno::Reference< beans::XPropertySet > xPropSet(mxShape,uno::UNO_QUERY); if (xPropSet.is()) @@ -2117,7 +2118,7 @@ void SdXMLChartShapeContext::StartElement(const uno::Reference< xml::sax::XAttri uno::Reference< frame::XModel > xChartModel; if( aAny >>= xChartModel ) { - mpChartContext = GetImport().GetChartImport()->CreateChartContext( GetImport(), XML_NAMESPACE_SVG, OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_chart)), xChartModel, xAttrList ); + mpChartContext = GetImport().GetChartImport()->CreateChartContext( GetImport(), XML_NAMESPACE_SVG, GetXMLToken(XML_CHART), xChartModel, xAttrList ); } } } @@ -2191,15 +2192,15 @@ void SdXMLObjectShapeContext::StartElement( const ::com::sun::star::uno::Referen sal_Bool bIsPresShape = maPresentationClass.getLength() != 0; if( bIsPresShape ) { - if( maPresentationClass.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_presentation_chart)) ) + if( IsXMLToken( maPresentationClass, XML_PRESENTATION_CHART ) ) { pService = "com.sun.star.presentation.ChartShape"; } - else if( maPresentationClass.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_presentation_table)) ) + else if( IsXMLToken( maPresentationClass, XML_PRESENTATION_TABLE ) ) { pService = "com.sun.star.presentation.TableShape"; } - else if( maPresentationClass.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_presentation_object)) ) + else if( IsXMLToken( maPresentationClass, XML_PRESENTATION_OBJECT ) ) { pService = "com.sun.star.presentation.OLE2Shape"; } @@ -2260,14 +2261,14 @@ void SdXMLObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl: switch( nPrefix ) { case XML_NAMESPACE_DRAW: - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_class_id)) ) + if( IsXMLToken( rLocalName, XML_CLASS_ID ) ) { maCLSID = rValue; return; } break; case XML_NAMESPACE_XLINK: - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_href)) ) + if( IsXMLToken( rLocalName, XML_HREF ) ) { maHref = GetImport().GetAbsoluteReference(rValue); return; @@ -2316,24 +2317,24 @@ void SdXMLAppletShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl: switch( nPrefix ) { case XML_NAMESPACE_DRAW: - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_applet_name)) ) + if( IsXMLToken( rLocalName, XML_APPLET_NAME ) ) { maAppletName = rValue; return; } - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_code)) ) + if( IsXMLToken( rLocalName, XML_CODE ) ) { maAppletCode = rValue; return; } - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_may_script)) ) + if( IsXMLToken( rLocalName, XML_MAY_SCRIPT ) ) { - mbIsScript = rValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_true)); + mbIsScript = IsXMLToken( rValue, XML_TRUE ); return; } break; case XML_NAMESPACE_XLINK: - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_href)) ) + if( IsXMLToken( rLocalName, XML_HREF ) ) { maHref = GetImport().GetAbsoluteReference(rValue); return; @@ -2390,7 +2391,7 @@ SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( USHORT nPrefix { SvXMLImportContext * pContext = NULL; - if( nPrefix == XML_NAMESPACE_DRAW && rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_param ) ) ) + if( nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_PARAM ) ) { OUString aParamName, aParamValue; const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; @@ -2404,11 +2405,11 @@ SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( USHORT nPrefix if( nPrefix == XML_NAMESPACE_DRAW ) { - if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_name ) ) ) + if( IsXMLToken( aLocalName, XML_NAME ) ) { aParamName = aValue; } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_value ) ) ) + else if( IsXMLToken( aLocalName, XML_VALUE ) ) { aParamValue = aValue; } @@ -2468,14 +2469,14 @@ void SdXMLPluginShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl: switch( nPrefix ) { case XML_NAMESPACE_DRAW: - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_mime_type)) ) + if( IsXMLToken( rLocalName, XML_MIME_TYPE ) ) { maMimeType = rValue; return; } break; case XML_NAMESPACE_XLINK: - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_href)) ) + if( IsXMLToken( rLocalName, XML_HREF ) ) { maHref = GetImport().GetAbsoluteReference(rValue); return; @@ -2519,7 +2520,7 @@ SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( USHORT nPrefix { SvXMLImportContext * pContext = NULL; - if( nPrefix == XML_NAMESPACE_DRAW && rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_param ) ) ) + if( nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_PARAM ) ) { OUString aParamName, aParamValue; const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; @@ -2533,11 +2534,11 @@ SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( USHORT nPrefix if( nPrefix == XML_NAMESPACE_DRAW ) { - if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_name ) ) ) + if( IsXMLToken( aLocalName, XML_NAME ) ) { aParamName = aValue; } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_value ) ) ) + else if( IsXMLToken( aLocalName, XML_VALUE ) ) { aParamValue = aValue; } @@ -2618,14 +2619,14 @@ void SdXMLFrameShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl:: switch( nPrefix ) { case XML_NAMESPACE_DRAW: - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_frame_name)) ) + if( IsXMLToken( rLocalName, XML_FRAME_NAME ) ) { maFrameName = rValue; return; } break; case XML_NAMESPACE_XLINK: - if( rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_href)) ) + if( IsXMLToken( rLocalName, XML_HREF ) ) { maHref = GetImport().GetAbsoluteReference(rValue); return; diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx index 5da47b17356d..a51586c1e7c8 100644 --- a/xmloff/source/draw/ximpshow.cxx +++ b/xmloff/source/draw/ximpshow.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ximpshow.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: cl $ $Date: 2001-05-18 08:39:24 $ + * last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,7 +86,9 @@ #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #endif -#include "xmlkywd.hxx" +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" +#endif #ifndef _COMPHELPER_EXTRACT_HXX_ #include <comphelper/extract.hxx> @@ -120,6 +122,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; using namespace ::com::sun::star::container; using namespace ::com::sun::star::presentation; +using namespace ::xmloff::token; /////////////////////////////////////////////////////////////////////// @@ -180,18 +183,18 @@ SdXMLShowsContext::SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, c switch( nPrefix ) { case XML_NAMESPACE_PRESENTATION: - if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_start_page ) ) ) + if( IsXMLToken( aLocalName, XML_START_PAGE ) ) { aAny <<= sValue; mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "FirstPage" ) ), aAny ); bAll = sal_False; } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_show ) ) ) + else if( IsXMLToken( aLocalName, XML_SHOW ) ) { mpImpl->maCustomShowName = sValue; bAll = sal_False; } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_pause ) ) ) + else if( IsXMLToken( aLocalName, XML_PAUSE ) ) { DateTime aTime; if( !SvXMLUnitConverter::convertTime( aTime, sValue ) ) @@ -201,54 +204,54 @@ SdXMLShowsContext::SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, c aAny <<= nMS; mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Pause" ) ), aAny ); } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_animations ) ) ) + else if( IsXMLToken( aLocalName, XML_ANIMATIONS ) ) { - aAny = bool2any( sValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_enabled ) ) ); + aAny = bool2any( IsXMLToken( sValue, XML_ENABLED ) ); mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "AllowAnimations" ) ), aAny ); } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_stay_on_top ) ) ) + else if( IsXMLToken( aLocalName, XML_STAY_ON_TOP ) ) { - aAny = bool2any( sValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_true ) ) ); + aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) ); mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsAlwaysOnTop" ) ), aAny ); } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_force_manual ) ) ) + else if( IsXMLToken( aLocalName, XML_FORCE_MANUAL ) ) { - aAny = bool2any( sValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_true ) ) ); + aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) ); mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsAutomatic" ) ), aAny ); } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_endless ) ) ) + else if( IsXMLToken( aLocalName, XML_ENDLESS ) ) { - aAny = bool2any( sValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_true ) ) ); + aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) ); mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsEndless" ) ), aAny ); } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_full_screen ) ) ) + else if( IsXMLToken( aLocalName, XML_FULL_SCREEN ) ) { - aAny = bool2any( sValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_true ) ) ); + aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) ); mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFullScreen" ) ), aAny ); } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_mouse_visible ) ) ) + else if( IsXMLToken( aLocalName, XML_MOUSE_VISIBLE ) ) { - aAny = bool2any( sValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_true ) ) ); + aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) ); mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsMouseVisible" ) ), aAny ); } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_start_with_navigator ) ) ) + else if( IsXMLToken( aLocalName, XML_START_WITH_NAVIGATOR ) ) { - aAny = bool2any( sValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_true ) ) ); + aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) ); mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "StartWithNavigator" ) ), aAny ); } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_mouse_as_pen ) ) ) + else if( IsXMLToken( aLocalName, XML_MOUSE_AS_PEN ) ) { - aAny = bool2any( sValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_true ) ) ); + aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) ); mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "UsePen" ) ), aAny ); } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_transition_on_click ) ) ) + else if( IsXMLToken( aLocalName, XML_TRANSITION_ON_CLICK ) ) { - aAny = bool2any( sValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_enabled ) ) ); + aAny = bool2any( IsXMLToken( sValue, XML_ENABLED ) ); mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsTransitionOnClick" ) ), aAny ); } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_show_logo ) ) ) + else if( IsXMLToken( aLocalName, XML_SHOW_LOGO ) ) { - aAny = bool2any( sValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_true ) ) ); + aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) ); mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsShowLogo" ) ), aAny ); } } @@ -272,7 +275,7 @@ SdXMLShowsContext::~SdXMLShowsContext() SvXMLImportContext * SdXMLShowsContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList ) { - if( mpImpl && nPrefix == XML_NAMESPACE_PRESENTATION && rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_show ) ) ) + if( mpImpl && nPrefix == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_SHOW ) ) { OUString aName; OUString aPages; @@ -289,11 +292,11 @@ SvXMLImportContext * SdXMLShowsContext::CreateChildContext( USHORT nPrefix, cons switch( nPrefix ) { case XML_NAMESPACE_PRESENTATION: - if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_name ) ) ) + if( IsXMLToken( aLocalName, XML_NAME ) ) { aName = sValue; } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_pages ) ) ) + else if( IsXMLToken( rLocalName, XML_PAGES ) ) { aPages = sValue; } diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index 99b9b9a7d200..e4a9e6911fd4 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ximpstyl.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: cl $ $Date: 2001-06-27 15:06:41 $ + * last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,8 +73,8 @@ #include "xmlnmspe.hxx" #endif -#ifndef _XMLOFF_XMLKYWD_HXX -#include "xmlkywd.hxx" +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" #endif #ifndef _XMLOFF_XMLUCONV_HXX @@ -153,6 +153,7 @@ using namespace ::rtl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; +using namespace ::xmloff::token; ////////////////////////////////////////////////////////////////////////////// @@ -213,7 +214,7 @@ SvXMLImportContext *SdXMLDrawingPagePropertySetContext::CreateChildContext( OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(xAttrList->getNameByIndex(i), &aLocalName); - if( (nPrefix == XML_NAMESPACE_XLINK) && aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_href ) ) ) + if( (nPrefix == XML_NAMESPACE_XLINK) && IsXMLToken( aLocalName, XML_HREF ) ) { uno::Any aAny; aAny <<= GetImport().GetAbsoluteReference( xAttrList->getValueByIndex(i) ); @@ -280,7 +281,7 @@ SvXMLImportContext *SdXMLDrawingPageStyleContext::CreateChildContext( SvXMLImportContext *pContext = 0; if( XML_NAMESPACE_STYLE == nPrefix && - rLocalName.compareToAscii( sXML_properties ) == 0 ) + IsXMLToken( rLocalName, XML_PROPERTIES ) ) { UniReference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper( GetFamily() ); @@ -362,7 +363,7 @@ SdXMLPageMasterStyleContext::SdXMLPageMasterStyleContext( } case XML_TOK_PAGEMASTERSTYLE_PAGE_ORIENTATION: { - if(sValue.equals(OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_portrait)))) + if( IsXMLToken( sValue, XML_PORTRAIT ) ) meOrientation = view::PaperOrientation_PORTRAIT; else meOrientation = view::PaperOrientation_LANDSCAPE; @@ -435,7 +436,7 @@ SvXMLImportContext *SdXMLPageMasterContext::CreateChildContext( { SvXMLImportContext* pContext = 0; - if(nPrefix == XML_NAMESPACE_STYLE && rLocalName.equals(OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_properties)))) + if(nPrefix == XML_NAMESPACE_STYLE && IsXMLToken( rLocalName, XML_PROPERTIES) ) { pContext = new SdXMLPageMasterStyleContext(GetSdImport(), nPrefix, rLocalName, xAttrList); @@ -478,7 +479,7 @@ SdXMLPresentationPageLayoutContext::SdXMLPresentationPageLayoutContext( OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName ); - if(nPrefix == XML_NAMESPACE_STYLE && aLocalName.equals(OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_name)))) + if(nPrefix == XML_NAMESPACE_STYLE && IsXMLToken( aLocalName, XML_NAME ) ) { msName = xAttrList->getValueByIndex( i ); } @@ -496,7 +497,7 @@ SvXMLImportContext *SdXMLPresentationPageLayoutContext::CreateChildContext( { SvXMLImportContext* pContext = 0; - if(nPrefix == XML_NAMESPACE_PRESENTATION && rLocalName.equals(OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_placeholder)))) + if(nPrefix == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_PLACEHOLDER ) ) { // presentation:placeholder inside style:presentation-page-layout context pContext = new SdXMLPresentationPlaceholderContext( @@ -785,7 +786,7 @@ SdXMLMasterPageContext::SdXMLMasterPageContext( uno::Reference< drawing::XShapes >& rShapes) : SdXMLGenericPageContext( rImport, nPrfx, rLName, xAttrList, rShapes ) { - const sal_Bool bHandoutMaster = rLName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sXML_handout_master)); + const sal_Bool bHandoutMaster = IsXMLToken( rLName, XML_HANDOUT_MASTER ); const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for(sal_Int16 i=0; i < nAttrCount; i++) @@ -1512,7 +1513,7 @@ SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext( SvXMLImportContext* pContext = 0; if(nPrefix == XML_NAMESPACE_STYLE - && rLocalName.equals(OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_master_page)))) + && IsXMLToken( rLocalName, XML_MASTER_PAGE ) ) { // style:masterpage inside office:styles context uno::Reference< drawing::XDrawPage > xNewMasterPage; @@ -1550,7 +1551,7 @@ SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext( } } else if(nPrefix == XML_NAMESPACE_STYLE - && rLocalName.equals(OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_handout_master)))) + && IsXMLToken( rLocalName, XML_HANDOUT_MASTER ) ) { uno::Reference< presentation::XHandoutMasterSupplier > xHandoutSupp( GetSdImport().GetModel(), uno::UNO_QUERY ); if( xHandoutSupp.is() ) @@ -1564,7 +1565,7 @@ SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext( } } else if( nPrefix == XML_NAMESPACE_DRAW - && rLocalName.equals(OUString(RTL_CONSTASCII_USTRINGPARAM(sXML_layer_set)))) + && IsXMLToken( rLocalName, XML_LAYER_SET ) ) { pContext = new SdXMLLayerSetContext( GetImport(), nPrefix, rLocalName, xAttrList ); } |