diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-11 15:16:51 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-12 08:26:40 +0100 |
| commit | a62c2a5fa5d5be465b0edab6adeb1fd16ace462f (patch) | |
| tree | 47cf29b4b7a0ba3ce321ce628a6b0a6175d978d7 /svx/source/unogallery | |
| parent | cff72ec4bf87c6484be97d954966309ba7a5eb8a (diff) | |
Don't hold css::uno::Type instances by pointer
...in comphelper::PropertyMapEntry and SfxItemPropertyMapEntry. And as the
arrays of such need to be initialized dynamically anyway, also change their name
members to proper OUStrings while at it. Plus some const clean-up.
Change-Id: I67d4d7b5773fb020605f369daf39528bec930606
Diffstat (limited to 'svx/source/unogallery')
| -rw-r--r-- | svx/source/unogallery/unogalitem.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index 8398d75204d6..32e28f55fdbe 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -226,27 +226,27 @@ sal_Int8 SAL_CALL GalleryItem::getType() SolarMutexGuard aGuard; ::comphelper::PropertySetInfo* pRet = new ::comphelper::PropertySetInfo(); - static ::comphelper::PropertyMapEntry aEntries[] = + static ::comphelper::PropertyMapEntry const aEntries[] = { - { MAP_CHAR_LEN( "GalleryItemType" ), UNOGALLERY_GALLERYITEMTYPE, &::getCppuType( (const sal_Int8*)(0)), + { OUString("GalleryItemType"), UNOGALLERY_GALLERYITEMTYPE, ::getCppuType( (const sal_Int8*)(0)), beans::PropertyAttribute::READONLY, 0 }, - { MAP_CHAR_LEN( "URL" ), UNOGALLERY_URL, &::getCppuType( (const OUString*)(0)), + { OUString("URL"), UNOGALLERY_URL, ::getCppuType( (const OUString*)(0)), beans::PropertyAttribute::READONLY, 0 }, - { MAP_CHAR_LEN( "Title" ), UNOGALLERY_TITLE, &::getCppuType( (const OUString*)(0)), + { OUString("Title"), UNOGALLERY_TITLE, ::getCppuType( (const OUString*)(0)), 0, 0 }, - { MAP_CHAR_LEN( "Thumbnail" ), UNOGALLERY_THUMBNAIL, &::getCppuType( (const uno::Reference< graphic::XGraphic >*)(0)), + { OUString("Thumbnail"), UNOGALLERY_THUMBNAIL, ::getCppuType( (const uno::Reference< graphic::XGraphic >*)(0)), beans::PropertyAttribute::READONLY, 0 }, - { MAP_CHAR_LEN( "Graphic" ), UNOGALLERY_GRAPHIC, &::getCppuType( (const uno::Reference< graphic::XGraphic >*)(0)), + { OUString("Graphic"), UNOGALLERY_GRAPHIC, ::getCppuType( (const uno::Reference< graphic::XGraphic >*)(0)), beans::PropertyAttribute::READONLY, 0 }, - { MAP_CHAR_LEN( "Drawing" ), UNOGALLERY_DRAWING, &::getCppuType( (const uno::Reference< lang::XComponent >*)(0) ), + { OUString("Drawing"), UNOGALLERY_DRAWING, ::getCppuType( (const uno::Reference< lang::XComponent >*)(0) ), beans::PropertyAttribute::READONLY, 0 }, - { 0,0,0,0,0,0} + { OUString(), 0, css::uno::Type(), 0, 0 } }; pRet->acquire(); |