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 /sfx2 | |
| 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 'sfx2')
| -rw-r--r-- | sfx2/source/doc/iframe.cxx | 18 | ||||
| -rw-r--r-- | sfx2/source/doc/plugin.cxx | 8 |
2 files changed, 13 insertions, 13 deletions
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index 8a92fbf466cb..1ec2f0db6a77 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -79,15 +79,15 @@ const SfxItemPropertyMapEntry* lcl_GetIFramePropertyMap_Impl() { static const SfxItemPropertyMapEntry aIFramePropertyMap_Impl[] = { - { "FrameIsAutoBorder", WID_FRAME_IS_AUTO_BORDER, ::getBooleanCppuType(), PROPERTY_UNBOUND, 0 }, - { "FrameIsAutoScroll", WID_FRAME_IS_AUTO_SCROLL, ::getBooleanCppuType(), PROPERTY_UNBOUND, 0 }, - { "FrameIsBorder", WID_FRAME_IS_BORDER, ::getBooleanCppuType(), PROPERTY_UNBOUND, 0 }, - { "FrameIsScrollingMode", WID_FRAME_IS_SCROLLING_MODE,::getBooleanCppuType(), PROPERTY_UNBOUND, 0 }, - { "FrameMarginHeight", WID_FRAME_MARGIN_HEIGHT, ::getCppuType( (sal_Int32*)0 ), PROPERTY_UNBOUND, 0 }, - { "FrameMarginWidth", WID_FRAME_MARGIN_WIDTH, ::getCppuType( (sal_Int32*)0 ), PROPERTY_UNBOUND, 0 }, - { "FrameName", WID_FRAME_NAME, ::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 }, - { "FrameURL", WID_FRAME_URL, ::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 }, - {} + { MAP_CHAR_LEN("FrameIsAutoBorder"), WID_FRAME_IS_AUTO_BORDER, &::getBooleanCppuType(), PROPERTY_UNBOUND, 0 }, + { MAP_CHAR_LEN("FrameIsAutoScroll"), WID_FRAME_IS_AUTO_SCROLL, &::getBooleanCppuType(), PROPERTY_UNBOUND, 0 }, + { MAP_CHAR_LEN("FrameIsBorder"), WID_FRAME_IS_BORDER, &::getBooleanCppuType(), PROPERTY_UNBOUND, 0 }, + { MAP_CHAR_LEN("FrameIsScrollingMode"), WID_FRAME_IS_SCROLLING_MODE, &::getBooleanCppuType(), PROPERTY_UNBOUND, 0 }, + { MAP_CHAR_LEN("FrameMarginHeight"), WID_FRAME_MARGIN_HEIGHT, &::getCppuType( (sal_Int32*)0 ), PROPERTY_UNBOUND, 0 }, + { MAP_CHAR_LEN("FrameMarginWidth"), WID_FRAME_MARGIN_WIDTH, &::getCppuType( (sal_Int32*)0 ), PROPERTY_UNBOUND, 0 }, + { MAP_CHAR_LEN("FrameName"), WID_FRAME_NAME, &::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 }, + { MAP_CHAR_LEN("FrameURL"), WID_FRAME_URL, &::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 }, + {0,0,0,0,0,0} }; return aIFramePropertyMap_Impl; } diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx index 82b7ebd0a913..3d24f23a96b4 100644 --- a/sfx2/source/doc/plugin.cxx +++ b/sfx2/source/doc/plugin.cxx @@ -62,10 +62,10 @@ const SfxItemPropertyMapEntry* lcl_GetPluginPropertyMap_Impl() { static const SfxItemPropertyMapEntry aPluginPropertyMap_Impl[] = { - { "PluginCommands", WID_COMMANDS, ::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), PROPERTY_UNBOUND, 0}, - { "PluginMimeType", WID_MIMETYPE, ::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 }, - { "PluginURL", WID_URL , ::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 }, - {} + { MAP_CHAR_LEN("PluginCommands"), WID_COMMANDS, &::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), PROPERTY_UNBOUND, 0}, + { MAP_CHAR_LEN("PluginMimeType"), WID_MIMETYPE, &::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 }, + { MAP_CHAR_LEN("PluginURL"), WID_URL , &::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 }, + {0,0,0,0,0,0} }; return aPluginPropertyMap_Impl; } |