diff options
| -rw-r--r-- | sw/inc/unoprnms.hxx | 7 | ||||
| -rw-r--r-- | sw/source/core/unocore/unomap.cxx | 42 |
2 files changed, 23 insertions, 26 deletions
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index 0e8fc2d6f119..eff1faa35017 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -2,9 +2,9 @@ * * $RCSfile: unoprnms.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: os $ $Date: 2000-10-26 10:00:45 $ + * last change: $Author: os $ $Date: 2000-10-27 14:23:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -509,8 +509,7 @@ extern const SwPropNameLen __FAR_DATA UNO_LINK_DISPLAY_BITMAP extern const SwPropNameLen __FAR_DATA UNO_NAME_HEADING_STYLE_NAME ; extern const SwPropNameLen __FAR_DATA UNO_NAME_SHOW_ONLINE_LAYOUT ; extern const SwPropNameLen __FAR_DATA UNO_NAME_USER_DEFINED_ATTRIBUTES ; -extern const SwPropNameLen __FAR_DATA UNO_NAME_PARA_USER_DEFINED_ATTRIBUTES ; -extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_USER_DEFINED_ATTRIBUTES ; +extern const SwPropNameLen __FAR_DATA UNO_NAME_TEXT_USER_DEFINED_ATTRIBUTES ; extern const SwPropNameLen __FAR_DATA UNO_NAME_FILE_PATH ; extern const SwPropNameLen __FAR_DATA UNO_NAME_PARA_CHAPTER_NUMBERING_LEVEL ; extern const SwPropNameLen __FAR_DATA UNO_NAME_PARA_CONDITIONAL_STYLE_NAME ; diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx index 3267c36ee728..64fa8b3cb104 100644 --- a/sw/source/core/unocore/unomap.cxx +++ b/sw/source/core/unocore/unomap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unomap.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: os $ $Date: 2000-10-25 12:59:42 $ + * last change: $Author: os $ $Date: 2000-10-27 14:22:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -565,8 +565,8 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 { SW_PROP_NAME(UNO_NAME_HYPER_LINK_NAME ), RES_TXTATR_INETFMT, &::getCppuType((const OUString*)0), PROPERTY_NONE ,MID_URL_HYPERLINKNAME }, { SW_PROP_NAME(UNO_NAME_UNVISITED_CHAR_STYLE_NAME), RES_TXTATR_INETFMT, &::getCppuType((const OUString*)0), PROPERTY_NONE ,MID_URL_VISITED_FMT }, { SW_PROP_NAME(UNO_NAME_VISITED_CHAR_STYLE_NAME), RES_TXTATR_INETFMT, &::getCppuType((const OUString*)0), PROPERTY_NONE ,MID_URL_UNVISITED_FMT }, - { SW_PROP_NAME(UNO_NAME_PARA_USER_DEFINED_ATTRIBUTES), RES_UNKNOWNATR_CONTAINER, &::getCppuType((uno::Reference<container::XNameContainer>*)0), PropertyAttribute::MAYBEVOID, 0 }, - { SW_PROP_NAME(UNO_NAME_CHAR_USER_DEFINED_ATTRIBUTES), RES_TXTATR_UNKNOWN_CONTAINER, &::getCppuType((uno::Reference<container::XNameContainer>*)0), PropertyAttribute::MAYBEVOID, 0 }, + { SW_PROP_NAME(UNO_NAME_USER_DEFINED_ATTRIBUTES), RES_UNKNOWNATR_CONTAINER, &::getCppuType((uno::Reference<container::XNameContainer>*)0), PropertyAttribute::MAYBEVOID, 0 }, + { SW_PROP_NAME(UNO_NAME_TEXT_USER_DEFINED_ATTRIBUTES), RES_TXTATR_UNKNOWN_CONTAINER, &::getCppuType((uno::Reference<container::XNameContainer>*)0), PropertyAttribute::MAYBEVOID, 0 }, { SW_PROP_NAME(UNO_NAME_PARA_CHAPTER_NUMBERING_LEVEL), FN_UNO_PARA_CHAPTER_NUMBERING_LEVEL,&::getCppuType((const sal_Int8*)0), PropertyAttribute::READONLY, 0}, { SW_PROP_NAME(UNO_NAME_PARA_CONDITIONAL_STYLE_NAME), FN_UNO_PARA_CONDITIONAL_STYLE_NAME, &::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0}, { SW_PROP_NAME(UNO_NAME_PARA_IS_NUMBERING_RESTART), FN_NUMBER_NEWSTART, &::getBooleanCppuType(), PropertyAttribute::MAYBEVOID, 0 }, @@ -612,7 +612,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 { SW_PROP_NAME(UNO_NAME_HYPER_LINK_NAME ), RES_TXTATR_INETFMT, &::getCppuType((const OUString*)0), PROPERTY_NONE ,MID_URL_HYPERLINKNAME }, { SW_PROP_NAME(UNO_NAME_UNVISITED_CHAR_STYLE_NAME), RES_TXTATR_INETFMT, &::getCppuType((const OUString*)0), PROPERTY_NONE ,MID_URL_VISITED_FMT }, { SW_PROP_NAME(UNO_NAME_VISITED_CHAR_STYLE_NAME), RES_TXTATR_INETFMT, &::getCppuType((const OUString*)0), PROPERTY_NONE ,MID_URL_UNVISITED_FMT }, - { SW_PROP_NAME(UNO_NAME_CHAR_USER_DEFINED_ATTRIBUTES), RES_TXTATR_UNKNOWN_CONTAINER, &::getCppuType((uno::Reference<container::XNameContainer>*)0), PropertyAttribute::MAYBEVOID, 0 }, + { SW_PROP_NAME(UNO_NAME_USER_DEFINED_ATTRIBUTES), RES_UNKNOWNATR_CONTAINER, &::getCppuType((uno::Reference<container::XNameContainer>*)0), PropertyAttribute::MAYBEVOID, 0 }, { SW_PROP_NAME(UNO_NAME_IS_PHYSICAL), FN_UNO_IS_PHYSICAL, &::getBooleanCppuType(), PropertyAttribute::READONLY, 0}, { SW_PROP_NAME(UNO_NAME_DISPLAY_NAME), FN_UNO_DISPLAY_NAME, &::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0}, {0,0,0,0} @@ -708,8 +708,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 { SW_PROP_NAME(UNO_NAME_PARA_HYPHENATION_MAX_TRAILING_CHARS), RES_PARATR_HYPHENZONE, &::getCppuType((const sal_Int16*)0), PropertyAttribute::MAYBEVOID, MID_HYPHEN_MIN_TRAIL }, { SW_PROP_NAME(UNO_NAME_PARA_HYPHENATION_MAX_HYPHENS ), RES_PARATR_HYPHENZONE, &::getCppuType((const sal_Int16*)0), PropertyAttribute::MAYBEVOID, MID_HYPHEN_MAX_HYPHENS}, { SW_PROP_NAME(UNO_NAME_NUMBERING_STYLE_NAME), RES_PARATR_NUMRULE, &::getCppuType((const OUString*)0), PropertyAttribute::MAYBEVOID, 0}, - { SW_PROP_NAME(UNO_NAME_PARA_USER_DEFINED_ATTRIBUTES), RES_UNKNOWNATR_CONTAINER, &::getCppuType((uno::Reference<container::XNameContainer>*)0), PropertyAttribute::MAYBEVOID, 0 }, - { SW_PROP_NAME(UNO_NAME_CHAR_USER_DEFINED_ATTRIBUTES), RES_TXTATR_UNKNOWN_CONTAINER, &::getCppuType((uno::Reference<container::XNameContainer>*)0), PropertyAttribute::MAYBEVOID, 0 }, + { SW_PROP_NAME(UNO_NAME_USER_DEFINED_ATTRIBUTES), RES_UNKNOWNATR_CONTAINER, &::getCppuType((uno::Reference<container::XNameContainer>*)0), PropertyAttribute::MAYBEVOID, 0 }, { SW_PROP_NAME(UNO_NAME_IS_PHYSICAL), FN_UNO_IS_PHYSICAL, &::getBooleanCppuType(), PropertyAttribute::READONLY, 0}, { SW_PROP_NAME(UNO_NAME_IS_AUTO_UPDATE), FN_UNO_IS_AUTO_UPDATE, &::getBooleanCppuType(), PROPERTY_NONE, 0}, { SW_PROP_NAME(UNO_NAME_DISPLAY_NAME), FN_UNO_DISPLAY_NAME, &::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0}, @@ -823,10 +822,10 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 { SW_PROP_NAME(UNO_NAME_HEADER_TOP_BORDER), FN_UNO_HEADER_BOX, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER |CONVERT_TWIPS }, { SW_PROP_NAME(UNO_NAME_HEADER_BOTTOM_BORDER), FN_UNO_HEADER_BOX, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER|CONVERT_TWIPS }, { SW_PROP_NAME(UNO_NAME_HEADER_BORDER_DISTANCE), FN_UNO_HEADER_BOX, &::getCppuType((const sal_Int32*)0), 0, BORDER_DISTANCE|CONVERT_TWIPS }, - { SW_PROP_NAME(UNO_NAME_HEADER_LEFT_BORDER_DISTANCE), RES_BOX, &::getCppuType((const sal_Int32*)0), 0, LEFT_BORDER_DISTANCE |CONVERT_TWIPS }, - { SW_PROP_NAME(UNO_NAME_HEADER_RIGHT_BORDER_DISTANCE), RES_BOX, &::getCppuType((const sal_Int32*)0), 0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS }, - { SW_PROP_NAME(UNO_NAME_HEADER_TOP_BORDER_DISTANCE), RES_BOX, &::getCppuType((const sal_Int32*)0), 0, TOP_BORDER_DISTANCE |CONVERT_TWIPS }, - { SW_PROP_NAME(UNO_NAME_HEADER_BOTTOM_BORDER_DISTANCE), RES_BOX, &::getCppuType((const sal_Int32*)0), 0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS }, + { SW_PROP_NAME(UNO_NAME_HEADER_LEFT_BORDER_DISTANCE), FN_UNO_HEADER_BOX, &::getCppuType((const sal_Int32*)0), 0, LEFT_BORDER_DISTANCE |CONVERT_TWIPS }, + { SW_PROP_NAME(UNO_NAME_HEADER_RIGHT_BORDER_DISTANCE), FN_UNO_HEADER_BOX, &::getCppuType((const sal_Int32*)0), 0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS }, + { SW_PROP_NAME(UNO_NAME_HEADER_TOP_BORDER_DISTANCE), FN_UNO_HEADER_BOX, &::getCppuType((const sal_Int32*)0), 0, TOP_BORDER_DISTANCE |CONVERT_TWIPS }, + { SW_PROP_NAME(UNO_NAME_HEADER_BOTTOM_BORDER_DISTANCE), FN_UNO_HEADER_BOX, &::getCppuType((const sal_Int32*)0), 0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS }, { SW_PROP_NAME(UNO_NAME_HEADER_SHADOW_FORMAT), FN_UNO_HEADER_SHADOW, &::getCppuType((const table::ShadowFormat*)0), PROPERTY_NONE, CONVERT_TWIPS}, { SW_PROP_NAME(UNO_NAME_HEADER_BODY_DISTANCE), FN_UNO_HEADER_BODY_DISTANCE,&::getCppuType((const sal_Int32*)0), PROPERTY_NONE ,MID_LO_MARGIN|CONVERT_TWIPS }, { SW_PROP_NAME(UNO_NAME_HEADER_IS_DYNAMIC_HEIGHT), FN_UNO_HEADER_IS_DYNAMIC_DISTANCE,&::getBooleanCppuType(), PROPERTY_NONE ,0 }, @@ -842,15 +841,15 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 { SW_PROP_NAME(UNO_NAME_FOOTER_LEFT_MARGIN), FN_UNO_FOOTER_LR_SPACE, &::getCppuType((const sal_Int32*)0), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS}, { SW_PROP_NAME(UNO_NAME_FOOTER_RIGHT_MARGIN), FN_UNO_FOOTER_LR_SPACE, &::getCppuType((const sal_Int32*)0), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS}, { SW_PROP_NAME(UNO_NAME_FOOTER_BACK_TRANSPARENT ), FN_UNO_FOOTER_BACKGROUND, &::getBooleanCppuType(), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT }, - { SW_PROP_NAME(UNO_NAME_FOOTER_LEFT_BORDER), RES_BOX, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER |CONVERT_TWIPS }, - { SW_PROP_NAME(UNO_NAME_FOOTER_RIGHT_BORDER), RES_BOX, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER |CONVERT_TWIPS }, - { SW_PROP_NAME(UNO_NAME_FOOTER_TOP_BORDER), RES_BOX, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER |CONVERT_TWIPS }, - { SW_PROP_NAME(UNO_NAME_FOOTER_BOTTOM_BORDER), RES_BOX, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER|CONVERT_TWIPS }, - { SW_PROP_NAME(UNO_NAME_FOOTER_BORDER_DISTANCE), RES_BOX, &::getCppuType((const sal_Int32*)0), 0, BORDER_DISTANCE|CONVERT_TWIPS }, - { SW_PROP_NAME(UNO_NAME_FOOTER_LEFT_BORDER_DISTANCE), RES_BOX, &::getCppuType((const sal_Int32*)0), 0, LEFT_BORDER_DISTANCE |CONVERT_TWIPS }, - { SW_PROP_NAME(UNO_NAME_FOOTER_RIGHT_BORDER_DISTANCE), RES_BOX, &::getCppuType((const sal_Int32*)0), 0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS }, - { SW_PROP_NAME(UNO_NAME_FOOTER_TOP_BORDER_DISTANCE), RES_BOX, &::getCppuType((const sal_Int32*)0), 0, TOP_BORDER_DISTANCE |CONVERT_TWIPS }, - { SW_PROP_NAME(UNO_NAME_FOOTER_BOTTOM_BORDER_DISTANCE), RES_BOX, &::getCppuType((const sal_Int32*)0), 0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS }, + { SW_PROP_NAME(UNO_NAME_FOOTER_LEFT_BORDER), FN_UNO_FOOTER_BOX, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER |CONVERT_TWIPS }, + { SW_PROP_NAME(UNO_NAME_FOOTER_RIGHT_BORDER), FN_UNO_FOOTER_BOX, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER |CONVERT_TWIPS }, + { SW_PROP_NAME(UNO_NAME_FOOTER_TOP_BORDER), FN_UNO_FOOTER_BOX, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER |CONVERT_TWIPS }, + { SW_PROP_NAME(UNO_NAME_FOOTER_BOTTOM_BORDER), FN_UNO_FOOTER_BOX, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER|CONVERT_TWIPS }, + { SW_PROP_NAME(UNO_NAME_FOOTER_BORDER_DISTANCE), FN_UNO_FOOTER_BOX, &::getCppuType((const sal_Int32*)0), 0, BORDER_DISTANCE|CONVERT_TWIPS }, + { SW_PROP_NAME(UNO_NAME_FOOTER_LEFT_BORDER_DISTANCE), FN_UNO_FOOTER_BOX, &::getCppuType((const sal_Int32*)0), 0, LEFT_BORDER_DISTANCE |CONVERT_TWIPS }, + { SW_PROP_NAME(UNO_NAME_FOOTER_RIGHT_BORDER_DISTANCE), FN_UNO_FOOTER_BOX, &::getCppuType((const sal_Int32*)0), 0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS }, + { SW_PROP_NAME(UNO_NAME_FOOTER_TOP_BORDER_DISTANCE), FN_UNO_FOOTER_BOX, &::getCppuType((const sal_Int32*)0), 0, TOP_BORDER_DISTANCE |CONVERT_TWIPS }, + { SW_PROP_NAME(UNO_NAME_FOOTER_BOTTOM_BORDER_DISTANCE), FN_UNO_FOOTER_BOX, &::getCppuType((const sal_Int32*)0), 0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS }, { SW_PROP_NAME(UNO_NAME_FOOTER_SHADOW_FORMAT), FN_UNO_FOOTER_SHADOW, &::getCppuType((const table::ShadowFormat*)0), PROPERTY_NONE, CONVERT_TWIPS}, { SW_PROP_NAME(UNO_NAME_FOOTER_BODY_DISTANCE), FN_UNO_FOOTER_BODY_DISTANCE,&::getCppuType((const sal_Int32*)0), PROPERTY_NONE ,MID_UP_MARGIN|CONVERT_TWIPS }, { SW_PROP_NAME(UNO_NAME_FOOTER_IS_DYNAMIC_HEIGHT), FN_UNO_FOOTER_IS_DYNAMIC_DISTANCE,&::getBooleanCppuType(), PROPERTY_NONE ,0 }, @@ -1600,8 +1599,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 { SW_PROP_NAME(UNO_NAME_BACK_TRANSPARENT ), FN_UNO_TABLE_CELL_BACKGROUND, &::getBooleanCppuType(), PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_GRAPHIC_TRANSPARENT }, { SW_PROP_NAME(UNO_NAME_WORD_MODE ), RES_CHRATR_WORDLINEMODE,&::getBooleanCppuType() , PROPERTY_NONE, 0}, { SW_PROP_NAME(UNO_NAME_PARA_STYLE_NAME), FN_UNO_PARA_STYLE, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0}, - { SW_PROP_NAME(UNO_NAME_PARA_USER_DEFINED_ATTRIBUTES), RES_UNKNOWNATR_CONTAINER, &::getCppuType((uno::Reference<container::XNameContainer>*)0), PropertyAttribute::MAYBEVOID, 0 }, - { SW_PROP_NAME(UNO_NAME_CHAR_USER_DEFINED_ATTRIBUTES), RES_TXTATR_UNKNOWN_CONTAINER, &::getCppuType((uno::Reference<container::XNameContainer>*)0), PropertyAttribute::MAYBEVOID, 0 }, + { SW_PROP_NAME(UNO_NAME_USER_DEFINED_ATTRIBUTES), RES_UNKNOWNATR_CONTAINER, &::getCppuType((uno::Reference<container::XNameContainer>*)0), PropertyAttribute::MAYBEVOID, 0 }, {0,0,0,0} }; aMapArr[nPropertyId] = aTableCursorPropertyMap_Impl; |