From b6c3afdcbe66075f5a82d35ce8e403e7fe696174 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 24 Jul 2017 13:56:33 +0200 Subject: SdrGlobalData::aUserMakeObjUserDataHdl is unused ever since commit ddb1d5ebf0a81888001ffa1dbab883df70cdc279 Author: Felix Zhang Date: Fri Nov 18 18:23:52 2011 +0800 remove unused Sdr methods removed the SdrObjFactory::MakeNewObjUserData method Change-Id: I95c167b2f20b436bcc0085b6b616406ac210045f Reviewed-on: https://gerrit.libreoffice.org/40363 Tested-by: Jenkins Reviewed-by: Noel Grandin --- svx/source/gallery2/galmisc.cxx | 8 -------- svx/source/gallery2/galtheme.cxx | 2 -- svx/source/svdraw/svdetc.cxx | 6 ------ svx/source/svdraw/svdobj.cxx | 19 ------------------- 4 files changed, 35 deletions(-) (limited to 'svx') diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index aed3a7169e4e..f87769814f7d 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -65,14 +65,6 @@ BitmapEx GalleryResGetBitmapEx(const OUString &rId) return aBmpEx; } -IMPL_STATIC_LINK( - SgaUserDataFactory, MakeUserData, SdrObjUserDataCreatorParams, aParams, SdrObjUserData* ) -{ - if ( aParams.nInventor == SdrInventor::SgaImap && aParams.nObjIdentifier == ID_IMAPINFO ) - return new SgaIMapInfo; - return nullptr; -} - GalleryGraphicImportRet GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, OUString& rFilterName, bool bShowProgress ) { diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index d71a2c4b280b..c5b8013f26a1 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -1245,8 +1245,6 @@ bool GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran if( aModel.GetModel() ) { - SgaUserDataFactory aFactory; - SdrPage* pPage = aModel.GetModel()->GetPage(0); SdrGrafObj* pGrafObj = new SdrGrafObj( *pGraphic ); diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 00418251e783..2d1061f1a1fe 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -373,12 +373,6 @@ std::vector>& ImpGetUserMakeObjHdl() return rGlobalData.aUserMakeObjHdl; } -std::vector>& ImpGetUserMakeObjUserDataHdl() -{ - SdrGlobalData& rGlobalData=GetSdrGlobalData(); - return rGlobalData.aUserMakeObjUserDataHdl; -} - OUString ImpGetResStr(const char* pResID) { return SvxResId(pResID); diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 975af73c5dda..bbb564ed2cb8 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -3282,25 +3282,6 @@ void SdrObjFactory::RemoveMakeObjectHdl(Link co rLL.erase(it); } -void SdrObjFactory::InsertMakeUserDataHdl(Link const & rLink) -{ - std::vector>& rLL=ImpGetUserMakeObjUserDataHdl(); - auto it = std::find(rLL.begin(), rLL.end(), rLink); - if (it != rLL.end()) { - OSL_FAIL("SdrObjFactory::InsertMakeUserDataHdl(): Link already in place."); - } else { - rLL.push_back(rLink); - } -} - -void SdrObjFactory::RemoveMakeUserDataHdl(Link const & rLink) -{ - std::vector>& rLL=ImpGetUserMakeObjUserDataHdl(); - auto it = std::find(rLL.begin(), rLL.end(), rLink); - if (it != rLL.end()) - rLL.erase(it); -} - namespace svx { ISdrObjectFilter::~ISdrObjectFilter() -- cgit