sd/source/ui/unoidl/unopage.cxx | 6 +++--- svx/source/unodraw/unoprov.cxx | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-)
New commits: commit 7b3c5cb12e91ce2a88b232c099366e7d1f633e7e Author: Stephan Bergmann <[email protected]> Date: Thu Dec 12 11:58:59 2013 +0100 Fix C++03 digraphs Change-Id: I456469c27b60290ad8280fe12fcb82958e1a6c85 diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index c285a6a..6a0e9d1 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -147,7 +147,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin { 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("LoopSound"), WID_LOOP_SOUND, ::getBooleanCppuType(), 0, 0}, - { OUString("NavigationOrder"), WID_NAVORDER, cppu::UnoType<::com::sun::star::container::XIndexAccess>::get(),0, 0}, + { OUString("NavigationOrder"), WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -174,7 +174,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin { 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("NavigationOrder"), WID_NAVORDER, cppu::UnoType<::com::sun::star::container::XIndexAccess>::get(),0, 0}, \ + { OUString("NavigationOrder"), WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0}, \ { OUString(), 0, css::uno::Type(), 0, 0 } static const SfxItemPropertyMapEntry aDrawPageNotesHandoutPropertyMap_Impl[] = @@ -204,7 +204,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin { 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("IsBackgroundDark"), WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, \ - { OUString("NavigationOrder"), WID_NAVORDER, cppu::UnoType<::com::sun::star::container::XIndexAccess>::get(),0, 0}, \ + { OUString("NavigationOrder"), WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0}, \ { OUString(), 0, css::uno::Type(), 0, 0 } static const SfxItemPropertyMapEntry aGraphicPagePropertyMap_Impl[] = diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 0ec21af..4972b49 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -245,7 +245,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxGraphicObjectPropertyMap() { OUString("IsMirrored"), OWN_ATTR_MIRRORED, ::getCppuBooleanType(), 0, 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("GraphicStream"), OWN_ATTR_GRAPHIC_STREAM, cppu::UnoType<::com::sun::star::io::XInputStream>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("GraphicStream"), OWN_ATTR_GRAPHIC_STREAM, cppu::UnoType<css::io::XInputStream>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -726,7 +726,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxMediaShapePropertyMap() // #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("PrivateStream"), OWN_ATTR_MEDIA_STREAM, cppu::UnoType<::com::sun::star::io::XInputStream>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 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(), 0, css::uno::Type(), 0, 0 } }; @@ -741,7 +741,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxTableShapePropertyMap() { 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_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP, cppu::UnoType<::com::sun::star::awt::XBitmap>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP, cppu::UnoType<css::awt::XBitmap>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME, ::getCppuType(( const OUString*)0), ::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}, @@ -750,15 +750,15 @@ SfxItemPropertyMapEntry const * ImplGetSvxTableShapePropertyMap() { 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("Model"), OWN_ATTR_OLEMODEL , cppu::UnoType<::com::sun::star::table::XTable>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("TableTemplate"), OWN_ATTR_TABLETEMPLATE , cppu::UnoType<::com::sun::star::container::XIndexAccess>::get(), 0, 0}, + { OUString("Model"), OWN_ATTR_OLEMODEL , cppu::UnoType<css::table::XTable>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("TableTemplate"), OWN_ATTR_TABLETEMPLATE , cppu::UnoType<css::container::XIndexAccess>::get(), 0, 0}, { OUString("UseFirstRowStyle"), OWN_ATTR_TABLETEMPLATE_FIRSTROW, ::getBooleanCppuType(),0, 0}, { OUString("UseLastRowStyle"), OWN_ATTR_TABLETEMPLATE_LASTROW, ::getBooleanCppuType(),0, 0}, { OUString("UseFirstColumnStyle"), OWN_ATTR_TABLETEMPLATE_FIRSTCOLUMN, ::getBooleanCppuType(),0, 0}, { OUString("UseLastColumnStyle"), OWN_ATTR_TABLETEMPLATE_LASTCOLUMN, ::getBooleanCppuType(),0, 0}, { OUString("UseBandingRowStyle"), OWN_ATTR_TABLETEMPLATE_BANDINGROWS, ::getBooleanCppuType(),0, 0}, { OUString("UseBandingColumnStyle"), OWN_ATTR_TABLETEMPLATE_BANDINGCOULUMNS, ::getBooleanCppuType(),0, 0}, - { OUString("ReplacementGraphic"), OWN_ATTR_BITMAP, cppu::UnoType<::com::sun::star::graphic::XGraphic>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("ReplacementGraphic"), OWN_ATTR_BITMAP, cppu::UnoType<css::graphic::XGraphic>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
