simplify SvxUnoDrawPool initialisation

Change-Id: Iaca5eec19935c50cc7cade4f3dab139a5232473a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154058
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 2 insertions, 19 deletions

diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index e94ccb2d7450..eb897556eff9 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -39,25 +39,8 @@
 using namespace ::com::sun::star;
 using namespace ::cppu;
 
-static rtl::Reference<comphelper::PropertySetInfo> const & getDefaults(SvxUnoDrawPoolDefaults nServiceId)
-{
-    switch (nServiceId)
-    {
-        case SvxUnoDrawPoolDefaults::Drawing: return SvxPropertySetInfoPool::getDrawingDefaults();
-        case SvxUnoDrawPoolDefaults::Writer: return SvxPropertySetInfoPool::getWriterDrawingDefaults();
-        default: std::abort();
-    }
-}
-
-SvxUnoDrawPool::SvxUnoDrawPool(SdrModel* pModel, SvxUnoDrawPoolDefaults nServiceId)
-: PropertySetHelper( getDefaults(nServiceId) ), mpModel( pModel )
-{
-    init();
-}
-
-/* deprecated */
-SvxUnoDrawPool::SvxUnoDrawPool(SdrModel* pModel)
-: PropertySetHelper( SvxPropertySetInfoPool::getDrawingDefaults() ), mpModel( pModel )
+SvxUnoDrawPool::SvxUnoDrawPool(SdrModel* pModel, rtl::Reference<comphelper::PropertySetInfo> const & xDefaults)
+: PropertySetHelper( xDefaults ), mpModel( pModel )
 {
     init();
 }