diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-11 15:37:26 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-11 15:38:30 +0100 |
commit | 123e2c3e9350463fde38fbcbb522e3d6d8340ee6 (patch) | |
tree | c0f9350733d93f6a906cfe2f19b5dac66a655283 /sd/source/ui/unoidl/unopage.cxx | |
parent | 90f91088d238469b4a2262c91de3117ba40f5bde (diff) |
Revert "Don't hold css::uno::Type instances by pointer"
This reverts commit 90f91088d238469b4a2262c91de3117ba40f5bde for now:
Ach, old GCC doesn't like plain string literals to initialize members
of OUString type...
Change-Id: I50563a00406259bb5d41831e2a2796762450d097
Diffstat (limited to 'sd/source/ui/unoidl/unopage.cxx')
-rw-r--r-- | sd/source/ui/unoidl/unopage.cxx | 240 |
1 files changed, 120 insertions, 120 deletions
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 5862db011b0e..a1a7ab45b8e2 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -108,79 +108,79 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin { static const SfxItemPropertyMapEntry aDrawPagePropertyMap_Impl[] = { - { UNO_NAME_PAGE_BACKGROUND, WID_PAGE_BACK, ITYPE( beans::XPropertySet ), beans::PropertyAttribute::MAYBEVOID,0}, - { UNO_NAME_PAGE_BOTTOM, WID_PAGE_BOTTOM, ::getCppuType((const sal_Int32*)0), 0, 0}, - { UNO_NAME_PAGE_LEFT, WID_PAGE_LEFT, ::getCppuType((const sal_Int32*)0), 0, 0}, - { UNO_NAME_PAGE_RIGHT, WID_PAGE_RIGHT, ::getCppuType((const sal_Int32*)0), 0, 0}, - { UNO_NAME_PAGE_TOP, WID_PAGE_TOP, ::getCppuType((const sal_Int32*)0), 0, 0}, - { UNO_NAME_PAGE_CHANGE, WID_PAGE_CHANGE, ::getCppuType((const sal_Int32*)0), 0, 0}, - { UNO_NAME_PAGE_DURATION, WID_PAGE_DURATION, ::getCppuType((const sal_Int32*)0), 0, 0}, - { UNO_NAME_PAGE_EFFECT, WID_PAGE_EFFECT, ::getCppuType((const presentation::FadeEffect*)0), 0, 0}, - { UNO_NAME_PAGE_HEIGHT, WID_PAGE_HEIGHT, ::getCppuType((const sal_Int32*)0), 0, 0}, - { UNO_NAME_PAGE_LAYOUT, WID_PAGE_LAYOUT, ::getCppuType((const sal_Int16*)0), 0, 0}, - { UNO_NAME_LINKDISPLAYBITMAP, WID_PAGE_LDBITMAP, ITYPE( awt::XBitmap), beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_LINKDISPLAYNAME, WID_PAGE_LDNAME, ::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_PAGE_NUMBER, WID_PAGE_NUMBER, ::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_PAGE_ORIENTATION, WID_PAGE_ORIENT, ::getCppuType((const view::PaperOrientation*)0),0, 0}, - { UNO_NAME_PAGE_SPEED, WID_PAGE_SPEED, ::getCppuType((const presentation::AnimationSpeed*)0), 0, 0}, - { UNO_NAME_PAGE_WIDTH, WID_PAGE_WIDTH, ::getCppuType((const sal_Int32*)0), 0, 0}, - { UNO_NAME_PAGE_PREVIEW, WID_PAGE_PREVIEW, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_PAGE_PREVIEWBITMAP, WID_PAGE_PREVIEWBITMAP, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_PAGE_VISIBLE, WID_PAGE_VISIBLE, ::getBooleanCppuType(), 0, 0}, - { UNO_NAME_OBJ_SOUNDFILE, WID_PAGE_SOUNDFILE, ::getCppuType((const Any*)0), 0, 0}, - { sUNO_Prop_IsBackgroundVisible, WID_PAGE_BACKVIS, ::getBooleanCppuType(), 0, 0}, - { sUNO_Prop_IsBackgroundObjectsVisible, WID_PAGE_BACKOBJVIS, ::getBooleanCppuType(), 0, 0}, - { sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - { sUNO_Prop_BookmarkURL, WID_PAGE_BOOKMARK, ::getCppuType((const OUString*)0), 0, 0}, - { "HighResDuration", WID_PAGE_HIGHRESDURATION, ::getCppuType((const double*)0), 0, 0}, - { "IsBackgroundDark" , WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, - { "IsFooterVisible", WID_PAGE_FOOTERVISIBLE, ::getBooleanCppuType(), 0, 0}, - { "FooterText", WID_PAGE_FOOTERTEXT, ::getCppuType((const OUString*)0), 0, 0}, - { "IsPageNumberVisible", WID_PAGE_PAGENUMBERVISIBLE, ::getBooleanCppuType(), 0, 0}, - { "IsDateTimeVisible", WID_PAGE_DATETIMEVISIBLE, ::getBooleanCppuType(), 0, 0}, - { "IsDateTimeFixed", WID_PAGE_DATETIMEFIXED, ::getBooleanCppuType(), 0, 0}, - { "DateTimeText", WID_PAGE_DATETIMETEXT, ::getCppuType((const OUString*)0), 0, 0}, - { "DateTimeFormat", WID_PAGE_DATETIMEFORMAT, ::getCppuType((const sal_Int32*)0), 0, 0}, - { "TransitionType", WID_TRANSITION_TYPE, ::getCppuType((const sal_Int16*)0), 0, 0}, - { "TransitionSubtype", WID_TRANSITION_SUBTYPE, ::getCppuType((const sal_Int16*)0), 0, 0}, - { "TransitionDirection", WID_TRANSITION_DIRECTION, ::getCppuType((const sal_Bool*)0), 0, 0}, - { "TransitionFadeColor", WID_TRANSITION_FADE_COLOR, ::getCppuType((const sal_Int32*)0), 0, 0}, - { "TransitionDuration", WID_TRANSITION_DURATION, ::getCppuType((const double*)0), 0, 0}, - { "LoopSound", WID_LOOP_SOUND, ::getBooleanCppuType(), 0, 0}, - { "NavigationOrder", WID_NAVORDER, ::com::sun::star::container::XIndexAccess::static_type(),0, 0}, - {} + { MAP_CHAR_LEN(UNO_NAME_PAGE_BACKGROUND), WID_PAGE_BACK, &ITYPE( beans::XPropertySet ), beans::PropertyAttribute::MAYBEVOID,0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_CHANGE), WID_PAGE_CHANGE, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_DURATION), WID_PAGE_DURATION, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_EFFECT), WID_PAGE_EFFECT, &::getCppuType((const presentation::FadeEffect*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, &::getCppuType((const sal_Int16*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, &ITYPE( awt::XBitmap), beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, &::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, &::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, &::getCppuType((const view::PaperOrientation*)0),0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_SPEED), WID_PAGE_SPEED, &::getCppuType((const presentation::AnimationSpeed*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_PREVIEW), WID_PAGE_PREVIEW, &::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_PREVIEWBITMAP), WID_PAGE_PREVIEWBITMAP, &::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_VISIBLE), WID_PAGE_VISIBLE, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_OBJ_SOUNDFILE), WID_PAGE_SOUNDFILE, &::getCppuType((const Any*)0), 0, 0}, + { MAP_CHAR_LEN(sUNO_Prop_IsBackgroundVisible), WID_PAGE_BACKVIS, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN(sUNO_Prop_IsBackgroundObjectsVisible), WID_PAGE_BACKOBJVIS, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + { MAP_CHAR_LEN(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN("HighResDuration"), WID_PAGE_HIGHRESDURATION, &::getCppuType((const double*)0), 0, 0}, + { MAP_CHAR_LEN("IsBackgroundDark" ), WID_PAGE_ISDARK, &::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN("IsFooterVisible"), WID_PAGE_FOOTERVISIBLE, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN("FooterText"), WID_PAGE_FOOTERTEXT, &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN("IsPageNumberVisible"), WID_PAGE_PAGENUMBERVISIBLE, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN("IsDateTimeVisible"), WID_PAGE_DATETIMEVISIBLE, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN("IsDateTimeFixed"), WID_PAGE_DATETIMEFIXED, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN("DateTimeText"), WID_PAGE_DATETIMETEXT, &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN("DateTimeFormat"), WID_PAGE_DATETIMEFORMAT, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN("TransitionType"), WID_TRANSITION_TYPE, &::getCppuType((const sal_Int16*)0), 0, 0}, + { MAP_CHAR_LEN("TransitionSubtype"), WID_TRANSITION_SUBTYPE, &::getCppuType((const sal_Int16*)0), 0, 0}, + { MAP_CHAR_LEN("TransitionDirection"), WID_TRANSITION_DIRECTION, &::getCppuType((const sal_Bool*)0), 0, 0}, + { MAP_CHAR_LEN("TransitionFadeColor"), WID_TRANSITION_FADE_COLOR, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN("TransitionDuration"), WID_TRANSITION_DURATION, &::getCppuType((const double*)0), 0, 0}, + { MAP_CHAR_LEN("LoopSound"), WID_LOOP_SOUND, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN("NavigationOrder"), WID_NAVORDER, &::com::sun::star::container::XIndexAccess::static_type(),0, 0}, + {0,0,0,0,0,0} }; #define DRAW_PAGE_NOTES_PROPERTIES \ - { UNO_NAME_PAGE_BOTTOM, WID_PAGE_BOTTOM, ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { UNO_NAME_PAGE_LEFT, WID_PAGE_LEFT, ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { UNO_NAME_PAGE_RIGHT, WID_PAGE_RIGHT, ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { UNO_NAME_PAGE_TOP, WID_PAGE_TOP, ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { UNO_NAME_PAGE_HEIGHT, WID_PAGE_HEIGHT, ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { UNO_NAME_PAGE_LAYOUT, WID_PAGE_LAYOUT, ::getCppuType((const sal_Int16*)0), 0, 0}, \ - { UNO_NAME_LINKDISPLAYBITMAP, WID_PAGE_LDBITMAP, ITYPE( awt::XBitmap), beans::PropertyAttribute::READONLY, 0}, \ - { UNO_NAME_LINKDISPLAYNAME, WID_PAGE_LDNAME, ::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0}, \ - { UNO_NAME_PAGE_NUMBER, WID_PAGE_NUMBER, ::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, \ - { UNO_NAME_PAGE_ORIENTATION, WID_PAGE_ORIENT, ::getCppuType((const view::PaperOrientation*)0),0, 0}, \ - { UNO_NAME_PAGE_WIDTH, WID_PAGE_WIDTH, ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},\ - { "IsHeaderVisible", WID_PAGE_HEADERVISIBLE, ::getBooleanCppuType(), 0, 0}, \ - { "HeaderText", WID_PAGE_HEADERTEXT, ::getCppuType((const OUString*)0), 0, 0}, \ - { "IsBackgroundDark", WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, \ - { "IsFooterVisible", WID_PAGE_FOOTERVISIBLE, ::getBooleanCppuType(), 0, 0}, \ - { "FooterText", WID_PAGE_FOOTERTEXT, ::getCppuType((const OUString*)0), 0, 0}, \ - { "IsPageNumberVisible", WID_PAGE_PAGENUMBERVISIBLE, ::getBooleanCppuType(), 0, 0}, \ - { "IsDateTimeVisible", WID_PAGE_DATETIMEVISIBLE, ::getBooleanCppuType(), 0, 0}, \ - { "IsDateTimeFixed", WID_PAGE_DATETIMEFIXED, ::getBooleanCppuType(), 0, 0}, \ - { "DateTimeText", WID_PAGE_DATETIMETEXT, ::getCppuType((const OUString*)0), 0, 0}, \ - { "DateTimeFormat", WID_PAGE_DATETIMEFORMAT, ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { "NavigationOrder", WID_NAVORDER, ::com::sun::star::container::XIndexAccess::static_type(),0, 0}, \ - {} + { MAP_CHAR_LEN(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, &::getCppuType((const sal_Int16*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, &ITYPE( awt::XBitmap), beans::PropertyAttribute::READONLY, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, &::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, &::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, &::getCppuType((const view::PaperOrientation*)0),0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},\ + { MAP_CHAR_LEN("IsHeaderVisible"), WID_PAGE_HEADERVISIBLE, &::getBooleanCppuType(), 0, 0}, \ + { MAP_CHAR_LEN("HeaderText"), WID_PAGE_HEADERTEXT, &::getCppuType((const OUString*)0), 0, 0}, \ + { MAP_CHAR_LEN("IsBackgroundDark" ), WID_PAGE_ISDARK, &::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, \ + { MAP_CHAR_LEN("IsFooterVisible"), WID_PAGE_FOOTERVISIBLE, &::getBooleanCppuType(), 0, 0}, \ + { MAP_CHAR_LEN("FooterText"), WID_PAGE_FOOTERTEXT, &::getCppuType((const OUString*)0), 0, 0}, \ + { MAP_CHAR_LEN("IsPageNumberVisible"), WID_PAGE_PAGENUMBERVISIBLE, &::getBooleanCppuType(), 0, 0}, \ + { MAP_CHAR_LEN("IsDateTimeVisible"), WID_PAGE_DATETIMEVISIBLE, &::getBooleanCppuType(), 0, 0}, \ + { MAP_CHAR_LEN("IsDateTimeFixed"), WID_PAGE_DATETIMEFIXED, &::getBooleanCppuType(), 0, 0}, \ + { MAP_CHAR_LEN("DateTimeText"), WID_PAGE_DATETIMETEXT, &::getCppuType((const OUString*)0), 0, 0}, \ + { MAP_CHAR_LEN("DateTimeFormat"), WID_PAGE_DATETIMEFORMAT, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN("NavigationOrder"), WID_NAVORDER, &::com::sun::star::container::XIndexAccess::static_type(),0, 0}, \ + {0,0,0,0,0,0} static const SfxItemPropertyMapEntry aDrawPageNotesHandoutPropertyMap_Impl[] = { // this must be the first two entries so they can be excluded for PK_STANDARD - { UNO_NAME_PAGE_BACKGROUND, WID_PAGE_BACK, ITYPE( beans::XPropertySet ), beans::PropertyAttribute::MAYBEVOID,0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_BACKGROUND), WID_PAGE_BACK, &ITYPE( beans::XPropertySet ), beans::PropertyAttribute::MAYBEVOID,0}, DRAW_PAGE_NOTES_PROPERTIES }; static const SfxItemPropertyMapEntry aDrawPageNotesHandoutPropertyNoBackMap_Impl[] = @@ -189,27 +189,27 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin }; #define GRAPHIC_PAGE_PROPERTIES \ - { UNO_NAME_PAGE_BOTTOM, WID_PAGE_BOTTOM, ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { UNO_NAME_PAGE_LEFT, WID_PAGE_LEFT, ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { UNO_NAME_PAGE_RIGHT, WID_PAGE_RIGHT, ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { UNO_NAME_PAGE_TOP, WID_PAGE_TOP, ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { UNO_NAME_PAGE_HEIGHT, WID_PAGE_HEIGHT, ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { UNO_NAME_LINKDISPLAYBITMAP, WID_PAGE_LDBITMAP, ITYPE(awt::XBitmap), beans::PropertyAttribute::READONLY, 0}, \ - { UNO_NAME_LINKDISPLAYNAME, WID_PAGE_LDNAME, ::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0}, \ - { UNO_NAME_PAGE_NUMBER, WID_PAGE_NUMBER, ::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, \ - { UNO_NAME_PAGE_ORIENTATION, WID_PAGE_ORIENT, ::getCppuType((const view::PaperOrientation*)0),0, 0}, \ - { UNO_NAME_PAGE_WIDTH, WID_PAGE_WIDTH, ::getCppuType((const sal_Int32*)0), 0, 0}, \ - { UNO_NAME_PAGE_PREVIEW, WID_PAGE_PREVIEW, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ - { UNO_NAME_PAGE_PREVIEWBITMAP, WID_PAGE_PREVIEWBITMAP, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},\ - { sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, \ - { sUNO_Prop_BookmarkURL, WID_PAGE_BOOKMARK, ::getCppuType((const OUString*)0), 0, 0}, \ - { "IsBackgroundDark", WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, \ - { "NavigationOrder", WID_NAVORDER, ::com::sun::star::container::XIndexAccess::static_type(),0, 0}, \ - {} + { MAP_CHAR_LEN(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, &ITYPE(awt::XBitmap), beans::PropertyAttribute::READONLY, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, &::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, &::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, &::getCppuType((const view::PaperOrientation*)0),0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_PREVIEW), WID_PAGE_PREVIEW, &::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_PREVIEWBITMAP), WID_PAGE_PREVIEWBITMAP, &::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},\ + { MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, \ + { MAP_CHAR_LEN(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, &::getCppuType((const OUString*)0), 0, 0}, \ + { MAP_CHAR_LEN("IsBackgroundDark" ), WID_PAGE_ISDARK, &::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, \ + { MAP_CHAR_LEN("NavigationOrder"), WID_NAVORDER, &::com::sun::star::container::XIndexAccess::static_type(),0, 0}, \ + {0,0,0,0,0,0} static const SfxItemPropertyMapEntry aGraphicPagePropertyMap_Impl[] = { - { UNO_NAME_PAGE_BACKGROUND, WID_PAGE_BACK, ITYPE( beans::XPropertySet), beans::PropertyAttribute::MAYBEVOID,0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_BACKGROUND), WID_PAGE_BACK, &ITYPE( beans::XPropertySet), beans::PropertyAttribute::MAYBEVOID,0}, GRAPHIC_PAGE_PROPERTIES }; static const SfxItemPropertyMapEntry aGraphicPagePropertyNoBackMap_Impl[] = @@ -262,46 +262,46 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind ) { static const SfxItemPropertyMapEntry aMasterPagePropertyMap_Impl[] = { - { UNO_NAME_PAGE_BACKGROUND, WID_PAGE_BACK, ITYPE(beans::XPropertySet), 0, 0}, - { UNO_NAME_PAGE_BOTTOM, WID_PAGE_BOTTOM, ::getCppuType((const sal_Int32*)0), 0, 0}, - { UNO_NAME_PAGE_LEFT, WID_PAGE_LEFT, ::getCppuType((const sal_Int32*)0), 0, 0}, - { UNO_NAME_PAGE_RIGHT, WID_PAGE_RIGHT, ::getCppuType((const sal_Int32*)0), 0, 0}, - { UNO_NAME_PAGE_TOP, WID_PAGE_TOP, ::getCppuType((const sal_Int32*)0), 0, 0}, - { UNO_NAME_PAGE_HEIGHT, WID_PAGE_HEIGHT, ::getCppuType((const sal_Int32*)0), 0, 0}, - { UNO_NAME_LINKDISPLAYBITMAP, WID_PAGE_LDBITMAP, ITYPE(awt::XBitmap), beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_LINKDISPLAYNAME, WID_PAGE_LDNAME, ::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_PAGE_NUMBER, WID_PAGE_NUMBER, ::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_PAGE_ORIENTATION, WID_PAGE_ORIENT, ::getCppuType((const view::PaperOrientation*)0),0, 0}, - { UNO_NAME_PAGE_WIDTH, WID_PAGE_WIDTH, ::getCppuType((const sal_Int32*)0), 0, 0}, - { "BackgroundFullSize", WID_PAGE_BACKFULL, ::getBooleanCppuType(), 0, 0}, - { sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - { "IsBackgroundDark", WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, - {} + { MAP_CHAR_LEN(UNO_NAME_PAGE_BACKGROUND), WID_PAGE_BACK, &ITYPE(beans::XPropertySet), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, &ITYPE(awt::XBitmap), beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, &::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, &::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, &::getCppuType((const view::PaperOrientation*)0),0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN("BackgroundFullSize"), WID_PAGE_BACKFULL, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + { MAP_CHAR_LEN("IsBackgroundDark" ), WID_PAGE_ISDARK, &::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, + {0,0,0,0,0,0} }; static const SfxItemPropertyMapEntry aHandoutMasterPagePropertyMap_Impl[] = { - { UNO_NAME_PAGE_BOTTOM, WID_PAGE_BOTTOM, ::getCppuType((const sal_Int32*)0), 0, 0}, - { UNO_NAME_PAGE_LEFT, WID_PAGE_LEFT, ::getCppuType((const sal_Int32*)0), 0, 0}, - { UNO_NAME_PAGE_RIGHT, WID_PAGE_RIGHT, ::getCppuType((const sal_Int32*)0), 0, 0}, - { UNO_NAME_PAGE_TOP, WID_PAGE_TOP, ::getCppuType((const sal_Int32*)0), 0, 0}, - { UNO_NAME_PAGE_HEIGHT, WID_PAGE_HEIGHT, ::getCppuType((const sal_Int32*)0), 0, 0}, - { UNO_NAME_PAGE_ORIENTATION, WID_PAGE_ORIENT, ::getCppuType((const view::PaperOrientation*)0),0, 0}, - { UNO_NAME_PAGE_NUMBER, WID_PAGE_NUMBER, ::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_PAGE_WIDTH, WID_PAGE_WIDTH, ::getCppuType((const sal_Int32*)0), 0, 0}, - { UNO_NAME_PAGE_LAYOUT, WID_PAGE_LAYOUT, ::getCppuType((const sal_Int16*)0), 0, 0}, - { sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - { "IsBackgroundDark", WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, - { "IsHeaderVisible", WID_PAGE_HEADERVISIBLE, ::getBooleanCppuType(), 0, 0}, - { "HeaderText", WID_PAGE_HEADERTEXT, ::getCppuType((const OUString*)0), 0, 0}, - { "IsFooterVisible", WID_PAGE_FOOTERVISIBLE, ::getBooleanCppuType(), 0, 0}, - { "FooterText", WID_PAGE_FOOTERTEXT, ::getCppuType((const OUString*)0), 0, 0}, - { "IsPageNumberVisible", WID_PAGE_PAGENUMBERVISIBLE, ::getBooleanCppuType(), 0, 0}, - { "IsDateTimeVisible", WID_PAGE_DATETIMEVISIBLE, ::getBooleanCppuType(), 0, 0}, - { "IsDateTimeFixed", WID_PAGE_DATETIMEFIXED, ::getBooleanCppuType(), 0, 0}, - { "DateTimeText", WID_PAGE_DATETIMETEXT, ::getCppuType((const OUString*)0), 0, 0}, - { "DateTimeFormat", WID_PAGE_DATETIMEFORMAT, ::getCppuType((const sal_Int32*)0), 0, 0}, - {} + { MAP_CHAR_LEN(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, &::getCppuType((const view::PaperOrientation*)0),0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, &::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, &::getCppuType((const sal_Int16*)0), 0, 0}, + { MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + { MAP_CHAR_LEN("IsBackgroundDark" ), WID_PAGE_ISDARK, &::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN("IsHeaderVisible"), WID_PAGE_HEADERVISIBLE, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN("HeaderText"), WID_PAGE_HEADERTEXT, &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN("IsFooterVisible"), WID_PAGE_FOOTERVISIBLE, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN("FooterText"), WID_PAGE_FOOTERTEXT, &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN("IsPageNumberVisible"), WID_PAGE_PAGENUMBERVISIBLE, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN("IsDateTimeVisible"), WID_PAGE_DATETIMEVISIBLE, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN("IsDateTimeFixed"), WID_PAGE_DATETIMEFIXED, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN("DateTimeText"), WID_PAGE_DATETIMETEXT, &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN("DateTimeFormat"), WID_PAGE_DATETIMEFORMAT, &::getCppuType((const sal_Int32*)0), 0, 0}, + {0,0,0,0,0,0} }; const SvxItemPropertySet* pRet = 0; |