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

Minimize the constructor functions to a bare minimum.

Browse Source 
Most of the constructors are supposed to be only a call of

  new TheInstance(arguments)

or an equivalent; so let's just change the constructor caller accordingly, to
accept unacquired new instance.

If there are exceptions that need to do more heavy lifting, they do not have
to use the constructor feature, or there can be a wrapper for the real
implementation, doing the additional work in their (C++) constructor.

Change-Id: I035c378778aeda60d15af4e56ca3761c586d5ded
This commit is contained in:
Jan Holesovsky 2014-01-16 16:26:55 +01:00
parent ef602ba8ce
commit 306efefe22
46 changed files with 66 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codemaker/source/cppumaker/cpputype.cxx
View File

@ -3463,7 +3463,7 @@ void ServiceType::dumpHxxFile(
"LO_URE_CTOR_FUN_")
<< name_.replaceAll(".", "_dot_")
<< (")(the_context.get(), ::css::uno::Sequence<"
" ::css::uno::Any >())), ::SAL_NO_ACQUIRE),"
" ::css::uno::Any >()))),"
" ::css::uno::UNO_QUERY);\n#else\n")
<< indent() << "the_instance = ::css::uno::Reference< "
<< scopedBaseName
@ -3606,7 +3606,7 @@ void ServiceType::dumpHxxFile(
} else {
o << "the_arguments";
}
o << ")), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);\n" << indent()
o << "))), ::css::uno::UNO_QUERY);\n" << indent()
<< ("::css::uno::Reference< ::css::lang::XInitialization > "
"init(the_instance, ::css::uno::UNO_QUERY);\n")
<< indent() << "if (init.is()) {\n"

11
cppuhelper/source/servicemanager.cxx
View File

@ -706,8 +706,7 @@ cppuhelper::ServiceManager::Data::Implementation::createInstance(
if (constructor != 0) {
return css::uno::Reference<css::uno::XInterface>(
(*constructor)(
context.get(), css::uno::Sequence<css::uno::Any>()),
SAL_NO_ACQUIRE);
context.get(), css::uno::Sequence<css::uno::Any>()));
}
if (factory1.is()) {
return factory1->createInstanceWithContext(context);
@ -730,8 +729,7 @@ cppuhelper::ServiceManager::Data::Implementation::createInstance(
if (constructor != 0) {
singleton.set(
(*constructor)(
context.get(), css::uno::Sequence<css::uno::Any>()),
SAL_NO_ACQUIRE);
context.get(), css::uno::Sequence<css::uno::Any>()));
} else if (factory1.is()) {
singleton = factory1->createInstanceWithContext(context);
} else if (factory2.is()) {
@ -761,7 +759,7 @@ cppuhelper::ServiceManager::Data::Implementation::createInstanceWithArguments(
// should be removed again once XInitialization-based
// implementations have become rare:
css::uno::Reference<css::uno::XInterface> inst(
(*constructor)(context.get(), arguments), SAL_NO_ACQUIRE);
(*constructor)(context.get(), arguments));
css::uno::Reference<css::lang::XInitialization> init(
inst, css::uno::UNO_QUERY);
if (init.is()) {
@ -793,8 +791,7 @@ cppuhelper::ServiceManager::Data::Implementation::createInstanceWithArguments(
}
if (constructor != 0) {
//HACK: see above
singleton.set(
(*constructor)(context.get(), arguments), SAL_NO_ACQUIRE);
singleton.set((*constructor)(context.get(), arguments));
css::uno::Reference<css::lang::XInitialization> init(
singleton, css::uno::UNO_QUERY);
if (init.is()) {

6
include/sfx2/app.hxx
View File

@ -189,10 +189,8 @@ public:
static ErrCode CallAppBasic( const OUString& i_macroName, SbxArray* i_args = NULL, SbxValue* i_ret = NULL )
{ return CallBasic( i_macroName, SfxApplication::GetOrCreate()->GetBasicManager(), i_args, i_ret ); }
BasicManager* GetBasicManager();
com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer >
GetDialogContainer();
com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer >
GetBasicContainer();
com::sun::star::script::XLibraryContainer * GetDialogContainer();
com::sun::star::script::XLibraryContainer * GetBasicContainer();
StarBASIC* GetBasic();
sal_uInt16 SaveBasicAndDialogContainer() const;

4
sax/source/expatwrap/sax_expat.cxx
View File

@ -1025,9 +1025,7 @@ com_sun_star_comp_extensions_xml_sax_ParserExpat_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<SaxExpatParser> x(new SaxExpatParser);
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new SaxExpatParser);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
sax/source/expatwrap/saxwriter.cxx
View File

@ -1375,9 +1375,7 @@ com_sun_star_extensions_xml_sax_Writer_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<SAXWriter> x(new SAXWriter);
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new SAXWriter);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
sax/source/fastparser/fastparser.cxx
View File

@ -1431,9 +1431,7 @@ com_sun_star_comp_extensions_xml_sax_FastParser_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<FastSaxParser> x(new FastSaxParser);
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new FastSaxParser);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

10
sfx2/source/appl/appbas.cxx
View File

@ -127,11 +127,10 @@ BasicManager* SfxApplication::GetBasicManager()
//--------------------------------------------------------------------
Reference< XLibraryContainer > SfxApplication::GetDialogContainer()
XLibraryContainer * SfxApplication::GetDialogContainer()
{
#ifdef DISABLE_SCRIPTING
Reference< XLibraryContainer > dummy;
return dummy;
return NULL;
#else
if ( !pAppData_Impl->pBasicManager->isValid() )
GetBasicManager();
@ -141,11 +140,10 @@ Reference< XLibraryContainer > SfxApplication::GetDialogContainer()
//--------------------------------------------------------------------
Reference< XLibraryContainer > SfxApplication::GetBasicContainer()
XLibraryContainer * SfxApplication::GetBasicContainer()
{
#ifdef DISABLE_SCRIPTING
Reference< XLibraryContainer > dummy;
return dummy;
return NULL;
#else
if ( !pAppData_Impl->pBasicManager->isValid() )
GetBasicManager();

10
sfx2/source/appl/appbaslib.cxx
View File

@ -121,7 +121,7 @@ void SfxBasicManagerHolder::storeLibrariesToStorage( const Reference< XStorage >
#endif
}
Reference< XLibraryContainer > SfxBasicManagerHolder::getLibraryContainer( ContainerType _eType )
XLibraryContainer * SfxBasicManagerHolder::getLibraryContainer( ContainerType _eType )
{
OSL_PRECOND( isValid(), "SfxBasicManagerHolder::getLibraryContainer: not initialized!" );
@ -161,9 +161,7 @@ com_sun_star_comp_sfx2_ApplicationDialogLibraryContainer_get_implementation(
css::uno::Sequence<css::uno::Any> const &)
{
SFX_APP()->GetBasicManager();
Reference< XInterface > xRet( SFX_APP()->GetDialogContainer(), UNO_QUERY );
xRet->acquire();
return xRet.get();
return SFX_APP()->GetDialogContainer();
}
//============================================================================
@ -175,9 +173,7 @@ com_sun_star_comp_sfx2_ApplicationScriptLibraryContainer_get_implementation(
css::uno::Sequence<css::uno::Any> const &)
{
SFX_APP()->GetBasicManager();
Reference< XInterface > xRet( SFX_APP()->GetBasicContainer(), UNO_QUERY );
xRet->acquire();
return xRet.get();
return SFX_APP()->GetBasicContainer();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
sfx2/source/appl/appdispatchprovider.cxx
View File

@ -255,9 +255,7 @@ com_sun_star_comp_sfx2_AppDispatchProvider_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &arguments)
{
rtl::Reference<SfxAppDispatchProvider> x(new SfxAppDispatchProvider(arguments));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new SfxAppDispatchProvider(arguments));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
sfx2/source/appl/macroloader.cxx
View File

@ -341,9 +341,7 @@ com_sun_star_comp_sfx2_SfxMacroLoader_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &arguments)
{
rtl::Reference<SfxMacroLoader> x(new SfxMacroLoader(arguments));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new SfxMacroLoader(arguments));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
sfx2/source/appl/shutdownicon.cxx
View File

@ -976,9 +976,7 @@ com_sun_star_comp_desktop_QuickstartWrapper_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<ShutdownIcon> x(new ShutdownIcon(context));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new ShutdownIcon(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
sfx2/source/appl/xpackcreator.cxx
View File

@ -178,9 +178,7 @@ com_sun_star_comp_embed_PackageStructureCreator_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<OPackageStructureCreator> x(new OPackageStructureCreator());
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new OPackageStructureCreator());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
sfx2/source/dialog/backingcomp.cxx
View File

@ -813,9 +813,7 @@ com_sun_star_comp_sfx2_BackingComp_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<BackingComp> x(new BackingComp(context));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new BackingComp(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

8
sfx2/source/doc/SfxDocumentMetaData.cxx
View File

@ -2319,9 +2319,7 @@ CompatWriterDocPropsImpl_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<CompatWriterDocPropsImpl> x(new CompatWriterDocPropsImpl(context));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new CompatWriterDocPropsImpl(context));
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
@ -2329,9 +2327,7 @@ SfxDocumentMetaData_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<SfxDocumentMetaData> x(new SfxDocumentMetaData(context));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new SfxDocumentMetaData(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
sfx2/source/doc/doctemplates.cxx
View File

@ -2900,9 +2900,7 @@ com_sun_star_comp_sfx2_DocumentTemplates_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<SfxDocTplService> x(new SfxDocTplService(context));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new SfxDocTplService(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
sfx2/source/doc/iframe.cxx
View File

@ -432,9 +432,7 @@ com_sun_star_comp_sfx2_IFrameObject_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &arguments)
{
rtl::Reference<IFrameObject> x(new IFrameObject(context, arguments));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new IFrameObject(context, arguments));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
sfx2/source/doc/ownsubfilterservice.cxx
View File

@ -126,9 +126,7 @@ com_sun_star_comp_document_OwnSubFilter_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &arguments)
{
rtl::Reference<OwnSubFilterService> x(new OwnSubFilterService(arguments));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new OwnSubFilterService(arguments));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
sfx2/source/doc/plugin.cxx
View File

@ -311,9 +311,7 @@ com_sun_star_comp_sfx2_PluginObject_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<PluginObject> x(new PluginObject());
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new PluginObject());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
sfx2/source/inc/appbaslib.hxx
View File

@ -59,7 +59,7 @@ public:
*/
void reset( BasicManager* _pBasicManager );
::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >
::com::sun::star::script::XLibraryContainer *
getLibraryContainer( ContainerType _eType );
/** calls the storeLibraries at both our script and basic library container

4
sfx2/source/view/frmload.cxx
View File

@ -778,9 +778,7 @@ com_sun_star_comp_office_FrameLoader_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<SfxFrameLoader_Impl> x(new SfxFrameLoader_Impl(context));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new SfxFrameLoader_Impl(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
stoc/source/defaultregistry/defaultregistry.cxx
View File

@ -1355,9 +1355,7 @@ com_sun_star_comp_stoc_NestedRegistry_get_implementation(
SAL_UNUSED_PARAMETER css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<NestedRegistryImpl> x(new NestedRegistryImpl);
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new NestedRegistryImpl);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
stoc/source/implementationregistration/implreg.cxx
View File

@ -1821,9 +1821,7 @@ com_sun_star_comp_stoc_ImplementationRegistration_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<ImplementationRegistration> x(new ImplementationRegistration(context));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new ImplementationRegistration(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
stoc/source/loader/dllcomponentloader.cxx
View File

@ -170,9 +170,7 @@ com_sun_star_comp_stoc_DLLComponentLoader_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<DllComponentLoader> x(new DllComponentLoader(context));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new DllComponentLoader(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
stoc/source/security/access_controller.cxx
View File

@ -984,9 +984,7 @@ com_sun_star_security_comp_stoc_AccessController_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<AccessController> x(new AccessController(context));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new AccessController(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
stoc/source/security/file_policy.cxx
View File

@ -545,9 +545,7 @@ com_sun_star_security_comp_stoc_FilePolicy_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<FilePolicy> x(new FilePolicy(context));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new FilePolicy(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

12
stoc/source/servicemanager/servicemanager.cxx
View File

@ -1676,9 +1676,7 @@ com_sun_star_comp_stoc_OServiceManager_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<OServiceManager> x(new OServiceManager(context));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new OServiceManager(context));
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
@ -1686,9 +1684,7 @@ com_sun_star_comp_stoc_ORegistryServiceManager_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<ORegistryServiceManager> x(new ORegistryServiceManager(context));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new ORegistryServiceManager(context));
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
@ -1696,9 +1692,7 @@ com_sun_star_comp_stoc_OServiceManagerWrapper_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<OServiceManagerWrapper> x(new OServiceManagerWrapper(context));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new OServiceManagerWrapper(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
stoc/source/simpleregistry/simpleregistry.cxx
View File

@ -1128,9 +1128,7 @@ com_sun_star_comp_stoc_SimpleRegistry_get_implementation(
SAL_UNUSED_PARAMETER css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<SimpleRegistry> x(new SimpleRegistry);
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new SimpleRegistry);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
svtools/source/filter/SvFilterOptionsDialog.cxx
View File

@ -304,9 +304,7 @@ com_sun_star_svtools_SvFilterOptionsDialog_get_implementation(
css::uno::XComponentContext * context,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<SvFilterOptionsDialog> x(new SvFilterOptionsDialog(context));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new SvFilterOptionsDialog(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
svtools/source/graphic/graphicunofactory.cxx
View File

@ -115,9 +115,7 @@ com_sun_star_graphic_GraphicObject_get_implementation(
SAL_UNUSED_PARAMETER css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &arguments)
{
rtl::Reference<GObjectImpl> x(new GObjectImpl(arguments));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new GObjectImpl(arguments));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
svtools/source/graphic/provider.cxx
View File

@ -861,9 +861,7 @@ com_sun_star_comp_graphic_GraphicProvider_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<GraphicProvider> x(new GraphicProvider);
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new GraphicProvider);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
svtools/source/graphic/renderer.cxx
View File

@ -297,9 +297,7 @@ com_sun_star_comp_graphic_GraphicRendererVCL_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<GraphicRendererVCL> x(new GraphicRendererVCL);
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new GraphicRendererVCL);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
svtools/source/hatchwindow/documentcloser.cxx
View File

@ -252,9 +252,7 @@ com_sun_star_comp_embed_DocumentCloser_get_implementation(
SAL_UNUSED_PARAMETER css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &arguments)
{
rtl::Reference<ODocumentCloser> x(new ODocumentCloser(arguments));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new ODocumentCloser(arguments));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
svtools/source/hatchwindow/hatchwindowfactory.cxx
View File

@ -89,9 +89,7 @@ com_sun_star_comp_embed_HatchWindowFactory_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<OHatchWindowFactory> x(new OHatchWindowFactory);
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new OHatchWindowFactory);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
svtools/source/uno/addrtempuno.cxx
View File

@ -228,9 +228,7 @@ com_sun_star_comp_svtools_OAddressBookSourceDialogUno_get_implementation(
css::uno::XComponentContext * context,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<OAddressBookSourceDialogUno> x(new OAddressBookSourceDialogUno(context));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new OAddressBookSourceDialogUno(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
svtools/source/uno/wizard/unowizard.cxx
View File

@ -502,9 +502,7 @@ com_sun_star_comp_svtools_uno_Wizard_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<Wizard> x(new Wizard(context));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new Wizard(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
svx/source/customshapes/EnhancedCustomShapeEngine.cxx
View File

@ -494,9 +494,7 @@ com_sun_star_drawing_EnhancedCustomShapeEngine_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<EnhancedCustomShapeEngine> x(new EnhancedCustomShapeEngine);
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new EnhancedCustomShapeEngine);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
svx/source/sdr/primitive2d/primitivefactory2d.cxx
View File

@ -93,9 +93,7 @@ com_sun_star_comp_graphic_PrimitiveFactory2D_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<PrimitiveFactory2D> x(new PrimitiveFactory2D);
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new PrimitiveFactory2D);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
svx/source/sidebar/PanelFactory.cxx
View File

@ -209,7 +209,5 @@ org_apache_openoffice_comp_svx_sidebar_PanelFactory_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<PanelFactory> x(new PanelFactory);
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new PanelFactory);
}

4
svx/source/tbxctrls/tbunocontroller.cxx
View File

@ -444,9 +444,7 @@ com_sun_star_svx_FontHeightToolBoxController_get_implementation(
css::uno::XComponentContext *rxContext,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<FontHeightToolBoxControl> x(new FontHeightToolBoxControl(rxContext));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new FontHeightToolBoxControl(rxContext));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

30
svx/source/tbxctrls/tbunosearchcontrollers.cxx
View File

@ -1055,9 +1055,7 @@ com_sun_star_svx_FindTextToolboxController_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<FindTextToolbarController> x(new FindTextToolbarController(context));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new FindTextToolbarController(context));
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
@ -1065,9 +1063,7 @@ com_sun_star_svx_ExitFindbarToolboxController_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<ExitSearchToolboxController> x(new ExitSearchToolboxController(context));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new ExitSearchToolboxController(context));
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
@ -1075,10 +1071,7 @@ com_sun_star_svx_UpSearchToolboxController_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<UpDownSearchToolboxController> x(new UpDownSearchToolboxController(
context, UpDownSearchToolboxController::UP));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new UpDownSearchToolboxController(context, UpDownSearchToolboxController::UP));
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
@ -1086,10 +1079,7 @@ com_sun_star_svx_DownSearchToolboxController_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<UpDownSearchToolboxController> x(new UpDownSearchToolboxController(
context, UpDownSearchToolboxController::DOWN));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new UpDownSearchToolboxController(context, UpDownSearchToolboxController::DOWN));
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
@ -1097,9 +1087,7 @@ com_sun_star_svx_MatchCaseToolboxController_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<MatchCaseToolboxController> x(new MatchCaseToolboxController(context));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new MatchCaseToolboxController(context));
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
@ -1107,9 +1095,7 @@ com_sun_star_svx_FindAllToolboxController_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<FindAllToolboxController> x(new FindAllToolboxController(context));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new FindAllToolboxController(context));
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
@ -1117,9 +1103,7 @@ com_sun_star_comp_svx_Impl_FindbarDispatcher_get_implementation(
SAL_UNUSED_PARAMETER css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<FindbarDispatcher> x(new FindbarDispatcher);
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new FindbarDispatcher);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
svx/source/unodraw/UnoGraphicExporter.cxx
View File

@ -1285,9 +1285,7 @@ com_sun_star_comp_Draw_GraphicExporter_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<GraphicExporter> x(new GraphicExporter);
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new GraphicExporter);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
svx/source/unodraw/recoveryui.cxx
View File

@ -425,9 +425,7 @@ com_sun_star_comp_svx_RecoveryUI_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<RecoveryUI> x(new RecoveryUI(context));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new RecoveryUI(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
svx/source/unodraw/unoctabl.cxx
View File

@ -190,9 +190,7 @@ com_sun_star_drawing_SvxUnoColorTable_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<SvxUnoColorTable> x(new SvxUnoColorTable);
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new SvxUnoColorTable);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
svx/source/unodraw/unoshcol.cxx
View File

@ -274,9 +274,7 @@ com_sun_star_drawing_SvxShapeCollection_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<SvxShapeCollection> x(new SvxShapeCollection);
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new SvxShapeCollection);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
svx/source/unogallery/unogalthemeprovider.cxx
View File

@ -236,9 +236,7 @@ com_sun_star_comp_gallery_GalleryThemeProvider_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<GalleryThemeProvider> x(new GalleryThemeProvider);
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new GalleryThemeProvider);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

10
svx/source/xml/xmlgrhlp.cxx
View File

@ -1055,10 +1055,7 @@ com_sun_star_comp_Svx_GraphicImportHelper_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<SvXMLGraphicImportExportHelper> x(
new SvXMLGraphicImportExportHelper(GRAPHICHELPER_MODE_READ));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new SvXMLGraphicImportExportHelper(GRAPHICHELPER_MODE_READ));
}
/** Create this with createInstanceWithArguments. service name
@ -1078,10 +1075,7 @@ com_sun_star_comp_Svx_GraphicExportHelper_get_implementation(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
rtl::Reference<SvXMLGraphicImportExportHelper> x(
new SvXMLGraphicImportExportHelper(GRAPHICHELPER_MODE_WRITE));
x->acquire();
return static_cast<cppu::OWeakObject *>(x.get());
return static_cast<cppu::OWeakObject *>(new SvXMLGraphicImportExportHelper(GRAPHICHELPER_MODE_WRITE));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */