Cleanup: Consolidate the different ways to get command labels/tooltips

Change-Id: Ieab809a3122c9d592894b84ec2e68195a4e02dde

2 files changed, 0 insertions, 99 deletions

diff --git a/include/sfx2/sidebar/CommandInfoProvider.hxx b/include/sfx2/sidebar/CommandInfoProvider.hxx
deleted file mode 100644
index 9161b126816a..000000000000
--- a/include/sfx2/sidebar/CommandInfoProvider.hxx
+++ /dev/null
@@ -1,94 +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 .
- */
-#ifndef INCLUDED_SFX2_SIDEBAR_COMMANDINFOPROVIDER_HXX
-#define INCLUDED_SFX2_SIDEBAR_COMMANDINFOPROVIDER_HXX
-
-#include <sfx2/dllapi.h>
-
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
-
-
-namespace sfx2 { namespace sidebar {
-
-/** Provide information about UNO commands like tooltip text with
-    keyboard accelerator.
-*/
-class SFX2_DLLPUBLIC CommandInfoProvider
-{
-public:
-    /** Return the singleton instance.
-
-        It caches some objects for the last XFrame object given to
-        GetLabelForCommand.  These objects are release and created new
-        when that method is called with a different XFrame from the
-        last call.
-
-        Lifetime control should work but could be more elegant.
-    */
-    static CommandInfoProvider& Instance();
-
-    /** Return a label for the given command.
-        @param rsCommandName
-            The command name is expected to start with .uno:
-        @param rxFrame
-            The frame is used to identify the module and document.
-        @return
-            The returned label contains the keyboard accelerator, if
-            one is defined.
-    */
-    ::rtl::OUString GetLabelForCommand (
-        const ::rtl::OUString& rsCommandName,
-        const css::uno::Reference<css::frame::XFrame>& rxFrame);
-
-    /** Do not call.  Should be part of a local and hidden interface.
-    */
-    void SetFrame (const css::uno::Reference<css::frame::XFrame>& rxFrame);
-
-  private:
-    css::uno::Reference<css::uno::XComponentContext> mxContext;
-    css::uno::Reference<css::frame::XFrame> mxCachedDataFrame;
-    css::uno::Reference<css::ui::XAcceleratorConfiguration> mxCachedDocumentAcceleratorConfiguration;
-    css::uno::Reference<css::ui::XAcceleratorConfiguration> mxCachedModuleAcceleratorConfiguration;
-    css::uno::Reference<css::ui::XAcceleratorConfiguration> mxCachedGlobalAcceleratorConfiguration;
-    ::rtl::OUString msCachedModuleIdentifier;
-    css::uno::Reference<css::lang::XComponent> mxFrameListener;
-
-    CommandInfoProvider();
-    ~CommandInfoProvider();
-
-    css::uno::Reference<css::ui::XAcceleratorConfiguration> GetDocumentAcceleratorConfiguration();
-    css::uno::Reference<css::ui::XAcceleratorConfiguration> GetModuleAcceleratorConfiguration();
-    css::uno::Reference<css::ui::XAcceleratorConfiguration> GetGlobalAcceleratorConfiguration();
-    ::rtl::OUString GetModuleIdentifier();
-    ::rtl::OUString GetCommandShortcut (const ::rtl::OUString& rCommandName);
-    css::uno::Sequence<css::beans::PropertyValue> GetCommandProperties (
-        const ::rtl::OUString& rsCommandName);
-    ::rtl::OUString GetCommandLabel (const ::rtl::OUString& rsCommandName);
-    static rtl::OUString RetrieveShortcutsFromConfiguration(
-        const css::uno::Reference<css::ui::XAcceleratorConfiguration>& rxConfiguration,
-        const rtl::OUString& rsCommandName);
-};
-
-} } // end of namespace sfx2/framework
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx
index 94e22e0c2d6b..2c31f8be3481 100644
--- a/include/sfx2/sidebar/ControllerItem.hxx
+++ b/include/sfx2/sidebar/ControllerItem.hxx
@@ -94,11 +94,6 @@ public:
     */
     void RequestUpdate();
 
-    /** Return the label for the command.  It contains the keyboard
-        accelerator when one exists.
-    */
-    ::rtl::OUString GetLabel() const;
-
     /** Return the extended help text for the command.
         Returns an empty string when the UNO command name is not available.
     */