dbaccess/Library_dbu.mk | 1 dbaccess/source/ui/misc/ToolBoxHelper.cxx | 102 ------------------------------ include/dbaccess/ToolBoxHelper.hxx | 70 -------------------- include/svx/colorwindow.hxx | 1 reportdesign/source/ui/dlg/Condition.cxx | 2 solenv/clang-format/blacklist | 2 svx/source/tbxctrls/tbcontrl.cxx | 5 - 7 files changed, 1 insertion(+), 182 deletions(-)
New commits: commit 3e8828508310b1203ca14a87a4d3967d2ef1d30a Author: Caolán McNamara <[email protected]> AuthorDate: Sat Oct 12 16:34:50 2019 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Oct 13 16:17:04 2019 +0200 no longer need bInterimBuilder Change-Id: Ieff1e34de9665c80ded39d605656fe7d0626aec7 Reviewed-on: https://gerrit.libreoffice.org/80716 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx index 4656f3d37af7..8b1cc35e7565 100644 --- a/include/svx/colorwindow.hxx +++ b/include/svx/colorwindow.hxx @@ -166,7 +166,6 @@ public: sal_uInt16 nSlotId, const css::uno::Reference< css::frame::XFrame >& rFrame, weld::Window* pParentWindow, const MenuOrToolMenuButton &rMenuButton, - bool bInterimBuilder, ColorSelectFunction const& rColorSelectFunction); weld::Container* GetWidget() { return mxTopLevel.get(); } virtual ~ColorWindow() override; diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 9e79c3d8830b..5676b6b91017 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -173,7 +173,6 @@ void Condition::SetBackgroundDropdownClick() nullptr, m_pDialog, MenuOrToolMenuButton(m_xActions.get(), "background"), - /*bInterimBuilder*/false, m_aBackColorWrapper)); m_xActions->set_item_popover("background", m_xBackColorFloat->GetWidget()); @@ -188,7 +187,6 @@ void Condition::SetForegroundDropdownClick() nullptr, m_pDialog, MenuOrToolMenuButton(m_xActions.get(), "foreground"), - /*bInterimBuilder*/false, m_aForeColorWrapper)); m_xActions->set_item_popover("foreground", m_xForeColorFloat->GetWidget()); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 6dc4292b57ec..510d695ffba0 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1705,11 +1705,9 @@ ColorWindow::ColorWindow(std::shared_ptr<PaletteManager> const & rPaletteManager const Reference< XFrame >& rFrame, weld::Window* pParentWindow, const MenuOrToolMenuButton& rMenuButton, - bool bInterimBuilder, ColorSelectFunction const & aFunction) : ToolbarPopupBase(rFrame) - , m_xBuilder(bInterimBuilder ? Application::CreateInterimBuilder(rMenuButton.get_widget(), "svx/ui/colorwindow.ui") - : Application::CreateBuilder(rMenuButton.get_widget(), "svx/ui/colorwindow.ui")) + , m_xBuilder(Application::CreateBuilder(rMenuButton.get_widget(), "svx/ui/colorwindow.ui")) , theSlotId(nSlotId) , mpParentWindow(pParentWindow) , maMenuButton(rMenuButton) @@ -4077,7 +4075,6 @@ void ColorListBox::createColorWindow() xFrame, m_pTopLevel, m_xButton.get(), - /*bInterimBuilder*/false, m_aColorWrapper)); SetNoSelection(); commit f7a475dc7c202e1f3e8a905cb7bedbddddf06ec0 Author: Caolán McNamara <[email protected]> AuthorDate: Fri Oct 11 14:23:07 2019 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Oct 13 16:16:52 2019 +0200 ToolBoxHelper is now unused Change-Id: I5e492fda0ce2b88c4e6790a6972bc36f082003a1 Reviewed-on: https://gerrit.libreoffice.org/80691 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 121584ef3426..74223abd7038 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -172,7 +172,6 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\ dbaccess/source/ui/misc/stringlistitem \ dbaccess/source/ui/misc/TableCopyHelper \ dbaccess/source/ui/misc/TokenWriter \ - dbaccess/source/ui/misc/ToolBoxHelper \ dbaccess/source/ui/misc/uiservices \ dbaccess/source/ui/misc/UITools \ dbaccess/source/ui/misc/WColumnSelect \ diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx deleted file mode 100644 index 3fc009dee348..000000000000 --- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx +++ /dev/null @@ -1,102 +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 <dbaccess/ToolBoxHelper.hxx> -#include <vcl/toolbox.hxx> -#include <vcl/svapp.hxx> -#include <svtools/miscopt.hxx> -#include <UITools.hxx> -#include <svtools/imgdef.hxx> -#include <vcl/event.hxx> -#include <vcl/settings.hxx> -#include <osl/diagnose.h> - -namespace dbaui -{ - OToolBoxHelper::OToolBoxHelper() - : m_nSymbolsSize(-1) - , m_pToolBox(nullptr) - { - - OSL_ENSURE(m_nSymbolsSize != SvtMiscOptions().GetCurrentSymbolsSize(),"SymbolsSize should not be identical"); - SvtMiscOptions().AddListenerLink( LINK( this, OToolBoxHelper, ConfigOptionsChanged ) ); - Application::AddEventListener( LINK( this, OToolBoxHelper, SettingsChanged ) ); - } - OToolBoxHelper::~OToolBoxHelper() - { - SvtMiscOptions().RemoveListenerLink( LINK( this, OToolBoxHelper, ConfigOptionsChanged ) ); - Application::RemoveEventListener( LINK( this, OToolBoxHelper, SettingsChanged ) ); - } - - void OToolBoxHelper::checkImageList() - { - if ( m_pToolBox ) - { - sal_Int16 nCurSymbolsSize = SvtMiscOptions().GetCurrentSymbolsSize(); - if ( nCurSymbolsSize != m_nSymbolsSize ) - { - m_nSymbolsSize = nCurSymbolsSize; - - Size aTbOldSize = m_pToolBox->GetSizePixel(); - adjustToolBoxSize(m_pToolBox); - Size aTbNewSize = m_pToolBox->GetSizePixel(); - resizeControls(Size(aTbNewSize.Width() - aTbOldSize.Width(), - aTbNewSize.Height() - aTbOldSize.Height()) - ); - } - } - } - - IMPL_LINK_NOARG(OToolBoxHelper, ConfigOptionsChanged, LinkParamNone*, void) - { - if ( m_pToolBox ) - { - SvtMiscOptions aOptions; - // check if imagelist changed - checkImageList(); - if ( aOptions.GetToolboxStyle() != m_pToolBox->GetOutStyle() ) - m_pToolBox->SetOutStyle(aOptions.GetToolboxStyle()); - } - } - IMPL_LINK(OToolBoxHelper, SettingsChanged, VclSimpleEvent&, _rEvt, void) - { - if ( m_pToolBox && _rEvt.GetId() == VclEventId::ApplicationDataChanged ) - { - DataChangedEvent* pData = static_cast<DataChangedEvent*>(static_cast<VclWindowEvent&>(_rEvt).GetData()); - if ( pData && ((( pData->GetType() == DataChangedEventType::SETTINGS ) || - ( pData->GetType() == DataChangedEventType::DISPLAY )) && - ( pData->GetFlags() & AllSettingsFlags::STYLE ))) - // check if imagelist changed - checkImageList(); - } - } - void OToolBoxHelper::setToolBox(ToolBox* _pTB) - { - bool bFirstTime = (m_pToolBox == nullptr); - m_pToolBox = _pTB; - if ( m_pToolBox ) - { - ConfigOptionsChanged(nullptr); - if ( bFirstTime ) - adjustToolBoxSize(m_pToolBox); - } - } -} // namespace - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/dbaccess/ToolBoxHelper.hxx b/include/dbaccess/ToolBoxHelper.hxx deleted file mode 100644 index 75f6dd094445..000000000000 --- a/include/dbaccess/ToolBoxHelper.hxx +++ /dev/null @@ -1,70 +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_DBACCESS_TOOLBOXHELPER_HXX -#define INCLUDED_DBACCESS_TOOLBOXHELPER_HXX - -#include <dbaccess/dbaccessdllapi.h> -#include <sal/types.h> -#include <tools/link.hxx> -#include <vcl/vclptr.hxx> - -class LinkParamNone; -class Size; -class ToolBox; -class VclSimpleEvent; - -namespace dbaui -{ - class DBACCESS_DLLPUBLIC OToolBoxHelper - { - sal_Int16 m_nSymbolsSize; // shows the toolbox large or small bitmaps - VclPtr<ToolBox> m_pToolBox; // our toolbox (may be NULL) - public: - OToolBoxHelper(); - virtual ~OToolBoxHelper(); - - /** will be called when the controls need to be resized. - @param _rDiff - Contains the difference of the old and new toolbox size. - - TO-DO: remove this when all implementations - are converted to .ui format - */ - virtual void resizeControls(const Size& _rDiff) = 0; - - /** only the member will be set, derived classes can override - this function and do what need to be done. - @param _pTB - The new ToolBox. - */ - void setToolBox(ToolBox* _pTB); - - /** checks if the toolbox needs a new imagelist. - */ - void checkImageList(); - - protected: - DECL_LINK(ConfigOptionsChanged, LinkParamNone*, void); - DECL_LINK(SettingsChanged, VclSimpleEvent&, void ); - }; -} -#endif // INCLUDED_DBACCESS_TOOLBOXHELPER_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 314d9f6d8bd5..dece08b26f0c 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -3408,7 +3408,6 @@ dbaccess/source/ui/misc/RowSetDrop.cxx dbaccess/source/ui/misc/RtfReader.cxx dbaccess/source/ui/misc/TableCopyHelper.cxx dbaccess/source/ui/misc/TokenWriter.cxx -dbaccess/source/ui/misc/ToolBoxHelper.cxx dbaccess/source/ui/misc/UITools.cxx dbaccess/source/ui/misc/UpdateHelperImpl.hxx dbaccess/source/ui/misc/WCPage.cxx @@ -6045,7 +6044,6 @@ include/cppuhelper/weakref.hxx include/cppunittester/protectorfactory.hxx include/dbaccess/AsynchronousLink.hxx include/dbaccess/IController.hxx -include/dbaccess/ToolBoxHelper.hxx include/dbaccess/controllerframe.hxx include/dbaccess/dataview.hxx include/dbaccess/dbaccessdllapi.h _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
