mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:mergeclasses

Browse Source 
Change-Id: I8f5c2ae658f8784233db98f752b6f9fa53110195
This commit is contained in:
Noel Grandin 2015-10-07 12:31:48 +02:00
parent 5dbbb498b5
commit bb76b8f106
13 changed files with 80 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compilerplugins/clang/mergeclasses.results
View File

@ -76,7 +76,7 @@ merge StarSymbolToMSMultiFont with StarSymbolToMSMultiFontImpl
merge StgReader with WW8Reader
merge SvListView with SvTreeListBox
merge SvxShapeMaster with SdXShape
merge SvxUnoDrawMSFactory with SvxFmMSFactory
merge SvxUnoDrawMSFactory with SvxUnoDrawMSFactory
merge SwXParaFrameEnumeration with SwXParaFrameEnumerationImpl
merge SwXParagraphEnumeration with SwXParagraphEnumerationImpl
merge SwXTextRanges with SwXTextRangesImpl

2
editeng/source/xml/xmltxtexp.cxx
View File

@ -193,7 +193,7 @@ SvxSimpleUnoModel::~SvxSimpleUnoModel()
{
}
// XMultiServiceFactory ( SvxFmMSFactory )
// XMultiServiceFactory ( SvxUnoDrawMSFactory )
uno::Reference< uno::XInterface > SAL_CALL SvxSimpleUnoModel::createInstance( const OUString& aServiceSpecifier )
throw(uno::Exception, uno::RuntimeException, std::exception)
{

40
include/svx/fmdmod.hxx
View File

@ -1,40 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_SVX_FMDMOD_HXX
#define INCLUDED_SVX_FMDMOD_HXX
#include <svx/unomod.hxx>
#include <svx/svxdllapi.h>
class SVX_DLLPUBLIC SvxFmMSFactory : public SvxUnoDrawMSFactory
{
public:
SvxFmMSFactory() {};
virtual ~SvxFmMSFactory() {}
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance(const OUString& ServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
#endif // INCLUDED_SVX_FMDMOD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

6
include/svx/unomodel.hxx
View File

@ -26,13 +26,13 @@
#include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <sfx2/sfxbasemodel.hxx>
#include <svx/fmdmod.hxx>
#include <svx/svxdllapi.h>
#include <svx/unomod.hxx>
class SdrModel;
class SVX_DLLPUBLIC SvxUnoDrawingModel : public SfxBaseModel, // implements SfxListener, OWEAKOBJECT & other
public SvxFmMSFactory,
public SvxUnoDrawMSFactory,
public ::com::sun::star::drawing::XDrawPagesSupplier,
public ::com::sun::star::lang::XServiceInfo,
public ::com::sun::star::ucb::XAnyCompareFactory
@ -76,7 +76,7 @@ public:
// XDrawPagesSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > SAL_CALL getDrawPages( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XMultiServiceFactory ( SvxFmMSFactory )
// XMultiServiceFactory ( SvxUnoDrawMSFactory )
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;

4
sc/inc/docuno.hxx
View File

@ -23,7 +23,6 @@
#include "address.hxx"
#include <sfx2/sfxbasemodel.hxx>
#include <svl/lstner.hxx>
#include <svx/fmdmod.hxx>
#include <com/sun/star/view/XRenderable.hpp>
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
#include <com/sun/star/document/XActionLockable.hpp>
@ -53,6 +52,7 @@
#include <svl/itemprop.hxx>
#include <vcl/event.hxx>
#include <vcl/ITiledRenderable.hxx>
#include <svx/unomod.hxx>
#include "drwlayer.hxx"
class ScDocShell;
@ -81,7 +81,7 @@ class SC_DLLPUBLIC ScModelObj : public SfxBaseModel,
public com::sun::star::view::XRenderable,
public com::sun::star::document::XLinkTargetSupplier,
public com::sun::star::beans::XPropertySet,
public SvxFmMSFactory, ///< derived from XMultiServiceFactory
public SvxUnoDrawMSFactory, ///< derived from XMultiServiceFactory
public com::sun::star::lang::XServiceInfo,
public ::com::sun::star::util::XChangesNotifier,
public com::sun::star::sheet::opencl::XOpenCLSelection

10
sc/source/ui/unoobj/docuno.cxx
View File

@ -2384,14 +2384,14 @@ css::uno::Reference<css::uno::XInterface> ScModelObj::create(
}
else
{
// alles was ich nicht kenn, werf ich der SvxFmMSFactory an den Hals,
// alles was ich nicht kenn, werf ich der SvxUnoDrawMSFactory an den Hals,
// da wird dann 'ne Exception geworfen, wenn's nicht passt...
try
{
xRet = arguments == 0
? SvxFmMSFactory::createInstance(aServiceSpecifier)
: SvxFmMSFactory::createInstanceWithArguments(
? SvxUnoDrawMSFactory::createInstance(aServiceSpecifier)
: SvxUnoDrawMSFactory::createInstanceWithArguments(
aServiceSpecifier, *arguments);
// extra block to force deletion of the temporary before ScShapeObj ctor (setDelegator)
}
@ -2450,10 +2450,10 @@ uno::Sequence<OUString> SAL_CALL ScModelObj::getAvailableServiceNames()
//! warum sind die Parameter bei concatServiceNames nicht const ???
//! return concatServiceNames( ScServiceProvider::GetAllServiceNames(),
//! SvxFmMSFactory::getAvailableServiceNames() );
//! SvxUnoDrawMSFactory::getAvailableServiceNames() );
uno::Sequence<OUString> aMyServices(ScServiceProvider::GetAllServiceNames());
uno::Sequence<OUString> aDrawServices(SvxFmMSFactory::getAvailableServiceNames());
uno::Sequence<OUString> aDrawServices(SvxUnoDrawMSFactory::getAvailableServiceNames());
return concatServiceNames( aMyServices, aDrawServices );
}

6
sd/source/ui/inc/unomodel.hxx
View File

@ -43,7 +43,7 @@
#include <svl/lstner.hxx>
#include <sfx2/sfxbasemodel.hxx>
#include <svx/fmdmod.hxx>
#include <svx/unomod.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 SvxFmMSFactory,
public SvxUnoDrawMSFactory,
public ::com::sun::star::drawing::XDrawPageDuplicator,
public ::com::sun::star::drawing::XLayerSupplier,
public ::com::sun::star::drawing::XMasterPagesSupplier,
@ -191,7 +191,7 @@ public:
// XPresentationSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation > SAL_CALL getPresentation( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XMultiServiceFactory ( SvxFmMSFactory )
// XMultiServiceFactory ( SvxUnoDrawMSFactory )
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::uno::Reference<css::uno::XInterface> SAL_CALL
createInstanceWithArguments(

8
sd/source/ui/unoidl/unomodel.cxx
View File

@ -815,7 +815,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdXImpressDocument::getHandoutMast
return xPage;
}
// XMultiServiceFactory ( SvxFmMSFactory )
// XMultiServiceFactory ( SvxUnoDrawMSFactory )
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 = SvxFmMSFactory::createInstance( aServiceSpecifier );
xRet = SvxUnoDrawMSFactory::createInstance( aServiceSpecifier );
}
uno::Reference< drawing::XShape > xShape( xRet, uno::UNO_QUERY );
@ -1111,7 +1111,7 @@ SdXImpressDocument::createInstanceWithArguments(
{
return create(ServiceSpecifier, arg);
}
return SvxFmMSFactory::createInstanceWithArguments(
return SvxUnoDrawMSFactory::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( SvxFmMSFactory::getAvailableServiceNames() );
const uno::Sequence< OUString > aSNS_ORG( SvxUnoDrawMSFactory::getAvailableServiceNames() );
uno::Sequence< OUString > aSNS( mbImpressDoc ? (36) : (19) );

1
svx/Library_svxcore.mk
View File

@ -427,7 +427,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/form/delayedevent \
svx/source/form/fmcontrolbordermanager \
svx/source/form/fmcontrollayout \
svx/source/form/fmdmod \
svx/source/form/fmdocumentclassification \
svx/source/form/fmdpage \
svx/source/form/fmexch \

100
svx/source/form/fmdmod.cxx
View File

@ -1,100 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <sal/macros.h>
#include <svx/fmdmod.hxx>
#include "fmservs.hxx"
#include <fmobj.hxx>
#include <svx/unoshape.hxx>
#include <comphelper/processfactory.hxx>
#include <svx/fmglob.hxx>
using namespace ::svxform;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxFmMSFactory::createInstance(const OUString& rServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception )
{
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xRet;
if ( rServiceSpecifier.startsWith( "com.sun.star.form.component." ) )
{
css::uno::Reference<css::uno::XComponentContext> xContext = comphelper::getProcessComponentContext();
xRet = xContext->getServiceManager()->createInstanceWithContext(rServiceSpecifier, xContext);
}
else if ( rServiceSpecifier == "com.sun.star.drawing.ControlShape" )
{
SdrObject* pObj = new FmFormObj();
xRet = static_cast<cppu::OWeakObject*>(static_cast<SvxShape_UnoImplHelper*>(new SvxShapeControl(pObj)));
}
if (!xRet.is())
xRet = SvxUnoDrawMSFactory::createInstance(rServiceSpecifier);
return xRet;
}
// Encapsulation violation: We *know* that
// SvxUnoDrawMSFactory::createInstanceWithArguments() always throws.
SAL_WNOUNREACHABLE_CODE_PUSH
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxFmMSFactory::createInstanceWithArguments(const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception )
{
return SvxUnoDrawMSFactory::createInstanceWithArguments(ServiceSpecifier, Arguments );
}
SAL_WNOUNREACHABLE_CODE_POP
::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmMSFactory::getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception )
{
static const OUString aSvxComponentServiceNameList[] =
{
OUString(FM_SUN_COMPONENT_TEXTFIELD),
OUString(FM_SUN_COMPONENT_FORM),
OUString(FM_SUN_COMPONENT_LISTBOX),
OUString(FM_SUN_COMPONENT_COMBOBOX),
OUString(FM_SUN_COMPONENT_RADIOBUTTON),
OUString(FM_SUN_COMPONENT_GROUPBOX),
OUString(FM_SUN_COMPONENT_FIXEDTEXT),
OUString(FM_SUN_COMPONENT_COMMANDBUTTON),
OUString(FM_SUN_COMPONENT_CHECKBOX),
OUString(FM_SUN_COMPONENT_GRIDCONTROL),
OUString(FM_SUN_COMPONENT_IMAGEBUTTON),
OUString(FM_SUN_COMPONENT_FILECONTROL),
OUString(FM_SUN_COMPONENT_TIMEFIELD),
OUString(FM_SUN_COMPONENT_DATEFIELD),
OUString(FM_SUN_COMPONENT_NUMERICFIELD),
OUString(FM_SUN_COMPONENT_CURRENCYFIELD),
OUString(FM_SUN_COMPONENT_PATTERNFIELD),
OUString(FM_SUN_COMPONENT_HIDDENCONTROL),
OUString(FM_SUN_COMPONENT_IMAGECONTROL)
};
static const sal_uInt16 nSvxComponentServiceNameListCount = sizeof(aSvxComponentServiceNameList) / sizeof ( aSvxComponentServiceNameList[0] );
::com::sun::star::uno::Sequence< OUString > aSeq( nSvxComponentServiceNameListCount );
OUString* pStrings = aSeq.getArray();
for( sal_uInt16 nIdx = 0; nIdx < nSvxComponentServiceNameListCount; nIdx++ )
pStrings[nIdx] = aSvxComponentServiceNameList[nIdx];
::com::sun::star::uno::Sequence< OUString > aParentSeq( SvxUnoDrawMSFactory::getAvailableServiceNames() );
return concatServiceNames( aParentSeq, aSeq );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

61
svx/source/unodraw/unomod.cxx
View File

@ -26,6 +26,7 @@
#include <svtools/unoevent.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/servicehelper.hxx>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/implbase.hxx>
@ -50,6 +51,8 @@
#include <svx/svdpage.hxx>
#include <svx/unoshape.hxx>
#include <svx/xmlgrhlp.hxx>
#include <fmobj.hxx>
#include "fmservs.hxx"
#include <com/sun/star/text/textfield/Type.hpp>
@ -196,10 +199,23 @@ css::uno::Reference<css::uno::XInterface> create(
}
uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstance( const OUString& rServiceSpecifier )
uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstance(const OUString& rServiceSpecifier)
throw( uno::Exception, uno::RuntimeException, std::exception )
{
return create(rServiceSpecifier, "");
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xRet;
if ( rServiceSpecifier.startsWith( "com.sun.star.form.component." ) )
{
css::uno::Reference<css::uno::XComponentContext> xContext = comphelper::getProcessComponentContext();
xRet = xContext->getServiceManager()->createInstanceWithContext(rServiceSpecifier, xContext);
}
else if ( rServiceSpecifier == "com.sun.star.drawing.ControlShape" )
{
SdrObject* pObj = new FmFormObj();
xRet = static_cast<cppu::OWeakObject*>(static_cast<SvxShape_UnoImplHelper*>(new SvxShapeControl(pObj)));
}
if (!xRet.is())
xRet = create(rServiceSpecifier, "");
return xRet;
}
uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createTextField( const OUString& ServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
@ -220,12 +236,45 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstanceWi
throw lang::NoSupportException();
}
uno::Sequence< OUString > SAL_CALL SvxUnoDrawMSFactory::getAvailableServiceNames()
throw( uno::RuntimeException, std::exception )
{
return UHashMap::getServiceNames();
static const OUString aSvxComponentServiceNameList[] =
{
OUString(FM_SUN_COMPONENT_TEXTFIELD),
OUString(FM_SUN_COMPONENT_FORM),
OUString(FM_SUN_COMPONENT_LISTBOX),
OUString(FM_SUN_COMPONENT_COMBOBOX),
OUString(FM_SUN_COMPONENT_RADIOBUTTON),
OUString(FM_SUN_COMPONENT_GROUPBOX),
OUString(FM_SUN_COMPONENT_FIXEDTEXT),
OUString(FM_SUN_COMPONENT_COMMANDBUTTON),
OUString(FM_SUN_COMPONENT_CHECKBOX),
OUString(FM_SUN_COMPONENT_GRIDCONTROL),
OUString(FM_SUN_COMPONENT_IMAGEBUTTON),
OUString(FM_SUN_COMPONENT_FILECONTROL),
OUString(FM_SUN_COMPONENT_TIMEFIELD),
OUString(FM_SUN_COMPONENT_DATEFIELD),
OUString(FM_SUN_COMPONENT_NUMERICFIELD),
OUString(FM_SUN_COMPONENT_CURRENCYFIELD),
OUString(FM_SUN_COMPONENT_PATTERNFIELD),
OUString(FM_SUN_COMPONENT_HIDDENCONTROL),
OUString(FM_SUN_COMPONENT_IMAGECONTROL)
};
static const sal_uInt16 nSvxComponentServiceNameListCount = SAL_N_ELEMENTS(aSvxComponentServiceNameList);
uno::Sequence< OUString > aSeq( nSvxComponentServiceNameListCount );
OUString* pStrings = aSeq.getArray();
for( sal_uInt16 nIdx = 0; nIdx < nSvxComponentServiceNameListCount; nIdx++ )
pStrings[nIdx] = aSvxComponentServiceNameList[nIdx];
uno::Sequence< OUString > aParentSeq( UHashMap::getServiceNames() );
return concatServiceNames( aParentSeq, aSeq );
}
uno::Sequence< OUString > SvxUnoDrawMSFactory::concatServiceNames( uno::Sequence< OUString >& rServices1, uno::Sequence< OUString >& rServices2 ) throw()
{
const sal_Int32 nLen1 = rServices1.getLength();
@ -349,7 +398,7 @@ uno::Reference< drawing::XDrawPages > SAL_CALL SvxUnoDrawingModel::getDrawPages(
return xDrawPages;
}
// XMultiServiceFactory ( SvxFmMSFactory )
// XMultiServiceFactory ( SvxUnoDrawMSFactory )
uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawingModel::createInstance( const OUString& aServiceSpecifier )
throw(uno::Exception, uno::RuntimeException, std::exception)
{
@ -503,7 +552,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawingModel::createInstance( c
}
else
{
xRet = SvxFmMSFactory::createInstance( aServiceSpecifier );
xRet = SvxUnoDrawMSFactory::createInstance( aServiceSpecifier );
}
return xRet;
@ -512,7 +561,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawingModel::createInstance( c
uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getAvailableServiceNames()
throw(uno::RuntimeException, std::exception)
{
const uno::Sequence< OUString > aSNS_ORG( SvxFmMSFactory::getAvailableServiceNames() );
const uno::Sequence< OUString > aSNS_ORG( SvxUnoDrawMSFactory::getAvailableServiceNames() );
uno::Sequence< OUString > aSNS( 21 );

4
sw/inc/unotxdoc.hxx
View File

@ -62,7 +62,7 @@
#include <com/sun/star/document/XDocumentLanguages.hpp>
#include <com/sun/star/util/XCloneable.hpp>
#include <svl/itemprop.hxx>
#include <svx/fmdmod.hxx>
#include <svx/unomod.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 SvxFmMSFactory,
public SvxUnoDrawMSFactory,
public SfxBaseModel,
public vcl::ITiledRenderable,
public ::com::sun::star::tiledrendering::XTiledRenderable

8
sw/source/uibase/uno/unotxdoc.cxx
View File

@ -1709,8 +1709,8 @@ css::uno::Reference<css::uno::XInterface> SwXTextDocument::create(
}
Reference<XInterface> xTmp(
arguments == 0
? SvxFmMSFactory::createInstance(aTmpServiceName)
: SvxFmMSFactory::createInstanceWithArguments(
? SvxUnoDrawMSFactory::createInstance(aTmpServiceName)
: SvxUnoDrawMSFactory::createInstanceWithArguments(
aTmpServiceName, *arguments));
if (rServiceName == "com.sun.star.drawing.GroupShape"
|| rServiceName == "com.sun.star.drawing.Shape3DSceneObject")
@ -1744,7 +1744,7 @@ Sequence< OUString > SwXTextDocument::getAvailableServiceNames()
static Sequence< OUString > aServices;
if ( aServices.getLength() == 0 )
{
Sequence< OUString > aRet = SvxFmMSFactory::getAvailableServiceNames();
Sequence< OUString > aRet = SvxUnoDrawMSFactory::getAvailableServiceNames();
OUString* pRet = aRet.getArray();
for ( sal_Int32 i = 0; i < aRet.getLength(); ++i )
{
@ -1756,7 +1756,7 @@ Sequence< OUString > SwXTextDocument::getAvailableServiceNames()
}
}
Sequence< OUString > aOwn = SwXServiceProvider::GetAllServiceNames();
aServices = SvxFmMSFactory::concatServiceNames(aRet, aOwn);
aServices = SvxUnoDrawMSFactory::concatServiceNames(aRet, aOwn);
}
return aServices;