[Libreoffice-commits] core.git: 4 commits - chart2/source comphelper/source dbaccess/source editeng/source extensions/source filter/source forms/source include/comphelper include/editeng include/svl include/svx linguistic/source reportdesign/source sc/source sd/source sfx2/source starmath/source svl/source svtools/source svx/source sw/inc sw/source xmloff/source
Stephan Bergmann
sbergman at redhat.com
Wed Dec 11 23:27:19 PST 2013
chart2/source/model/filter/XMLFilter.cxx | 77
chart2/source/tools/ErrorBar.cxx | 32
comphelper/source/property/genericpropertyset.cxx | 10
comphelper/source/property/propertysethelper.cxx | 20
comphelper/source/property/propertysetinfo.cxx | 31
dbaccess/source/core/dataaccess/databasedocument.cxx | 17
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 6
editeng/source/uno/unofield.cxx | 50
editeng/source/uno/unoipset.cxx | 8
editeng/source/uno/unotext.cxx | 16
editeng/source/xml/xmltxtexp.cxx | 8
editeng/source/xml/xmltxtimp.cxx | 2
extensions/source/bibliography/bibload.cxx | 4
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 15
forms/source/richtext/richtextunowrapper.cxx | 6
include/comphelper/TypeGeneration.hxx | 2
include/comphelper/propertysetinfo.hxx | 11
include/editeng/unotext.hxx | 132
include/svl/itemprop.hxx | 14
include/svx/unoprov.hxx | 2
include/svx/unoshprp.hxx | 496 -
linguistic/source/lngopt.cxx | 82
reportdesign/source/core/api/ReportDefinition.cxx | 13
reportdesign/source/filter/xml/xmlColumn.cxx | 8
reportdesign/source/filter/xml/xmlHelper.cxx | 48
reportdesign/source/filter/xml/xmlfilter.cxx | 17
sc/source/core/data/dptabsrc.cxx | 72
sc/source/filter/xml/xmlwrap.cxx | 59
sc/source/ui/unoobj/addruno.cxx | 28
sc/source/ui/unoobj/afmtuno.cxx | 110
sc/source/ui/unoobj/appluno.cxx | 38
sc/source/ui/unoobj/cellsuno.cxx | 1244 ++--
sc/source/ui/unoobj/chart2uno.cxx | 14
sc/source/ui/unoobj/confuno.cxx | 62
sc/source/ui/unoobj/dapiuno.cxx | 64
sc/source/ui/unoobj/datauno.cxx | 72
sc/source/ui/unoobj/defltuno.cxx | 42
sc/source/ui/unoobj/docuno.cxx | 115
sc/source/ui/unoobj/fielduno.cxx | 44
sc/source/ui/unoobj/fmtuno.cxx | 22
sc/source/ui/unoobj/linkuno.cxx | 12
sc/source/ui/unoobj/nameuno.cxx | 14
sc/source/ui/unoobj/notesuno.cxx | 2
sc/source/ui/unoobj/optuno.cxx | 26
sc/source/ui/unoobj/shapeuno.cxx | 17
sc/source/ui/unoobj/srchuno.cxx | 26
sc/source/ui/unoobj/styleuno.cxx | 504 -
sc/source/ui/unoobj/targuno.cxx | 6
sc/source/ui/unoobj/textuno.cxx | 4
sc/source/ui/unoobj/tokenuno.cxx | 12
sc/source/ui/unoobj/viewuno.cxx | 58
sd/source/core/stlsheet.cxx | 22
sd/source/core/text/textapi.cxx | 10
sd/source/filter/xml/sdxmlwrp.cxx | 185
sd/source/ui/slideshow/slideshow.cxx | 32
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 100
sd/source/ui/unoidl/unocpres.cxx | 4
sd/source/ui/unoidl/unohelp.hxx | 3
sd/source/ui/unoidl/unolayer.cxx | 16
sd/source/ui/unoidl/unomodel.cxx | 68
sd/source/ui/unoidl/unoobj.cxx | 64
sd/source/ui/unoidl/unopage.cxx | 308 -
sd/source/ui/unoidl/unopback.cxx | 2
sd/source/ui/unoidl/unosrch.cxx | 10
sfx2/source/doc/iframe.cxx | 18
sfx2/source/doc/plugin.cxx | 8
starmath/source/mathmlexport.cxx | 18
starmath/source/mathmlimport.cxx | 18
starmath/source/unomodel.cxx | 138
svl/source/items/itemprop.cxx | 17
svl/source/numbers/numfmuno.cxx | 38
svtools/source/graphic/descriptor.cxx | 21
svtools/source/graphic/renderer.cxx | 11
svtools/source/uno/unoimap.cxx | 61
svx/source/form/dataaccessdescriptor.cxx | 50
svx/source/table/cell.cxx | 38
svx/source/unodraw/unomod.cxx | 13
svx/source/unodraw/unopool.cxx | 4
svx/source/unodraw/unoprov.cxx | 631 +-
svx/source/unodraw/unoshape.cxx | 4
svx/source/unogallery/unogalitem.cxx | 16
sw/inc/unomap.hxx | 2
sw/source/core/access/accpara.cxx | 4
sw/source/core/fields/textapi.cxx | 18
sw/source/core/unocore/unomap.cxx | 3250 ++++++------
sw/source/core/unocore/unoobj.cxx | 8
sw/source/core/unocore/unosett.cxx | 82
sw/source/filter/xml/swxml.cxx | 86
sw/source/filter/xml/wrtxml.cxx | 67
sw/source/ui/uno/unomailmerge.cxx | 3
xmloff/source/core/xmlexp.cxx | 14
xmloff/source/meta/MetaExportComponent.cxx | 8
92 files changed, 4602 insertions(+), 4662 deletions(-)
New commits:
commit de68d46d745f67e1f4e9e10dcbf1b534ec7aea39
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Dec 11 15:36:28 2013 +0100
Remove unnecessary macro ITYPE
Change-Id: I9ade981c771367fd292600d73124f89b94a7a924
diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx
index 2cae928..11dd9cf 100644
--- a/sd/source/ui/unoidl/unocpres.cxx
+++ b/sd/source/ui/unoidl/unocpres.cxx
@@ -164,7 +164,7 @@ void SAL_CALL SdXCustomPresentation::replaceByIndex( sal_Int32 Index, const uno:
uno::Type SAL_CALL SdXCustomPresentation::getElementType()
throw(uno::RuntimeException)
{
- return ITYPE( drawing::XDrawPage );
+ return cppu::UnoType<drawing::XDrawPage>::get();
}
sal_Bool SAL_CALL SdXCustomPresentation::hasElements()
@@ -462,7 +462,7 @@ sal_Bool SAL_CALL SdXCustomPresentationAccess::hasByName( const OUString& aName
uno::Type SAL_CALL SdXCustomPresentationAccess::getElementType()
throw(uno::RuntimeException)
{
- return ITYPE( container::XIndexContainer );
+ return cppu::UnoType<container::XIndexContainer>::get();
}
sal_Bool SAL_CALL SdXCustomPresentationAccess::hasElements()
diff --git a/sd/source/ui/unoidl/unohelp.hxx b/sd/source/ui/unoidl/unohelp.hxx
index 690a239..0b54151 100644
--- a/sd/source/ui/unoidl/unohelp.hxx
+++ b/sd/source/ui/unoidl/unohelp.hxx
@@ -43,9 +43,6 @@ inline void bool2any( sal_Bool bBool, ::com::sun::star::uno::Any& rAny )
}
-#define ITYPE( xint ) \
- ::getCppuType((const uno::Reference< xint >*)0)
-
#define QUERYINT( xint ) \
if( rType == ::getCppuType((const uno::Reference< xint >*)0) ) \
aAny <<= uno::Reference< xint >(this)
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index 802b73c..e7e1c27 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -710,7 +710,7 @@ sal_Bool SAL_CALL SdLayerManager::hasByName( const OUString& aName ) throw(uno::
uno::Type SAL_CALL SdLayerManager::getElementType()
throw(uno::RuntimeException)
{
- return ITYPE( drawing::XLayer );
+ return cppu::UnoType<drawing::XLayer>::get();
}
sal_Bool SAL_CALL SdLayerManager::hasElements() throw(uno::RuntimeException)
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index b43b395..2aa7af5 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -263,9 +263,9 @@ uno::Any SAL_CALL SdXImpressDocument::queryInterface( const uno::Type & rType )
else QUERYINT(style::XStyleFamiliesSupplier);
else QUERYINT(com::sun::star::ucb::XAnyCompareFactory);
else QUERYINT(view::XRenderable);
- else if( mbImpressDoc && rType == ITYPE(presentation::XPresentationSupplier) )
+ else if( mbImpressDoc && rType == cppu::UnoType<presentation::XPresentationSupplier>::get() )
aAny <<= uno::Reference< presentation::XPresentationSupplier >(this);
- else if( mbImpressDoc && rType == ITYPE(presentation::XCustomPresentationSupplier) )
+ else if( mbImpressDoc && rType == cppu::UnoType<presentation::XCustomPresentationSupplier>::get() )
aAny <<= uno::Reference< presentation::XCustomPresentationSupplier >(this);
else
return SfxBaseModel::queryInterface( rType );
@@ -352,22 +352,22 @@ uno::Sequence< uno::Type > SAL_CALL SdXImpressDocument::getTypes( ) throw(uno::
maTypeSequence.realloc( nBaseTypes + nOwnTypes );
uno::Type* pTypes = maTypeSequence.getArray();
- *pTypes++ = ITYPE(beans::XPropertySet);
- *pTypes++ = ITYPE(lang::XServiceInfo);
- *pTypes++ = ITYPE(lang::XMultiServiceFactory);
- *pTypes++ = ITYPE(drawing::XDrawPageDuplicator);
- *pTypes++ = ITYPE(drawing::XLayerSupplier);
- *pTypes++ = ITYPE(drawing::XMasterPagesSupplier);
- *pTypes++ = ITYPE(drawing::XDrawPagesSupplier);
- *pTypes++ = ITYPE(document::XLinkTargetSupplier);
- *pTypes++ = ITYPE(style::XStyleFamiliesSupplier);
- *pTypes++ = ITYPE(com::sun::star::ucb::XAnyCompareFactory);
- *pTypes++ = ITYPE(view::XRenderable);
+ *pTypes++ = cppu::UnoType<beans::XPropertySet>::get();
+ *pTypes++ = cppu::UnoType<lang::XServiceInfo>::get();
+ *pTypes++ = cppu::UnoType<lang::XMultiServiceFactory>::get();
+ *pTypes++ = cppu::UnoType<drawing::XDrawPageDuplicator>::get();
+ *pTypes++ = cppu::UnoType<drawing::XLayerSupplier>::get();
+ *pTypes++ = cppu::UnoType<drawing::XMasterPagesSupplier>::get();
+ *pTypes++ = cppu::UnoType<drawing::XDrawPagesSupplier>::get();
+ *pTypes++ = cppu::UnoType<document::XLinkTargetSupplier>::get();
+ *pTypes++ = cppu::UnoType<style::XStyleFamiliesSupplier>::get();
+ *pTypes++ = cppu::UnoType<com::sun::star::ucb::XAnyCompareFactory>::get();
+ *pTypes++ = cppu::UnoType<view::XRenderable>::get();
if( mbImpressDoc )
{
- *pTypes++ = ITYPE(presentation::XPresentationSupplier);
- *pTypes++ = ITYPE(presentation::XCustomPresentationSupplier);
- *pTypes++ = ITYPE(presentation::XHandoutMasterSupplier);
+ *pTypes++ = cppu::UnoType<presentation::XPresentationSupplier>::get();
+ *pTypes++ = cppu::UnoType<presentation::XCustomPresentationSupplier>::get();
+ *pTypes++ = cppu::UnoType<presentation::XHandoutMasterSupplier>::get();
}
for( sal_Int32 nType = 0; nType < nBaseTypes; nType++ )
@@ -2455,7 +2455,7 @@ sal_Bool SAL_CALL SdDrawPagesAccess::hasByName( const OUString& aName ) throw(un
uno::Type SAL_CALL SdDrawPagesAccess::getElementType()
throw(uno::RuntimeException)
{
- return ITYPE( drawing::XDrawPage );
+ return cppu::UnoType<drawing::XDrawPage>::get();
}
sal_Bool SAL_CALL SdDrawPagesAccess::hasElements()
@@ -2657,7 +2657,7 @@ uno::Any SAL_CALL SdMasterPagesAccess::getByIndex( sal_Int32 Index )
uno::Type SAL_CALL SdMasterPagesAccess::getElementType()
throw(uno::RuntimeException)
{
- return ITYPE(drawing::XDrawPage);
+ return cppu::UnoType<drawing::XDrawPage>::get();
}
sal_Bool SAL_CALL SdMasterPagesAccess::hasElements()
@@ -2957,7 +2957,7 @@ sal_Bool SAL_CALL SdDocLinkTargets::hasByName( const OUString& aName )
uno::Type SAL_CALL SdDocLinkTargets::getElementType()
throw(uno::RuntimeException)
{
- return ITYPE(beans::XPropertySet);
+ return cppu::UnoType<beans::XPropertySet>::get();
}
sal_Bool SAL_CALL SdDocLinkTargets::hasElements()
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 217d28d..d1b867c 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -129,8 +129,8 @@ static SdTypesCache gImplTypesCache;
#define IMPRESS_MAP_ENTRIES \
- { OUString(UNO_NAME_OBJ_LEGACYFRAGMENT),WID_LEGACYFRAGMENT, ITYPE(drawing::XShape), 0, 0},\
- { OUString(UNO_NAME_OBJ_ANIMATIONPATH), WID_ANIMPATH, ITYPE(drawing::XShape), 0, 0},\
+ { OUString(UNO_NAME_OBJ_LEGACYFRAGMENT),WID_LEGACYFRAGMENT, cppu::UnoType<drawing::XShape>::get(), 0, 0},\
+ { OUString(UNO_NAME_OBJ_ANIMATIONPATH), WID_ANIMPATH, cppu::UnoType<drawing::XShape>::get(), 0, 0},\
{ OUString(UNO_NAME_OBJ_BOOKMARK), WID_BOOKMARK, ::getCppuType((const OUString*)0), 0, 0},\
{ OUString(UNO_NAME_OBJ_DIMCOLOR), WID_DIMCOLOR, ::getCppuType((const sal_Int32*)0), 0, 0},\
{ OUString(UNO_NAME_OBJ_DIMHIDE), WID_DIMHIDE, ::getBooleanCppuType(), 0, 0},\
@@ -142,7 +142,7 @@ static SdTypesCache gImplTypesCache;
{ OUString(UNO_NAME_OBJ_CLICKACTION), WID_CLICKACTION, ::getCppuType((const presentation::ClickAction*)0), 0, 0},\
{ OUString(UNO_NAME_OBJ_PLAYFULL), WID_PLAYFULL, ::getBooleanCppuType(), 0, 0},\
{ OUString(UNO_NAME_OBJ_PRESORDER), WID_PRESORDER, ::getCppuType((const sal_Int32*)0), 0, 0},\
- { OUString(UNO_NAME_OBJ_STYLE), WID_STYLE, ITYPE( style::XStyle), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},\
+ { OUString(UNO_NAME_OBJ_STYLE), WID_STYLE, cppu::UnoType<style::XStyle>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},\
{ OUString(UNO_NAME_OBJ_SOUNDFILE), WID_SOUNDFILE, ::getCppuType((const OUString*)0), 0, 0},\
{ OUString(UNO_NAME_OBJ_SOUNDON), WID_SOUNDON, ::getBooleanCppuType(), 0, 0},\
{ OUString(UNO_NAME_OBJ_SPEED), WID_SPEED, ::getCppuType((const presentation::AnimationSpeed*)0), 0, 0},\
@@ -179,7 +179,7 @@ static SdTypesCache gImplTypesCache;
#define DRAW_MAP_ENTRIES\
{ OUString(UNO_NAME_OBJ_BOOKMARK), WID_BOOKMARK, ::getCppuType((const OUString*)0), 0, 0},\
{ OUString(UNO_NAME_OBJ_CLICKACTION), WID_CLICKACTION, ::getCppuType((const presentation::ClickAction*)0),0, 0},\
- { OUString(UNO_NAME_OBJ_STYLE), WID_STYLE, ITYPE(style::XStyle), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},\
+ { OUString(UNO_NAME_OBJ_STYLE), WID_STYLE, cppu::UnoType<style::XStyle>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},\
{ OUString("NavigationOrder"), WID_NAVORDER, ::getCppuType((const sal_Int32*)0), 0, 0},\
{ OUString(), 0, css::uno::Type(), 0, 0 }
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index f505230..c323181 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -108,7 +108,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin
{
static const SfxItemPropertyMapEntry aDrawPagePropertyMap_Impl[] =
{
- { OUString(UNO_NAME_PAGE_BACKGROUND), WID_PAGE_BACK, ITYPE( beans::XPropertySet ), beans::PropertyAttribute::MAYBEVOID,0},
+ { OUString(UNO_NAME_PAGE_BACKGROUND), WID_PAGE_BACK, cppu::UnoType<beans::XPropertySet>::get(), beans::PropertyAttribute::MAYBEVOID,0},
{ OUString(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, ::getCppuType((const sal_Int32*)0), 0, 0},
{ OUString(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, ::getCppuType((const sal_Int32*)0), 0, 0},
{ OUString(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, ::getCppuType((const sal_Int32*)0), 0, 0},
@@ -118,7 +118,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin
{ OUString(UNO_NAME_PAGE_EFFECT), WID_PAGE_EFFECT, ::getCppuType((const presentation::FadeEffect*)0), 0, 0},
{ OUString(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, ::getCppuType((const sal_Int32*)0), 0, 0},
{ OUString(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, ::getCppuType((const sal_Int16*)0), 0, 0},
- { OUString(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, ITYPE( awt::XBitmap), beans::PropertyAttribute::READONLY, 0},
+ { OUString(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, ::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::getCppuType((const view::PaperOrientation*)0),0, 0},
@@ -158,7 +158,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin
{ OUString(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, ::getCppuType((const sal_Int32*)0), 0, 0}, \
{ OUString(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, ::getCppuType((const sal_Int32*)0), 0, 0}, \
{ OUString(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, ::getCppuType((const sal_Int16*)0), 0, 0}, \
- { OUString(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, ITYPE( awt::XBitmap), beans::PropertyAttribute::READONLY, 0}, \
+ { OUString(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0}, \
{ OUString(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, ::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0}, \
{ OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, \
{ OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::getCppuType((const view::PaperOrientation*)0),0, 0}, \
@@ -180,7 +180,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin
static const SfxItemPropertyMapEntry aDrawPageNotesHandoutPropertyMap_Impl[] =
{
// this must be the first two entries so they can be excluded for PK_STANDARD
- { OUString(UNO_NAME_PAGE_BACKGROUND), WID_PAGE_BACK, ITYPE( beans::XPropertySet ), beans::PropertyAttribute::MAYBEVOID,0},
+ { OUString(UNO_NAME_PAGE_BACKGROUND), WID_PAGE_BACK, cppu::UnoType<beans::XPropertySet>::get(), beans::PropertyAttribute::MAYBEVOID,0},
DRAW_PAGE_NOTES_PROPERTIES
};
static const SfxItemPropertyMapEntry aDrawPageNotesHandoutPropertyNoBackMap_Impl[] =
@@ -194,7 +194,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin
{ OUString(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, ::getCppuType((const sal_Int32*)0), 0, 0}, \
{ OUString(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, ::getCppuType((const sal_Int32*)0), 0, 0}, \
{ OUString(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, ::getCppuType((const sal_Int32*)0), 0, 0}, \
- { OUString(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, ITYPE(awt::XBitmap), beans::PropertyAttribute::READONLY, 0}, \
+ { OUString(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0}, \
{ OUString(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, ::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0}, \
{ OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, \
{ OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::getCppuType((const view::PaperOrientation*)0),0, 0}, \
@@ -209,7 +209,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin
static const SfxItemPropertyMapEntry aGraphicPagePropertyMap_Impl[] =
{
- { OUString(UNO_NAME_PAGE_BACKGROUND), WID_PAGE_BACK, ITYPE( beans::XPropertySet), beans::PropertyAttribute::MAYBEVOID,0},
+ { OUString(UNO_NAME_PAGE_BACKGROUND), WID_PAGE_BACK, cppu::UnoType<beans::XPropertySet>::get(), beans::PropertyAttribute::MAYBEVOID,0},
GRAPHIC_PAGE_PROPERTIES
};
static const SfxItemPropertyMapEntry aGraphicPagePropertyNoBackMap_Impl[] =
@@ -262,13 +262,13 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind )
{
static const SfxItemPropertyMapEntry aMasterPagePropertyMap_Impl[] =
{
- { OUString(UNO_NAME_PAGE_BACKGROUND), WID_PAGE_BACK, ITYPE(beans::XPropertySet), 0, 0},
+ { OUString(UNO_NAME_PAGE_BACKGROUND), WID_PAGE_BACK, cppu::UnoType<beans::XPropertySet>::get(), 0, 0},
{ OUString(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, ::getCppuType((const sal_Int32*)0), 0, 0},
{ OUString(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, ::getCppuType((const sal_Int32*)0), 0, 0},
{ OUString(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, ::getCppuType((const sal_Int32*)0), 0, 0},
{ OUString(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, ::getCppuType((const sal_Int32*)0), 0, 0},
{ OUString(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, ITYPE(awt::XBitmap), beans::PropertyAttribute::READONLY, 0},
+ { OUString(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, ::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::getCppuType((const view::PaperOrientation*)0),0, 0},
@@ -528,11 +528,11 @@ Any SAL_CALL SdGenericDrawPage::queryInterface( const uno::Type & rType )
else QUERYINT( drawing::XShapeCombiner );
else QUERYINT( drawing::XShapeBinder );
else QUERYINT( beans::XMultiPropertySet );
- else if( rType == ITYPE( office::XAnnotationAccess ) )
+ else if( rType == cppu::UnoType<office::XAnnotationAccess>::get() )
{
return Any( Reference< office::XAnnotationAccess >( this ) );
}
- else if( rType == ITYPE( XAnimationNodeSupplier ) )
+ else if( rType == cppu::UnoType<XAnimationNodeSupplier>::get() )
{
if( mbIsImpressDocument )
{
@@ -1874,7 +1874,7 @@ SdPageLinkTargets::~SdPageLinkTargets() throw()
uno::Type SAL_CALL SdPageLinkTargets::getElementType()
throw(uno::RuntimeException)
{
- return ITYPE(beans::XPropertySet);
+ return cppu::UnoType<beans::XPropertySet>::get();
}
sal_Bool SAL_CALL SdPageLinkTargets::hasElements()
@@ -2032,7 +2032,7 @@ SdDrawPage::~SdDrawPage() throw()
Any SAL_CALL SdDrawPage::queryInterface( const uno::Type & rType )
throw(uno::RuntimeException)
{
- if( rType == ITYPE( drawing::XMasterPageTarget ) )
+ if( rType == cppu::UnoType<drawing::XMasterPageTarget>::get() )
{
return makeAny( Reference< drawing::XMasterPageTarget >( this ) );
}
@@ -2042,7 +2042,7 @@ Any SAL_CALL SdDrawPage::queryInterface( const uno::Type & rType )
{
const PageKind ePageKind = GetPage() ? GetPage()->GetPageKind() : PK_STANDARD;
- if( ePageKind != PK_HANDOUT && rType == ITYPE( presentation::XPresentationPage ) )
+ if( ePageKind != PK_HANDOUT && rType == cppu::UnoType<presentation::XPresentationPage>::get() )
{
return makeAny( Reference< presentation::XPresentationPage >( this ) );
}
@@ -2079,21 +2079,21 @@ Sequence< uno::Type > SAL_CALL SdDrawPage::getTypes() throw(uno::RuntimeExceptio
// Collect the types of this class.
::std::vector<uno::Type> aTypes;
aTypes.reserve(13);
- aTypes.push_back(ITYPE(drawing::XDrawPage));
- aTypes.push_back(ITYPE(beans::XPropertySet));
- aTypes.push_back(ITYPE(container::XNamed));
- aTypes.push_back(ITYPE(drawing::XMasterPageTarget));
- aTypes.push_back(ITYPE(lang::XServiceInfo));
- aTypes.push_back(ITYPE(util::XReplaceable));
- aTypes.push_back(ITYPE(document::XLinkTargetSupplier));
- aTypes.push_back(ITYPE( drawing::XShapeCombiner ));
- aTypes.push_back(ITYPE( drawing::XShapeBinder ));
- aTypes.push_back(ITYPE( office::XAnnotationAccess ));
- aTypes.push_back(ITYPE( beans::XMultiPropertySet ));
+ aTypes.push_back(cppu::UnoType<drawing::XDrawPage>::get());
+ aTypes.push_back(cppu::UnoType<beans::XPropertySet>::get());
+ aTypes.push_back(cppu::UnoType<container::XNamed>::get());
+ aTypes.push_back(cppu::UnoType<drawing::XMasterPageTarget>::get());
+ aTypes.push_back(cppu::UnoType<lang::XServiceInfo>::get());
+ aTypes.push_back(cppu::UnoType<util::XReplaceable>::get());
+ aTypes.push_back(cppu::UnoType<document::XLinkTargetSupplier>::get());
+ aTypes.push_back(cppu::UnoType<drawing::XShapeCombiner>::get());
+ aTypes.push_back(cppu::UnoType<drawing::XShapeBinder>::get());
+ aTypes.push_back(cppu::UnoType<office::XAnnotationAccess>::get());
+ aTypes.push_back(cppu::UnoType<beans::XMultiPropertySet>::get());
if( bPresPage )
- aTypes.push_back(ITYPE(presentation::XPresentationPage));
+ aTypes.push_back(cppu::UnoType<presentation::XPresentationPage>::get());
if( bPresPage && ePageKind == PK_STANDARD )
- aTypes.push_back(ITYPE(XAnimationNodeSupplier));
+ aTypes.push_back(cppu::UnoType<XAnimationNodeSupplier>::get());
// Get types of base class.
const Sequence< uno::Type > aBaseTypes( SdGenericDrawPage::getTypes() );
@@ -2689,13 +2689,13 @@ Any SAL_CALL SdMasterPage::queryInterface( const uno::Type & rType )
uno::Any aAny;
- if( rType == ITYPE( container::XIndexAccess ) )
+ if( rType == cppu::UnoType<container::XIndexAccess>::get() )
aAny <<= Reference< container::XIndexAccess >((presentation::XPresentationPage*)(this));
- else if( rType == ITYPE( container::XElementAccess ) )
+ else if( rType == cppu::UnoType<container::XElementAccess>::get() )
aAny <<= Reference< container::XElementAccess >((presentation::XPresentationPage*)(this));
- else if( rType == ITYPE( container::XNamed ) )
+ else if( rType == cppu::UnoType<container::XNamed>::get() )
aAny <<= Reference< container::XNamed >(this);
- else if( rType == ITYPE( presentation::XPresentationPage ) &&
+ else if( rType == cppu::UnoType<presentation::XPresentationPage>::get() &&
( mbIsImpressDocument &&
GetPage() && GetPage()->GetPageKind() != PK_HANDOUT) )
aAny <<= Reference< presentation::XPresentationPage >( this );
@@ -2732,20 +2732,20 @@ Sequence< uno::Type > SAL_CALL SdMasterPage::getTypes() throw(uno::RuntimeExcept
// Collect the types of this class.
::std::vector<uno::Type> aTypes;
aTypes.reserve(12);
- aTypes.push_back(ITYPE(drawing::XDrawPage));
- aTypes.push_back(ITYPE(beans::XPropertySet));
- aTypes.push_back(ITYPE(container::XNamed));
- aTypes.push_back(ITYPE(lang::XServiceInfo));
- aTypes.push_back(ITYPE(util::XReplaceable));
- aTypes.push_back(ITYPE(document::XLinkTargetSupplier));
- aTypes.push_back(ITYPE( drawing::XShapeCombiner ));
- aTypes.push_back(ITYPE( drawing::XShapeBinder ));
- aTypes.push_back(ITYPE( office::XAnnotationAccess ));
- aTypes.push_back(ITYPE( beans::XMultiPropertySet ));
+ aTypes.push_back(cppu::UnoType<drawing::XDrawPage>::get());
+ aTypes.push_back(cppu::UnoType<beans::XPropertySet>::get());
+ aTypes.push_back(cppu::UnoType<container::XNamed>::get());
+ aTypes.push_back(cppu::UnoType<lang::XServiceInfo>::get());
+ aTypes.push_back(cppu::UnoType<util::XReplaceable>::get());
+ aTypes.push_back(cppu::UnoType<document::XLinkTargetSupplier>::get());
+ aTypes.push_back(cppu::UnoType<drawing::XShapeCombiner>::get());
+ aTypes.push_back(cppu::UnoType<drawing::XShapeBinder>::get());
+ aTypes.push_back(cppu::UnoType<office::XAnnotationAccess>::get());
+ aTypes.push_back(cppu::UnoType<beans::XMultiPropertySet>::get());
if( bPresPage )
- aTypes.push_back(ITYPE(presentation::XPresentationPage));
+ aTypes.push_back(cppu::UnoType<presentation::XPresentationPage>::get());
if( bPresPage && ePageKind == PK_STANDARD )
- aTypes.push_back(ITYPE(XAnimationNodeSupplier));
+ aTypes.push_back(cppu::UnoType<XAnimationNodeSupplier>::get());
// Get types of base class.
const Sequence< uno::Type > aBaseTypes( SdGenericDrawPage::getTypes() );
diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx
index 8b44fdd..690c2f9 100644
--- a/sd/source/ui/unoidl/unosrch.cxx
+++ b/sd/source/ui/unoidl/unosrch.cxx
@@ -831,7 +831,7 @@ SdUnoFindAllAccess::~SdUnoFindAllAccess() throw()
uno::Type SAL_CALL SdUnoFindAllAccess::getElementType()
throw(::com::sun::star::uno::RuntimeException)
{
- return ITYPE( text::XTextRange );
+ return cppu::UnoType<text::XTextRange>::get();
}
sal_Bool SAL_CALL SdUnoFindAllAccess::hasElements()
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 0bf65e5..cc62ba4 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -65,9 +65,6 @@ using namespace ::com::sun::star;
if( rType == ::getCppuType((const uno::Reference< xint >*)0) ) \
aAny <<= uno::Reference< xint >(this)
-#define ITYPE( xint ) \
- ::getCppuType((const uno::Reference< xint >*)0)
-
//-////////////////////////////////////////////////////////////////////
class SvxUnoDrawPagesAccess : public ::cppu::WeakImplHelper2< ::com::sun::star::drawing::XDrawPages, ::com::sun::star::lang::XServiceInfo >
@@ -303,10 +300,10 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawingModel::getTypes( ) throw(uno::
maTypeSequence.realloc( nBaseTypes + nOwnTypes );
uno::Type* pTypes = maTypeSequence.getArray();
- *pTypes++ = ITYPE(lang::XServiceInfo);
- *pTypes++ = ITYPE(lang::XMultiServiceFactory);
- *pTypes++ = ITYPE(drawing::XDrawPagesSupplier);
- *pTypes++ = ITYPE(com::sun::star::ucb::XAnyCompareFactory);
+ *pTypes++ = cppu::UnoType<lang::XServiceInfo>::get();
+ *pTypes++ = cppu::UnoType<lang::XMultiServiceFactory>::get();
+ *pTypes++ = cppu::UnoType<drawing::XDrawPagesSupplier>::get();
+ *pTypes++ = cppu::UnoType<com::sun::star::ucb::XAnyCompareFactory>::get();
for( sal_Int32 nType = 0; nType < nBaseTypes; nType++ )
*pTypes++ = *pBaseTypes++;
@@ -653,7 +650,7 @@ uno::Any SAL_CALL SvxUnoDrawPagesAccess::getByIndex( sal_Int32 Index )
uno::Type SAL_CALL SvxUnoDrawPagesAccess::getElementType()
throw(uno::RuntimeException)
{
- return ITYPE( drawing::XDrawPage );
+ return cppu::UnoType<drawing::XDrawPage>::get();
}
sal_Bool SAL_CALL SvxUnoDrawPagesAccess::hasElements()
commit 121be3b60ac5f1b4592784b2818a32889d6e9bd1
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Dec 11 15:27:24 2013 +0100
Remove unnecessary macro
Change-Id: Ibdb27900b70b6ccebfde542b516e71c4c1a6e795
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index f62bb1d..fe9429f 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -77,61 +77,59 @@ using namespace comphelper;
extern void TransformOOo2xDocument( SdDrawDocument* pDocument );
-#define XML_STRING(i, x) sal_Char const i[sizeof(x)] = x
-
-XML_STRING( sXML_metaStreamName, "meta.xml");
-XML_STRING( sXML_styleStreamName, "styles.xml" );
-XML_STRING( sXML_contentStreamName, "content.xml" );
-XML_STRING( sXML_settingsStreamName, "settings.xml" );
-
-XML_STRING( sXML_export_impress_oasis_service, "com.sun.star.comp.Impress.XMLOasisExporter" );
-XML_STRING( sXML_export_impress_meta_oasis_service, "com.sun.star.comp.Impress.XMLOasisMetaExporter" );
-XML_STRING( sXML_export_impress_styles_oasis_service, "com.sun.star.comp.Impress.XMLOasisStylesExporter" );
-XML_STRING( sXML_export_impress_content_oasis_service, "com.sun.star.comp.Impress.XMLOasisContentExporter" );
-XML_STRING( sXML_export_impress_settings_oasis_service, "com.sun.star.comp.Impress.XMLOasisSettingsExporter" );
-
-XML_STRING( sXML_export_draw_oasis_service, "com.sun.star.comp.Draw.XMLOasisExporter" );
-XML_STRING( sXML_export_draw_meta_oasis_service, "com.sun.star.comp.Draw.XMLOasisMetaExporter" );
-XML_STRING( sXML_export_draw_styles_oasis_service, "com.sun.star.comp.Draw.XMLOasisStylesExporter" );
-XML_STRING( sXML_export_draw_content_oasis_service, "com.sun.star.comp.Draw.XMLOasisContentExporter" );
-XML_STRING( sXML_export_draw_settings_oasis_service, "com.sun.star.comp.Draw.XMLOasisSettingsExporter" );
-
-XML_STRING( sXML_import_impress_oasis_service, "com.sun.star.comp.Impress.XMLOasisImporter" );
-XML_STRING( sXML_import_impress_meta_oasis_service, "com.sun.star.comp.Impress.XMLOasisMetaImporter" );
-XML_STRING( sXML_import_impress_styles_oasis_service, "com.sun.star.comp.Impress.XMLOasisStylesImporter" );
-XML_STRING( sXML_import_impress_content_oasis_service, "com.sun.star.comp.Impress.XMLOasisContentImporter" );
-XML_STRING( sXML_import_impress_settings_oasis_service, "com.sun.star.comp.Impress.XMLOasisSettingsImporter" );
-
-XML_STRING( sXML_import_draw_oasis_service, "com.sun.star.comp.Draw.XMLOasisImporter" );
-XML_STRING( sXML_import_draw_meta_oasis_service, "com.sun.star.comp.Draw.XMLOasisMetaImporter" );
-XML_STRING( sXML_import_draw_styles_oasis_service, "com.sun.star.comp.Draw.XMLOasisStylesImporter" );
-XML_STRING( sXML_import_draw_content_oasis_service, "com.sun.star.comp.Draw.XMLOasisContentImporter" );
-XML_STRING( sXML_import_draw_settings_oasis_service, "com.sun.star.comp.Draw.XMLOasisSettingsImporter" );
+char const sXML_metaStreamName[] = "meta.xml";
+char const sXML_styleStreamName[] = "styles.xml";
+char const sXML_contentStreamName[] = "content.xml";
+char const sXML_settingsStreamName[] = "settings.xml";
+
+char const sXML_export_impress_oasis_service[] = "com.sun.star.comp.Impress.XMLOasisExporter";
+char const sXML_export_impress_meta_oasis_service[] = "com.sun.star.comp.Impress.XMLOasisMetaExporter";
+char const sXML_export_impress_styles_oasis_service[] = "com.sun.star.comp.Impress.XMLOasisStylesExporter";
+char const sXML_export_impress_content_oasis_service[] = "com.sun.star.comp.Impress.XMLOasisContentExporter";
+char const sXML_export_impress_settings_oasis_service[] = "com.sun.star.comp.Impress.XMLOasisSettingsExporter";
+
+char const sXML_export_draw_oasis_service[] = "com.sun.star.comp.Draw.XMLOasisExporter";
+char const sXML_export_draw_meta_oasis_service[] = "com.sun.star.comp.Draw.XMLOasisMetaExporter";
+char const sXML_export_draw_styles_oasis_service[] = "com.sun.star.comp.Draw.XMLOasisStylesExporter";
+char const sXML_export_draw_content_oasis_service[] = "com.sun.star.comp.Draw.XMLOasisContentExporter";
+char const sXML_export_draw_settings_oasis_service[] = "com.sun.star.comp.Draw.XMLOasisSettingsExporter";
+
+char const sXML_import_impress_oasis_service[] = "com.sun.star.comp.Impress.XMLOasisImporter";
+char const sXML_import_impress_meta_oasis_service[] = "com.sun.star.comp.Impress.XMLOasisMetaImporter";
+char const sXML_import_impress_styles_oasis_service[] = "com.sun.star.comp.Impress.XMLOasisStylesImporter";
+char const sXML_import_impress_content_oasis_service[] = "com.sun.star.comp.Impress.XMLOasisContentImporter";
+char const sXML_import_impress_settings_oasis_service[] = "com.sun.star.comp.Impress.XMLOasisSettingsImporter";
+
+char const sXML_import_draw_oasis_service[] = "com.sun.star.comp.Draw.XMLOasisImporter";
+char const sXML_import_draw_meta_oasis_service[] = "com.sun.star.comp.Draw.XMLOasisMetaImporter";
+char const sXML_import_draw_styles_oasis_service[] = "com.sun.star.comp.Draw.XMLOasisStylesImporter";
+char const sXML_import_draw_content_oasis_service[] = "com.sun.star.comp.Draw.XMLOasisContentImporter";
+char const sXML_import_draw_settings_oasis_service[] = "com.sun.star.comp.Draw.XMLOasisSettingsImporter";
// OOo
-XML_STRING( sXML_export_impress_ooo_service, "com.sun.star.comp.Impress.XMLExporter" );
-XML_STRING( sXML_export_impress_meta_ooo_service, "com.sun.star.comp.Impress.XMLMetaExporter" );
-XML_STRING( sXML_export_impress_styles_ooo_service, "com.sun.star.comp.Impress.XMLStylesExporter" );
-XML_STRING( sXML_export_impress_content_ooo_service, "com.sun.star.comp.Impress.XMLContentExporter" );
-XML_STRING( sXML_export_impress_settings_ooo_service, "com.sun.star.comp.Impress.XMLSettingsExporter" );
-
-XML_STRING( sXML_export_draw_ooo_service, "com.sun.star.comp.Draw.XMLExporter" );
-XML_STRING( sXML_export_draw_meta_ooo_service, "com.sun.star.comp.Draw.XMLMetaExporter" );
-XML_STRING( sXML_export_draw_styles_ooo_service, "com.sun.star.comp.Draw.XMLStylesExporter" );
-XML_STRING( sXML_export_draw_content_ooo_service, "com.sun.star.comp.Draw.XMLContentExporter" );
-XML_STRING( sXML_export_draw_settings_ooo_service, "com.sun.star.comp.Draw.XMLSettingsExporter" );
-
-XML_STRING( sXML_import_impress_ooo_service, "com.sun.star.comp.Impress.XMLImporter" );
-XML_STRING( sXML_import_impress_meta_ooo_service, "com.sun.star.comp.Impress.XMLMetaImporter" );
-XML_STRING( sXML_import_impress_styles_ooo_service, "com.sun.star.comp.Impress.XMLStylesImporter" );
-XML_STRING( sXML_import_impress_content_ooo_service, "com.sun.star.comp.Impress.XMLContentImporter" );
-XML_STRING( sXML_import_impress_settings_ooo_service, "com.sun.star.comp.Impress.XMLSettingsImporter" );
-
-XML_STRING( sXML_import_draw_ooo_service, "com.sun.star.comp.Draw.XMLImporter" );
-XML_STRING( sXML_import_draw_meta_ooo_service, "com.sun.star.comp.Draw.XMLMetaImporter" );
-XML_STRING( sXML_import_draw_styles_ooo_service, "com.sun.star.comp.Draw.XMLStylesImporter" );
-XML_STRING( sXML_import_draw_content_ooo_service, "com.sun.star.comp.Draw.XMLContentImporter" );
-XML_STRING( sXML_import_draw_settings_ooo_service, "com.sun.star.comp.Draw.XMLSettingsImporter" );
+char const sXML_export_impress_ooo_service[] = "com.sun.star.comp.Impress.XMLExporter";
+char const sXML_export_impress_meta_ooo_service[] = "com.sun.star.comp.Impress.XMLMetaExporter";
+char const sXML_export_impress_styles_ooo_service[] = "com.sun.star.comp.Impress.XMLStylesExporter";
+char const sXML_export_impress_content_ooo_service[] = "com.sun.star.comp.Impress.XMLContentExporter";
+char const sXML_export_impress_settings_ooo_service[] = "com.sun.star.comp.Impress.XMLSettingsExporter";
+
+char const sXML_export_draw_ooo_service[] = "com.sun.star.comp.Draw.XMLExporter";
+char const sXML_export_draw_meta_ooo_service[] = "com.sun.star.comp.Draw.XMLMetaExporter";
+char const sXML_export_draw_styles_ooo_service[] = "com.sun.star.comp.Draw.XMLStylesExporter";
+char const sXML_export_draw_content_ooo_service[] = "com.sun.star.comp.Draw.XMLContentExporter";
+char const sXML_export_draw_settings_ooo_service[] = "com.sun.star.comp.Draw.XMLSettingsExporter";
+
+char const sXML_import_impress_ooo_service[] = "com.sun.star.comp.Impress.XMLImporter";
+char const sXML_import_impress_meta_ooo_service[] = "com.sun.star.comp.Impress.XMLMetaImporter";
+char const sXML_import_impress_styles_ooo_service[] = "com.sun.star.comp.Impress.XMLStylesImporter";
+char const sXML_import_impress_content_ooo_service[] = "com.sun.star.comp.Impress.XMLContentImporter";
+char const sXML_import_impress_settings_ooo_service[] = "com.sun.star.comp.Impress.XMLSettingsImporter";
+
+char const sXML_import_draw_ooo_service[] = "com.sun.star.comp.Draw.XMLImporter";
+char const sXML_import_draw_meta_ooo_service[] = "com.sun.star.comp.Draw.XMLMetaImporter";
+char const sXML_import_draw_styles_ooo_service[] = "com.sun.star.comp.Draw.XMLStylesImporter";
+char const sXML_import_draw_content_ooo_service[] = "com.sun.star.comp.Draw.XMLContentImporter";
+char const sXML_import_draw_settings_ooo_service[] = "com.sun.star.comp.Draw.XMLSettingsImporter";
struct XML_SERVICEMAP
{
commit 12bbe8f1304aba005599d55cdffa09976ed7bf6c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Dec 11 15:24:14 2013 +0100
Remove unnecessary macro
Change-Id: I8af2e887a6ad2b345b5b214eb02095c71cdafbc2
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 54ccfaf..0cd5a3c 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -60,29 +60,27 @@ using ::osl::MutexGuard;
namespace
{
-#define LOCAL_CONST_STR(i, x) sal_Char const i[sizeof(x)] = x
-
-LOCAL_CONST_STR( sXML_metaStreamName, "meta.xml");
-LOCAL_CONST_STR( sXML_styleStreamName, "styles.xml" );
-LOCAL_CONST_STR( sXML_contentStreamName, "content.xml" );
-LOCAL_CONST_STR( sXML_oldContentStreamName, "Content.xml" );
+char const sXML_metaStreamName[] = "meta.xml";
+char const sXML_styleStreamName[] = "styles.xml";
+char const sXML_contentStreamName[] = "content.xml";
+char const sXML_oldContentStreamName[] = "Content.xml";
// soffice 6/7
-LOCAL_CONST_STR( sXML_export_chart_styles_service, "com.sun.star.comp.Chart.XMLStylesExporter" );
-LOCAL_CONST_STR( sXML_export_chart_content_service, "com.sun.star.comp.Chart.XMLContentExporter" );
+char const sXML_export_chart_styles_service[] = "com.sun.star.comp.Chart.XMLStylesExporter";
+char const sXML_export_chart_content_service[] = "com.sun.star.comp.Chart.XMLContentExporter";
-LOCAL_CONST_STR( sXML_import_chart_styles_service, "com.sun.star.comp.Chart.XMLStylesImporter" );
-LOCAL_CONST_STR( sXML_import_chart_content_service, "com.sun.star.comp.Chart.XMLContentImporter" );
-LOCAL_CONST_STR( sXML_import_chart_old_content_service, "com.sun.star.office.sax.importer.Chart" );
+char const sXML_import_chart_styles_service[] = "com.sun.star.comp.Chart.XMLStylesImporter";
+char const sXML_import_chart_content_service[] = "com.sun.star.comp.Chart.XMLContentImporter";
+char const sXML_import_chart_old_content_service[] = "com.sun.star.office.sax.importer.Chart";
// Oasis
-LOCAL_CONST_STR( sXML_export_chart_oasis_styles_service, "com.sun.star.comp.Chart.XMLOasisStylesExporter" );
-LOCAL_CONST_STR( sXML_export_chart_oasis_content_service, "com.sun.star.comp.Chart.XMLOasisContentExporter" );
-LOCAL_CONST_STR( sXML_export_chart_oasis_meta_service, "com.sun.star.comp.Chart.XMLOasisMetaExporter" );
+char const sXML_export_chart_oasis_styles_service[] = "com.sun.star.comp.Chart.XMLOasisStylesExporter";
+char const sXML_export_chart_oasis_content_service[] = "com.sun.star.comp.Chart.XMLOasisContentExporter";
+char const sXML_export_chart_oasis_meta_service[] = "com.sun.star.comp.Chart.XMLOasisMetaExporter";
-LOCAL_CONST_STR( sXML_import_chart_oasis_styles_service, "com.sun.star.comp.Chart.XMLOasisStylesImporter" );
-LOCAL_CONST_STR( sXML_import_chart_oasis_content_service, "com.sun.star.comp.Chart.XMLOasisContentImporter" );
-LOCAL_CONST_STR( sXML_import_chart_oasis_meta_service, "com.sun.star.comp.Chart.XMLOasisMetaImporter" );
+char const sXML_import_chart_oasis_styles_service[] = "com.sun.star.comp.Chart.XMLOasisStylesImporter";
+char const sXML_import_chart_oasis_content_service[] = "com.sun.star.comp.Chart.XMLOasisContentImporter";
+char const sXML_import_chart_oasis_meta_service[] = "com.sun.star.comp.Chart.XMLOasisMetaImporter";
uno::Reference< embed::XStorage > lcl_getWriteStorage(
const Sequence< beans::PropertyValue >& rMediaDescriptor,
commit a62c2a5fa5d5be465b0edab6adeb1fd16ace462f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Dec 11 15:16:51 2013 +0100
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
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 8c563b1..54ccfaf 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -61,7 +61,6 @@ using ::osl::MutexGuard;
namespace
{
#define LOCAL_CONST_STR(i, x) sal_Char const i[sizeof(x)] = x
-#define MAP_LEN(x) x, sizeof(x) - 1
LOCAL_CONST_STR( sXML_metaStreamName, "meta.xml");
LOCAL_CONST_STR( sXML_styleStreamName, "styles.xml" );
@@ -340,28 +339,28 @@ sal_Int32 XMLFilter::impl_Import(
// create XPropertySet with extra informatio for the filter
/** property map for import info set */
- comphelper::PropertyMapEntry aImportInfoMap[] =
+ comphelper::PropertyMapEntry const aImportInfoMap[] =
{
// necessary properties for XML progress bar at load time
- { MAP_LEN( "ProgressRange" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
- { MAP_LEN( "ProgressMax" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
- { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
- { MAP_LEN( "PrivateData" ), 0,
- &::getCppuType( (Reference<XInterface> *)0 ),
+ { OUString("ProgressRange"), 0, ::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+ { OUString("ProgressMax"), 0, ::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+ { OUString("ProgressCurrent"), 0, ::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+ { OUString("PrivateData"), 0,
+ ::getCppuType( (Reference<XInterface> *)0 ),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
- { MAP_LEN( "BaseURI" ), 0,
- &::getCppuType( (OUString *)0 ),
+ { OUString("BaseURI"), 0,
+ ::getCppuType( (OUString *)0 ),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
- { MAP_LEN( "StreamRelPath" ), 0,
- &::getCppuType( (OUString *)0 ),
+ { OUString("StreamRelPath"), 0,
+ ::getCppuType( (OUString *)0 ),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
- { MAP_LEN( "StreamName" ), 0,
- &::getCppuType( (OUString *)0 ),
+ { OUString("StreamName"), 0,
+ ::getCppuType( (OUString *)0 ),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
- { MAP_LEN( "BuildId" ), 0,
- &::getCppuType( (OUString *)0 ),
+ { OUString("BuildId"), 0,
+ ::getCppuType( (OUString *)0 ),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
- { NULL, 0, 0, NULL, 0, 0 }
+ { OUString(), 0, css::uno::Type(), 0, 0 }
};
uno::Reference< beans::XPropertySet > xImportInfo(
comphelper::GenericPropertySet_CreateInstance(
@@ -614,14 +613,14 @@ sal_Int32 XMLFilter::impl_Export(
m_xContext, xStorage );
// property map for export info set
- comphelper::PropertyMapEntry aExportInfoMap[] =
+ comphelper::PropertyMapEntry const aExportInfoMap[] =
{
- { MAP_LEN("UsePrettyPrinting"), 0, &::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0},
- { MAP_LEN("BaseURI"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
- { MAP_LEN("StreamRelPath"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
- { MAP_LEN("StreamName"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
- { MAP_LEN("ExportTableNumberList"), 0, &::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0 },
- { NULL, 0, 0, NULL, 0, 0 }
+ { OUString("UsePrettyPrinting"), 0, ::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0},
+ { OUString("BaseURI"), 0, ::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
+ { OUString("StreamRelPath"), 0, ::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
+ { OUString("StreamName"), 0, ::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
+ { OUString("ExportTableNumberList"), 0, ::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0 },
+ { OUString(), 0, css::uno::Type(), 0, 0 }
};
uno::Reference< beans::XPropertySet > xInfoSet =
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index 3e305b9..277fb86 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -55,22 +55,22 @@ const SfxItemPropertySet* GetErrorBarPropertySet()
{
static const SfxItemPropertyMapEntry aErrorBarPropertyMap_Impl[] =
{
- {MAP_CHAR_LEN("ShowPositiveError"),0,&getBooleanCppuType(), 0, 0},
- {MAP_CHAR_LEN("ShowNegativeError"),1,&getBooleanCppuType(), 0, 0},
- {MAP_CHAR_LEN("PositiveError"),2,&getCppuType((const double*)0),0,0},
- {MAP_CHAR_LEN("NegativeError"),3,&getCppuType((const double*)0), 0, 0},
- {MAP_CHAR_LEN("PercentageError"),4,&getCppuType((const double*)0), 0, 0},
- {MAP_CHAR_LEN("ErrorBarStyle"),5,&getCppuType((sal_Int32*)0),0,0},
- {MAP_CHAR_LEN("ErrorBarRangePositive"),6,&getCppuType((OUString*)0),0,0}, // read-only for export
- {MAP_CHAR_LEN("ErrorBarRangeNegative"),7,&getCppuType((OUString*)0),0,0}, // read-only for export
- {MAP_CHAR_LEN("Weight"),8,&getCppuType((const double*)0),0,0},
- {MAP_CHAR_LEN("LineStyle"),9,&getCppuType((com::sun::star::drawing::LineStyle*)0),0,0},
- {MAP_CHAR_LEN("LineDash"),10,&getCppuType((drawing::LineDash*)0),0,0},
- {MAP_CHAR_LEN("LineWidth"),11,&getCppuType((sal_Int32*)0),0,0},
- {MAP_CHAR_LEN("LineColor"),12,&getCppuType((com::sun::star::util::Color*)0),0,0},
- {MAP_CHAR_LEN("LineTransparence"),13,&getCppuType((sal_Int16*)0),0,0},
- {MAP_CHAR_LEN("LineJoint"),14,&getCppuType((com::sun::star::drawing::LineJoint*)0),0,0},
- {0,0,0,0,0,0}
+ {OUString("ShowPositiveError"),0,getBooleanCppuType(), 0, 0},
+ {OUString("ShowNegativeError"),1,getBooleanCppuType(), 0, 0},
+ {OUString("PositiveError"),2,getCppuType((const double*)0),0,0},
+ {OUString("NegativeError"),3,getCppuType((const double*)0), 0, 0},
+ {OUString("PercentageError"),4,getCppuType((const double*)0), 0, 0},
+ {OUString("ErrorBarStyle"),5,getCppuType((sal_Int32*)0),0,0},
+ {OUString("ErrorBarRangePositive"),6,getCppuType((OUString*)0),0,0}, // read-only for export
+ {OUString("ErrorBarRangeNegative"),7,getCppuType((OUString*)0),0,0}, // read-only for export
+ {OUString("Weight"),8,getCppuType((const double*)0),0,0},
+ {OUString("LineStyle"),9,getCppuType((com::sun::star::drawing::LineStyle*)0),0,0},
+ {OUString("LineDash"),10,getCppuType((drawing::LineDash*)0),0,0},
+ {OUString("LineWidth"),11,getCppuType((sal_Int32*)0),0,0},
+ {OUString("LineColor"),12,getCppuType((com::sun::star::util::Color*)0),0,0},
+ {OUString("LineTransparence"),13,getCppuType((sal_Int16*)0),0,0},
+ {OUString("LineJoint"),14,getCppuType((com::sun::star::drawing::LineJoint*)0),0,0},
+ { OUString(), 0, css::uno::Type(), 0, 0 }
};
static SfxItemPropertySet aPropSet( aErrorBarPropertyMap_Impl );
return &aPropSet;
diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx
index feb803e..e5d52a7 100644
--- a/comphelper/source/property/genericpropertyset.cxx
+++ b/comphelper/source/property/genericpropertyset.cxx
@@ -157,15 +157,14 @@ void GenericPropertySet::_setPropertyValues( const PropertyMapEntry** ppEntries,
while( *ppEntries )
{
- const OUString aPropertyName( (*ppEntries)->mpName, (*ppEntries)->mnNameLen, RTL_TEXTENCODING_ASCII_US );
- OInterfaceContainerHelper * pHelper = m_aListener.getContainer(aPropertyName);
+ OInterfaceContainerHelper * pHelper = m_aListener.getContainer((*ppEntries)->maName);
- maAnyMap[ aPropertyName ] = *pValues;
+ maAnyMap[ (*ppEntries)->maName ] = *pValues;
if ( pHelper )
{
PropertyChangeEvent aEvt;
- aEvt.PropertyName = aPropertyName;
+ aEvt.PropertyName = (*ppEntries)->maName;
aEvt.NewValue = *pValues;
aGuard.clear();
pHelper->notifyEach( &XPropertyChangeListener::propertyChange, aEvt );
@@ -184,8 +183,7 @@ void GenericPropertySet::_getPropertyValues( const comphelper::PropertyMapEntry*
while( *ppEntries )
{
- const OUString aPropertyName( (*ppEntries)->mpName, (*ppEntries)->mnNameLen, RTL_TEXTENCODING_ASCII_US );
- *pValue = maAnyMap[ aPropertyName ];
+ *pValue = maAnyMap[ (*ppEntries)->maName ];
ppEntries++;
pValue++;
diff --git a/comphelper/source/property/propertysethelper.cxx b/comphelper/source/property/propertysethelper.cxx
index e1422cf..21cea0c 100644
--- a/comphelper/source/property/propertysethelper.cxx
+++ b/comphelper/source/property/propertysethelper.cxx
@@ -35,13 +35,13 @@ namespace comphelper
class PropertySetHelperImpl
{
public:
- PropertyMapEntry* find( const OUString& aName ) const throw();
+ PropertyMapEntry const * find( const OUString& aName ) const throw();
PropertySetInfo* mpInfo;
};
}
-PropertyMapEntry* PropertySetHelperImpl::find( const OUString& aName ) const throw()
+PropertyMapEntry const * PropertySetHelperImpl::find( const OUString& aName ) const throw()
{
PropertyMap::const_iterator aIter = mpInfo->getPropertyMap()->find( aName );
@@ -84,7 +84,7 @@ Reference< XPropertySetInfo > SAL_CALL PropertySetHelper::getPropertySetInfo( )
void SAL_CALL PropertySetHelper::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
{
- PropertyMapEntry* aEntries[2];
+ PropertyMapEntry const * aEntries[2];
aEntries[0] = mp->find( aPropertyName );
if( NULL == aEntries[0] )
@@ -97,7 +97,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue( const OUString& aPropertyName
Any SAL_CALL PropertySetHelper::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
- PropertyMapEntry* aEntries[2];
+ PropertyMapEntry const * aEntries[2];
aEntries[0] = mp->find( PropertyName );
if( NULL == aEntries[0] )
@@ -141,7 +141,7 @@ void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< OUString >&
if( nCount )
{
- PropertyMapEntry** pEntries = new PropertyMapEntry*[nCount+1];
+ PropertyMapEntry const ** pEntries = new PropertyMapEntry const *[nCount+1];
pEntries[nCount] = NULL;
const OUString* pNames = aPropertyNames.getConstArray();
@@ -170,7 +170,7 @@ Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues( const Sequence< O
Sequence< Any > aValues;
if( nCount )
{
- PropertyMapEntry** pEntries = new PropertyMapEntry*[nCount+1];
+ PropertyMapEntry const ** pEntries = new PropertyMapEntry const *[nCount+1];
pEntries[nCount] = NULL;
const OUString* pNames = aPropertyNames.getConstArray();
@@ -215,7 +215,7 @@ void SAL_CALL PropertySetHelper::firePropertiesChangeEvent( const Sequence< OUSt
// XPropertyState
PropertyState SAL_CALL PropertySetHelper::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException)
{
- PropertyMapEntry* aEntries[2];
+ PropertyMapEntry const * aEntries[2];
aEntries[0] = mp->find( PropertyName );
if( aEntries[0] == NULL )
@@ -241,7 +241,7 @@ Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const S
sal_Bool bUnknown = sal_False;
- PropertyMapEntry** pEntries = new PropertyMapEntry*[nCount+1];
+ PropertyMapEntry const ** pEntries = new PropertyMapEntry const *[nCount+1];
sal_Int32 n;
for( n = 0; !bUnknown && (n < nCount); n++, pNames++ )
@@ -266,7 +266,7 @@ Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const S
void SAL_CALL PropertySetHelper::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException)
{
- PropertyMapEntry *pEntry = mp->find( PropertyName );
+ PropertyMapEntry const *pEntry = mp->find( PropertyName );
if( NULL == pEntry )
throw UnknownPropertyException( PropertyName, static_cast< XPropertySet* >( this ) );
@@ -275,7 +275,7 @@ void SAL_CALL PropertySetHelper::setPropertyToDefault( const OUString& PropertyN
Any SAL_CALL PropertySetHelper::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
- PropertyMapEntry* pEntry = mp->find( aPropertyName );
+ PropertyMapEntry const * pEntry = mp->find( aPropertyName );
if( NULL == pEntry )
throw UnknownPropertyException( aPropertyName, static_cast< XPropertySet* >( this ) );
diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx
index 2567a06..cc49841 100644
--- a/comphelper/source/property/propertysetinfo.cxx
+++ b/comphelper/source/property/propertysetinfo.cxx
@@ -35,7 +35,7 @@ public:
PropertyMapImpl() throw();
virtual ~PropertyMapImpl() throw();
- void add( PropertyMapEntry* pMap, sal_Int32 nCount = -1 ) throw();
+ void add( PropertyMapEntry const * pMap, sal_Int32 nCount = -1 ) throw();
void remove( const OUString& aName ) throw();
Sequence< Property > getProperties() throw();
@@ -59,30 +59,23 @@ PropertyMapImpl::~PropertyMapImpl() throw()
{
}
-void PropertyMapImpl::add( PropertyMapEntry* pMap, sal_Int32 nCount ) throw()
+void PropertyMapImpl::add( PropertyMapEntry const * pMap, sal_Int32 nCount ) throw()
{
// nCount < 0 => add all
// nCount == 0 => add nothing
// nCount > 0 => add at most nCount entries
- while( pMap->mpName && ( ( nCount < 0) || ( nCount-- > 0 ) ) )
+ while( !pMap->maName.isEmpty() && ( ( nCount < 0) || ( nCount-- > 0 ) ) )
{
- OUString aName( pMap->mpName, pMap->mnNameLen, RTL_TEXTENCODING_ASCII_US );
-
#ifdef DBG_UTIL
- PropertyMap::iterator aIter = maPropertyMap.find( aName );
+ PropertyMap::iterator aIter = maPropertyMap.find( pMap->maName );
if( aIter != maPropertyMap.end() )
{
OSL_FAIL( "Warning: PropertyMapEntry added twice, possible error!");
}
#endif
- if( NULL == pMap->mpType )
- {
- OSL_FAIL( "No type in PropertyMapEntry!");
- pMap->mpType = &::getCppuType((const sal_Int32*)0);
- }
- maPropertyMap[aName] = pMap;
+ maPropertyMap[pMap->maName] = pMap;
if( maProperties.getLength() )
maProperties.realloc( 0 );
@@ -113,11 +106,11 @@ Sequence< Property > PropertyMapImpl::getProperties() throw()
const PropertyMap::iterator aEnd = maPropertyMap.end();
while( aIter != aEnd )
{
- PropertyMapEntry* pEntry = (*aIter).second;
+ PropertyMapEntry const * pEntry = (*aIter).second;
- pProperties->Name = OUString( pEntry->mpName, pEntry->mnNameLen, RTL_TEXTENCODING_ASCII_US );
+ pProperties->Name = pEntry->maName;
pProperties->Handle = pEntry->mnHandle;
- pProperties->Type = *pEntry->mpType;
+ pProperties->Type = pEntry->maType;
pProperties->Attributes = pEntry->mnAttributes;
++pProperties;
@@ -140,9 +133,9 @@ Property PropertyMapImpl::getPropertyByName( const OUString& aName ) throw( Unkn
if( maPropertyMap.end() == aIter )
throw UnknownPropertyException( aName, NULL );
- PropertyMapEntry* pEntry = (*aIter).second;
+ PropertyMapEntry const * pEntry = (*aIter).second;
- return Property( aName, pEntry->mnHandle, *pEntry->mpType, pEntry->mnAttributes );
+ return Property( aName, pEntry->mnHandle, pEntry->maType, pEntry->mnAttributes );
}
sal_Bool PropertyMapImpl::hasPropertyByName( const OUString& aName ) throw()
@@ -157,7 +150,7 @@ PropertySetInfo::PropertySetInfo() throw()
mpMap = new PropertyMapImpl();
}
-PropertySetInfo::PropertySetInfo( PropertyMapEntry* pMap ) throw()
+PropertySetInfo::PropertySetInfo( PropertyMapEntry const * pMap ) throw()
{
mpMap = new PropertyMapImpl();
mpMap->add( pMap );
@@ -168,7 +161,7 @@ PropertySetInfo::~PropertySetInfo() throw()
delete mpMap;
}
-void PropertySetInfo::add( PropertyMapEntry* pMap ) throw()
+void PropertySetInfo::add( PropertyMapEntry const * pMap ) throw()
{
mpMap->add( pMap );
}
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 38c1ff4..21f16e8 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -89,7 +89,6 @@
#include <list>
#include <svtools/grfmgr.hxx>
-#define MAP_LEN(x) x, sizeof(x) - 1
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -493,11 +492,11 @@ void ODatabaseDocument::impl_import_nolck_throw( const Reference< XComponentCont
lcl_extractAndStartStatusIndicator( _rResource, xStatusIndicator, aFilterCreationArgs );
/** property map for import info set */
- comphelper::PropertyMapEntry aExportInfoMap[] =
+ comphelper::PropertyMapEntry const aExportInfoMap[] =
{
- { MAP_LEN( "BaseURI"), 0,&::getCppuType( (OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 },
- { MAP_LEN( "StreamName"), 0,&::getCppuType( (OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 },
- { NULL, 0, 0, NULL, 0, 0 }
+ { OUString("BaseURI"), 0, ::getCppuType( (OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 },
+ { OUString("StreamName"), 0, ::getCppuType( (OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 },
+ { OUString(), 0, css::uno::Type(), 0, 0 }
};
uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ) );
xInfoSet->setPropertyValue("BaseURI", uno::makeAny(_rResource.getOrDefault("URL",OUString())));
@@ -1613,10 +1612,10 @@ void ODatabaseDocument::impl_writeStorage_throw( const Reference< XStorage >& _r
/** property map for export info set */
comphelper::PropertyMapEntry aExportInfoMap[] =
{
- { MAP_LEN( "BaseURI"), 0,&::getCppuType( (OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 },
- { MAP_LEN( "StreamName"), 0,&::getCppuType( (OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 },
- { MAP_LEN( "UsePrettyPrinting" ), 0, &::getCppuType((sal_Bool*)0), beans::PropertyAttribute::MAYBEVOID, 0},
- { NULL, 0, 0, NULL, 0, 0 }
+ { OUString("BaseURI"), 0, ::getCppuType( (OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 },
+ { OUString("StreamName"), 0, ::getCppuType( (OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 },
+ { OUString("UsePrettyPrinting"), 0, ::getCppuType((sal_Bool*)0), beans::PropertyAttribute::MAYBEVOID, 0},
+ { OUString(), 0, css::uno::Type(), 0, 0 }
};
uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ) );
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index b041172..3b44e94 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -94,9 +94,9 @@ namespace accessibility
SVX_UNOEDIT_CHAR_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
SVX_UNOEDIT_NUMBERING_PROPERTIE,
- {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- {0,0,0,0,0,0}
+ {OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ { OUString(), 0, css::uno::Type(), 0, 0 }
};
static SvxItemPropertySet aPropSet( aPropMap, EditEngine::GetGlobalItemPool() );
return &aPropSet;
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 6c818e2..b4ee7cd 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -71,62 +71,62 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId )
{
static const SfxItemPropertyMapEntry aExDateTimeFieldPropertyMap_Impl[] =
{
- { MAP_CHAR_LEN(UNO_TC_PROP_DATE_TIME), WID_DATE, &::getCppuType((const util::DateTime*)0), 0, 0 },
- { MAP_CHAR_LEN(UNO_TC_PROP_IS_FIXED), WID_BOOL1, &::getBooleanCppuType(), 0, 0 },
- { MAP_CHAR_LEN(UNO_TC_PROP_IS_DATE), WID_BOOL2, &::getBooleanCppuType(), 0, 0 },
- { MAP_CHAR_LEN(UNO_TC_PROP_NUMFORMAT), WID_INT32, &::getCppuType((const sal_Int32*)0), 0, 0 },
- {0,0,0,0,0,0}
+ { OUString(UNO_TC_PROP_DATE_TIME), WID_DATE, ::getCppuType((const util::DateTime*)0), 0, 0 },
+ { OUString(UNO_TC_PROP_IS_FIXED), WID_BOOL1, ::getBooleanCppuType(), 0, 0 },
+ { OUString(UNO_TC_PROP_IS_DATE), WID_BOOL2, ::getBooleanCppuType(), 0, 0 },
+ { OUString(UNO_TC_PROP_NUMFORMAT), WID_INT32, ::getCppuType((const sal_Int32*)0), 0, 0 },
+ { OUString(), 0, css::uno::Type(), 0, 0 }
};
static const SfxItemPropertySet aExDateTimeFieldPropertySet_Impl(aExDateTimeFieldPropertyMap_Impl);
static const SfxItemPropertyMapEntry aDateTimeFieldPropertyMap_Impl[] =
{
- { MAP_CHAR_LEN(UNO_TC_PROP_IS_DATE), WID_BOOL2, &::getBooleanCppuType(), 0, 0 },
- {0,0,0,0,0,0}
+ { OUString(UNO_TC_PROP_IS_DATE), WID_BOOL2, ::getBooleanCppuType(), 0, 0 },
+ { OUString(), 0, css::uno::Type(), 0, 0 }
};
static const SfxItemPropertySet aDateTimeFieldPropertySet_Impl(aDateTimeFieldPropertyMap_Impl);
static const SfxItemPropertyMapEntry aUrlFieldPropertyMap_Impl[] =
{
- { MAP_CHAR_LEN(UNO_TC_PROP_URL_FORMAT), WID_INT16, &::getCppuType((const sal_Int16*)0), 0, 0 },
- { MAP_CHAR_LEN(UNO_TC_PROP_URL_REPRESENTATION), WID_STRING1, &::getCppuType((const OUString*)0), 0, 0 },
- { MAP_CHAR_LEN(UNO_TC_PROP_URL_TARGET), WID_STRING2, &::getCppuType((const OUString*)0), 0, 0 },
- { MAP_CHAR_LEN(UNO_TC_PROP_URL), WID_STRING3, &::getCppuType((const OUString*)0), 0, 0 },
- {0,0,0,0,0,0}
+ { OUString(UNO_TC_PROP_URL_FORMAT), WID_INT16, ::getCppuType((const sal_Int16*)0), 0, 0 },
+ { OUString(UNO_TC_PROP_URL_REPRESENTATION), WID_STRING1, ::getCppuType((const OUString*)0), 0, 0 },
+ { OUString(UNO_TC_PROP_URL_TARGET), WID_STRING2, ::getCppuType((const OUString*)0), 0, 0 },
+ { OUString(UNO_TC_PROP_URL), WID_STRING3, ::getCppuType((const OUString*)0), 0, 0 },
+ { OUString(), 0, css::uno::Type(), 0, 0 }
};
static const SfxItemPropertySet aUrlFieldPropertySet_Impl(aUrlFieldPropertyMap_Impl);
static const SfxItemPropertyMapEntry aEmptyPropertyMap_Impl[] =
{
- {0,0,0,0,0,0}
+ { OUString(), 0, css::uno::Type(), 0, 0 }
};
static const SfxItemPropertySet aEmptyPropertySet_Impl(aEmptyPropertyMap_Impl);
static const SfxItemPropertyMapEntry aExtFileFieldPropertyMap_Impl[] =
{
- { MAP_CHAR_LEN(UNO_TC_PROP_IS_FIXED), WID_BOOL1, &::getBooleanCppuType(), 0, 0 },
- { MAP_CHAR_LEN(UNO_TC_PROP_FILE_FORMAT), WID_INT16, &::getCppuType((const sal_Int16*)0), 0, 0 },
- { MAP_CHAR_LEN(UNO_TC_PROP_CURRENT_PRESENTATION), WID_STRING1, &::getCppuType((const OUString*)0), 0, 0 },
- {0,0,0,0,0,0}
+ { OUString(UNO_TC_PROP_IS_FIXED), WID_BOOL1, ::getBooleanCppuType(), 0, 0 },
+ { OUString(UNO_TC_PROP_FILE_FORMAT), WID_INT16, ::getCppuType((const sal_Int16*)0), 0, 0 },
+ { OUString(UNO_TC_PROP_CURRENT_PRESENTATION), WID_STRING1, ::getCppuType((const OUString*)0), 0, 0 },
+ { OUString(), 0, css::uno::Type(), 0, 0 }
};
static const SfxItemPropertySet aExtFileFieldPropertySet_Impl(aExtFileFieldPropertyMap_Impl);
static const SfxItemPropertyMapEntry aAuthorFieldPropertyMap_Impl[] =
{
- { MAP_CHAR_LEN(UNO_TC_PROP_IS_FIXED), WID_BOOL1, &::getBooleanCppuType(), 0, 0 },
- { MAP_CHAR_LEN(UNO_TC_PROP_CURRENT_PRESENTATION), WID_STRING1,&::getCppuType((const OUString*)0), 0, 0 },
- { MAP_CHAR_LEN(UNO_TC_PROP_AUTHOR_CONTENT), WID_STRING2,&::getCppuType((const OUString*)0), 0, 0 },
- { MAP_CHAR_LEN(UNO_TC_PROP_AUTHOR_FORMAT), WID_INT16, &::getCppuType((const sal_Int16*)0), 0, 0 },
- { MAP_CHAR_LEN(UNO_TC_PROP_AUTHOR_FULLNAME), WID_BOOL2, &::getBooleanCppuType(), 0, 0 },
- {0,0,0,0,0,0}
+ { OUString(UNO_TC_PROP_IS_FIXED), WID_BOOL1, ::getBooleanCppuType(), 0, 0 },
+ { OUString(UNO_TC_PROP_CURRENT_PRESENTATION), WID_STRING1,::getCppuType((const OUString*)0), 0, 0 },
+ { OUString(UNO_TC_PROP_AUTHOR_CONTENT), WID_STRING2,::getCppuType((const OUString*)0), 0, 0 },
+ { OUString(UNO_TC_PROP_AUTHOR_FORMAT), WID_INT16, ::getCppuType((const sal_Int16*)0), 0, 0 },
+ { OUString(UNO_TC_PROP_AUTHOR_FULLNAME), WID_BOOL2, ::getBooleanCppuType(), 0, 0 },
+ { OUString(), 0, css::uno::Type(), 0, 0 }
};
static const SfxItemPropertySet aAuthorFieldPropertySet_Impl(aAuthorFieldPropertyMap_Impl);
static const SfxItemPropertyMapEntry aMeasureFieldPropertyMap_Impl[] =
{
- { MAP_CHAR_LEN(UNO_TC_PROP_MEASURE_KIND), WID_INT16, &::getCppuType((const sal_Int16*)0), 0, 0 },
- {0,0,0,0,0,0}
+ { OUString(UNO_TC_PROP_MEASURE_KIND), WID_INT16, ::getCppuType((const sal_Int16*)0), 0, 0 },
+ { OUString(), 0, css::uno::Type(), 0, 0 }
};
static const SfxItemPropertySet aMeasureFieldPropertySet_Impl(aMeasureFieldPropertyMap_Impl);
diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx
index ed16db9b..fe955ba 100644
--- a/editeng/source/uno/unoipset.cxx
+++ b/editeng/source/uno/unoipset.cxx
@@ -133,13 +133,13 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
SvxUnoConvertToMM( eMapUnit, aVal );
}
}
- else if ( pMap->pType->getTypeClass() == uno::TypeClass_ENUM &&
+ else if ( pMap->aType.getTypeClass() == uno::TypeClass_ENUM &&
aVal.getValueType() == ::getCppuType((const sal_Int32*)0) )
{
// convert typeless SfxEnumItem to enum type
sal_Int32 nEnum;
aVal >>= nEnum;
- aVal.setValue( &nEnum, *pMap->pType );
+ aVal.setValue( &nEnum, pMap->aType );
}
}
else
@@ -245,13 +245,13 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
}
}
- if ( pMap->pType->getTypeClass() == uno::TypeClass_ENUM &&
+ if ( pMap->aType.getTypeClass() == uno::TypeClass_ENUM &&
aVal.getValueType() == ::getCppuType((const sal_Int32*)0) )
{
sal_Int32 nEnum;
aVal >>= nEnum;
- aVal.setValue( &nEnum, *pMap->pType );
+ aVal.setValue( &nEnum, pMap->aType );
}
return aVal;
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 8a63ef7..93c46ae 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -88,11 +88,11 @@ const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap()
SVX_UNOEDIT_FONT_PROPERTIES,
SVX_UNOEDIT_OUTLINER_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
- {MAP_CHAR_LEN("TextField"), EE_FEATURE_FIELD, &::getCppuType((const uno::Reference< text::XTextField >*)0), beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- {0,0,0,0,0,0}
+ {OUString("TextField"), EE_FEATURE_FIELD, ::getCppuType((const uno::Reference< text::XTextField >*)0), beans::PropertyAttribute::READONLY, 0 },
+ {OUString("TextPortionType"), WID_PORTIONTYPE, ::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0 },
+ {OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ { OUString(), 0, css::uno::Type(), 0, 0 }
};
return aSvxTextPortionPropertyMap;
}
@@ -117,9 +117,9 @@ const SfxItemPropertyMapEntry* ImplGetSvxUnoOutlinerTextCursorPropertyMap()
SVX_UNOEDIT_FONT_PROPERTIES,
SVX_UNOEDIT_OUTLINER_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
- {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- {0,0,0,0,0,0}
+ {OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ { OUString(), 0, css::uno::Type(), 0, 0 }
};
return aSvxUnoOutlinerTextCursorPropertyMap;
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index 6d3523c..8dbd165 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -382,11 +382,11 @@ SvxXMLTextExportComponent::SvxXMLTextExportComponent(
SVX_UNOEDIT_CHAR_PROPERTIES,
SVX_UNOEDIT_FONT_PROPERTIES,
// SVX_UNOEDIT_OUTLINER_PROPERTIES,
- {MAP_CHAR_LEN(UNO_NAME_NUMBERING_RULES), EE_PARA_NUMBULLET, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace>*)0), 0, 0 },
- {MAP_CHAR_LEN(UNO_NAME_NUMBERING), EE_PARA_BULLETSTATE,&::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(UNO_NAME_NUMBERING_LEVEL), EE_PARA_OUTLLEVEL, &::getCppuType((const sal_Int16*)0), 0, 0 },
+ {OUString(UNO_NAME_NUMBERING_RULES), EE_PARA_NUMBULLET, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace>*)0), 0, 0 },
+ {OUString(UNO_NAME_NUMBERING), EE_PARA_BULLETSTATE,::getBooleanCppuType(), 0, 0 },
+ {OUString(UNO_NAME_NUMBERING_LEVEL), EE_PARA_OUTLLEVEL, ::getCppuType((const sal_Int16*)0), 0, 0 },
SVX_UNOEDIT_PARA_PROPERTIES,
- {0,0,0,0,0,0}
+ { OUString(), 0, css::uno::Type(), 0, 0 }
};
static SvxItemPropertySet aSvxXMLTextExportComponentPropertySet( SvxXMLTextExportComponentPropertyMap, EditEngine::GetGlobalItemPool() );
diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index 5220dbf..f5c7fbf 100644
--- a/editeng/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -147,7 +147,7 @@ void SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& r
SVX_UNOEDIT_FONT_PROPERTIES,
// SVX_UNOEDIT_OUTLINER_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
- {0,0,0,0,0,0}
+ { OUString(), 0, css::uno::Type(), 0, 0 }
};
static SvxItemPropertySet aSvxXMLTextImportComponentPropertySet( SvxXMLTextImportComponentPropertyMap, EditEngine::GetGlobalItemPool() );
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 94e5e0a..ef47bb9 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -577,8 +577,8 @@ Reference< XPropertySetInfo > BibliographyLoader::getPropertySetInfo(void) thro
{
static const SfxItemPropertyMapEntry aBibProps_Impl[] =
{
- { MAP_CHAR_LEN("BibliographyDataFieldNames"), 0, &::getCppuType((Sequence<PropertyValue>*)0), PropertyAttribute::READONLY, 0},
- {0,0,0,0,0,0}
+ { OUString("BibliographyDataFieldNames"), 0, ::getCppuType((Sequence<PropertyValue>*)0), PropertyAttribute::READONLY, 0},
+ { OUString(), 0, css::uno::Type(), 0, 0 }
};
static Reference< XPropertySetInfo > xRet =
SfxItemPropertySet(aBibProps_Impl).getPropertySetInfo();
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index 5ad8a22..539f746 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -63,9 +63,6 @@ using namespace com::sun::star::xml::sax;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::task;
-
-#define MAP_LEN(x) x, sizeof(x) - 1
-
sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
throw (RuntimeException)
{
@@ -98,8 +95,8 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star
// create an XProperty set to configure the exporter for pretty printing
PropertyMapEntry aImportInfoMap[] =
{
- { MAP_LEN( "BaseURI" ), 0, &::getCppuType((const OUString*)0), PropertyAttribute::MAYBEVOID, 0},
- { NULL, 0, 0, NULL, 0, 0 }
+ { OUString("BaseURI"), 0, ::getCppuType((const OUString*)0), PropertyAttribute::MAYBEVOID, 0},
+ { OUString(), 0, css::uno::Type(), 0, 0 }
};
Reference< XPropertySet > xInfoSet(
@@ -256,10 +253,10 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star
// create an XProperty set to configure the exporter for pretty printing
PropertyMapEntry aImportInfoMap[] =
{
- { MAP_LEN( "UsePrettyPrinting" ), 0, &::getCppuType((const sal_Bool*)0), PropertyAttribute::MAYBEVOID, 0},
- { MAP_LEN( "ExportTextNumberElement" ), 0, &::getCppuType((const sal_Bool*)0), PropertyAttribute::MAYBEVOID, 0},
- { MAP_LEN( "BaseURI" ), 0, &::getCppuType((const OUString*)0), PropertyAttribute::MAYBEVOID, 0},
- { NULL, 0, 0, NULL, 0, 0 }
+ { OUString("UsePrettyPrinting"), 0, ::getCppuType((const sal_Bool*)0), PropertyAttribute::MAYBEVOID, 0},
+ { OUString("ExportTextNumberElement"), 0, ::getCppuType((const sal_Bool*)0), PropertyAttribute::MAYBEVOID, 0},
+ { OUString("BaseURI"), 0, ::getCppuType((const OUString*)0), PropertyAttribute::MAYBEVOID, 0},
+ { OUString(), 0, css::uno::Type(), 0, 0 }
};
Reference< XPropertySet > xInfoSet(
diff --git a/forms/source/richtext/richtextunowrapper.cxx b/forms/source/richtext/richtextunowrapper.cxx
index 817bf2f..4415f15 100644
--- a/forms/source/richtext/richtextunowrapper.cxx
+++ b/forms/source/richtext/richtextunowrapper.cxx
@@ -49,9 +49,9 @@ namespace frm
SVX_UNOEDIT_CHAR_PROPERTIES,
SVX_UNOEDIT_FONT_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
- { MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType( static_cast< const Reference< XNameContainer >* >( NULL ) ), 0, 0 },
- { MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType( static_cast< const Reference< XNameContainer >* >( NULL ) ), 0, 0 },
- { NULL, 0, 0, NULL, 0, 0 }
+ { OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, ::getCppuType( static_cast< const Reference< XNameContainer >* >( NULL ) ), 0, 0 },
+ { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType( static_cast< const Reference< XNameContainer >* >( NULL ) ), 0, 0 },
+ { OUString(), 0, css::uno::Type(), 0, 0 }
};
static SvxItemPropertySet aTextEnginePropertySet( aTextEnginePropertyMap, SdrObject::GetGlobalDrawObjectItemPool() );
return &aTextEnginePropertySet;
diff --git a/include/comphelper/TypeGeneration.hxx b/include/comphelper/TypeGeneration.hxx
index 6e03c0b..0b70e4a 100644
--- a/include/comphelper/TypeGeneration.hxx
+++ b/include/comphelper/TypeGeneration.hxx
@@ -23,8 +23,6 @@
#include <sal/types.h>
#include <comphelper/comphelperdllapi.h>
-#define CPPU_E2T(type) ((com::sun::star::uno::Type*)type)
-
namespace com { namespace sun { namespace star { namespace uno {
class Type;
} } } }
diff --git a/include/comphelper/propertysetinfo.hxx b/include/comphelper/propertysetinfo.hxx
index 34b12e1..71863b0 100644
--- a/include/comphelper/propertysetinfo.hxx
+++ b/include/comphelper/propertysetinfo.hxx
@@ -39,15 +39,14 @@ namespace comphelper
struct PropertyMapEntry
{
- const sal_Char* mpName;
- sal_uInt16 mnNameLen;
+ OUString maName;
sal_Int32 mnHandle;
- const com::sun::star::uno::Type* mpType;
+ com::sun::star::uno::Type maType;
sal_Int16 mnAttributes;
sal_uInt8 mnMemberId;
};
-typedef std::map<OUString, PropertyMapEntry*> PropertyMap;
+typedef std::map<OUString, PropertyMapEntry const *> PropertyMap;
class PropertyMapImpl;
@@ -60,7 +59,7 @@ private:
PropertyMapImpl* mpMap;
public:
PropertySetInfo() throw();
- PropertySetInfo( PropertyMapEntry* pMap ) throw();
+ PropertySetInfo( PropertyMapEntry const * pMap ) throw();
virtual ~PropertySetInfo() throw();
/** returns a stl map with all PropertyMapEntry pointer.<p>
@@ -71,7 +70,7 @@ public:
/** adds an array of PropertyMapEntry to this instance.<p>
The end is marked with a PropertyMapEntry where mpName equals NULL</p>
*/
- void add( PropertyMapEntry* pMap ) throw();
+ void add( PropertyMapEntry const * pMap ) throw();
/** removes an already added PropertyMapEntry which string in mpName equals to aName */
void remove( const OUString& aName ) throw();
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 8c9da3f..e1ee419 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -69,81 +69,81 @@ class SvxItemPropertySet;
#define WID_PARAISNUMBERINGRESTART OWN_ATTR_VALUE_START+4
#define SVX_UNOEDIT_NUMBERING_PROPERTIE \
- {MAP_CHAR_LEN(UNO_NAME_NUMBERING_RULES), EE_PARA_NUMBULLET, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace>*)0), 0, 0 }, \
- {MAP_CHAR_LEN(UNO_NAME_NUMBERING), EE_PARA_BULLETSTATE,&::getBooleanCppuType(), 0, 0 }
+ {OUString(UNO_NAME_NUMBERING_RULES), EE_PARA_NUMBULLET, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace>*)0), 0, 0 }, \
+ {OUString(UNO_NAME_NUMBERING), EE_PARA_BULLETSTATE,::getBooleanCppuType(), 0, 0 }
#define SVX_UNOEDIT_OUTLINER_PROPERTIES \
SVX_UNOEDIT_NUMBERING_PROPERTIE, \
- {MAP_CHAR_LEN(UNO_NAME_NUMBERING_LEVEL), WID_NUMLEVEL, &::getCppuType((const sal_Int16*)0), 0, 0 }, \
- {MAP_CHAR_LEN("NumberingStartValue"), WID_NUMBERINGSTARTVALUE, &::getCppuType((const sal_Int16*)0), 0, 0 }, \
- {MAP_CHAR_LEN("ParaIsNumberingRestart"), WID_PARAISNUMBERINGRESTART, &::getBooleanCppuType(), 0, 0 }
+ {OUString(UNO_NAME_NUMBERING_LEVEL), WID_NUMLEVEL, ::getCppuType((const sal_Int16*)0), 0, 0 }, \
+ {OUString("NumberingStartValue"), WID_NUMBERINGSTARTVALUE, ::getCppuType((const sal_Int16*)0), 0, 0 }, \
+ {OUString("ParaIsNumberingRestart"), WID_PARAISNUMBERINGRESTART, ::getBooleanCppuType(), 0, 0 }
#define SVX_UNOEDIT_CHAR_PROPERTIES \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_HEIGHT), EE_CHAR_FONTHEIGHT, &::getCppuType((const float*)0), 0, MID_FONTHEIGHT|CONVERT_TWIPS }, \
- { MAP_CHAR_LEN("CharScaleWidth"), EE_CHAR_FONTWIDTH, &::getCppuType((const sal_Int16*)0), 0, 0 }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTNAME), EE_CHAR_FONTINFO, &::getCppuType((const OUString*)0), 0, MID_FONT_FAMILY_NAME },\
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTSTYLENAME),EE_CHAR_FONTINFO, &::getCppuType((const OUString*)0), 0, MID_FONT_STYLE_NAME }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTFAMILY), EE_CHAR_FONTINFO, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_FAMILY }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTCHARSET), EE_CHAR_FONTINFO, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_CHAR_SET }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTPITCH), EE_CHAR_FONTINFO, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_PITCH }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_POSTURE), EE_CHAR_ITALIC, &::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, MID_POSTURE }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_WEIGHT), EE_CHAR_WEIGHT, &::getCppuType((const float*)0), 0, MID_WEIGHT }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_LOCALE), EE_CHAR_LANGUAGE, &::getCppuType((const ::com::sun::star::lang::Locale*)0),0, MID_LANG_LOCALE }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_COLOR), EE_CHAR_COLOR, &::getCppuType((const sal_Int32*)0), 0, 0 }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_ESCAPEMENT), EE_CHAR_ESCAPEMENT, &::getCppuType((const sal_Int16*)0), 0, MID_ESC }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_UNDERLINE), EE_CHAR_UNDERLINE, &::getCppuType((const sal_Int16*)0), 0, MID_TL_STYLE }, \
- { MAP_CHAR_LEN("CharUnderlineColor"), EE_CHAR_UNDERLINE, &::getCppuType((const sal_Int32*)0), 0, MID_TL_COLOR }, \
- { MAP_CHAR_LEN("CharUnderlineHasColor"), EE_CHAR_UNDERLINE, &::getBooleanCppuType(), 0, MID_TL_HASCOLOR } , \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_OVERLINE), EE_CHAR_OVERLINE, &::getCppuType((const sal_Int16*)0), 0, MID_TL_STYLE }, \
- { MAP_CHAR_LEN("CharOverlineColor"), EE_CHAR_OVERLINE, &::getCppuType((const sal_Int32*)0), 0, MID_TL_COLOR }, \
- { MAP_CHAR_LEN("CharOverlineHasColor"), EE_CHAR_OVERLINE, &::getBooleanCppuType(), 0, MID_TL_HASCOLOR } , \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_CROSSEDOUT), EE_CHAR_STRIKEOUT, &::getBooleanCppuType(), 0, MID_CROSSED_OUT }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_STRIKEOUT), EE_CHAR_STRIKEOUT, &::getCppuType((const sal_Int16*)0), 0, MID_CROSS_OUT}, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_SHADOWED), EE_CHAR_SHADOW, &::getBooleanCppuType(), 0, 0 }, \
- { MAP_CHAR_LEN("CharContoured"), EE_CHAR_OUTLINE, &::getBooleanCppuType(), 0, 0 }, \
- { MAP_CHAR_LEN("CharEscapementHeight"), EE_CHAR_ESCAPEMENT, &::getCppuType((const sal_Int8*)0), 0, MID_ESC_HEIGHT },\
- { MAP_CHAR_LEN("CharAutoKerning"), EE_CHAR_PAIRKERNING,&::getBooleanCppuType(), 0, 0 } , \
- { MAP_CHAR_LEN("CharKerning"), EE_CHAR_KERNING, &::getCppuType((const sal_Int16*)0) , 0, 0 }, \
- { MAP_CHAR_LEN("CharWordMode"), EE_CHAR_WLM, &::getBooleanCppuType(), 0, 0 }, \
- { MAP_CHAR_LEN("CharEmphasis"), EE_CHAR_EMPHASISMARK,&::getCppuType((const sal_Int16*)0), 0, MID_EMPHASIS},\
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_HEIGHT_ASIAN), EE_CHAR_FONTHEIGHT_CJK, &::getCppuType((const float*)0), 0, MID_FONTHEIGHT|CONVERT_TWIPS }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTNAME_ASIAN), EE_CHAR_FONTINFO_CJK, &::getCppuType((const OUString*)0), 0, MID_FONT_FAMILY_NAME },\
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTSTYLENAME_ASIAN), EE_CHAR_FONTINFO_CJK, &::getCppuType((const OUString*)0), 0, MID_FONT_STYLE_NAME }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTFAMILY_ASIAN), EE_CHAR_FONTINFO_CJK, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_FAMILY }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTCHARSET_ASIAN), EE_CHAR_FONTINFO_CJK, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_CHAR_SET }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTPITCH_ASIAN), EE_CHAR_FONTINFO_CJK, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_PITCH }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_POSTURE_ASIAN), EE_CHAR_ITALIC_CJK, &::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, MID_POSTURE }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_WEIGHT_ASIAN), EE_CHAR_WEIGHT_CJK, &::getCppuType((const float*)0), 0, MID_WEIGHT }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_LOCALE_ASIAN), EE_CHAR_LANGUAGE_CJK, &::getCppuType((const ::com::sun::star::lang::Locale*)0),0, MID_LANG_LOCALE }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_HEIGHT_COMPLEX), EE_CHAR_FONTHEIGHT_CTL, &::getCppuType((const float*)0), 0, MID_FONTHEIGHT|CONVERT_TWIPS }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTNAME_COMPLEX), EE_CHAR_FONTINFO_CTL, &::getCppuType((const OUString*)0), 0, MID_FONT_FAMILY_NAME },\
- {MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTSTYLENAME_COMPLEX),EE_CHAR_FONTINFO_CTL, &::getCppuType((const OUString*)0), 0, MID_FONT_STYLE_NAME }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTFAMILY_COMPLEX), EE_CHAR_FONTINFO_CTL, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_FAMILY }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTCHARSET_COMPLEX), EE_CHAR_FONTINFO_CTL, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_CHAR_SET }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTPITCH_COMPLEX), EE_CHAR_FONTINFO_CTL, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_PITCH }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_POSTURE_COMPLEX), EE_CHAR_ITALIC_CTL, &::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, MID_POSTURE }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_WEIGHT_COMPLEX), EE_CHAR_WEIGHT_CTL, &::getCppuType((const float*)0), 0, MID_WEIGHT }, \
- { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_LOCALE_COMPLEX), EE_CHAR_LANGUAGE_CTL, &::getCppuType((const ::com::sun::star::lang::Locale*)0),0, MID_LANG_LOCALE }, \
- { MAP_CHAR_LEN("CharRelief" ), EE_CHAR_RELIEF, &::getCppuType((const sal_Int16*)0), 0, MID_RELIEF }
+ { OUString(UNO_NAME_EDIT_CHAR_HEIGHT), EE_CHAR_FONTHEIGHT, ::getCppuType((const float*)0), 0, MID_FONTHEIGHT|CONVERT_TWIPS }, \
+ { OUString("CharScaleWidth"), EE_CHAR_FONTWIDTH, ::getCppuType((const sal_Int16*)0), 0, 0 }, \
+ { OUString(UNO_NAME_EDIT_CHAR_FONTNAME), EE_CHAR_FONTINFO, ::getCppuType((const OUString*)0), 0, MID_FONT_FAMILY_NAME },\
+ { OUString(UNO_NAME_EDIT_CHAR_FONTSTYLENAME),EE_CHAR_FONTINFO, ::getCppuType((const OUString*)0), 0, MID_FONT_STYLE_NAME }, \
+ { OUString(UNO_NAME_EDIT_CHAR_FONTFAMILY), EE_CHAR_FONTINFO, ::getCppuType((const sal_Int16*)0), 0, MID_FONT_FAMILY }, \
+ { OUString(UNO_NAME_EDIT_CHAR_FONTCHARSET), EE_CHAR_FONTINFO, ::getCppuType((const sal_Int16*)0), 0, MID_FONT_CHAR_SET }, \
+ { OUString(UNO_NAME_EDIT_CHAR_FONTPITCH), EE_CHAR_FONTINFO, ::getCppuType((const sal_Int16*)0), 0, MID_FONT_PITCH }, \
+ { OUString(UNO_NAME_EDIT_CHAR_POSTURE), EE_CHAR_ITALIC, ::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, MID_POSTURE }, \
+ { OUString(UNO_NAME_EDIT_CHAR_WEIGHT), EE_CHAR_WEIGHT, ::getCppuType((const float*)0), 0, MID_WEIGHT }, \
+ { OUString(UNO_NAME_EDIT_CHAR_LOCALE), EE_CHAR_LANGUAGE, ::getCppuType((const ::com::sun::star::lang::Locale*)0),0, MID_LANG_LOCALE }, \
+ { OUString(UNO_NAME_EDIT_CHAR_COLOR), EE_CHAR_COLOR, ::getCppuType((const sal_Int32*)0), 0, 0 }, \
+ { OUString(UNO_NAME_EDIT_CHAR_ESCAPEMENT), EE_CHAR_ESCAPEMENT, ::getCppuType((const sal_Int16*)0), 0, MID_ESC }, \
+ { OUString(UNO_NAME_EDIT_CHAR_UNDERLINE), EE_CHAR_UNDERLINE, ::getCppuType((const sal_Int16*)0), 0, MID_TL_STYLE }, \
+ { OUString("CharUnderlineColor"), EE_CHAR_UNDERLINE, ::getCppuType((const sal_Int32*)0), 0, MID_TL_COLOR }, \
+ { OUString("CharUnderlineHasColor"), EE_CHAR_UNDERLINE, ::getBooleanCppuType(), 0, MID_TL_HASCOLOR } , \
+ { OUString(UNO_NAME_EDIT_CHAR_OVERLINE), EE_CHAR_OVERLINE, ::getCppuType((const sal_Int16*)0), 0, MID_TL_STYLE }, \
+ { OUString("CharOverlineColor"), EE_CHAR_OVERLINE, ::getCppuType((const sal_Int32*)0), 0, MID_TL_COLOR }, \
+ { OUString("CharOverlineHasColor"), EE_CHAR_OVERLINE, ::getBooleanCppuType(), 0, MID_TL_HASCOLOR } , \
+ { OUString(UNO_NAME_EDIT_CHAR_CROSSEDOUT), EE_CHAR_STRIKEOUT, ::getBooleanCppuType(), 0, MID_CROSSED_OUT }, \
+ { OUString(UNO_NAME_EDIT_CHAR_STRIKEOUT), EE_CHAR_STRIKEOUT, ::getCppuType((const sal_Int16*)0), 0, MID_CROSS_OUT}, \
+ { OUString(UNO_NAME_EDIT_CHAR_SHADOWED), EE_CHAR_SHADOW, ::getBooleanCppuType(), 0, 0 }, \
+ { OUString("CharContoured"), EE_CHAR_OUTLINE, ::getBooleanCppuType(), 0, 0 }, \
+ { OUString("CharEscapementHeight"), EE_CHAR_ESCAPEMENT, ::getCppuType((const sal_Int8*)0), 0, MID_ESC_HEIGHT },\
+ { OUString("CharAutoKerning"), EE_CHAR_PAIRKERNING,::getBooleanCppuType(), 0, 0 } , \
+ { OUString("CharKerning"), EE_CHAR_KERNING, ::getCppuType((const sal_Int16*)0) , 0, 0 }, \
+ { OUString("CharWordMode"), EE_CHAR_WLM, ::getBooleanCppuType(), 0, 0 }, \
+ { OUString("CharEmphasis"), EE_CHAR_EMPHASISMARK, ::getCppuType((const sal_Int16*)0), 0, MID_EMPHASIS},\
+ { OUString(UNO_NAME_EDIT_CHAR_HEIGHT_ASIAN), EE_CHAR_FONTHEIGHT_CJK, ::getCppuType((const float*)0), 0, MID_FONTHEIGHT|CONVERT_TWIPS }, \
+ { OUString(UNO_NAME_EDIT_CHAR_FONTNAME_ASIAN), EE_CHAR_FONTINFO_CJK, ::getCppuType((const OUString*)0), 0, MID_FONT_FAMILY_NAME },\
+ { OUString(UNO_NAME_EDIT_CHAR_FONTSTYLENAME_ASIAN), EE_CHAR_FONTINFO_CJK, ::getCppuType((const OUString*)0), 0, MID_FONT_STYLE_NAME }, \
+ { OUString(UNO_NAME_EDIT_CHAR_FONTFAMILY_ASIAN), EE_CHAR_FONTINFO_CJK, ::getCppuType((const sal_Int16*)0), 0, MID_FONT_FAMILY }, \
+ { OUString(UNO_NAME_EDIT_CHAR_FONTCHARSET_ASIAN), EE_CHAR_FONTINFO_CJK, ::getCppuType((const sal_Int16*)0), 0, MID_FONT_CHAR_SET }, \
+ { OUString(UNO_NAME_EDIT_CHAR_FONTPITCH_ASIAN), EE_CHAR_FONTINFO_CJK, ::getCppuType((const sal_Int16*)0), 0, MID_FONT_PITCH }, \
+ { OUString(UNO_NAME_EDIT_CHAR_POSTURE_ASIAN), EE_CHAR_ITALIC_CJK, ::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, MID_POSTURE }, \
+ { OUString(UNO_NAME_EDIT_CHAR_WEIGHT_ASIAN), EE_CHAR_WEIGHT_CJK, ::getCppuType((const float*)0), 0, MID_WEIGHT }, \
+ { OUString(UNO_NAME_EDIT_CHAR_LOCALE_ASIAN), EE_CHAR_LANGUAGE_CJK, ::getCppuType((const ::com::sun::star::lang::Locale*)0),0, MID_LANG_LOCALE }, \
+ { OUString(UNO_NAME_EDIT_CHAR_HEIGHT_COMPLEX), EE_CHAR_FONTHEIGHT_CTL, ::getCppuType((const float*)0), 0, MID_FONTHEIGHT|CONVERT_TWIPS }, \
+ { OUString(UNO_NAME_EDIT_CHAR_FONTNAME_COMPLEX), EE_CHAR_FONTINFO_CTL, ::getCppuType((const OUString*)0), 0, MID_FONT_FAMILY_NAME },\
+ { OUString(UNO_NAME_EDIT_CHAR_FONTSTYLENAME_COMPLEX),EE_CHAR_FONTINFO_CTL, ::getCppuType((const OUString*)0), 0, MID_FONT_STYLE_NAME }, \
+ { OUString(UNO_NAME_EDIT_CHAR_FONTFAMILY_COMPLEX), EE_CHAR_FONTINFO_CTL, ::getCppuType((const sal_Int16*)0), 0, MID_FONT_FAMILY }, \
+ { OUString(UNO_NAME_EDIT_CHAR_FONTCHARSET_COMPLEX), EE_CHAR_FONTINFO_CTL, ::getCppuType((const sal_Int16*)0), 0, MID_FONT_CHAR_SET }, \
+ { OUString(UNO_NAME_EDIT_CHAR_FONTPITCH_COMPLEX), EE_CHAR_FONTINFO_CTL, ::getCppuType((const sal_Int16*)0), 0, MID_FONT_PITCH }, \
+ { OUString(UNO_NAME_EDIT_CHAR_POSTURE_COMPLEX), EE_CHAR_ITALIC_CTL, ::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, MID_POSTURE }, \
+ { OUString(UNO_NAME_EDIT_CHAR_WEIGHT_COMPLEX), EE_CHAR_WEIGHT_CTL, ::getCppuType((const float*)0), 0, MID_WEIGHT }, \
+ { OUString(UNO_NAME_EDIT_CHAR_LOCALE_COMPLEX), EE_CHAR_LANGUAGE_CTL, ::getCppuType((const ::com::sun::star::lang::Locale*)0),0, MID_LANG_LOCALE }, \
+ { OUString("CharRelief"), EE_CHAR_RELIEF, ::getCppuType((const sal_Int16*)0), 0, MID_RELIEF }
#define SVX_UNOEDIT_FONT_PROPERTIES \
- {MAP_CHAR_LEN(UNO_NAME_EDIT_FONT_DESCRIPTOR), WID_FONTDESC, &::getCppuType((const ::com::sun::star::awt::FontDescriptor*)0), 0, MID_FONT_FAMILY_NAME }
+ {OUString(UNO_NAME_EDIT_FONT_DESCRIPTOR), WID_FONTDESC, ::getCppuType((const ::com::sun::star::awt::FontDescriptor*)0), 0, MID_FONT_FAMILY_NAME }
#define SVX_UNOEDIT_PARA_PROPERTIES \
- {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_ADJUST), EE_PARA_JUST, &::getCppuType((const sal_Int16*)0), 0, MID_PARA_ADJUST }, \
- {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_BMARGIN), EE_PARA_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_LO_MARGIN|SFX_METRIC_ITEM }, \
- {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_IS_HYPHEN), EE_PARA_HYPHENATE, &::getBooleanCppuType(), 0, 0 }, \
- {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_LASTLINEADJ), EE_PARA_JUST, &::getCppuType((const sal_Int16*)0), 0, MID_LAST_LINE_ADJUST }, \
- {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_LMARGIN), EE_PARA_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_TXT_LMARGIN|SFX_METRIC_ITEM }, \
- {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_LINESPACING), EE_PARA_SBL, &::getCppuType((const ::com::sun::star::style::LineSpacing*)0), 0, 0 }, \
- {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_RMARGIN), EE_PARA_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_R_MARGIN|SFX_METRIC_ITEM }, \
- {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_TAPSTOPS), EE_PARA_TABS, &::getCppuType((const ::com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop >*)0), 0, 0 }, \
- {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_TMARGIN), EE_PARA_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_UP_MARGIN|SFX_METRIC_ITEM },\
- {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_FIRST_LINE_INDENT), EE_PARA_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_FIRST_LINE_INDENT|SFX_METRIC_ITEM}, \
- {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_IS_HANGING_PUNCTUATION),EE_PARA_HANGINGPUNCTUATION, &::getBooleanCppuType(), 0 ,0 }, \
- {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_IS_CHARACTER_DISTANCE), EE_PARA_ASIANCJKSPACING, &::getBooleanCppuType(), 0 ,0 }, \
- {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_IS_FORBIDDEN_RULES), EE_PARA_FORBIDDENRULES, &::getBooleanCppuType(), 0 ,0 },\
- {MAP_CHAR_LEN("WritingMode"), EE_PARA_WRITINGDIR, &::getCppuType((const sal_Int16*)0), 0, 0 }
+ {OUString(UNO_NAME_EDIT_PARA_ADJUST), EE_PARA_JUST, ::getCppuType((const sal_Int16*)0), 0, MID_PARA_ADJUST }, \
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list