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 /sw | |
| parent | 2fe02d55d72a808dd79ba9529bc5078a45175c16 (diff) | |
fix tdf#95488, crash in report wizard
This reverts commit bb76b8f10697f3d5ca1f9a2f19902b043bd61cd7
"loplugin:mergeclasses"
Change-Id: Ib65459ab45cd4cefa859ed75f9ddc4f070879b1d
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/unotxdoc.hxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/uno/unotxdoc.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index d5c5eb9f17d2..e4ea69448a74 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -62,7 +62,7 @@ #include <com/sun/star/document/XDocumentLanguages.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <svl/itemprop.hxx> -#include <svx/unomod.hxx> +#include <svx/fmdmod.hxx> #include <editeng/UnoForbiddenCharsTable.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/implbase.hxx> @@ -126,7 +126,7 @@ typedef cppu::WeakImplHelper SwXTextDocumentBaseClass; class SW_DLLPUBLIC SwXTextDocument : public SwXTextDocumentBaseClass, - public SvxUnoDrawMSFactory, + public SvxFmMSFactory, public SfxBaseModel, public vcl::ITiledRenderable, public ::com::sun::star::tiledrendering::XTiledRenderable diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 79b5b90bd8bf..4c54dc9fb4f5 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -1668,8 +1668,8 @@ css::uno::Reference<css::uno::XInterface> SwXTextDocument::create( } Reference<XInterface> xTmp( arguments == 0 - ? SvxUnoDrawMSFactory::createInstance(aTmpServiceName) - : SvxUnoDrawMSFactory::createInstanceWithArguments( + ? SvxFmMSFactory::createInstance(aTmpServiceName) + : SvxFmMSFactory::createInstanceWithArguments( aTmpServiceName, *arguments)); if (rServiceName == "com.sun.star.drawing.GroupShape" || rServiceName == "com.sun.star.drawing.Shape3DSceneObject") @@ -1703,7 +1703,7 @@ Sequence< OUString > SwXTextDocument::getAvailableServiceNames() static Sequence< OUString > aServices; if ( aServices.getLength() == 0 ) { - Sequence< OUString > aRet = SvxUnoDrawMSFactory::getAvailableServiceNames(); + Sequence< OUString > aRet = SvxFmMSFactory::getAvailableServiceNames(); OUString* pRet = aRet.getArray(); for ( sal_Int32 i = 0; i < aRet.getLength(); ++i ) { @@ -1715,7 +1715,7 @@ Sequence< OUString > SwXTextDocument::getAvailableServiceNames() } } Sequence< OUString > aOwn = SwXServiceProvider::GetAllServiceNames(); - aServices = SvxUnoDrawMSFactory::concatServiceNames(aRet, aOwn); + aServices = SvxFmMSFactory::concatServiceNames(aRet, aOwn); } return aServices; |