summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-01 08:41:28 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-01 08:41:28 +0200
commit008904a75bae7a42af8fce5f2bced4d029af3094 (patch)
treee961b17f35984274d53e96eaa8a164674168edcb
parente81a7fd0ee95c2afbc373b26ec34d6084ee07cff (diff)
Replace remaining getCppuType et al with cppu::UnoType
Change-Id: I4791f064f223487ce57e68f8e0b1e3d74e66e868
Diffstat
-rw-r--r--include/svx/unoshprp.hxx150
-rw-r--r--svx/source/dialog/rubydialog.cxx2
-rw-r--r--svx/source/form/dataaccessdescriptor.cxx6
-rw-r--r--svx/source/form/fmshimp.cxx10
-rw-r--r--svx/source/form/fmsrccfg.cxx2
-rw-r--r--svx/source/form/fmsrcimp.cxx2
-rw-r--r--svx/source/form/formcontroller.cxx4
-rw-r--r--svx/source/form/xfm_addcondition.cxx8
-rw-r--r--svx/source/items/customshapeitem.cxx14
-rw-r--r--svx/source/table/cell.cxx4
-rw-r--r--svx/source/table/tablecolumn.cxx8
-rw-r--r--svx/source/table/tablerow.cxx8
-rw-r--r--svx/source/unodraw/unomod.cxx2
-rw-r--r--svx/source/unodraw/unomtabl.cxx2
-rw-r--r--svx/source/unodraw/unopage.cxx6
-rw-r--r--svx/source/unodraw/unoprov.cxx81
-rw-r--r--svx/source/unodraw/unoshap2.cxx10
-rw-r--r--svx/source/unodraw/unoshap3.cxx2
-rw-r--r--svx/source/unodraw/unoshape.cxx4
-rw-r--r--svx/source/unodraw/unoshcol.cxx4
-rw-r--r--svx/source/xoutdev/xattr.cxx8
21 files changed, 169 insertions, 168 deletions
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index 94d358c12a36..b7a95be95442 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -189,17 +189,17 @@
{ OUString("FontWorkAdjust"), XATTR_FORMTXTADJUST, /*ENUM*/::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ OUString("FontWorkDistance"), XATTR_FORMTXTDISTANCE, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
{ OUString("FontWorkStart"), XATTR_FORMTXTSTART, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
- { OUString("FontWorkMirror"), XATTR_FORMTXTMIRROR, ::getBooleanCppuType(), 0, 0}, \
- { OUString("FontWorkOutline"), XATTR_FORMTXTOUTLINE, ::getBooleanCppuType(), 0, 0}, \
+ { OUString("FontWorkMirror"), XATTR_FORMTXTMIRROR, cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString("FontWorkOutline"), XATTR_FORMTXTOUTLINE, cppu::UnoType<bool>::get(), 0, 0}, \
{ OUString("FontWorkShadow"), XATTR_FORMTXTSHADOW, /*ENUM*/::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ OUString("FontWorkShadowColor"), XATTR_FORMTXTSHDWCOLOR, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ OUString("FontWorkShadowOffsetX"), XATTR_FORMTXTSHDWXVAL, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
{ OUString("FontWorkShadowOffsetY"), XATTR_FORMTXTSHDWYVAL, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
- { OUString("FontWorkHideForm"), XATTR_FORMTXTHIDEFORM, ::getBooleanCppuType(), 0, 0}, \
+ { OUString("FontWorkHideForm"), XATTR_FORMTXTHIDEFORM, cppu::UnoType<bool>::get(), 0, 0}, \
{ OUString("FontWorkShadowTransparence"),XATTR_FORMTXTSHDWTRANSP, ::cppu::UnoType<sal_Int16>::get(), 0, 0},
#define SHADOW_PROPERTIES \
- { OUString(UNO_NAME_SHADOW), SDRATTR_SHADOW, ::getBooleanCppuType(), 0, 0}, \
+ { OUString(UNO_NAME_SHADOW), SDRATTR_SHADOW, cppu::UnoType<bool>::get(), 0, 0}, \
{ OUString(UNO_NAME_SHADOWCOLOR), SDRATTR_SHADOWCOLOR, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ OUString(UNO_NAME_SHADOWTRANSPARENCE),SDRATTR_SHADOWTRANSPARENCE, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
{ OUString(UNO_NAME_SHADOWXDIST), SDRATTR_SHADOWXDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
@@ -208,12 +208,12 @@
#define LINE_PROPERTIES_DEFAULTS\
{ OUString(UNO_NAME_LINECAP), XATTR_LINECAP, ::cppu::UnoType<com::sun::star::drawing::LineCap>::get(), 0, 0}, \
{ OUString(UNO_NAME_LINECOLOR), XATTR_LINECOLOR, ::cppu::UnoType<sal_Int32>::get() , 0, 0}, \
- { OUString(UNO_NAME_LINEENDCENTER), XATTR_LINEENDCENTER, ::getBooleanCppuType() , 0, 0}, \
+ { OUString(UNO_NAME_LINEENDCENTER), XATTR_LINEENDCENTER, cppu::UnoType<bool>::get() , 0, 0}, \
{ OUString(UNO_NAME_LINEENDWIDTH), XATTR_LINEENDWIDTH, ::cppu::UnoType<sal_Int32>::get() , 0, SFX_METRIC_ITEM}, \
{ OUString(UNO_NAME_LINEJOINT), XATTR_LINEJOINT, ::cppu::UnoType<com::sun::star::drawing::LineJoint>::get(), 0, 0}, \
- { OUString(UNO_NAME_LINESTARTCENTER), XATTR_LINESTARTCENTER, ::getBooleanCppuType() , 0, 0}, \
+ { OUString(UNO_NAME_LINESTARTCENTER), XATTR_LINESTARTCENTER, cppu::UnoType<bool>::get() , 0, 0}, \
{ OUString(UNO_NAME_LINESTARTWIDTH), XATTR_LINESTARTWIDTH, ::cppu::UnoType<sal_Int32>::get() , 0, SFX_METRIC_ITEM}, \
- { OUString(UNO_NAME_LINESTYLE), XATTR_LINESTYLE, ::getCppuType((const ::com::sun::star::drawing::LineStyle*)0) , 0, 0}, \
+ { OUString(UNO_NAME_LINESTYLE), XATTR_LINESTYLE, cppu::UnoType<css::drawing::LineStyle>::get() , 0, 0}, \
{ OUString(UNO_NAME_LINETRANSPARENCE), XATTR_LINETRANSPARENCE, ::cppu::UnoType<sal_Int16>::get() , 0, 0}, \
{ OUString(UNO_NAME_LINEWIDTH), XATTR_LINEWIDTH, ::cppu::UnoType<sal_Int32>::get() , 0, SFX_METRIC_ITEM},
@@ -229,7 +229,7 @@
{ OUString("LineStartName"), XATTR_LINESTART, ::cppu::UnoType<OUString>::get(), 0, MID_NAME },
#define FILL_PROPERTIES_BMP \
- { OUString(UNO_NAME_FILLBMP_LOGICAL_SIZE), XATTR_FILLBMP_SIZELOG, ::getBooleanCppuType() , 0, 0}, \
+ { OUString(UNO_NAME_FILLBMP_LOGICAL_SIZE), XATTR_FILLBMP_SIZELOG, cppu::UnoType<bool>::get() , 0, 0}, \
{ OUString(UNO_NAME_FILLBMP_OFFSET_X), XATTR_FILLBMP_TILEOFFSETX, ::cppu::UnoType<sal_Int32>::get() , 0, 0}, \
{ OUString(UNO_NAME_FILLBMP_OFFSET_Y), XATTR_FILLBMP_TILEOFFSETY, ::cppu::UnoType<sal_Int32>::get() , 0, 0}, \
{ OUString(UNO_NAME_FILLBMP_POSITION_OFFSET_X), XATTR_FILLBMP_POSOFFSETX, ::cppu::UnoType<sal_Int32>::get() , 0, 0}, \
@@ -237,8 +237,8 @@
{ OUString(UNO_NAME_FILLBMP_RECTANGLE_POINT), XATTR_FILLBMP_POS, ::cppu::UnoType<com::sun::star::drawing::RectanglePoint>::get() , 0, 0}, \
{ OUString(UNO_NAME_FILLBMP_SIZE_X), XATTR_FILLBMP_SIZEX, ::cppu::UnoType<sal_Int32>::get() , 0, SFX_METRIC_ITEM}, \
{ OUString(UNO_NAME_FILLBMP_SIZE_Y), XATTR_FILLBMP_SIZEY, ::cppu::UnoType<sal_Int32>::get() , 0, SFX_METRIC_ITEM}, \
- { OUString(UNO_NAME_FILLBMP_STRETCH), XATTR_FILLBMP_STRETCH, ::getBooleanCppuType() , 0, 0}, \
- { OUString(UNO_NAME_FILLBMP_TILE), XATTR_FILLBMP_TILE, ::getBooleanCppuType() , 0, 0},\
+ { OUString(UNO_NAME_FILLBMP_STRETCH), XATTR_FILLBMP_STRETCH, cppu::UnoType<bool>::get() , 0, 0}, \
+ { OUString(UNO_NAME_FILLBMP_TILE), XATTR_FILLBMP_TILE, cppu::UnoType<bool>::get() , 0, 0},\
{ OUString(UNO_NAME_FILLBMP_MODE), OWN_ATTR_FILLBMP_MODE, ::cppu::UnoType<com::sun::star::drawing::BitmapMode>::get(), 0, 0},
#define FILL_PROPERTIES_DEFAULTS \
@@ -247,8 +247,8 @@
#define FILL_PROPERTIES \
FILL_PROPERTIES_BMP \
FILL_PROPERTIES_DEFAULTS \
- { OUString(UNO_NAME_FILLBACKGROUND), XATTR_FILLBACKGROUND , ::getBooleanCppuType(), 0, 0}, \
- { OUString(UNO_NAME_FILLBITMAP), XATTR_FILLBITMAP , ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0) , 0, MID_BITMAP}, \
+ { OUString(UNO_NAME_FILLBACKGROUND), XATTR_FILLBACKGROUND , cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString(UNO_NAME_FILLBITMAP), XATTR_FILLBITMAP , cppu::UnoType<css::awt::XBitmap>::get() , 0, MID_BITMAP}, \
{ OUString(UNO_NAME_FILLBITMAPNAME), XATTR_FILLBITMAP , ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
{ OUString(UNO_NAME_FILLBITMAPURL), XATTR_FILLBITMAP , ::cppu::UnoType<OUString>::get(), 0, MID_GRAFURL }, \
{ OUString(UNO_NAME_FILLGRADIENTSTEPCOUNT), XATTR_GRADIENTSTEPCOUNT , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
@@ -271,15 +271,15 @@
{ OUString(UNO_NAME_TEXT_ANIAMOUNT), SDRATTR_TEXT_ANIAMOUNT, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
{ OUString(UNO_NAME_TEXT_ANICOUNT), SDRATTR_TEXT_ANICOUNT, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
{ OUString(UNO_NAME_TEXT_ANIDELAY), SDRATTR_TEXT_ANIDELAY, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
- { OUString(UNO_NAME_TEXT_ANIDIRECTION), SDRATTR_TEXT_ANIDIRECTION, ::getCppuType((const ::com::sun::star::drawing::TextAnimationDirection*)0), 0, 0}, \
- { OUString(UNO_NAME_TEXT_ANIKIND), SDRATTR_TEXT_ANIKIND, ::getCppuType((const ::com::sun::star::drawing::TextAnimationKind*)0), 0, 0}, \
- { OUString(UNO_NAME_TEXT_ANISTARTINSIDE), SDRATTR_TEXT_ANISTARTINSIDE, ::getBooleanCppuType(), 0, 0}, \
- { OUString(UNO_NAME_TEXT_ANISTOPINSIDE), SDRATTR_TEXT_ANISTOPINSIDE, ::getBooleanCppuType(), 0, 0}, \
- { OUString(UNO_NAME_TEXT_AUTOGROWHEIGHT), SDRATTR_TEXT_AUTOGROWHEIGHT, ::getBooleanCppuType(), 0, 0}, \
- { OUString(UNO_NAME_TEXT_AUTOGROWWIDTH), SDRATTR_TEXT_AUTOGROWWIDTH, ::getBooleanCppuType(), 0, 0}, \
- { OUString(UNO_NAME_TEXT_CONTOURFRAME), SDRATTR_TEXT_CONTOURFRAME, ::getBooleanCppuType(), 0, 0}, \
- { OUString(UNO_NAME_TEXT_FITTOSIZE), SDRATTR_TEXT_FITTOSIZE, ::getCppuType((const ::com::sun::star::drawing::TextFitToSizeType*)0), 0, 0}, \
- { OUString(UNO_NAME_TEXT_HORZADJUST), SDRATTR_TEXT_HORZADJUST, ::getCppuType((const ::com::sun::star::drawing::TextHorizontalAdjust*)0), 0, 0}, \
+ { OUString(UNO_NAME_TEXT_ANIDIRECTION), SDRATTR_TEXT_ANIDIRECTION, cppu::UnoType<css::drawing::TextAnimationDirection>::get(), 0, 0}, \
+ { OUString(UNO_NAME_TEXT_ANIKIND), SDRATTR_TEXT_ANIKIND, cppu::UnoType<css::drawing::TextAnimationKind>::get(), 0, 0}, \
+ { OUString(UNO_NAME_TEXT_ANISTARTINSIDE), SDRATTR_TEXT_ANISTARTINSIDE, cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString(UNO_NAME_TEXT_ANISTOPINSIDE), SDRATTR_TEXT_ANISTOPINSIDE, cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString(UNO_NAME_TEXT_AUTOGROWHEIGHT), SDRATTR_TEXT_AUTOGROWHEIGHT, cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString(UNO_NAME_TEXT_AUTOGROWWIDTH), SDRATTR_TEXT_AUTOGROWWIDTH, cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString(UNO_NAME_TEXT_CONTOURFRAME), SDRATTR_TEXT_CONTOURFRAME, cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString(UNO_NAME_TEXT_FITTOSIZE), SDRATTR_TEXT_FITTOSIZE, cppu::UnoType<css::drawing::TextFitToSizeType>::get(), 0, 0}, \
+ { OUString(UNO_NAME_TEXT_HORZADJUST), SDRATTR_TEXT_HORZADJUST, cppu::UnoType<css::drawing::TextHorizontalAdjust>::get(), 0, 0}, \
{ OUString(UNO_NAME_TEXT_LEFTDIST), SDRATTR_TEXT_LEFTDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
{ OUString(UNO_NAME_TEXT_LOWERDIST), SDRATTR_TEXT_LOWERDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
{ OUString(UNO_NAME_TEXT_MAXFRAMEHEIGHT), SDRATTR_TEXT_MAXFRAMEHEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
@@ -288,9 +288,9 @@
{ OUString(UNO_NAME_TEXT_MINFRAMEWIDTH), SDRATTR_TEXT_MINFRAMEWIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
{ OUString(UNO_NAME_TEXT_RIGHTDIST), SDRATTR_TEXT_RIGHTDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
{ OUString(UNO_NAME_TEXT_UPPERDIST), SDRATTR_TEXT_UPPERDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
- { OUString(UNO_NAME_TEXT_FONTINDEPENDENTLINESPACING),SDRATTR_TEXT_USEFIXEDCELLHEIGHT,::getBooleanCppuType(), 0, 0}, \
- { OUString(UNO_NAME_TEXT_VERTADJUST), SDRATTR_TEXT_VERTADJUST, ::getCppuType((const ::com::sun::star::drawing::TextVerticalAdjust*)0), 0, 0},\
- { OUString(UNO_NAME_TEXT_WORDWRAP), SDRATTR_TEXT_WORDWRAP, ::getBooleanCppuType(), 0, 0}, \
+ { OUString(UNO_NAME_TEXT_FONTINDEPENDENTLINESPACING),SDRATTR_TEXT_USEFIXEDCELLHEIGHT,cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString(UNO_NAME_TEXT_VERTADJUST), SDRATTR_TEXT_VERTADJUST, cppu::UnoType<css::drawing::TextVerticalAdjust>::get(), 0, 0},\
+ { OUString(UNO_NAME_TEXT_WORDWRAP), SDRATTR_TEXT_WORDWRAP, cppu::UnoType<bool>::get(), 0, 0}, \
SVX_UNOEDIT_CHAR_PROPERTIES, \
SVX_UNOEDIT_PARA_PROPERTIES,
@@ -298,20 +298,20 @@
SVX_UNOEDIT_NUMBERING_PROPERTIE, \
TEXT_PROPERTIES_DEFAULTS
-// { "HasLevels", OWN_ATTR_HASLEVELS, ::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+// { "HasLevels", OWN_ATTR_HASLEVELS, cppu::UnoType<bool>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
#define MISC_OBJ_PROPERTIES_NO_SHEAR \
- { OUString("Transformation"), OWN_ATTR_TRANSFORMATION, ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, \
+ { OUString("Transformation"), OWN_ATTR_TRANSFORMATION, cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, \
{ OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { OUString(UNO_NAME_MISC_OBJ_FRAMERECT), OWN_ATTR_FRAMERECT, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0 }, \
+ { OUString(UNO_NAME_MISC_OBJ_FRAMERECT), OWN_ATTR_FRAMERECT, cppu::UnoType<css::awt::Rectangle>::get(), 0, 0 }, \
{ OUString(UNO_NAME_MISC_OBJ_ROTATEANGLE), SDRATTR_ROTATEANGLE, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
- { OUString(UNO_NAME_BITMAP), OWN_ATTR_BITMAP, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \
- { OUString(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \
- { OUString("IsFontwork"), OWN_ATTR_ISFONTWORK, ::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \
- { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+ { OUString(UNO_NAME_BITMAP), OWN_ATTR_BITMAP, cppu::UnoType<css::awt::XBitmap>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \
+ { OUString(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \
+ { OUString("IsFontwork"), OWN_ATTR_ISFONTWORK, cppu::UnoType<bool>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \
+ { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
#define MISC_OBJ_PROPERTIES \
- { OUString(UNO_NAME_MISC_OBJ_INTEROPGRABBAG), OWN_ATTR_INTEROPGRABBAG, ::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), 0, 0}, \
+ { OUString(UNO_NAME_MISC_OBJ_INTEROPGRABBAG), OWN_ATTR_INTEROPGRABBAG, cppu::UnoType<css::uno::Sequence< ::com::sun::star::beans::PropertyValue >>::get(), 0, 0}, \
MISC_OBJ_PROPERTIES_NO_SHEAR \
{ OUString(UNO_NAME_MISC_OBJ_SHEARANGLE), SDRATTR_SHEARANGLE, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
@@ -319,11 +319,11 @@
#define SHAPE_DESCRIPTOR_PROPERTIES \
{ OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
{ OUString(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME , ::cppu::UnoType<OUString>::get(), 0, 0}, \
- { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT , ::getBooleanCppuType(), 0, 0}, \
+ { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT , cppu::UnoType<bool>::get(), 0, 0}, \
{ OUString(UNO_NAME_MISC_OBJ_NAME), SDRATTR_OBJECTNAME , ::cppu::UnoType<OUString>::get(), 0, 0}, \
- { OUString(UNO_NAME_MISC_OBJ_PRINTABLE), SDRATTR_OBJPRINTABLE , ::getBooleanCppuType(), 0, 0}, \
- { OUString("Visible"), SDRATTR_OBJVISIBLE , ::getBooleanCppuType(), 0, 0}, \
- { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT , ::getBooleanCppuType(), 0, 0},\
+ { OUString(UNO_NAME_MISC_OBJ_PRINTABLE), SDRATTR_OBJPRINTABLE , cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString("Visible"), SDRATTR_OBJVISIBLE , cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT , cppu::UnoType<bool>::get(), 0, 0},\
{ OUString("UINameSingular"), OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \
{ OUString("UINamePlural"), OWN_ATTR_UINAME_PLURAL , ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \
/* #i68101# */ \
@@ -332,7 +332,7 @@
#define LINKTARGET_PROPERTIES \
{ OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \
- { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+ { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , cppu::UnoType<css::awt::XBitmap>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
#define CONNECTOR_PROPERTIES \
@@ -347,22 +347,22 @@
{ OUString(UNO_NAME_EDGELINE1DELTA), SDRATTR_EDGELINE1DELTA, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
{ OUString(UNO_NAME_EDGELINE2DELTA), SDRATTR_EDGELINE2DELTA, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
{ OUString(UNO_NAME_EDGELINE3DELTA), SDRATTR_EDGELINE3DELTA, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
- { OUString("StartShape"), OWN_ATTR_EDGE_START_OBJ, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \
+ { OUString("StartShape"), OWN_ATTR_EDGE_START_OBJ, cppu::UnoType<css::drawing::XShape>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \
{ OUString("StartGluePointIndex"), OWN_ATTR_GLUEID_HEAD, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ OUString("StartPosition"), OWN_ATTR_EDGE_START_POS, ::cppu::UnoType<com::sun::star::awt::Point>::get(), 0, 0}, \
- { OUString("EndShape"), OWN_ATTR_EDGE_END_OBJ, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \
+ { OUString("EndShape"), OWN_ATTR_EDGE_END_OBJ, cppu::UnoType<css::drawing::XShape>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \
{ OUString("EndPosition"), OWN_ATTR_EDGE_END_POS, ::cppu::UnoType<com::sun::star::awt::Point>::get(), 0, 0},\
{ OUString("EndGluePointIndex"), OWN_ATTR_GLUEID_TAIL, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
\
- { OUString("EdgeStartConnection"), OWN_ATTR_EDGE_START_OBJ, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \
+ { OUString("EdgeStartConnection"), OWN_ATTR_EDGE_START_OBJ, cppu::UnoType<css::drawing::XShape>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \
{ OUString("EdgeStartPoint"), OWN_ATTR_EDGE_START_POS, ::cppu::UnoType<com::sun::star::awt::Point>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \
- { OUString("EdgeEndConnection"), OWN_ATTR_EDGE_END_OBJ, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \
+ { OUString("EdgeEndConnection"), OWN_ATTR_EDGE_END_OBJ, cppu::UnoType<css::drawing::XShape>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \
{ OUString("EdgeEndPoint"), OWN_ATTR_EDGE_END_POS, ::cppu::UnoType<com::sun::star::awt::Point>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \
\
{ OUString(UNO_NAME_POLYPOLYGONBEZIER), OWN_ATTR_EDGE_POLYPOLYGONBEZIER, ::cppu::UnoType<com::sun::star::drawing::PolyPolygonBezierCoords>::get(), 0, 0},
#define SPECIAL_DIMENSIONING_PROPERTIES_DEFAULTS \
- { OUString(UNO_NAME_MEASUREBELOWREFEDGE), SDRATTR_MEASUREBELOWREFEDGE, ::getBooleanCppuType(), 0, 0}, \
+ { OUString(UNO_NAME_MEASUREBELOWREFEDGE), SDRATTR_MEASUREBELOWREFEDGE, cppu::UnoType<bool>::get(), 0, 0}, \
{ OUString(UNO_NAME_MEASUREFORMATSTRING), SDRATTR_MEASUREFORMATSTRING, ::cppu::UnoType<OUString>::get(), 0, 0}, \
{ OUString(UNO_NAME_MEASUREHELPLINE1LEN), SDRATTR_MEASUREHELPLINE1LEN, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
{ OUString(UNO_NAME_MEASUREHELPLINE2LEN), SDRATTR_MEASUREHELPLINE2LEN, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
@@ -372,14 +372,14 @@
{ OUString(UNO_NAME_MEASURELINEDIST), SDRATTR_MEASURELINEDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
{ OUString(UNO_NAME_MEASUREOVERHANG), SDRATTR_MEASUREOVERHANG, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
{ OUString(UNO_NAME_MEASUREUNIT), SDRATTR_MEASUREUNIT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},\
- { OUString(UNO_NAME_MEASURESHOWUNIT), SDRATTR_MEASURESHOWUNIT, ::getBooleanCppuType(), 0, 0}, \
- { OUString(UNO_NAME_MEASURETEXTAUTOANGLE), SDRATTR_MEASURETEXTAUTOANGLE, ::getBooleanCppuType(), 0, 0}, \
+ { OUString(UNO_NAME_MEASURESHOWUNIT), SDRATTR_MEASURESHOWUNIT, cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString(UNO_NAME_MEASURETEXTAUTOANGLE), SDRATTR_MEASURETEXTAUTOANGLE, cppu::UnoType<bool>::get(), 0, 0}, \
{ OUString(UNO_NAME_MEASURETEXTAUTOANGLEVIEW), SDRATTR_MEASURETEXTAUTOANGLEVIEW, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ OUString(UNO_NAME_MEASURETEXTFIXEDANGLE), SDRATTR_MEASURETEXTFIXEDANGLE, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ OUString(UNO_NAME_MEASURETEXTHPOS), SDRATTR_MEASURETEXTHPOS, ::cppu::UnoType<com::sun::star::drawing::MeasureTextHorzPos>::get(), 0, 0}, \
- { OUString(UNO_NAME_MEASURETEXTISFIXEDANGLE), SDRATTR_MEASURETEXTISFIXEDANGLE, ::getBooleanCppuType(), 0, 0}, \
- { OUString(UNO_NAME_MEASURETEXTROTA90), SDRATTR_MEASURETEXTROTA90, ::getBooleanCppuType(), 0, 0}, \
- { OUString(UNO_NAME_MEASURETEXTUPSIDEDOWN), SDRATTR_MEASURETEXTUPSIDEDOWN, ::getBooleanCppuType(), 0, 0}, \
+ { OUString(UNO_NAME_MEASURETEXTISFIXEDANGLE), SDRATTR_MEASURETEXTISFIXEDANGLE, cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString(UNO_NAME_MEASURETEXTROTA90), SDRATTR_MEASURETEXTROTA90, cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString(UNO_NAME_MEASURETEXTUPSIDEDOWN), SDRATTR_MEASURETEXTUPSIDEDOWN, cppu::UnoType<bool>::get(), 0, 0}, \
{ OUString(UNO_NAME_MEASURETEXTVPOS), SDRATTR_MEASURETEXTVPOS, ::cppu::UnoType<com::sun::star::drawing::MeasureTextVertPos>::get(), 0, 0}, \
{ OUString("MeasureDecimalPlaces"), SDRATTR_MEASUREDECIMALPLACES, ::cppu::UnoType<sal_Int16>::get(), 0, 0},
@@ -410,7 +410,7 @@
{ OUString(UNO_NAME_GRAPHIC_RED), SDRATTR_GRAFRED , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
{ OUString(UNO_NAME_GRAPHIC_GREEN), SDRATTR_GRAFGREEN , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
{ OUString(UNO_NAME_GRAPHIC_BLUE), SDRATTR_GRAFBLUE , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
- { OUString(UNO_NAME_GRAPHIC_GAMMA), SDRATTR_GRAFGAMMA , ::getCppuType((const double*)0), 0, 0}, \
+ { OUString(UNO_NAME_GRAPHIC_GAMMA), SDRATTR_GRAFGAMMA , cppu::UnoType<double>::get(), 0, 0}, \
{ OUString(UNO_NAME_GRAPHIC_TRANSPARENCY), SDRATTR_GRAFTRANSPARENCE , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
{ OUString(UNO_NAME_GRAPHIC_COLOR_MODE), SDRATTR_GRAFMODE , ::cppu::UnoType<com::sun::star::drawing::ColorMode>::get(), 0, 0},
@@ -420,8 +420,8 @@
{ OUString(UNO_NAME_GRAPHOBJ_GRAFURL), OWN_ATTR_GRAFURL , ::cppu::UnoType<OUString>::get(), 0, 0 }, \
{ OUString(UNO_NAME_GRAPHOBJ_REPLACEMENTGRAFURL), OWN_ATTR_REPLACEMENTGRAFURL , ::cppu::UnoType<OUString>::get(), 0, 0 }, \
{ OUString(UNO_NAME_GRAPHOBJ_GRAFSTREAMURL), OWN_ATTR_GRAFSTREAMURL , ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, \
- { OUString(UNO_NAME_GRAPHOBJ_FILLBITMAP), OWN_ATTR_VALUE_FILLBITMAP , ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap>*)0) , 0, 0}, \
- { OUString(UNO_NAME_GRAPHOBJ_GRAPHIC), OWN_ATTR_VALUE_GRAPHIC , ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic>*)0) , 0, 0},
+ { OUString(UNO_NAME_GRAPHOBJ_FILLBITMAP), OWN_ATTR_VALUE_FILLBITMAP , cppu::UnoType<css::awt::XBitmap>::get() , 0, 0}, \
+ { OUString(UNO_NAME_GRAPHOBJ_GRAPHIC), OWN_ATTR_VALUE_GRAPHIC , cppu::UnoType<css::graphic::XGraphic>::get() , 0, 0},
#define SPECIAL_3DSCENEOBJECT_PROPERTIES_DEFAULTS \
@@ -444,18 +444,18 @@
{ OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_6), SDRATTR_3DSCENE_LIGHTDIRECTION_6 , ::cppu::UnoType<com::sun::star::drawing::Direction3D>::get(), 0, 0}, \
{ OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_7), SDRATTR_3DSCENE_LIGHTDIRECTION_7 , ::cppu::UnoType<com::sun::star::drawing::Direction3D>::get(), 0, 0}, \
{ OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_8), SDRATTR_3DSCENE_LIGHTDIRECTION_8 , ::cppu::UnoType<com::sun::star::drawing::Direction3D>::get(), 0, 0}, \
- { OUString(UNO_NAME_3D_SCENE_LIGHTON_1), SDRATTR_3DSCENE_LIGHTON_1 , ::getBooleanCppuType(), 0, 0}, \
- { OUString(UNO_NAME_3D_SCENE_LIGHTON_2), SDRATTR_3DSCENE_LIGHTON_2 , ::getBooleanCppuType(), 0, 0}, \
- { OUString(UNO_NAME_3D_SCENE_LIGHTON_3), SDRATTR_3DSCENE_LIGHTON_3 , ::getBooleanCppuType(), 0, 0}, \
- { OUString(UNO_NAME_3D_SCENE_LIGHTON_4), SDRATTR_3DSCENE_LIGHTON_4 , ::getBooleanCppuType(), 0, 0}, \
- { OUString(UNO_NAME_3D_SCENE_LIGHTON_5), SDRATTR_3DSCENE_LIGHTON_5 , ::getBooleanCppuType(), 0, 0}, \
- { OUString(UNO_NAME_3D_SCENE_LIGHTON_6), SDRATTR_3DSCENE_LIGHTON_6 , ::getBooleanCppuType(), 0, 0}, \
- { OUString(UNO_NAME_3D_SCENE_LIGHTON_7), SDRATTR_3DSCENE_LIGHTON_7 , ::getBooleanCppuType(), 0, 0}, \
- { OUString(UNO_NAME_3D_SCENE_LIGHTON_8), SDRATTR_3DSCENE_LIGHTON_8 , ::getBooleanCppuType(), 0, 0}, \
- { OUString(UNO_NAME_3D_SCENE_PERSPECTIVE), SDRATTR_3DSCENE_PERSPECTIVE , ::getCppuType((const ::com::sun::star::drawing::ProjectionMode*)0), 0, 0}, \
+ { OUString(UNO_NAME_3D_SCENE_LIGHTON_1), SDRATTR_3DSCENE_LIGHTON_1 , cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString(UNO_NAME_3D_SCENE_LIGHTON_2), SDRATTR_3DSCENE_LIGHTON_2 , cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString(UNO_NAME_3D_SCENE_LIGHTON_3), SDRATTR_3DSCENE_LIGHTON_3 , cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString(UNO_NAME_3D_SCENE_LIGHTON_4), SDRATTR_3DSCENE_LIGHTON_4 , cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString(UNO_NAME_3D_SCENE_LIGHTON_5), SDRATTR_3DSCENE_LIGHTON_5 , cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString(UNO_NAME_3D_SCENE_LIGHTON_6), SDRATTR_3DSCENE_LIGHTON_6 , cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString(UNO_NAME_3D_SCENE_LIGHTON_7), SDRATTR_3DSCENE_LIGHTON_7 , cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString(UNO_NAME_3D_SCENE_LIGHTON_8), SDRATTR_3DSCENE_LIGHTON_8 , cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString(UNO_NAME_3D_SCENE_PERSPECTIVE), SDRATTR_3DSCENE_PERSPECTIVE , cppu::UnoType<css::drawing::ProjectionMode>::get(), 0, 0}, \
{ OUString(UNO_NAME_3D_SCENE_SHADOW_SLANT), SDRATTR_3DSCENE_SHADOW_SLANT , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
{ OUString(UNO_NAME_3D_SCENE_SHADE_MODE), SDRATTR_3DSCENE_SHADE_MODE , ::cppu::UnoType<com::sun::star::drawing::ShadeMode>::get(), 0, 0}, \
- { OUString(UNO_NAME_3D_SCENE_TWO_SIDED_LIGHTING),SDRATTR_3DSCENE_TWO_SIDED_LIGHTING, ::getBooleanCppuType(), 0, 0},
+ { OUString(UNO_NAME_3D_SCENE_TWO_SIDED_LIGHTING),SDRATTR_3DSCENE_TWO_SIDED_LIGHTING, cppu::UnoType<bool>::get(), 0, 0},
#define SPECIAL_3DSCENEOBJECT_PROPERTIES \
SPECIAL_3DSCENEOBJECT_PROPERTIES_DEFAULTS \
@@ -465,41 +465,41 @@
// #i28528#
// Added extra Item (Bool) for chart2 to be able to show reduced line geometry (SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY)
#define MISC_3D_OBJ_PROPERTIES \
- { OUString(UNO_NAME_3D_DOUBLE_SIDED) ,SDRATTR_3DOBJ_DOUBLE_SIDED , ::getBooleanCppuType(), 0, 0}, \
+ { OUString(UNO_NAME_3D_DOUBLE_SIDED) ,SDRATTR_3DOBJ_DOUBLE_SIDED , cppu::UnoType<bool>::get(), 0, 0}, \
{ OUString(UNO_NAME_3D_MAT_COLOR) ,SDRATTR_3DOBJ_MAT_COLOR , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ OUString(UNO_NAME_3D_MAT_EMISSION) ,SDRATTR_3DOBJ_MAT_EMISSION , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ OUString(UNO_NAME_3D_MAT_SPECULAR) ,SDRATTR_3DOBJ_MAT_SPECULAR , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ OUString(UNO_NAME_3D_MAT_SPECULAR_INTENSITY) ,SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
- { OUString(UNO_NAME_3D_NORMALS_INVERT) ,SDRATTR_3DOBJ_NORMALS_INVERT , ::getBooleanCppuType(), 0, 0}, \
+ { OUString(UNO_NAME_3D_NORMALS_INVERT) ,SDRATTR_3DOBJ_NORMALS_INVERT , cppu::UnoType<bool>::get(), 0, 0}, \
{ OUString(UNO_NAME_3D_NORMALS_KIND) ,SDRATTR_3DOBJ_NORMALS_KIND , ::cppu::UnoType<com::sun::star::drawing::NormalsKind>::get(), 0, 0}, \
- { OUString(UNO_NAME_3D_SHADOW_3D) ,SDRATTR_3DOBJ_SHADOW_3D , ::getBooleanCppuType(), 0, 0}, \
- { OUString(UNO_NAME_3D_TEXTURE_FILTER) ,SDRATTR_3DOBJ_TEXTURE_FILTER , ::getBooleanCppuType(), 0, 0}, \
+ { OUString(UNO_NAME_3D_SHADOW_3D) ,SDRATTR_3DOBJ_SHADOW_3D , cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString(UNO_NAME_3D_TEXTURE_FILTER) ,SDRATTR_3DOBJ_TEXTURE_FILTER , cppu::UnoType<bool>::get(), 0, 0}, \
{ OUString(UNO_NAME_3D_TEXTURE_KIND) ,SDRATTR_3DOBJ_TEXTURE_KIND , ::cppu::UnoType<com::sun::star::drawing::TextureKind>::get(), 0, 0}, \
{ OUString(UNO_NAME_3D_TEXTURE_MODE) ,SDRATTR_3DOBJ_TEXTURE_MODE , ::cppu::UnoType<com::sun::star::drawing::TextureMode>::get(), 0, 0}, \
{ OUString(UNO_NAME_3D_TEXTURE_PROJ_X) ,SDRATTR_3DOBJ_TEXTURE_PROJ_X , ::cppu::UnoType<com::sun::star::drawing::TextureProjectionMode>::get(), 0, 0}, \
{ OUString(UNO_NAME_3D_TEXTURE_PROJ_Y) ,SDRATTR_3DOBJ_TEXTURE_PROJ_Y , ::cppu::UnoType<com::sun::star::drawing::TextureProjectionMode>::get(), 0, 0}, \
- { OUString(UNO_NAME_3D_REDUCED_LINE_GEOMETRY) ,SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY , ::getBooleanCppuType(), 0, 0},
+ { OUString(UNO_NAME_3D_REDUCED_LINE_GEOMETRY) ,SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY , cppu::UnoType<bool>::get(), 0, 0},
#define SPECIAL_3DCUBEOBJECT_PROPERTIES \
{ OUString(UNO_NAME_3D_TRANSFORM_MATRIX) ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX , ::cppu::UnoType<com::sun::star::drawing::HomogenMatrix>::get(), 0, 0}, \
- { OUString(UNO_NAME_3D_POS) ,OWN_ATTR_3D_VALUE_POSITION , ::getCppuType((const ::com::sun::star::drawing::Position3D*)0), 0, 0}, \
+ { OUString(UNO_NAME_3D_POS) ,OWN_ATTR_3D_VALUE_POSITION , cppu::UnoType<css::drawing::Position3D>::get(), 0, 0}, \
{ OUString(UNO_NAME_3D_SIZE) ,OWN_ATTR_3D_VALUE_SIZE , ::cppu::UnoType<com::sun::star::drawing::Direction3D>::get(), 0, 0}, \
- { OUString(UNO_NAME_3D_POS_IS_CENTER) ,OWN_ATTR_3D_VALUE_POS_IS_CENTER , ::getBooleanCppuType(), 0, 0},
+ { OUString(UNO_NAME_3D_POS_IS_CENTER) ,OWN_ATTR_3D_VALUE_POS_IS_CENTER , cppu::UnoType<bool>::get(), 0, 0},
#define SPECIAL_3DSPHEREOBJECT_PROPERTIES \
{ OUString(UNO_NAME_3D_TRANSFORM_MATRIX) ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX , ::cppu::UnoType<com::sun::star::drawing::HomogenMatrix>::get(), 0, 0}, \
- { OUString(UNO_NAME_3D_POS) ,OWN_ATTR_3D_VALUE_POSITION , ::getCppuType((const ::com::sun::star::drawing::Position3D*)0), 0, 0}, \
+ { OUString(UNO_NAME_3D_POS) ,OWN_ATTR_3D_VALUE_POSITION , cppu::UnoType<css::drawing::Position3D>::get(), 0, 0}, \
{ OUString(UNO_NAME_3D_SIZE) ,OWN_ATTR_3D_VALUE_SIZE , ::cppu::UnoType<com::sun::star::drawing::Direction3D>::get(), 0, 0}, \
{ OUString(UNO_NAME_3D_HORZ_SEGS) ,SDRATTR_3DOBJ_HORZ_SEGS, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ OUString(UNO_NAME_3D_VERT_SEGS) ,SDRATTR_3DOBJ_VERT_SEGS, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
// #107245# New 3D properties which are possible for lathe and extrude 3d objects
#define SPECIAL_3DLATHEANDEXTRUDEOBJ_PROPERTIES \
- { OUString(UNO_NAME_3D_SMOOTH_NORMALS) , SDRATTR_3DOBJ_SMOOTH_NORMALS, ::getBooleanCppuType(), 0, 0}, \
- { OUString(UNO_NAME_3D_SMOOTH_LIDS) , SDRATTR_3DOBJ_SMOOTH_LIDS, ::getBooleanCppuType(), 0, 0}, \
- { OUString(UNO_NAME_3D_CHARACTER_MODE) , SDRATTR_3DOBJ_CHARACTER_MODE, ::getBooleanCppuType(), 0, 0}, \
- { OUString(UNO_NAME_3D_CLOSE_FRONT) , SDRATTR_3DOBJ_CLOSE_FRONT, ::getBooleanCppuType(), 0, 0}, \
- { OUString(UNO_NAME_3D_CLOSE_BACK) , SDRATTR_3DOBJ_CLOSE_BACK, ::getBooleanCppuType(), 0, 0},
+ { OUString(UNO_NAME_3D_SMOOTH_NORMALS) , SDRATTR_3DOBJ_SMOOTH_NORMALS, cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString(UNO_NAME_3D_SMOOTH_LIDS) , SDRATTR_3DOBJ_SMOOTH_LIDS, cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString(UNO_NAME_3D_CHARACTER_MODE) , SDRATTR_3DOBJ_CHARACTER_MODE, cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString(UNO_NAME_3D_CLOSE_FRONT) , SDRATTR_3DOBJ_CLOSE_FRONT, cppu::UnoType<bool>::get(), 0, 0}, \
+ { OUString(UNO_NAME_3D_CLOSE_BACK) , SDRATTR_3DOBJ_CLOSE_BACK, cppu::UnoType<bool>::get(), 0, 0},
#define SPECIAL_3DLATHEOBJECT_PROPERTIES \
{ OUString(UNO_NAME_3D_TRANSFORM_MATRIX) ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX,::cppu::UnoType<com::sun::star::drawing::HomogenMatrix>::get(), 0, 0}, \
@@ -520,13 +520,13 @@
{ OUString(UNO_NAME_3D_POLYPOLYGON3D) ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D , ::cppu::UnoType<com::sun::star::drawing::PolyPolygonShape3D>::get(), 0, 0}, \
{ OUString(UNO_NAME_3D_NORMALSPOLYGON3D) ,OWN_ATTR_3D_VALUE_NORMALSPOLYGON3D, ::cppu::UnoType<com::sun::star::drawing::PolyPolygonShape3D>::get(), 0, 0}, \
{ OUString(UNO_NAME_3D_TEXTUREPOLYGON3D) ,OWN_ATTR_3D_VALUE_TEXTUREPOLYGON3D, ::cppu::UnoType<com::sun::star::drawing::PolyPolygonShape3D>::get(), 0, 0}, \
- { OUString(UNO_NAME_3D_LINEONLY) ,OWN_ATTR_3D_VALUE_LINEONLY , ::getBooleanCppuType(), 0, 0},
+ { OUString(UNO_NAME_3D_LINEONLY) ,OWN_ATTR_3D_VALUE_LINEONLY , cppu::UnoType<bool>::get(), 0, 0},
#define SPECIAL_3DBACKSCALE_PROPERTIES \
{ OUString(UNO_NAME_3D_BACKSCALE) ,SDRATTR_3DOBJ_BACKSCALE , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
#define CUSTOMSHAPE_PROPERTIES \
- { OUString(UNO_NAME_CUSTOMSHAPE_ADJUSTMENT),SDRATTR_CUSTOMSHAPE_ADJUSTMENT, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int32>*)0), 0, 0}, \
+ { OUString(UNO_NAME_CUSTOMSHAPE_ADJUSTMENT),SDRATTR_CUSTOMSHAPE_ADJUSTMENT, cppu::UnoType<css::uno::Sequence<sal_Int32>>::get(), 0, 0}, \
#endif
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 97c2ce0ecec1..7c05cd5cfa58 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -599,7 +599,7 @@ IMPL_LINK(SvxRubyDialog, PositionHdl_Impl, ListBox*, pBox)
{
AssertOneEntry();
sal_Bool bAbove = !pBox->GetSelectEntryPos();
- const Type& rType = ::getBooleanCppuType();
+ const Type& rType = cppu::UnoType<bool>::get();
Sequence<PropertyValues>& aRubyValues = pImpl->GetRubyValues();
for(sal_Int32 nRuby = 0; nRuby < aRubyValues.getLength(); nRuby++)
{
diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx
index e09593bc5e65..1b53ad0e1b23 100644
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
@@ -185,7 +185,7 @@ namespace svx
static PropertyMapEntry const s_aDesriptorProperties[] =
{
{ OUString("ActiveConnection"), daConnection, cppu::UnoType<XConnection>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("BookmarkSelection"), daBookmarkSelection, ::getBooleanCppuType( ), PropertyAttribute::TRANSIENT, 0 },
+ { OUString("BookmarkSelection"), daBookmarkSelection, cppu::UnoType<bool>::get(), PropertyAttribute::TRANSIENT, 0 },
{ OUString("Column"), daColumnObject, cppu::UnoType<XPropertySet>::get(), PropertyAttribute::TRANSIENT, 0 },
{ OUString("ColumnName"), daColumnName, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
{ OUString("Command"), daCommand, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
@@ -195,9 +195,9 @@ namespace svx
{ OUString("Cursor"), daCursor, cppu::UnoType<XResultSet>::get(), PropertyAttribute::TRANSIENT, 0 },
{ OUString("DataSourceName"), daDataSource, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
{ OUString("DatabaseLocation"), daDatabaseLocation, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("EscapeProcessing"), daEscapeProcessing, ::getBooleanCppuType( ), PropertyAttribute::TRANSIENT, 0 },
+ { OUString("EscapeProcessing"), daEscapeProcessing, cppu::UnoType<bool>::get(), PropertyAttribute::TRANSIENT, 0 },
{ OUString("Filter"), daFilter, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 },
- { OUString("Selection"), daSelection, ::getCppuType( static_cast< Sequence< Any >* >(NULL) ), PropertyAttribute::TRANSIENT, 0 },
+ { OUString("Selection"), daSelection, cppu::UnoType<Sequence< Any >>::get(), PropertyAttribute::TRANSIENT, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index f41cfacaed5f..120bfb174e75 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -1376,21 +1376,21 @@ void FmXFormShell::LoopGrids(sal_Int16 nWhat)
case GA_DISABLE_SYNC:
{
sal_Bool bB(sal_False);
- xModelSet->setPropertyValue(FM_PROP_DISPLAYSYNCHRON, Any(&bB,getBooleanCppuType()));
+ xModelSet->setPropertyValue(FM_PROP_DISPLAYSYNCHRON, Any(&bB,cppu::UnoType<bool>::get()));
}
break;
case GA_FORCE_SYNC:
{
Any aOldVal( xModelSet->getPropertyValue(FM_PROP_DISPLAYSYNCHRON) );
sal_Bool bB(sal_True);
- xModelSet->setPropertyValue(FM_PROP_DISPLAYSYNCHRON, Any(&bB,getBooleanCppuType()));
+ xModelSet->setPropertyValue(FM_PROP_DISPLAYSYNCHRON, Any(&bB,cppu::UnoType<bool>::get()));
xModelSet->setPropertyValue(FM_PROP_DISPLAYSYNCHRON, aOldVal);
}
break;
case GA_ENABLE_SYNC:
{
sal_Bool bB(sal_True);
- xModelSet->setPropertyValue(FM_PROP_DISPLAYSYNCHRON, Any(&bB,getBooleanCppuType()));
+ xModelSet->setPropertyValue(FM_PROP_DISPLAYSYNCHRON, Any(&bB,cppu::UnoType<bool>::get()));
}
break;
}
@@ -1398,7 +1398,7 @@ void FmXFormShell::LoopGrids(sal_Int16 nWhat)
if (nWhat & GA_DISABLE_ROCTRLR)
{
sal_Bool bB(sal_False);
- xModelSet->setPropertyValue(FM_PROP_ALWAYSSHOWCURSOR, Any(&bB,getBooleanCppuType()));
+ xModelSet->setPropertyValue(FM_PROP_ALWAYSSHOWCURSOR, Any(&bB,cppu::UnoType<bool>::get()));
Reference< XPropertyState> xModelPropState(xModelSet, UNO_QUERY);
if (xModelPropState.is())
xModelPropState->setPropertyToDefault(FM_PROP_CURSORCOLOR);
@@ -1408,7 +1408,7 @@ void FmXFormShell::LoopGrids(sal_Int16 nWhat)
else if (nWhat & GA_ENABLE_ROCTRLR)
{
sal_Bool bB(sal_True);
- xModelSet->setPropertyValue(FM_PROP_ALWAYSSHOWCURSOR, Any(&bB,getBooleanCppuType()));
+ xModelSet->setPropertyValue(FM_PROP_ALWAYSSHOWCURSOR, Any(&bB,cppu::UnoType<bool>::get()));
xModelSet->setPropertyValue(FM_PROP_CURSORCOLOR, makeAny(sal_Int32(COL_LIGHTRED)));
}
}
diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx
index 023dbcf2feaf..5c5288d5ba26 100644
--- a/svx/source/form/fmsrccfg.cxx
+++ b/svx/source/form/fmsrccfg.cxx
@@ -147,7 +147,7 @@ namespace svxform
// class FmSearchConfigItem - a config item that stores search parameters
-#define TA( c ) &c, getCppuType( &c )
+#define TA( c ) &c, cppu::UnoType<decltype(c)>::get()
FmSearchConfigItem::FmSearchConfigItem()
:OConfigurationValueContainer( ::comphelper::getProcessComponentContext(), m_aMutex, "/org.openoffice.Office.DataAccess/FormSearchOptions", CVC_UPDATE_ACCESS | CVC_LAZY_UPDATE, 2 )
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 4c9f2fa4cde2..dc4bff3edb5a 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -1237,7 +1237,7 @@ void FmSearchEngine::StartOverSpecial(bool _bSearchForNull)
void FmSearchEngine::InvalidatePreviousLoc()
{
- m_aPreviousLocBookmark.setValue(0,getVoidCppuType());
+ m_aPreviousLocBookmark.setValue(0,cppu::UnoType<cppu::UnoVoidType>::get());
m_iterPreviousLocField = m_arrUsedFields.end();
}
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 541f6f74b1d5..94dd18139c27 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -878,10 +878,10 @@ void FormController::fillProperties(
Property* pDesc = _rProps.getArray();
pDesc[nPos++] = Property(FM_PROP_FILTER, FM_ATTR_FILTER,
- ::getCppuType((const OUString*)0),
+ cppu::UnoType<OUString>::get(),
PropertyAttribute::READONLY);
pDesc[nPos++] = Property(FM_PROP_FORM_OPERATIONS, FM_ATTR_FORM_OPERATIONS,
- ::getCppuType((const Reference< XFormOperations >*)0),
+ cppu::UnoType<XFormOperations>::get(),
PropertyAttribute::READONLY);
}
diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx
index d00bc97b7c0c..8a0c27557564 100644
--- a/svx/source/form/xfm_addcondition.cxx
+++ b/svx/source/form/xfm_addcondition.cxx
@@ -72,7 +72,7 @@ namespace svxform
PROPERTY_ID_BINDING,
PropertyAttribute::TRANSIENT,
&m_xBinding,
- ::getCppuType( &m_xBinding )
+ cppu::UnoType<decltype(m_xBinding)>::get()
);
registerProperty(
@@ -80,7 +80,7 @@ namespace svxform
PROPERTY_ID_FACET_NAME,
PropertyAttribute::TRANSIENT,
&m_sFacetName,
- ::getCppuType( &m_sFacetName )
+ cppu::UnoType<decltype(m_sFacetName)>::get()
);
registerProperty(
@@ -88,7 +88,7 @@ namespace svxform
PROPERTY_ID_CONDITION_VALUE,
PropertyAttribute::TRANSIENT,
&m_sConditionValue,
- ::getCppuType( &m_sConditionValue )
+ cppu::UnoType<decltype(m_sConditionValue)>::get()
);
registerProperty(
@@ -96,7 +96,7 @@ namespace svxform
PROPERTY_ID_FORM_MODEL,
PropertyAttribute::TRANSIENT,
&m_xWorkModel,
- ::getCppuType( &m_xWorkModel )
+ cppu::UnoType<decltype(m_xWorkModel)>::get()
);
}
diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx
index 3af285edaefe..4b51ac9becb9 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -54,7 +54,7 @@ SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem( const uno::Sequence< bea
throw uno::RuntimeException(
"CustomShapeGeometry has duplicate property " + rPropVal.Name);
}
- if ( rPropVal.Value.getValueType() == ::getCppuType((const ::com::sun::star::uno::Sequence < beans::PropertyValue >*)0) )
+ if ( rPropVal.Value.getValueType() == cppu::UnoType<css::uno::Sequence < beans::PropertyValue >>::get() )
{
uno::Sequence< beans::PropertyValue > const & rPropSeq = *static_cast<uno::Sequence< beans::PropertyValue > const *>(rPropVal.Value.getValue());
for ( j = 0; j < rPropSeq.getLength(); j++ )
@@ -90,7 +90,7 @@ com::sun::star::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( co
com::sun::star::uno::Any* pSeqAny = GetPropertyValueByName( rSequenceName );
if ( pSeqAny )
{
- if ( pSeqAny->getValueType() == ::getCppuType((const ::com::sun::star::uno::Sequence < beans::PropertyValue >*)0) )
+ if ( pSeqAny->getValueType() == cppu::UnoType<css::uno::Sequence < beans::PropertyValue >>::get() )
{
PropertyPairHashMap::iterator aHashIter( aPropPairHashMap.find( PropertyPair( rSequenceName, rPropName ) ) );
if ( aHashIter != aPropPairHashMap.end() )
@@ -110,7 +110,7 @@ const com::sun::star::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByNa
const com::sun::star::uno::Any* pSeqAny = GetPropertyValueByName( rSequenceName );
if ( pSeqAny )
{
- if ( pSeqAny->getValueType() == ::getCppuType((const ::com::sun::star::uno::Sequence < beans::PropertyValue >*)0) )
+ if ( pSeqAny->getValueType() == cppu::UnoType<css::uno::Sequence < beans::PropertyValue >>::get() )
{
PropertyPairHashMap::const_iterator aHashIter( aPropPairHashMap.find( PropertyPair( rSequenceName, rPropName ) ) );
if ( aHashIter != aPropPairHashMap.end() )
@@ -130,7 +130,7 @@ void SdrCustomShapeGeometryItem::SetPropertyValue( const com::sun::star::beans::
if ( pAny )
{ // property is already available
sal_Int32 i;
- if ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::uno::Sequence < beans::PropertyValue >*)0) )
+ if ( pAny->getValueType() == cppu::UnoType<css::uno::Sequence < beans::PropertyValue >>::get() )
{ // old property is a sequence->each entry has to be removed from the HashPairMap
::com::sun::star::uno::Sequence < beans::PropertyValue > const & rSecSequence =
*static_cast<css::uno::Sequence < beans::PropertyValue > const *>(pAny->getValue());
@@ -142,7 +142,7 @@ void SdrCustomShapeGeometryItem::SetPropertyValue( const com::sun::star::beans::
}
}
*pAny = rPropVal.Value;
- if ( rPropVal.Value.getValueType() == ::getCppuType((const ::com::sun::star::uno::Sequence < beans::PropertyValue >*)0) )
+ if ( rPropVal.Value.getValueType() == cppu::UnoType<css::uno::Sequence < beans::PropertyValue >>::get() )
{ // the new property is a sequence->each entry has to be inserted into the HashPairMap
::com::sun::star::uno::Sequence < beans::PropertyValue > const & rSecSequence =
*static_cast<css::uno::Sequence < beans::PropertyValue > const *>(pAny->getValue());
@@ -196,7 +196,7 @@ void SdrCustomShapeGeometryItem::SetPropertyValue( const OUString& rSequenceName
if( pSeqAny )
{
- if ( pSeqAny->getValueType() == ::getCppuType((const ::com::sun::star::uno::Sequence < beans::PropertyValue >*)0) )
+ if ( pSeqAny->getValueType() == cppu::UnoType<css::uno::Sequence < beans::PropertyValue >>::get() )
{
PropertyPairHashMap::iterator aHashIter( aPropPairHashMap.find( PropertyPair( rSequenceName, rPropVal.Name ) ) );
if ( aHashIter != aPropPairHashMap.end() )
@@ -231,7 +231,7 @@ void SdrCustomShapeGeometryItem::ClearPropertyValue( const OUString& rPropName )
com::sun::star::uno::Any* pSeqAny = &aPropSeq[ (*aHashIter).second ].Value;
if ( pSeqAny )
{
- if ( pSeqAny->getValueType() == ::getCppuType((const ::com::sun::star::uno::Sequence < beans::PropertyValue >*)0) )
+ if ( pSeqAny->getValueType() == cppu::UnoType<css::uno::Sequence < beans::PropertyValue >>::get() )
{
::com::sun::star::uno::Sequence < beans::PropertyValue > const & rSecSequence =
*static_cast<css::uno::Sequence < beans::PropertyValue > const *>(pSeqAny->getValue());
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 356f45d7d58a..8a8af8c9f00e 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -73,7 +73,7 @@ static const SvxItemPropertySet* ImplGetSvxCellPropertySet()
static const SfxItemPropertyMapEntry aSvxCellPropertyMap[] =
{
FILL_PROPERTIES
-// { "HasLevels", OWN_ATTR_HASLEVELS, ::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+// { "HasLevels", OWN_ATTR_HASLEVELS, cppu::UnoType<bool>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString("Style"), OWN_ATTR_STYLE, cppu::UnoType< ::com::sun::star::style::XStyle >::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString(UNO_NAME_TEXT_WRITINGMODE), SDRATTR_TEXTDIRECTION, cppu::UnoType<com::sun::star::text::WritingMode>::get(), 0, 0},
{ OUString(UNO_NAME_TEXT_HORZADJUST), SDRATTR_TEXT_HORZADJUST, cppu::UnoType<com::sun::star::drawing::TextHorizontalAdjust>::get(), 0, 0}, \
@@ -82,7 +82,7 @@ static const SvxItemPropertySet* ImplGetSvxCellPropertySet()
{ OUString(UNO_NAME_TEXT_RIGHTDIST), SDRATTR_TEXT_RIGHTDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
{ OUString(UNO_NAME_TEXT_UPPERDIST), SDRATTR_TEXT_UPPERDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
{ OUString(UNO_NAME_TEXT_VERTADJUST), SDRATTR_TEXT_VERTADJUST, cppu::UnoType<com::sun::star::drawing::TextVerticalAdjust>::get(), 0, 0},\
- { OUString(UNO_NAME_TEXT_WORDWRAP), SDRATTR_TEXT_WORDWRAP, ::getBooleanCppuType(), 0, 0}, \
+ { OUString(UNO_NAME_TEXT_WORDWRAP), SDRATTR_TEXT_WORDWRAP, cppu::UnoType<bool>::get(), 0, 0}, \
{ OUString("TableBorder"), OWN_ATTR_TABLEBORDER, cppu::UnoType<TableBorder>::get(), 0, 0 }, \
{ OUString("TopBorder"), SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, TOP_BORDER }, \
diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx
index 1b0aa1706596..9e558bdb9719 100644
--- a/svx/source/table/tablecolumn.cxx
+++ b/svx/source/table/tablecolumn.cxx
@@ -264,17 +264,17 @@ rtl::Reference< FastPropertySetInfo > TableColumn::getStaticPropertySetInfo()
aProperties[1].Name = "OptimalWidth";
aProperties[1].Handle = Property_OptimalWidth;
- aProperties[1].Type = ::getBooleanCppuType();
+ aProperties[1].Type = cppu::UnoType<bool>::get();
aProperties[1].Attributes = 0;
aProperties[2].Name = "IsVisible";
aProperties[2].Handle = Property_IsVisible;
- aProperties[2].Type = ::getBooleanCppuType();
+ aProperties[2].Type = cppu::UnoType<bool>::get();
aProperties[2].Attributes = 0;
aProperties[3].Name = "IsStartOfNewPage";
aProperties[3].Handle = Property_IsStartOfNewPage;
- aProperties[3].Type = ::getBooleanCppuType();
+ aProperties[3].Type = cppu::UnoType<bool>::get();
aProperties[3].Attributes = 0;
aProperties[4].Name = "Size";
@@ -284,7 +284,7 @@ rtl::Reference< FastPropertySetInfo > TableColumn::getStaticPropertySetInfo()
aProperties[5].Name = "OptimalSize";
aProperties[5].Handle = Property_OptimalWidth;
- aProperties[5].Type = ::getBooleanCppuType();
+ aProperties[5].Type = cppu::UnoType<bool>::get();
aProperties[5].Attributes = 0;
xInfo.set( new FastPropertySetInfo(aProperties) );
diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx
index ed1e93872d24..195a895781e5 100644
--- a/svx/source/table/tablerow.cxx
+++ b/svx/source/table/tablerow.cxx
@@ -334,17 +334,17 @@ rtl::Reference< FastPropertySetInfo > TableRow::getStaticPropertySetInfo()
aProperties[1].Name = "OptimalHeight";
aProperties[1].Handle = Property_OptimalHeight;
- aProperties[1].Type = ::getBooleanCppuType();
+ aProperties[1].Type = cppu::UnoType<bool>::get();
aProperties[1].Attributes = 0;
aProperties[2].Name = "IsVisible";
aProperties[2].Handle = Property_IsVisible;
- aProperties[2].Type = ::getBooleanCppuType();
+ aProperties[2].Type = cppu::UnoType<bool>::get();
aProperties[2].Attributes = 0;
aProperties[3].Name = "IsStartOfNewPage";
aProperties[3].Handle = Property_IsStartOfNewPage;
- aProperties[3].Type = ::getBooleanCppuType();
+ aProperties[3].Type = cppu::UnoType<bool>::get();
aProperties[3].Attributes = 0;
aProperties[4].Name = "Size";
@@ -354,7 +354,7 @@ rtl::Reference< FastPropertySetInfo > TableRow::getStaticPropertySetInfo()
aProperties[5].Name = "OptimalSize";
aProperties[5].Handle = Property_OptimalHeight;
- aProperties[5].Type = ::getBooleanCppuType();
+ aProperties[5].Type = cppu::UnoType<bool>::get();
aProperties[5].Attributes = 0;
xInfo.set( new FastPropertySetInfo(aProperties) );
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 68c0fe66faf5..05b938416da2 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -61,7 +61,7 @@ using namespace ::com::sun::star;
//-
#define QUERYINT( xint ) \
- if( rType == ::getCppuType((const uno::Reference< xint >*)0) ) \
+ if( rType == cppu::UnoType<xint>::get() ) \
aAny <<= uno::Reference< xint >(this)
//-
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index 7a9d20f3e1b8..a0d9e57d9450 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -409,7 +409,7 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::hasByName( const OUString& aName )
uno::Type SAL_CALL SvxUnoMarkerTable::getElementType( )
throw( uno::RuntimeException, std::exception )
{
- return ::getCppuType((const drawing::PointSequence*)0);
+ return cppu::UnoType<drawing::PointSequence>::get();
}
sal_Bool SAL_CALL SvxUnoMarkerTable::hasElements( )
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 288b7bf6025f..d9b6fb731366 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -58,7 +58,7 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::drawing;
#define INTERFACE_TYPE( xint ) \
- ::getCppuType((const Reference< xint >*)0)
+ cppu::UnoType<xint>::get()
UNO3_GETIMPLEMENTATION_IMPL( SvxDrawPage );
SvxDrawPage::SvxDrawPage( SdrPage* pInPage ) throw()
@@ -175,7 +175,7 @@ void SAL_CALL SvxDrawPage::addEventListener( const ::com::sun::star::uno::Refere
if( mpModel == 0 )
throw lang::DisposedException();
- mrBHelper.addListener( ::getCppuType( &aListener ) , aListener );
+ mrBHelper.addListener( cppu::UnoType<decltype(aListener)>::get() , aListener );
}
void SAL_CALL SvxDrawPage::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception)
@@ -185,7 +185,7 @@ void SAL_CALL SvxDrawPage::removeEventListener( const ::com::sun::star::uno::Ref
if( mpModel == 0 )
throw lang::DisposedException();
- mrBHelper.removeListener( ::getCppuType( &aListener ) , aListener );
+ mrBHelper.removeListener( cppu::UnoType<decltype(aListener)>::get() , aListener );
}
// SfxListener
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index cd97bb3aa84a..2d092a0253ab 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -173,7 +173,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonPropertyMap()
{
static SfxItemPropertyMapEntry const aPolyPolygonPropertyMap_Impl[] =
{
- { OUString("Geometry"), OWN_ATTR_BASE_GEOMETRY, ::getCppuType((const ::com::sun::star::drawing::PointSequenceSequence*)0), 0, 0 },
+ { OUString("Geometry"), OWN_ATTR_BASE_GEOMETRY, cppu::UnoType<css::drawing::PointSequenceSequence>::get(), 0, 0 },
SPECIAL_POLYGON_PROPERTIES
SPECIAL_POLYPOLYGON_PROPERTIES
FILL_PROPERTIES
@@ -242,7 +242,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxGraphicObjectPropertyMap()
TEXT_PROPERTIES
// #FontWork#
FONTWORK_PROPERTIES
- { OUString("IsMirrored"), OWN_ATTR_MIRRORED, ::getCppuBooleanType(), 0, 0},
+ { OUString("IsMirrored"), OWN_ATTR_MIRRORED, cppu::UnoType<bool>::get(), 0, 0},
{ OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
{ OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
{ OUString("GraphicStream"), OWN_ATTR_GRAPHIC_STREAM, cppu::UnoType<css::io::XInputStream>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
@@ -461,7 +461,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxOle2PropertyMap()
{ OUString("EmbeddedObjectNoNewClient"),OWN_ATTR_OLE_EMBEDDED_OBJECT_NONEWCLIENT, cppu::UnoType<com::sun::star::embed::XEmbeddedObject>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString("OriginalSize"), OWN_ATTR_OLESIZE , cppu::UnoType<com::sun::star::awt::Size>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString("CLSID"), OWN_ATTR_CLSID , cppu::UnoType<OUString>::get(), 0, 0 },
- { OUString("IsInternal"), OWN_ATTR_INTERNAL_OLE , ::getBooleanCppuType() , ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+ { OUString("IsInternal"), OWN_ATTR_INTERNAL_OLE , cppu::UnoType<bool>::get() , ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString("VisibleArea"), OWN_ATTR_OLE_VISAREA , cppu::UnoType<com::sun::star::awt::Rectangle>::get(), 0, 0},
{ OUString("Aspect"), OWN_ATTR_OLE_ASPECT , cppu::UnoType<sal_Int64>::get(), 0, 0},
{ OUString(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , cppu::UnoType<OUString>::get(), 0, 0 },
@@ -479,17 +479,17 @@ SfxItemPropertyMapEntry const * ImplGetSvxPluginPropertyMap()
{
{ OUString("PluginMimeType"), OWN_ATTR_PLUGIN_MIMETYPE , cppu::UnoType<OUString>::get(), 0, 0},
{ OUString("PluginURL"), OWN_ATTR_PLUGIN_URL , cppu::UnoType<OUString>::get(), 0, 0},
- { OUString("PluginCommands"), OWN_ATTR_PLUGIN_COMMANDS , ::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), 0, 0},
+ { OUString("PluginCommands"), OWN_ATTR_PLUGIN_COMMANDS , cppu::UnoType<css::uno::Sequence< ::com::sun::star::beans::PropertyValue >>::get(), 0, 0},
{ OUString("Transformation"), OWN_ATTR_TRANSFORMATION , cppu::UnoType<com::sun::star::drawing::HomogenMatrix3>::get(), 0, 0 },
{ OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , cppu::UnoType<sal_Int32>::get(), 0, 0},
{ OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , cppu::UnoType<sal_Int16>::get(), 0, 0},
{ OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , cppu::UnoType<OUString>::get(), 0, 0},
{ OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , cppu::UnoType<com::sun::star::awt::XBitmap>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
- { OUString(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE , ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+ { OUString(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE , cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , cppu::UnoType<OUString>::get(), 0, 0 },
- { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
- { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0},
{ OUString(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , cppu::UnoType<OUString>::get(), 0, 0 },
{ OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , cppu::UnoType<OUString>::get(), 0, 0 },
{ OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType<com::sun::star::awt::Rectangle>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
@@ -510,8 +510,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxFramePropertyMap()
{
{ OUString("FrameURL"), OWN_ATTR_FRAME_URL , cppu::UnoType<OUString>::get(), 0, 0},
{ OUString("FrameName"), OWN_ATTR_FRAME_NAME , cppu::UnoType<OUString>::get(), 0, 0},
- { OUString("FrameIsAutoScroll"), OWN_ATTR_FRAME_ISAUTOSCROLL , ::getBooleanCppuType() , ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
- { OUString("FrameIsBorder"), OWN_ATTR_FRAME_ISBORDER , ::getBooleanCppuType() , 0, 0},
+ { OUString("FrameIsAutoScroll"), OWN_ATTR_FRAME_ISAUTOSCROLL , cppu::UnoType<bool>::get() , ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+ { OUString("FrameIsBorder"), OWN_ATTR_FRAME_ISBORDER , cppu::UnoType<bool>::get() , 0, 0},
{ OUString("FrameMarginWidth"), OWN_ATTR_FRAME_MARGIN_WIDTH , cppu::UnoType<sal_Int32>::get(), 0, 0},
{ OUString("FrameMarginHeight"), OWN_ATTR_FRAME_MARGIN_HEIGHT, cppu::UnoType<sal_Int32>::get(), 0, 0},
{ OUString("Transformation"), OWN_ATTR_TRANSFORMATION , cppu::UnoType<com::sun::star::drawing::HomogenMatrix3>::get(), 0, 0 },
@@ -520,10 +520,10 @@ SfxItemPropertyMapEntry const * ImplGetSvxFramePropertyMap()
{ OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , cppu::UnoType<OUString>::get(), 0, 0},
{ OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , cppu::UnoType<com::sun::star::awt::XBitmap>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
- { OUString(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE , ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+ { OUString(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE , cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , cppu::UnoType<OUString>::get(), 0, 0 },
- { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
- { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0},
{ OUString(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , cppu::UnoType<OUString>::get(), 0, 0 },
{ OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , cppu::UnoType<OUString>::get(), 0, 0 },
{ OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType<com::sun::star::awt::Rectangle>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
@@ -544,19 +544,19 @@ SfxItemPropertyMapEntry const * ImplGetSvxAppletPropertyMap()
{ OUString("AppletCodeBase"), OWN_ATTR_APPLET_CODEBASE , cppu::UnoType<OUString>::get(), 0, 0},
{ OUString("AppletName"), OWN_ATTR_APPLET_NAME , cppu::UnoType<OUString>::get(), 0, 0},
{ OUString("AppletCode"), OWN_ATTR_APPLET_CODE , cppu::UnoType<OUString>::get(), 0, 0},
- { OUString("AppletCommands"), OWN_ATTR_APPLET_COMMANDS , ::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), 0, 0},
+ { OUString("AppletCommands"), OWN_ATTR_APPLET_COMMANDS , cppu::UnoType<css::uno::Sequence< ::com::sun::star::beans::PropertyValue >>::get(), 0, 0},
{ OUString("AppletDocBase"), OWN_ATTR_APPLET_DOCBASE , cppu::UnoType<OUString>::get(), 0, 0},
- { OUString("AppletIsScript"), OWN_ATTR_APPLET_ISSCRIPT , ::getBooleanCppuType(), 0, 0 },
+ { OUString("AppletIsScript"), OWN_ATTR_APPLET_ISSCRIPT , cppu::UnoType<bool>::get(), 0, 0 },
{ OUString("Transformation"), OWN_ATTR_TRANSFORMATION , cppu::UnoType<com::sun::star::drawing::HomogenMatrix3>::get(), 0, 0 },
{ OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , cppu::UnoType<sal_Int32>::get(), 0, 0},
{ OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , cppu::UnoType<sal_Int16>::get(), 0, 0},
{ OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , cppu::UnoType<OUString>::get(), 0, 0},
{ OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , cppu::UnoType<com::sun::star::awt::XBitmap>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
- { OUString(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE , ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+ { OUString(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE , cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , cppu::UnoType<OUString>::get(), 0, 0 },
- { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
- { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0},
{ OUString(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , cppu::UnoType<OUString>::get(), 0, 0 },
{ OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , cppu::UnoType<OUString>::get(), 0, 0 },
{ OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType<com::sun::star::awt::Rectangle>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
@@ -591,7 +591,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxControlShapePropertyMap()
{ OUString("CharRelief"), 0, cppu::UnoType<sal_Int16>::get(), 0, 0 },
{ OUString("CharUnderlineColor"), 0, cppu::UnoType<sal_Int32>::get(), 0, 0 },
{ OUString("CharKerning"), 0, cppu::UnoType<sal_Int16>::get(), 0, 0 },
- { OUString("CharWordMode"), 0, ::getBooleanCppuType(), 0, 0 },
+ { OUString("CharWordMode"), 0, cppu::UnoType<bool>::get(), 0, 0 },
{ OUString(UNO_NAME_EDIT_PARA_ADJUST), 0, cppu::UnoType<sal_Int16>::get(), 0, 0 },
{ OUString("TextVerticalAdjust"), 0, cppu::UnoType<TextVerticalAdjust>::get(), MAYBEVOID, 0 },
{ OUString("ControlBackground"), 0, cppu::UnoType<sal_Int32>::get(), 0, 0 },
@@ -599,8 +599,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxControlShapePropertyMap()
{ OUString("ControlBorderColor"), 0, cppu::UnoType<sal_Int32>::get(), 0, 0 },
{ OUString("ControlSymbolColor"), 0, cppu::UnoType<sal_Int16>::get(), 0, 0 },
{ OUString("ImageScaleMode"), 0, cppu::UnoType<sal_Int16>::get(), 0, 0 },
- { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
- { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0},
{ OUString("ControlTextEmphasis"), 0, cppu::UnoType<sal_Int16>::get(), 0, 0 },
{ OUString("ControlWritingMode"), 0, cppu::UnoType< sal_Int16 >::get(), 0, 0},
// the following properties are handled by SvxShape
@@ -617,9 +617,9 @@ SfxItemPropertyMapEntry const * ImplGetSvxControlShapePropertyMap()
{ OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0},
{ OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0},
// #i112587#
- { OUString(UNO_NAME_MISC_OBJ_PRINTABLE), SDRATTR_OBJPRINTABLE , ::getBooleanCppuType(), 0, 0},
- { OUString("Visible"), SDRATTR_OBJVISIBLE , ::getBooleanCppuType(), 0, 0},
- { OUString(UNO_NAME_MISC_OBJ_INTEROPGRABBAG), OWN_ATTR_INTEROPGRABBAG, ::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_PRINTABLE), SDRATTR_OBJPRINTABLE , cppu::UnoType<bool>::get(), 0, 0},
+ { OUString("Visible"), SDRATTR_OBJVISIBLE , cppu::UnoType<bool>::get(), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_INTEROPGRABBAG), OWN_ATTR_INTEROPGRABBAG, cppu::UnoType<css::uno::Sequence< ::com::sun::star::beans::PropertyValue >>::get(), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@@ -637,8 +637,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxPageShapePropertyMap()
{ OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , cppu::UnoType<OUString>::get(), 0, 0},
{ OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , cppu::UnoType<com::sun::star::awt::XBitmap>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
- { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
- { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0},
{ OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType<com::sun::star::awt::Rectangle>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
// #i68101#
{ OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0},
@@ -655,15 +655,15 @@ SfxItemPropertyMapEntry const * ImplGetSvxCaptionPropertyMap()
{
{ OUString("CaptionPoint"), OWN_ATTR_CAPTION_POINT, cppu::UnoType<com::sun::star::awt::Point>::get(), 0, 0 },
{ OUString("CaptionType"), SDRATTR_CAPTIONTYPE, cppu::UnoType<sal_Int16>::get(), 0, 0},
- { OUString("CaptionIsFixedAngle"), SDRATTR_CAPTIONFIXEDANGLE, ::getBooleanCppuType(), 0, 0},
+ { OUString("CaptionIsFixedAngle"), SDRATTR_CAPTIONFIXEDANGLE, cppu::UnoType<bool>::get(), 0, 0},
{ OUString("CaptionAngle"), SDRATTR_CAPTIONANGLE, cppu::UnoType<sal_Int32>::get(), 0, 0},
{ OUString("CaptionGap"), SDRATTR_CAPTIONGAP, cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM},
{ OUString("CaptionEscapeDirection"), SDRATTR_CAPTIONESCDIR, cppu::UnoType<sal_Int32>::get(), 0, 0},
- { OUString("CaptionIsEscapeRelative"), SDRATTR_CAPTIONESCISREL, ::getBooleanCppuType(), 0, 0},
+ { OUString("CaptionIsEscapeRelative"), SDRATTR_CAPTIONESCISREL, cppu::UnoType<bool>::get(), 0, 0},
{ OUString("CaptionEscapeRelative"), SDRATTR_CAPTIONESCREL, cppu::UnoType<sal_Int32>::get(), 0, 0},
{ OUString("CaptionEscapeAbsolute"), SDRATTR_CAPTIONESCABS, cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM},
{ OUString("CaptionLineLength"), SDRATTR_CAPTIONLINELEN, cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM},
- { OUString("CaptionIsFitLineLength"), SDRATTR_CAPTIONFITLINELEN, ::getBooleanCppuType(), 0, 0},
+ { OUString("CaptionIsFitLineLength"), SDRATTR_CAPTIONFITLINELEN, cppu::UnoType<bool>::get(), 0, 0},
EDGERADIUS_PROPERTIES
FILL_PROPERTIES
LINE_PROPERTIES
@@ -689,7 +689,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxCustomShapePropertyMap()
{
{ OUString("CustomShapeEngine"), SDRATTR_CUSTOMSHAPE_ENGINE, cppu::UnoType<OUString>::get(), 0, 0 },
{ OUString("CustomShapeData"), SDRATTR_CUSTOMSHAPE_DATA, cppu::UnoType<OUString>::get(), 0, 0 },
- { OUString("CustomShapeGeometry"), SDRATTR_CUSTOMSHAPE_GEOMETRY, ::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), 0, 0 },
+ { OUString("CustomShapeGeometry"), SDRATTR_CUSTOMSHAPE_GEOMETRY,
+ cppu::UnoType<css::uno::Sequence< ::com::sun::star::beans::PropertyValue >>::get(), 0, 0 },
{ OUString("CustomShapeGraphicURL"), SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, cppu::UnoType<OUString>::get(), 0, 0},
CUSTOMSHAPE_PROPERTIES
FILL_PROPERTIES
@@ -723,8 +724,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxMediaShapePropertyMap()
{ OUString("Mute"), OWN_ATTR_MEDIA_MUTE, cppu::UnoType<sal_Bool>::get(), 0, 0},
{ OUString("VolumeDB"), OWN_ATTR_MEDIA_VOLUMEDB, cppu::UnoType<sal_Int16>::get(), 0, 0},
{ OUString("Zoom"), OWN_ATTR_MEDIA_ZOOM, cppu::UnoType<com::sun::star::media::ZoomLevel>::get(), 0, 0},
- { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
- { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0},
{ OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType<com::sun::star::awt::Rectangle>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
// #i68101#
{ OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0},
@@ -749,20 +750,20 @@ SfxItemPropertyMapEntry const * ImplGetSvxTableShapePropertyMap()
{ OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP, cppu::UnoType<css::awt::XBitmap>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME, cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString("Transformation"), OWN_ATTR_TRANSFORMATION, cppu::UnoType<com::sun::star::drawing::HomogenMatrix3>::get(), 0, 0 },
- { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
- { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0},
{ OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType<com::sun::star::awt::Rectangle>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_MISC_OBJ_NAME), SDRATTR_OBJECTNAME, cppu::UnoType<rtl::OUString>::get(), 0, 0},
{ OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0},
{ OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0},
{ OUString("Model"), OWN_ATTR_OLEMODEL , cppu::UnoType<css::table::XTable>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString("TableTemplate"), OWN_ATTR_TABLETEMPLATE , cppu::UnoType<css::container::XIndexAccess>::get(), 0, 0},
- { OUString("UseFirstRowStyle"), OWN_ATTR_TABLETEMPLATE_FIRSTROW, ::getBooleanCppuType(),0, 0},
- { OUString("UseLastRowStyle"), OWN_ATTR_TABLETEMPLATE_LASTROW, ::getBooleanCppuType(),0, 0},
- { OUString("UseFirstColumnStyle"), OWN_ATTR_TABLETEMPLATE_FIRSTCOLUMN, ::getBooleanCppuType(),0, 0},
- { OUString("UseLastColumnStyle"), OWN_ATTR_TABLETEMPLATE_LASTCOLUMN, ::getBooleanCppuType(),0, 0},
- { OUString("UseBandingRowStyle"), OWN_ATTR_TABLETEMPLATE_BANDINGROWS, ::getBooleanCppuType(),0, 0},
- { OUString("UseBandingColumnStyle"), OWN_ATTR_TABLETEMPLATE_BANDINGCOULUMNS, ::getBooleanCppuType(),0, 0},
+ { OUString("UseFirstRowStyle"), OWN_ATTR_TABLETEMPLATE_FIRSTROW, cppu::UnoType<bool>::get(),0, 0},
+ { OUString("UseLastRowStyle"), OWN_ATTR_TABLETEMPLATE_LASTROW, cppu::UnoType<bool>::get(),0, 0},
+ { OUString("UseFirstColumnStyle"), OWN_ATTR_TABLETEMPLATE_FIRSTCOLUMN, cppu::UnoType<bool>::get(),0, 0},
+ { OUString("UseLastColumnStyle"), OWN_ATTR_TABLETEMPLATE_LASTCOLUMN, cppu::UnoType<bool>::get(),0, 0},
+ { OUString("UseBandingRowStyle"), OWN_ATTR_TABLETEMPLATE_BANDINGROWS, cppu::UnoType<bool>::get(),0, 0},
+ { OUString("UseBandingColumnStyle"), OWN_ATTR_TABLETEMPLATE_BANDINGCOULUMNS, cppu::UnoType<bool>::get(),0, 0},
{ OUString("ReplacementGraphic"), OWN_ATTR_BITMAP, cppu::UnoType<css::graphic::XGraphic>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@@ -794,7 +795,7 @@ comphelper::PropertyMapEntry const * ImplGetAdditionalWriterDrawingDefaultsPrope
{
static comphelper::PropertyMapEntry const aSvxAdditionalDefaultsPropertyMap_Impl[] =
{
- { OUString("IsFollowingTextFlow"), SID_SW_FOLLOW_TEXT_FLOW, ::getBooleanCppuType(), 0, 0},
+ { OUString("IsFollowingTextFlow"), SID_SW_FOLLOW_TEXT_FLOW, cppu::UnoType<bool>::get(), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 27e7ace02276..f0f4eb3bb932 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -66,7 +66,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container;
#define QUERYINT( xint ) \
- if( rType == ::getCppuType((const Reference< xint >*)0) ) \
+ if( rType == cppu::UnoType<xint>::get() ) \
aAny <<= Reference< xint >(this)
SvxShapeGroup::SvxShapeGroup( SdrObject* pObj, SvxDrawPage* pDrawPage ) throw() :
@@ -1060,7 +1060,7 @@ bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const Sfx
{
case OWN_ATTR_VALUE_POLYPOLYGON:
{
- if( rValue.getValue() && (rValue.getValueType() == ::getCppuType(( const drawing::PointSequenceSequence*)0) ) )
+ if( rValue.getValue() && (rValue.getValueType() == cppu::UnoType<drawing::PointSequenceSequence>::get() ) )
{
basegfx::B2DPolyPolygon aNewPolyPolygon(ImplSvxPointSequenceSequenceToB2DPolyPolygon( static_cast<drawing::PointSequenceSequence const *>(rValue.getValue())));
SetPolygon(aNewPolyPolygon);
@@ -1070,7 +1070,7 @@ bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const Sfx
}
case OWN_ATTR_BASE_GEOMETRY:
{
- if( rValue.getValue() && (rValue.getValueType() == ::getCppuType(( const drawing::PointSequenceSequence*)0)))
+ if( rValue.getValue() && (rValue.getValueType() == cppu::UnoType<drawing::PointSequenceSequence>::get()))
{
if( mpObj.is() )
{
@@ -1087,7 +1087,7 @@ bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const Sfx
}
case OWN_ATTR_VALUE_POLYGON:
{
- if( rValue.getValue() && (rValue.getValueType() == ::getCppuType(( const drawing::PointSequenceSequence*)0) ))
+ if( rValue.getValue() && (rValue.getValueType() == cppu::UnoType<drawing::PointSequenceSequence>::get() ))
{
drawing::PointSequence const * pSequence = static_cast<drawing::PointSequence const *>(rValue.getValue());
@@ -1422,7 +1422,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte
{
if( rValue.getValue() )
{
- if( rValue.getValueType() == ::getCppuType(( const uno::Sequence< sal_Int8 >*)0) )
+ if( rValue.getValueType() == cppu::UnoType<uno::Sequence< sal_Int8 >>::get() )
{
uno::Sequence<sal_Int8> const * pSeq( static_cast<uno::Sequence<sal_Int8> const *>(rValue.getValue()) );
SvMemoryStream aMemStm;
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 56ec526eaa19..e65d9fe3f834 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -53,7 +53,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container;
#define QUERYINT( xint ) \
- if( rType == ::getCppuType((const Reference< xint >*)0) ) \
+ if( rType == cppu::UnoType<xint>::get() ) \
aAny <<= Reference< xint >(this)
Svx3DSceneObject::Svx3DSceneObject( SdrObject* pObj, SvxDrawPage* pDrawPage ) throw()
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 5a2fac6321b6..58a3e7d14ff4 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -695,7 +695,7 @@ uno::Any SvxShape::GetBitmap( bool bMetaFile /* = false */ ) const
const uno::Sequence<sal_Int8> aSeq(
static_cast< const sal_Int8* >(aDestStrm.GetData()),
aDestStrm.GetEndOfData());
- aAny.setValue( &aSeq, ::getCppuType((const uno::Sequence< sal_Int8 >*)0) );
+ aAny.setValue( &aSeq, cppu::UnoType<uno::Sequence< sal_Int8 >>::get() );
}
else
{
@@ -2288,7 +2288,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
basegfx::B2DPolyPolygon aNewPolyPolygon;
// #123616# be a little bit more flexible regardin gthe data type used
- if( rValue.getValueType() == ::getCppuType(( const drawing::PointSequenceSequence*)0))
+ if( rValue.getValueType() == cppu::UnoType<drawing::PointSequenceSequence>::get())
{
// get polygpon data from PointSequenceSequence
aNewPolyPolygon = basegfx::tools::UnoPointSequenceSequenceToB2DPolyPolygon(
diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx
index 0d16ad299a5f..ac932c2572a2 100644
--- a/svx/source/unodraw/unoshcol.cxx
+++ b/svx/source/unodraw/unoshcol.cxx
@@ -194,13 +194,13 @@ void SvxShapeCollection::dispose()
// XComponent
void SAL_CALL SvxShapeCollection::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception)
{
- mrBHelper.addListener( ::getCppuType( &aListener ) , aListener );
+ mrBHelper.addListener( cppu::UnoType<decltype(aListener)>::get() , aListener );
}
// XComponent
void SAL_CALL SvxShapeCollection::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception)
{
- mrBHelper.removeListener( ::getCppuType( &aListener ) , aListener );
+ mrBHelper.removeListener( cppu::UnoType<decltype(aListener)>::get() , aListener );
}
// XShapes
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 8a9c6450f17c..a46bfe9a7923 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -2043,13 +2043,13 @@ bool XLineStartCenterItem::GetPresentation
bool XLineStartCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
sal_Bool bValue = GetValue();
- rVal.setValue( &bValue, ::getCppuBooleanType() );
+ rVal.setValue( &bValue, cppu::UnoType<bool>::get() );
return true;
}
bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
- if( !rVal.hasValue() || rVal.getValueType() != ::getCppuBooleanType() )
+ if( !rVal.hasValue() || rVal.getValueType() != cppu::UnoType<bool>::get() )
return false;
SetValue( *static_cast<sal_Bool const *>(rVal.getValue()) );
@@ -2094,13 +2094,13 @@ bool XLineEndCenterItem::GetPresentation
bool XLineEndCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
sal_Bool bValue = GetValue();
- rVal.setValue( &bValue, ::getCppuBooleanType() );
+ rVal.setValue( &bValue, cppu::UnoType<bool>::get() );
return true;
}
bool XLineEndCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
- if( !rVal.hasValue() || rVal.getValueType() != ::getCppuBooleanType() )
+ if( !rVal.hasValue() || rVal.getValueType() != cppu::UnoType<bool>::get() )
return false;
SetValue( *static_cast<sal_Bool const *>(rVal.getValue()) );
generated by cgit (git 2.34.1) at 2025-02-11 08:07:01 +0000