ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

[API CHANGE] no need for TaskCreatorService to be exposed via UNO

Browse Source 
This is a purely internal usage thing.

Change-Id: I8d13d21c791bc88a2fc288fb97f7877eecab3e73
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186494
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2025-06-14 19:34:01 +02:00
parent 312ba0c765
commit 96b6d13c9a
11 changed files with 12 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbaccess/Library_dbahsql.mk
+1
View File
@@ -22,6 +22,7 @@ $(eval $(call gb_Library_use_libraries,dbahsql,\
comphelper \
cppu \
cppuhelper \
fwk \
sal \
salhelper \
dbtools \
dbaccess/source/ui/misc/databaseobjectview.cxx
+2 -2
View File
@@ -22,7 +22,6 @@
#include <asyncmodaldialog.hxx>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/frame/TaskCreator.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
#include <com/sun/star/sdb/application/XTableUIProvider.hpp>
@@ -34,6 +33,7 @@
#include <comphelper/diagnose_ex.hxx>
#include <utility>
#include <vcl/window.hxx>
#include <framework/taskcreatorsrv.hxx>
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,
embeddedobj/Library_embobj.mk
+1
View File
@@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,embobj,\
comphelper \
cppu \
cppuhelper \
fwk \
sal \
svt \
utl \
embeddedobj/source/general/docholder.cxx
+3 -3
View File
@@ -18,7 +18,6 @@
*/
#include <com/sun/star/embed/Aspects.hpp>
#include <com/sun/star/frame/TaskCreator.hpp>
#include <com/sun/star/frame/XTitle.hpp>
#include <com/sun/star/frame/TerminationVetoException.hpp>
#include <com/sun/star/frame/XComponentLoader.hpp>
@@ -64,6 +63,7 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <framework/taskcreatorsrv.hxx>
#include <docholder.hxx>
#include <commonembobj.hxx>
@@ -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);
framework/source/classes/taskcreator.cxx
+1 -2
View File
@@ -18,12 +18,11 @@
*/
#include <classes/taskcreator.hxx>
#include <services/taskcreatorsrv.hxx>
#include <framework/taskcreatorsrv.hxx>
#include <services.h>
#include <taskcreatordefs.hxx>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/frame/TaskCreator.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <utility>
framework/source/services/taskcreatorsrv.cxx
+1 -9
View File
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <services/taskcreatorsrv.hxx>
#include <framework/taskcreatorsrv.hxx>
#include <helper/persistentwindowstate.hxx>
#include <helper/tagwindowasmodified.hxx>
#include <helper/titlebarupdate.hxx>
@@ -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<css::uno::Any> const &)
{
return cppu::acquire(new TaskCreatorService(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
framework/util/fwk.component
-5
View File
@@ -149,11 +149,6 @@
constructor="com_sun_star_comp_framework_StatusIndicatorFactory_get_implementation">
<service name="com.sun.star.task.StatusIndicatorFactory"/>
</implementation>
<implementation name="com.sun.star.comp.framework.TaskCreator"
constructor="com_sun_star_comp_framework_TaskCreator_get_implementation"
single-instance="true">
<service name="com.sun.star.frame.TaskCreator"/>
</implementation>
<implementation name="com.sun.star.comp.framework.ToolBarControllerFactory"
constructor="com_sun_star_comp_framework_ToolBarControllerFactory_get_implementation"
single-instance="true">
framework/inc/services/taskcreatorsrv.hxx → include/framework/taskcreatorsrv.hxx
+3 -20
View File
@@ -19,18 +19,16 @@
#pragma once
#include "fwkdllapi.h"
#include <comphelper/compbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/frame/XFrame2.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/supportsservice.hxx>
typedef comphelper::WeakComponentImplHelper<css::lang::XServiceInfo,
css::lang::XSingleServiceFactory>
typedef comphelper::WeakComponentImplHelper<css::lang::XSingleServiceFactory>
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<css::uno::XComponentContext> 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<OUString> SAL_CALL getSupportedServiceNames() override
{
return { u"com.sun.star.frame.TaskCreator"_ustr };
}
// XSingleServiceFactory
virtual css::uno::Reference<css::uno::XInterface> SAL_CALL createInstance() override;
offapi/UnoApi_offapi.mk
-1
View File
@@ -199,7 +199,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/frame,\
OfficeFrameLoader \
SessionListener \
StartModule \
TaskCreator \
UICommandDescription \
theAutoRecovery \
theDesktop \
offapi/com/sun/star/frame/TaskCreator.idl
-31
View File
@@ -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: */
solenv/bin/native-code.py
-1
View File
@@ -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",