diff options
36 files changed, 325 insertions, 325 deletions
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 7dd6df603c86..5f4a7ebf881c 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -78,9 +78,9 @@ static SvxItemPropertySet& GetStylePropertySet() { static const SfxItemPropertyMapEntry aFullPropertyMap_Impl[] = { - { OUString("Family"), WID_STYLE_FAMILY, ::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0}, + { OUString("Family"), WID_STYLE_FAMILY, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0}, { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<XNameContainer>::get(), 0, 0}, - { OUString("DisplayName"), WID_STYLE_DISPNAME, ::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0}, + { OUString("DisplayName"), WID_STYLE_DISPNAME, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0}, { OUString("Hidden"), WID_STYLE_HIDDEN, ::getCppuType((bool*)0), 0, 0}, SVX_UNOEDIT_NUMBERING_PROPERTIE, @@ -1175,7 +1175,7 @@ Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) thro if( pEntry->aType != aAny.getValueType() ) { // since the sfx uint16 item now exports a sal_Int32, we may have to fix this here - if( ( pEntry->aType == ::getCppuType((const sal_Int16*)0)) && aAny.getValueType() == ::getCppuType((const sal_Int32*)0) ) + if( ( pEntry->aType == ::cppu::UnoType<sal_Int16>::get()) && aAny.getValueType() == ::cppu::UnoType<sal_Int32>::get() ) { sal_Int32 nValue = 0; aAny >>= nValue; diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx index 238172b49f73..0eedb57ce646 100644 --- a/sd/source/core/text/textapi.cxx +++ b/sd/source/core/text/textapi.cxx @@ -121,7 +121,7 @@ const SvxItemPropertySet* ImplGetSdTextPortionPropertyMap() SVX_UNOEDIT_OUTLINER_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, {OUString("TextField"), EE_FEATURE_FIELD, ::getCppuType((const Reference< XTextField >*)0), PropertyAttribute::READONLY, 0 }, - {OUString("TextPortionType"), WID_PORTIONTYPE, ::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0 }, + {OUString("TextPortionType"), WID_PORTIONTYPE, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0 }, {OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, ::getCppuType((const Reference< XNameContainer >*)0) , 0, 0}, {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const Reference< XNameContainer >*)0) , 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 7b77d2cca04d..401b902531dd 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -441,9 +441,9 @@ bool SdXMLFilter::Import( ErrCode& nError ) PropertyMapEntry const aImportInfoMap[] = { // necessary properties for XML progress bar at load time - { 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("ProgressRange"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("ProgressMax"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("ProgressCurrent"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("Preview"), 0, ::getCppuType((const sal_Bool*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("PageLayouts"), 0, ::getCppuType((const uno::Reference< container::XNameAccess >*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("PrivateData"), 0, @@ -819,12 +819,12 @@ bool SdXMLFilter::Export() /** property map for export info set */ PropertyMapEntry const aExportInfoMap[] = { - { 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("ProgressRange"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("ProgressMax"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("ProgressCurrent"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("UsePrettyPrinting"),0, ::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("PageLayoutNames"), 0, ::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("PageLayoutNames"), 0, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("BaseURI"), 0, ::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 420fb4bf17b9..3335a1728c99 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -1800,7 +1800,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent, if( pSet->getPropertyState( nHandleRepeat ) != STLPropertyState_AMBIGUOUS ) { Any aRepeatCount( pSet->getPropertyValue( nHandleRepeat ) ); - if( (aRepeatCount.getValueType() == ::getCppuType((const double*)0)) || !aRepeatCount.hasValue() ) + if( (aRepeatCount.getValueType() == ::cppu::UnoType<double>::get()) || !aRepeatCount.hasValue() ) { double fRepeat = 0.0; if( aRepeatCount.hasValue() ) diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index aa81b00be39c..89c35efea6f2 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -111,9 +111,9 @@ const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap() static const SfxItemPropertyMapEntry aPresentationPropertyMap_Impl[] = { { OUString("AllowAnimations"), ATTR_PRESENT_ANIMATION_ALLOWED, ::getBooleanCppuType(), 0, 0 }, - { OUString("CustomShow"), ATTR_PRESENT_CUSTOMSHOW, ::getCppuType((const OUString*)0), 0, 0 }, - { OUString("Display"), ATTR_PRESENT_DISPLAY, ::getCppuType((const sal_Int32*)0), 0, 0 }, - { OUString("FirstPage"), ATTR_PRESENT_DIANAME, ::getCppuType((const OUString*)0), 0, 0 }, + { OUString("CustomShow"), ATTR_PRESENT_CUSTOMSHOW, ::cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString("Display"), ATTR_PRESENT_DISPLAY, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { OUString("FirstPage"), ATTR_PRESENT_DIANAME, ::cppu::UnoType<OUString>::get(), 0, 0 }, { OUString("IsAlwaysOnTop"), ATTR_PRESENT_ALWAYS_ON_TOP, ::getBooleanCppuType(), 0, 0 }, { OUString("IsAutomatic"), ATTR_PRESENT_MANUEL, ::getBooleanCppuType(), 0, 0 }, { OUString("IsEndless"), ATTR_PRESENT_ENDLESS, ::getBooleanCppuType(), 0, 0 }, @@ -122,7 +122,7 @@ const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap() { OUString("IsMouseVisible"), ATTR_PRESENT_MOUSE, ::getBooleanCppuType(), 0, 0 }, { OUString("IsShowLogo"), ATTR_PRESENT_SHOW_PAUSELOGO, ::getBooleanCppuType(), 0, 0 }, { OUString("IsTransitionOnClick"), ATTR_PRESENT_CHANGE_PAGE, ::getBooleanCppuType(), 0, 0 }, - { OUString("Pause"), ATTR_PRESENT_PAUSE_TIMEOUT, ::getCppuType((const sal_Int32*)0), 0, 0 }, + { OUString("Pause"), ATTR_PRESENT_PAUSE_TIMEOUT, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, { OUString("StartWithNavigator"), ATTR_PRESENT_NAVIGATOR, ::getBooleanCppuType(), 0, 0 }, { OUString("UsePen"), ATTR_PRESENT_PEN, ::getBooleanCppuType(), 0, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index a4cd1c4a1fc0..78f7bb5b6eaa 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -732,12 +732,12 @@ void DrawController::FillPropertyTable ( rProperties.push_back( beans::Property("ZoomValue", PROPERTY_ZOOMVALUE, - ::getCppuType((const sal_Int16*)0), + ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND )); rProperties.push_back( beans::Property("ZoomType", PROPERTY_ZOOMTYPE, - ::getCppuType((const sal_Int16*)0), + ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND )); rProperties.push_back( beans::Property("ViewOffset", @@ -753,12 +753,12 @@ void DrawController::FillPropertyTable ( rProperties.push_back( beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("UpdateAcc") ), PROPERTY_UPDATEACC, - ::getCppuType((const sal_Int16*)0), + ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND )); rProperties.push_back( beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("PageChange") ), PROPERTY_PAGE_CHANGE, - ::getCppuType((const sal_Int16*)0), + ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND )); } diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index b8fbd1b50ac0..f84a973e917e 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -154,23 +154,23 @@ enum SdDocumentSettingsPropertyHandles { OUString("IsPrintNotes"), HANDLE_PRINTNOTES, ::getBooleanCppuType(), 0, MID_PRINTER }, { OUString("IsPrintHandout"), HANDLE_PRINTHANDOUT, ::getBooleanCppuType(), 0, MID_PRINTER }, { OUString("IsPrintOutline"), HANDLE_PRINTOUTLINE, ::getBooleanCppuType(), 0, MID_PRINTER }, - { OUString("SlidesPerHandout"), HANDLE_SLIDESPERHANDOUT, ::getCppuType((const sal_Int16*)0), 0, MID_PRINTER }, + { OUString("SlidesPerHandout"), HANDLE_SLIDESPERHANDOUT, ::cppu::UnoType<sal_Int16>::get(), 0, MID_PRINTER }, { OUString("HandoutsHorizontal"), HANDLE_HANDOUTHORIZONTAL, ::getBooleanCppuType(), 0, MID_PRINTER }, { OUString(), 0, css::uno::Type(), 0, 0 } }; static PropertyMapEntry const aDrawSettingsInfoMap[] = { - { OUString("MeasureUnit"), HANDLE_MEASUREUNIT, ::getCppuType((const sal_Int16*)0), 0, 0 }, - { OUString("ScaleNumerator"), HANDLE_SCALE_NUM, ::getCppuType((const sal_Int32*)0), 0, 0 }, - { OUString("ScaleDenominator"), HANDLE_SCALE_DOM, ::getCppuType((const sal_Int32*)0), 0, 0 }, + { OUString("MeasureUnit"), HANDLE_MEASUREUNIT, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { OUString("ScaleNumerator"), HANDLE_SCALE_NUM, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { OUString("ScaleDenominator"), HANDLE_SCALE_DOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; static PropertyMapEntry const aCommonSettingsInfoMap[] = { - { OUString("DefaultTabStop"), HANDLE_TABSTOP, ::getCppuType((const sal_Int32*)0), 0, 0 }, - { OUString("PrinterName"), HANDLE_PRINTERNAME, ::getCppuType((const OUString*)0), 0, 0 }, + { OUString("DefaultTabStop"), HANDLE_TABSTOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { OUString("PrinterName"), HANDLE_PRINTERNAME, ::cppu::UnoType<OUString>::get(), 0, 0 }, { OUString("PrinterSetup"), HANDLE_PRINTERJOB, ::getCppuType((const uno::Sequence < sal_Int8 > *)0), 0, MID_PRINTER }, { OUString("IsPrintPageName"), HANDLE_PRINTPAGENAME, ::getBooleanCppuType(), 0, MID_PRINTER }, @@ -182,23 +182,23 @@ enum SdDocumentSettingsPropertyHandles { OUString("IsPrintBooklet"), HANDLE_PRINTBOOKLET, ::getBooleanCppuType(), 0, MID_PRINTER }, { OUString("IsPrintBookletFront"), HANDLE_PRINTBOOKLETFRONT, ::getBooleanCppuType(), 0, MID_PRINTER }, { OUString("IsPrintBookletBack"), HANDLE_PRINTBOOKLETBACK, ::getBooleanCppuType(), 0, MID_PRINTER }, - { OUString("PrintQuality"), HANDLE_PRINTQUALITY, ::getCppuType((const sal_Int32*)0), 0, MID_PRINTER }, - { OUString("ColorTableURL"), HANDLE_COLORTABLEURL, ::getCppuType((const OUString*)0), 0, 0 }, - { OUString("DashTableURL"), HANDLE_DASHTABLEURL, ::getCppuType((const OUString*)0), 0, 0 }, - { OUString("LineEndTableURL"), HANDLE_LINEENDTABLEURL, ::getCppuType((const OUString*)0), 0, 0 }, - { OUString("HatchTableURL"), HANDLE_HATCHTABLEURL, ::getCppuType((const OUString*)0), 0, 0 }, - { OUString("GradientTableURL"), HANDLE_GRADIENTTABLEURL, ::getCppuType((const OUString*)0), 0, 0 }, - { OUString("BitmapTableURL"), HANDLE_BITMAPTABLEURL, ::getCppuType((const OUString*)0), 0, 0 }, + { OUString("PrintQuality"), HANDLE_PRINTQUALITY, ::cppu::UnoType<sal_Int32>::get(), 0, MID_PRINTER }, + { OUString("ColorTableURL"), HANDLE_COLORTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString("DashTableURL"), HANDLE_DASHTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString("LineEndTableURL"), HANDLE_LINEENDTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString("HatchTableURL"), HANDLE_HATCHTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString("GradientTableURL"), HANDLE_GRADIENTTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString("BitmapTableURL"), HANDLE_BITMAPTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 }, { OUString("ForbiddenCharacters"), HANDLE_FORBIDDENCHARS, ::getCppuType((const Reference< XForbiddenCharacters >*)0), 0, 0 }, { OUString("ApplyUserData"), HANDLE_APPLYUSERDATA, ::getBooleanCppuType(), 0, 0 }, - { OUString("PageNumberFormat"), HANDLE_PAGENUMFMT, ::getCppuType((const sal_Int32*)0), 0, 0 }, + { OUString("PageNumberFormat"), HANDLE_PAGENUMFMT, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, { OUString("ParagraphSummation"), HANDLE_PARAGRAPHSUMMATION, ::getBooleanCppuType(), 0, 0 }, - { OUString("CharacterCompressionType"),HANDLE_CHARCOMPRESS, ::getCppuType((sal_Int16*)0), 0, 0 }, + { OUString("CharacterCompressionType"),HANDLE_CHARCOMPRESS, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, { OUString("IsKernAsianPunctuation"),HANDLE_ASIANPUNCT, ::getBooleanCppuType(), 0, 0 }, { OUString("UpdateFromTemplate"), HANDLE_UPDATEFROMTEMPLATE, ::getBooleanCppuType(), 0, 0 }, - { OUString("PrinterIndependentLayout"),HANDLE_PRINTER_INDEPENDENT_LAYOUT,::getCppuType((const sal_Int16*)0), 0, 0 }, + { OUString("PrinterIndependentLayout"),HANDLE_PRINTER_INDEPENDENT_LAYOUT,::cppu::UnoType<sal_Int16>::get(), 0, 0 }, // --> #i33095# { OUString("LoadReadonly"), HANDLE_LOAD_READONLY, ::getBooleanCppuType(), 0, 0 }, { OUString("SaveVersionOnClose"), HANDLE_SAVE_VERSION, ::getBooleanCppuType(), 0, 0 }, diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx index 40a1ebc4d49e..46b0098f0902 100644 --- a/sd/source/ui/unoidl/randomnode.cxx +++ b/sd/source/ui/unoidl/randomnode.cxx @@ -242,7 +242,7 @@ void SAL_CALL RandomAnimationNode::initialize( const Sequence< Any >& aArguments if( aArguments.getLength() != 1 ) throw IllegalArgumentException(); - if( aArguments[0].getValueType() == ::getCppuType((const sal_Int16*)0) ) + if( aArguments[0].getValueType() == ::cppu::UnoType<sal_Int16>::get() ) { aArguments[0] >>= mnPresetClass; } diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index 405251d520e5..118ec3fcb166 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -69,9 +69,9 @@ const SvxItemPropertySet* ImplGetSdLayerPropertySet() { OUString(UNO_NAME_LAYER_LOCKED), WID_LAYER_LOCKED, ::getBooleanCppuType(), 0, 0 }, { OUString(UNO_NAME_LAYER_PRINTABLE), WID_LAYER_PRINTABLE,::getBooleanCppuType(), 0, 0 }, { OUString(UNO_NAME_LAYER_VISIBLE), WID_LAYER_VISIBLE, ::getBooleanCppuType(), 0, 0 }, - { OUString(UNO_NAME_LAYER_NAME), WID_LAYER_NAME, ::getCppuType((const OUString*)0), 0, 0 }, - { OUString("Title"), WID_LAYER_TITLE, ::getCppuType((const OUString*)0), 0, 0 }, - { OUString("Description"), WID_LAYER_DESC, ::getCppuType((const OUString*)0), 0, 0 }, + { OUString(UNO_NAME_LAYER_NAME), WID_LAYER_NAME, ::cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString("Title"), WID_LAYER_TITLE, ::cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString("Description"), WID_LAYER_DESC, ::cppu::UnoType<OUString>::get(), 0, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; static SvxItemPropertySet aSDLayerPropertySet_Impl( aSdLayerPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 5ef64b302556..c0e45a4a8737 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -184,9 +184,9 @@ const SvxItemPropertySet* ImplGetDrawModelPropertySet() { { OUString("BuildId"), WID_MODEL_BUILDID, ::getCppuType(static_cast< const OUString * >(0)), 0, 0}, { OUString(sUNO_Prop_CharLocale), WID_MODEL_LANGUAGE, ::getCppuType((const lang::Locale*)0), 0, 0}, - { OUString(sUNO_Prop_TabStop), WID_MODEL_TABSTOP, ::getCppuType((const sal_Int32*)0), 0, 0}, + { OUString(sUNO_Prop_TabStop), WID_MODEL_TABSTOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString(sUNO_Prop_VisibleArea), WID_MODEL_VISAREA, ::getCppuType((const awt::Rectangle*)0), 0, 0}, - { OUString(sUNO_Prop_MapUnit), WID_MODEL_MAPUNIT, ::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, + { OUString(sUNO_Prop_MapUnit), WID_MODEL_MAPUNIT, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, { OUString(sUNO_Prop_ForbiddenCharacters), WID_MODEL_FORBCHARS, ::getCppuType((const uno::Reference< i18n::XForbiddenCharacters > *)0), beans::PropertyAttribute::READONLY, 0}, { OUString(sUNO_Prop_AutomContFocus), WID_MODEL_CONTFOCUS, ::getBooleanCppuType(), 0, 0}, { OUString(sUNO_Prop_ApplyFrmDsgnMode), WID_MODEL_DSGNMODE, ::getBooleanCppuType(), 0, 0}, diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 4062bc85452a..3a01a03801dd 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -132,8 +132,8 @@ static SdTypesCache gImplTypesCache; #define IMPRESS_MAP_ENTRIES \ { 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_BOOKMARK), WID_BOOKMARK, ::cppu::UnoType<OUString>::get(), 0, 0},\ + { OUString(UNO_NAME_OBJ_DIMCOLOR), WID_DIMCOLOR, ::cppu::UnoType<sal_Int32>::get(), 0, 0},\ { OUString(UNO_NAME_OBJ_DIMHIDE), WID_DIMHIDE, ::getBooleanCppuType(), 0, 0},\ { OUString(UNO_NAME_OBJ_DIMPREV), WID_DIMPREV, ::getBooleanCppuType(), 0, 0},\ { OUString(UNO_NAME_OBJ_EFFECT), WID_EFFECT, ::getCppuType((const presentation::AnimationEffect*)0), 0, 0},\ @@ -142,17 +142,17 @@ static SdTypesCache gImplTypesCache; { OUString(UNO_NAME_OBJ_MASTERDEPENDENT),WID_MASTERDEPEND, ::getBooleanCppuType(), 0, 0},\ { 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_PRESORDER), WID_PRESORDER, ::cppu::UnoType<sal_Int32>::get(), 0, 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_SOUNDFILE), WID_SOUNDFILE, ::cppu::UnoType<OUString>::get(), 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},\ { OUString(UNO_NAME_OBJ_TEXTEFFECT), WID_TEXTEFFECT, ::getCppuType((const presentation::AnimationEffect*)0), 0, 0},\ - { OUString(UNO_NAME_OBJ_BLUESCREEN), WID_BLUESCREEN, ::getCppuType((const sal_Int32*)0), 0, 0},\ - { OUString(UNO_NAME_OBJ_VERB), WID_VERB, ::getCppuType((const sal_Int32*)0), 0, 0},\ + { OUString(UNO_NAME_OBJ_BLUESCREEN), WID_BLUESCREEN, ::cppu::UnoType<sal_Int32>::get(), 0, 0},\ + { OUString(UNO_NAME_OBJ_VERB), WID_VERB, ::cppu::UnoType<sal_Int32>::get(), 0, 0},\ { OUString("IsAnimation"), WID_ISANIMATION, ::getBooleanCppuType(), 0, 0},\ - { OUString("NavigationOrder"), WID_NAVORDER, ::getCppuType((const sal_Int32*)0), 0, 0},\ - { OUString("PlaceholderText"), WID_PLACEHOLDERTEXT, ::getCppuType((const OUString*)0), 0, 0},\ + { OUString("NavigationOrder"), WID_NAVORDER, ::cppu::UnoType<sal_Int32>::get(), 0, 0},\ + { OUString("PlaceholderText"), WID_PLACEHOLDERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0},\ { OUString(), 0, css::uno::Type(), 0, 0 } @@ -178,10 +178,10 @@ static SdTypesCache gImplTypesCache; } #define DRAW_MAP_ENTRIES\ - { OUString(UNO_NAME_OBJ_BOOKMARK), WID_BOOKMARK, ::getCppuType((const OUString*)0), 0, 0},\ + { OUString(UNO_NAME_OBJ_BOOKMARK), WID_BOOKMARK, ::cppu::UnoType<OUString>::get(), 0, 0},\ { OUString(UNO_NAME_OBJ_CLICKACTION), WID_CLICKACTION, ::getCppuType((const presentation::ClickAction*)0),0, 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("NavigationOrder"), WID_NAVORDER, ::cppu::UnoType<sal_Int32>::get(), 0, 0},\ { OUString(), 0, css::uno::Type(), 0, 0 } static const SfxItemPropertyMapEntry* lcl_GetDraw_SdXShapePropertySimpleMap_Impl() diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 3aaa96c4b7fb..be10c835a3dc 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -106,21 +106,21 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind eP static const SfxItemPropertyMapEntry aDrawPagePropertyMap_Impl[] = { { 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}, - { OUString(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, ::getCppuType((const sal_Int32*)0), 0, 0}, - { OUString(UNO_NAME_PAGE_CHANGE), WID_PAGE_CHANGE, ::getCppuType((const sal_Int32*)0), 0, 0}, - { OUString(UNO_NAME_PAGE_DURATION), WID_PAGE_DURATION, ::getCppuType((const sal_Int32*)0), 0, 0}, + { OUString(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString(UNO_NAME_PAGE_CHANGE), WID_PAGE_CHANGE, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString(UNO_NAME_PAGE_DURATION), WID_PAGE_DURATION, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, { 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_PAGE_HEIGHT), WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, ::cppu::UnoType<sal_Int16>::get(), 0, 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_LINKDISPLAYNAME), WID_PAGE_LDNAME, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, { OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::getCppuType((const view::PaperOrientation*)0),0, 0}, { OUString(UNO_NAME_PAGE_SPEED), WID_PAGE_SPEED, ::getCppuType((const presentation::AnimationSpeed*)0), 0, 0}, - { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::getCppuType((const sal_Int32*)0), 0, 0}, + { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString(UNO_NAME_PAGE_PREVIEW), WID_PAGE_PREVIEW, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { OUString(UNO_NAME_PAGE_PREVIEWBITMAP), WID_PAGE_PREVIEWBITMAP, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { OUString(UNO_NAME_PAGE_VISIBLE), WID_PAGE_VISIBLE, ::getBooleanCppuType(), 0, 0}, @@ -128,49 +128,49 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind eP { OUString(sUNO_Prop_IsBackgroundVisible), WID_PAGE_BACKVIS, ::getBooleanCppuType(), 0, 0}, { OUString(sUNO_Prop_IsBackgroundObjectsVisible), WID_PAGE_BACKOBJVIS, ::getBooleanCppuType(), 0, 0}, { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - { OUString(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, ::getCppuType((const OUString*)0), 0, 0}, - { OUString("HighResDuration"), WID_PAGE_HIGHRESDURATION, ::getCppuType((const double*)0), 0, 0}, + { OUString(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, ::cppu::UnoType<OUString>::get(), 0, 0}, + { OUString("HighResDuration"), WID_PAGE_HIGHRESDURATION, ::cppu::UnoType<double>::get(), 0, 0}, { OUString("IsBackgroundDark") , WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, { OUString("IsFooterVisible"), WID_PAGE_FOOTERVISIBLE, ::getBooleanCppuType(), 0, 0}, - { OUString("FooterText"), WID_PAGE_FOOTERTEXT, ::getCppuType((const OUString*)0), 0, 0}, + { OUString("FooterText"), WID_PAGE_FOOTERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, { OUString("IsPageNumberVisible"), WID_PAGE_PAGENUMBERVISIBLE, ::getBooleanCppuType(), 0, 0}, { OUString("IsDateTimeVisible"), WID_PAGE_DATETIMEVISIBLE, ::getBooleanCppuType(), 0, 0}, { OUString("IsDateTimeFixed"), WID_PAGE_DATETIMEFIXED, ::getBooleanCppuType(), 0, 0}, - { OUString("DateTimeText"), WID_PAGE_DATETIMETEXT, ::getCppuType((const OUString*)0), 0, 0}, - { OUString("DateTimeFormat"), WID_PAGE_DATETIMEFORMAT, ::getCppuType((const sal_Int32*)0), 0, 0}, - { OUString("TransitionType"), WID_TRANSITION_TYPE, ::getCppuType((const sal_Int16*)0), 0, 0}, - { OUString("TransitionSubtype"), WID_TRANSITION_SUBTYPE, ::getCppuType((const sal_Int16*)0), 0, 0}, + { OUString("DateTimeText"), WID_PAGE_DATETIMETEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, + { OUString("DateTimeFormat"), WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString("TransitionType"), WID_TRANSITION_TYPE, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, + { OUString("TransitionSubtype"), WID_TRANSITION_SUBTYPE, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, { OUString("TransitionDirection"), WID_TRANSITION_DIRECTION, ::getCppuType((const sal_Bool*)0), 0, 0}, - { OUString("TransitionFadeColor"), WID_TRANSITION_FADE_COLOR, ::getCppuType((const sal_Int32*)0), 0, 0}, - { OUString("TransitionDuration"), WID_TRANSITION_DURATION, ::getCppuType((const double*)0), 0, 0}, + { OUString("TransitionFadeColor"), WID_TRANSITION_FADE_COLOR, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString("TransitionDuration"), WID_TRANSITION_DURATION, ::cppu::UnoType<double>::get(), 0, 0}, { OUString("LoopSound"), WID_LOOP_SOUND, ::getBooleanCppuType(), 0, 0}, { OUString("NavigationOrder"), WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; #define DRAW_PAGE_NOTES_PROPERTIES \ - { 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_PAGE_LAYOUT), WID_PAGE_LAYOUT, ::getCppuType((const sal_Int16*)0), 0, 0}, \ + { OUString(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, ::cppu::UnoType<sal_Int16>::get(), 0, 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_LINKDISPLAYNAME), WID_PAGE_LDNAME, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0}, \ + { OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, \ { OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::getCppuType((const view::PaperOrientation*)0),0, 0}, \ - { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::getCppuType((const sal_Int32*)0), 0, 0}, \ + { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},\ { OUString("IsHeaderVisible"), WID_PAGE_HEADERVISIBLE, ::getBooleanCppuType(), 0, 0}, \ - { OUString("HeaderText"), WID_PAGE_HEADERTEXT, ::getCppuType((const OUString*)0), 0, 0}, \ + { OUString("HeaderText"), WID_PAGE_HEADERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, \ { OUString("IsBackgroundDark"), WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, \ { OUString("IsFooterVisible"), WID_PAGE_FOOTERVISIBLE, ::getBooleanCppuType(), 0, 0}, \ - { OUString("FooterText"), WID_PAGE_FOOTERTEXT, ::getCppuType((const OUString*)0), 0, 0}, \ + { OUString("FooterText"), WID_PAGE_FOOTERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, \ { OUString("IsPageNumberVisible"), WID_PAGE_PAGENUMBERVISIBLE, ::getBooleanCppuType(), 0, 0}, \ { OUString("IsDateTimeVisible"), WID_PAGE_DATETIMEVISIBLE, ::getBooleanCppuType(), 0, 0}, \ { OUString("IsDateTimeFixed"), WID_PAGE_DATETIMEFIXED, ::getBooleanCppuType(), 0, 0}, \ - { OUString("DateTimeText"), WID_PAGE_DATETIMETEXT, ::getCppuType((const OUString*)0), 0, 0}, \ - { OUString("DateTimeFormat"), WID_PAGE_DATETIMEFORMAT, ::getCppuType((const sal_Int32*)0), 0, 0}, \ + { OUString("DateTimeText"), WID_PAGE_DATETIMETEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, \ + { OUString("DateTimeFormat"), WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ { OUString("NavigationOrder"), WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0}, \ { OUString(), 0, css::uno::Type(), 0, 0 } @@ -186,20 +186,20 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind eP }; #define GRAPHIC_PAGE_PROPERTIES \ - { 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_PAGE_BOTTOM), WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 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_LINKDISPLAYNAME), WID_PAGE_LDNAME, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0}, \ + { OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, \ { OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::getCppuType((const view::PaperOrientation*)0),0, 0}, \ - { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::getCppuType((const sal_Int32*)0), 0, 0}, \ + { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ { OUString(UNO_NAME_PAGE_PREVIEW), WID_PAGE_PREVIEW, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ { OUString(UNO_NAME_PAGE_PREVIEWBITMAP), WID_PAGE_PREVIEWBITMAP, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},\ { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, \ - { OUString(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, ::getCppuType((const OUString*)0), 0, 0}, \ + { OUString(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, ::cppu::UnoType<OUString>::get(), 0, 0}, \ { OUString("IsBackgroundDark"), WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, \ { OUString("NavigationOrder"), WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0}, \ { OUString(), 0, css::uno::Type(), 0, 0 } @@ -260,16 +260,16 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind ) static const SfxItemPropertyMapEntry aMasterPagePropertyMap_Impl[] = { { 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_PAGE_BOTTOM), WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 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_LINKDISPLAYNAME), WID_PAGE_LDNAME, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, { OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::getCppuType((const view::PaperOrientation*)0),0, 0}, - { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::getCppuType((const sal_Int32*)0), 0, 0}, + { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString("BackgroundFullSize"), WID_PAGE_BACKFULL, ::getBooleanCppuType(), 0, 0}, { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, { OUString("IsBackgroundDark"), WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, @@ -278,26 +278,26 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind ) static const SfxItemPropertyMapEntry aHandoutMasterPagePropertyMap_Impl[] = { - { 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_PAGE_BOTTOM), WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::getCppuType((const view::PaperOrientation*)0),0, 0}, - { OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::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_PAGE_NUMBER), WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, { OUString("IsBackgroundDark"), WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, { OUString("IsHeaderVisible"), WID_PAGE_HEADERVISIBLE, ::getBooleanCppuType(), 0, 0}, - { OUString("HeaderText"), WID_PAGE_HEADERTEXT, ::getCppuType((const OUString*)0), 0, 0}, + { OUString("HeaderText"), WID_PAGE_HEADERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, { OUString("IsFooterVisible"), WID_PAGE_FOOTERVISIBLE, ::getBooleanCppuType(), 0, 0}, - { OUString("FooterText"), WID_PAGE_FOOTERTEXT, ::getCppuType((const OUString*)0), 0, 0}, + { OUString("FooterText"), WID_PAGE_FOOTERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, { OUString("IsPageNumberVisible"), WID_PAGE_PAGENUMBERVISIBLE, ::getBooleanCppuType(), 0, 0}, { OUString("IsDateTimeVisible"), WID_PAGE_DATETIMEVISIBLE, ::getBooleanCppuType(), 0, 0}, { OUString("IsDateTimeFixed"), WID_PAGE_DATETIMEFIXED, ::getBooleanCppuType(), 0, 0}, - { OUString("DateTimeText"), WID_PAGE_DATETIMETEXT, ::getCppuType((const OUString*)0), 0, 0}, - { OUString("DateTimeFormat"), WID_PAGE_DATETIMEFORMAT, ::getCppuType((const sal_Int32*)0), 0, 0}, + { OUString("DateTimeText"), WID_PAGE_DATETIMETEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, + { OUString("DateTimeFormat"), WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index c78c7b1b0fa3..9db6ca3bf30a 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -129,7 +129,7 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) { setPropertyValue( aPropertyName, *pAny ); } - else if ( ( pAny->getValueType() == ::getCppuType((const OUString*)0) ) && + else if ( ( pAny->getValueType() == ::cppu::UnoType<OUString>::get() ) && ( aIt->nMemberId == MID_NAME ) ) { setPropertyValue( aPropertyName, *pAny ); @@ -143,7 +143,7 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) { setPropertyValue( aPropertyName, *pAny ); } - else if ( ( pAny->getValueType() == ::getCppuType((const OUString*)0) ) && + else if ( ( pAny->getValueType() == ::cppu::UnoType<OUString>::get() ) && ( aIt->nMemberId == MID_NAME ) ) { setPropertyValue( aPropertyName, *pAny ); @@ -158,7 +158,7 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) { setPropertyValue( aPropertyName, *pAny ); } - else if ( ( pAny->getValueType() == ::getCppuType((const OUString*)0) ) && + else if ( ( pAny->getValueType() == ::cppu::UnoType<OUString>::get() ) && ( ( aIt->nMemberId == MID_NAME ) || ( aIt->nMemberId == MID_GRAFURL ) ) ) { setPropertyValue( aPropertyName, *pAny ); diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 51d0d656248c..8e904c20f64c 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -76,10 +76,10 @@ static const SvxItemPropertySet* ImplGetSvxCellPropertySet() { 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, ::getCppuType( (::com::sun::star::text::WritingMode*) 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_LEFTDIST), SDRATTR_TEXT_LEFTDIST, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_TEXT_LOWERDIST), SDRATTR_TEXT_LOWERDIST, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_TEXT_RIGHTDIST), SDRATTR_TEXT_RIGHTDIST, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_TEXT_UPPERDIST), SDRATTR_TEXT_UPPERDIST, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ + { 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_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, ::getCppuType((const ::com::sun::star::drawing::TextVerticalAdjust*)0), 0, 0},\ { OUString(UNO_NAME_TEXT_WORDWRAP), SDRATTR_TEXT_WORDWRAP, ::getBooleanCppuType(), 0, 0}, \ @@ -988,7 +988,7 @@ Any Cell::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMa if( pMap->aType != aAny.getValueType() ) { // since the sfx uint16 item now exports a sal_Int32, we may have to fix this here - if( ( pMap->aType == ::getCppuType((const sal_Int16*)0)) && aAny.getValueType() == ::getCppuType((const sal_Int32*)0) ) + if( ( pMap->aType == ::cppu::UnoType<sal_Int16>::get()) && aAny.getValueType() == ::cppu::UnoType<sal_Int32>::get() ) { sal_Int32 nValue = 0; aAny >>= nValue; diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx index e2ba8467e99c..2909f3e5d936 100644 --- a/svx/source/table/tablecolumn.cxx +++ b/svx/source/table/tablecolumn.cxx @@ -255,7 +255,7 @@ rtl::Reference< FastPropertySetInfo > TableColumn::getStaticPropertySetInfo() aProperties[0].Name = "Width"; aProperties[0].Handle = Property_Width; - aProperties[0].Type = ::getCppuType((const sal_Int32*)0); + aProperties[0].Type = ::cppu::UnoType<sal_Int32>::get(); aProperties[0].Attributes = 0; aProperties[1].Name = "OptimalWidth"; @@ -275,7 +275,7 @@ rtl::Reference< FastPropertySetInfo > TableColumn::getStaticPropertySetInfo() aProperties[4].Name = "Size"; aProperties[4].Handle = Property_Width; - aProperties[4].Type = ::getCppuType((const sal_Int32*)0); + aProperties[4].Type = ::cppu::UnoType<sal_Int32>::get(); aProperties[4].Attributes = 0; aProperties[5].Name = "OptimalSize"; diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx index 7434db61fb0a..c213e495ab40 100644 --- a/svx/source/table/tablerow.cxx +++ b/svx/source/table/tablerow.cxx @@ -329,7 +329,7 @@ rtl::Reference< FastPropertySetInfo > TableRow::getStaticPropertySetInfo() aProperties[0].Name = "Height"; aProperties[0].Handle = Property_Height; - aProperties[0].Type = ::getCppuType((const sal_Int32*)0); + aProperties[0].Type = ::cppu::UnoType<sal_Int32>::get(); aProperties[0].Attributes = 0; aProperties[1].Name = "OptimalHeight"; @@ -349,7 +349,7 @@ rtl::Reference< FastPropertySetInfo > TableRow::getStaticPropertySetInfo() aProperties[4].Name = "Size"; aProperties[4].Handle = Property_Height; - aProperties[4].Type = ::getCppuType((const sal_Int32*)0); + aProperties[4].Type = ::cppu::UnoType<sal_Int32>::get(); aProperties[4].Attributes = 0; aProperties[5].Name = "OptimalSize"; diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index 3ef214670aa3..a0486428aeb2 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -262,7 +262,7 @@ sal_Bool SAL_CALL NamespaceMap::hasByName( const OUString& aName ) throw (Runtim // XElementAccess Type SAL_CALL NamespaceMap::getElementType() throw (RuntimeException, std::exception) { - return ::getCppuType( (const OUString*) 0 ); + return ::cppu::UnoType<OUString>::get(); } sal_Bool SAL_CALL NamespaceMap::hasElements() throw (RuntimeException, std::exception) diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 597075347b8c..5d30c42b8a46 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -293,7 +293,7 @@ XPropertyEntry* SvxUnoXColorTable::getEntry( const OUString& rName, const uno::A uno::Type SAL_CALL SvxUnoXColorTable::getElementType() throw( uno::RuntimeException, std::exception ) { - return ::getCppuType((const sal_Int32*)0); + return ::cppu::UnoType<sal_Int32>::get(); } // XServiceInfo @@ -678,7 +678,7 @@ XPropertyEntry* SvxUnoXBitmapTable::getEntry( const OUString& rName, const uno:: uno::Type SAL_CALL SvxUnoXBitmapTable::getElementType() throw( uno::RuntimeException, std::exception ) { - return ::getCppuType((const OUString*)0); + return ::cppu::UnoType<OUString>::get(); } // XServiceInfo diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx index cd208a8624ac..938d3cc79d28 100644 --- a/svx/source/unodraw/unobtabl.cxx +++ b/svx/source/unodraw/unobtabl.cxx @@ -100,7 +100,7 @@ NameOrIndex* SvxUnoBitmapTable::createItem() const throw() uno::Type SAL_CALL SvxUnoBitmapTable::getElementType( ) throw( uno::RuntimeException, std::exception ) { - return ::getCppuType( (const OUString*)0 ); + return ::cppu::UnoType<OUString>::get(); } /** diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx index bb910a4a6cad..759435cac5dd 100644 --- a/svx/source/unodraw/unoctabl.cxx +++ b/svx/source/unodraw/unoctabl.cxx @@ -169,7 +169,7 @@ sal_Bool SAL_CALL SvxUnoColorTable::hasByName( const OUString& aName ) uno::Type SAL_CALL SvxUnoColorTable::getElementType() throw( uno::RuntimeException, std::exception ) { - return ::getCppuType((const sal_Int32*)0); + return ::cppu::UnoType<sal_Int32>::get(); } sal_Bool SAL_CALL SvxUnoColorTable::hasElements() diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index ad3a3e562925..5575e3e7fa10 100644 --- a/svx/source/unodraw/unopool.cxx +++ b/svx/source/unodraw/unopool.cxx @@ -139,7 +139,7 @@ void SvxUnoDrawPool::getAny( SfxItemPool* pPool, const comphelper::PropertyMapEn SvxUnoConvertToMM( eMapUnit, rValue ); } // convert int32 to correct enum type if needed - else if ( pEntry->maType.getTypeClass() == uno::TypeClass_ENUM && rValue.getValueType() == ::getCppuType((const sal_Int32*)0) ) + else if ( pEntry->maType.getTypeClass() == uno::TypeClass_ENUM && rValue.getValueType() == ::cppu::UnoType<sal_Int32>::get() ) { sal_Int32 nEnum; rValue >>= nEnum; diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index db97e84a179a..92bdcfbd6c1e 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -457,17 +457,17 @@ SfxItemPropertyMapEntry const * ImplGetSvxOle2PropertyMap() TEXT_PROPERTIES FONTWORK_PROPERTIES - { OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , ::getCppuType(( const OUString*)0), 0, 0 }, + { OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , ::cppu::UnoType<OUString>::get(), 0, 0 }, { OUString("Model"), OWN_ATTR_OLEMODEL , ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { OUString("EmbeddedObject"), OWN_ATTR_OLE_EMBEDDED_OBJECT, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { OUString("EmbeddedObjectNoNewClient"),OWN_ATTR_OLE_EMBEDDED_OBJECT_NONEWCLIENT, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { OUString("OriginalSize"), OWN_ATTR_OLESIZE , ::getCppuType(( const ::com::sun::star::awt::Size*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("CLSID"), OWN_ATTR_CLSID , ::getCppuType(( const OUString*)0), 0, 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("VisibleArea"), OWN_ATTR_OLE_VISAREA , ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0}, { OUString("Aspect"), OWN_ATTR_OLE_ASPECT , ::getCppuType((const sal_Int64*)0), 0, 0}, - { OUString(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , ::getCppuType(( const OUString*)0), 0, 0 }, - { OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , ::getCppuType(( const OUString*)0), 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_GRAPHOBJ_GRAPHIC), OWN_ATTR_VALUE_GRAPHIC , ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic>*)0), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -479,26 +479,26 @@ SfxItemPropertyMapEntry const * ImplGetSvxPluginPropertyMap() { static SfxItemPropertyMapEntry const aPluginPropertyMap_Impl[] = { - { OUString("PluginMimeType"), OWN_ATTR_PLUGIN_MIMETYPE , ::getCppuType((const OUString*)0), 0, 0}, - { OUString("PluginURL"), OWN_ATTR_PLUGIN_URL , ::getCppuType((const OUString*)0), 0, 0}, + { 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("Transformation"), OWN_ATTR_TRANSFORMATION , ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, - { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , ::getCppuType((const sal_Int32*)0), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , ::getCppuType((const sal_Int16*)0), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , ::getCppuType((const OUString*)0), 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 , ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , ::getCppuType(( const OUString*)0), ::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("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , ::getCppuType(( const OUString*)0), 0, 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_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , ::getCppuType(( const OUString*)0), 0, 0 }, - { OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , ::getCppuType(( const OUString*)0), 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, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { OUString("VisibleArea"), OWN_ATTR_OLE_VISAREA , ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0}, // #i68101# - { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::getCppuType((const OUString*)0), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::getCppuType((const OUString*)0), 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(), 0, css::uno::Type(), 0, 0 } }; @@ -510,29 +510,29 @@ SfxItemPropertyMapEntry const * ImplGetSvxFramePropertyMap() //TODO/LATER: new properties for ScrollingMode and DefaultBorder static SfxItemPropertyMapEntry const aFramePropertyMap_Impl[] = { - { OUString("FrameURL"), OWN_ATTR_FRAME_URL , ::getCppuType((const OUString*)0), 0, 0}, - { OUString("FrameName"), OWN_ATTR_FRAME_NAME , ::getCppuType((const OUString*)0), 0, 0}, + { 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("FrameMarginWidth"), OWN_ATTR_FRAME_MARGIN_WIDTH , ::getCppuType((const sal_Int32*)0), 0, 0}, - { OUString("FrameMarginHeight"), OWN_ATTR_FRAME_MARGIN_HEIGHT, ::getCppuType((const sal_Int32*)0), 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 , ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, - { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , ::getCppuType((const sal_Int32*)0), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , ::getCppuType((const sal_Int16*)0), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , ::getCppuType((const OUString*)0), 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 , ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , ::getCppuType(( const OUString*)0), ::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("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , ::getCppuType(( const OUString*)0), 0, 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_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , ::getCppuType(( const OUString*)0), 0, 0 }, - { OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , ::getCppuType(( const OUString*)0), 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, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { OUString("VisibleArea"), OWN_ATTR_OLE_VISAREA , ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0}, // #i68101# - { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::getCppuType((const OUString*)0), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::getCppuType((const OUString*)0), 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(), 0, css::uno::Type(), 0, 0 } }; @@ -543,29 +543,29 @@ SfxItemPropertyMapEntry const * ImplGetSvxAppletPropertyMap() { static SfxItemPropertyMapEntry const aAppletPropertyMap_Impl[] = { - { OUString("AppletCodeBase"), OWN_ATTR_APPLET_CODEBASE , ::getCppuType(( const OUString*)0), 0, 0}, - { OUString("AppletName"), OWN_ATTR_APPLET_NAME , ::getCppuType(( const OUString*)0), 0, 0}, - { OUString("AppletCode"), OWN_ATTR_APPLET_CODE , ::getCppuType(( const OUString*)0), 0, 0}, + { 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("AppletDocBase"), OWN_ATTR_APPLET_DOCBASE , ::getCppuType(( const OUString*)0), 0, 0}, + { OUString("AppletDocBase"), OWN_ATTR_APPLET_DOCBASE , ::cppu::UnoType<OUString>::get(), 0, 0}, { OUString("AppletIsScript"), OWN_ATTR_APPLET_ISSCRIPT , ::getBooleanCppuType(), 0, 0 }, { OUString("Transformation"), OWN_ATTR_TRANSFORMATION , ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, - { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , ::getCppuType((const sal_Int32*)0), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , ::getCppuType((const sal_Int16*)0), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , ::getCppuType((const OUString*)0), 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 , ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , ::getCppuType(( const OUString*)0), ::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("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , ::getCppuType(( const OUString*)0), 0, 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_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , ::getCppuType(( const OUString*)0), 0, 0 }, - { OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , ::getCppuType(( const OUString*)0), 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, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { OUString("VisibleArea"), OWN_ATTR_OLE_VISAREA , ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0}, // #i68101# - { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::getCppuType((const OUString*)0), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::getCppuType((const OUString*)0), 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(), 0, css::uno::Type(), 0, 0 } }; @@ -577,46 +577,46 @@ SfxItemPropertyMapEntry const * ImplGetSvxControlShapePropertyMap() static SfxItemPropertyMapEntry const aControlPropertyMap_Impl[] = { // the following properties are mapped to the XControl Model of this shape - { OUString(UNO_NAME_EDIT_CHAR_FONTNAME), 0, ::getCppuType((const OUString*)0), 0, 0 }, - { OUString(UNO_NAME_EDIT_CHAR_FONTSTYLENAME), 0, ::getCppuType((const OUString*)0), 0, 0 }, - { OUString(UNO_NAME_EDIT_CHAR_FONTFAMILY), 0, ::getCppuType((const sal_Int16*)0), 0, 0 }, - { OUString(UNO_NAME_EDIT_CHAR_FONTCHARSET), 0, ::getCppuType((const sal_Int16*)0), 0, 0 }, + { OUString(UNO_NAME_EDIT_CHAR_FONTNAME), 0, ::cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString(UNO_NAME_EDIT_CHAR_FONTSTYLENAME), 0, ::cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString(UNO_NAME_EDIT_CHAR_FONTFAMILY), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { OUString(UNO_NAME_EDIT_CHAR_FONTCHARSET), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, { OUString(UNO_NAME_EDIT_CHAR_HEIGHT), 0, ::getCppuType((const float*)0), 0, 0 }, - { OUString(UNO_NAME_EDIT_CHAR_FONTPITCH), 0, ::getCppuType((const sal_Int16*)0), 0, 0 }, + { OUString(UNO_NAME_EDIT_CHAR_FONTPITCH), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, { OUString(UNO_NAME_EDIT_CHAR_POSTURE), 0, ::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, 0 }, { OUString(UNO_NAME_EDIT_CHAR_WEIGHT), 0, ::getCppuType((const float*)0), 0, 0 }, - { OUString(UNO_NAME_EDIT_CHAR_UNDERLINE), 0, ::getCppuType((const sal_Int16*)0), 0, 0 }, - { OUString(UNO_NAME_EDIT_CHAR_STRIKEOUT), 0, ::getCppuType((const sal_Int16*)0), 0, 0}, - { OUString(UNO_NAME_EDIT_CHAR_CASEMAP), 0, ::getCppuType((const sal_Int16*)0), 0, 0 }, - { OUString(UNO_NAME_EDIT_CHAR_COLOR), 0, ::getCppuType((const sal_Int32*)0), 0, 0 }, - { OUString("CharRelief"), 0, ::getCppuType((const sal_Int16*)0), 0, 0 }, - { OUString("CharUnderlineColor"), 0, ::getCppuType((const sal_Int32*)0), 0, 0 }, - { OUString("CharKerning"), 0, ::getCppuType((const sal_Int16*)0), 0, 0 }, + { OUString(UNO_NAME_EDIT_CHAR_UNDERLINE), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { OUString(UNO_NAME_EDIT_CHAR_STRIKEOUT), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, + { OUString(UNO_NAME_EDIT_CHAR_CASEMAP), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { OUString(UNO_NAME_EDIT_CHAR_COLOR), 0, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { 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(UNO_NAME_EDIT_PARA_ADJUST), 0, ::getCppuType((const sal_Int16*)0), 0, 0 }, + { OUString(UNO_NAME_EDIT_PARA_ADJUST), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, { OUString("TextVerticalAdjust"), 0, ::getCppuType((const TextVerticalAdjust*)0), MAYBEVOID, 0 }, - { OUString("ControlBackground"), 0, ::getCppuType((const sal_Int32*)0), 0, 0 }, - { OUString("ControlBorder"), 0, ::getCppuType((const sal_Int16*)0), 0, 0 }, - { OUString("ControlBorderColor"), 0, ::getCppuType((const sal_Int32*)0), 0, 0 }, - { OUString("ControlSymbolColor"), 0, ::getCppuType((const sal_Int16*)0), 0, 0 }, - { OUString("ImageScaleMode"), 0, ::getCppuType((const sal_Int16*)0), 0, 0 }, + { OUString("ControlBackground"), 0, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { OUString("ControlBorder"), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { 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("ControlTextEmphasis"), 0, ::getCppuType((const sal_Int16*)0), 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 { OUString("Transformation"), OWN_ATTR_TRANSFORMATION , ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, - { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , ::getCppuType((const sal_Int32*)0), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , ::getCppuType((const sal_Int16*)0), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , ::getCppuType((const OUString*)0), 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 , ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , ::getCppuType(( const OUString*)0), ::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("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::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(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, // #i68101# - { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::getCppuType((const OUString*)0), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::getCppuType((const OUString*)0), 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}, // #i112587# { OUString(UNO_NAME_MISC_OBJ_PRINTABLE), SDRATTR_OBJPRINTABLE , ::getBooleanCppuType(), 0, 0}, { OUString("Visible"), SDRATTR_OBJVISIBLE , ::getBooleanCppuType(), 0, 0}, @@ -631,19 +631,19 @@ SfxItemPropertyMapEntry const * ImplGetSvxPageShapePropertyMap() { static SfxItemPropertyMapEntry const aPageShapePropertyMap_Impl[] = { - { OUString("PageNumber"), OWN_ATTR_PAGE_NUMBER , ::getCppuType((const sal_Int32*)0), 0, 0}, + { OUString("PageNumber"), OWN_ATTR_PAGE_NUMBER , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString("Transformation"), OWN_ATTR_TRANSFORMATION , ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, - { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , ::getCppuType((const sal_Int32*)0), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , ::getCppuType((const sal_Int16*)0), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , ::getCppuType((const OUString*)0), 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 , ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , ::getCppuType(( const OUString*)0), ::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_BOUNDRECT), OWN_ATTR_BOUNDRECT, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, // #i68101# - { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::getCppuType((const OUString*)0), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::getCppuType((const OUString*)0), 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(), 0, css::uno::Type(), 0, 0 } }; @@ -655,15 +655,15 @@ SfxItemPropertyMapEntry const * ImplGetSvxCaptionPropertyMap() static SfxItemPropertyMapEntry const aCaptionPropertyMap_Impl[] = { { OUString("CaptionPoint"), OWN_ATTR_CAPTION_POINT, ::getCppuType((const com::sun::star::awt::Point*)0), 0, 0 }, - { OUString("CaptionType"), SDRATTR_CAPTIONTYPE, ::getCppuType((const sal_Int16*)0), 0, 0}, + { OUString("CaptionType"), SDRATTR_CAPTIONTYPE, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, { OUString("CaptionIsFixedAngle"), SDRATTR_CAPTIONFIXEDANGLE, ::getBooleanCppuType(), 0, 0}, - { OUString("CaptionAngle"), SDRATTR_CAPTIONANGLE, ::getCppuType((const sal_Int32*)0), 0, 0}, - { OUString("CaptionGap"), SDRATTR_CAPTIONGAP, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, - { OUString("CaptionEscapeDirection"), SDRATTR_CAPTIONESCDIR, ::getCppuType((const sal_Int32*)0), 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("CaptionEscapeRelative"), SDRATTR_CAPTIONESCREL, ::getCppuType((const sal_Int32*)0), 0, 0}, - { OUString("CaptionEscapeAbsolute"), SDRATTR_CAPTIONESCABS, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, - { OUString("CaptionLineLength"), SDRATTR_CAPTIONLINELEN, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, + { 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}, EDGERADIUS_PROPERTIES FILL_PROPERTIES @@ -688,10 +688,10 @@ SfxItemPropertyMapEntry const * ImplGetSvxCustomShapePropertyMap() { static SfxItemPropertyMapEntry const aCustomShapePropertyMap_Impl[] = { - { OUString("CustomShapeEngine"), SDRATTR_CUSTOMSHAPE_ENGINE, ::getCppuType((const OUString*)0), 0, 0 }, - { OUString("CustomShapeData"), SDRATTR_CUSTOMSHAPE_DATA, ::getCppuType((const OUString*)0), 0, 0 }, + { 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("CustomShapeGraphicURL"), SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, ::getCppuType((const OUString*)0), 0, 0}, + { OUString("CustomShapeGraphicURL"), SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, ::cppu::UnoType<OUString>::get(), 0, 0}, CUSTOMSHAPE_PROPERTIES FILL_PROPERTIES LINE_PROPERTIES @@ -712,27 +712,27 @@ SfxItemPropertyMapEntry const * ImplGetSvxMediaShapePropertyMap() { static SfxItemPropertyMapEntry const aMediaShapePropertyMap_Impl[] = { - { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER, ::getCppuType((const sal_Int32*)0), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID, ::getCppuType((const sal_Int16*)0), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME, ::getCppuType((const OUString*)0), 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, ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME, ::getCppuType(( const OUString*)0), ::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, ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, - { OUString("MediaURL"), OWN_ATTR_MEDIA_URL, ::getCppuType((const OUString*)0), 0, 0}, + { OUString("MediaURL"), OWN_ATTR_MEDIA_URL, ::cppu::UnoType<OUString>::get(), 0, 0}, { OUString("PreferredSize"), OWN_ATTR_MEDIA_PREFERREDSIZE, ::getCppuType((const ::com::sun::star::awt::Size*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { OUString("Loop"), OWN_ATTR_MEDIA_LOOP, ::getCppuType((const sal_Bool*)0), 0, 0}, { OUString("Mute"), OWN_ATTR_MEDIA_MUTE, ::getCppuType((const sal_Bool*)0), 0, 0}, - { OUString("VolumeDB"), OWN_ATTR_MEDIA_VOLUMEDB, ::getCppuType((const sal_Int16*)0), 0, 0}, + { OUString("VolumeDB"), OWN_ATTR_MEDIA_VOLUMEDB, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, { OUString("Zoom"), OWN_ATTR_MEDIA_ZOOM, ::getCppuType((const ::com::sun::star::media::ZoomLevel*)0), 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_BOUNDRECT), OWN_ATTR_BOUNDRECT, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, // #i68101# - { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::getCppuType((const OUString*)0), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::getCppuType((const OUString*)0), 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("PrivateStream"), OWN_ATTR_MEDIA_STREAM, cppu::UnoType<css::io::XInputStream>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - {OUString("PrivateTempFileURL"), OWN_ATTR_MEDIA_TEMPFILEURL, ::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("MediaMimeType"), OWN_ATTR_MEDIA_MIMETYPE, ::getCppuType((const OUString*)0), 0, 0}, + {OUString("PrivateTempFileURL"), OWN_ATTR_MEDIA_TEMPFILEURL, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("MediaMimeType"), OWN_ATTR_MEDIA_MIMETYPE, ::cppu::UnoType<OUString>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -743,18 +743,18 @@ SfxItemPropertyMapEntry const * ImplGetSvxTableShapePropertyMap() { static SfxItemPropertyMapEntry const aTableShapePropertyMap_Impl[] = { - { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER, ::getCppuType((const sal_Int32*)0), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID, ::getCppuType((const sal_Int16*)0), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME, ::getCppuType((const OUString*)0), 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<css::awt::XBitmap>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME, ::getCppuType(( const OUString*)0), ::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, ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 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_BOUNDRECT), OWN_ATTR_BOUNDRECT, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { OUString(UNO_NAME_MISC_OBJ_NAME), SDRATTR_OBJECTNAME, ::getCppuType((const ::rtl::OUString*)0), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::getCppuType((const OUString*)0), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::getCppuType((const OUString*)0), 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}, diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index c0df7549300e..bd389bc6d365 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -2026,7 +2026,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE if( pMap->aType != aAny.getValueType() ) { // since the sfx uint16 item now exports a sal_Int32, we may have to fix this here - if( ( pMap->aType == ::getCppuType((const sal_Int16*)0)) && aAny.getValueType() == ::getCppuType((const sal_Int32*)0) ) + if( ( pMap->aType == ::cppu::UnoType<sal_Int16>::get()) && aAny.getValueType() == ::cppu::UnoType<sal_Int32>::get() ) { sal_Int32 nValue = 0; aAny >>= nValue; diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index bce885e94a86..50251c09b46d 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -469,7 +469,7 @@ SvXMLImportContext *SvxXMLXTableImport::CreateContext( sal_uInt16 nPrefix, const if ( rLocalName == "color-table" ) { - if( aType == ::getCppuType((const sal_Int32*)0) ) + if( aType == ::cppu::UnoType<sal_Int32>::get() ) return new SvxXMLTableImportContext( *this, nPrefix, rLocalName, xAttrList, stice_color, mrTable, bOOoFormat ); } else if ( rLocalName == "marker-table" ) @@ -494,7 +494,7 @@ SvXMLImportContext *SvxXMLXTableImport::CreateContext( sal_uInt16 nPrefix, const } else if ( rLocalName == "bitmap-table" ) { - if( aType == ::getCppuType((const OUString*)0)) + if( aType == ::cppu::UnoType<OUString>::get()) return new SvxXMLTableImportContext( *this, nPrefix, rLocalName, xAttrList, stice_bitmap, mrTable, bOOoFormat ); } } diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx index c5ded1779349..944b48ed384c 100644 --- a/sw/source/core/fields/textapi.cxx +++ b/sw/source/core/fields/textapi.cxx @@ -40,7 +40,7 @@ static const SvxItemPropertySet* ImplGetSvxTextPortionPropertySet() {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 }, + ::cppu::UnoType<OUString>::get(), 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, diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index 8b89a2ef9325..446e104488ca 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -341,7 +341,7 @@ bool SwFmtINetFmt::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) else { // all string properties: - if(rVal.getValueType() != ::getCppuType((OUString*)0)) + if(rVal.getValueType() != ::cppu::UnoType<OUString>::get()) return false; switch(nMemberId) diff --git a/sw/source/core/uibase/dbui/mailmergehelper.cxx b/sw/source/core/uibase/dbui/mailmergehelper.cxx index 29534423fae2..1d3826ac745e 100644 --- a/sw/source/core/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/core/uibase/dbui/mailmergehelper.cxx @@ -727,7 +727,7 @@ uno::Sequence< datatransfer::DataFlavor > SwMailTransferable::getTransferDataFla aRet[0].MimeType = m_aMimeType; if( m_bIsBody ) { - aRet[0].DataType = getCppuType((OUString*)0); + aRet[0].DataType = cppu::UnoType<OUString>::get(); } else { diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 9ee4087ce328..722910248734 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -225,7 +225,7 @@ public: // XElemenAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { - return ::getCppuType((const OUString*)0); + return ::cppu::UnoType<OUString>::get(); } virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE { diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 8d60f0111e22..fb8fce715e7f 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -2281,7 +2281,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) throw uno::RuntimeException(); //UUUU - if(pEntry && pEntry->aType == ::getCppuType((const sal_Int16*)0) && pEntry->aType != aAny.getValueType()) + if(pEntry && pEntry->aType == ::cppu::UnoType<sal_Int16>::get() && pEntry->aType != aAny.getValueType()) { // since the sfx uint16 item now exports a sal_Int32, we may have to fix this here sal_Int32 nValue = 0; diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 32c1c7aca76c..3b0d8ce78e0e 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -2827,7 +2827,7 @@ bool SwUnoCursorHelper::ConvertSortProperties( sal_uInt16 nIndex = rPropName[17]; nIndex -= '0'; sal_Int16 nCol = -1; - if (aValue.getValueType() == ::getCppuType((const sal_Int16*)0) + if (aValue.getValueType() == ::cppu::UnoType<sal_Int16>::get() && nIndex < 3) { aValue >>= nCol; diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 7abf06178c8a..790b4eaaf753 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -113,18 +113,18 @@ const SfxItemPropertySet* GetFootnoteSet() { static const SfxItemPropertyMapEntry aFootnoteMap_Impl[] = { - { OUString(UNO_NAME_ANCHOR_CHAR_STYLE_NAME),WID_ANCHOR_CHARACTER_STYLE, ::getCppuType((const OUString*)0), PROPERTY_NONE, 0}, - { OUString(UNO_NAME_BEGIN_NOTICE), WID_BEGIN_NOTICE, ::getCppuType((const OUString*)0), PROPERTY_NONE, 0}, - { OUString(UNO_NAME_CHAR_STYLE_NAME), WID_CHARACTER_STYLE, ::getCppuType((const OUString*)0), PROPERTY_NONE, 0}, - { OUString(UNO_NAME_END_NOTICE), WID_END_NOTICE , ::getCppuType((const OUString*)0), PROPERTY_NONE, 0}, - { OUString(UNO_NAME_FOOTNOTE_COUNTING), WID_FOOTNOTE_COUNTING, ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0}, - { OUString(UNO_NAME_NUMBERING_TYPE), WID_NUMBERING_TYPE, ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0}, - { OUString(UNO_NAME_PAGE_STYLE_NAME), WID_PAGE_STYLE, ::getCppuType((const OUString*)0), PROPERTY_NONE, 0}, - { OUString(UNO_NAME_PARA_STYLE_NAME), WID_PARAGRAPH_STYLE, ::getCppuType((const OUString*)0), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_ANCHOR_CHAR_STYLE_NAME),WID_ANCHOR_CHARACTER_STYLE, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_BEGIN_NOTICE), WID_BEGIN_NOTICE, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_CHAR_STYLE_NAME), WID_CHARACTER_STYLE, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_END_NOTICE), WID_END_NOTICE , ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_FOOTNOTE_COUNTING), WID_FOOTNOTE_COUNTING, ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_NUMBERING_TYPE), WID_NUMBERING_TYPE, ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_PAGE_STYLE_NAME), WID_PAGE_STYLE, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_PARA_STYLE_NAME), WID_PARAGRAPH_STYLE, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, { OUString(UNO_NAME_POSITION_END_OF_DOC), WID_POSITION_END_OF_DOC,::getBooleanCppuType(), PROPERTY_NONE, 0}, - { OUString(UNO_NAME_PREFIX), WID_PREFIX, ::getCppuType((const OUString*)0), PROPERTY_NONE, 0}, - { OUString(UNO_NAME_START_AT), WID_START_AT , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0}, - { OUString(UNO_NAME_SUFFIX), WID_SUFFIX, ::getCppuType((const OUString*)0), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_PREFIX), WID_PREFIX, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_START_AT), WID_START_AT , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_SUFFIX), WID_SUFFIX, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; static const SfxItemPropertySet aFootnoteSet_Impl(aFootnoteMap_Impl); @@ -135,14 +135,14 @@ const SfxItemPropertySet* GetEndnoteSet() { static const SfxItemPropertyMapEntry aEndnoteMap_Impl[] = { - { OUString(UNO_NAME_ANCHOR_CHAR_STYLE_NAME),WID_ANCHOR_CHARACTER_STYLE, ::getCppuType((const OUString*)0), PROPERTY_NONE, 0}, - { OUString(UNO_NAME_CHAR_STYLE_NAME), WID_CHARACTER_STYLE, ::getCppuType((const OUString*)0), PROPERTY_NONE, 0}, - { OUString(UNO_NAME_NUMBERING_TYPE), WID_NUMBERING_TYPE, ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0}, - { OUString(UNO_NAME_PAGE_STYLE_NAME), WID_PAGE_STYLE, ::getCppuType((const OUString*)0), PROPERTY_NONE, 0}, - { OUString(UNO_NAME_PARA_STYLE_NAME), WID_PARAGRAPH_STYLE, ::getCppuType((const OUString*)0), PROPERTY_NONE, 0}, - { OUString(UNO_NAME_PREFIX), WID_PREFIX, ::getCppuType((const OUString*)0), PROPERTY_NONE, 0}, - { OUString(UNO_NAME_START_AT), WID_START_AT , ::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0}, - { OUString(UNO_NAME_SUFFIX), WID_SUFFIX, ::getCppuType((const OUString*)0), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_ANCHOR_CHAR_STYLE_NAME),WID_ANCHOR_CHARACTER_STYLE, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_CHAR_STYLE_NAME), WID_CHARACTER_STYLE, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_NUMBERING_TYPE), WID_NUMBERING_TYPE, ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_PAGE_STYLE_NAME), WID_PAGE_STYLE, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_PARA_STYLE_NAME), WID_PARAGRAPH_STYLE, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_PREFIX), WID_PREFIX, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_START_AT), WID_START_AT , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_SUFFIX), WID_SUFFIX, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; static const SfxItemPropertySet aEndnoteSet_Impl(aEndnoteMap_Impl); @@ -156,9 +156,9 @@ const SfxItemPropertySet* GetNumberingRulesSet() { OUString(UNO_NAME_IS_ABSOLUTE_MARGINS), WID_IS_ABS_MARGINS, ::getBooleanCppuType(), PROPERTY_NONE, 0}, { OUString(UNO_NAME_IS_AUTOMATIC), WID_IS_AUTOMATIC, ::getBooleanCppuType(), PROPERTY_NONE, 0}, { OUString(UNO_NAME_IS_CONTINUOUS_NUMBERING), WID_CONTINUOUS, ::getBooleanCppuType(), PROPERTY_NONE, 0}, - { OUString(UNO_NAME_NAME), WID_RULE_NAME , ::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_NAME), WID_RULE_NAME , ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0}, { OUString(UNO_NAME_NUMBERING_IS_OUTLINE), WID_IS_OUTLINE, ::getBooleanCppuType(), PROPERTY_NONE, 0}, - { OUString(UNO_NAME_DEFAULT_LIST_ID), WID_DEFAULT_LIST_ID, ::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_DEFAULT_LIST_ID), WID_DEFAULT_LIST_ID, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; static const SfxItemPropertySet aNumberingRulesSet_Impl( aNumberingRulesMap_Impl ); @@ -180,17 +180,17 @@ const SfxItemPropertySet* GetLineNumberingSet() { static const SfxItemPropertyMapEntry aLineNumberingMap_Impl[] = { - { OUString(UNO_NAME_CHAR_STYLE_NAME), WID_CHARACTER_STYLE, ::getCppuType((const OUString*)0), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_CHAR_STYLE_NAME), WID_CHARACTER_STYLE, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, { OUString(UNO_NAME_COUNT_EMPTY_LINES), WID_COUNT_EMPTY_LINES , ::getBooleanCppuType(),PROPERTY_NONE, 0}, { OUString(UNO_NAME_COUNT_LINES_IN_FRAMES), WID_COUNT_LINES_IN_FRAMES, ::getBooleanCppuType(),PROPERTY_NONE, 0}, - { OUString(UNO_NAME_DISTANCE), WID_DISTANCE , ::getCppuType((const sal_Int32*)0),PROPERTY_NONE, 0}, + { OUString(UNO_NAME_DISTANCE), WID_DISTANCE , ::cppu::UnoType<sal_Int32>::get(),PROPERTY_NONE, 0}, { OUString(UNO_NAME_IS_ON), WID_NUM_ON, ::getBooleanCppuType() , PROPERTY_NONE, 0}, - { OUString(UNO_NAME_INTERVAL), WID_INTERVAL , ::getCppuType((const sal_Int16*)0),PROPERTY_NONE, 0}, - { OUString(UNO_NAME_SEPARATOR_TEXT), WID_SEPARATOR_TEXT, ::getCppuType((const OUString*)0), PROPERTY_NONE, 0}, - { OUString(UNO_NAME_NUMBER_POSITION), WID_NUMBER_POSITION, ::getCppuType((const sal_Int16*)0),PROPERTY_NONE, 0}, - { OUString(UNO_NAME_NUMBERING_TYPE), WID_NUMBERING_TYPE , ::getCppuType((const sal_Int16*)0),PROPERTY_NONE, 0}, + { OUString(UNO_NAME_INTERVAL), WID_INTERVAL , ::cppu::UnoType<sal_Int16>::get(),PROPERTY_NONE, 0}, + { OUString(UNO_NAME_SEPARATOR_TEXT), WID_SEPARATOR_TEXT, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_NUMBER_POSITION), WID_NUMBER_POSITION, ::cppu::UnoType<sal_Int16>::get(),PROPERTY_NONE, 0}, + { OUString(UNO_NAME_NUMBERING_TYPE), WID_NUMBERING_TYPE , ::cppu::UnoType<sal_Int16>::get(),PROPERTY_NONE, 0}, { OUString(UNO_NAME_RESTART_AT_EACH_PAGE), WID_RESTART_AT_EACH_PAGE, ::getBooleanCppuType() , PROPERTY_NONE, 0}, - { OUString(UNO_NAME_SEPARATOR_INTERVAL), WID_SEPARATOR_INTERVAL, ::getCppuType((const sal_Int16*)0),PROPERTY_NONE, 0}, + { OUString(UNO_NAME_SEPARATOR_INTERVAL), WID_SEPARATOR_INTERVAL, ::cppu::UnoType<sal_Int16>::get(),PROPERTY_NONE, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; static const SfxItemPropertySet aLineNumberingSet_Impl(aLineNumberingMap_Impl); @@ -1340,22 +1340,22 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex( //adjust SvxAdjust eAdj = rFmt.GetNumAdjust(); sal_Int16 nINT16 = aSvxToUnoAdjust[(sal_uInt16)eAdj]; - PropValData* pData = new PropValData((void*)&nINT16, "Adjust", ::getCppuType((const sal_Int16*)0) ); + PropValData* pData = new PropValData((void*)&nINT16, "Adjust", ::cppu::UnoType<sal_Int16>::get() ); aPropertyValues.push_back(pData); //parentnumbering nINT16 = rFmt.GetIncludeUpperLevels(); - pData = new PropValData((void*)&nINT16, "ParentNumbering", ::getCppuType((const sal_Int16*)0)); + pData = new PropValData((void*)&nINT16, "ParentNumbering", ::cppu::UnoType<sal_Int16>::get()); aPropertyValues.push_back(pData); //prefix OUString aUString = rFmt.GetPrefix(); - pData = new PropValData((void*)&aUString, "Prefix", ::getCppuType((const OUString*)0)); + pData = new PropValData((void*)&aUString, "Prefix", ::cppu::UnoType<OUString>::get()); aPropertyValues.push_back(pData); //suffix aUString = rFmt.GetSuffix(); - pData = new PropValData((void*)&aUString, "Suffix", ::getCppuType((const OUString*)0)); + pData = new PropValData((void*)&aUString, "Suffix", ::cppu::UnoType<OUString>::get()); aPropertyValues.push_back(pData); //char style name @@ -1372,29 +1372,29 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex( aUString = OUString(); SwStyleNameMapper::FillProgName( CharStyleName, aUString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true ); - pData = new PropValData((void*)&aUString, "CharStyleName", ::getCppuType((const OUString*)0)); + pData = new PropValData((void*)&aUString, "CharStyleName", ::cppu::UnoType<OUString>::get()); aPropertyValues.push_back(pData); //startvalue nINT16 = rFmt.GetStart(); - pData = new PropValData((void*)&nINT16, "StartWith", ::getCppuType((const sal_Int16*)0)); + pData = new PropValData((void*)&nINT16, "StartWith", ::cppu::UnoType<sal_Int16>::get()); aPropertyValues.push_back(pData); if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION ) { //leftmargin sal_Int32 nINT32 = convertTwipToMm100(rFmt.GetAbsLSpace()); - pData = new PropValData((void*)&nINT32, UNO_NAME_LEFT_MARGIN, ::getCppuType((const sal_Int32*)0)); + pData = new PropValData((void*)&nINT32, UNO_NAME_LEFT_MARGIN, ::cppu::UnoType<sal_Int32>::get()); aPropertyValues.push_back(pData); //chartextoffset nINT32 = convertTwipToMm100(rFmt.GetCharTextDistance()); - pData = new PropValData((void*)&nINT32, UNO_NAME_SYMBOL_TEXT_DISTANCE, ::getCppuType((const sal_Int32*)0)); + pData = new PropValData((void*)&nINT32, UNO_NAME_SYMBOL_TEXT_DISTANCE, ::cppu::UnoType<sal_Int32>::get()); aPropertyValues.push_back(pData); //firstlineoffset nINT32 = convertTwipToMm100(rFmt.GetFirstLineOffset()); - pData = new PropValData((void*)&nINT32, UNO_NAME_FIRST_LINE_OFFSET, ::getCppuType((const sal_Int32*)0)); + pData = new PropValData((void*)&nINT32, UNO_NAME_FIRST_LINE_OFFSET, ::cppu::UnoType<sal_Int32>::get()); aPropertyValues.push_back(pData); } @@ -1406,7 +1406,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex( } pData = new PropValData( (void*)&nINT16, UNO_NAME_POSITION_AND_SPACE_MODE, - ::getCppuType((const sal_Int16*)0) ); + ::cppu::UnoType<sal_Int16>::get() ); aPropertyValues.push_back(pData); if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT ) @@ -1423,34 +1423,34 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex( } pData = new PropValData( (void*)&nINT16, UNO_NAME_LABEL_FOLLOWED_BY, - ::getCppuType((const sal_Int16*)0) ); + ::cppu::UnoType<sal_Int16>::get() ); aPropertyValues.push_back(pData); // ListtabStopPosition sal_Int32 nINT32 = convertTwipToMm100(rFmt.GetListtabPos()); pData = new PropValData( (void*)&nINT32, UNO_NAME_LISTTAB_STOP_POSITION, - ::getCppuType((const sal_Int32*)0)); + ::cppu::UnoType<sal_Int32>::get()); aPropertyValues.push_back(pData); // FirstLineIndent nINT32 = convertTwipToMm100(rFmt.GetFirstLineIndent()); pData = new PropValData( (void*)&nINT32, UNO_NAME_FIRST_LINE_INDENT, - ::getCppuType((const sal_Int32*)0)); + ::cppu::UnoType<sal_Int32>::get()); aPropertyValues.push_back(pData); // IndentAt nINT32 = convertTwipToMm100(rFmt.GetIndentAt()); pData = new PropValData( (void*)&nINT32, UNO_NAME_INDENT_AT, - ::getCppuType((const sal_Int32*)0)); + ::cppu::UnoType<sal_Int32>::get()); aPropertyValues.push_back(pData); } //numberingtype nINT16 = rFmt.GetNumberingType(); - pData = new PropValData((void*)&nINT16, "NumberingType", ::getCppuType((const sal_Int16*)0)); + pData = new PropValData((void*)&nINT16, "NumberingType", ::cppu::UnoType<sal_Int16>::get()); aPropertyValues.push_back(pData); if(!bChapterNum) @@ -1459,19 +1459,19 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex( { //BulletId nINT16 = rFmt.GetBulletChar(); - pData = new PropValData((void*)&nINT16, "BulletId", ::getCppuType((const sal_Int16*)0)); + pData = new PropValData((void*)&nINT16, "BulletId", ::cppu::UnoType<sal_Int16>::get()); aPropertyValues.push_back(pData); const Font* pFont = rFmt.GetBulletFont(); //BulletChar aUString = OUString(rFmt.GetBulletChar()); - pData = new PropValData((void*)&aUString, "BulletChar", ::getCppuType((const OUString*)0)); + pData = new PropValData((void*)&aUString, "BulletChar", ::cppu::UnoType<OUString>::get()); aPropertyValues.push_back(pData); //BulletFontName aUString = pFont ? pFont->GetStyleName() : OUString(); - pData = new PropValData((void*)&aUString, "BulletFontName", ::getCppuType((const OUString*)0)); + pData = new PropValData((void*)&aUString, "BulletFontName", ::cppu::UnoType<OUString>::get()); aPropertyValues.push_back(pData); //BulletFont @@ -1495,7 +1495,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex( } else aUString = OUString(); - pData = new PropValData((void*)&aUString, UNO_NAME_GRAPHIC_URL, ::getCppuType((const OUString*)0)); + pData = new PropValData((void*)&aUString, UNO_NAME_GRAPHIC_URL, ::cppu::UnoType<OUString>::get()); aPropertyValues.push_back(pData); //graphicbitmap @@ -1519,7 +1519,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex( const SwFmtVertOrient* pOrient = rFmt.GetGraphicOrientation(); if(pOrient) { - pData = new PropValData((void*)0, UNO_NAME_VERT_ORIENT, ::getCppuType((const sal_Int16*)0)); + pData = new PropValData((void*)0, UNO_NAME_VERT_ORIENT, ::cppu::UnoType<sal_Int16>::get()); ((const SfxPoolItem*)pOrient)->QueryValue(pData->aVal, MID_VERTORIENT_ORIENT); aPropertyValues.push_back(pData); } @@ -1555,7 +1555,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex( aUString = OUString(); SwStyleNameMapper::FillProgName(sValue, aUString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true); - pData = new PropValData((void*)&aUString, UNO_NAME_HEADING_STYLE_NAME, ::getCppuType((const OUString*)0)); + pData = new PropValData((void*)&aUString, UNO_NAME_HEADING_STYLE_NAME, ::cppu::UnoType<OUString>::get()); aPropertyValues.push_back(pData); } diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index cef2bb0ec8c5..264bb6c14d21 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -1930,7 +1930,7 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, if (MID_PAGEDESC_PAGEDESCNAME != nMemberId) break; // special handling for RES_PAGEDESC - if(aValue.getValueType() != ::getCppuType((const OUString*)0)) + if(aValue.getValueType() != ::cppu::UnoType<OUString>::get()) throw lang::IllegalArgumentException(); SfxItemSet& rStyleSet = rBase.GetItemSet(); @@ -2124,7 +2124,7 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, { if( MID_DROPCAP_CHAR_STYLE_NAME == nMemberId) { - if(aValue.getValueType() == ::getCppuType((const OUString*)0)) + if(aValue.getValueType() == ::cppu::UnoType<OUString>::get()) { SfxItemSet& rStyleSet = rBase.GetItemSet(); @@ -2557,7 +2557,7 @@ static uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, rPropSet.getPropertyValue(rEntry, rSet, aRet); //UUUU - if(rEntry.aType == ::getCppuType((const sal_Int16*)0) && rEntry.aType != aRet.getValueType()) + if(rEntry.aType == ::cppu::UnoType<sal_Int16>::get() && rEntry.aType != aRet.getValueType()) { // since the sfx uint16 item now exports a sal_Int32, we may have to fix this here sal_Int32 nValue = 0; diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index 3dbf7a36b58e..3efec76032f9 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -418,7 +418,7 @@ void SwHTMLWriter::OutHiddenForm( const uno::Reference< form::XForm > & rForm ) if( xPropSet->getPropertySetInfo()->hasPropertyByName( sPropName ) ) { uno::Any aAny2 = xPropSet->getPropertyValue( sPropName ); - if( aAny2.getValueType() == ::getCppuType((sal_Int16*)0) ) + if( aAny2.getValueType() == ::cppu::UnoType<sal_Int16>::get() ) { if( form::FormComponentType::HIDDENCONTROL == *(sal_Int16*)aAny2.getValue() ) @@ -465,7 +465,7 @@ void SwHTMLWriter::OutForm( bool bOn, uno::Any aTmp = xFormPropSet->getPropertyValue( OUString("Name") ); - if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && + if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() && !((OUString*)aTmp.getValue())->isEmpty() ) { sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_name) + "=\""; @@ -477,7 +477,7 @@ void SwHTMLWriter::OutForm( bool bOn, aTmp = xFormPropSet->getPropertyValue( OUString("TargetURL") ); - if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && + if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() && !((OUString*)aTmp.getValue())->isEmpty() ) { sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_action) + "=\""; @@ -528,7 +528,7 @@ void SwHTMLWriter::OutForm( bool bOn, aTmp = xFormPropSet->getPropertyValue( OUString("TargetFrame") ); - if( aTmp.getValueType() == ::getCppuType((const OUString*)0)&& + if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get()&& !((OUString*)aTmp.getValue())->isEmpty() ) { sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_target) + "=\""; @@ -588,7 +588,7 @@ void SwHTMLWriter::OutHiddenControls( continue; aTmp = xPropSet->getPropertyValue( sPropName ); - if( aTmp.getValueType() != ::getCppuType((const sal_Int16*)0) ) + if( aTmp.getValueType() != ::cppu::UnoType<sal_Int16>::get() ) continue; if( form::FormComponentType::HIDDENCONTROL == @@ -602,7 +602,7 @@ void SwHTMLWriter::OutHiddenControls( aTmp = xPropSet->getPropertyValue( OUString("Name") ); - if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && + if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() && !((OUString*)aTmp.getValue())->isEmpty() ) { sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_name) + "=\""; @@ -613,7 +613,7 @@ void SwHTMLWriter::OutHiddenControls( } aTmp = xPropSet->getPropertyValue( OUString("HiddenValue") ); - if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && + if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() && !((OUString*)aTmp.getValue())->isEmpty() ) { sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_value) + "=\""; @@ -665,7 +665,7 @@ const SdrObject *SwHTMLWriter::GetHTMLControl( const SwDrawFrmFmt& rFmt ) return 0; uno::Any aTmp = xPropSet->getPropertyValue( sPropName ); - if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0)&& + if( aTmp.getValueType() == ::cppu::UnoType<sal_Int16>::get()&& lcl_html_isHTMLControl( *(sal_Int16*) aTmp.getValue() ) ) { return pObj; @@ -756,7 +756,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, ? TYPE_CHECKBOX : TYPE_RADIO); aTmp = xPropSet->getPropertyValue( OUString("DefaultState") ); - if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0) && + if( aTmp.getValueType() == ::cppu::UnoType<sal_Int16>::get() && TRISTATE_FALSE != *(sal_Int16*) aTmp.getValue() ) { sOptions += " " + OString(OOO_STRING_SVTOOLS_HTML_O_checked); @@ -764,7 +764,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, aTmp = xPropSet->getPropertyValue( OUString("RefValue") ); - if( aTmp.getValueType() == ::getCppuType((const OUString*)0) ) + if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() ) { const OUString& rVal = *(OUString*)aTmp.getValue(); @@ -799,7 +799,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, aTmp = xPropSet->getPropertyValue( OUString("Label") ); - if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && + if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() && !((OUString*)aTmp.getValue())->isEmpty() ) { sValue = *(OUString*)aTmp.getValue(); @@ -891,7 +891,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( xPropSetInfo->hasPropertyByName( sEchoChar ) ) { aTmp = xPropSet->getPropertyValue( sEchoChar ); - if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0) && + if( aTmp.getValueType() == ::cppu::UnoType<sal_Int16>::get() && *(sal_Int16*)aTmp.getValue() != 0 ) eType = TYPE_PASSWORD; } @@ -904,7 +904,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, aTmp = xPropSet->getPropertyValue( OUString("MaxTextLen") ); - if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0) && + if( aTmp.getValueType() == ::cppu::UnoType<sal_Int16>::get() && *(sal_Int16*) aTmp.getValue() != 0 ) { sOptions += " " + OString(OOO_STRING_SVTOOLS_HTML_O_maxlength) + "=\"" + @@ -915,7 +915,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( xPropSetInfo->hasPropertyByName( sDefaultText ) ) { aTmp = xPropSet->getPropertyValue( sDefaultText ); - if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && + if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() && !((OUString*)aTmp.getValue())->isEmpty() ) { sValue = *(OUString*)aTmp.getValue(); @@ -962,7 +962,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, } aTmp = xPropSet->getPropertyValue("Name"); - if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && + if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() && !((OUString*)aTmp.getValue())->isEmpty() ) { sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_name) + "=\""; @@ -993,7 +993,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, { aTmp = xPropSet->getPropertyValue( OUString("ImageURL") ); - if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && + if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() && !((OUString*)aTmp.getValue())->isEmpty() ) { sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_src) + "=\""; @@ -1034,7 +1034,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, aTmp = xPropSet->getPropertyValue( OUString("TabIndex") ); - if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0) ) + if( aTmp.getValueType() == ::cppu::UnoType<sal_Int16>::get() ) { sal_Int16 nTabIndex = *(sal_Int16*) aTmp.getValue(); if( nTabIndex > 0 ) @@ -1074,7 +1074,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); - if( aTmp.getValueType() == ::getCppuType((const sal_Int32*)0) ) + if( aTmp.getValueType() == ::cppu::UnoType<sal_Int32>::get() ) { Color aCol(*(sal_Int32*)aTmp .getValue()); aItemSet.Put( SvxBrushItem( aCol, RES_CHRATR_BACKGROUND ) ); @@ -1084,7 +1084,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); - if( aTmp.getValueType() == ::getCppuType((const sal_Int32*)0) ) + if( aTmp.getValueType() == ::cppu::UnoType<sal_Int32>::get() ) { Color aColor( *(sal_Int32*)aTmp .getValue() ); aItemSet.Put( SvxColorItem( aColor, RES_CHRATR_COLOR ) ); @@ -1106,7 +1106,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); - if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && + if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() && !((OUString*)aTmp.getValue())->isEmpty() ) { Font aFixedFont( OutputDevice::GetDefaultFont( @@ -1120,7 +1120,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); - if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0)) + if( aTmp.getValueType() == ::cppu::UnoType<sal_Int16>::get()) eFamily = (FontFamily)*(sal_Int16*) aTmp.getValue(); } SvxFontItem aItem( eFamily, aFName, aEmptyOUStr, PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, RES_CHRATR_FONT ); @@ -1144,7 +1144,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); - if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0)) + if( aTmp.getValueType() == ::cppu::UnoType<sal_Int16>::get()) { FontItalic eItalic = (FontItalic)*(sal_Int16*)aTmp.getValue(); if( eItalic != ITALIC_DONTKNOW && eItalic != ITALIC_NONE ) @@ -1155,7 +1155,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); - if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0) ) + if( aTmp.getValueType() == ::cppu::UnoType<sal_Int16>::get() ) { FontUnderline eUnderline = (FontUnderline)*(sal_Int16*)aTmp.getValue(); @@ -1168,7 +1168,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); - if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0)) + if( aTmp.getValueType() == ::cppu::UnoType<sal_Int16>::get()) { FontStrikeout eStrikeout = (FontStrikeout)*(sal_Int16*)aTmp.getValue(); @@ -1275,7 +1275,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, OUString sVal; aTmp = xPropSet->getPropertyValue( OUString("DefaultText") ); - if( aTmp.getValueType() == ::getCppuType((const OUString*)0)&& + if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get()&& !((OUString*)aTmp.getValue())->isEmpty() ) { sVal = *(OUString*)aTmp.getValue(); @@ -1298,7 +1298,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, else if( TYPE_CHECKBOX == eType || TYPE_RADIO == eType ) { aTmp = xPropSet->getPropertyValue("Label"); - if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && + if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() && !((OUString*)aTmp.getValue())->isEmpty() ) { sValue = *(OUString*)aTmp.getValue(); diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index 9f11d7d058ab..be5926c5bc2d 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -537,13 +537,13 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c comphelper::PropertyMapEntry const aInfoMap[] = { { OUString("ProgressRange"), 0, - ::getCppuType((sal_Int32*)0), + ::cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("ProgressMax"), 0, - ::getCppuType((sal_Int32*)0), + ::cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("ProgressCurrent"), 0, - ::getCppuType((sal_Int32*)0), + ::cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("NumberStyles"), 0, ::getCppuType( (uno::Reference<container::XNameContainer> *) 0), diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 1a7e201c4577..4ee2f71728f0 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -105,13 +105,13 @@ sal_uInt32 SwXMLWriter::_Write( const uno::Reference < task::XStatusIndicator >& comphelper::PropertyMapEntry const aInfoMap[] = { { OUString("ProgressRange"), 0, - ::getCppuType((sal_Int32*)0), + ::cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("ProgressMax"), 0, - ::getCppuType((sal_Int32*)0), + ::cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("ProgressCurrent"), 0, - ::getCppuType((sal_Int32*)0), + ::cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("WrittenNumberStyles"), 0, ::getCppuType((uno::Sequence<sal_Int32> *)0), diff --git a/sw/source/ui/vba/vbapalette.cxx b/sw/source/ui/vba/vbapalette.cxx index dbb8e600c341..1622a389d27b 100644 --- a/sw/source/ui/vba/vbapalette.cxx +++ b/sw/source/ui/vba/vbapalette.cxx @@ -72,7 +72,7 @@ public: // Methods XElementAcess virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { - return ::getCppuType( (sal_Int32*)0 ); + return ::cppu::UnoType<sal_Int32>::get(); } virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { |