diff options
49 files changed, 1333 insertions, 1164 deletions
diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx index 62d7e70f4d91..8ec07f8b1332 100644 --- a/xmloff/source/chart/PropertyMap.hxx +++ b/xmloff/source/chart/PropertyMap.hxx @@ -2,9 +2,9 @@ * * $RCSfile: PropertyMap.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: bm $ $Date: 2001-06-05 16:11:03 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,6 +70,9 @@ #ifndef _XMLOFF_XMLKYWD_HXX #include "xmlkywd.hxx" #endif +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" +#endif #ifndef _XMLOFF_XMLTYPES_HXX #include "xmltypes.hxx" #endif @@ -218,44 +221,49 @@ const XMLPropertyMapEntry aXMLChartPropMap[] = SvXMLEnumMapEntry aXMLChartAxisArrangementEnumMap[] = { - { sXML_automatic, ::com::sun::star::chart::ChartAxisArrangeOrderType_AUTO }, - { sXML_side_by_side, ::com::sun::star::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE }, - { sXML_stagger_even, ::com::sun::star::chart::ChartAxisArrangeOrderType_STAGGER_EVEN }, - { sXML_stagger_odd, ::com::sun::star::chart::ChartAxisArrangeOrderType_STAGGER_ODD } + { ::xmloff::token::XML_AUTOMATIC, ::com::sun::star::chart::ChartAxisArrangeOrderType_AUTO }, + { ::xmloff::token::XML_SIDE_BY_SIDE, ::com::sun::star::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE }, + { ::xmloff::token::XML_STAGGER_EVEN, ::com::sun::star::chart::ChartAxisArrangeOrderType_STAGGER_EVEN }, + { ::xmloff::token::XML_STAGGER_ODD, ::com::sun::star::chart::ChartAxisArrangeOrderType_STAGGER_ODD }, + { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry aXMLChartErrorCategoryEnumMap[] = { - { sXML_none, ::com::sun::star::chart::ChartErrorCategory_NONE }, - { sXML_variance, ::com::sun::star::chart::ChartErrorCategory_VARIANCE }, - { sXML_standard_deviation, ::com::sun::star::chart::ChartErrorCategory_STANDARD_DEVIATION }, - { sXML_percentage, ::com::sun::star::chart::ChartErrorCategory_PERCENT }, - { sXML_error_margin, ::com::sun::star::chart::ChartErrorCategory_ERROR_MARGIN }, - { sXML_constant, ::com::sun::star::chart::ChartErrorCategory_CONSTANT_VALUE } + { ::xmloff::token::XML_NONE, ::com::sun::star::chart::ChartErrorCategory_NONE }, + { ::xmloff::token::XML_VARIANCE, ::com::sun::star::chart::ChartErrorCategory_VARIANCE }, + { ::xmloff::token::XML_STANDARD_DEVIATION, ::com::sun::star::chart::ChartErrorCategory_STANDARD_DEVIATION }, + { ::xmloff::token::XML_PERCENTAGE, ::com::sun::star::chart::ChartErrorCategory_PERCENT }, + { ::xmloff::token::XML_ERROR_MARGIN, ::com::sun::star::chart::ChartErrorCategory_ERROR_MARGIN }, + { ::xmloff::token::XML_CONSTANT, ::com::sun::star::chart::ChartErrorCategory_CONSTANT_VALUE }, + { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry aXMLChartRegressionCurveTypeEnumMap[] = { - { sXML_none, ::com::sun::star::chart::ChartRegressionCurveType_NONE }, - { sXML_linear, ::com::sun::star::chart::ChartRegressionCurveType_LINEAR }, - { sXML_logarithmic, ::com::sun::star::chart::ChartRegressionCurveType_LOGARITHM }, - { sXML_exponential, ::com::sun::star::chart::ChartRegressionCurveType_EXPONENTIAL }, - { sXML_polynomial, ::com::sun::star::chart::ChartRegressionCurveType_POLYNOMIAL }, - { sXML_power, ::com::sun::star::chart::ChartRegressionCurveType_POWER } + { ::xmloff::token::XML_NONE, ::com::sun::star::chart::ChartRegressionCurveType_NONE }, + { ::xmloff::token::XML_LINEAR, ::com::sun::star::chart::ChartRegressionCurveType_LINEAR }, + { ::xmloff::token::XML_LOGARITHMIC, ::com::sun::star::chart::ChartRegressionCurveType_LOGARITHM }, + { ::xmloff::token::XML_EXPONENTIAL, ::com::sun::star::chart::ChartRegressionCurveType_EXPONENTIAL }, + { ::xmloff::token::XML_POLYNOMIAL, ::com::sun::star::chart::ChartRegressionCurveType_POLYNOMIAL }, + { ::xmloff::token::XML_POWER, ::com::sun::star::chart::ChartRegressionCurveType_POWER }, + { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry aXMLChartSolidTypeEnumMap[] = { - { sXML_cuboid, ::com::sun::star::chart::ChartSolidType::RECTANGULAR_SOLID }, - { sXML_cylinder, ::com::sun::star::chart::ChartSolidType::CYLINDER }, - { sXML_cone, ::com::sun::star::chart::ChartSolidType::CONE }, - { sXML_pyramid, ::com::sun::star::chart::ChartSolidType::PYRAMID }, + { ::xmloff::token::XML_CUBOID, ::com::sun::star::chart::ChartSolidType::RECTANGULAR_SOLID }, + { ::xmloff::token::XML_CYLINDER, ::com::sun::star::chart::ChartSolidType::CYLINDER }, + { ::xmloff::token::XML_CONE, ::com::sun::star::chart::ChartSolidType::CONE }, + { ::xmloff::token::XML_PYRAMID, ::com::sun::star::chart::ChartSolidType::PYRAMID }, + { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry aXMLChartDataRowSourceTypeEnumMap[] = { - { sXML_columns, ::com::sun::star::chart::ChartDataRowSource_COLUMNS }, - { sXML_rows, ::com::sun::star::chart::ChartDataRowSource_ROWS } + { ::xmloff::token::XML_COLUMNS, ::com::sun::star::chart::ChartDataRowSource_COLUMNS }, + { ::xmloff::token::XML_ROWS, ::com::sun::star::chart::ChartDataRowSource_ROWS }, + { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; #endif // XML_SCH_CREATE_GLOBAL_MAPS diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index a2d13ff8a3ae..0447c4aa6f62 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: SchXMLChartContext.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: af $ $Date: 2001-06-08 14:57:28 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -120,6 +120,7 @@ #endif using namespace com::sun::star; +using namespace ::xmloff::token; #define SCH_BUILDCHART(xDoc) if( xDoc->hasControllersLocked() ) {\ xDoc->unlockControllers();\ @@ -143,25 +144,25 @@ enum SchXMLChartType static __FAR_DATA SvXMLEnumMapEntry aXMLChartClassMap[] = { - { sXML_line, XML_CHART_CLASS_LINE }, - { sXML_area, XML_CHART_CLASS_AREA }, - { sXML_circle, XML_CHART_CLASS_CIRCLE }, - { sXML_ring, XML_CHART_CLASS_RING }, - { sXML_scatter, XML_CHART_CLASS_SCATTER }, - { sXML_radar, XML_CHART_CLASS_RADAR }, - { sXML_bar, XML_CHART_CLASS_BAR }, - { sXML_stock, XML_CHART_CLASS_STOCK }, - { sXML_bubble, XML_CHART_CLASS_BUBBLE }, - { 0, 0 } + { XML_LINE, XML_CHART_CLASS_LINE }, + { XML_AREA, XML_CHART_CLASS_AREA }, + { XML_CIRCLE, XML_CHART_CLASS_CIRCLE }, + { XML_RING, XML_CHART_CLASS_RING }, + { XML_SCATTER, XML_CHART_CLASS_SCATTER }, + { XML_RADAR, XML_CHART_CLASS_RADAR }, + { XML_BAR, XML_CHART_CLASS_BAR }, + { XML_STOCK, XML_CHART_CLASS_STOCK }, + { XML_BUBBLE, XML_CHART_CLASS_BUBBLE }, + { XML_TOKEN_INVALID, 0 } }; static __FAR_DATA SvXMLEnumMapEntry aXMLLegendAlignmentMap[] = { - { sXML_left, chart::ChartLegendPosition_LEFT }, - { sXML_top, chart::ChartLegendPosition_TOP }, - { sXML_right, chart::ChartLegendPosition_RIGHT }, - { sXML_bottom, chart::ChartLegendPosition_BOTTOM }, - { 0, 0 } + { XML_LEFT, chart::ChartLegendPosition_LEFT }, + { XML_TOP, chart::ChartLegendPosition_TOP }, + { XML_RIGHT, chart::ChartLegendPosition_RIGHT }, + { XML_BOTTOM, chart::ChartLegendPosition_BOTTOM }, + { XML_TOKEN_INVALID, 0 } }; // ---------------------------------------- diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index 65125ccadd2f..a144dc00596b 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: SchXMLPlotAreaContext.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: bm $ $Date: 2001-06-13 13:59:26 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -131,14 +131,15 @@ #endif using namespace com::sun::star; +using namespace ::xmloff::token; static __FAR_DATA SvXMLEnumMapEntry aXMLAxisClassMap[] = { - { sXML_category, SCH_XML_AXIS_CATEGORY }, - { sXML_domain, SCH_XML_AXIS_DOMAIN }, - { sXML_value, SCH_XML_AXIS_VALUE }, - { sXML_series, SCH_XML_AXIS_SERIES }, - { 0, 0 } + { XML_CATEGORY, SCH_XML_AXIS_CATEGORY }, + { XML_DOMAIN, SCH_XML_AXIS_DOMAIN }, + { XML_VALUE, SCH_XML_AXIS_VALUE }, + { XML_SERIES, SCH_XML_AXIS_SERIES }, + { XML_TOKEN_INVALID, 0 } }; SchXMLPlotAreaContext::SchXMLPlotAreaContext( SchXMLImportHelper& rImpHelper, diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 8cc45bdf3eb5..f51e493ea0d8 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmltoken.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: dvo $ $Date: 2001-06-12 17:46:20 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1986,6 +1986,28 @@ namespace xmloff { namespace token { TOKEN( "data-source-has-labels" ), // XML_DATA_SOURCE_HAS_LABELS TOKEN( "link-data-style-to-source" ), // XML_LINK_DATA_STYLE_TO_SOURCE TOKEN( "sort-algorithm" ), // XML_SORT_ALGORITHM + TOKEN( "straight-line" ), // XML_STRAIGHT_LINE + TOKEN( "angled-line" ), // XML_ANGLED_LINE + TOKEN( "angled-connector-line" ), // XML_ANGLED_CONNECTOR_LINE + + TOKEN( "application/x-www-form-urlencoded" ), // XML_APPLICATION_X_WWW_FORM_URLENCODED + TOKEN( "multipart/formdata" ), // XML_MULTIPART_FORMDATA + TOKEN( "application/text" ), // XML_APPLICATION_TEXT + TOKEN( "get" ), // XML_GET + TOKEN( "post" ), // XML_POST + TOKEN( "query" ), // XML_QUERY + TOKEN( "parent" ), // XML_PARENT + TOKEN( "records" ), // XML_RECORDS + TOKEN( "push" ), // XML_PUSH + TOKEN( "submit" ), // XML_SUBMIT + TOKEN( "reset" ), // XML_RESET + TOKEN( "value-list" ), // XML_VALUE_LIST + TOKEN( "sql" ), // XML_SQL + TOKEN( "sql-pass-through" ), // XML_SQL_PASS_THROUGH + TOKEN( "table-fields" ), // XML_TABLE_FIELDS + TOKEN( "unchecked" ), // XML_UNCHECKED + TOKEN( "checked" ), // XML_CHECKED + TOKEN( "unknown" ), // XML_UNKNOWN { 0, NULL, NULL } // XML_TOKEN_END }; diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index 5ead806548bf..9b5fe5408e81 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmluconv.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: mib $ $Date: 2001-05-18 13:46:50 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -125,6 +125,7 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::text; using namespace com::sun::star::style; +using namespace ::xmloff::token; const sal_Int8 XML_MAXDIGITSCOUNT_TIME = 11; const sal_Int8 XML_MAXDIGITSCOUNT_DATETIME = 6; @@ -536,11 +537,11 @@ void SvXMLUnitConverter::convertMeasurePx( OUStringBuffer& rBuffer, */ sal_Bool SvXMLUnitConverter::convertEnum( sal_uInt16& rEnum, const OUString& rValue, - const SvXMLEnumMapEntry *pMap ) + const SvXMLEnumStringMapEntry *pMap ) { while( pMap->pName ) { - if( rValue.compareToAscii( pMap->pName ) == 0 ) + if( rValue.equalsAsciiL( pMap->pName, pMap->nNameLength ) ) { rEnum = pMap->nValue; return sal_True; @@ -551,6 +552,25 @@ sal_Bool SvXMLUnitConverter::convertEnum( sal_uInt16& rEnum, return sal_False; } +/** convert string to enum using given token map, if the enum is + not found in the map, this method will return false */ +sal_Bool SvXMLUnitConverter::convertEnum( + sal_uInt16& rEnum, + const OUString& rValue, + const SvXMLEnumMapEntry *pMap ) +{ + while( pMap->eToken != XML_TOKEN_INVALID ) + { + if( IsXMLToken( rValue, pMap->eToken ) ) + { + rEnum = pMap->nValue; + return sal_True; + } + pMap++; + } + return sal_False; +} + /** convert enum to string using given enum map with optional default string. If the enum is not found in the map, this method will either use the given default or return @@ -558,7 +578,7 @@ sal_Bool SvXMLUnitConverter::convertEnum( sal_uInt16& rEnum, */ sal_Bool SvXMLUnitConverter::convertEnum( OUStringBuffer& rBuffer, sal_uInt16 nValue, - const SvXMLEnumMapEntry *pMap, + const SvXMLEnumStringMapEntry *pMap, sal_Char * pDefault /* = NULL */ ) { const sal_Char *pStr = pDefault; @@ -582,6 +602,38 @@ sal_Bool SvXMLUnitConverter::convertEnum( OUStringBuffer& rBuffer, return NULL != pStr; } +/** convert enum to string using given token map with an optional + default token. If the enum is not found in the map, + this method will either use the given default or return + false if no default is set */ +sal_Bool SvXMLUnitConverter::convertEnum( + OUStringBuffer& rBuffer, + sal_uInt16 nValue, + const SvXMLEnumMapEntry *pMap, + enum XMLTokenEnum eDefault) +{ + enum XMLTokenEnum eTok = eDefault; + + while( pMap->eToken != XML_TOKEN_INVALID ) + { + if( pMap->nValue == nValue ) + { + eTok = pMap->eToken; + break; + } + pMap++; + } + + // the map may have contained XML_TOKEN_INVALID + if( eTok == XML_TOKEN_INVALID ) + eTok = eDefault; + + if( eTok != XML_TOKEN_INVALID ) + rBuffer.append( GetXMLToken(eTok) ); + + return (eTok != XML_TOKEN_INVALID); +} + int lcl_gethex( int nChar ) { if( nChar >= '0' && nChar <= '9' ) diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx index 41d916727157..e0cdc5e524e7 100644 --- a/xmloff/source/draw/animexp.cxx +++ b/xmloff/source/draw/animexp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: animexp.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: cl $ $Date: 2001-05-23 11:55:10 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -117,61 +117,62 @@ 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; SvXMLEnumMapEntry aXML_AnimationEffect_EnumMap[] = { - { sXML_none, EK_none }, - { sXML_fade, EK_fade }, - { sXML_move, EK_move }, - { sXML_stripes, EK_stripes }, - { sXML_open, EK_open }, - { sXML_close, EK_close }, - { sXML_dissolve, EK_dissolve }, - { sXML_wavyline, EK_wavyline }, - { sXML_random, EK_random }, - { sXML_lines, EK_lines }, - { sXML_laser, EK_laser }, - { sXML_appear, EK_appear }, - { sXML_hide, EK_hide }, - { sXML_move_short, EK_move_short }, - { sXML_checkerboard,EK_checkerboard }, - { sXML_rotate, EK_rotate }, - { sXML_stretch, EK_stretch }, - { NULL, 0 } + { XML_NONE, EK_none }, + { XML_FADE, EK_fade }, + { XML_MOVE, EK_move }, + { XML_STRIPES, EK_stripes }, + { XML_OPEN, EK_open }, + { XML_CLOSE, EK_close }, + { XML_DISSOLVE, EK_dissolve }, + { XML_WAVYLINE, EK_wavyline }, + { XML_RANDOM, EK_random }, + { XML_LINES, EK_lines }, + { XML_LASER, EK_laser }, + { XML_APPEAR, EK_appear }, + { XML_HIDE, EK_hide }, + { XML_MOVE_SHORT, EK_move_short }, + { XML_CHECKERBOARD, EK_checkerboard }, + { XML_ROTATE, EK_rotate }, + { XML_STRETCH, EK_stretch }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry aXML_AnimationDirection_EnumMap[] = { - { sXML_none, ED_none }, - { sXML_from_left, ED_from_left }, - { sXML_from_top, ED_from_top }, - { sXML_from_right, ED_from_right }, - { sXML_from_bottom, ED_from_bottom }, - { sXML_from_center, ED_from_center }, - { sXML_from_upper_left, ED_from_upperleft }, - { sXML_from_upper_right,ED_from_upperright }, - { sXML_from_lower_left, ED_from_lowerleft }, - { sXML_from_lower_right,ED_from_lowerright }, - { sXML_to_left, ED_to_left }, - { sXML_to_top, ED_to_top }, - { sXML_to_right, ED_to_right }, - { sXML_to_bottom, ED_to_bottom }, - { sXML_to_upper_left, ED_to_upperleft }, - { sXML_to_upper_right, ED_to_upperright }, - { sXML_to_lower_right, ED_to_lowerright }, - { sXML_to_lower_left, ED_to_lowerleft }, - { sXML_path, ED_path }, - { sXML_spiral_inward_left, ED_spiral_inward_left }, - { sXML_spiral_inward_right,ED_spiral_inward_right }, - { sXML_spiral_outward_left, ED_spiral_outward_left }, - { sXML_spiral_outward_right, ED_spiral_outward_right }, - { sXML_vertical, ED_vertical }, - { sXML_horizontal, ED_horizontal }, - { sXML_to_center, ED_to_center }, - { sXML_clockwise, ED_clockwise }, - { sXML_counter_clockwise,ED_cclockwise }, - { NULL, 0 } + { XML_NONE, ED_none }, + { XML_FROM_LEFT, ED_from_left }, + { XML_FROM_TOP, ED_from_top }, + { XML_FROM_RIGHT, ED_from_right }, + { XML_FROM_BOTTOM, ED_from_bottom }, + { XML_FROM_CENTER, ED_from_center }, + { XML_FROM_UPPER_LEFT, ED_from_upperleft }, + { XML_FROM_UPPER_RIGHT, ED_from_upperright }, + { XML_FROM_LOWER_LEFT, ED_from_lowerleft }, + { XML_FROM_LOWER_RIGHT, ED_from_lowerright }, + { XML_TO_LEFT, ED_to_left }, + { XML_TO_TOP, ED_to_top }, + { XML_TO_RIGHT, ED_to_right }, + { XML_TO_BOTTOM, ED_to_bottom }, + { XML_TO_UPPER_LEFT, ED_to_upperleft }, + { XML_TO_UPPER_RIGHT, ED_to_upperright }, + { XML_TO_LOWER_RIGHT, ED_to_lowerright }, + { XML_TO_LOWER_LEFT, ED_to_lowerleft }, + { XML_PATH, ED_path }, + { XML_SPIRAL_INWARD_LEFT, ED_spiral_inward_left }, + { XML_SPIRAL_INWARD_RIGHT,ED_spiral_inward_right }, + { XML_SPIRAL_OUTWARD_LEFT, ED_spiral_outward_left }, + { XML_SPIRAL_OUTWARD_RIGHT, ED_spiral_outward_right }, + { XML_VERTICAL, ED_vertical }, + { XML_HORIZONTAL, ED_horizontal }, + { XML_TO_CENTER, ED_to_center }, + { XML_CLOCKWISE, ED_clockwise }, + { XML_COUNTER_CLOCKWISE,ED_cclockwise }, + { XML_TOKEN_INVALID, 0 } }; const struct Effect @@ -314,10 +315,10 @@ void SdXMLImplSetEffect( AnimationEffect eEffect, XMLEffect& eKind, XMLEffectDir SvXMLEnumMapEntry aXML_AnimationSpeed_EnumMap[] = { - { sXML_slow, AnimationSpeed_SLOW }, - { sXML_medium, AnimationSpeed_MEDIUM }, - { sXML_fast, AnimationSpeed_FAST }, - { NULL, 0 } + { XML_SLOW, AnimationSpeed_SLOW }, + { XML_MEDIUM, AnimationSpeed_MEDIUM }, + { XML_FAST, AnimationSpeed_FAST }, + { XML_TOKEN_INVALID, 0 } }; enum XMLActionKind diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index 716ff74f2d23..df25330d4ab8 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: eventimp.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: sab $ $Date: 2001-03-16 14:35:56 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -123,26 +123,27 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::document; using namespace ::com::sun::star::container; using namespace ::com::sun::star::presentation; +using namespace ::xmloff::token; /////////////////////////////////////////////////////////////////////// SvXMLEnumMapEntry __READONLY_DATA aXML_EventActions_EnumMap[] = { - { sXML_none, ClickAction_NONE }, - { sXML_previous_page, ClickAction_PREVPAGE }, - { sXML_next_page, ClickAction_NEXTPAGE }, - { sXML_first_page, ClickAction_FIRSTPAGE }, - { sXML_last_page, ClickAction_LASTPAGE }, - { sXML_hide, ClickAction_INVISIBLE }, - { sXML_stop, ClickAction_STOPPRESENTATION }, - { sXML_execute, ClickAction_PROGRAM }, - { sXML_show, ClickAction_BOOKMARK }, - { sXML_show, ClickAction_DOCUMENT }, - { sXML_execute_macro, ClickAction_MACRO }, - { sXML_verb, ClickAction_VERB }, - { sXML_fade_out, ClickAction_VANISH }, - { sXML_sound, ClickAction_SOUND }, - { 0, 0 } + { XML_NONE, ClickAction_NONE }, + { XML_PREVIOUS_PAGE, ClickAction_PREVPAGE }, + { XML_NEXT_PAGE, ClickAction_NEXTPAGE }, + { XML_FIRST_PAGE, ClickAction_FIRSTPAGE }, + { XML_LAST_PAGE, ClickAction_LASTPAGE }, + { XML_HIDE, ClickAction_INVISIBLE }, + { XML_STOP, ClickAction_STOPPRESENTATION }, + { XML_EXECUTE, ClickAction_PROGRAM }, + { XML_SHOW, ClickAction_BOOKMARK }, + { XML_SHOW, ClickAction_DOCUMENT }, + { XML_EXECUTE_MACRO, ClickAction_MACRO }, + { XML_VERB, ClickAction_VERB }, + { XML_FADE_OUT, ClickAction_VANISH }, + { XML_SOUND, ClickAction_SOUND }, + { XML_TOKEN_INVALID, 0 } }; /////////////////////////////////////////////////////////////////////// diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index b7870e091efd..ace065ca895b 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sdpropls.cxx,v $ * - * $Revision: 1.40 $ + * $Revision: 1.41 $ * - * last change: $Author: aw $ $Date: 2001-06-12 13:21:57 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -219,6 +219,7 @@ using namespace ::rtl; using namespace ::com::sun::star; +using namespace ::xmloff::token; ////////////////////////////////////////////////////////////////////////////// // entry list for graphic properties @@ -447,110 +448,110 @@ const XMLPropertyMapEntry aXMLSDPresPageProps[] = SvXMLEnumMapEntry aXML_LineStyle_EnumMap[] = { - { sXML_none, drawing::LineStyle_NONE }, - { sXML_solid, drawing::LineStyle_SOLID }, - { sXML_dash, drawing::LineStyle_DASH }, - { NULL, 0 } + { XML_NONE, drawing::LineStyle_NONE }, + { XML_SOLID, drawing::LineStyle_SOLID }, + { XML_DASH, drawing::LineStyle_DASH }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry aXML_LineJoint_EnumMap[] = { - { sXML_none, drawing::LineJoint_NONE }, - { sXML_miter, drawing::LineJoint_MITER }, - { sXML_round, drawing::LineJoint_ROUND }, - { sXML_bevel, drawing::LineJoint_BEVEL }, - { sXML_middle, drawing::LineJoint_MIDDLE }, - { NULL, 0 } + { XML_NONE, drawing::LineJoint_NONE }, + { XML_MITER, drawing::LineJoint_MITER }, + { XML_ROUND, drawing::LineJoint_ROUND }, + { XML_BEVEL, drawing::LineJoint_BEVEL }, + { XML_MIDDLE, drawing::LineJoint_MIDDLE }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry aXML_FillStyle_EnumMap[] = { - { sXML_none, drawing::FillStyle_NONE }, - { sXML_solid, drawing::FillStyle_SOLID }, - { sXML_bitmap, drawing::FillStyle_BITMAP }, - { sXML_gradient,drawing::FillStyle_GRADIENT }, - { sXML_hatch, drawing::FillStyle_HATCH }, - { NULL, 0 } + { XML_NONE, drawing::FillStyle_NONE }, + { XML_SOLID, drawing::FillStyle_SOLID }, + { XML_BITMAP, drawing::FillStyle_BITMAP }, + { XML_GRADIENT, drawing::FillStyle_GRADIENT }, + { XML_HATCH, drawing::FillStyle_HATCH }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry aXML_PresChange_EnumMap[] = { - { sXML_manual, 0 }, - { sXML_automatic, 1 }, - { sXML_semi_automatic, 2 }, - { NULL, 0 } + { XML_MANUAL, 0 }, + { XML_AUTOMATIC, 1 }, + { XML_SEMI_AUTOMATIC, 2 }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry aXML_TransSpeed_EnumMap[] = { - { sXML_fast, presentation::AnimationSpeed_FAST }, - { sXML_medium, presentation::AnimationSpeed_MEDIUM }, - { sXML_slow, presentation::AnimationSpeed_SLOW }, - { NULL, 0 } + { XML_FAST, presentation::AnimationSpeed_FAST }, + { XML_MEDIUM, presentation::AnimationSpeed_MEDIUM }, + { XML_SLOW, presentation::AnimationSpeed_SLOW }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry aXML_FadeEffect_EnumMap[] = { - { sXML_none, presentation::FadeEffect_NONE }, - { sXML_fade_from_left, presentation::FadeEffect_FADE_FROM_LEFT }, - { sXML_fade_from_top, presentation::FadeEffect_FADE_FROM_TOP }, - { sXML_fade_from_right, presentation::FadeEffect_FADE_FROM_RIGHT }, - { sXML_fade_from_bottom, presentation::FadeEffect_FADE_FROM_BOTTOM }, - { sXML_fade_to_center, presentation::FadeEffect_FADE_TO_CENTER }, - { sXML_fade_from_center, presentation::FadeEffect_FADE_FROM_CENTER }, - { sXML_move_from_left, presentation::FadeEffect_MOVE_FROM_LEFT }, - { sXML_move_from_top, presentation::FadeEffect_MOVE_FROM_TOP }, - { sXML_move_from_right, presentation::FadeEffect_MOVE_FROM_RIGHT }, - { sXML_move_from_bottom, presentation::FadeEffect_MOVE_FROM_BOTTOM }, - { sXML_roll_from_left, presentation::FadeEffect_ROLL_FROM_LEFT }, - { sXML_roll_from_right, presentation::FadeEffect_ROLL_FROM_RIGHT }, - { sXML_roll_from_bottom, presentation::FadeEffect_ROLL_FROM_BOTTOM }, - { sXML_vertical_stripes, presentation::FadeEffect_VERTICAL_STRIPES }, - { sXML_horizontal_stripes, presentation::FadeEffect_HORIZONTAL_STRIPES }, - { sXML_clockwise, presentation::FadeEffect_CLOCKWISE }, - { sXML_counterclockwise, presentation::FadeEffect_COUNTERCLOCKWISE }, - { sXML_fade_from_upperleft, presentation::FadeEffect_FADE_FROM_UPPERLEFT }, - { sXML_fade_from_upperright,presentation::FadeEffect_FADE_FROM_UPPERRIGHT }, - { sXML_fade_from_lowerleft, presentation::FadeEffect_FADE_FROM_LOWERLEFT }, - { sXML_fade_from_lowerright,presentation::FadeEffect_FADE_FROM_LOWERRIGHT }, - { sXML_close_vertical, presentation::FadeEffect_CLOSE_VERTICAL }, - { sXML_close_horizontal, presentation::FadeEffect_CLOSE_HORIZONTAL }, - { sXML_open_vertical, presentation::FadeEffect_OPEN_VERTICAL }, - { sXML_open_horizontal, presentation::FadeEffect_OPEN_HORIZONTAL }, - { sXML_spiralin_left, presentation::FadeEffect_SPIRALIN_LEFT }, - { sXML_spiralin_right, presentation::FadeEffect_SPIRALIN_RIGHT }, - { sXML_spiralout_left, presentation::FadeEffect_SPIRALOUT_LEFT }, - { sXML_spiralout_right, presentation::FadeEffect_SPIRALOUT_RIGHT }, - { sXML_dissolve, presentation::FadeEffect_DISSOLVE }, - { sXML_wavyline_from_left, presentation::FadeEffect_WAVYLINE_FROM_LEFT }, - { sXML_wavyline_from_top, presentation::FadeEffect_WAVYLINE_FROM_TOP }, - { sXML_wavyline_from_right, presentation::FadeEffect_WAVYLINE_FROM_RIGHT }, - { sXML_wavyline_from_bottom,presentation::FadeEffect_WAVYLINE_FROM_BOTTOM }, - { sXML_random, presentation::FadeEffect_RANDOM }, - { sXML_stretch_from_left, presentation::FadeEffect_STRETCH_FROM_LEFT }, - { sXML_stretch_from_top, presentation::FadeEffect_STRETCH_FROM_TOP }, - { sXML_stretch_from_right, presentation::FadeEffect_STRETCH_FROM_RIGHT }, - { sXML_stretch_from_bottom, presentation::FadeEffect_STRETCH_FROM_BOTTOM }, - { sXML_vertical_lines, presentation::FadeEffect_VERTICAL_LINES }, - { sXML_horizontal_lines, presentation::FadeEffect_HORIZONTAL_LINES }, - { NULL, 0 } + { XML_NONE, presentation::FadeEffect_NONE }, + { XML_FADE_FROM_LEFT, presentation::FadeEffect_FADE_FROM_LEFT }, + { XML_FADE_FROM_TOP, presentation::FadeEffect_FADE_FROM_TOP }, + { XML_FADE_FROM_RIGHT, presentation::FadeEffect_FADE_FROM_RIGHT }, + { XML_FADE_FROM_BOTTOM, presentation::FadeEffect_FADE_FROM_BOTTOM }, + { XML_FADE_TO_CENTER, presentation::FadeEffect_FADE_TO_CENTER }, + { XML_FADE_FROM_CENTER, presentation::FadeEffect_FADE_FROM_CENTER }, + { XML_MOVE_FROM_LEFT, presentation::FadeEffect_MOVE_FROM_LEFT }, + { XML_MOVE_FROM_TOP, presentation::FadeEffect_MOVE_FROM_TOP }, + { XML_MOVE_FROM_RIGHT, presentation::FadeEffect_MOVE_FROM_RIGHT }, + { XML_MOVE_FROM_BOTTOM, presentation::FadeEffect_MOVE_FROM_BOTTOM }, + { XML_ROLL_FROM_LEFT, presentation::FadeEffect_ROLL_FROM_LEFT }, + { XML_ROLL_FROM_RIGHT, presentation::FadeEffect_ROLL_FROM_RIGHT }, + { XML_ROLL_FROM_BOTTOM, presentation::FadeEffect_ROLL_FROM_BOTTOM }, + { XML_VERTICAL_STRIPES, presentation::FadeEffect_VERTICAL_STRIPES }, + { XML_HORIZONTAL_STRIPES, presentation::FadeEffect_HORIZONTAL_STRIPES }, + { XML_CLOCKWISE, presentation::FadeEffect_CLOCKWISE }, + { XML_COUNTERCLOCKWISE, presentation::FadeEffect_COUNTERCLOCKWISE }, + { XML_FADE_FROM_UPPERLEFT, presentation::FadeEffect_FADE_FROM_UPPERLEFT }, + { XML_FADE_FROM_UPPERRIGHT,presentation::FadeEffect_FADE_FROM_UPPERRIGHT }, + { XML_FADE_FROM_LOWERLEFT, presentation::FadeEffect_FADE_FROM_LOWERLEFT }, + { XML_FADE_FROM_LOWERRIGHT,presentation::FadeEffect_FADE_FROM_LOWERRIGHT }, + { XML_CLOSE_VERTICAL, presentation::FadeEffect_CLOSE_VERTICAL }, + { XML_CLOSE_HORIZONTAL, presentation::FadeEffect_CLOSE_HORIZONTAL }, + { XML_OPEN_VERTICAL, presentation::FadeEffect_OPEN_VERTICAL }, + { XML_OPEN_HORIZONTAL, presentation::FadeEffect_OPEN_HORIZONTAL }, + { XML_SPIRALIN_LEFT, presentation::FadeEffect_SPIRALIN_LEFT }, + { XML_SPIRALIN_RIGHT, presentation::FadeEffect_SPIRALIN_RIGHT }, + { XML_SPIRALOUT_LEFT, presentation::FadeEffect_SPIRALOUT_LEFT }, + { XML_SPIRALOUT_RIGHT, presentation::FadeEffect_SPIRALOUT_RIGHT }, + { XML_DISSOLVE, presentation::FadeEffect_DISSOLVE }, + { XML_WAVYLINE_FROM_LEFT, presentation::FadeEffect_WAVYLINE_FROM_LEFT }, + { XML_WAVYLINE_FROM_TOP, presentation::FadeEffect_WAVYLINE_FROM_TOP }, + { XML_WAVYLINE_FROM_RIGHT, presentation::FadeEffect_WAVYLINE_FROM_RIGHT }, + { XML_WAVYLINE_FROM_BOTTOM,presentation::FadeEffect_WAVYLINE_FROM_BOTTOM }, + { XML_RANDOM, presentation::FadeEffect_RANDOM }, + { XML_STRETCH_FROM_LEFT, presentation::FadeEffect_STRETCH_FROM_LEFT }, + { XML_STRETCH_FROM_TOP, presentation::FadeEffect_STRETCH_FROM_TOP }, + { XML_STRETCH_FROM_RIGHT, presentation::FadeEffect_STRETCH_FROM_RIGHT }, + { XML_STRETCH_FROM_BOTTOM, presentation::FadeEffect_STRETCH_FROM_BOTTOM }, + { XML_VERTICAL_LINES, presentation::FadeEffect_VERTICAL_LINES }, + { XML_HORIZONTAL_LINES, presentation::FadeEffect_HORIZONTAL_LINES }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry aXML_ConnectionKind_EnumMap[] = { - { sXML_standard, drawing::ConnectorType_STANDARD }, - { sXML_curve, drawing::ConnectorType_CURVE }, - { sXML_line, drawing::ConnectorType_LINE }, - { sXML_lines, drawing::ConnectorType_LINES }, - { NULL, 0 } + { XML_STANDARD, drawing::ConnectorType_STANDARD }, + { XML_CURVE, drawing::ConnectorType_CURVE }, + { XML_LINE, drawing::ConnectorType_LINE }, + { XML_LINES, drawing::ConnectorType_LINES }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry aXML_BitmapMode_EnumMap[] = { - { sXML_repeat, drawing::BitmapMode_REPEAT }, - { sXML_stretch, drawing::BitmapMode_STRETCH }, - { sXML_background_no_repeat, drawing::BitmapMode_NO_REPEAT }, - { NULL, 0 } + { XML_REPEAT, drawing::BitmapMode_REPEAT }, + { XML_STRETCH, drawing::BitmapMode_STRETCH }, + { XML_BACKGROUND_NO_REPEAT, drawing::BitmapMode_NO_REPEAT }, + { XML_TOKEN_INVALID, 0 } }; ////////////////////////////////////////////////////////////////////////////// @@ -558,222 +559,222 @@ SvXMLEnumMapEntry aXML_BitmapMode_EnumMap[] = SvXMLEnumMapEntry aXML_NormalsKind_EnumMap[] = { - { sXML_object, drawing::NormalsKind_SPECIFIC }, - { sXML_flat, drawing::NormalsKind_FLAT }, - { sXML_sphere, drawing::NormalsKind_SPHERE }, - { NULL, 0 } + { XML_OBJECT, drawing::NormalsKind_SPECIFIC }, + { XML_FLAT, drawing::NormalsKind_FLAT }, + { XML_SPHERE, drawing::NormalsKind_SPHERE }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry aXML_TexGenerationX_EnumMap[] = { - { sXML_object, drawing::TextureProjectionMode_OBJECTSPECIFIC }, - { sXML_parallel, drawing::TextureProjectionMode_PARALLEL }, - { sXML_sphere, drawing::TextureProjectionMode_SPHERE }, - { NULL, 0 } + { XML_OBJECT, drawing::TextureProjectionMode_OBJECTSPECIFIC }, + { XML_PARALLEL, drawing::TextureProjectionMode_PARALLEL }, + { XML_SPHERE, drawing::TextureProjectionMode_SPHERE }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry aXML_TexGenerationY_EnumMap[] = { - { sXML_object, drawing::TextureProjectionMode_OBJECTSPECIFIC }, - { sXML_parallel, drawing::TextureProjectionMode_PARALLEL }, - { sXML_sphere, drawing::TextureProjectionMode_SPHERE }, - { NULL, 0 } + { XML_OBJECT, drawing::TextureProjectionMode_OBJECTSPECIFIC }, + { XML_PARALLEL, drawing::TextureProjectionMode_PARALLEL }, + { XML_SPHERE, drawing::TextureProjectionMode_SPHERE }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry aXML_TexKind_EnumMap[] = { - { sXML_luminance, drawing::TextureKind_LUMINANCE }, -// { sXML_intensity, drawing::TextureKind_INTENSITY }, - { sXML_color, drawing::TextureKind_COLOR }, - { NULL, 0 } + { XML_LUMINANCE, drawing::TextureKind_LUMINANCE }, +// { XML_INTENSITY, drawing::TextureKind_INTENSITY }, + { XML_COLOR, drawing::TextureKind_COLOR }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry aXML_TexMode_EnumMap[] = { - { sXML_replace, drawing::TextureMode_REPLACE }, - { sXML_modulate, drawing::TextureMode_MODULATE }, - { sXML_blend, drawing::TextureMode_BLEND }, - { NULL, 0 } + { XML_REPLACE, drawing::TextureMode_REPLACE }, + { XML_MODULATE, drawing::TextureMode_MODULATE }, + { XML_BLEND, drawing::TextureMode_BLEND }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry aXML_RefPoint_EnumMap[] = { - { sXML_top_left, drawing::RectanglePoint_LEFT_TOP }, - { sXML_top, drawing::RectanglePoint_MIDDLE_TOP }, - { sXML_top_right, drawing::RectanglePoint_RIGHT_TOP }, - { sXML_left, drawing::RectanglePoint_LEFT_MIDDLE }, - { sXML_center, drawing::RectanglePoint_MIDDLE_MIDDLE }, - { sXML_right, drawing::RectanglePoint_RIGHT_MIDDLE }, - { sXML_bottom_left, drawing::RectanglePoint_LEFT_BOTTOM }, - { sXML_bottom, drawing::RectanglePoint_MIDDLE_BOTTOM }, - { sXML_bottom_right,drawing::RectanglePoint_RIGHT_BOTTOM }, - { NULL, 0 } + { XML_TOP_LEFT, drawing::RectanglePoint_LEFT_TOP }, + { XML_TOP, drawing::RectanglePoint_MIDDLE_TOP }, + { XML_TOP_RIGHT, drawing::RectanglePoint_RIGHT_TOP }, + { XML_LEFT, drawing::RectanglePoint_LEFT_MIDDLE }, + { XML_CENTER, drawing::RectanglePoint_MIDDLE_MIDDLE }, + { XML_RIGHT, drawing::RectanglePoint_RIGHT_MIDDLE }, + { XML_BOTTOM_LEFT, drawing::RectanglePoint_LEFT_BOTTOM }, + { XML_BOTTOM, drawing::RectanglePoint_MIDDLE_BOTTOM }, + { XML_BOTTOM_RIGHT, drawing::RectanglePoint_RIGHT_BOTTOM }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry aXML_CircleKind_EnumMap[] = { - { sXML_full, drawing::CircleKind_FULL }, - { sXML_section, drawing::CircleKind_SECTION }, - { sXML_cut, drawing::CircleKind_CUT }, - { sXML_arc, drawing::CircleKind_ARC }, - { NULL, 0 } + { XML_FULL, drawing::CircleKind_FULL }, + { XML_SECTION, drawing::CircleKind_SECTION }, + { XML_CUT, drawing::CircleKind_CUT }, + { XML_ARC, drawing::CircleKind_ARC }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry aXML_WritingMode_EnumMap[] = { - { sXML_tb_rl, text::WritingMode_TB_RL }, - { sXML_lr_tb, text::WritingMode_LR_TB }, - { NULL, 0 } + { XML_TB_RL, text::WritingMode_TB_RL }, + { XML_LR_TB, text::WritingMode_LR_TB }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_TextAnimation_Enum[] = { - { sXML_none, drawing::TextAnimationKind_NONE }, - { sXML_blinking, drawing::TextAnimationKind_BLINK }, // will be filtered - { sXML_scroll, drawing::TextAnimationKind_SCROLL }, - { sXML_alternate, drawing::TextAnimationKind_ALTERNATE }, - { sXML_slide, drawing::TextAnimationKind_SLIDE }, - { 0, 0 } + { XML_NONE, drawing::TextAnimationKind_NONE }, + { XML_BLINKING, drawing::TextAnimationKind_BLINK }, // will be filtered + { XML_SCROLL, drawing::TextAnimationKind_SCROLL }, + { XML_ALTERNATE, drawing::TextAnimationKind_ALTERNATE }, + { XML_SLIDE, drawing::TextAnimationKind_SLIDE }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_TextAnimation_Blinking_Enum[] = { - { sXML_false, drawing::TextAnimationKind_NONE }, - { sXML_true, drawing::TextAnimationKind_BLINK }, - { sXML_false, drawing::TextAnimationKind_SCROLL }, - { sXML_false, drawing::TextAnimationKind_ALTERNATE }, - { sXML_false, drawing::TextAnimationKind_SLIDE }, - { 0, 0 } + { XML_FALSE, drawing::TextAnimationKind_NONE }, + { XML_TRUE, drawing::TextAnimationKind_BLINK }, + { XML_FALSE, drawing::TextAnimationKind_SCROLL }, + { XML_FALSE, drawing::TextAnimationKind_ALTERNATE }, + { XML_FALSE, drawing::TextAnimationKind_SLIDE }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_TextAnimationDirection_Enum[] = { - { sXML_left, drawing::TextAnimationDirection_LEFT }, - { sXML_right, drawing::TextAnimationDirection_RIGHT }, // will be filtered - { sXML_up, drawing::TextAnimationDirection_UP }, - { sXML_down, drawing::TextAnimationDirection_DOWN }, - { 0, 0 } + { XML_LEFT, drawing::TextAnimationDirection_LEFT }, + { XML_RIGHT, drawing::TextAnimationDirection_RIGHT }, // will be filtered + { XML_UP, drawing::TextAnimationDirection_UP }, + { XML_DOWN, drawing::TextAnimationDirection_DOWN }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_TextAlign_Enum[] = { - { sXML_left, drawing::TextHorizontalAdjust_LEFT }, - { sXML_center, drawing::TextHorizontalAdjust_CENTER }, - { sXML_right, drawing::TextHorizontalAdjust_RIGHT }, - { sXML_justify, drawing::TextHorizontalAdjust_BLOCK }, - { 0, 0 } + { XML_LEFT, drawing::TextHorizontalAdjust_LEFT }, + { XML_CENTER, drawing::TextHorizontalAdjust_CENTER }, + { XML_RIGHT, drawing::TextHorizontalAdjust_RIGHT }, + { XML_JUSTIFY, drawing::TextHorizontalAdjust_BLOCK }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_VerticalAlign_Enum[] = { - { sXML_top, drawing::TextVerticalAdjust_TOP }, - { sXML_middle, drawing::TextVerticalAdjust_CENTER }, - { sXML_bottom, drawing::TextVerticalAdjust_BOTTOM }, - { 0, 0 } + { XML_TOP, drawing::TextVerticalAdjust_TOP }, + { XML_MIDDLE, drawing::TextVerticalAdjust_CENTER }, + { XML_BOTTOM, drawing::TextVerticalAdjust_BOTTOM }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_FitToSize_Enum[] = { - { sXML_false, drawing::TextFitToSizeType_NONE }, - { sXML_true, drawing::TextFitToSizeType_PROPORTIONAL }, - { sXML_true, drawing::TextFitToSizeType_ALLLINES }, - { sXML_true, drawing::TextFitToSizeType_RESIZEATTR }, - { 0, 0 } + { XML_FALSE, drawing::TextFitToSizeType_NONE }, + { XML_TRUE, drawing::TextFitToSizeType_PROPORTIONAL }, + { XML_TRUE, drawing::TextFitToSizeType_ALLLINES }, + { XML_TRUE, drawing::TextFitToSizeType_RESIZEATTR }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_MeasureUnit_Enum[] = { - { sXML_automatic, 0 }, - { sXML_unit_mm, 1 }, - { sXML_unit_cm, 2 }, - { sXML_unit_m, 3 }, - { sXML_unit_km, 4 }, - { sXML_unit_pt, 6 }, - { sXML_unit_pc, 7 }, - { sXML_unit_inch, 8 }, - { sXML_unit_foot, 9 }, - { sXML_unit_miles, 10 }, - { 0,0 } + { XML_AUTOMATIC, 0 }, + { XML_UNIT_MM, 1 }, + { XML_UNIT_CM, 2 }, + { XML_UNIT_M, 3 }, + { XML_UNIT_KM, 4 }, + { XML_UNIT_PT, 6 }, + { XML_UNIT_PC, 7 }, + { XML_UNIT_INCH, 8 }, + { XML_UNIT_FOOT, 9 }, + { XML_UNIT_MILES, 10 }, + { XML_TOKEN_INVALID,0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_Measure_HAlign_Enum[] = { - { sXML_automatic, drawing::MeasureTextHorzPos_AUTO }, - { sXML_left_outside, drawing::MeasureTextHorzPos_LEFTOUTSIDE }, - { sXML_inside, drawing::MeasureTextHorzPos_INSIDE }, - { sXML_right_outside, drawing::MeasureTextHorzPos_RIGHTOUTSIDE}, - { 0,0 } + { XML_AUTOMATIC, drawing::MeasureTextHorzPos_AUTO }, + { XML_LEFT_OUTSIDE, drawing::MeasureTextHorzPos_LEFTOUTSIDE }, + { XML_INSIDE, drawing::MeasureTextHorzPos_INSIDE }, + { XML_RIGHT_OUTSIDE, drawing::MeasureTextHorzPos_RIGHTOUTSIDE}, + { XML_TOKEN_INVALID,0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_Measure_VAlign_Enum[] = { - { sXML_automatic, drawing::MeasureTextVertPos_AUTO }, - { sXML_above, drawing::MeasureTextVertPos_EAST }, - { sXML_below, drawing::MeasureTextVertPos_WEST }, - { sXML_center, drawing::MeasureTextVertPos_CENTERED }, - { 0,0 } + { XML_AUTOMATIC, drawing::MeasureTextVertPos_AUTO }, + { XML_ABOVE, drawing::MeasureTextVertPos_EAST }, + { XML_BELOW, drawing::MeasureTextVertPos_WEST }, + { XML_CENTER, drawing::MeasureTextVertPos_CENTERED }, + { XML_TOKEN_INVALID,0 } }; // #FontWork# SvXMLEnumMapEntry __READONLY_DATA pXML_Fontwork_Style_Enum[] = { - { sXML_rotate, 0 }, //XFT_ROTATE, - { sXML_upright, 1 }, //XFT_UPRIGHT, - { sXML_slant_x, 2 }, //XFT_SLANTX, - { sXML_slant_y, 3 }, //XFT_SLANTY, - { sXML_none, 4 }, //XFT_NONE - { 0,0 } + { XML_ROTATE, 0 }, //XFT_ROTATE, + { XML_UPRIGHT, 1 }, //XFT_UPRIGHT, + { XML_SLANT_X, 2 }, //XFT_SLANTX, + { XML_SLANT_Y, 3 }, //XFT_SLANTY, + { XML_NONE, 4 }, //XFT_NONE + { XML_TOKEN_INVALID,0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_Fontwork_Adjust_Enum[] = { - { sXML_left, 0 }, //XFT_LEFT, - { sXML_right, 1 }, //XFT_RIGHT, - { sXML_autosize, 2 }, //XFT_AUTOSIZE, - { sXML_center, 3 }, //XFT_CENTER - { 0,0 } + { XML_LEFT, 0 }, //XFT_LEFT, + { XML_RIGHT, 1 }, //XFT_RIGHT, + { XML_AUTOSIZE, 2 }, //XFT_AUTOSIZE, + { XML_CENTER, 3 }, //XFT_CENTER + { XML_TOKEN_INVALID,0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_Fontwork_Shadow_Enum[] = { - { sXML_normal, 0 }, //XFTSHADOW_NORMAL, - { sXML_slant, 1 }, //XFTSHADOW_SLANT, - { sXML_none, 2 }, //XFTSHADOW_NONE - { 0,0 } + { XML_NORMAL, 0 }, //XFTSHADOW_NORMAL, + { XML_SLANT, 1 }, //XFTSHADOW_SLANT, + { XML_NONE, 2 }, //XFTSHADOW_NONE + { XML_TOKEN_INVALID,0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_Fontwork_Form_Enum[] = { - { sXML_none, 0 }, //XFTFORM_NONE, - { sXML_topcircle, 1 }, //XFTFORM_TOPCIRC, - { sXML_bottomcircle, 2 }, //XFTFORM_BOTCIRC, - { sXML_leftcircle, 3 }, //XFTFORM_LFTCIRC, - { sXML_rightcircle, 4 }, //XFTFORM_RGTCIRC, - { sXML_toparc, 5 }, //XFTFORM_TOPARC, - { sXML_bottomarc, 6 }, //XFTFORM_BOTARC, - { sXML_leftarc, 7 }, //XFTFORM_LFTARC, - { sXML_rightarc, 8 }, //XFTFORM_RGTARC, - { sXML_button1, 9 }, //XFTFORM_BUTTON1, - { sXML_button2, 10 }, //XFTFORM_BUTTON2, - { sXML_button3, 11 }, //XFTFORM_BUTTON3, - { sXML_button4, 12 }, //XFTFORM_BUTTON4 - { 0,0 } + { XML_NONE, 0 }, //XFTFORM_NONE, + { XML_TOPCIRCLE, 1 }, //XFTFORM_TOPCIRC, + { XML_BOTTOMCIRCLE, 2 }, //XFTFORM_BOTCIRC, + { XML_LEFTCIRCLE, 3 }, //XFTFORM_LFTCIRC, + { XML_RIGHTCIRCLE, 4 }, //XFTFORM_RGTCIRC, + { XML_TOPARC, 5 }, //XFTFORM_TOPARC, + { XML_BOTTOMARC, 6 }, //XFTFORM_BOTARC, + { XML_LEFTARC, 7 }, //XFTFORM_LFTARC, + { XML_RIGHTARC, 8 }, //XFTFORM_RGTARC, + { XML_BUTTON1, 9 }, //XFTFORM_BUTTON1, + { XML_BUTTON2, 10 }, //XFTFORM_BUTTON2, + { XML_BUTTON3, 11 }, //XFTFORM_BUTTON3, + { XML_BUTTON4, 12 }, //XFTFORM_BUTTON4 + { XML_TOKEN_INVALID,0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_Caption_Esc_Dir_Enum[] = { - { sXML_horizontal, 0 }, //SDRCAPT_ESCHORIZONTAL, - { sXML_vertical, 1 }, //SDRCAPT_ESCVERTICAL, - { sXML_auto, 2 }, //SDRCAPT_ESCBESTFIT, - { 0,0 } + { XML_HORIZONTAL, 0 }, //SDRCAPT_ESCHORIZONTAL, + { XML_VERTICAL, 1 }, //SDRCAPT_ESCVERTICAL, + { XML_AUTO, 2 }, //SDRCAPT_ESCBESTFIT, + { XML_TOKEN_INVALID,0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_Caption_Type_Enum[] = { - { sXML_straight_line, 0 }, //SDRCAPT_TYPE1, - { sXML_angled_line, 1 }, //SDRCAPT_TYPE2, - { sXML_angled_connector_line, 2 }, //SDRCAPT_TYPE3, - { 0,0 } + { XML_STRAIGHT_LINE, 0 }, //SDRCAPT_TYPE1, + { XML_ANGLED_LINE, 1 }, //SDRCAPT_TYPE2, + { XML_ANGLED_CONNECTOR_LINE, 2 }, //SDRCAPT_TYPE3, + { XML_TOKEN_INVALID,0 } }; ////////////////////////////////////////////////////////////////////////////// diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 91a15efac2f9..844320b8c29e 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -2,9 +2,9 @@ * * $RCSfile: shapeexport.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: cl $ $Date: 2001-06-11 13:59:09 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -112,6 +112,7 @@ using namespace ::rtl; using namespace ::com::sun::star; +using namespace ::xmloff::token; ////////////////////////////////////////////////////////////////////////////// @@ -923,28 +924,28 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x SvXMLEnumMapEntry aXML_GlueAlignment_EnumMap[] = { - { sXML_top_left, drawing::Alignment_TOP_LEFT }, - { sXML_top, drawing::Alignment_TOP }, - { sXML_top_right, drawing::Alignment_TOP_RIGHT }, - { sXML_left, drawing::Alignment_LEFT }, - { sXML_center, drawing::Alignment_CENTER }, - { sXML_right, drawing::Alignment_RIGHT }, - { sXML_bottom_left, drawing::Alignment_BOTTOM_LEFT }, - { sXML_bottom, drawing::Alignment_BOTTOM }, - { sXML_bottom_right,drawing::Alignment_BOTTOM_RIGHT }, - { NULL, 0 } + { XML_TOP_LEFT, drawing::Alignment_TOP_LEFT }, + { XML_TOP, drawing::Alignment_TOP }, + { XML_TOP_RIGHT, drawing::Alignment_TOP_RIGHT }, + { XML_LEFT, drawing::Alignment_LEFT }, + { XML_CENTER, drawing::Alignment_CENTER }, + { XML_RIGHT, drawing::Alignment_RIGHT }, + { XML_BOTTOM_LEFT, drawing::Alignment_BOTTOM_LEFT }, + { XML_BOTTOM, drawing::Alignment_BOTTOM }, + { XML_BOTTOM_RIGHT, drawing::Alignment_BOTTOM_RIGHT }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry aXML_GlueEscapeDirection_EnumMap[] = { - { sXML_auto, drawing::EscapeDirection_SMART }, - { sXML_left, drawing::EscapeDirection_LEFT }, - { sXML_right, drawing::EscapeDirection_RIGHT }, - { sXML_up, drawing::EscapeDirection_UP }, - { sXML_down, drawing::EscapeDirection_DOWN }, - { sXML_horizontal, drawing::EscapeDirection_HORIZONTAL }, - { sXML_vertical, drawing::EscapeDirection_VERTICAL }, - { NULL, 0 } + { XML_AUTO, drawing::EscapeDirection_SMART }, + { XML_LEFT, drawing::EscapeDirection_LEFT }, + { XML_RIGHT, drawing::EscapeDirection_RIGHT }, + { XML_UP, drawing::EscapeDirection_UP }, + { XML_DOWN, drawing::EscapeDirection_DOWN }, + { XML_HORIZONTAL, drawing::EscapeDirection_HORIZONTAL }, + { XML_VERTICAL, drawing::EscapeDirection_VERTICAL }, + { XML_TOKEN_INVALID, 0 } }; /** exports all user defined glue points */ diff --git a/xmloff/source/forms/formenums.cxx b/xmloff/source/forms/formenums.cxx index 6bb4b0986ee2..334a2627002e 100644 --- a/xmloff/source/forms/formenums.cxx +++ b/xmloff/source/forms/formenums.cxx @@ -2,9 +2,9 @@ * * $RCSfile: formenums.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: fs $ $Date: 2001-06-07 12:25:52 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -105,6 +105,9 @@ #ifndef _XMLOFF_XMLKYWD_HXX #include "xmlkywd.hxx" #endif +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" +#endif //......................................................................... namespace xmloff @@ -114,6 +117,7 @@ namespace xmloff using namespace ::com::sun::star::form; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::awt; + using namespace ::xmloff::token; const SvXMLEnumMapEntry* OEnumMapper::s_pEnumMap[OEnumMapper::KNOWN_ENUM_PROPERTIES] = { @@ -146,10 +150,10 @@ namespace xmloff { static SvXMLEnumMapEntry aSubmitEncodingMap[] = { - { "application/x-www-form-urlencoded", FormSubmitEncoding_URL }, - { "multipart/formdata", FormSubmitEncoding_MULTIPART }, - { "application/text", FormSubmitEncoding_TEXT }, - { NULL, 0 } + { XML_APPLICATION_X_WWW_FORM_URLENCODED, FormSubmitEncoding_URL }, + { XML_MULTIPART_FORMDATA, FormSubmitEncoding_MULTIPART }, + { XML_APPLICATION_TEXT, FormSubmitEncoding_TEXT }, + { XML_TOKEN_INVALID, 0 } }; rReturn = aSubmitEncodingMap; } @@ -159,9 +163,9 @@ namespace xmloff { static SvXMLEnumMapEntry aSubmitMethodMap[] = { - { "get", FormSubmitMethod_GET }, - { "post", FormSubmitMethod_POST }, - { NULL, 0 } + { XML_GET, FormSubmitMethod_GET }, + { XML_POST, FormSubmitMethod_POST }, + { XML_TOKEN_INVALID, 0 } }; rReturn = aSubmitMethodMap; } @@ -171,10 +175,10 @@ namespace xmloff { static SvXMLEnumMapEntry aCommandTypeMap[] = { - { "table", CommandType::TABLE }, - { "query", CommandType::QUERY }, - { "command", CommandType::COMMAND }, - { NULL, 0 } + { XML_TABLE, CommandType::TABLE }, + { XML_QUERY, CommandType::QUERY }, + { XML_COMMAND, CommandType::COMMAND }, + { XML_TOKEN_INVALID, 0 } }; rReturn = aCommandTypeMap; } @@ -184,10 +188,10 @@ namespace xmloff { static SvXMLEnumMapEntry aNavigationTypeMap[] = { - { "none", NavigationBarMode_NONE }, - { "current", NavigationBarMode_CURRENT }, - { "parent", NavigationBarMode_PARENT }, - { NULL, 0 } + { XML_NONE, NavigationBarMode_NONE }, + { XML_CURRENT, NavigationBarMode_CURRENT }, + { XML_PARENT, NavigationBarMode_PARENT }, + { XML_TOKEN_INVALID, 0 } }; rReturn = aNavigationTypeMap; }; @@ -197,10 +201,10 @@ namespace xmloff { static SvXMLEnumMapEntry aTabulytorCycleMap[] = { - { "records", TabulatorCycle_RECORDS }, - { "current", TabulatorCycle_CURRENT }, - { "page", TabulatorCycle_PAGE }, - { NULL, 0 } + { XML_RECORDS, TabulatorCycle_RECORDS }, + { XML_CURRENT, TabulatorCycle_CURRENT }, + { XML_PAGE, TabulatorCycle_PAGE }, + { XML_TOKEN_INVALID, 0 } }; rReturn = aTabulytorCycleMap; }; @@ -210,11 +214,11 @@ namespace xmloff { static SvXMLEnumMapEntry aFormButtonTypeMap[] = { - { "push", FormButtonType_PUSH }, - { "submit", FormButtonType_SUBMIT }, - { "reset", FormButtonType_RESET }, - { "url", FormButtonType_URL }, - { NULL, 0 } + { XML_PUSH, FormButtonType_PUSH }, + { XML_SUBMIT, FormButtonType_SUBMIT }, + { XML_RESET, FormButtonType_RESET }, + { XML_URL, FormButtonType_URL }, + { XML_TOKEN_INVALID, 0 } }; rReturn = aFormButtonTypeMap; }; @@ -224,13 +228,13 @@ namespace xmloff { static SvXMLEnumMapEntry aListSourceTypeMap[] = { - { "value-list", ListSourceType_VALUELIST }, - { "table", ListSourceType_TABLE }, - { "query", ListSourceType_QUERY }, - { "sql", ListSourceType_SQL }, - { "sql-pass-through", ListSourceType_SQLPASSTHROUGH }, - { "table-fields", ListSourceType_TABLEFIELDS }, - { NULL, 0 } + { XML_VALUE_LIST, ListSourceType_VALUELIST }, + { XML_TABLE, ListSourceType_TABLE }, + { XML_QUERY, ListSourceType_QUERY }, + { XML_SQL, ListSourceType_SQL }, + { XML_SQL_PASS_THROUGH, ListSourceType_SQLPASSTHROUGH }, + { XML_TABLE_FIELDS, ListSourceType_TABLEFIELDS }, + { XML_TOKEN_INVALID, 0 } }; rReturn = aListSourceTypeMap; }; @@ -240,10 +244,10 @@ namespace xmloff { static SvXMLEnumMapEntry aCheckStateMap[] = { - { "unchecked", STATE_NOCHECK }, - { "checked", STATE_CHECK }, - { "unknown", STATE_DONTKNOW }, - { NULL, 0 } + { XML_UNCHECKED, STATE_NOCHECK }, + { XML_CHECKED, STATE_CHECK }, + { XML_UNKNOWN, STATE_DONTKNOW }, + { XML_TOKEN_INVALID, 0 } }; rReturn = aCheckStateMap; }; @@ -252,12 +256,12 @@ namespace xmloff { static SvXMLEnumMapEntry aTextAlignMap[] = { - { sXML_start, TextAlign::LEFT }, - { sXML_center, TextAlign::CENTER }, - { sXML_end, TextAlign::RIGHT }, - { sXML_justify, -1 }, - { sXML_justified, -1 }, - { NULL, 0 } + { XML_START, TextAlign::LEFT }, + { XML_CENTER, TextAlign::CENTER }, + { XML_END, TextAlign::RIGHT }, + { XML_JUSTIFY, -1 }, + { XML_JUSTIFIED, -1 }, + { XML_TOKEN_INVALID, 0 } }; rReturn = aTextAlignMap; }; @@ -266,17 +270,17 @@ namespace xmloff { static SvXMLEnumMapEntry aBorderTypeMap[] = { - { sXML_none, 0 }, - { sXML_hidden, 0 }, - { sXML_solid, 2 }, - { sXML_double, 2 }, - { sXML_dotted, 2 }, - { sXML_dashed, 2 }, - { sXML_groove, 1 }, - { sXML_ridge, 1 }, - { sXML_inset, 1 }, - { sXML_outset, 1 }, - { NULL, 0 } + { XML_NONE, 0 }, + { XML_HIDDEN, 0 }, + { XML_SOLID, 2 }, + { XML_DOUBLE, 2 }, + { XML_DOTTED, 2 }, + { XML_DASHED, 2 }, + { XML_GROOVE, 1 }, + { XML_RIDGE, 1 }, + { XML_INSET, 1 }, + { XML_OUTSET, 1 }, + { XML_TOKEN_INVALID, 0 } }; rReturn = aBorderTypeMap; }; @@ -286,12 +290,12 @@ namespace xmloff { static SvXMLEnumMapEntry aFontEmphasisMap[] = { - { sXML_none, FontEmphasisMark::NONE }, - { sXML_dot, FontEmphasisMark::DOT }, - { sXML_circle, FontEmphasisMark::CIRCLE }, - { sXML_disc, FontEmphasisMark::DISC }, - { sXML_accent, FontEmphasisMark::ACCENT }, - { 0, 0 } + { XML_NONE, FontEmphasisMark::NONE }, + { XML_DOT, FontEmphasisMark::DOT }, + { XML_CIRCLE, FontEmphasisMark::CIRCLE }, + { XML_DISC, FontEmphasisMark::DISC }, + { XML_ACCENT, FontEmphasisMark::ACCENT }, + { XML_TOKEN_INVALID, 0 } }; rReturn = aFontEmphasisMap; } @@ -301,10 +305,10 @@ namespace xmloff { static SvXMLEnumMapEntry aFontReliefMap[] = { - { sXML_none, FontRelief::NONE }, - { sXML_engraved, FontRelief::ENGRAVED }, - { sXML_embossed, FontRelief::EMBOSSED }, - { 0, 0 } + { XML_NONE, FontRelief::NONE }, + { XML_ENGRAVED, FontRelief::ENGRAVED }, + { XML_EMBOSSED, FontRelief::EMBOSSED }, + { XML_TOKEN_INVALID, 0 } }; rReturn = aFontReliefMap; } @@ -322,6 +326,9 @@ namespace xmloff /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.6 2001/06/07 12:25:52 fs + * #86096# enums for FontEmphasis and FontRelief + * * Revision 1.5 2000/12/19 12:13:57 fs * some changes ... now the exported styles are XSL conform * diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx index 7202b855a15e..ea3a2d746985 100644 --- a/xmloff/source/style/DashStyle.cxx +++ b/xmloff/source/style/DashStyle.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DashStyle.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: cl $ $Date: 2001-01-24 18:48:25 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,6 +91,10 @@ #include "xmlkywd.hxx" #endif +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" +#endif + #ifndef _RTL_USTRBUF_HXX_ #include<rtl/ustrbuf.hxx> #endif @@ -109,6 +113,7 @@ using namespace ::com::sun::star; using namespace ::rtl; +using namespace ::xmloff::token; enum SvXMLTokenMapAttrs { @@ -136,11 +141,11 @@ static __FAR_DATA SvXMLTokenMapEntry aDashStyleAttrTokenMap[] = SvXMLEnumMapEntry __READONLY_DATA pXML_DashStyle_Enum[] = { - { sXML_rect, drawing::DashStyle_RECT }, - { sXML_round, drawing::DashStyle_ROUND }, - { sXML_rect, drawing::DashStyle_RECTRELATIVE }, - { sXML_round, drawing::DashStyle_ROUNDRELATIVE }, - { 0, 0 } + { XML_RECT, drawing::DashStyle_RECT }, + { XML_ROUND, drawing::DashStyle_ROUND }, + { XML_RECT, drawing::DashStyle_RECTRELATIVE }, + { XML_ROUND, drawing::DashStyle_ROUNDRELATIVE }, + { XML_TOKEN_INVALID, 0 } }; XMLDashStyle::XMLDashStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > * _pHandler, diff --git a/xmloff/source/style/DrawAspectHdl.cxx b/xmloff/source/style/DrawAspectHdl.cxx index d2d6a1d51c27..1902fafbcf6d 100644 --- a/xmloff/source/style/DrawAspectHdl.cxx +++ b/xmloff/source/style/DrawAspectHdl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DrawAspectHdl.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mib $ $Date: 2001-05-10 10:07:52 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,6 +81,7 @@ using namespace ::rtl; using namespace ::com::sun::star; +using namespace ::xmloff::token; /////////////////////////////////////////////////////////////////////////////// // @@ -89,11 +90,11 @@ using namespace ::com::sun::star; SvXMLEnumMapEntry __READONLY_DATA pXML_DrawAspect_Enum[] = { - { sXML_content, 1 }, - { sXML_thumbnail, 2 }, - { sXML_icon, 4 }, - { sXML_print, 8 }, - { 0, 0 } + { XML_CONTENT, 1 }, + { XML_THUMBNAIL, 2 }, + { XML_ICON, 4 }, + { XML_PRINT, 8 }, + { XML_TOKEN_INVALID, 0 } }; DrawAspectHdl::~DrawAspectHdl() diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx index f668b92bb661..cc7227274423 100644 --- a/xmloff/source/style/GradientStyle.cxx +++ b/xmloff/source/style/GradientStyle.cxx @@ -2,9 +2,9 @@ * * $RCSfile: GradientStyle.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: cl $ $Date: 2001-01-24 18:48:25 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -105,6 +105,7 @@ using namespace ::com::sun::star; using namespace ::rtl; +using namespace ::xmloff::token; enum SvXMLTokenMapAttrs { @@ -138,13 +139,13 @@ static __FAR_DATA SvXMLTokenMapEntry aGradientAttrTokenMap[] = SvXMLEnumMapEntry __READONLY_DATA pXML_GradientStyle_Enum[] = { - { sXML_gradientstyle_linear, awt::GradientStyle_LINEAR }, - { sXML_gradientstyle_axial, awt::GradientStyle_AXIAL }, - { sXML_gradientstyle_radial, awt::GradientStyle_RADIAL }, - { sXML_gradientstyle_ellipsoid, awt::GradientStyle_ELLIPTICAL }, - { sXML_gradientstyle_square, awt::GradientStyle_SQUARE }, - { sXML_gradientstyle_rectangular, awt::GradientStyle_RECT }, - { 0, 0 } + { XML_GRADIENTSTYLE_LINEAR, awt::GradientStyle_LINEAR }, + { XML_GRADIENTSTYLE_AXIAL, awt::GradientStyle_AXIAL }, + { XML_GRADIENTSTYLE_RADIAL, awt::GradientStyle_RADIAL }, + { XML_GRADIENTSTYLE_ELLIPSOID, awt::GradientStyle_ELLIPTICAL }, + { XML_GRADIENTSTYLE_SQUARE, awt::GradientStyle_SQUARE }, + { XML_GRADIENTSTYLE_RECTANGULAR, awt::GradientStyle_RECT }, + { XML_TOKEN_INVALID, 0 } }; XMLGradientStyle::XMLGradientStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > * _pHandler, diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx index 85b901f9ef02..eca0dd2b0212 100644 --- a/xmloff/source/style/HatchStyle.cxx +++ b/xmloff/source/style/HatchStyle.cxx @@ -2,9 +2,9 @@ * * $RCSfile: HatchStyle.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: cl $ $Date: 2001-01-24 18:48:25 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -105,6 +105,7 @@ using namespace ::com::sun::star; using namespace ::rtl; +using namespace ::xmloff::token; enum SvXMLTokenMapAttrs { @@ -128,10 +129,10 @@ static __FAR_DATA SvXMLTokenMapEntry aHatchAttrTokenMap[] = SvXMLEnumMapEntry __READONLY_DATA pXML_HatchStyle_Enum[] = { - { sXML_hatchstyle_single, drawing::HatchStyle_SINGLE }, - { sXML_hatchstyle_double, drawing::HatchStyle_DOUBLE }, - { sXML_hatchstyle_triple, drawing::HatchStyle_TRIPLE }, - { 0, 0 } + { XML_HATCHSTYLE_SINGLE, drawing::HatchStyle_SINGLE }, + { XML_HATCHSTYLE_DOUBLE, drawing::HatchStyle_DOUBLE }, + { XML_HATCHSTYLE_TRIPLE, drawing::HatchStyle_TRIPLE }, + { XML_TOKEN_INVALID, 0 } }; XMLHatchStyle::XMLHatchStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & _rHandler, diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx index 84cde52f949f..23788d7b315f 100644 --- a/xmloff/source/style/TransGradientStyle.cxx +++ b/xmloff/source/style/TransGradientStyle.cxx @@ -2,9 +2,9 @@ * * $RCSfile: TransGradientStyle.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: cl $ $Date: 2001-01-24 18:48:25 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -105,6 +105,7 @@ using namespace ::com::sun::star; using namespace ::rtl; +using namespace ::xmloff::token; enum SvXMLTokenMapAttrs { @@ -134,13 +135,13 @@ static __FAR_DATA SvXMLTokenMapEntry aTrGradientAttrTokenMap[] = SvXMLEnumMapEntry __READONLY_DATA pXML_GradientStyle_Enum[] = { - { sXML_gradientstyle_linear, awt::GradientStyle_LINEAR }, - { sXML_gradientstyle_axial, awt::GradientStyle_AXIAL }, - { sXML_gradientstyle_radial, awt::GradientStyle_RADIAL }, - { sXML_gradientstyle_ellipsoid, awt::GradientStyle_ELLIPTICAL }, - { sXML_gradientstyle_square, awt::GradientStyle_SQUARE }, - { sXML_gradientstyle_rectangular, awt::GradientStyle_RECT }, - { 0, 0 } + { XML_GRADIENTSTYLE_LINEAR, awt::GradientStyle_LINEAR }, + { XML_GRADIENTSTYLE_AXIAL, awt::GradientStyle_AXIAL }, + { XML_GRADIENTSTYLE_RADIAL, awt::GradientStyle_RADIAL }, + { XML_GRADIENTSTYLE_ELLIPSOID, awt::GradientStyle_ELLIPTICAL }, + { XML_GRADIENTSTYLE_SQUARE, awt::GradientStyle_SQUARE }, + { XML_GRADIENTSTYLE_RECTANGULAR, awt::GradientStyle_RECT }, + { XML_TOKEN_INVALID, 0 } }; XMLTransGradientStyle::XMLTransGradientStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & _rHandler, diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx index 21be73efb4b1..23c306d6eb05 100644 --- a/xmloff/source/style/XMLBackgroundImageContext.cxx +++ b/xmloff/source/style/XMLBackgroundImageContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLBackgroundImageContext.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mib $ $Date: 2000-12-02 10:25:46 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,6 +94,7 @@ using namespace ::rtl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::style; +using namespace ::xmloff::token; enum SvXMLTokenMapAttrs { @@ -121,24 +122,24 @@ static __FAR_DATA SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] = SvXMLEnumMapEntry psXML_BrushRepeat[] = { - { sXML_background_repeat, GraphicLocation_TILED }, - { sXML_background_no_repeat, GraphicLocation_MIDDLE_MIDDLE }, - { sXML_background_stretch, GraphicLocation_AREA }, - { 0, 0 } + { XML_BACKGROUND_REPEAT, GraphicLocation_TILED }, + { XML_BACKGROUND_NO_REPEAT, GraphicLocation_MIDDLE_MIDDLE }, + { XML_BACKGROUND_STRETCH, GraphicLocation_AREA }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry psXML_BrushHoriPos[] = { - { sXML_left, GraphicLocation_LEFT_MIDDLE }, - { sXML_right, GraphicLocation_RIGHT_MIDDLE }, - { 0, 0 } + { XML_LEFT, GraphicLocation_LEFT_MIDDLE }, + { XML_RIGHT, GraphicLocation_RIGHT_MIDDLE }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry psXML_BrushVertPos[] = { - { sXML_top, GraphicLocation_MIDDLE_TOP }, - { sXML_bottom, GraphicLocation_MIDDLE_BOTTOM }, - { 0, 0 } + { XML_TOP, GraphicLocation_MIDDLE_TOP }, + { XML_BOTTOM, GraphicLocation_MIDDLE_BOTTOM }, + { XML_TOKEN_INVALID, 0 } }; void lcl_xmlbic_MergeHoriPos( GraphicLocation& ePos, diff --git a/xmloff/source/style/XMLConstantsPropertyHandler.cxx b/xmloff/source/style/XMLConstantsPropertyHandler.cxx index 57ed7d54eda1..bc0d2c8820af 100644 --- a/xmloff/source/style/XMLConstantsPropertyHandler.cxx +++ b/xmloff/source/style/XMLConstantsPropertyHandler.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLConstantsPropertyHandler.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2000-09-27 13:55:58 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,12 +77,13 @@ using namespace ::com::sun::star::uno; using namespace ::rtl; +using ::xmloff::token::XMLTokenEnum; XMLConstantsPropertyHandler::XMLConstantsPropertyHandler( const SvXMLEnumMapEntry *pM, - const sal_Char *pDflt ) : + enum XMLTokenEnum eDflt ) : pMap( pM ), - pDefault( pDflt ) + eDefault( eDflt ) { } @@ -114,8 +115,7 @@ sal_Bool XMLConstantsPropertyHandler::exportXML( sal_Int16 nEnum; rValue >>= nEnum; - sal_Bool bRet = rUnitConverter.convertEnum( aOut, nEnum, pMap, - (sal_Char *)pDefault ); + sal_Bool bRet = rUnitConverter.convertEnum( aOut, nEnum, pMap, eDefault ); rStrExpValue = aOut.makeStringAndClear(); diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx index a7f664d2997e..c113ab1239cd 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLFootnoteSeparatorExport.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: dvo $ $Date: 2001-04-17 12:01:20 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -101,6 +101,7 @@ using namespace ::com::sun::star; +using namespace ::xmloff::token; using ::rtl::OUStringBuffer; using ::std::vector; @@ -116,10 +117,10 @@ XMLFootnoteSeparatorExport::~XMLFootnoteSeparatorExport() static const SvXMLEnumMapEntry aXML_HorizontalAdjust_Enum[] = { - { sXML_left, text::HorizontalAdjust_LEFT }, - { sXML_center, text::HorizontalAdjust_CENTER }, - { sXML_right, text::HorizontalAdjust_RIGHT }, - { 0, 0 } + { XML_LEFT, text::HorizontalAdjust_LEFT }, + { XML_CENTER, text::HorizontalAdjust_CENTER }, + { XML_RIGHT, text::HorizontalAdjust_RIGHT }, + { XML_TOKEN_INVALID, 0 } }; void XMLFootnoteSeparatorExport::exportXML( diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx index 4304760049de..fd285443bef0 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLFootnoteSeparatorImport.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: dvo $ $Date: 2001-04-17 12:01:20 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -123,6 +123,7 @@ using namespace ::com::sun::star; +using namespace ::xmloff::token; using ::rtl::OUString; using ::std::vector; @@ -155,10 +156,10 @@ XMLFootnoteSeparatorImport::~XMLFootnoteSeparatorImport() static const SvXMLEnumMapEntry aXML_HorizontalAdjust_Enum[] = { - { sXML_left, text::HorizontalAdjust_LEFT }, - { sXML_center, text::HorizontalAdjust_CENTER }, - { sXML_right, text::HorizontalAdjust_RIGHT }, - { 0, 0 } + { XML_LEFT, text::HorizontalAdjust_LEFT }, + { XML_CENTER, text::HorizontalAdjust_CENTER }, + { XML_RIGHT, text::HorizontalAdjust_RIGHT }, + { XML_TOKEN_INVALID, 0 } }; void XMLFootnoteSeparatorImport::StartElement( diff --git a/xmloff/source/style/adjushdl.cxx b/xmloff/source/style/adjushdl.cxx index 1ce8d6cbd203..fe426b4137db 100644 --- a/xmloff/source/style/adjushdl.cxx +++ b/xmloff/source/style/adjushdl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: adjushdl.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mib $ $Date: 2001-01-30 08:50:10 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,24 +93,25 @@ using namespace ::com::sun::star; using namespace ::rtl; +using namespace ::xmloff::token; SvXMLEnumMapEntry __READONLY_DATA pXML_Para_Adjust_Enum[] = { - { sXML_start, style::ParagraphAdjust_LEFT }, - { sXML_end, style::ParagraphAdjust_RIGHT }, - { sXML_center, style::ParagraphAdjust_CENTER }, - { sXML_justify, style::ParagraphAdjust_BLOCK }, - { sXML_justified, style::ParagraphAdjust_BLOCK }, // obsolete - { 0, 0 } + { XML_START, style::ParagraphAdjust_LEFT }, + { XML_END, style::ParagraphAdjust_RIGHT }, + { XML_CENTER, style::ParagraphAdjust_CENTER }, + { XML_JUSTIFY, style::ParagraphAdjust_BLOCK }, + { XML_JUSTIFIED, style::ParagraphAdjust_BLOCK }, // obsolete + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_Para_Align_Last_Enum[] = { - { sXML_start, style::ParagraphAdjust_LEFT }, - { sXML_center, style::ParagraphAdjust_CENTER }, - { sXML_justify, style::ParagraphAdjust_BLOCK }, - { sXML_justified, style::ParagraphAdjust_BLOCK }, // obsolete - { 0, 0 } + { XML_START, style::ParagraphAdjust_LEFT }, + { XML_CENTER, style::ParagraphAdjust_CENTER }, + { XML_JUSTIFY, style::ParagraphAdjust_BLOCK }, + { XML_JUSTIFIED, style::ParagraphAdjust_BLOCK }, // obsolete + { XML_TOKEN_INVALID, 0 } }; /////////////////////////////////////////////////////////////////////////////// @@ -141,7 +142,7 @@ sal_Bool XMLParaAdjustPropHdl::exportXML( OUString& rStrExpValue, const uno::Any rValue >>= nVal; - sal_Bool bRet = rUnitConverter.convertEnum( aOut, nVal, pXML_Para_Adjust_Enum, sXML_start ); + sal_Bool bRet = rUnitConverter.convertEnum( aOut, nVal, pXML_Para_Adjust_Enum, XML_START ); rStrExpValue = aOut.makeStringAndClear(); @@ -178,7 +179,7 @@ sal_Bool XMLLastLineAdjustPropHdl::exportXML( OUString& rStrExpValue, const uno: rValue >>= nVal; if( nVal != style::ParagraphAdjust_LEFT ) - bRet = rUnitConverter.convertEnum( aOut, nVal, pXML_Para_Align_Last_Enum, sXML_start ); + bRet = rUnitConverter.convertEnum( aOut, nVal, pXML_Para_Align_Last_Enum, XML_START ); rStrExpValue = aOut.makeStringAndClear(); diff --git a/xmloff/source/style/backhdl.cxx b/xmloff/source/style/backhdl.cxx index 1c8fe737061e..72c33ad484fe 100644 --- a/xmloff/source/style/backhdl.cxx +++ b/xmloff/source/style/backhdl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: backhdl.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:07:04 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,19 +89,20 @@ using namespace ::rtl; using namespace ::com::sun::star; +using namespace ::xmloff::token; SvXMLEnumMapEntry psXML_BrushHorizontalPos[] = { - { sXML_left, style::GraphicLocation_LEFT_MIDDLE }, - { sXML_right, style::GraphicLocation_RIGHT_MIDDLE }, - { 0, 0 } + { XML_LEFT, style::GraphicLocation_LEFT_MIDDLE }, + { XML_RIGHT, style::GraphicLocation_RIGHT_MIDDLE }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry psXML_BrushVerticalPos[] = { - { sXML_top, style::GraphicLocation_MIDDLE_TOP }, - { sXML_bottom, style::GraphicLocation_MIDDLE_BOTTOM }, - { 0, 0 } + { XML_TOP, style::GraphicLocation_MIDDLE_TOP }, + { XML_BOTTOM, style::GraphicLocation_MIDDLE_BOTTOM }, + { XML_TOKEN_INVALID, 0 } }; /////////////////////////////////////////////////////////////////////////////// diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx index 99e5dda6511e..366380d99b19 100644 --- a/xmloff/source/style/bordrhdl.cxx +++ b/xmloff/source/style/bordrhdl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: bordrhdl.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:07:04 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,6 +90,7 @@ using namespace ::rtl; using namespace ::com::sun::star; +using namespace ::xmloff::token; // copied from svx/boxitem.hxx #define DEF_LINE_WIDTH_0 1 @@ -157,25 +158,25 @@ using namespace ::com::sun::star; SvXMLEnumMapEntry psXML_BorderStyles[] = { - { sXML_none, SVX_XML_BORDER_STYLE_NONE }, - { sXML_hidden, SVX_XML_BORDER_STYLE_NONE }, - { sXML_solid, SVX_XML_BORDER_STYLE_SOLID }, - { sXML_double, SVX_XML_BORDER_STYLE_DOUBLE }, - { sXML_dotted, SVX_XML_BORDER_STYLE_SOLID }, - { sXML_dashed, SVX_XML_BORDER_STYLE_SOLID }, - { sXML_groove, SVX_XML_BORDER_STYLE_SOLID }, - { sXML_ridge, SVX_XML_BORDER_STYLE_SOLID }, - { sXML_inset, SVX_XML_BORDER_STYLE_SOLID }, - { sXML_outset, SVX_XML_BORDER_STYLE_SOLID }, - { 0, 0 } + { XML_NONE, SVX_XML_BORDER_STYLE_NONE }, + { XML_HIDDEN, SVX_XML_BORDER_STYLE_NONE }, + { XML_SOLID, SVX_XML_BORDER_STYLE_SOLID }, + { XML_DOUBLE, SVX_XML_BORDER_STYLE_DOUBLE }, + { XML_DOTTED, SVX_XML_BORDER_STYLE_SOLID }, + { XML_DASHED, SVX_XML_BORDER_STYLE_SOLID }, + { XML_GROOVE, SVX_XML_BORDER_STYLE_SOLID }, + { XML_RIDGE, SVX_XML_BORDER_STYLE_SOLID }, + { XML_INSET, SVX_XML_BORDER_STYLE_SOLID }, + { XML_OUTSET, SVX_XML_BORDER_STYLE_SOLID }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry psXML_NamedBorderWidths[] = { - { sXML_thin, SVX_XML_BORDER_WIDTH_THIN }, - { sXML_middle, SVX_XML_BORDER_WIDTH_MIDDLE }, - { sXML_thick, SVX_XML_BORDER_WIDTH_THICK }, - { 0, 0 } + { XML_THIN, SVX_XML_BORDER_WIDTH_THIN }, + { XML_MIDDLE, SVX_XML_BORDER_WIDTH_MIDDLE }, + { XML_THICK, SVX_XML_BORDER_WIDTH_THICK }, + { XML_TOKEN_INVALID, 0 } }; // mapping tables to map external xml input to intarnal box line widths diff --git a/xmloff/source/style/breakhdl.cxx b/xmloff/source/style/breakhdl.cxx index 2bed635cd57c..4346a06ddf14 100644 --- a/xmloff/source/style/breakhdl.cxx +++ b/xmloff/source/style/breakhdl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: breakhdl.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mib $ $Date: 2000-10-18 11:18:29 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,15 +89,16 @@ using namespace ::rtl; using namespace ::com::sun::star; +using namespace ::xmloff::token; SvXMLEnumMapEntry psXML_BreakTypes[] = { - { sXML_auto, 0 }, - { sXML_column, 1 }, - { sXML_page, 2 }, - { sXML_even_page, 2 }, - { sXML_odd_page, 2 }, - { 0, 0} + { XML_AUTO, 0 }, + { XML_COLUMN, 1 }, + { XML_PAGE, 2 }, + { XML_EVEN_PAGE, 2 }, + { XML_ODD_PAGE, 2 }, + { XML_TOKEN_INVALID, 0} }; /////////////////////////////////////////////////////////////////////////////// diff --git a/xmloff/source/style/cdouthdl.cxx b/xmloff/source/style/cdouthdl.cxx index ee31909b7071..5a6b327bcfdc 100644 --- a/xmloff/source/style/cdouthdl.cxx +++ b/xmloff/source/style/cdouthdl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cdouthdl.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:07:04 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,15 +89,16 @@ using namespace ::rtl; using namespace ::com::sun::star; +using namespace ::xmloff::token; SvXMLEnumMapEntry pXML_Crossedout_Enum[] = { - { sXML_crossedout_none, STRIKEOUT_NONE }, - { sXML_crossedout_single, STRIKEOUT_SINGLE }, - { sXML_crossedout_double, STRIKEOUT_DOUBLE }, - { sXML_crossedout_thick, STRIKEOUT_BOLD }, - { sXML_crossedout_slash, STRIKEOUT_SLASH }, - { sXML_crossedout_cross, STRIKEOUT_X } + { XML_CROSSEDOUT_NONE, STRIKEOUT_NONE }, + { XML_CROSSEDOUT_SINGLE, STRIKEOUT_SINGLE }, + { XML_CROSSEDOUT_DOUBLE, STRIKEOUT_DOUBLE }, + { XML_CROSSEDOUT_THICK, STRIKEOUT_BOLD }, + { XML_CROSSEDOUT_SLASH, STRIKEOUT_SLASH }, + { XML_CROSSEDOUT_CROSS, STRIKEOUT_X } }; /////////////////////////////////////////////////////////////////////////////// diff --git a/xmloff/source/style/csmaphdl.cxx b/xmloff/source/style/csmaphdl.cxx index d8b38304f593..1f540c8ecdc5 100644 --- a/xmloff/source/style/csmaphdl.cxx +++ b/xmloff/source/style/csmaphdl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: csmaphdl.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mib $ $Date: 2000-10-12 12:52:06 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,14 +90,15 @@ using namespace ::rtl; using namespace ::com::sun::star; +using namespace ::xmloff::token; static SvXMLEnumMapEntry pXML_Casemap_Enum[] = { - { sXML_none, style::CaseMap::NONE }, - { sXML_casemap_lowercase, style::CaseMap::LOWERCASE }, - { sXML_casemap_uppercase, style::CaseMap::UPPERCASE }, - { sXML_casemap_capitalize, style::CaseMap::TITLE }, - { 0,0 } + { XML_NONE, style::CaseMap::NONE }, + { XML_CASEMAP_LOWERCASE, style::CaseMap::LOWERCASE }, + { XML_CASEMAP_UPPERCASE, style::CaseMap::UPPERCASE }, + { XML_CASEMAP_CAPITALIZE, style::CaseMap::TITLE }, + { XML_TOKEN_INVALID, 0 } }; /////////////////////////////////////////////////////////////////////////////// diff --git a/xmloff/source/style/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx index c39af312f231..8dcf0d5227be 100644 --- a/xmloff/source/style/fonthdl.cxx +++ b/xmloff/source/style/fonthdl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fonthdl.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mib $ $Date: 2000-11-13 08:42:13 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,24 +89,25 @@ using namespace ::rtl; using namespace ::com::sun::star; +using namespace ::xmloff::token; static SvXMLEnumMapEntry __READONLY_DATA aFontFamilyGenericMapping[] = { - { sXML_decorative, FAMILY_DECORATIVE }, - - { sXML_modern, FAMILY_MODERN }, - { sXML_roman, FAMILY_ROMAN }, - { sXML_script, FAMILY_SCRIPT }, - { sXML_swiss, FAMILY_SWISS }, - { sXML_system, FAMILY_SYSTEM }, - { 0, 0 } + { XML_DECORATIVE, FAMILY_DECORATIVE }, + + { XML_MODERN, FAMILY_MODERN }, + { XML_ROMAN, FAMILY_ROMAN }, + { XML_SCRIPT, FAMILY_SCRIPT }, + { XML_SWISS, FAMILY_SWISS }, + { XML_SYSTEM, FAMILY_SYSTEM }, + { XML_TOKEN_INVALID, 0 } }; static SvXMLEnumMapEntry __READONLY_DATA aFontPitchMapping[] = { - { sXML_fixed, PITCH_FIXED }, - { sXML_variable, PITCH_VARIABLE }, - { 0, 0 } + { XML_FIXED, PITCH_FIXED }, + { XML_VARIABLE, PITCH_VARIABLE }, + { XML_TOKEN_INVALID, 0 } }; /////////////////////////////////////////////////////////////////////////////// // @@ -356,7 +357,7 @@ sal_Bool XMLFontPitchPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& if( PITCH_DONTKNOW != ePitch ) { - bRet = rUnitConverter.convertEnum( aOut, ePitch, aFontPitchMapping, sXML_fixed ); + bRet = rUnitConverter.convertEnum( aOut, ePitch, aFontPitchMapping, XML_FIXED ); rStrExpValue = aOut.makeStringAndClear(); } diff --git a/xmloff/source/style/postuhdl.cxx b/xmloff/source/style/postuhdl.cxx index 70930fa1ee8e..fa2ec5d9c7cb 100644 --- a/xmloff/source/style/postuhdl.cxx +++ b/xmloff/source/style/postuhdl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: postuhdl.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:07:05 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,13 +93,14 @@ using namespace ::rtl; using namespace ::com::sun::star; +using namespace ::xmloff::token; SvXMLEnumMapEntry __READONLY_DATA aPostureGenericMapping[] = { - { sXML_posture_normal, ITALIC_NONE }, - { sXML_posture_italic, ITALIC_NORMAL }, - { sXML_posture_oblique, ITALIC_OBLIQUE }, - { 0, 0 } + { XML_POSTURE_NORMAL, ITALIC_NONE }, + { XML_POSTURE_ITALIC, ITALIC_NORMAL }, + { XML_POSTURE_OBLIQUE, ITALIC_OBLIQUE }, + { XML_TOKEN_INVALID, 0 } }; /////////////////////////////////////////////////////////////////////////////// diff --git a/xmloff/source/style/prhdlfac.cxx b/xmloff/source/style/prhdlfac.cxx index f0bb4c9f7dc4..99ee3810f7dd 100644 --- a/xmloff/source/style/prhdlfac.cxx +++ b/xmloff/source/style/prhdlfac.cxx @@ -2,9 +2,9 @@ * * $RCSfile: prhdlfac.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: mib $ $Date: 2001-05-10 10:07:18 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,6 +81,10 @@ #include "xmlkywd.hxx" #endif +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" +#endif + #ifndef _XMLOFF_PROPERTYHANDLER_BASICTYPES_HXX #include "xmlbahdl.hxx" #endif @@ -160,22 +164,23 @@ #endif using namespace ::com::sun::star; +using namespace ::xmloff::token; SvXMLEnumMapEntry aXML_ColorMode_EnumMap[] = { - { sXML_greyscale, drawing::ColorMode_GREYS }, - { sXML_mono, drawing::ColorMode_MONO }, - { sXML_watermark, drawing::ColorMode_WATERMARK }, - { sXML_standard, drawing::ColorMode_STANDARD }, - { NULL, 0 } + { XML_GREYSCALE, drawing::ColorMode_GREYS }, + { XML_MONO, drawing::ColorMode_MONO }, + { XML_WATERMARK, drawing::ColorMode_WATERMARK }, + { XML_STANDARD, drawing::ColorMode_STANDARD }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry __READONLY_DATA aXML_HorizontalAdjust_Enum[] = { - { sXML_left, text::HorizontalAdjust_LEFT }, - { sXML_center, text::HorizontalAdjust_CENTER }, - { sXML_right, text::HorizontalAdjust_RIGHT }, - { 0, 0 } + { XML_LEFT, text::HorizontalAdjust_LEFT }, + { XML_CENTER, text::HorizontalAdjust_CENTER }, + { XML_RIGHT, text::HorizontalAdjust_RIGHT }, + { XML_TOKEN_INVALID, 0 } }; diff --git a/xmloff/source/style/undlihdl.cxx b/xmloff/source/style/undlihdl.cxx index baf12513a540..bad7cc11211d 100644 --- a/xmloff/source/style/undlihdl.cxx +++ b/xmloff/source/style/undlihdl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: undlihdl.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mib $ $Date: 2000-11-23 11:51:54 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,28 +90,29 @@ using namespace ::rtl; using namespace ::com::sun::star; using namespace ::com::sun::star::awt; +using namespace ::xmloff::token; SvXMLEnumMapEntry __READONLY_DATA pXML_Underline_Enum[] = { - { sXML_underline_none, FontUnderline::NONE }, - { sXML_underline_single, FontUnderline::SINGLE }, - { sXML_underline_double, FontUnderline::DOUBLE }, - { sXML_underline_dotted, FontUnderline::DOTTED }, - { sXML_underline_dash, FontUnderline::DASH }, - { sXML_underline_long_dash, FontUnderline::LONGDASH }, - { sXML_underline_dot_dash, FontUnderline::DASHDOT }, - { sXML_underline_dot_dot_dash, FontUnderline::DASHDOTDOT }, - { sXML_underline_wave, FontUnderline::WAVE }, - { sXML_underline_bold, FontUnderline::BOLD }, - { sXML_underline_bold_dotted, FontUnderline::BOLDDOTTED }, - { sXML_underline_bold_dash, FontUnderline::BOLDDASH }, - { sXML_underline_bold_long_dash, FontUnderline::BOLDLONGDASH }, - { sXML_underline_bold_dot_dash, FontUnderline::BOLDDASHDOT }, - { sXML_underline_bold_dot_dot_dash, FontUnderline::BOLDDASHDOTDOT }, - { sXML_underline_bold_wave, FontUnderline::BOLDWAVE }, - { sXML_underline_double_wave, FontUnderline::DOUBLEWAVE }, - { sXML_underline_small_wave, FontUnderline::SMALLWAVE }, - { 0, 0 } + { XML_UNDERLINE_NONE, FontUnderline::NONE }, + { XML_UNDERLINE_SINGLE, FontUnderline::SINGLE }, + { XML_UNDERLINE_DOUBLE, FontUnderline::DOUBLE }, + { XML_UNDERLINE_DOTTED, FontUnderline::DOTTED }, + { XML_UNDERLINE_DASH, FontUnderline::DASH }, + { XML_UNDERLINE_LONG_DASH, FontUnderline::LONGDASH }, + { XML_UNDERLINE_DOT_DASH, FontUnderline::DASHDOT }, + { XML_UNDERLINE_DOT_DOT_DASH, FontUnderline::DASHDOTDOT }, + { XML_UNDERLINE_WAVE, FontUnderline::WAVE }, + { XML_UNDERLINE_BOLD, FontUnderline::BOLD }, + { XML_UNDERLINE_BOLD_DOTTED, FontUnderline::BOLDDOTTED }, + { XML_UNDERLINE_BOLD_DASH, FontUnderline::BOLDDASH }, + { XML_UNDERLINE_BOLD_LONG_DASH, FontUnderline::BOLDLONGDASH }, + { XML_UNDERLINE_BOLD_DOT_DASH, FontUnderline::BOLDDASHDOT }, + { XML_UNDERLINE_BOLD_DOT_DOT_DASH, FontUnderline::BOLDDASHDOTDOT }, + { XML_UNDERLINE_BOLD_WAVE, FontUnderline::BOLDWAVE }, + { XML_UNDERLINE_DOUBLE_WAVE, FontUnderline::DOUBLEWAVE }, + { XML_UNDERLINE_SMALL_WAVE, FontUnderline::SMALLWAVE }, + { XML_TOKEN_INVALID, 0 } }; /////////////////////////////////////////////////////////////////////////////// diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 5ef8c63480c7..650ebe289765 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlnumfi.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: nn $ $Date: 2001-06-13 18:44:23 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,6 +81,7 @@ using namespace ::rtl; using namespace ::com::sun::star; +using namespace ::xmloff::token; //------------------------------------------------------------------------- @@ -381,16 +382,16 @@ static __FAR_DATA SvXMLTokenMapEntry aStyleElemAttrMap[] = static __FAR_DATA SvXMLEnumMapEntry aStyleValueMap[] = { - { sXML_short, sal_False }, - { sXML_long, sal_True }, - { 0, 0 } + { XML_SHORT, sal_False }, + { XML_LONG, sal_True }, + { XML_TOKEN_INVALID, 0 } }; static __FAR_DATA SvXMLEnumMapEntry aFormatSourceMap[] = { - { sXML_fixed, sal_False }, - { sXML_language, sal_True }, - { 0, 0 } + { XML_FIXED, sal_False }, + { XML_LANGUAGE, sal_True }, + { XML_TOKEN_INVALID, 0 } }; //------------------------------------------------------------------------- diff --git a/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx index c7a5ffdb7922..0d1cd26291d5 100644 --- a/xmloff/source/style/xmltabe.cxx +++ b/xmloff/source/style/xmltabe.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmltabe.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: mib $ $Date: 2001-05-16 11:31:05 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,15 +97,16 @@ using namespace ::rtl; using namespace ::com::sun::star; +using namespace ::xmloff::token; SvXMLEnumMapEntry psXML_tabstop_style[] = { - { "left", style::TabAlign_LEFT }, - { "center", style::TabAlign_CENTER }, - { "right", style::TabAlign_RIGHT }, - { "char", style::TabAlign_DECIMAL }, - { "default", style::TabAlign_DEFAULT }, // ????????????????????????????????????? - { 0, 0 } + { XML_LEFT, style::TabAlign_LEFT }, + { XML_CENTER, style::TabAlign_CENTER }, + { XML_RIGHT, style::TabAlign_RIGHT }, + { XML_CHAR, style::TabAlign_DECIMAL }, + { XML_DEFAULT, style::TabAlign_DEFAULT }, // ????????????????????????????????????? + { XML_TOKEN_INVALID, 0 } }; void SvxXMLTabStopExport::exportTabStop( const ::com::sun::star::style::TabStop* pTabStop ) diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx index c85c0e876a9f..c5d5557b70db 100644 --- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLFootnoteConfigurationImportContext.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: dvo $ $Date: 2001-04-26 13:17:32 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -137,7 +137,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::style; using namespace ::com::sun::star::xml::sax; - +using namespace ::xmloff::token; // // XMLFootnoteConfigHelper @@ -306,10 +306,10 @@ const SvXMLTokenMap& static SvXMLEnumMapEntry __READONLY_DATA aFootnoteNumberingMap[] = { - { sXML_page, FootnoteNumbering::PER_PAGE }, - { sXML_chapter, FootnoteNumbering::PER_CHAPTER }, - { sXML_document, FootnoteNumbering::PER_DOCUMENT }, - { 0, 0 }, + { XML_PAGE, FootnoteNumbering::PER_PAGE }, + { XML_CHAPTER, FootnoteNumbering::PER_CHAPTER }, + { XML_DOCUMENT, FootnoteNumbering::PER_DOCUMENT }, + { XML_TOKEN_INVALID, 0 }, }; void XMLFootnoteConfigurationImportContext::StartElement( diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx index ec3b7a0d67ab..419f06331f09 100644 --- a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLIndexBibliographyEntryContext.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: dvo $ $Date: 2001-01-02 14:41:37 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -102,6 +102,7 @@ using namespace ::com::sun::star::text; +using namespace ::xmloff::token; using ::rtl::OUString; using ::com::sun::star::beans::PropertyValue; @@ -137,38 +138,38 @@ XMLIndexBibliographyEntryContext::~XMLIndexBibliographyEntryContext() const SvXMLEnumMapEntry aBibliographyDataFieldMap[] = { - { sXML_address, BibliographyDataField::ADDRESS }, - { sXML_annote, BibliographyDataField::ANNOTE }, - { sXML_author, BibliographyDataField::AUTHOR }, - { sXML_bibiliographic_type, BibliographyDataField::BIBILIOGRAPHIC_TYPE }, - { sXML_booktitle, BibliographyDataField::BOOKTITLE }, - { sXML_chapter, BibliographyDataField::CHAPTER }, - { sXML_custom1, BibliographyDataField::CUSTOM1 }, - { sXML_custom2, BibliographyDataField::CUSTOM2 }, - { sXML_custom3, BibliographyDataField::CUSTOM3 }, - { sXML_custom4, BibliographyDataField::CUSTOM4 }, - { sXML_custom5, BibliographyDataField::CUSTOM5 }, - { sXML_edition, BibliographyDataField::EDITION }, - { sXML_editor, BibliographyDataField::EDITOR }, - { sXML_howpublished, BibliographyDataField::HOWPUBLISHED }, - { sXML_identifier, BibliographyDataField::IDENTIFIER }, - { sXML_institution, BibliographyDataField::INSTITUTION }, - { sXML_isbn, BibliographyDataField::ISBN }, - { sXML_journal, BibliographyDataField::JOURNAL }, - { sXML_month, BibliographyDataField::MONTH }, - { sXML_note, BibliographyDataField::NOTE }, - { sXML_number, BibliographyDataField::NUMBER }, - { sXML_organizations, BibliographyDataField::ORGANIZATIONS }, - { sXML_pages, BibliographyDataField::PAGES }, - { sXML_publisher, BibliographyDataField::PUBLISHER }, - { sXML_report_type, BibliographyDataField::REPORT_TYPE }, - { sXML_school, BibliographyDataField::SCHOOL }, - { sXML_series, BibliographyDataField::SERIES }, - { sXML_title, BibliographyDataField::TITLE }, - { sXML_url, BibliographyDataField::URL }, - { sXML_volume, BibliographyDataField::VOLUME }, - { sXML_year, BibliographyDataField::YEAR }, - { NULL, NULL } + { XML_ADDRESS, BibliographyDataField::ADDRESS }, + { XML_ANNOTE, BibliographyDataField::ANNOTE }, + { XML_AUTHOR, BibliographyDataField::AUTHOR }, + { XML_BIBILIOGRAPHIC_TYPE, BibliographyDataField::BIBILIOGRAPHIC_TYPE }, + { XML_BOOKTITLE, BibliographyDataField::BOOKTITLE }, + { XML_CHAPTER, BibliographyDataField::CHAPTER }, + { XML_CUSTOM1, BibliographyDataField::CUSTOM1 }, + { XML_CUSTOM2, BibliographyDataField::CUSTOM2 }, + { XML_CUSTOM3, BibliographyDataField::CUSTOM3 }, + { XML_CUSTOM4, BibliographyDataField::CUSTOM4 }, + { XML_CUSTOM5, BibliographyDataField::CUSTOM5 }, + { XML_EDITION, BibliographyDataField::EDITION }, + { XML_EDITOR, BibliographyDataField::EDITOR }, + { XML_HOWPUBLISHED, BibliographyDataField::HOWPUBLISHED }, + { XML_IDENTIFIER, BibliographyDataField::IDENTIFIER }, + { XML_INSTITUTION, BibliographyDataField::INSTITUTION }, + { XML_ISBN, BibliographyDataField::ISBN }, + { XML_JOURNAL, BibliographyDataField::JOURNAL }, + { XML_MONTH, BibliographyDataField::MONTH }, + { XML_NOTE, BibliographyDataField::NOTE }, + { XML_NUMBER, BibliographyDataField::NUMBER }, + { XML_ORGANIZATIONS, BibliographyDataField::ORGANIZATIONS }, + { XML_PAGES, BibliographyDataField::PAGES }, + { XML_PUBLISHER, BibliographyDataField::PUBLISHER }, + { XML_REPORT_TYPE, BibliographyDataField::REPORT_TYPE }, + { XML_SCHOOL, BibliographyDataField::SCHOOL }, + { XML_SERIES, BibliographyDataField::SERIES }, + { XML_TITLE, BibliographyDataField::TITLE }, + { XML_URL, BibliographyDataField::URL }, + { XML_VOLUME, BibliographyDataField::VOLUME }, + { XML_YEAR, BibliographyDataField::YEAR }, + { XML_TOKEN_INVALID, 0 } }; void XMLIndexBibliographyEntryContext::StartElement( diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx index 7cb31c85e8bd..9fe9a8518bae 100644 --- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx +++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLIndexChapterInfoEntryContext.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: dvo $ $Date: 2001-01-02 14:41:37 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -102,6 +102,7 @@ using namespace ::com::sun::star::text; +using namespace ::xmloff::token; using ::rtl::OUString; using ::com::sun::star::beans::PropertyValue; @@ -133,13 +134,13 @@ XMLIndexChapterInfoEntryContext::~XMLIndexChapterInfoEntryContext() static const SvXMLEnumMapEntry aChapterDisplayMap[] = { - { sXML_name, ChapterFormat::NAME }, - { sXML_number, ChapterFormat::NUMBER }, - { sXML_number_and_name, ChapterFormat::NAME_NUMBER }, + { XML_NAME, ChapterFormat::NAME }, + { XML_NUMBER, ChapterFormat::NUMBER }, + { XML_NUMBER_AND_NAME, ChapterFormat::NAME_NUMBER }, // not supported by the template: -// { sXML_plain_number_and_name, ChapterFormat::NO_PREFIX_SUFFIX }, -// { sXML_plain_number, ChapterFormat::DIGIT }, - { 0, 0 } +// { XML_PLAIN_NUMBER_AND_NAME, ChapterFormat::NO_PREFIX_SUFFIX }, +// { XML_PLAIN_NUMBER, ChapterFormat::DIGIT }, + { XML_TOKEN_INVALID, 0 } }; void XMLIndexChapterInfoEntryContext::StartElement( diff --git a/xmloff/source/text/XMLIndexMarkExport.cxx b/xmloff/source/text/XMLIndexMarkExport.cxx index cd1f327f417a..7c8a230de5b9 100644 --- a/xmloff/source/text/XMLIndexMarkExport.cxx +++ b/xmloff/source/text/XMLIndexMarkExport.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLIndexMarkExport.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: dvo $ $Date: 2001-05-14 13:01:56 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -193,13 +193,13 @@ void XMLIndexMarkExport::ExportIndexMark( // but not for -mark-end Reference<XPropertySetInfo> xPropertySetInfo = xIndexMarkPropSet->getPropertySetInfo(); - if (xPropertySetInfo->hasPropertyByName(sLevel)) + if (xPropertySetInfo->hasPropertyByName(sUserIndexName)) { - // table of content: - pElementNames = lcl_pTocMarkNames; + // user index mark + pElementNames = lcl_pUserIndexMarkName; if (nElementNo != 2) { - ExportTOCMarkAttributes(xIndexMarkPropSet); + ExportUserIndexMarkAttributes(xIndexMarkPropSet); } } else if (xPropertySetInfo->hasPropertyByName(sPrimaryKey)) @@ -213,11 +213,11 @@ void XMLIndexMarkExport::ExportIndexMark( } else { - // user index mark - pElementNames = lcl_pUserIndexMarkName; + // table of content: + pElementNames = lcl_pTocMarkNames; if (nElementNo != 2) { - ExportUserIndexMarkAttributes(xIndexMarkPropSet); + ExportTOCMarkAttributes(xIndexMarkPropSet); } } @@ -262,6 +262,9 @@ void XMLIndexMarkExport::ExportUserIndexMarkAttributes( rExport.AddAttribute(XML_NAMESPACE_TEXT, sXML_index_name, sIndexName); } + + // additionally export outline level; just reuse ExportTOCMarkAttributes + ExportTOCMarkAttributes( rPropSet ); } void XMLIndexMarkExport::ExportAlphabeticalIndexMarkAttributes( diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx index 931311b48ba4..13303e3fe0bd 100644 --- a/xmloff/source/text/XMLIndexTOCContext.cxx +++ b/xmloff/source/text/XMLIndexTOCContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLIndexTOCContext.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: dvo $ $Date: 2001-05-31 16:11:06 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -167,6 +167,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; +using namespace ::xmloff::token; using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; @@ -201,14 +202,14 @@ static const sal_Char* aIndexSourceElementMap[] = SvXMLEnumMapEntry __READONLY_DATA aIndexTypeMap[] = { - { sXML_table_of_content, TEXT_INDEX_TOC }, - { sXML_alphabetical_index, TEXT_INDEX_ALPHABETICAL }, - { sXML_table_index, TEXT_INDEX_TABLE }, - { sXML_object_index, TEXT_INDEX_OBJECT }, - { sXML_bibliography, TEXT_INDEX_BIBLIOGRAPHY }, - { sXML_user_index, TEXT_INDEX_USER }, - { sXML_illustration_index, TEXT_INDEX_ILLUSTRATION }, - { NULL, NULL } + { XML_TABLE_OF_CONTENT, TEXT_INDEX_TOC }, + { XML_ALPHABETICAL_INDEX, TEXT_INDEX_ALPHABETICAL }, + { XML_TABLE_INDEX, TEXT_INDEX_TABLE }, + { XML_OBJECT_INDEX, TEXT_INDEX_OBJECT }, + { XML_BIBLIOGRAPHY, TEXT_INDEX_BIBLIOGRAPHY }, + { XML_USER_INDEX, TEXT_INDEX_USER }, + { XML_ILLUSTRATION_INDEX, TEXT_INDEX_ILLUSTRATION }, + { XML_TOKEN_INVALID, 0 } }; diff --git a/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx index 491826181d82..7336a640eabf 100644 --- a/xmloff/source/text/XMLIndexTableSourceContext.cxx +++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLIndexTableSourceContext.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: dvo $ $Date: 2001-01-12 18:27:06 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -125,6 +125,7 @@ #endif using namespace ::com::sun::star::text; +using namespace ::xmloff::token; using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; @@ -163,15 +164,15 @@ XMLIndexTableSourceContext::~XMLIndexTableSourceContext() static SvXMLEnumMapEntry __READONLY_DATA lcl_aReferenceTypeTokenMap[] = { - { sXML_text, ReferenceFieldPart::TEXT }, - { sXML_category_and_value, ReferenceFieldPart::CATEGORY_AND_NUMBER }, - { sXML_caption, ReferenceFieldPart::ONLY_CAPTION }, + { XML_TEXT, ReferenceFieldPart::TEXT }, + { XML_CATEGORY_AND_VALUE, ReferenceFieldPart::CATEGORY_AND_NUMBER }, + { XML_CAPTION, ReferenceFieldPart::ONLY_CAPTION }, // wrong values that previous versions wrote: - { sXML_chapter, ReferenceFieldPart::CATEGORY_AND_NUMBER }, - { sXML_page, ReferenceFieldPart::ONLY_CAPTION }, + { XML_CHAPTER, ReferenceFieldPart::CATEGORY_AND_NUMBER }, + { XML_PAGE, ReferenceFieldPart::ONLY_CAPTION }, - { 0, 0 } + { XML_TOKEN_INVALID, 0 } }; void XMLIndexTableSourceContext::ProcessAttribute( diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx index efca1d721c26..bf25387d649f 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTemplateContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLIndexTemplateContext.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: dvo $ $Date: 2001-01-02 14:41:38 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -131,6 +131,7 @@ using namespace ::std; //using namespace ::com::sun::star::text; +using namespace ::xmloff::token; using ::rtl::OUString; using ::rtl::OUStringBuffer; @@ -327,17 +328,17 @@ enum TemplateTokenType SvXMLEnumMapEntry aTemplateTokenTypeMap[] = { - { sXML_index_entry_chapter, XML_TOK_INDEX_TYPE_CHAPTER }, - { sXML_index_entry_text, XML_TOK_INDEX_TYPE_ENTRY_TEXT }, - { sXML_index_entry_tab_stop, XML_TOK_INDEX_TYPE_TAB_STOP }, - { sXML_index_entry_span, XML_TOK_INDEX_TYPE_TEXT }, - { sXML_index_entry_page_number, XML_TOK_INDEX_TYPE_PAGE_NUMBER }, - { sXML_index_entry_chapter_number, XML_TOK_INDEX_TYPE_CHAPTER_NUMBER }, - { sXML_index_entry_chapter, XML_TOK_INDEX_TYPE_CHAPTER }, - { sXML_index_entry_link_start, XML_TOK_INDEX_TYPE_LINK_START }, - { sXML_index_entry_link_end, XML_TOK_INDEX_TYPE_LINK_END }, - { sXML_index_entry_bibliography, XML_TOK_INDEX_TYPE_BIBLIOGRAPHY }, - { 0, 0 } + { XML_INDEX_ENTRY_CHAPTER, XML_TOK_INDEX_TYPE_CHAPTER }, + { XML_INDEX_ENTRY_TEXT, XML_TOK_INDEX_TYPE_ENTRY_TEXT }, + { XML_INDEX_ENTRY_TAB_STOP, XML_TOK_INDEX_TYPE_TAB_STOP }, + { XML_INDEX_ENTRY_SPAN, XML_TOK_INDEX_TYPE_TEXT }, + { XML_INDEX_ENTRY_PAGE_NUMBER, XML_TOK_INDEX_TYPE_PAGE_NUMBER }, + { XML_INDEX_ENTRY_CHAPTER_NUMBER, XML_TOK_INDEX_TYPE_CHAPTER_NUMBER }, + { XML_INDEX_ENTRY_CHAPTER, XML_TOK_INDEX_TYPE_CHAPTER }, + { XML_INDEX_ENTRY_LINK_START, XML_TOK_INDEX_TYPE_LINK_START }, + { XML_INDEX_ENTRY_LINK_END, XML_TOK_INDEX_TYPE_LINK_END }, + { XML_INDEX_ENTRY_BIBLIOGRAPHY, XML_TOK_INDEX_TYPE_BIBLIOGRAPHY }, + { XML_TOKEN_INVALID, 0 } }; SvXMLImportContext *XMLIndexTemplateContext::CreateChildContext( @@ -437,17 +438,17 @@ SvXMLImportContext *XMLIndexTemplateContext::CreateChildContext( const SvXMLEnumMapEntry aLevelNameTOCMap[] = { - { sXML_1, 1 }, - { sXML_2, 2 }, - { sXML_3, 3 }, - { sXML_4, 4 }, - { sXML_5, 5 }, - { sXML_6, 6 }, - { sXML_7, 7 }, - { sXML_8, 8 }, - { sXML_9, 9 }, - { sXML_10, 10 }, - { NULL, NULL } + { XML_1, 1 }, + { XML_2, 2 }, + { XML_3, 3 }, + { XML_4, 4 }, + { XML_5, 5 }, + { XML_6, 6 }, + { XML_7, 7 }, + { XML_8, 8 }, + { XML_9, 9 }, + { XML_10, 10 }, + { XML_TOKEN_INVALID, NULL } }; const sal_Char* aLevelStylePropNameTOCMap[] = @@ -487,11 +488,11 @@ const sal_Bool aAllowedTokenTypesUser[] = const SvXMLEnumMapEntry aLevelNameAlphaMap[] = { - { sXML_separator, 1 }, - { sXML_1, 2 }, - { sXML_2, 3 }, - { sXML_3, 4 }, - { NULL, NULL } + { XML_SEPARATOR, 1 }, + { XML_1, 2 }, + { XML_2, 3 }, + { XML_3, 4 }, + { XML_TOKEN_INVALID, 0 } }; const sal_Char* aLevelStylePropNameAlphaMap[] = @@ -516,29 +517,29 @@ const sal_Bool aAllowedTokenTypesAlpha[] = const SvXMLEnumMapEntry aLevelNameBibliographyMap[] = { - { sXML_article, 1 }, - { sXML_book, 2 }, - { sXML_booklet, 3 }, - { sXML_conference, 4 }, - { sXML_custom1, 5 }, - { sXML_custom2, 6 }, - { sXML_custom3, 7 }, - { sXML_custom4, 8 }, - { sXML_custom5, 9 }, - { sXML_email, 10 }, - { sXML_inbook, 11 }, - { sXML_incollection, 12 }, - { sXML_inproceedings, 13 }, - { sXML_journal, 14 }, - { sXML_manual, 15 }, - { sXML_mastersthesis, 16 }, - { sXML_misc, 17 }, - { sXML_phdthesis, 18 }, - { sXML_proceedings, 19 }, - { sXML_techreport, 20 }, - { sXML_unpublished, 21 }, - { sXML_www, 22 }, - { NULL, NULL } + { XML_ARTICLE, 1 }, + { XML_BOOK, 2 }, + { XML_BOOKLET, 3 }, + { XML_CONFERENCE, 4 }, + { XML_CUSTOM1, 5 }, + { XML_CUSTOM2, 6 }, + { XML_CUSTOM3, 7 }, + { XML_CUSTOM4, 8 }, + { XML_CUSTOM5, 9 }, + { XML_EMAIL, 10 }, + { XML_INBOOK, 11 }, + { XML_INCOLLECTION, 12 }, + { XML_INPROCEEDINGS, 13 }, + { XML_JOURNAL, 14 }, + { XML_MANUAL, 15 }, + { XML_MASTERSTHESIS, 16 }, + { XML_MISC, 17 }, + { XML_PHDTHESIS, 18 }, + { XML_PROCEEDINGS, 19 }, + { XML_TECHREPORT, 20 }, + { XML_UNPUBLISHED, 21 }, + { XML_WWW, 22 }, + { XML_TOKEN_INVALID, 0 } }; // TODO: replace with real property names, when available diff --git a/xmloff/source/text/XMLLineNumberingExport.cxx b/xmloff/source/text/XMLLineNumberingExport.cxx index ca88f35923b7..71c9220d570d 100644 --- a/xmloff/source/text/XMLLineNumberingExport.cxx +++ b/xmloff/source/text/XMLLineNumberingExport.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLLineNumberingExport.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mib $ $Date: 2001-03-19 09:41:43 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,6 +97,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; +using namespace ::xmloff::token; using ::rtl::OUString; using ::rtl::OUStringBuffer; @@ -121,11 +122,11 @@ XMLLineNumberingExport::XMLLineNumberingExport(SvXMLExport& rExp) : SvXMLEnumMapEntry __READONLY_DATA aLineNumberPositionMap[] = { - { sXML_left, style::LineNumberPosition::LEFT }, - { sXML_right, style::LineNumberPosition::RIGHT }, - { sXML_inside, style::LineNumberPosition::INSIDE }, - { sXML_outside, style::LineNumberPosition::OUTSIDE }, - { NULL, 0 } + { XML_LEFT, style::LineNumberPosition::LEFT }, + { XML_RIGHT, style::LineNumberPosition::RIGHT }, + { XML_INSIDE, style::LineNumberPosition::INSIDE }, + { XML_OUTSIDE, style::LineNumberPosition::OUTSIDE }, + { XML_TOKEN_INVALID, 0 } }; diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx index 4e739e57c3f7..f0011afeeb15 100644 --- a/xmloff/source/text/XMLLineNumberingImportContext.cxx +++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLLineNumberingImportContext.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: dvo $ $Date: 2001-05-30 10:21:38 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -110,6 +110,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::style; +using namespace ::xmloff::token; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::xml::sax::XAttributeList; @@ -159,11 +160,11 @@ XMLLineNumberingImportContext::~XMLLineNumberingImportContext() static const SvXMLEnumMapEntry aLineNumberPositionMap[] = { - { sXML_left, style::LineNumberPosition::LEFT }, - { sXML_right, style::LineNumberPosition::RIGHT }, - { sXML_inside, style::LineNumberPosition::INSIDE }, - { sXML_outside, style::LineNumberPosition::OUTSIDE }, - { NULL, 0 } + { XML_LEFT, style::LineNumberPosition::LEFT }, + { XML_RIGHT, style::LineNumberPosition::RIGHT }, + { XML_INSIDE, style::LineNumberPosition::INSIDE }, + { XML_OUTSIDE, style::LineNumberPosition::OUTSIDE }, + { XML_TOKEN_INVALID, 0 } }; static SvXMLTokenMapEntry aLineNumberingTokenMap[] = diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx index 04a02dc1d67f..91fc90d0aeb0 100644 --- a/xmloff/source/text/XMLSectionExport.cxx +++ b/xmloff/source/text/XMLSectionExport.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLSectionExport.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: dvo $ $Date: 2001-06-12 17:46:20 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -527,16 +527,16 @@ void XMLSectionExport::ExportIndexHeaderStart( } -SvXMLEnumMapEntry __READONLY_DATA aIndexTypeMap[] = +SvXMLEnumStringMapEntry __READONLY_DATA aIndexTypeMap[] = { - { "com.sun.star.text.ContentIndex", TEXT_SECTION_TYPE_TOC }, - { "com.sun.star.text.DocumentIndex", TEXT_SECTION_TYPE_ALPHABETICAL }, - { "com.sun.star.text.TableIndex", TEXT_SECTION_TYPE_TABLE }, - { "com.sun.star.text.ObjectIndex", TEXT_SECTION_TYPE_OBJECT }, - { "com.sun.star.text.Bibliography", TEXT_SECTION_TYPE_BIBLIOGRAPHY }, - { "com.sun.star.text.UserIndex", TEXT_SECTION_TYPE_USER }, - { "com.sun.star.text.IllustrationsIndex", TEXT_SECTION_TYPE_ILLUSTRATION }, - { NULL, NULL } + ENUM_STRING_MAP_ENTRY( "com.sun.star.text.ContentIndex", TEXT_SECTION_TYPE_TOC ), + ENUM_STRING_MAP_ENTRY( "com.sun.star.text.DocumentIndex", TEXT_SECTION_TYPE_ALPHABETICAL ), + ENUM_STRING_MAP_ENTRY( "com.sun.star.text.TableIndex", TEXT_SECTION_TYPE_TABLE ), + ENUM_STRING_MAP_ENTRY( "com.sun.star.text.ObjectIndex", TEXT_SECTION_TYPE_OBJECT ), + ENUM_STRING_MAP_ENTRY( "com.sun.star.text.Bibliography", TEXT_SECTION_TYPE_BIBLIOGRAPHY ), + ENUM_STRING_MAP_ENTRY( "com.sun.star.text.UserIndex", TEXT_SECTION_TYPE_USER ), + ENUM_STRING_MAP_ENTRY( "com.sun.star.text.IllustrationsIndex", TEXT_SECTION_TYPE_ILLUSTRATION ), + ENUM_STRING_MAP_END() }; enum SectionTypeEnum XMLSectionExport::MapSectionType( @@ -1275,67 +1275,67 @@ enum TemplateParamEnum TOK_TPARAM_BIBLIOGRAPHY_DATA }; -SvXMLEnumMapEntry __READONLY_DATA aTemplateTypeMap[] = +SvXMLEnumStringMapEntry __READONLY_DATA aTemplateTypeMap[] = { - { "TokenEntryNumber", TOK_TTYPE_ENTRY_NUMBER }, - { "TokenEntryText", TOK_TTYPE_ENTRY_TEXT }, - { "TokenTabStop", TOK_TTYPE_TAB_STOP }, - { "TokenText", TOK_TTYPE_TEXT }, - { "TokenPageNumber", TOK_TTYPE_PAGE_NUMBER }, - { "TokenChapterInfo", TOK_TTYPE_CHAPTER_INFO }, - { "TokenHyperlinkStart", TOK_TTYPE_HYPERLINK_START }, - { "TokenHyperlinkEnd", TOK_TTYPE_HYPERLINK_END }, - { "TokenBibliographyDataField", TOK_TTYPE_BIBLIOGRAPHY }, - { NULL, NULL } + ENUM_STRING_MAP_ENTRY( "TokenEntryNumber", TOK_TTYPE_ENTRY_NUMBER ), + ENUM_STRING_MAP_ENTRY( "TokenEntryText", TOK_TTYPE_ENTRY_TEXT ), + ENUM_STRING_MAP_ENTRY( "TokenTabStop", TOK_TTYPE_TAB_STOP ), + ENUM_STRING_MAP_ENTRY( "TokenText", TOK_TTYPE_TEXT ), + ENUM_STRING_MAP_ENTRY( "TokenPageNumber", TOK_TTYPE_PAGE_NUMBER ), + ENUM_STRING_MAP_ENTRY( "TokenChapterInfo", TOK_TTYPE_CHAPTER_INFO ), + ENUM_STRING_MAP_ENTRY( "TokenHyperlinkStart", TOK_TTYPE_HYPERLINK_START ), + ENUM_STRING_MAP_ENTRY( "TokenHyperlinkEnd", TOK_TTYPE_HYPERLINK_END ), + ENUM_STRING_MAP_ENTRY( "TokenBibliographyDataField", TOK_TTYPE_BIBLIOGRAPHY ), + ENUM_STRING_MAP_END() }; -SvXMLEnumMapEntry __READONLY_DATA aTemplateParamMap[] = +SvXMLEnumStringMapEntry __READONLY_DATA aTemplateParamMap[] = { - { "TokenType", TOK_TPARAM_TOKEN_TYPE }, - { "CharacterStyleName", TOK_TPARAM_CHAR_STYLE }, - { "TabStopRightAligned", TOK_TPARAM_TAB_RIGHT_ALIGNED }, - { "TabStopPosition", TOK_TPARAM_TAB_POSITION }, - { "TabStopFillCharacter", TOK_TPARAM_TAB_FILL_CHAR }, - { "Text", TOK_TPARAM_TEXT }, - { "ChapterFormat", TOK_TPARAM_CHAPTER_FORMAT }, - { "BibliographyDataField", TOK_TPARAM_BIBLIOGRAPHY_DATA }, - { NULL, NULL } + ENUM_STRING_MAP_ENTRY( "TokenType", TOK_TPARAM_TOKEN_TYPE ), + ENUM_STRING_MAP_ENTRY( "CharacterStyleName", TOK_TPARAM_CHAR_STYLE ), + ENUM_STRING_MAP_ENTRY( "TabStopRightAligned", TOK_TPARAM_TAB_RIGHT_ALIGNED ), + ENUM_STRING_MAP_ENTRY( "TabStopPosition", TOK_TPARAM_TAB_POSITION ), + ENUM_STRING_MAP_ENTRY( "TabStopFillCharacter", TOK_TPARAM_TAB_FILL_CHAR ), + ENUM_STRING_MAP_ENTRY( "Text", TOK_TPARAM_TEXT ), + ENUM_STRING_MAP_ENTRY( "ChapterFormat", TOK_TPARAM_CHAPTER_FORMAT ), + ENUM_STRING_MAP_ENTRY( "BibliographyDataField", TOK_TPARAM_BIBLIOGRAPHY_DATA ), + ENUM_STRING_MAP_END() }; SvXMLEnumMapEntry __READONLY_DATA aBibliographyDataFieldMap[] = { - { sXML_address, BibliographyDataField::ADDRESS }, - { sXML_annote, BibliographyDataField::ANNOTE }, - { sXML_author, BibliographyDataField::AUTHOR }, - { sXML_bibiliographic_type, BibliographyDataField::BIBILIOGRAPHIC_TYPE }, - { sXML_booktitle, BibliographyDataField::BOOKTITLE }, - { sXML_chapter, BibliographyDataField::CHAPTER }, - { sXML_custom1, BibliographyDataField::CUSTOM1 }, - { sXML_custom2, BibliographyDataField::CUSTOM2 }, - { sXML_custom3, BibliographyDataField::CUSTOM3 }, - { sXML_custom4, BibliographyDataField::CUSTOM4 }, - { sXML_custom5, BibliographyDataField::CUSTOM5 }, - { sXML_edition, BibliographyDataField::EDITION }, - { sXML_editor, BibliographyDataField::EDITOR }, - { sXML_howpublished, BibliographyDataField::HOWPUBLISHED }, - { sXML_identifier, BibliographyDataField::IDENTIFIER }, - { sXML_institution, BibliographyDataField::INSTITUTION }, - { sXML_isbn, BibliographyDataField::ISBN }, - { sXML_journal, BibliographyDataField::JOURNAL }, - { sXML_month, BibliographyDataField::MONTH }, - { sXML_note, BibliographyDataField::NOTE }, - { sXML_number, BibliographyDataField::NUMBER }, - { sXML_organizations, BibliographyDataField::ORGANIZATIONS }, - { sXML_pages, BibliographyDataField::PAGES }, - { sXML_publisher, BibliographyDataField::PUBLISHER }, - { sXML_report_type, BibliographyDataField::REPORT_TYPE }, - { sXML_school, BibliographyDataField::SCHOOL }, - { sXML_series, BibliographyDataField::SERIES }, - { sXML_title, BibliographyDataField::TITLE }, - { sXML_url, BibliographyDataField::URL }, - { sXML_volume, BibliographyDataField::VOLUME }, - { sXML_year, BibliographyDataField::YEAR }, - { NULL, NULL } + { XML_ADDRESS, BibliographyDataField::ADDRESS }, + { XML_ANNOTE, BibliographyDataField::ANNOTE }, + { XML_AUTHOR, BibliographyDataField::AUTHOR }, + { XML_BIBILIOGRAPHIC_TYPE, BibliographyDataField::BIBILIOGRAPHIC_TYPE }, + { XML_BOOKTITLE, BibliographyDataField::BOOKTITLE }, + { XML_CHAPTER, BibliographyDataField::CHAPTER }, + { XML_CUSTOM1, BibliographyDataField::CUSTOM1 }, + { XML_CUSTOM2, BibliographyDataField::CUSTOM2 }, + { XML_CUSTOM3, BibliographyDataField::CUSTOM3 }, + { XML_CUSTOM4, BibliographyDataField::CUSTOM4 }, + { XML_CUSTOM5, BibliographyDataField::CUSTOM5 }, + { XML_EDITION, BibliographyDataField::EDITION }, + { XML_EDITOR, BibliographyDataField::EDITOR }, + { XML_HOWPUBLISHED, BibliographyDataField::HOWPUBLISHED }, + { XML_IDENTIFIER, BibliographyDataField::IDENTIFIER }, + { XML_INSTITUTION, BibliographyDataField::INSTITUTION }, + { XML_ISBN, BibliographyDataField::ISBN }, + { XML_JOURNAL, BibliographyDataField::JOURNAL }, + { XML_MONTH, BibliographyDataField::MONTH }, + { XML_NOTE, BibliographyDataField::NOTE }, + { XML_NUMBER, BibliographyDataField::NUMBER }, + { XML_ORGANIZATIONS, BibliographyDataField::ORGANIZATIONS }, + { XML_PAGES, BibliographyDataField::PAGES }, + { XML_PUBLISHER, BibliographyDataField::PUBLISHER }, + { XML_REPORT_TYPE, BibliographyDataField::REPORT_TYPE }, + { XML_SCHOOL, BibliographyDataField::SCHOOL }, + { XML_SERIES, BibliographyDataField::SERIES }, + { XML_TITLE, BibliographyDataField::TITLE }, + { XML_URL, BibliographyDataField::URL }, + { XML_VOLUME, BibliographyDataField::VOLUME }, + { XML_YEAR, BibliographyDataField::YEAR }, + { XML_TOKEN_INVALID, 0 } }; void XMLSectionExport::ExportIndexTemplateElement( diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx index 0475d74b9e61..5c8b74fa0052 100644 --- a/xmloff/source/text/XMLTextColumnsContext.cxx +++ b/xmloff/source/text/XMLTextColumnsContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLTextColumnsContext.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: dvo $ $Date: 2001-05-15 12:37:49 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -106,6 +106,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::text; using namespace ::com::sun::star::style; using namespace ::com::sun::star::beans; +using namespace ::xmloff::token; enum SvXMLTokenMapAttrs { @@ -143,10 +144,10 @@ static __FAR_DATA SvXMLTokenMapEntry aColSepAttrTokenMap[] = SvXMLEnumMapEntry __READONLY_DATA pXML_Sep_Align_Enum[] = { - { sXML_top, VerticalAlignment_TOP }, - { sXML_middle, VerticalAlignment_MIDDLE }, - { sXML_bottom, VerticalAlignment_BOTTOM }, - { 0, 0 } + { XML_TOP, VerticalAlignment_TOP }, + { XML_MIDDLE, VerticalAlignment_MIDDLE }, + { XML_BOTTOM, VerticalAlignment_BOTTOM }, + { XML_TOKEN_INVALID, 0 } }; class XMLTextColumnContext_Impl: public SvXMLImportContext diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index 344efa3960c7..54b89c9e94c8 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLTextMarkImportContext.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: dvo $ $Date: 2001-01-02 14:41:38 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -119,6 +119,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; using namespace ::com::sun::star::xml::sax; +using namespace ::xmloff::token; TYPEINIT1( XMLTextMarkImportContext, SvXMLImportContext); @@ -137,13 +138,13 @@ enum lcl_MarkType { TypeReference, TypeReferenceStart, TypeReferenceEnd, static SvXMLEnumMapEntry __READONLY_DATA lcl_aMarkTypeMap[] = { - { sXML_reference_mark, TypeReference }, - { sXML_reference_mark_start, TypeReferenceStart }, - { sXML_reference_mark_end, TypeReferenceEnd }, - { sXML_bookmark, TypeBookmark }, - { sXML_bookmark_start, TypeBookmarkStart }, - { sXML_bookmark_end, TypeBookmarkEnd }, - { 0, 0 }, + { XML_REFERENCE_MARK, TypeReference }, + { XML_REFERENCE_MARK_START, TypeReferenceStart }, + { XML_REFERENCE_MARK_END, TypeReferenceEnd }, + { XML_BOOKMARK, TypeBookmark }, + { XML_BOOKMARK_START, TypeBookmarkStart }, + { XML_BOOKMARK_END, TypeBookmarkEnd }, + { XML_TOKEN_INVALID, 0 }, }; void XMLTextMarkImportContext::StartElement( diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 2ab1534cffb7..26e405712faa 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtflde.cxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: dvo $ $Date: 2001-06-12 16:32:06 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -225,6 +225,7 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::style; using namespace ::com::sun::star::document; using namespace ::com::sun::star::container; +using namespace ::xmloff::token; static sal_Char __READONLY_DATA FIELD_SERVICE_SENDER[] = "ExtendedUser"; @@ -285,79 +286,79 @@ static sal_Char __READONLY_DATA FIELD_SERVICE_COMBINED_CHARACTERS[] = "CombinedC static sal_Char __READONLY_DATA FIELD_SERVICE_MEASURE[] = "Measure"; -SvXMLEnumMapEntry __READONLY_DATA aFieldServiceNameMapping[] = +SvXMLEnumStringMapEntry __READONLY_DATA aFieldServiceNameMapping[] = { - { FIELD_SERVICE_SENDER, FIELD_ID_SENDER }, - { FIELD_SERVICE_AUTHOR, FIELD_ID_AUTHOR }, - { FIELD_SERVICE_JUMPEDIT, FIELD_ID_PLACEHOLDER }, - { FIELD_SERVICE_GETEXP, FIELD_ID_VARIABLE_GET }, - { FIELD_SERVICE_SETEXP, FIELD_ID_VARIABLE_SET }, - { FIELD_SERVICE_USER, FIELD_ID_USER_GET }, - { FIELD_SERVICE_INPUT, FIELD_ID_TEXT_INPUT }, - { FIELD_SERVICE_USERINPUT, FIELD_ID_USER_INPUT }, - { FIELD_SERVICE_DATETIME, FIELD_ID_TIME }, - { FIELD_SERVICE_PAGENUMBER, FIELD_ID_PAGENUMBER }, - { FIELD_SERVICE_REFERENCE_PAGE_SET, FIELD_ID_REFPAGE_SET }, - { FIELD_SERVICE_REFERENCE_PAGE_GET, FIELD_ID_REFPAGE_GET }, - - { FIELD_SERVICE_DB_NEXT, FIELD_ID_DATABASE_NEXT }, - { FIELD_SERVICE_DB_SELECT, FIELD_ID_DATABASE_SELECT }, - { FIELD_SERVICE_DB_NUMBER, FIELD_ID_DATABASE_NUMBER }, - { FIELD_SERVICE_DB_DISPLAY, FIELD_ID_DATABASE_DISPLAY }, + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_SENDER, FIELD_ID_SENDER ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_AUTHOR, FIELD_ID_AUTHOR ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_JUMPEDIT, FIELD_ID_PLACEHOLDER ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_GETEXP, FIELD_ID_VARIABLE_GET ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_SETEXP, FIELD_ID_VARIABLE_SET ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_USER, FIELD_ID_USER_GET ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_INPUT, FIELD_ID_TEXT_INPUT ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_USERINPUT, FIELD_ID_USER_INPUT ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_DATETIME, FIELD_ID_TIME ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_PAGENUMBER, FIELD_ID_PAGENUMBER ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_REFERENCE_PAGE_SET, FIELD_ID_REFPAGE_SET ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_REFERENCE_PAGE_GET, FIELD_ID_REFPAGE_GET ), + + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_DB_NEXT, FIELD_ID_DATABASE_NEXT ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_DB_SELECT, FIELD_ID_DATABASE_SELECT ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_DB_NUMBER, FIELD_ID_DATABASE_NUMBER ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_DB_DISPLAY, FIELD_ID_DATABASE_DISPLAY ), // workaround for #no-bug#: Database/DataBase - { "DataBase", FIELD_ID_DATABASE_DISPLAY }, - { FIELD_SERVICE_DB_NAME, FIELD_ID_DATABASE_NAME }, - - { FIELD_SERVICE_DOC_INFO_CREATE_AUTHOR, FIELD_ID_DOCINFO_CREATION_AUTHOR }, - { FIELD_SERVICE_DOC_INFO_CREATE_DATE_TIME, FIELD_ID_DOCINFO_CREATION_TIME}, - { FIELD_SERVICE_DOC_INFO_CHANGE_AUTHOR, FIELD_ID_DOCINFO_SAVE_AUTHOR }, - { FIELD_SERVICE_DOC_INFO_CHANGE_DATE_TIME, FIELD_ID_DOCINFO_SAVE_TIME }, - { FIELD_SERVICE_DOC_INFO_EDIT_TIME, FIELD_ID_DOCINFO_EDIT_DURATION }, - { FIELD_SERVICE_DOC_INFO_DESCRIPTION, FIELD_ID_DOCINFO_DESCRIPTION }, - { FIELD_SERVICE_DOC_INFO_INFO0, FIELD_ID_DOCINFO_INFORMATION0 }, - { FIELD_SERVICE_DOC_INFO_INFO1, FIELD_ID_DOCINFO_INFORMATION1 }, - { FIELD_SERVICE_DOC_INFO_INFO2, FIELD_ID_DOCINFO_INFORMATION2 }, - { FIELD_SERVICE_DOC_INFO_INFO3, FIELD_ID_DOCINFO_INFORMATION3 }, - { FIELD_SERVICE_DOC_INFO_PRINT_AUTHOR, FIELD_ID_DOCINFO_PRINT_AUTHOR }, - { FIELD_SERVICE_DOC_INFO_PRINT_DATE_TIME, FIELD_ID_DOCINFO_PRINT_TIME }, - { FIELD_SERVICE_DOC_INFO_KEY_WORDS, FIELD_ID_DOCINFO_KEYWORDS }, - { FIELD_SERVICE_DOC_INFO_SUBJECT, FIELD_ID_DOCINFO_SUBJECT }, - { FIELD_SERVICE_DOC_INFO_TITLE, FIELD_ID_DOCINFO_TITLE }, - { FIELD_SERVICE_DOC_INFO_REVISION, FIELD_ID_DOCINFO_REVISION }, - - { FIELD_SERVICE_CONDITIONAL_TEXT, FIELD_ID_CONDITIONAL_TEXT }, - { FIELD_SERVICE_HIDDEN_TEXT, FIELD_ID_HIDDEN_TEXT }, - { FIELD_SERVICE_HIDDEN_PARAGRAPH, FIELD_ID_HIDDEN_PARAGRAPH }, - - { FIELD_SERVICE_FILE_NAME, FIELD_ID_FILE_NAME }, - { FIELD_SERVICE_CHAPTER, FIELD_ID_CHAPTER }, - { FIELD_SERVICE_TEMPLATE_NAME, FIELD_ID_TEMPLATE_NAME }, - - { FIELD_SERVICE_PAGE_COUNT, FIELD_ID_COUNT_PAGES }, - { FIELD_SERVICE_PARAGRAPH_COUNT, FIELD_ID_COUNT_PARAGRAPHS }, - { FIELD_SERVICE_WORD_COUNT, FIELD_ID_COUNT_WORDS }, - { FIELD_SERVICE_CHARACTER_COUNT, FIELD_ID_COUNT_CHARACTERS }, - { FIELD_SERVICE_TABLE_COUNT, FIELD_ID_COUNT_TABLES }, - { FIELD_SERVICE_GRAPHIC_COUNT, FIELD_ID_COUNT_GRAPHICS }, - { FIELD_SERVICE_OBJECT_COUNT, FIELD_ID_COUNT_OBJECTS }, - - { FIELD_SERVICE_MACRO, FIELD_ID_MACRO }, - { FIELD_SERVICE_GET_REFERENCE, FIELD_ID_REF_REFERENCE }, - { FIELD_SERVICE_DDE, FIELD_ID_DDE }, - - { FIELD_SERVICE_BIBLIOGRAPHY, FIELD_ID_BIBLIOGRAPHY }, - - { FIELD_SERVICE_SCRIPT, FIELD_ID_SCRIPT }, - { FIELD_SERVICE_ANNOTATION, FIELD_ID_ANNOTATION }, - - { FIELD_SERVICE_COMBINED_CHARACTERS, FIELD_ID_COMBINED_CHARACTERS }, + ENUM_STRING_MAP_ENTRY( "DataBase", FIELD_ID_DATABASE_DISPLAY ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_DB_NAME, FIELD_ID_DATABASE_NAME ), + + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_DOC_INFO_CREATE_AUTHOR, FIELD_ID_DOCINFO_CREATION_AUTHOR ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_DOC_INFO_CREATE_DATE_TIME, FIELD_ID_DOCINFO_CREATION_TIME), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_DOC_INFO_CHANGE_AUTHOR, FIELD_ID_DOCINFO_SAVE_AUTHOR ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_DOC_INFO_CHANGE_DATE_TIME, FIELD_ID_DOCINFO_SAVE_TIME ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_DOC_INFO_EDIT_TIME, FIELD_ID_DOCINFO_EDIT_DURATION ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_DOC_INFO_DESCRIPTION, FIELD_ID_DOCINFO_DESCRIPTION ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_DOC_INFO_INFO0, FIELD_ID_DOCINFO_INFORMATION0 ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_DOC_INFO_INFO1, FIELD_ID_DOCINFO_INFORMATION1 ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_DOC_INFO_INFO2, FIELD_ID_DOCINFO_INFORMATION2 ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_DOC_INFO_INFO3, FIELD_ID_DOCINFO_INFORMATION3 ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_DOC_INFO_PRINT_AUTHOR, FIELD_ID_DOCINFO_PRINT_AUTHOR ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_DOC_INFO_PRINT_DATE_TIME, FIELD_ID_DOCINFO_PRINT_TIME ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_DOC_INFO_KEY_WORDS, FIELD_ID_DOCINFO_KEYWORDS ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_DOC_INFO_SUBJECT, FIELD_ID_DOCINFO_SUBJECT ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_DOC_INFO_TITLE, FIELD_ID_DOCINFO_TITLE ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_DOC_INFO_REVISION, FIELD_ID_DOCINFO_REVISION ), + + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_CONDITIONAL_TEXT, FIELD_ID_CONDITIONAL_TEXT ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_HIDDEN_TEXT, FIELD_ID_HIDDEN_TEXT ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_HIDDEN_PARAGRAPH, FIELD_ID_HIDDEN_PARAGRAPH ), + + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_FILE_NAME, FIELD_ID_FILE_NAME ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_CHAPTER, FIELD_ID_CHAPTER ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_TEMPLATE_NAME, FIELD_ID_TEMPLATE_NAME ), + + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_PAGE_COUNT, FIELD_ID_COUNT_PAGES ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_PARAGRAPH_COUNT, FIELD_ID_COUNT_PARAGRAPHS ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_WORD_COUNT, FIELD_ID_COUNT_WORDS ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_CHARACTER_COUNT, FIELD_ID_COUNT_CHARACTERS ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_TABLE_COUNT, FIELD_ID_COUNT_TABLES ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_GRAPHIC_COUNT, FIELD_ID_COUNT_GRAPHICS ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_OBJECT_COUNT, FIELD_ID_COUNT_OBJECTS ), + + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_MACRO, FIELD_ID_MACRO ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_GET_REFERENCE, FIELD_ID_REF_REFERENCE ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_DDE, FIELD_ID_DDE ), + + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_BIBLIOGRAPHY, FIELD_ID_BIBLIOGRAPHY ), + + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_SCRIPT, FIELD_ID_SCRIPT ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_ANNOTATION, FIELD_ID_ANNOTATION ), + + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_COMBINED_CHARACTERS, FIELD_ID_COMBINED_CHARACTERS ), // non-writer fields - { FIELD_SERVICE_SHEET_NAME, FIELD_ID_SHEET_NAME }, - { FIELD_SERVICE_URL, FIELD_ID_URL }, - { FIELD_SERVICE_MEASURE, FIELD_ID_MEASURE }, + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_SHEET_NAME, FIELD_ID_SHEET_NAME ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_URL, FIELD_ID_URL ), + ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_MEASURE, FIELD_ID_MEASURE ), - { 0, 0 } + ENUM_STRING_MAP_END() }; @@ -2434,29 +2435,29 @@ void XMLTextFieldExport::ProcessDateTime(const sal_Char* sXMLName, SvXMLEnumMapEntry __READONLY_DATA aBibliographyDataTypeMap[] = { - { sXML_article, BibliographyDataType::ARTICLE }, - { sXML_book, BibliographyDataType::BOOK }, - { sXML_booklet, BibliographyDataType::BOOKLET }, - { sXML_conference, BibliographyDataType::CONFERENCE }, - { sXML_custom1, BibliographyDataType::CUSTOM1 }, - { sXML_custom2, BibliographyDataType::CUSTOM2 }, - { sXML_custom3, BibliographyDataType::CUSTOM3 }, - { sXML_custom4, BibliographyDataType::CUSTOM4 }, - { sXML_custom5, BibliographyDataType::CUSTOM5 }, - { sXML_email, BibliographyDataType::EMAIL }, - { sXML_inbook, BibliographyDataType::INBOOK }, - { sXML_incollection, BibliographyDataType::INCOLLECTION }, - { sXML_inproceedings, BibliographyDataType::INPROCEEDINGS }, - { sXML_journal, BibliographyDataType::JOURNAL }, - { sXML_manual, BibliographyDataType::MANUAL }, - { sXML_mastersthesis, BibliographyDataType::MASTERSTHESIS }, - { sXML_misc, BibliographyDataType::MISC }, - { sXML_phdthesis, BibliographyDataType::PHDTHESIS }, - { sXML_proceedings, BibliographyDataType::PROCEEDINGS }, - { sXML_techreport, BibliographyDataType::TECHREPORT }, - { sXML_unpublished, BibliographyDataType::UNPUBLISHED }, - { sXML_www, BibliographyDataType::WWW }, - { 0, 0 } + { XML_ARTICLE, BibliographyDataType::ARTICLE }, + { XML_BOOK, BibliographyDataType::BOOK }, + { XML_BOOKLET, BibliographyDataType::BOOKLET }, + { XML_CONFERENCE, BibliographyDataType::CONFERENCE }, + { XML_CUSTOM1, BibliographyDataType::CUSTOM1 }, + { XML_CUSTOM2, BibliographyDataType::CUSTOM2 }, + { XML_CUSTOM3, BibliographyDataType::CUSTOM3 }, + { XML_CUSTOM4, BibliographyDataType::CUSTOM4 }, + { XML_CUSTOM5, BibliographyDataType::CUSTOM5 }, + { XML_EMAIL, BibliographyDataType::EMAIL }, + { XML_INBOOK, BibliographyDataType::INBOOK }, + { XML_INCOLLECTION, BibliographyDataType::INCOLLECTION }, + { XML_INPROCEEDINGS, BibliographyDataType::INPROCEEDINGS }, + { XML_JOURNAL, BibliographyDataType::JOURNAL }, + { XML_MANUAL, BibliographyDataType::MANUAL }, + { XML_MASTERSTHESIS, BibliographyDataType::MASTERSTHESIS }, + { XML_MISC, BibliographyDataType::MISC }, + { XML_PHDTHESIS, BibliographyDataType::PHDTHESIS }, + { XML_PROCEEDINGS, BibliographyDataType::PROCEEDINGS }, + { XML_TECHREPORT, BibliographyDataType::TECHREPORT }, + { XML_UNPUBLISHED, BibliographyDataType::UNPUBLISHED }, + { XML_WWW, BibliographyDataType::WWW }, + { XML_TOKEN_INVALID, 0 } }; diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index a706c4d2597e..b1d8ef883e23 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtfldi.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: nn $ $Date: 2001-05-31 18:15:39 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -227,7 +227,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::document; using namespace ::com::sun::star::util; using namespace ::com::sun::star::xml::sax; - +using namespace ::xmloff::token; // @@ -1020,10 +1020,10 @@ TYPEINIT1( XMLPageContinuationImportContext, XMLTextFieldImportContext ); static SvXMLEnumMapEntry __READONLY_DATA lcl_aSelectPageAttrMap[] = { - { sXML_previous, PageNumberType_PREV }, - { sXML_current, PageNumberType_CURRENT }, - { sXML_next, PageNumberType_NEXT }, - { 0, 0 }, + { XML_PREVIOUS, PageNumberType_PREV }, + { XML_CURRENT, PageNumberType_CURRENT }, + { XML_NEXT, PageNumberType_NEXT }, + { XML_TOKEN_INVALID, 0 }, }; XMLPageContinuationImportContext::XMLPageContinuationImportContext( @@ -2308,11 +2308,11 @@ TYPEINIT1( XMLFileNameImportContext, XMLTextFieldImportContext ); static const SvXMLEnumMapEntry aFilenameDisplayMap[] = { - { sXML_path, FilenameDisplayFormat::PATH }, - { sXML_name, FilenameDisplayFormat::NAME }, - { sXML_name_and_extension, FilenameDisplayFormat::NAME_AND_EXT }, - { sXML_full, FilenameDisplayFormat::FULL }, - { 0, 0 } + { XML_PATH, FilenameDisplayFormat::PATH }, + { XML_NAME, FilenameDisplayFormat::NAME }, + { XML_NAME_AND_EXTENSION, FilenameDisplayFormat::NAME_AND_EXT }, + { XML_FULL, FilenameDisplayFormat::FULL }, + { XML_TOKEN_INVALID, 0 } }; XMLFileNameImportContext::XMLFileNameImportContext( @@ -2396,13 +2396,13 @@ void XMLFileNameImportContext::PrepareField( static const SvXMLEnumMapEntry aTemplateDisplayMap[] = { - { sXML_full, TemplateDisplayFormat::FULL }, - { sXML_path, TemplateDisplayFormat::PATH }, - { sXML_name, TemplateDisplayFormat::NAME }, - { sXML_name_and_extension, TemplateDisplayFormat::NAME_AND_EXT }, - { sXML_area, TemplateDisplayFormat::AREA }, - { sXML_title, TemplateDisplayFormat::TITLE }, - { 0, 0 } + { XML_FULL, TemplateDisplayFormat::FULL }, + { XML_PATH, TemplateDisplayFormat::PATH }, + { XML_NAME, TemplateDisplayFormat::NAME }, + { XML_NAME_AND_EXTENSION, TemplateDisplayFormat::NAME_AND_EXT }, + { XML_AREA, TemplateDisplayFormat::AREA }, + { XML_TITLE, TemplateDisplayFormat::TITLE }, + { XML_TOKEN_INVALID, 0 } }; TYPEINIT1( XMLTemplateNameImportContext, XMLTextFieldImportContext ); @@ -2458,12 +2458,12 @@ TYPEINIT1( XMLChapterImportContext, XMLTextFieldImportContext ); static const SvXMLEnumMapEntry aChapterDisplayMap[] = { - { sXML_name, ChapterFormat::NAME }, - { sXML_number, ChapterFormat::NUMBER }, - { sXML_number_and_name, ChapterFormat::NAME_NUMBER }, - { sXML_plain_number_and_name, ChapterFormat::NO_PREFIX_SUFFIX }, - { sXML_plain_number, ChapterFormat::DIGIT }, - { 0, 0 } + { XML_NAME, ChapterFormat::NAME }, + { XML_NUMBER, ChapterFormat::NUMBER }, + { XML_NUMBER_AND_NAME, ChapterFormat::NAME_NUMBER }, + { XML_PLAIN_NUMBER_AND_NAME, ChapterFormat::NO_PREFIX_SUFFIX }, + { XML_PLAIN_NUMBER, ChapterFormat::DIGIT }, + { XML_TOKEN_INVALID, 0 } }; XMLChapterImportContext::XMLChapterImportContext( @@ -2824,14 +2824,14 @@ XMLReferenceFieldImportContext::XMLReferenceFieldImportContext( static SvXMLEnumMapEntry __READONLY_DATA lcl_aReferenceTypeTokenMap[] = { - { sXML_page, ReferenceFieldPart::PAGE}, - { sXML_chapter, ReferenceFieldPart::CHAPTER }, - { sXML_text, ReferenceFieldPart::TEXT }, - { sXML_direction, ReferenceFieldPart::UP_DOWN }, - { sXML_category_and_value, ReferenceFieldPart::CATEGORY_AND_NUMBER }, - { sXML_caption, ReferenceFieldPart::ONLY_CAPTION }, - { sXML_value, ReferenceFieldPart::ONLY_SEQUENCE_NUMBER }, - { 0, 0 } + { XML_PAGE, ReferenceFieldPart::PAGE}, + { XML_CHAPTER, ReferenceFieldPart::CHAPTER }, + { XML_TEXT, ReferenceFieldPart::TEXT }, + { XML_DIRECTION, ReferenceFieldPart::UP_DOWN }, + { XML_CATEGORY_AND_VALUE, ReferenceFieldPart::CATEGORY_AND_NUMBER }, + { XML_CAPTION, ReferenceFieldPart::ONLY_CAPTION }, + { XML_VALUE, ReferenceFieldPart::ONLY_SEQUENCE_NUMBER }, + { XML_TOKEN_INVALID, 0 } }; void XMLReferenceFieldImportContext::StartElement( @@ -3311,38 +3311,38 @@ XMLBibliographyFieldImportContext::XMLBibliographyFieldImportContext( // TODO: this is the same map as is used in XMLSectionExport; we need only one copy. SvXMLEnumMapEntry __READONLY_DATA aBibliographyDataFieldMap[] = { - { sXML_address, BibliographyDataField::ADDRESS }, - { sXML_annote, BibliographyDataField::ANNOTE }, - { sXML_author, BibliographyDataField::AUTHOR }, - { sXML_bibiliographic_type, BibliographyDataField::BIBILIOGRAPHIC_TYPE }, - { sXML_booktitle, BibliographyDataField::BOOKTITLE }, - { sXML_chapter, BibliographyDataField::CHAPTER }, - { sXML_custom1, BibliographyDataField::CUSTOM1 }, - { sXML_custom2, BibliographyDataField::CUSTOM2 }, - { sXML_custom3, BibliographyDataField::CUSTOM3 }, - { sXML_custom4, BibliographyDataField::CUSTOM4 }, - { sXML_custom5, BibliographyDataField::CUSTOM5 }, - { sXML_edition, BibliographyDataField::EDITION }, - { sXML_editor, BibliographyDataField::EDITOR }, - { sXML_howpublished, BibliographyDataField::HOWPUBLISHED }, - { sXML_identifier, BibliographyDataField::IDENTIFIER }, - { sXML_institution, BibliographyDataField::INSTITUTION }, - { sXML_isbn, BibliographyDataField::ISBN }, - { sXML_journal, BibliographyDataField::JOURNAL }, - { sXML_month, BibliographyDataField::MONTH }, - { sXML_note, BibliographyDataField::NOTE }, - { sXML_number, BibliographyDataField::NUMBER }, - { sXML_organizations, BibliographyDataField::ORGANIZATIONS }, - { sXML_pages, BibliographyDataField::PAGES }, - { sXML_publisher, BibliographyDataField::PUBLISHER }, - { sXML_report_type, BibliographyDataField::REPORT_TYPE }, - { sXML_school, BibliographyDataField::SCHOOL }, - { sXML_series, BibliographyDataField::SERIES }, - { sXML_title, BibliographyDataField::TITLE }, - { sXML_url, BibliographyDataField::URL }, - { sXML_volume, BibliographyDataField::VOLUME }, - { sXML_year, BibliographyDataField::YEAR }, - { NULL, NULL } + { XML_ADDRESS, BibliographyDataField::ADDRESS }, + { XML_ANNOTE, BibliographyDataField::ANNOTE }, + { XML_AUTHOR, BibliographyDataField::AUTHOR }, + { XML_BIBILIOGRAPHIC_TYPE, BibliographyDataField::BIBILIOGRAPHIC_TYPE }, + { XML_BOOKTITLE, BibliographyDataField::BOOKTITLE }, + { XML_CHAPTER, BibliographyDataField::CHAPTER }, + { XML_CUSTOM1, BibliographyDataField::CUSTOM1 }, + { XML_CUSTOM2, BibliographyDataField::CUSTOM2 }, + { XML_CUSTOM3, BibliographyDataField::CUSTOM3 }, + { XML_CUSTOM4, BibliographyDataField::CUSTOM4 }, + { XML_CUSTOM5, BibliographyDataField::CUSTOM5 }, + { XML_EDITION, BibliographyDataField::EDITION }, + { XML_EDITOR, BibliographyDataField::EDITOR }, + { XML_HOWPUBLISHED, BibliographyDataField::HOWPUBLISHED }, + { XML_IDENTIFIER, BibliographyDataField::IDENTIFIER }, + { XML_INSTITUTION, BibliographyDataField::INSTITUTION }, + { XML_ISBN, BibliographyDataField::ISBN }, + { XML_JOURNAL, BibliographyDataField::JOURNAL }, + { XML_MONTH, BibliographyDataField::MONTH }, + { XML_NOTE, BibliographyDataField::NOTE }, + { XML_NUMBER, BibliographyDataField::NUMBER }, + { XML_ORGANIZATIONS, BibliographyDataField::ORGANIZATIONS }, + { XML_PAGES, BibliographyDataField::PAGES }, + { XML_PUBLISHER, BibliographyDataField::PUBLISHER }, + { XML_REPORT_TYPE, BibliographyDataField::REPORT_TYPE }, + { XML_SCHOOL, BibliographyDataField::SCHOOL }, + { XML_SERIES, BibliographyDataField::SERIES }, + { XML_TITLE, BibliographyDataField::TITLE }, + { XML_URL, BibliographyDataField::URL }, + { XML_VOLUME, BibliographyDataField::VOLUME }, + { XML_YEAR, BibliographyDataField::YEAR }, + { XML_TOKEN_INVALID, 0 } }; // we'll process attributes on our own and forfit the standard diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index 1bc5b462cc45..0563e13c18dc 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtparai.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: mib $ $Date: 2001-05-18 13:52:46 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -106,6 +106,9 @@ #ifndef _XMLOFF_XMLKYWD_HXX #include "xmlkywd.hxx" #endif +#ifndef _XMLOFF_XMLTOKEN_HXX +#include "xmltoken.hxx" +#endif #ifndef _XMLOFF_NMSPMAP_HXX #include "nmspmap.hxx" #endif @@ -148,6 +151,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; using namespace ::com::sun::star::drawing; +using namespace ::xmloff::token; // --------------------------------------------------------------------- @@ -1324,6 +1328,7 @@ void XMLTOCMarkImportContext_Impl::ProcessAttribute( class XMLUserIndexMarkImportContext_Impl : public XMLIndexMarkImportContext_Impl { const OUString sUserIndexName; + const OUString sLevel; public: TYPEINFO(); @@ -1351,7 +1356,8 @@ XMLUserIndexMarkImportContext_Impl::XMLUserIndexMarkImportContext_Impl( enum XMLTextPElemTokens nTok, XMLHints_Impl& rHnts) : XMLIndexMarkImportContext_Impl(rImport, nPrefix, rLocalName, nTok, rHnts), - sUserIndexName(RTL_CONSTASCII_USTRINGPARAM("UserIndexName")) + sUserIndexName(RTL_CONSTASCII_USTRINGPARAM("UserIndexName")), + sLevel(RTL_CONSTASCII_USTRINGPARAM("Level")) { } @@ -1359,15 +1365,38 @@ void XMLUserIndexMarkImportContext_Impl::ProcessAttribute( sal_uInt16 nNamespace, OUString sLocalName, OUString sValue, Reference<beans::XPropertySet>& rPropSet) { - if ((XML_NAMESPACE_TEXT == nNamespace) && - (sLocalName.equalsAsciiL(sXML_index_name, sizeof(sXML_index_name)-1))) + if ( XML_NAMESPACE_TEXT == nNamespace ) { - Any aAny; - aAny <<= sValue; - rPropSet->setPropertyValue(sUserIndexName, aAny); + if ( IsXMLToken( sLocalName, XML_INDEX_NAME ) ) + { + Any aAny; + aAny <<= sValue; + rPropSet->setPropertyValue(sUserIndexName, aAny); + } + else if ( IsXMLToken( sLocalName, XML_OUTLINE_LEVEL ) ) + { + // ouline level: set Level property + sal_Int32 nTmp; + if (SvXMLUnitConverter::convertNumber( + nTmp, sValue, 0, + GetImport().GetTextImport()->GetChapterNumbering()->getCount())) + { + Any aAny; + aAny <<= (sal_Int16)nTmp; + rPropSet->setPropertyValue(sLevel, aAny); + } + // else: value out of range -> ignore + } + else + { + // else: unknown text property: delegate to super class + XMLIndexMarkImportContext_Impl::ProcessAttribute( + nNamespace, sLocalName, sValue, rPropSet); + } } else { + // else: unknown namespace: delegate to super class XMLIndexMarkImportContext_Impl::ProcessAttribute( nNamespace, sLocalName, sValue, rPropSet); } diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx index e6501c1da398..013cc020cfb5 100644 --- a/xmloff/source/text/txtprhdl.cxx +++ b/xmloff/source/text/txtprhdl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtprhdl.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: mib $ $Date: 2001-05-10 10:09:49 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -143,6 +143,8 @@ using namespace ::com::sun::star::style; //using namespace ::com::sun::star::container; //using namespace ::com::sun::star::beans; using namespace ::com::sun::star::text; +using namespace ::xmloff::token; + #define CONSTASCII_USTRINGPARAM_CMP(s) s, sizeof(s)-1 @@ -150,160 +152,160 @@ using namespace ::com::sun::star::text; SvXMLEnumMapEntry __READONLY_DATA pXML_HoriPos_Enum[] = { - { sXML_from_left, HoriOrientation::NONE }, - { sXML_from_inside, HoriOrientation::NONE }, // import only - { sXML_left, HoriOrientation::LEFT }, - { sXML_inside, HoriOrientation::LEFT }, // import only - { sXML_center, HoriOrientation::CENTER }, - { sXML_right, HoriOrientation::RIGHT }, - { sXML_outside, HoriOrientation::RIGHT }, // import only - { 0, 0 } + { XML_FROM_LEFT, HoriOrientation::NONE }, + { XML_FROM_INSIDE, HoriOrientation::NONE }, // import only + { XML_LEFT, HoriOrientation::LEFT }, + { XML_INSIDE, HoriOrientation::LEFT }, // import only + { XML_CENTER, HoriOrientation::CENTER }, + { XML_RIGHT, HoriOrientation::RIGHT }, + { XML_OUTSIDE, HoriOrientation::RIGHT }, // import only + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_HoriPosMirrored_Enum[] = { - { sXML_from_inside, HoriOrientation::NONE }, - { sXML_inside, HoriOrientation::LEFT }, - { sXML_center, HoriOrientation::CENTER }, - { sXML_outside, HoriOrientation::RIGHT }, - { 0, 0 } + { XML_FROM_INSIDE, HoriOrientation::NONE }, + { XML_INSIDE, HoriOrientation::LEFT }, + { XML_CENTER, HoriOrientation::CENTER }, + { XML_OUTSIDE, HoriOrientation::RIGHT }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_HoriRel_Enum[] = { - { sXML_paragraph, RelOrientation::FRAME }, - { sXML_paragraph_content, RelOrientation::PRINT_AREA }, - { sXML_page, RelOrientation::PAGE_FRAME }, - { sXML_page_content, RelOrientation::PAGE_PRINT_AREA }, - { sXML_paragraph_start_margin, RelOrientation::FRAME_LEFT }, - { sXML_paragraph_end_margin, RelOrientation::FRAME_RIGHT }, - { sXML_page_start_margin, RelOrientation::PAGE_LEFT }, - { sXML_page_end_margin, RelOrientation::PAGE_RIGHT }, - { sXML_char, RelOrientation::CHAR }, - { sXML_frame, RelOrientation::FRAME }, // import only - { sXML_frame_content, RelOrientation::PRINT_AREA }, // import only - { sXML_frame_start_margin, RelOrientation::FRAME_LEFT }, // import only - { sXML_frame_end_margin, RelOrientation::FRAME_RIGHT }, // import only - { 0, 0 } + { XML_PARAGRAPH, RelOrientation::FRAME }, + { XML_PARAGRAPH_CONTENT, RelOrientation::PRINT_AREA }, + { XML_PAGE, RelOrientation::PAGE_FRAME }, + { XML_PAGE_CONTENT, RelOrientation::PAGE_PRINT_AREA }, + { XML_PARAGRAPH_START_MARGIN, RelOrientation::FRAME_LEFT }, + { XML_PARAGRAPH_END_MARGIN, RelOrientation::FRAME_RIGHT }, + { XML_PAGE_START_MARGIN, RelOrientation::PAGE_LEFT }, + { XML_PAGE_END_MARGIN, RelOrientation::PAGE_RIGHT }, + { XML_CHAR, RelOrientation::CHAR }, + { XML_FRAME, RelOrientation::FRAME }, // import only + { XML_FRAME_CONTENT, RelOrientation::PRINT_AREA }, // import only + { XML_FRAME_START_MARGIN, RelOrientation::FRAME_LEFT }, // import only + { XML_FRAME_END_MARGIN, RelOrientation::FRAME_RIGHT }, // import only + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_HoriRelFrame_Enum[] = { - { sXML_frame, RelOrientation::FRAME }, - { sXML_frame_content, RelOrientation::PRINT_AREA }, - { sXML_page, RelOrientation::PAGE_FRAME }, - { sXML_page_content, RelOrientation::PAGE_PRINT_AREA }, - { sXML_frame_start_margin, RelOrientation::FRAME_LEFT }, - { sXML_frame_end_margin, RelOrientation::FRAME_RIGHT }, - { sXML_page_start_margin, RelOrientation::PAGE_LEFT }, - { sXML_page_end_margin, RelOrientation::PAGE_RIGHT }, - { sXML_char, RelOrientation::CHAR }, - { 0, 0 } + { XML_FRAME, RelOrientation::FRAME }, + { XML_FRAME_CONTENT, RelOrientation::PRINT_AREA }, + { XML_PAGE, RelOrientation::PAGE_FRAME }, + { XML_PAGE_CONTENT, RelOrientation::PAGE_PRINT_AREA }, + { XML_FRAME_START_MARGIN, RelOrientation::FRAME_LEFT }, + { XML_FRAME_END_MARGIN, RelOrientation::FRAME_RIGHT }, + { XML_PAGE_START_MARGIN, RelOrientation::PAGE_LEFT }, + { XML_PAGE_END_MARGIN, RelOrientation::PAGE_RIGHT }, + { XML_CHAR, RelOrientation::CHAR }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_HoriMirror_Enum[] = { - { sXML_from_left, sal_False }, - { sXML_from_inside, sal_True }, - { sXML_left, sal_False }, - { sXML_inside, sal_True }, - { sXML_center, sal_False }, - { sXML_right, sal_False }, - { sXML_outside, sal_True }, - { 0, 0 } + { XML_FROM_LEFT, sal_False }, + { XML_FROM_INSIDE, sal_True }, + { XML_LEFT, sal_False }, + { XML_INSIDE, sal_True }, + { XML_CENTER, sal_False }, + { XML_RIGHT, sal_False }, + { XML_OUTSIDE, sal_True }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_VertPos_Enum[] = { - { sXML_from_top, VertOrientation::NONE }, - { sXML_top, VertOrientation::TOP }, - { sXML_top, VertOrientation::CHAR_TOP }, // export only - { sXML_top, VertOrientation::LINE_TOP }, // export only - { sXML_middle, VertOrientation::CENTER }, - { sXML_middle, VertOrientation::CHAR_CENTER }, // export only - { sXML_middle, VertOrientation::LINE_CENTER }, // export only - { sXML_bottom, VertOrientation::BOTTOM }, - { sXML_bottom, VertOrientation::CHAR_BOTTOM }, // export only - { sXML_bottom, VertOrientation::LINE_BOTTOM }, // export only - { 0, 0 } + { XML_FROM_TOP, VertOrientation::NONE }, + { XML_TOP, VertOrientation::TOP }, + { XML_TOP, VertOrientation::CHAR_TOP }, // export only + { XML_TOP, VertOrientation::LINE_TOP }, // export only + { XML_MIDDLE, VertOrientation::CENTER }, + { XML_MIDDLE, VertOrientation::CHAR_CENTER }, // export only + { XML_MIDDLE, VertOrientation::LINE_CENTER }, // export only + { XML_BOTTOM, VertOrientation::BOTTOM }, + { XML_BOTTOM, VertOrientation::CHAR_BOTTOM }, // export only + { XML_BOTTOM, VertOrientation::LINE_BOTTOM }, // export only + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_VertRel_Enum[] = { - { sXML_paragraph, RelOrientation::FRAME }, - { sXML_paragraph_content, RelOrientation::PRINT_AREA }, - { sXML_char, RelOrientation::CHAR }, - { sXML_page, RelOrientation::FRAME }, // import only - { sXML_page_content, RelOrientation::PRINT_AREA }, // import only - { sXML_frame, RelOrientation::FRAME }, // import only - { sXML_frame_content, RelOrientation::PRINT_AREA }, // import only - { 0, 0 } + { XML_PARAGRAPH, RelOrientation::FRAME }, + { XML_PARAGRAPH_CONTENT, RelOrientation::PRINT_AREA }, + { XML_CHAR, RelOrientation::CHAR }, + { XML_PAGE, RelOrientation::FRAME }, // import only + { XML_PAGE_CONTENT, RelOrientation::PRINT_AREA }, // import only + { XML_FRAME, RelOrientation::FRAME }, // import only + { XML_FRAME_CONTENT, RelOrientation::PRINT_AREA }, // import only + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_VertRelPage_Enum[] = { - { sXML_page, RelOrientation::FRAME }, - { sXML_page_content, RelOrientation::PRINT_AREA }, - { sXML_page, RelOrientation::PAGE_FRAME }, - { sXML_page_content, RelOrientation::PAGE_PRINT_AREA }, - { 0, 0 } + { XML_PAGE, RelOrientation::FRAME }, + { XML_PAGE_CONTENT, RelOrientation::PRINT_AREA }, + { XML_PAGE, RelOrientation::PAGE_FRAME }, + { XML_PAGE_CONTENT, RelOrientation::PAGE_PRINT_AREA }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_VertRelFrame_Enum[] = { - { sXML_frame, RelOrientation::FRAME }, - { sXML_frame_content, RelOrientation::PRINT_AREA }, - { 0, 0 } + { XML_FRAME, RelOrientation::FRAME }, + { XML_FRAME_CONTENT, RelOrientation::PRINT_AREA }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_VertRelAsChar_Enum[] = { - { sXML_baseline, VertOrientation::TOP }, - { sXML_baseline, VertOrientation::CENTER }, // export only - { sXML_baseline, VertOrientation::BOTTOM }, // export only - { sXML_text, VertOrientation::CHAR_TOP }, - { sXML_text, VertOrientation::CHAR_CENTER }, // export only - { sXML_text, VertOrientation::CHAR_BOTTOM }, // export only - { sXML_line, VertOrientation::LINE_TOP }, - { sXML_line, VertOrientation::LINE_CENTER }, // export only - { sXML_line, VertOrientation::LINE_BOTTOM }, // export only - { 0, 0 } + { XML_BASELINE, VertOrientation::TOP }, + { XML_BASELINE, VertOrientation::CENTER }, // export only + { XML_BASELINE, VertOrientation::BOTTOM }, // export only + { XML_TEXT, VertOrientation::CHAR_TOP }, + { XML_TEXT, VertOrientation::CHAR_CENTER }, // export only + { XML_TEXT, VertOrientation::CHAR_BOTTOM }, // export only + { XML_LINE, VertOrientation::LINE_TOP }, + { XML_LINE, VertOrientation::LINE_CENTER }, // export only + { XML_LINE, VertOrientation::LINE_BOTTOM }, // export only + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_RubyAdjust_Enum[] = { - { sXML_left, RubyAdjust_LEFT }, - { sXML_center, RubyAdjust_CENTER }, - { sXML_right, RubyAdjust_RIGHT }, - { sXML_distribute_letter, RubyAdjust_BLOCK }, - { sXML_distribute_space, RubyAdjust_INDENT_BLOCK }, - { 0, 0 } + { XML_LEFT, RubyAdjust_LEFT }, + { XML_CENTER, RubyAdjust_CENTER }, + { XML_RIGHT, RubyAdjust_RIGHT }, + { XML_DISTRIBUTE_LETTER, RubyAdjust_BLOCK }, + { XML_DISTRIBUTE_SPACE, RubyAdjust_INDENT_BLOCK }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_FontRelief_Enum[] = { - { sXML_none, FontRelief::NONE }, - { sXML_engraved, FontRelief::ENGRAVED }, - { sXML_embossed, FontRelief::EMBOSSED }, - { 0, 0 } + { XML_NONE, FontRelief::NONE }, + { XML_ENGRAVED, FontRelief::ENGRAVED }, + { XML_EMBOSSED, FontRelief::EMBOSSED }, + { XML_TOKEN_INVALID, 0 } }; SvXMLEnumMapEntry __READONLY_DATA pXML_VerticalAlign_Enum[] = { #if SUPD > 630 - { sXML_top, ParagraphVertAlign::TOP }, - { sXML_middle, ParagraphVertAlign::CENTER }, - { sXML_bottom, ParagraphVertAlign::BOTTOM }, - { sXML_baseline, ParagraphVertAlign::BASELINE }, - { sXML_auto, ParagraphVertAlign::AUTOMATIC }, + { XML_TOP, ParagraphVertAlign::TOP }, + { XML_MIDDLE, ParagraphVertAlign::CENTER }, + { XML_BOTTOM, ParagraphVertAlign::BOTTOM }, + { XML_BASELINE, ParagraphVertAlign::BASELINE }, + { XML_AUTO, ParagraphVertAlign::AUTOMATIC }, #else - { sXML_top, 2 }, - { sXML_middle, 3 }, - { sXML_bottom, 4 }, - { sXML_baseline, 1 }, - { sXML_auto, 0 }, + { XML_TOP, 2 }, + { XML_MIDDLE, 3 }, + { XML_BOTTOM, 4 }, + { XML_BASELINE, 1 }, + { XML_AUTO, 0 }, #endif - { 0, 0 } + { XML_TOKEN_INVALID, 0 } }; // --------------------------------------------------------------------------- @@ -531,13 +533,13 @@ XMLParagraphOnlyPropHdl_Impl::~XMLParagraphOnlyPropHdl_Impl() SvXMLEnumMapEntry __READONLY_DATA pXML_Wrap_Enum[] = { - { sXML_none, WrapTextMode_NONE }, - { sXML_run_through, WrapTextMode_THROUGHT }, - { sXML_parallel, WrapTextMode_PARALLEL }, - { sXML_dynamic, WrapTextMode_DYNAMIC }, - { sXML_left, WrapTextMode_LEFT }, - { sXML_right, WrapTextMode_RIGHT }, - { 0, 0 } + { XML_NONE, WrapTextMode_NONE }, + { XML_RUN_THROUGH, WrapTextMode_THROUGHT }, + { XML_PARALLEL, WrapTextMode_PARALLEL }, + { XML_DYNAMIC, WrapTextMode_DYNAMIC }, + { XML_LEFT, WrapTextMode_LEFT }, + { XML_RIGHT, WrapTextMode_RIGHT }, + { XML_TOKEN_INVALID, 0 } }; class XMLWrapPropHdl_Impl : public XMLPropertyHandler @@ -580,7 +582,7 @@ sal_Bool XMLWrapPropHdl_Impl::exportXML( rValue >>= eVal; - sal_Bool bRet = rUnitConverter.convertEnum( aOut, eVal, pXML_Wrap_Enum, sXML_none ); + sal_Bool bRet = rUnitConverter.convertEnum( aOut, eVal, pXML_Wrap_Enum, XML_NONE ); rStrExpValue = aOut.makeStringAndClear(); @@ -678,12 +680,12 @@ XMLFrameProtectPropHdl_Impl::~XMLFrameProtectPropHdl_Impl() SvXMLEnumMapEntry __READONLY_DATA pXML_Anchor_Enum[] = { - { sXML_char, TextContentAnchorType_AT_CHARACTER }, - { sXML_page, TextContentAnchorType_AT_PAGE }, - { sXML_frame, TextContentAnchorType_AT_FRAME }, - { sXML_paragraph, TextContentAnchorType_AT_PARAGRAPH }, - { sXML_as_char, TextContentAnchorType_AS_CHARACTER }, - { 0, 0 } + { XML_CHAR, TextContentAnchorType_AT_CHARACTER }, + { XML_PAGE, TextContentAnchorType_AT_PAGE }, + { XML_FRAME, TextContentAnchorType_AT_FRAME }, + { XML_PARAGRAPH, TextContentAnchorType_AT_PARAGRAPH }, + { XML_AS_CHAR, TextContentAnchorType_AS_CHARACTER }, + { XML_TOKEN_INVALID, 0 } }; @@ -712,7 +714,7 @@ sal_Bool XMLAnchorTypePropHdl::exportXML( rValue >>= eVal; - sal_Bool bRet = rUnitConverter.convertEnum( aOut, eVal, pXML_Anchor_Enum, sXML_paragraph ); + sal_Bool bRet = rUnitConverter.convertEnum( aOut, eVal, pXML_Anchor_Enum, XML_PARAGRAPH ); rStrExpValue = aOut.makeStringAndClear(); @@ -944,12 +946,12 @@ XMLGrfMirrorPropHdl_Impl::~XMLGrfMirrorPropHdl_Impl() SvXMLEnumMapEntry __READONLY_DATA pXML_Emphasize_Enum[] = { - { sXML_none, FontEmphasis::NONE }, - { sXML_dot, FontEmphasis::DOT_ABOVE }, - { sXML_circle, FontEmphasis::CIRCLE_ABOVE }, - { sXML_disc, FontEmphasis::DISK_ABOVE }, - { sXML_accent, FontEmphasis::ACCENT_ABOVE }, - { 0, 0 } + { XML_NONE, FontEmphasis::NONE }, + { XML_DOT, FontEmphasis::DOT_ABOVE }, + { XML_CIRCLE, FontEmphasis::CIRCLE_ABOVE }, + { XML_DISC, FontEmphasis::DISK_ABOVE }, + { XML_ACCENT, FontEmphasis::ACCENT_ABOVE }, + { XML_TOKEN_INVALID, 0 } }; class XMLTextEmphasizePropHdl_Impl : public XMLPropertyHandler { @@ -1034,7 +1036,7 @@ sal_Bool XMLTextEmphasizePropHdl_Impl::exportXML( } bRet = rUnitConverter.convertEnum( aOut, nType, pXML_Emphasize_Enum, - sXML_dot ); + XML_DOT ); if( bRet ) { if( nType != 0 ) @@ -1318,34 +1320,34 @@ const XMLPropertyHandler *XMLTextPropertyHandlerFactory_Impl::GetPropertyHandler pHdl = new XMLTextColumnsPropertyHandler; break; case XML_TYPE_TEXT_HORIZONTAL_POS: - pHdl = new XMLConstantsPropertyHandler( pXML_HoriPos_Enum, 0 ); + pHdl = new XMLConstantsPropertyHandler( pXML_HoriPos_Enum, XML_TOKEN_INVALID ); break; case XML_TYPE_TEXT_HORIZONTAL_POS_MIRRORED: - pHdl = new XMLConstantsPropertyHandler( pXML_HoriPosMirrored_Enum, 0 ); + pHdl = new XMLConstantsPropertyHandler( pXML_HoriPosMirrored_Enum, XML_TOKEN_INVALID ); break; case XML_TYPE_TEXT_HORIZONTAL_REL: - pHdl = new XMLConstantsPropertyHandler( pXML_HoriRel_Enum, 0 ); + pHdl = new XMLConstantsPropertyHandler( pXML_HoriRel_Enum, XML_TOKEN_INVALID ); break; case XML_TYPE_TEXT_HORIZONTAL_REL_FRAME: - pHdl = new XMLConstantsPropertyHandler( pXML_HoriRelFrame_Enum, 0 ); + pHdl = new XMLConstantsPropertyHandler( pXML_HoriRelFrame_Enum, XML_TOKEN_INVALID ); break; case XML_TYPE_TEXT_HORIZONTAL_MIRROR: pHdl = new XMLHoriMirrorPropHdl_Impl; break; case XML_TYPE_TEXT_VERTICAL_POS: - pHdl = new XMLConstantsPropertyHandler( pXML_VertPos_Enum, 0 ); + pHdl = new XMLConstantsPropertyHandler( pXML_VertPos_Enum, XML_TOKEN_INVALID ); break; case XML_TYPE_TEXT_VERTICAL_REL: - pHdl = new XMLConstantsPropertyHandler( pXML_VertRel_Enum, 0 ); + pHdl = new XMLConstantsPropertyHandler( pXML_VertRel_Enum, XML_TOKEN_INVALID ); break; case XML_TYPE_TEXT_VERTICAL_REL_PAGE: - pHdl = new XMLConstantsPropertyHandler( pXML_VertRelPage_Enum, 0 ); + pHdl = new XMLConstantsPropertyHandler( pXML_VertRelPage_Enum, XML_TOKEN_INVALID ); break; case XML_TYPE_TEXT_VERTICAL_REL_FRAME: - pHdl = new XMLConstantsPropertyHandler( pXML_VertRelFrame_Enum, 0 ); + pHdl = new XMLConstantsPropertyHandler( pXML_VertRelFrame_Enum, XML_TOKEN_INVALID ); break; case XML_TYPE_TEXT_VERTICAL_REL_AS_CHAR: - pHdl = new XMLConstantsPropertyHandler( pXML_VertRelAsChar_Enum, 0 ); + pHdl = new XMLConstantsPropertyHandler( pXML_VertRelAsChar_Enum, XML_TOKEN_INVALID ); break; case XML_TYPE_TEXT_MIRROR_VERTICAL: pHdl = new XMLGrfMirrorPropHdl_Impl( sXML_vertical, sal_False ); @@ -1400,10 +1402,10 @@ const XMLPropertyHandler *XMLTextPropertyHandlerFactory_Impl::GetPropertyHandler pHdl = new XMLTextSyncWidthHeightPropHdl_Impl( sXML_scale_min ); break; case XML_TYPE_TEXT_RUBY_ADJUST: - pHdl = new XMLConstantsPropertyHandler( pXML_RubyAdjust_Enum, 0 ); + pHdl = new XMLConstantsPropertyHandler( pXML_RubyAdjust_Enum, XML_TOKEN_INVALID ); break; case XML_TYPE_TEXT_FONT_RELIEF: - pHdl = new XMLConstantsPropertyHandler( pXML_FontRelief_Enum, 0 ); + pHdl = new XMLConstantsPropertyHandler( pXML_FontRelief_Enum, XML_TOKEN_INVALID ); break; case XML_TYPE_TEXT_ROTATION_ANGLE: pHdl = new XMLTextRotationAnglePropHdl_Impl; @@ -1414,7 +1416,7 @@ const XMLPropertyHandler *XMLTextPropertyHandlerFactory_Impl::GetPropertyHandler OUString( RTL_CONSTASCII_USTRINGPARAM( sXML_line_height ) ) ); break; case XML_TYPE_TEXT_VERTICAL_ALIGN: - pHdl = new XMLConstantsPropertyHandler( pXML_VerticalAlign_Enum, 0 ); + pHdl = new XMLConstantsPropertyHandler( pXML_VerticalAlign_Enum, XML_TOKEN_INVALID ); break; } diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx index bfdaeace708d..8db9d608f807 100644 --- a/xmloff/source/text/txtstyli.cxx +++ b/xmloff/source/text/txtstyli.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtstyli.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: dvo $ $Date: 2001-06-11 10:39:13 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -138,16 +138,17 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; //using namespace ::com::sun::star::text; +using namespace ::xmloff::token; static __FAR_DATA SvXMLEnumMapEntry aCategoryMap[] = { - { sXML_text, ParagraphStyleCategory::TEXT }, - { sXML_chapter, ParagraphStyleCategory::CHAPTER }, - { sXML_list, ParagraphStyleCategory::LIST }, - { sXML_index, ParagraphStyleCategory::INDEX }, - { sXML_extra, ParagraphStyleCategory::EXTRA }, - { sXML_html, ParagraphStyleCategory::HTML }, - { 0, 0 } + { XML_TEXT, ParagraphStyleCategory::TEXT }, + { XML_CHAPTER, ParagraphStyleCategory::CHAPTER }, + { XML_LIST, ParagraphStyleCategory::LIST }, + { XML_INDEX, ParagraphStyleCategory::INDEX }, + { XML_EXTRA, ParagraphStyleCategory::EXTRA }, + { XML_HTML, ParagraphStyleCategory::HTML }, + { XML_TOKEN_INVALID, 0 } }; void XMLTextStyleContext::SetAttribute( sal_uInt16 nPrefixKey, diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index 182567b50055..ae49d99a4ee3 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtvfldi.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: dvo $ $Date: 2001-03-30 12:28:15 $ + * last change: $Author: dvo $ $Date: 2001-06-15 10:37:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -177,12 +177,13 @@ static const sal_Char sAPI_current_presentation[] = "CurrentPresentation"; static const sal_Char sAPI_sequence_value[] = "SequenceValue"; -using namespace rtl; -using namespace com::sun::star; -using namespace com::sun::star::uno; -using namespace com::sun::star::beans; -using namespace com::sun::star::text; -using namespace com::sun::star::style; +using namespace ::rtl; +using namespace ::com::sun::star; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::text; +using namespace ::com::sun::star::style; +using namespace ::xmloff::token; @@ -1195,14 +1196,14 @@ enum ValueType static SvXMLEnumMapEntry __READONLY_DATA aValueTypeMap[] = { - { sXML_float, XML_VALUE_TYPE_FLOAT }, - { sXML_currency, XML_VALUE_TYPE_CURRENCY }, - { sXML_percentage, XML_VALUE_TYPE_PERCENTAGE }, - { sXML_date, XML_VALUE_TYPE_DATE }, - { sXML_time, XML_VALUE_TYPE_TIME }, - { sXML_boolean, XML_VALUE_TYPE_BOOLEAN }, - { sXML_string, XML_VALUE_TYPE_STRING }, - { 0, 0 }, + { XML_FLOAT, XML_VALUE_TYPE_FLOAT }, + { XML_CURRENCY, XML_VALUE_TYPE_CURRENCY }, + { XML_PERCENTAGE, XML_VALUE_TYPE_PERCENTAGE }, + { XML_DATE, XML_VALUE_TYPE_DATE }, + { XML_TIME, XML_VALUE_TYPE_TIME }, + { XML_BOOLEAN, XML_VALUE_TYPE_BOOLEAN }, + { XML_STRING, XML_VALUE_TYPE_STRING }, + { XML_TOKEN_INVALID, 0 } }; XMLValueImportHelper::XMLValueImportHelper( |