diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-05 11:33:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-05 12:02:00 +0200 |
| commit | 609b22787392be4c2eac6fe098a70341a4c204e4 (patch) | |
| tree | 75a40671862b9dbe2c8acd6e0e6fbeb39a8c1ac2 /sd | |
| parent | 2fe02d55d72a808dd79ba9529bc5078a45175c16 (diff) | |
fix tdf#95488, crash in report wizard
This reverts commit bb76b8f10697f3d5ca1f9a2f19902b043bd61cd7
"loplugin:mergeclasses"
Change-Id: Ib65459ab45cd4cefa859ed75f9ddc4f070879b1d
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/inc/unomodel.hxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index 68c7e7c2bea4..11076cafcb4a 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -43,7 +43,7 @@ #include <svl/lstner.hxx> #include <sfx2/sfxbasemodel.hxx> -#include <svx/unomod.hxx> +#include <svx/fmdmod.hxx> #include <vcl/event.hxx> #include <vcl/ITiledRenderable.hxx> @@ -69,7 +69,7 @@ extern OUString getPageApiNameFromUiName( const OUString& rUIName ); * * ***********************************************************************/ class SD_DLLPUBLIC SdXImpressDocument : public SfxBaseModel, // implements SfxListener, OWEAKOBJECT & other - public SvxUnoDrawMSFactory, + public SvxFmMSFactory, public css::drawing::XDrawPageDuplicator, public css::drawing::XLayerSupplier, public css::drawing::XMasterPagesSupplier, @@ -191,7 +191,7 @@ public: // XPresentationSupplier virtual css::uno::Reference< css::presentation::XPresentation > SAL_CALL getPresentation( ) throw(css::uno::RuntimeException, std::exception) override; - // XMultiServiceFactory ( SvxUnoDrawMSFactory ) + // XMultiServiceFactory ( SvxFmMSFactory ) virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::uno::XInterface> SAL_CALL createInstanceWithArguments( diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index e426351e9558..f1e5614aa731 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -815,7 +815,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdXImpressDocument::getHandoutMast return xPage; } -// XMultiServiceFactory ( SvxUnoDrawMSFactory ) +// XMultiServiceFactory ( SvxFmMSFactory ) css::uno::Reference<css::uno::XInterface> SdXImpressDocument::create( OUString const & aServiceSpecifier, OUString const & referer) @@ -1075,7 +1075,7 @@ css::uno::Reference<css::uno::XInterface> SdXImpressDocument::create( } else { - xRet = SvxUnoDrawMSFactory::createInstance( aServiceSpecifier ); + xRet = SvxFmMSFactory::createInstance( aServiceSpecifier ); } uno::Reference< drawing::XShape > xShape( xRet, uno::UNO_QUERY ); @@ -1111,7 +1111,7 @@ SdXImpressDocument::createInstanceWithArguments( { return create(ServiceSpecifier, arg); } - return SvxUnoDrawMSFactory::createInstanceWithArguments( + return SvxFmMSFactory::createInstanceWithArguments( ServiceSpecifier, Arguments); } @@ -1123,7 +1123,7 @@ uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getAvailableServiceNames( if( NULL == mpDoc ) throw lang::DisposedException(); - const uno::Sequence< OUString > aSNS_ORG( SvxUnoDrawMSFactory::getAvailableServiceNames() ); + const uno::Sequence< OUString > aSNS_ORG( SvxFmMSFactory::getAvailableServiceNames() ); uno::Sequence< OUString > aSNS( mbImpressDoc ? (36) : (19) ); |