From 1180b3473aed3251b5869256abc9c7774bab9ced Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Mon, 4 Nov 2024 11:26:07 +0500 Subject: com::sun::star -> css Change-Id: I890ec73e30d3cc6b210903ecee29431f3cb5f635 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175979 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- desktop/source/app/app.cxx | 2 +- .../source/deployment/manager/dp_commandenvironments.cxx | 10 +++++----- .../source/deployment/manager/dp_extensionmanager.cxx | 16 ++++++++-------- .../source/deployment/manager/dp_informationprovider.cxx | 14 +++++++------- desktop/source/deployment/manager/dp_properties.cxx | 8 ++++---- desktop/source/lib/init.cxx | 2 +- desktop/source/lib/lokinteractionhandler.hxx | 16 ++++++++-------- 7 files changed, 34 insertions(+), 34 deletions(-) (limited to 'desktop/source') diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index c38fd40944ee..ec7d7f30a0c8 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1264,7 +1264,7 @@ private: if (xJavaComponentLoader.is()) { - const css::uno::Reference< ::com::sun::star::registry::XRegistryKey > xRegistryKey; + const css::uno::Reference< css::registry::XRegistryKey > xRegistryKey; try { xJavaComponentLoader->activate(u""_ustr, u""_ustr, u""_ustr, xRegistryKey); diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx index 4a0a88f42432..1252cf94e29a 100644 --- a/desktop/source/deployment/manager/dp_commandenvironments.cxx +++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx @@ -28,12 +28,12 @@ #include "dp_commandenvironments.hxx" #include -namespace deployment = com::sun::star::deployment; -namespace task = com::sun::star::task; -namespace ucb = com::sun::star::ucb; -namespace uno = com::sun::star::uno; +namespace deployment = css::deployment; +namespace task = css::task; +namespace ucb = css::ucb; +namespace uno = css::uno; -using ::com::sun::star::uno::Reference; +using css::uno::Reference; namespace dp_manager { diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 61fa44517be9..b6db9d10c483 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -55,14 +55,14 @@ #include #include -namespace lang = com::sun::star::lang; -namespace task = com::sun::star::task; -namespace ucb = com::sun::star::ucb; -namespace uno = com::sun::star::uno; -namespace beans = com::sun::star::beans; -namespace util = com::sun::star::util; - -using ::com::sun::star::uno::Reference; +namespace lang = css::lang; +namespace task = css::task; +namespace ucb = css::ucb; +namespace uno = css::uno; +namespace beans = css::beans; +namespace util = css::util; + +using css::uno::Reference; namespace { diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx index 14208c3b27a3..5ce8e60b52e0 100644 --- a/desktop/source/deployment/manager/dp_informationprovider.cxx +++ b/desktop/source/deployment/manager/dp_informationprovider.cxx @@ -45,13 +45,13 @@ #include #include -namespace beans = com::sun::star::beans ; -namespace deployment = com::sun::star::deployment ; -namespace lang = com::sun::star::lang ; -namespace task = com::sun::star::task ; -namespace css_ucb = com::sun::star::ucb ; -namespace uno = com::sun::star::uno ; -namespace xml = com::sun::star::xml ; +namespace beans = css::beans ; +namespace deployment = css::deployment ; +namespace lang = css::lang ; +namespace task = css::task ; +namespace css_ucb = css::ucb ; +namespace uno = css::uno ; +namespace xml = css::xml ; namespace dp_info { diff --git a/desktop/source/deployment/manager/dp_properties.cxx b/desktop/source/deployment/manager/dp_properties.cxx index e356c9393bb5..ab170d52d75e 100644 --- a/desktop/source/deployment/manager/dp_properties.cxx +++ b/desktop/source/deployment/manager/dp_properties.cxx @@ -26,12 +26,12 @@ #include #include "dp_properties.hxx" -namespace lang = com::sun::star::lang; -namespace ucb = com::sun::star::ucb; -namespace uno = com::sun::star::uno; +namespace lang = css::lang; +namespace ucb = css::ucb; +namespace uno = css::uno; -using ::com::sun::star::uno::Reference; +using css::uno::Reference; constexpr OUString PROP_SUPPRESS_LICENSE = u"SUPPRESS_LICENSE"_ustr; constexpr OUStringLiteral PROP_EXTENSION_UPDATE = u"EXTENSION_UPDATE"; diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index a0f73fd49f8a..f17f1484b63d 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -7778,7 +7778,7 @@ static void lo_status_indicator_callback(void *data, comphelper::LibreOfficeKit: /// Used by preloadData (LibreOfficeKit) for providing different shortcuts for different languages. static void preLoadShortCutAccelerators() { - std::unordered_map>& acceleratorConfs = SfxLokHelper::getAcceleratorConfs(); + std::unordered_map>& acceleratorConfs = SfxLokHelper::getAcceleratorConfs(); css::uno::Sequence installedLocales(officecfg::Setup::Office::InstalledLocales::get()->getElementNames()); OUString actualLang = officecfg::Setup::L10N::ooLocale::get(); diff --git a/desktop/source/lib/lokinteractionhandler.hxx b/desktop/source/lib/lokinteractionhandler.hxx index c3641db0762f..06aa62b9bcca 100644 --- a/desktop/source/lib/lokinteractionhandler.hxx +++ b/desktop/source/lib/lokinteractionhandler.hxx @@ -41,9 +41,9 @@ information easily via callbacks. TODO: the callbacks are not implemented yet, we just approve any interaction that we get. */ -class LOKInteractionHandler: public cppu::WeakImplHelper +class LOKInteractionHandler: public cppu::WeakImplHelper { private: desktop::LibLibreOffice_Impl * m_pLOKit; @@ -76,7 +76,7 @@ private: bool handlePasswordRequest(const css::uno::Sequence> &rContinuations, const css::uno::Any& rRequest); static bool handleMacroConfirmationRequest(const css::uno::Reference& xRequest); - static bool handleFilterOptionsRequest(const ::com::sun::star::uno::Reference<::com::sun::star::task::XInteractionRequest>& Request); + static bool handleFilterOptionsRequest(const css::uno::Reference& Request); static bool handlePackageReparationRequest(const css::uno::Reference& xRequest); static bool handleLoadReadOnlyRequest(const css::uno::Reference& xRequest); @@ -95,13 +95,13 @@ public: virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName) override; - virtual com::sun::star::uno::Sequence SAL_CALL getSupportedServiceNames() override; + virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() override; - virtual void SAL_CALL initialize(com::sun::star::uno::Sequence const & rArguments) override; + virtual void SAL_CALL initialize(css::uno::Sequence const & rArguments) override; - virtual void SAL_CALL handle(com::sun::star::uno::Reference const & rRequest) override; + virtual void SAL_CALL handle(css::uno::Reference const & rRequest) override; - virtual sal_Bool SAL_CALL handleInteractionRequest(const ::com::sun::star::uno::Reference<::com::sun::star::task::XInteractionRequest>& Request) override; + virtual sal_Bool SAL_CALL handleInteractionRequest(const css::uno::Reference& Request) override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit