diff options
Diffstat (limited to 'svtools/source/uno')
| -rw-r--r-- | svtools/source/uno/unoimap.cxx | 61 |
1 files changed, 29 insertions, 32 deletions
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index ad57fccc693c..c6f4194672c6 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -42,9 +42,6 @@ #include <svtools/imaprect.hxx> #include <svtools/imappoly.hxx> -#define MAP_LEN(x) x, sizeof(x)-1 - - using namespace comphelper; using namespace cppu; using namespace com::sun::star; @@ -126,39 +123,39 @@ private: UNO3_GETIMPLEMENTATION_IMPL( SvUnoImageMapObject ); -PropertySetInfo* SvUnoImageMapObject::createPropertySetInfo( sal_uInt16 nType ) +PropertySetInfo * SvUnoImageMapObject::createPropertySetInfo( sal_uInt16 nType ) { switch( nType ) { case IMAP_OBJ_POLYGON: { - static PropertyMapEntry aPolygonObj_Impl[] = + static PropertyMapEntry const aPolygonObj_Impl[] = { - { MAP_LEN( "URL" ), HANDLE_URL, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_LEN( "Title" ), HANDLE_TITLE, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_LEN( "Target" ), HANDLE_TARGET, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_LEN( "Name" ), HANDLE_NAME, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_LEN( "IsActive" ), HANDLE_ISACTIVE, &::getBooleanCppuType(), 0, 0 }, - { MAP_LEN( "Polygon" ), HANDLE_POLYGON, &::getCppuType((const PointSequence*)0), 0, 0 }, - {0,0,0,0,0,0} + { "URL", HANDLE_URL, ::getCppuType((const OUString*)0), 0, 0 }, + { "Title", HANDLE_TITLE, ::getCppuType((const OUString*)0), 0, 0 }, + { "Description", HANDLE_DESCRIPTION, ::getCppuType((const OUString*)0), 0, 0 }, + { "Target", HANDLE_TARGET, ::getCppuType((const OUString*)0), 0, 0 }, + { "Name", HANDLE_NAME, ::getCppuType((const OUString*)0), 0, 0 }, + { "IsActive", HANDLE_ISACTIVE, ::getBooleanCppuType(), 0, 0 }, + { "Polygon", HANDLE_POLYGON, ::getCppuType((const PointSequence*)0), 0, 0 }, + {} }; return new PropertySetInfo( aPolygonObj_Impl ); } case IMAP_OBJ_CIRCLE: { - static PropertyMapEntry aCircleObj_Impl[] = + static PropertyMapEntry const aCircleObj_Impl[] = { - { MAP_LEN( "URL" ), HANDLE_URL, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_LEN( "Title" ), HANDLE_TITLE, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_LEN( "Target" ), HANDLE_TARGET, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_LEN( "Name" ), HANDLE_NAME, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_LEN( "IsActive" ), HANDLE_ISACTIVE, &::getBooleanCppuType(), 0, 0 }, - { MAP_LEN( "Center" ), HANDLE_CENTER, &::getCppuType((const awt::Point*)0), 0, 0 }, - { MAP_LEN( "Radius" ), HANDLE_RADIUS, &::getCppuType((const sal_Int32*)0), 0, 0 }, - {0,0,0,0,0,0} + { "URL", HANDLE_URL, ::getCppuType((const OUString*)0), 0, 0 }, + { "Title", HANDLE_TITLE, ::getCppuType((const OUString*)0), 0, 0 }, + { "Description", HANDLE_DESCRIPTION, ::getCppuType((const OUString*)0), 0, 0 }, + { "Target", HANDLE_TARGET, ::getCppuType((const OUString*)0), 0, 0 }, + { "Name", HANDLE_NAME, ::getCppuType((const OUString*)0), 0, 0 }, + { "IsActive", HANDLE_ISACTIVE, ::getBooleanCppuType(), 0, 0 }, + { "Center", HANDLE_CENTER, ::getCppuType((const awt::Point*)0), 0, 0 }, + { "Radius", HANDLE_RADIUS, ::getCppuType((const sal_Int32*)0), 0, 0 }, + {} }; return new PropertySetInfo( aCircleObj_Impl ); @@ -166,16 +163,16 @@ PropertySetInfo* SvUnoImageMapObject::createPropertySetInfo( sal_uInt16 nType ) case IMAP_OBJ_RECTANGLE: default: { - static PropertyMapEntry aRectangleObj_Impl[] = + static PropertyMapEntry const aRectangleObj_Impl[] = { - { MAP_LEN( "URL" ), HANDLE_URL, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_LEN( "Title" ), HANDLE_TITLE, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_LEN( "Target" ), HANDLE_TARGET, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_LEN( "Name" ), HANDLE_NAME, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_LEN( "IsActive" ), HANDLE_ISACTIVE, &::getBooleanCppuType(), 0, 0 }, - { MAP_LEN( "Boundary" ), HANDLE_BOUNDARY, &::getCppuType((const awt::Rectangle*)0), 0, 0 }, - {0,0,0,0,0,0} + { "URL", HANDLE_URL, ::getCppuType((const OUString*)0), 0, 0 }, + { "Title", HANDLE_TITLE, ::getCppuType((const OUString*)0), 0, 0 }, + { "Description", HANDLE_DESCRIPTION, ::getCppuType((const OUString*)0), 0, 0 }, + { "Target", HANDLE_TARGET, ::getCppuType((const OUString*)0), 0, 0 }, + { "Name", HANDLE_NAME, ::getCppuType((const OUString*)0), 0, 0 }, + { "IsActive", HANDLE_ISACTIVE, ::getBooleanCppuType(), 0, 0 }, + { "Boundary", HANDLE_BOUNDARY, ::getCppuType((const awt::Rectangle*)0), 0, 0 }, + {} }; return new PropertySetInfo( aRectangleObj_Impl ); |