diff options
28 files changed, 77 insertions, 71 deletions
diff --git a/desktop/CppunitTest_desktop_app.mk b/desktop/CppunitTest_desktop_app.mk index adb57add6e7a..15b681cef048 100644 --- a/desktop/CppunitTest_desktop_app.mk +++ b/desktop/CppunitTest_desktop_app.mk @@ -32,6 +32,7 @@ $(eval $(call gb_CppunitTest_use_libraries,desktop_app, \ $(if $(ENABLE_BREAKPAD),crashreport) \ deploymentmisc \ editeng \ + fwk \ i18nlangtag \ $(if $(filter OPENCL,$(BUILD_TYPE)),opencl) \ sal \ diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 9dd91971a825..33deef07a69a 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -64,6 +64,7 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\ ) \ deploymentmisc \ editeng \ + fwk \ i18nlangtag \ $(if $(filter OPENCL,$(BUILD_TYPE)),opencl) \ sal \ diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index e5ed6e491edb..ddd4e78e0082 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -42,6 +42,7 @@ #include "updater.hxx" #endif +#include <framework/desktop.hxx> #include <i18nlangtag/languagetag.hxx> #include <o3tl/char16_t2wchar_t.hxx> #include <o3tl/runtimetooustring.hxx> @@ -71,7 +72,6 @@ #include <com/sun/star/configuration/backend/BackendAccessException.hpp> #include <com/sun/star/task/theJobExecutor.hpp> #include <com/sun/star/task/OfficeRestartManager.hpp> -#include <com/sun/star/task/XJob.hpp> #include <com/sun/star/task/XRestartManager.hpp> #include <com/sun/star/document/XDocumentEventListener.hpp> #include <com/sun/star/office/Quickstart.hpp> @@ -610,9 +610,7 @@ bool Desktop::QueryExit() void Desktop::Shutdown() { - Reference<XDesktop2> xDesktop = css::frame::Desktop::create(::comphelper::getProcessComponentContext()); - Reference<XJob> xDesktopInternal(xDesktop, UNO_QUERY_THROW); - xDesktopInternal->execute({{"shutdown", {}}}); + framework::getDesktop(::comphelper::getProcessComponentContext())->shutdown(); } void Desktop::HandleBootstrapPathErrors( ::utl::Bootstrap::Status aBootstrapStatus, const OUString& aDiagnosticMessage ) diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index 1fe75ccab4b7..718045b47318 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -19,6 +19,10 @@ $(eval $(call gb_Library_Library,fwk)) +$(eval $(call gb_Library_add_defs,fwk,\ + -DLO_DLLIMPLEMENTATION_FWK \ +)) + $(eval $(call gb_Library_set_componentfile,fwk,framework/util/fwk)) $(eval $(call gb_Library_set_include,fwk,\ diff --git a/framework/inc/classes/converter.hxx b/framework/inc/classes/converter.hxx index 15d36a5f0d0d..a9fdfff9f37a 100644 --- a/framework/inc/classes/converter.hxx +++ b/framework/inc/classes/converter.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <tools/datetime.hxx> -#include <fwidllapi.h> +#include <framework/fwidllapi.h> namespace framework{ diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx index fa7907927d13..7632a72bcd1e 100644 --- a/framework/inc/classes/protocolhandlercache.hxx +++ b/framework/inc/classes/protocolhandlercache.hxx @@ -27,7 +27,7 @@ #include <unotools/configitem.hxx> #include <rtl/ustring.hxx> -#include <fwidllapi.h> +#include <framework/fwidllapi.h> namespace framework{ diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx index 00f8689487e6..5605eff87ebe 100644 --- a/framework/inc/helper/mischelper.hxx +++ b/framework/inc/helper/mischelper.hxx @@ -34,7 +34,7 @@ #include <i18nlangtag/lang.h> #include <svl/languageoptions.hxx> #include <rtl/ustring.hxx> -#include <fwidllapi.h> +#include <framework/fwidllapi.h> #include <functional> #include <set> diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx index 1da482c4e86f..773685876a57 100644 --- a/framework/inc/helper/oframes.hxx +++ b/framework/inc/helper/oframes.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_FRAMEWORK_INC_HELPER_OFRAMES_HXX #define INCLUDED_FRAMEWORK_INC_HELPER_OFRAMES_HXX -#include <classes/framecontainer.hxx> +#include <framework/framecontainer.hxx> #include <com/sun/star/frame/XFrames.hpp> #include <com/sun/star/frame/XFrame.hpp> diff --git a/framework/inc/helper/shareablemutex.hxx b/framework/inc/helper/shareablemutex.hxx index 9470983fb41d..c05bffb47145 100644 --- a/framework/inc/helper/shareablemutex.hxx +++ b/framework/inc/helper/shareablemutex.hxx @@ -22,7 +22,7 @@ #include <osl/interlck.h> #include <osl/mutex.hxx> -#include <fwidllapi.h> +#include <framework/fwidllapi.h> namespace framework { diff --git a/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx index 1bb8e01103da..c5783ffe975c 100644 --- a/framework/inc/jobs/configaccess.hxx +++ b/framework/inc/jobs/configaccess.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <rtl/ustring.hxx> -#include <fwidllapi.h> +#include <framework/fwidllapi.h> namespace framework{ diff --git a/framework/inc/jobs/jobconst.hxx b/framework/inc/jobs/jobconst.hxx index 80e78f4d991a..96a60f81af86 100644 --- a/framework/inc/jobs/jobconst.hxx +++ b/framework/inc/jobs/jobconst.hxx @@ -21,7 +21,7 @@ #define INCLUDED_FRAMEWORK_INC_JOBS_JOBCONST_HXX #include <rtl/ustring.hxx> -#include <fwidllapi.h> +#include <framework/fwidllapi.h> namespace framework{ diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx index cc7bb0db28d2..d1cea3b5c800 100644 --- a/framework/inc/pch/precompiled_fwk.hxx +++ b/framework/inc/pch/precompiled_fwk.hxx @@ -251,7 +251,7 @@ #if PCH_LEVEL >= 4 #include <framework/addonsoptions.hxx> #include <framework/fwedllapi.h> -#include <fwidllapi.h> +#include <framework/fwidllapi.h> #include <properties.h> #include <targets.h> #endif // PCH_LEVEL >= 4 diff --git a/framework/inc/threadhelp/transactionguard.hxx b/framework/inc/threadhelp/transactionguard.hxx index 2c4366cdee23..a030ba56fb56 100644 --- a/framework/inc/threadhelp/transactionguard.hxx +++ b/framework/inc/threadhelp/transactionguard.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_FRAMEWORK_INC_THREADHELP_TRANSACTIONGUARD_HXX #define INCLUDED_FRAMEWORK_INC_THREADHELP_TRANSACTIONGUARD_HXX -#include <threadhelp/transactionmanager.hxx> +#include <framework/transactionmanager.hxx> namespace framework{ diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx index 43f10597c4a7..063d63280e0d 100644 --- a/framework/inc/uielement/constitemcontainer.hxx +++ b/framework/inc/uielement/constitemcontainer.hxx @@ -32,7 +32,7 @@ #include <cppuhelper/propshlp.hxx> #include <vector> -#include <fwidllapi.h> +#include <framework/fwidllapi.h> namespace framework { diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx index d22fc9a098c3..6b44578a4f71 100644 --- a/framework/inc/uielement/itemcontainer.hxx +++ b/framework/inc/uielement/itemcontainer.hxx @@ -28,7 +28,7 @@ #include <cppuhelper/implbase.hxx> #include <vector> -#include <fwidllapi.h> +#include <framework/fwidllapi.h> namespace framework { diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx index a71282b993a0..50c46e4a8189 100644 --- a/framework/inc/uielement/rootitemcontainer.hxx +++ b/framework/inc/uielement/rootitemcontainer.hxx @@ -34,7 +34,7 @@ #include <cppuhelper/propshlp.hxx> #include <vector> -#include <fwidllapi.h> +#include <framework/fwidllapi.h> namespace framework { diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx index f1d7fd1ea018..d07697cbe8ef 100644 --- a/framework/source/classes/framecontainer.cxx +++ b/framework/source/classes/framecontainer.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <classes/framecontainer.hxx> +#include <framework/framecontainer.hxx> #include <com/sun/star/frame/FrameSearchFlag.hpp> diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx index 7b6f930b57e6..21c8fb69bf13 100644 --- a/framework/source/fwi/threadhelp/transactionmanager.cxx +++ b/framework/source/fwi/threadhelp/transactionmanager.cxx @@ -20,7 +20,7 @@ #include <sal/config.h> #include <sal/log.hxx> -#include <threadhelp/transactionmanager.hxx> +#include <framework/transactionmanager.hxx> #include <com/sun/star/lang/DisposedException.hpp> diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 95dd35546713..d3ebf627b86c 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <services/desktop.hxx> +#include <framework/desktop.hxx> #include <loadenv/loadenv.hxx> @@ -323,17 +323,6 @@ sal_Bool SAL_CALL Desktop::terminate() return true; } -css::uno::Any Desktop::execute(css::uno::Sequence<css::beans::NamedValue> const & Arguments) -{ - if (Arguments.getLength() == 1 && Arguments[0].Name == "shutdown" - && !Arguments[0].Value.hasValue()) - { - shutdown(); - return {}; - } - throw css::lang::IllegalArgumentException("unsupported job request", {}, 0); -} - void Desktop::shutdown() { TransactionGuard aTransaction(m_aTransactionManager, E_HARDEXCEPTIONS); @@ -1773,13 +1762,19 @@ rtl::Reference<framework::Desktop> createDesktop( } +rtl::Reference<framework::Desktop> framework::getDesktop( + css::uno::Reference<css::uno::XComponentContext> const & context) +{ + static auto const instance = createDesktop(context); + return instance; +} + extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_Desktop_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { - static auto const instance = createDesktop(context); - return cppu::acquire(instance.get()); + return cppu::acquire(framework::getDesktop(context).get()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 11881c3ebefb..676965b3230c 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -26,6 +26,7 @@ #include <dispatch/windowcommanddispatch.hxx> #include <loadenv/loadenv.hxx> #include <helper/oframes.hxx> +#include <framework/framecontainer.hxx> #include <framework/titlehelper.hxx> #include <svtools/openfiledroptargetlistener.hxx> #include <classes/taskcreator.hxx> @@ -33,7 +34,6 @@ #include <framework/framelistanalyzer.hxx> #include <helper/dockingareadefaultacceptor.hxx> #include <dispatch/dispatchinformationprovider.hxx> -#include <classes/framecontainer.hxx> #include <pattern/window.hxx> #include <properties.h> diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index b0c7e70eb725..e90cde5c3641 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -20,7 +20,7 @@ #include <sal/types.h> #include <sal/log.hxx> -#include <services/desktop.hxx> +#include <framework/desktop.hxx> #include <tools/diagnose_ex.h> #include <com/sun/star/beans/NamedValue.hpp> diff --git a/framework/inc/services/desktop.hxx b/include/framework/desktop.hxx index 3967650eabde..e49361839a67 100644 --- a/framework/inc/services/desktop.hxx +++ b/include/framework/desktop.hxx @@ -17,15 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_DESKTOP_HXX -#define INCLUDED_FRAMEWORK_INC_SERVICES_DESKTOP_HXX +#pragma once #include <sal/config.h> #include <memory> #include <vector> -#include <classes/framecontainer.hxx> +#include "framecontainer.hxx" +#include "fwkdllapi.h" +#include "transactionmanager.hxx" #include <com/sun/star/frame/XUntitledNumbers.hpp> #include <com/sun/star/frame/XController.hpp> @@ -42,14 +43,13 @@ #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> -#include <com/sun/star/task/XJob.hpp> #include <com/sun/star/frame/XDispatchRecorderSupplier.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/propshlp.hxx> -#include <threadhelp/transactionmanager.hxx> +#include <rtl/ref.hxx> #include <unotools/cmdoptions.hxx> namespace framework{ @@ -90,13 +90,12 @@ enum ELoadState typedef cppu::WeakComponentImplHelper< css::lang::XServiceInfo , css::frame::XDesktop2 , - css::task::XJob, // for internal "shutdown" command css::frame::XTasksSupplier , css::frame::XDispatchResultListener , // => XEventListener css::task::XInteractionHandler , css::frame::XUntitledNumbers > Desktop_BASE; -class Desktop final : private cppu::BaseMutex, +class LO_DLLPUBLIC_FWK Desktop final : private cppu::BaseMutex, public Desktop_BASE, public cppu::OPropertySetHelper { @@ -285,12 +284,9 @@ class Desktop final : private cppu::BaseMutex, /// @throws css::uno::RuntimeException bool terminateQuickstarterToo(); - css::uno::Any SAL_CALL execute(css::uno::Sequence<css::beans::NamedValue> const & Arguments) - override; - - private: void shutdown(); + private: // OPropertySetHelper virtual sal_Bool SAL_CALL convertFastPropertyValue ( css::uno::Any& aConvertedValue , css::uno::Any& aOldValue , @@ -450,8 +446,9 @@ class Desktop final : private cppu::BaseMutex, }; // class Desktop -} // namespace framework +LO_DLLPUBLIC_FWK rtl::Reference<Desktop> getDesktop( + css::uno::Reference<css::uno::XComponentContext> const & context); -#endif // INCLUDED_FRAMEWORK_INC_SERVICES_DESKTOP_HXX +} // namespace framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/classes/framecontainer.hxx b/include/framework/framecontainer.hxx index 72a868f66d34..9cd896ac7f61 100644 --- a/framework/inc/classes/framecontainer.hxx +++ b/include/framework/framecontainer.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_FRAMECONTAINER_HXX -#define INCLUDED_FRAMEWORK_INC_CLASSES_FRAMECONTAINER_HXX +#pragma once #include <sal/config.h> @@ -89,6 +88,4 @@ class FrameContainer final } // namespace framework -#endif // INCLUDED_FRAMEWORK_INC_CLASSES_FRAMECONTAINER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/fwidllapi.h b/include/framework/fwidllapi.h index 290f18721ec0..21df058b0912 100644 --- a/framework/inc/fwidllapi.h +++ b/include/framework/fwidllapi.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FRAMEWORK_INC_FWIDLLAPI_H -#define INCLUDED_FRAMEWORK_INC_FWIDLLAPI_H +#pragma once #include <sal/types.h> @@ -28,6 +27,4 @@ #define FWI_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif -#endif // INCLUDED_FRAMEWORK_INC_FWIDLLAPI_H - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/fwkdllapi.h b/include/framework/fwkdllapi.h new file mode 100644 index 000000000000..57daebb1d5b2 --- /dev/null +++ b/include/framework/fwkdllapi.h @@ -0,0 +1,22 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * 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/. + */ + +#pragma once + +#include <sal/config.h> + +#include <sal/types.h> + +#if defined LO_DLLIMPLEMENTATION_FWK +#define LO_DLLPUBLIC_FWK SAL_DLLPUBLIC_EXPORT +#else +#define LO_DLLPUBLIC_FWK SAL_DLLPUBLIC_IMPORT +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/framework/inc/threadhelp/gate.hxx b/include/framework/gate.hxx index 627a3a7cb4fb..d4e7f3588523 100644 --- a/framework/inc/threadhelp/gate.hxx +++ b/include/framework/gate.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FRAMEWORK_INC_THREADHELP_GATE_HXX -#define INCLUDED_FRAMEWORK_INC_THREADHELP_GATE_HXX +#pragma once #include <osl/mutex.hxx> #include <osl/conditn.hxx> @@ -144,6 +143,4 @@ class Gate } // namespace framework -#endif // INCLUDED_FRAMEWORK_INC_THREADHELP_GATE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/threadhelp/transactionmanager.hxx b/include/framework/transactionmanager.hxx index 9dbdc3b38e57..9a93d59ac452 100644 --- a/framework/inc/threadhelp/transactionmanager.hxx +++ b/include/framework/transactionmanager.hxx @@ -17,14 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FRAMEWORK_INC_THREADHELP_TRANSACTIONMANAGER_HXX -#define INCLUDED_FRAMEWORK_INC_THREADHELP_TRANSACTIONMANAGER_HXX +#pragma once #include <config_options.h> -#include <threadhelp/gate.hxx> - #include <osl/mutex.hxx> -#include <fwidllapi.h> + +#include "fwidllapi.h" +#include "gate.hxx" namespace framework{ @@ -123,6 +122,4 @@ class UNLESS_MERGELIBS(FWI_DLLPUBLIC) TransactionManager } // namespace framework -#endif // INCLUDED_FRAMEWORK_INC_THREADHELP_TRANSACTIONMANAGER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 6ffd1bb4b3d9..2ffa91497589 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -4857,7 +4857,6 @@ framework/inc/classes/actiontriggercontainer.hxx framework/inc/classes/actiontriggerpropertyset.hxx framework/inc/classes/actiontriggerseparatorpropertyset.hxx framework/inc/classes/converter.hxx -framework/inc/classes/framecontainer.hxx framework/inc/classes/imagewrapper.hxx framework/inc/classes/protocolhandlercache.hxx framework/inc/classes/resource.hxx @@ -4873,7 +4872,6 @@ framework/inc/dispatch/popupmenudispatcher.hxx framework/inc/dispatch/servicehandler.hxx framework/inc/dispatch/startmoduledispatcher.hxx framework/inc/dispatch/systemexec.hxx -framework/inc/fwidllapi.h framework/inc/helper/dockingareadefaultacceptor.hxx framework/inc/helper/mischelper.hxx framework/inc/helper/ocomponentaccess.hxx @@ -4909,16 +4907,13 @@ framework/inc/protocols.h framework/inc/recording/dispatchrecorder.hxx framework/inc/recording/dispatchrecordersupplier.hxx framework/inc/services.h -framework/inc/services/desktop.hxx framework/inc/services/layoutmanager.hxx framework/inc/services/mediatypedetectionhelper.hxx framework/inc/services/uriabbreviation.hxx framework/inc/statusbarconfiguration.hxx framework/inc/stdtypes.h framework/inc/targets.h -framework/inc/threadhelp/gate.hxx framework/inc/threadhelp/transactionguard.hxx -framework/inc/threadhelp/transactionmanager.hxx framework/inc/toolboxconfiguration.hxx framework/inc/uiconfiguration/globalsettings.hxx framework/inc/uiconfiguration/graphicnameaccess.hxx @@ -6059,13 +6054,18 @@ include/framework/ContextChangeEventMultiplexerTunnel.hxx include/framework/actiontriggerhelper.hxx include/framework/addonsoptions.hxx include/framework/configimporter.hxx +include/framework/desktop.hxx include/framework/documentundoguard.hxx +include/framework/framecontainer.hxx include/framework/framelistanalyzer.hxx include/framework/fwedllapi.h +include/framework/fwidllapi.h +include/framework/gate.hxx include/framework/imutex.hxx include/framework/interaction.hxx include/framework/sfxhelperfunctions.hxx include/framework/titlehelper.hxx +include/framework/transactionmanager.hxx include/framework/undomanagerhelper.hxx include/helpcompiler/HelpIndexer.hxx include/helpcompiler/HelpSearch.hxx |