diff options
Diffstat (limited to 'sd/source/ui/unoidl/unoobj.cxx')
| -rw-r--r-- | sd/source/ui/unoidl/unoobj.cxx | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 5fedbcd717b3..b3cba2aeadee 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -42,7 +42,7 @@ #include <vos/mutex.hxx> #include <svl/itemprop.hxx> #include <svl/style.hxx> - +#include <svx/svdpool.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/app.hxx> #include <svtools/unoimap.hxx> @@ -58,10 +58,11 @@ #include <svx/svdopath.hxx> #include <svx/svdoole2.hxx> #include <svx/svdograf.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include "CustomAnimationPreset.hxx" #include "Outliner.hxx" #include "sdresid.hxx" +#include <comphelper/serviceinfohelper.hxx> #include "anminfo.hxx" #include "unohelp.hxx" @@ -247,12 +248,12 @@ static SdTypesCache gImplTypesCache; { if( bGraphicObj ) { - static SvxItemPropertySet aImpress_SdXShapePropertyGraphicSet_Impl( lcl_GetImpress_SdXShapePropertyGraphicMap_Impl()); + static SvxItemPropertySet aImpress_SdXShapePropertyGraphicSet_Impl( lcl_GetImpress_SdXShapePropertyGraphicMap_Impl(), SdrObject::GetGlobalDrawObjectItemPool()); pRet = &aImpress_SdXShapePropertyGraphicSet_Impl; } else { - static SvxItemPropertySet aImpress_SdXShapePropertySet_Impl(lcl_GetImpress_SdXShapePropertySimpleMap_Impl()); + static SvxItemPropertySet aImpress_SdXShapePropertySet_Impl(lcl_GetImpress_SdXShapePropertySimpleMap_Impl(), SdrObject::GetGlobalDrawObjectItemPool()); pRet = &aImpress_SdXShapePropertySet_Impl; } } @@ -260,12 +261,12 @@ static SdTypesCache gImplTypesCache; { if( bGraphicObj ) { - static SvxItemPropertySet aDraw_SdXShapePropertyGraphicSet_Impl(lcl_GetDraw_SdXShapePropertyGraphicMap_Impl()); + static SvxItemPropertySet aDraw_SdXShapePropertyGraphicSet_Impl(lcl_GetDraw_SdXShapePropertyGraphicMap_Impl(), SdrObject::GetGlobalDrawObjectItemPool()); pRet = &aDraw_SdXShapePropertyGraphicSet_Impl; } else { - static SvxItemPropertySet aDraw_SdXShapePropertySet_Impl( lcl_GetDraw_SdXShapePropertySimpleMap_Impl()); + static SvxItemPropertySet aDraw_SdXShapePropertySet_Impl( lcl_GetDraw_SdXShapePropertySimpleMap_Impl(), SdrObject::GetGlobalDrawObjectItemPool()); pRet = &aDraw_SdXShapePropertySet_Impl; } } @@ -282,7 +283,7 @@ static SdTypesCache gImplTypesCache; static const SvxItemPropertySet* lcl_GetEmpty_SdXShapePropertySet_Impl() { - static SvxItemPropertySet aEmptyPropSet( lcl_GetEmpty_SdXShapePropertyMap_Impl() ); + static SvxItemPropertySet aEmptyPropSet( lcl_GetEmpty_SdXShapePropertyMap_Impl(), SdrObject::GetGlobalDrawObjectItemPool() ); return &aEmptyPropSet; } const SvEventDescription* ImplGetSupportedMacroItems() @@ -957,7 +958,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL SdXShape::getSupportedServiceNames() t { uno::Sequence< OUString > aSeq( mpShape->_getSupportedServiceNames() ); - SvxServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.presentation.Shape", + comphelper::ServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.presentation.Shape", "com.sun.star.document.LinkTarget" ); SdrObject* pObj = mpShape->GetSdrObject(); @@ -967,10 +968,10 @@ uno::Sequence< ::rtl::OUString > SAL_CALL SdXShape::getSupportedServiceNames() t switch( nInventor ) { case OBJ_TITLETEXT: - SvxServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.presentation.TitleTextShape" ); + comphelper::ServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.presentation.TitleTextShape" ); break; case OBJ_OUTLINETEXT: - SvxServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.presentation.OutlinerShape" ); + comphelper::ServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.presentation.OutlinerShape" ); break; } } |