Kaydet (Commit) 0438d3e6 authored tarafından Maxim Monastirsky's avatar Maxim Monastirsky

dbaccess: OToolboxController is now unused

This also removes the only occurrence of the
"com.sun.star.frame.ToolboxController" service. However it shouldn't
be considered as API CHANGE, as no 3rd-party code should rely on
undocumented services, and fortunately a toolbox controller like this
has no use for 3rd-party anyway.

BTW there are other cases of using non-existent (unique) service
names for toolbox controllers in non-sfx2 modules, rather than using
the standard "com.sun.star.frame.ToolbarController". There is
OToolboxController in reportdesign (which I hope to remove soon too,
as it's just a wrapper around SvxColorToolBoxControl). And there was
also ShapeToolbarController in chart2 which I removed in
2aea9e37 ("Introduce generic sub toolbar
controller").

Change-Id: Iea8858be2406f32bb5a022920b4b1cee70603c09
üst d8d110ce
......@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
dbaccess/source/ui/control/SqlNameEdit \
dbaccess/source/ui/control/TableGrantCtrl \
dbaccess/source/ui/control/tabletree \
dbaccess/source/ui/control/toolboxcontroller \
dbaccess/source/ui/control/undosqledit \
dbaccess/source/ui/control/VertSplitView \
dbaccess/source/ui/dlg/admincontrols \
......
......@@ -134,10 +134,8 @@
#define RID_TABLEDESIGNROWPOPUPMENU RID_MENU_START + 7
#define RID_SBA_RTF_PKEYPOPUP RID_MENU_START + 9
#define RID_MENU_APP_EDIT RID_MENU_START + 10
#define RID_MENU_APP_NEW RID_MENU_START + 11
#define RID_MENU_APP_PREVIEW RID_MENU_START + 12
#define MENU_BROWSER_DEFAULTCONTEXT RID_MENU_START + 14
#define RID_MENU_REFRESH_DATA RID_MENU_START + 15
#define RID_MENU_JOINVIEW_CONNECTION RID_MENU_START + 16
#define RID_MENU_JOINVIEW_TABLE RID_MENU_START + 17
......
/* -*- 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_DBACCESS_SOURCE_UI_INC_TOOLBOXCONTROLLER_HXX
#define INCLUDED_DBACCESS_SOURCE_UI_INC_TOOLBOXCONTROLLER_HXX
#include <svtools/toolboxcontroller.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase1.hxx>
#include <vcl/vclptr.hxx>
#include "apitools.hxx"
#include "moduledbu.hxx"
#include <map>
#include <memory>
class PopupMenu;
namespace dbaui
{
typedef ::cppu::ImplHelper1 < css::lang::XServiceInfo> TToolboxController_BASE;
class OToolboxController : public ::svt::ToolboxController
,public TToolboxController_BASE
{
typedef std::map<OUString, sal_Bool> TCommandState;
OModuleClient m_aModuleClient;
TCommandState m_aStates;
sal_uInt16 m_nToolBoxId;
VclPtr<PopupMenu> getMenu();
public:
OToolboxController(const css::uno::Reference< css::uno::XComponentContext >& _rxORB);
// XInterface
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL acquire() throw () override;
virtual void SAL_CALL release() throw () override;
// XServiceInfo
DECLARE_SERVICE_INFO_STATIC();
// XInitialization
virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
// XStatusListener
virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
// XToolbarController
virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override;
};
} // dbaui
#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TOOLBOXCONTROLLER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -47,7 +47,6 @@ void SAL_CALL createRegistryInfo_OSQLMessageDialog();
void SAL_CALL createRegistryInfo_OTableControl();
void SAL_CALL createRegistryInfo_OTableFilterDialog();
void SAL_CALL createRegistryInfo_OTextConnectionSettingsDialog();
void SAL_CALL createRegistryInfo_OToolboxController();
void SAL_CALL createRegistryInfo_OUserSettingsDialog();
void SAL_CALL createRegistryInfo_OViewControl();
void SAL_CALL createRegistryInfo_SbaXGridControl();
......
......@@ -53,7 +53,6 @@ extern "C" void SAL_CALL createRegistryInfo_DBU()
createRegistryInfo_OUserSettingsDialog();
createRegistryInfo_OColumnControlModel();
createRegistryInfo_OColumnControl();
createRegistryInfo_OToolboxController();
createRegistryInfo_CopyTableWizard();
createRegistryInfo_OTextConnectionSettingsDialog();
createRegistryInfo_LimitBoxController();
......
......@@ -42,9 +42,6 @@
<implementation name="com.sun.star.comp.sdb.DirectSQLDialog">
<service name="org.openoffice.comp.dbu.DirectSqlDialog"/>
</implementation>
<implementation name="com.sun.star.sdb.ApplicationToolboxController">
<service name="com.sun.star.frame.ToolboxController"/>
</implementation>
<implementation name="com.sun.star.uno.comp.sdb.RowsetFilterDialog">
<service name="com.sun.star.sdb.FilterDialog"/>
</implementation>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment