From 65b3a5cbc7e018b4e3f4f61228bf9334fd9a956e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toma=C5=BE=20Vajngerl?= Date: Sat, 9 Jan 2021 12:02:59 +0900 Subject: [PATCH] Revert "Very early work-in-progress commit for the "DevTools" dockable toolbar" Better path forward is to use a dockable window for the DevTools - added in commit 5f5ee992bd8377dc984b576950d468f6407d5c63 This reverts commit c0d770d4feb919cb3306c48d576ac30709154eae. --- .../org/openoffice/Office/Accelerators.xcu | 6 - .../org/openoffice/Office/ProtocolHandler.xcu | 5 - .../openoffice/Office/UI/GenericCommands.xcu | 8 - .../Office/UI/WriterWindowState.xcu | 20 -- svx/Library_svx.mk | 1 - .../tbxctrls/tbunodevtoolscontrollers.cxx | 266 ------------------ svx/util/svx.component | 5 - sw/UIConfig_swriter.mk | 1 - sw/uiconfig/swriter/menubar/menubar.xml | 1 - sw/uiconfig/swriter/toolbar/devtools.xml | 15 - 10 files changed, 328 deletions(-) delete mode 100644 svx/source/tbxctrls/tbunodevtoolscontrollers.cxx delete mode 100644 sw/uiconfig/swriter/toolbar/devtools.xml diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 98e8de1cb688..967aa98a04db 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -6155,12 +6155,6 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing .uno:UpdateInputFields - - - I10N SHORTCUTS - NO TRANSLATE - vnd.libreoffice.devtools:FocusToDevTools - - I10N SHORTCUTS - NO TRANSLATE diff --git a/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu b/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu index 822dc8da9584..3e64280d514c 100644 --- a/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu +++ b/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu @@ -75,10 +75,5 @@ vnd.org.libreoffice.recentdocs:* - - - vnd.libreoffice.devtools:* - - diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index c9aee96ee153..fadfcb966638 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -1710,14 +1710,6 @@ bit 3 (0x8): #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8 1 - - - DevTools... - - - 1 - - ~What's This? diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu index cd05d2951869..f5d7bdf862d3 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu @@ -139,26 +139,6 @@ false - - - 0,1 - - - true - - - 1 - - - DevTools - - - false - - - false - - 0,1 diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 0e8557ecb0f8..18b5cc64cb37 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -238,7 +238,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/tbxctrls/linewidthctrl \ svx/source/tbxctrls/tbunocontroller \ svx/source/tbxctrls/tbunosearchcontrollers \ - svx/source/tbxctrls/tbunodevtoolscontrollers \ svx/source/tbxctrls/tbxcolor \ svx/source/tbxctrls/tbxdrctl \ svx/source/tbxctrls/verttexttbxctrl \ diff --git a/svx/source/tbxctrls/tbunodevtoolscontrollers.cxx b/svx/source/tbxctrls/tbunodevtoolscontrollers.cxx deleted file mode 100644 index 37925815dfb9..000000000000 --- a/svx/source/tbxctrls/tbunodevtoolscontrollers.cxx +++ /dev/null @@ -1,266 +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 . - */ - -#include - -#include -#include - -#include - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace -{ -// protocol handler for "vnd.libreoffice.devtools:*" URLs -// The dispatch object will be used for shortcut commands for findbar -class DevToolsDispatcher : public css::lang::XServiceInfo, - public css::lang::XInitialization, - public css::frame::XDispatchProvider, - public css::frame::XDispatch, - public ::cppu::OWeakObject -{ -public: - DevToolsDispatcher(); - virtual ~DevToolsDispatcher() override; - - // XInterface - virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& aType) override; - virtual void SAL_CALL acquire() throw() override; - virtual void SAL_CALL release() throw() override; - - // XServiceInfo - virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; - virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() override; - - // XInitialization - virtual void SAL_CALL initialize(const css::uno::Sequence& aArguments) override; - - // XDispatchProvider - virtual css::uno::Reference - SAL_CALL queryDispatch(const css::util::URL& aURL, const OUString& sTargetFrameName, - sal_Int32 nSearchFlags) override; - virtual css::uno::Sequence> SAL_CALL queryDispatches( - const css::uno::Sequence& lDescriptions) override; - - // XDispatch - virtual void SAL_CALL - dispatch(const css::util::URL& aURL, - const css::uno::Sequence& lArguments) override; - virtual void SAL_CALL - addStatusListener(const css::uno::Reference& xListener, - const css::util::URL& aURL) override; - virtual void SAL_CALL - removeStatusListener(const css::uno::Reference& xListener, - const css::util::URL& aURL) override; - -private: - css::uno::Reference m_xFrame; -}; - -DevToolsDispatcher::DevToolsDispatcher() {} - -DevToolsDispatcher::~DevToolsDispatcher() { m_xFrame = nullptr; } - -// XInterface -css::uno::Any SAL_CALL DevToolsDispatcher::queryInterface(const css::uno::Type& aType) -{ - css::uno::Any aReturn(::cppu::queryInterface(aType, static_cast(this), - static_cast(this), - static_cast(this), - static_cast(this))); - - if (aReturn.hasValue()) - return aReturn; - - return OWeakObject::queryInterface(aType); -} - -void SAL_CALL DevToolsDispatcher::acquire() throw() { OWeakObject::acquire(); } - -void SAL_CALL DevToolsDispatcher::release() throw() { OWeakObject::release(); } - -// XServiceInfo -OUString SAL_CALL DevToolsDispatcher::getImplementationName() -{ - return "org.libreoffice.Impl.DevToolsDispatcher"; -} - -sal_Bool SAL_CALL DevToolsDispatcher::supportsService(const OUString& ServiceName) -{ - return cppu::supportsService(this, ServiceName); -} - -css::uno::Sequence SAL_CALL DevToolsDispatcher::getSupportedServiceNames() -{ - return { "org.libreoffice.DevToolsDispatcher", "com.sun.star.frame.ProtocolHandler" }; -} - -// XInitialization -void SAL_CALL DevToolsDispatcher::initialize(const css::uno::Sequence& aArguments) -{ - if (aArguments.hasElements()) - aArguments[0] >>= m_xFrame; -} - -// XDispatchProvider -css::uno::Reference SAL_CALL DevToolsDispatcher::queryDispatch( - const css::util::URL& aURL, const OUString& /*sTargetFrameName*/, sal_Int32 /*nSearchFlags*/) -{ - css::uno::Reference xDispatch; - - if (aURL.Protocol == "vnd.libreoffice.devtools:") - xDispatch = this; - - return xDispatch; -} - -css::uno::Sequence> - SAL_CALL DevToolsDispatcher::queryDispatches( - const css::uno::Sequence& seqDescripts) -{ - sal_Int32 nCount = seqDescripts.getLength(); - css::uno::Sequence> lDispatcher(nCount); - - std::transform( - seqDescripts.begin(), seqDescripts.end(), lDispatcher.begin(), - [this](const css::frame::DispatchDescriptor& rDescript) -> css::uno::Reference { - return queryDispatch(rDescript.FeatureURL, rDescript.FrameName, rDescript.SearchFlags); - }); - - return lDispatcher; -} - -// XDispatch -void SAL_CALL DevToolsDispatcher::dispatch( - const css::util::URL& aURL, const css::uno::Sequence& /*lArgs*/) -{ - //vnd.libreoffice.devtools:FocusToDevTools - set cursor to the XXX of the devtools - if (aURL.Path != "FocusToDevTools") - return; - - css::uno::Reference xPropSet(m_xFrame, css::uno::UNO_QUERY); - if (!xPropSet.is()) - return; - - css::uno::Reference xLayoutManager; - css::uno::Any aValue = xPropSet->getPropertyValue("LayoutManager"); - aValue >>= xLayoutManager; - if (!xLayoutManager.is()) - return; - - const OUString sResourceURL("private:resource/toolbar/devtools"); - css::uno::Reference xUIElement = xLayoutManager->getElement(sResourceURL); - if (!xUIElement.is()) - { - // show the devtools if necessary - xLayoutManager->createElement(sResourceURL); - xLayoutManager->showElement(sResourceURL); - xUIElement = xLayoutManager->getElement(sResourceURL); - if (!xUIElement.is()) - return; - } - - css::uno::Reference xWindow(xUIElement->getRealInterface(), - css::uno::UNO_QUERY); - VclPtr pWindow = VCLUnoHelper::GetWindow(xWindow); - ToolBox* pToolBox = static_cast(pWindow.get()); - pToolBox->set_id("DevTools"); - if (!pToolBox) - return; - - ToolBox::ImplToolItems::size_type nItemCount = pToolBox->GetItemCount(); - for (ToolBox::ImplToolItems::size_type i = 0; i < nItemCount; ++i) - { - sal_uInt16 id = pToolBox->GetItemId(i); - OUString sItemCommand = pToolBox->GetItemCommand(id); - if (sItemCommand == ".uno:DevTools") - { - vcl::Window* pItemWin = pToolBox->GetItemWindow(id); - if (pItemWin) - { - SolarMutexGuard aSolarMutexGuard; -#if 0 // ??? - Control* pControl = dynamic_cast(pItemWin); - if ( pControl ) - pControl->SetTextToSelected_Impl(); -#endif - pItemWin->GrabFocus(); - return; - } - } - } -} - -void SAL_CALL DevToolsDispatcher::addStatusListener( - const css::uno::Reference& /*xControl*/, - const css::util::URL& /*aURL*/) -{ -} - -void SAL_CALL DevToolsDispatcher::removeStatusListener( - const css::uno::Reference& /*xControl*/, - const css::util::URL& /*aURL*/) -{ -} -} - -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* -org_libreoffice_Impl_DevToolsDispatcher_get_implementation( - SAL_UNUSED_PARAMETER css::uno::XComponentContext*, css::uno::Sequence const&) -{ - return cppu::acquire(new DevToolsDispatcher); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/util/svx.component b/svx/util/svx.component index f9d2cce75229..ff8d802394ac 100644 --- a/svx/util/svx.component +++ b/svx/util/svx.component @@ -28,11 +28,6 @@ - - - - diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index 4d78aa0cb550..71a0632d6979 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -46,7 +46,6 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/swriter,\ sw/uiconfig/swriter/toolbar/changes \ sw/uiconfig/swriter/toolbar/classificationbar \ sw/uiconfig/swriter/toolbar/colorbar \ - sw/uiconfig/swriter/toolbar/devtools \ sw/uiconfig/swriter/toolbar/drawbar \ sw/uiconfig/swriter/toolbar/drawingobjectbar \ sw/uiconfig/swriter/toolbar/drawtextobjectbar \ diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index 11b52c3945bc..4ec0436d48fe 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -787,7 +787,6 @@ - diff --git a/sw/uiconfig/swriter/toolbar/devtools.xml b/sw/uiconfig/swriter/toolbar/devtools.xml deleted file mode 100644 index 5b8ed5f673f0..000000000000 --- a/sw/uiconfig/swriter/toolbar/devtools.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - -