diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-08-20 21:06:42 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-22 09:39:14 +0100 |
commit | dea4557b92e849c7e16e831e3119379536b6d4c0 (patch) | |
tree | c772e57b86000758ca55940f916f3ee715945266 /comphelper | |
parent | callcatcher: unused .cxx .hxx combo in xmloff (diff) | |
download | core-dea4557b92e849c7e16e831e3119379536b6d4c0.tar.gz core-dea4557b92e849c7e16e831e3119379536b6d4c0.zip |
callcatcher: and so now unused
Diffstat (limited to 'comphelper')
-rw-r--r-- | comphelper/Library_comphelp.mk | 1 | ||||
-rw-r--r-- | comphelper/Package_inc.mk | 1 | ||||
-rw-r--r-- | comphelper/inc/comphelper/componentfactory.hxx | 83 | ||||
-rw-r--r-- | comphelper/source/processfactory/componentfactory.cxx | 62 |
4 files changed, 0 insertions, 147 deletions
diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk index 80e233d1640f..ac1067b48ad3 100644 --- a/comphelper/Library_comphelp.mk +++ b/comphelper/Library_comphelp.mk @@ -123,7 +123,6 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\ comphelper/source/misc/weak \ comphelper/source/misc/weakeventlistener \ comphelper/source/officeinstdir/officeinstallationdirectories \ - comphelper/source/processfactory/componentfactory \ comphelper/source/processfactory/processfactory \ comphelper/source/property/ChainablePropertySet \ comphelper/source/property/ChainablePropertySetInfo \ diff --git a/comphelper/Package_inc.mk b/comphelper/Package_inc.mk index 25c6f4b8e538..3819721c5e90 100644 --- a/comphelper/Package_inc.mk +++ b/comphelper/Package_inc.mk @@ -105,7 +105,6 @@ $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/logging.hxx,comp $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/sharedmutex.hxx,comphelper/sharedmutex.hxx)) $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/documentinfo.hxx,comphelper/documentinfo.hxx)) $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/weakeventlistener.hxx,comphelper/weakeventlistener.hxx)) -$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/componentfactory.hxx,comphelper/componentfactory.hxx)) $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/containermultiplexer.hxx,comphelper/containermultiplexer.hxx)) $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/broadcasthelper.hxx,comphelper/broadcasthelper.hxx)) $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/numbers.hxx,comphelper/numbers.hxx)) diff --git a/comphelper/inc/comphelper/componentfactory.hxx b/comphelper/inc/comphelper/componentfactory.hxx deleted file mode 100644 index 03381a08da43..000000000000 --- a/comphelper/inc/comphelper/componentfactory.hxx +++ /dev/null @@ -1,83 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _COMPHELPER_COMPONENTFACTORY_HXX -#define _COMPHELPER_COMPONENTFACTORY_HXX -#include "comphelper/comphelperdllapi.h" - -#include <com/sun/star/lang/XSingleServiceFactory.hpp> - - -/** - * @Descr - * Utilities to get an instance of a component if a ProcessServiceFactory - * is not available like it is the case in "small tools" as the Setup. - */ -#include <com/sun/star/uno/Reference.h> - - -#ifdef UNX -// "libNAMExy.so" (__DLLEXTENSION == "xy.so") -#define LLCF_LIBNAME( name ) "lib" name __DLLEXTENSION -#else -// "NAMExy.dll" (__DLLEXTENSION == "xy") -#define LLCF_LIBNAME( name ) name __DLLEXTENSION ".dll" -#endif - - -namespace rtl { - class OUString; -} -namespace com { namespace sun { namespace star { - namespace lang { - class XSingleServiceFactory; - class XMultiServiceFactory; - } - namespace registry { - class XRegistryKey; - } -}}} - - -namespace comphelper -{ - -::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > - loadLibComponentFactory( - const ::rtl::OUString & rLibraryName, - const ::rtl::OUString & rImplementationName, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xSF, - const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > & xKey - ); - - -} // namespace comphelper - -#endif // _COMPHELPER_COMPONENTFACTORY_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/processfactory/componentfactory.cxx b/comphelper/source/processfactory/componentfactory.cxx deleted file mode 100644 index c7d41e8d77bf..000000000000 --- a/comphelper/source/processfactory/componentfactory.cxx +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_comphelper.hxx" -#include <comphelper/componentfactory.hxx> -#include <comphelper/processfactory.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> - -#include <com/sun/star/registry/XRegistryKey.hpp> -#include <cppuhelper/shlib.hxx> - - -using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::registry; -using namespace ::rtl; - - -namespace comphelper -{ - -Reference< XSingleServiceFactory > loadLibComponentFactory( - const OUString & rLibName, - const OUString & rImplName, - const Reference< XMultiServiceFactory > & xSF, - const Reference< XRegistryKey > & xKey - ) -{ - return Reference< XSingleServiceFactory >( ::cppu::loadSharedLibComponentFactory( - rLibName, OUString(), rImplName, xSF, xKey ), UNO_QUERY ); -} - -} // namespace comphelper - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |