Mike Kaganski
315349828a
Commit 8ed30e4a243a3efdfe380852d20910bc4a02e181 (Move ToolboxController
to use OPropertyContainerImplHelper, 2026-04-10) introduced cases similar
to the problem handled in commit 3917b082b9f4530d305cd947ab47658f6883c4f1
(Fix --enable-werror gcc build on Linux, 2026-04-09).
In file included from /home/mk/core/framework/inc/uielement/complextoolbarcontroller.hxx:28,
from /home/mk/core/framework/inc/uielement/comboboxtoolbarcontroller.hxx:24,
from /home/mk/core/framework/source/uielement/comboboxtoolbarcontroller.cxx:20:
/home/mk/core/include/svtools/toolboxcontroller.hxx:86:31: error: ‘virtual void svt::ToolboxController::disposing(const com::sun::star::lang::EventObject&)’ was hidden [-Werror=overloaded-virtual=]
86 | virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
| ^~~~~~~~~
/home/mk/core/framework/inc/uielement/comboboxtoolbarcontroller.hxx:44:22: note: by ‘virtual void framework::ComboboxToolbarController::disposing(std::unique_lock<std::mutex>&)’
44 | virtual void disposing(std::unique_lock<std::mutex>& rGuard) override;
| ^~~~~~~~~
Change-Id: Ic41be4d39b032864c3427d17a85502e36f31dce9
Reviewed-on: https://gerrit.collaboraoffice.com/c/core/+/757
Reviewed-by: Justin Luth <justin.luth@collabora.com>
Tested-by: Jenkins CPCI <releng@collaboraoffice.com>
(cherry picked from commit e95308f8dc2e5c1088686eaa1552126eea9745d0)
(cherry picked from commit d6a555ec61272006e801764dd46a493bbbf3e90a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/205689
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Jenkins
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
97 lines
3.8 KiB
C++
97 lines
3.8 KiB
C++
/* -*- 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 .
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <framework/fwkdllapi.h>
|
|
#include <svtools/toolboxcontroller.hxx>
|
|
#include <vcl/toolbox.hxx>
|
|
|
|
namespace weld { class Toolbar; }
|
|
|
|
namespace framework
|
|
{
|
|
|
|
class UNLESS_MERGELIBS(FWK_DLLPUBLIC) GenericToolbarController final : public svt::ToolboxController
|
|
{
|
|
public:
|
|
GenericToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
|
|
const css::uno::Reference< css::frame::XFrame >& rFrame,
|
|
ToolBox* pToolBar,
|
|
ToolBoxItemId nID,
|
|
const OUString& aCommand );
|
|
GenericToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
|
|
const css::uno::Reference< css::frame::XFrame >& rFrame,
|
|
weld::Toolbar& rToolBar,
|
|
const OUString& aCommand );
|
|
virtual ~GenericToolbarController() override;
|
|
|
|
// WeakComponentImplHelperBase
|
|
using svt::ToolboxController::disposing;
|
|
virtual void disposing(std::unique_lock<std::mutex>& rGuard) override;
|
|
|
|
// XToolbarController
|
|
virtual void SAL_CALL execute( sal_Int16 KeyModifier ) override;
|
|
|
|
// XStatusListener
|
|
virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
|
|
|
|
DECL_DLLPRIVATE_STATIC_LINK( GenericToolbarController, ExecuteHdl_Impl, void*, void );
|
|
|
|
struct ExecuteInfo
|
|
{
|
|
css::uno::Reference< css::frame::XDispatch > xDispatch;
|
|
css::util::URL aTargetURL;
|
|
css::uno::Sequence< css::beans::PropertyValue > aArgs;
|
|
};
|
|
|
|
private:
|
|
VclPtr<ToolBox> m_xToolbar;
|
|
ToolBoxItemId m_nID;
|
|
bool m_bEnumCommand : 1,
|
|
m_bMirrored : 1,
|
|
m_bMadeInvisible : 1;
|
|
OUString m_aEnumCommand;
|
|
};
|
|
|
|
class UNLESS_MERGELIBS(FWK_DLLPUBLIC) ImageOrientationController final : public svt::ToolboxController
|
|
{
|
|
public:
|
|
ImageOrientationController(const css::uno::Reference<css::uno::XComponentContext>& rContext,
|
|
const css::uno::Reference<css::frame::XFrame>& rFrame,
|
|
const css::uno::Reference<css::awt::XWindow>& rParentWindow,
|
|
const OUString& rModuleName);
|
|
|
|
// WeakComponentImplHelperBase
|
|
using svt::ToolboxController::disposing;
|
|
void disposing(std::unique_lock<std::mutex>& rGuard) override;
|
|
|
|
// XStatusListener
|
|
void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& rEvent) override;
|
|
|
|
DECL_LINK(WindowEventListener, VclWindowEvent&, void);
|
|
private:
|
|
Degree10 m_nRotationAngle;
|
|
bool m_bMirrored;
|
|
};
|
|
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|