diff --git a/dbaccess/Library_dbahsql.mk b/dbaccess/Library_dbahsql.mk index 05b99126c62e..e6c353c63f40 100644 --- a/dbaccess/Library_dbahsql.mk +++ b/dbaccess/Library_dbahsql.mk @@ -22,6 +22,7 @@ $(eval $(call gb_Library_use_libraries,dbahsql,\ comphelper \ cppu \ cppuhelper \ + fwk \ sal \ salhelper \ dbtools \ diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx index 112c79947393..7a96d9172d3f 100644 --- a/dbaccess/source/ui/misc/databaseobjectview.cxx +++ b/dbaccess/source/ui/misc/databaseobjectview.cxx @@ -22,7 +22,6 @@ #include #include -#include #include #include #include @@ -34,6 +33,7 @@ #include #include #include +#include namespace dbaui { @@ -103,7 +103,7 @@ namespace dbaui // if we have no externally provided frame, create one if ( !m_xFrameLoader.is() ) { - Reference< XSingleServiceFactory > xFact = TaskCreator::create(m_xORB); + rtl::Reference< TaskCreatorService > xFact = new TaskCreatorService(m_xORB); Sequence< Any > lArgs{ Any(NamedValue(u"ParentFrame"_ustr, Any(m_xParentFrame))), Any(NamedValue(u"TopWindow"_ustr, Any(true))), Any(NamedValue(u"SupportPersistentWindowState"_ustr, diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk index 18cf55518d44..c06d229a0113 100644 --- a/embeddedobj/Library_embobj.mk +++ b/embeddedobj/Library_embobj.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,embobj,\ comphelper \ cppu \ cppuhelper \ + fwk \ sal \ svt \ utl \ diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index eddc8a47ca0f..6ed4d38ba0bc 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -18,7 +18,6 @@ */ #include -#include #include #include #include @@ -64,6 +63,7 @@ #include #include +#include #include #include @@ -433,7 +433,7 @@ bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >& xPar uno::Reference< frame::XFrame > xContFrame( xContDisp, uno::UNO_QUERY ); // create a frame based on the specified window - uno::Reference< lang::XSingleServiceFactory > xFrameFact = frame::TaskCreator::create(m_xContext); + rtl::Reference< TaskCreatorService > xFrameFact = new TaskCreatorService(m_xContext); uno::Sequence< uno::Any > aArgs( xContFrame.is() ? 2 : 1 ); auto pArgs = aArgs.getArray(); @@ -812,7 +812,7 @@ uno::Reference< frame::XFrame > const & DocumentHolder::GetDocFrame() // the frame for outplace activation if ( !m_xFrame.is() ) { - uno::Reference< lang::XSingleServiceFactory > xFrameFact = frame::TaskCreator::create(m_xContext); + rtl::Reference< TaskCreatorService > xFrameFact = new TaskCreatorService(m_xContext); m_xFrame.set(xFrameFact->createInstanceWithArguments( m_aOutplaceFrameProps ), uno::UNO_QUERY_THROW); diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx index 167e345e051e..cd0a511b1e76 100644 --- a/framework/source/classes/taskcreator.cxx +++ b/framework/source/classes/taskcreator.cxx @@ -18,12 +18,11 @@ */ #include -#include +#include #include #include #include -#include #include #include #include diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index 2cd7519d0b73..70908178da0f 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include #include #include #include @@ -284,12 +284,4 @@ OUString TaskCreatorService::impl_filterNames( const OUString& sName ) return sFiltered; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * -com_sun_star_comp_framework_TaskCreator_get_implementation( - css::uno::XComponentContext *context, - css::uno::Sequence const &) -{ - return cppu::acquire(new TaskCreatorService(context)); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/util/fwk.component b/framework/util/fwk.component index b8fef412703d..eccbe5e2694b 100644 --- a/framework/util/fwk.component +++ b/framework/util/fwk.component @@ -149,11 +149,6 @@ constructor="com_sun_star_comp_framework_StatusIndicatorFactory_get_implementation"> - - - diff --git a/framework/inc/services/taskcreatorsrv.hxx b/include/framework/taskcreatorsrv.hxx similarity index 78% rename from framework/inc/services/taskcreatorsrv.hxx rename to include/framework/taskcreatorsrv.hxx index e66cda211378..01b8ba18aaa3 100644 --- a/framework/inc/services/taskcreatorsrv.hxx +++ b/include/framework/taskcreatorsrv.hxx @@ -19,18 +19,16 @@ #pragma once +#include "fwkdllapi.h" #include -#include #include #include #include -#include -typedef comphelper::WeakComponentImplHelper +typedef comphelper::WeakComponentImplHelper TaskCreatorService_BASE; -class TaskCreatorService : public TaskCreatorService_BASE +class FWK_DLLPUBLIC TaskCreatorService : public TaskCreatorService_BASE { private: /** @short the global uno service manager. @@ -41,21 +39,6 @@ private: public: explicit TaskCreatorService(css::uno::Reference xContext); - virtual OUString SAL_CALL getImplementationName() override - { - return u"com.sun.star.comp.framework.TaskCreator"_ustr; - } - - virtual sal_Bool SAL_CALL supportsService(OUString const& ServiceName) override - { - return cppu::supportsService(this, ServiceName); - } - - virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() override - { - return { u"com.sun.star.frame.TaskCreator"_ustr }; - } - // XSingleServiceFactory virtual css::uno::Reference SAL_CALL createInstance() override; diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 76907d1defaa..b25e2a261ef4 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -199,7 +199,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/frame,\ OfficeFrameLoader \ SessionListener \ StartModule \ - TaskCreator \ UICommandDescription \ theAutoRecovery \ theDesktop \ diff --git a/offapi/com/sun/star/frame/TaskCreator.idl b/offapi/com/sun/star/frame/TaskCreator.idl deleted file mode 100644 index f7cba87cd926..000000000000 --- a/offapi/com/sun/star/frame/TaskCreator.idl +++ /dev/null @@ -1,31 +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 . - */ - - - module com { module sun { module star { module frame { - -/** - @since LibreOffice 4.1 - */ -service TaskCreator : com::sun::star::lang::XSingleServiceFactory; - - -}; }; }; }; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 638d9b98a26d..8671942bf7aa 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -215,7 +215,6 @@ core_constructor_list = [ "com_sun_star_comp_framework_ToolbarAsMenuController_get_implementation", "com_sun_star_comp_framework_ResourceMenuController_get_implementation", "com_sun_star_comp_framework_StatusIndicatorFactory_get_implementation", - "com_sun_star_comp_framework_TaskCreator_get_implementation", "com_sun_star_comp_framework_ToolBarControllerFactory_get_implementation", "com_sun_star_comp_framework_UIConfigurationManager_get_implementation", "com_sun_star_comp_framework_UIElementFactoryManager_get_implementation",