diff options
24 files changed, 85 insertions, 591 deletions
diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results index 887952275242..d5c5aa7d356c 100644 --- a/compilerplugins/clang/unusedmethods.results +++ b/compilerplugins/clang/unusedmethods.results @@ -420,7 +420,7 @@ include/editeng/hyphenzoneitem.hxx:65 _Bool SvxHyphenZoneItem::IsPageEnd() const include/filter/msfilter/mstoolbar.hxx:103 Indent::Indent(_Bool) -include/formula/opcode.hxx:520 +include/formula/opcode.hxx:518 class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > OpCodeEnumToString(enum OpCode) include/formula/tokenarray.hxx:180 class formula::FormulaTokenArrayReferencesIterator formula::FormulaTokenArrayReferencesIterator::operator++(int) @@ -554,40 +554,30 @@ include/sfx2/charwin.hxx:63 void SvxCharView::connect_focus_in(const class Link<class weld::Widget &, void> &) include/sfx2/charwin.hxx:64 void SvxCharView::connect_focus_out(const class Link<class weld::Widget &, void> &) -include/sfx2/controlwrapper.hxx:150 - _Bool sfx::ControlWrapperBase::IsControlDontKnow() const -include/sfx2/controlwrapper.hxx:152 - void sfx::ControlWrapperBase::SetControlDontKnow(_Bool) -include/sfx2/controlwrapper.hxx:235 - sfx::MetricFieldWrapper::MetricFieldWrapper<ValueT>(class MetricField &,enum FieldUnit) +include/sfx2/controlwrapper.hxx:147 + void sfx::ControlWrapperBase::ModifyControl(enum TriState) +include/sfx2/controlwrapper.hxx:210 + sfx::DummyWindowWrapper::DummyWindowWrapper(class vcl::Window &) include/sfx2/docfilt.hxx:83 _Bool SfxFilter::GetGpgEncryption() const -include/sfx2/itemconnect.hxx:215 - sfx::ItemControlConnection::ItemControlConnection<ItemWrpT, ControlWrpT>(unsigned short,type-parameter-?-? *,enum ItemConnFlags) -include/sfx2/itemconnect.hxx:221 - sfx::ItemControlConnection::ItemControlConnection<ItemWrpT, ControlWrpT>(unsigned short,typename type-parameter-?-?::ControlType &,enum ItemConnFlags) -include/sfx2/itemconnect.hxx:254 - sfx::DummyItemConnection::DummyItemConnection(unsigned short,class vcl::Window &,enum ItemConnFlags) -include/sfx2/itemconnect.hxx:286 - sfx::ListBoxConnection::ListBoxConnection<ItemWrpT>(unsigned short,class ListBox &,const typename ItemControlConnection<type-parameter-?-?, ListBoxWrapper<typename type-parameter-?-?::ItemValueType> >::ControlWrapperType::MapEntryType *,enum ItemConnFlags) -include/sfx2/itemconnect.hxx:306 - sfx::ItemConnectionArray::ItemConnectionArray() -include/sfx2/itemconnect.hxx:311 - void sfx::ItemConnectionArray::AddConnection(class sfx::ItemConnectionBase *) -include/sfx2/itemwrapper.hxx:92 - sfx::SingleItemWrapper::SingleItemWrapper<ItemT, ValueT>(unsigned short) -include/sfx2/itemwrapper.hxx:97 - unsigned short sfx::SingleItemWrapper::GetSlotId() const -include/sfx2/itemwrapper.hxx:103 - const type-parameter-?-? * sfx::SingleItemWrapper::GetUniqueItem(const class SfxItemSet &) const -include/sfx2/itemwrapper.hxx:107 - const type-parameter-?-? & sfx::SingleItemWrapper::GetDefaultItem(const class SfxItemSet &) const -include/sfx2/itemwrapper.hxx:110 - type-parameter-?-? sfx::SingleItemWrapper::GetItemValue(const type-parameter-?-? &) const -include/sfx2/itemwrapper.hxx:112 - void sfx::SingleItemWrapper::SetItemValue(type-parameter-?-? &,type-parameter-?-?) const -include/sfx2/itemwrapper.hxx:133 - sfx::ValueItemWrapper::ValueItemWrapper<ItemT, ValueT, InternalValueT>(unsigned short) +include/sfx2/itemconnect.hxx:166 + void sfx::ItemConnectionBase::DoApplyFlags(const class SfxItemSet *) +include/sfx2/itemconnect.hxx:168 + void sfx::ItemConnectionBase::DoReset(const class SfxItemSet *) +include/sfx2/itemconnect.hxx:170 + _Bool sfx::ItemConnectionBase::DoFillItemSet(class SfxItemSet &,const class SfxItemSet &) +include/sfx2/itemconnect.hxx:173 + sfx::ItemConnectionBase::ItemConnectionBase(enum ItemConnFlags) +include/sfx2/itemconnect.hxx:183 + enum TriState sfx::ItemConnectionBase::GetShowState(_Bool) const +include/sfx2/itemwrapper.hxx:43 + _Bool sfx::ItemWrapperHelper::IsKnownItem(const class SfxItemSet &,unsigned short) +include/sfx2/itemwrapper.hxx:47 + const class SfxPoolItem * sfx::ItemWrapperHelper::GetUniqueItem(const class SfxItemSet &,unsigned short) +include/sfx2/itemwrapper.hxx:50 + const class SfxPoolItem & sfx::ItemWrapperHelper::GetDefaultItem(const class SfxItemSet &,unsigned short) +include/sfx2/itemwrapper.hxx:53 + void sfx::ItemWrapperHelper::RemoveDefaultItem(class SfxItemSet &,const class SfxItemSet &,unsigned short) include/sfx2/lokcharthelper.hxx:41 void LokChartHelper::Invalidate() include/sfx2/msg.hxx:120 @@ -602,6 +592,10 @@ include/svtools/ctrlbox.hxx:208 long LineListBox::GetWidth() const include/svtools/dialogcontrolling.hxx:167 void svt::ControlDependencyManager::enableOnCheckMark(class CheckBox &,class vcl::Window &,class vcl::Window &) +include/svtools/imagemgr.hxx:124 + class rtl::OUString SvFileInformationManager::GetFileImageId(const class INetURLObject &) +include/svtools/treelistbox.hxx:689 + void SvTreeListBox::ShowEntry(class SvTreeListEntry *) include/svx/ClassificationEditView.hxx:42 void svx::ClassificationEditView::SetCharAttributes() include/svx/ClassificationEditView.hxx:48 @@ -610,20 +604,34 @@ include/svx/ClassificationField.hxx:48 const class rtl::OUString & svx::ClassificationResult::getDisplayText() const include/svx/ClassificationField.hxx:53 _Bool svx::ClassificationResult::operator==(const class svx::ClassificationResult &) const +include/svx/dlgctrl.hxx:222 + HatchingLB::HatchingLB(class vcl::Window *,long) +include/svx/dlgctrl.hxx:230 + GradientLB::GradientLB(class vcl::Window *,long) +include/svx/dlgctrl.hxx:238 + BitmapLB::BitmapLB(class vcl::Window *,long) +include/svx/dlgctrl.hxx:265 + void LineLB::setAddStandardFields(_Bool) +include/svx/dlgctrl.hxx:267 + void LineLB::Append(const class XDashEntry &,const class BitmapEx &) +include/svx/dlgctrl.hxx:268 + void LineLB::Modify(const class XDashEntry &,int,const class BitmapEx &) +include/svx/dlgctrl.hxx:300 + void SvxLineLB::set_sensitive(_Bool) +include/svx/dlgctrl.hxx:301 + _Bool SvxLineLB::get_sensitive() const +include/svx/dlgctrl.hxx:323 + void SvxLineEndLB::set_active_text(const class rtl::OUString &) +include/svx/fontlb.hxx:38 + SvLBoxFontString::SvLBoxFontString(const class rtl::OUString &,const class vcl::Font &,const class Color *) include/svx/framelink.hxx:201 _Bool svx::frame::operator>(const class svx::frame::Style &,const class svx::frame::Style &) include/svx/framelink.hxx:238 _Bool svx::frame::StyleVectorCombination::operator<(const class svx::frame::StyleVectorCombination &) const -include/svx/orienthelper.hxx:86 - void svx::OrientationHelper::EnableStackedTriState(_Bool) include/svx/svdlayer.hxx:75 _Bool SdrLayer::operator==(const class SdrLayer &) const include/svx/svdpntv.hxx:462 _Bool SdrPaintView::IsSwapAsynchron() const -include/svx/svdundo.hxx:190 - SdrUndoMoveObj::SdrUndoMoveObj(class SdrObject &) -include/svx/svdundo.hxx:525 - SdrUndoMoveLayer::SdrUndoMoveLayer(unsigned short,class SdrLayerAdmin &,class SdrModel &,unsigned short) include/svx/xpoly.hxx:82 _Bool XPolygon::operator==(const class XPolygon &) const include/tools/bigint.hxx:86 @@ -798,47 +806,49 @@ include/vcl/weld.hxx:172 class rtl::OUString weld::Notebook::get_tab_label_text(const class rtl::OString &) const include/vcl/weld.hxx:198 struct SystemEnvData weld::Window::get_system_data() const -include/vcl/weld.hxx:345 +include/vcl/weld.hxx:341 + void weld::TreeView::append(const class rtl::OUString &,const class rtl::OUString &,class VirtualDevice &) +include/vcl/weld.hxx:354 void weld::TreeView::set_top_entry(int) -include/vcl/weld.hxx:375 +include/vcl/weld.hxx:385 void weld::TreeView::select_all() -include/vcl/weld.hxx:503 +include/vcl/weld.hxx:520 void weld::Entry::signal_insert_text(class rtl::OUString &) -include/vcl/weld.hxx:515 +include/vcl/weld.hxx:532 int weld::Entry::get_position() const -include/vcl/weld.hxx:575 +include/vcl/weld.hxx:592 int weld::SpinButton::get_min() const -include/vcl/weld.hxx:835 +include/vcl/weld.hxx:857 class Size weld::MetricSpinButton::get_size_request() const -include/vcl/weld.hxx:846 +include/vcl/weld.hxx:868 void weld::MetricSpinButton::set_position(int) -include/vcl/weld.hxx:893 +include/vcl/weld.hxx:915 _Bool weld::TimeSpinButton::get_sensitive() const -include/vcl/weld.hxx:894 +include/vcl/weld.hxx:916 _Bool weld::TimeSpinButton::get_visible() const -include/vcl/weld.hxx:895 +include/vcl/weld.hxx:917 void weld::TimeSpinButton::grab_focus() -include/vcl/weld.hxx:896 +include/vcl/weld.hxx:918 _Bool weld::TimeSpinButton::has_focus() const -include/vcl/weld.hxx:897 +include/vcl/weld.hxx:919 void weld::TimeSpinButton::show(_Bool) -include/vcl/weld.hxx:898 +include/vcl/weld.hxx:920 void weld::TimeSpinButton::hide() -include/vcl/weld.hxx:899 +include/vcl/weld.hxx:921 void weld::TimeSpinButton::save_value() -include/vcl/weld.hxx:900 +include/vcl/weld.hxx:922 _Bool weld::TimeSpinButton::get_value_changed_from_saved() const -include/vcl/weld.hxx:991 +include/vcl/weld.hxx:1013 void weld::DrawingArea::connect_key_release(const class Link<const class KeyEvent &, _Bool> &) -include/vcl/weld.hxx:1017 - void weld::Menu::set_sensitive(const class rtl::OString &,_Bool) -include/vcl/weld.hxx:1018 +include/vcl/weld.hxx:1040 void weld::Menu::set_active(const class rtl::OString &,_Bool) -include/vcl/weld.hxx:1027 +include/vcl/weld.hxx:1050 + void weld::Menu::append(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &) +include/vcl/weld.hxx:1066 void weld::SizeGroup::set_mode(enum VclSizeGroupMode) -include/vcl/weld.hxx:1049 +include/vcl/weld.hxx:1088 class std::unique_ptr<class weld::Window, struct std::default_delete<class weld::Window> > weld::Builder::weld_window(const class rtl::OString &,_Bool) -include/vcl/weld.hxx:1160 +include/vcl/weld.hxx:1199 class rtl::OUString weld::MessageDialogController::get_primary_text() const include/vcl/window.hxx:430 const char * ImplDbgCheckWindow(const void *) @@ -846,8 +856,8 @@ include/vcl/window.hxx:1239 class Size vcl::Window::PaintActiveFloatingWindow(class VirtualDevice &) const libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx:35 void openLokDialog(struct _GtkWidget *,void *) -lotuswordpro/source/filter/lwplaypiece.hxx:219 - double LwpLayoutColumns::GetColWidth(unsigned short) +lotuswordpro/source/filter/lwplaypiece.hxx:206 + double LwpColumnInfo::GetWidth() o3tl/qa/cow_wrapper_clients.hxx:140 _Bool o3tltests::cow_wrapper_client4::operator==(const class o3tltests::cow_wrapper_client4 &) const o3tl/qa/cow_wrapper_clients.hxx:141 @@ -872,8 +882,6 @@ sc/inc/datamapper.hxx:85 void sc::ExternalDataSource::setURL(const class rtl::OUString &) sc/inc/datamapper.hxx:86 void sc::ExternalDataSource::setProvider(const class rtl::OUString &) -sc/inc/documentlinkmgr.hxx:65 - void sc::DocumentLinkManager::disconnectDdeLinks() sc/inc/dpfilteredcache.hxx:143 void ScDPFilteredCache::dump() const sc/inc/formulacell.hxx:460 @@ -970,7 +978,7 @@ sc/source/ui/inc/viewdata.hxx:407 long ScViewData::GetLOKDocHeightPixel() const sc/source/ui/inc/viewdata.hxx:540 _Bool ScViewData::IsGridMode() const -scaddins/source/analysis/analysishelper.hxx:818 +scaddins/source/analysis/analysishelper.hxx:819 _Bool sca::analysis::ScaDate::operator>=(const class sca::analysis::ScaDate &) const sccomp/source/solver/DifferentialEvolution.hxx:67 int DifferentialEvolutionAlgorithm::getLastChange() @@ -1034,10 +1042,6 @@ slideshow/source/engine/animationfactory.cxx:548 typename type-parameter-?-?::ValueType slideshow::internal::(anonymous namespace)::GenericAnimation::getUnderlyingValue() const slideshow/source/engine/opengl/TransitionImpl.hxx:180 void OGLTransitionImpl::finish(double,double,double,double,double) -slideshow/source/inc/shapeattributelayer.hxx:380 - _Bool slideshow::internal::ShapeAttributeLayer::isCharRotationAngleValid() const -slideshow/source/inc/shapeattributelayer.hxx:387 - void slideshow::internal::ShapeAttributeLayer::setCharRotationAngle(const double &) svgio/inc/svgstyleattributes.hxx:346 class svgio::svgreader::SvgNumber svgio::svgreader::SvgStyleAttributes::getStrokeDashOffset() const svgio/inc/svgstyleattributes.hxx:370 @@ -1120,8 +1124,6 @@ sw/inc/extinput.hxx:48 class SwExtTextInput * SwExtTextInput::GetPrev() sw/inc/extinput.hxx:49 const class SwExtTextInput * SwExtTextInput::GetPrev() const -sw/inc/fesh.hxx:538 - void SwFEShell::BreakMark() sw/inc/IDocumentLinksAdministration.hxx:53 _Bool IDocumentLinksAdministration::GetData(const class rtl::OUString &,const class rtl::OUString &,class com::sun::star::uno::Any &) const sw/inc/IDocumentLinksAdministration.hxx:55 @@ -1312,12 +1314,12 @@ vcl/source/fontsubset/xlat.hxx:34 unsigned short vcl::TranslateChar15(unsigned short) vcl/source/fontsubset/xlat.hxx:35 unsigned short vcl::TranslateChar16(unsigned short) +workdir/LexTarget/l10ntools/source/cfglex.cxx:3721 + void YYWarning(const char *) workdir/LexTarget/l10ntools/source/xrmlex.cxx:715 void YYWarning() -workdir/LexTarget/l10ntools/source/xrmlex.cxx:2211 - void YYWarning(const char *) -writerfilter/source/dmapper/TableData.hxx:329 - void writerfilter::dmapper::TableData::insertCellProperties(unsigned int,class tools::SvRef<class writerfilter::dmapper::TablePropertyMap>) +writerfilter/source/dmapper/TableData.hxx:174 + void writerfilter::dmapper::RowData::insertCellProperties(unsigned int,class tools::SvRef<class writerfilter::dmapper::TablePropertyMap>) writerfilter/source/ooxml/OOXMLPropertySet.hxx:176 class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> *, class std::__cxx1998::vector<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> > > >, class std::__debug::vector<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> > > > writerfilter::ooxml::OOXMLPropertySet::begin() const writerfilter/source/ooxml/OOXMLPropertySet.hxx:177 diff --git a/compilerplugins/clang/unusedmethods.unused-returns.results b/compilerplugins/clang/unusedmethods.unused-returns.results index ce5ec6c0f034..317f6a014776 100644 --- a/compilerplugins/clang/unusedmethods.unused-returns.results +++ b/compilerplugins/clang/unusedmethods.unused-returns.results @@ -144,6 +144,8 @@ include/sfx2/linkmgr.hxx:64 _Bool sfx2::LinkManager::InsertLink(class sfx2::SvBaseLink *,unsigned short,enum SfxLinkUpdateMode,const class rtl::OUString *) include/sfx2/lnkbase.hxx:103 class sfx2::SvLinkSource * sfx2::SvBaseLink::GetRealObject() +include/svl/listener.hxx:55 + _Bool SvtListener::EndListening(class SvtBroadcaster &) include/svl/macitem.hxx:92 class SvStream & SvxMacroTableDtor::Write(class SvStream &) const include/svl/poolitem.hxx:173 @@ -196,9 +198,9 @@ include/vcl/texteng.hxx:279 _Bool TextEngine::Read(class SvStream &,const class TextSelection *) include/vcl/toolbox.hxx:514 _Bool ToolBox::ChangeHighlightUpDn(_Bool) -include/vcl/weld.hxx:300 +include/vcl/weld.hxx:308 _Bool weld::ComboBox::get_entry_selection_bounds(int &,int &) -include/vcl/weld.hxx:925 +include/vcl/weld.hxx:947 _Bool weld::TextView::get_selection_bounds(int &,int &) lotuswordpro/inc/lwpsvstream.hxx:76 class LwpSvStream & LwpSvStream::ReadUInt8(unsigned char &) diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index c678922dbbab..b81ad28d5951 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -142,10 +142,6 @@ public: explicit ControlWrapperBase() {} virtual ~ControlWrapperBase(); - /** Derived classes enable, disable, show, or hide control(s). - @descr Will do nothing, if the corresponding parameter is TRISTATE_INDET. */ - virtual void ModifyControl( TriState eShow ) = 0; - private: ControlWrapperBase( const ControlWrapperBase& ) = delete; ControlWrapperBase& operator=( const ControlWrapperBase& ) = delete; @@ -183,10 +179,6 @@ public: /** Returns a reference to the control this connection works on. */ ControlT& GetControl() { return mrControl; } - /** Enables, disables, shows, or hides the control. - @descr Does nothing, if the corresponding parameter is TRISTATE_INDET. */ - virtual void ModifyControl( TriState eShow ) override; - /** Derived classes return the value the control contains. */ virtual ValueT GetControlValue() const = 0; /** Derived classes set the contents of the control to the passed value. */ @@ -197,23 +189,6 @@ private: }; -/** A dummy wrapper for a VCL Window that does nothing special. - - This wrapper is used to implement the DummyItemConnection. It does not - connect an item to a control, but handles the special flags to disable or - hide a control, if an item is unknown. - */ -class SFX2_DLLPUBLIC DummyWindowWrapper: - public SingleControlWrapper< vcl::Window, void* > -{ -public: - explicit DummyWindowWrapper( vcl::Window& rWindow ); - - virtual void* GetControlValue() const override; - virtual void SetControlValue( void* ) override; -}; - - #define WRAPPER_LISTBOX_ENTRY_NOTFOUND 0xFFFF /* XXX was value of LISTBOX_ENTRY_NOTFOUND */ /** A wrapper for the VCL ListBox. @@ -288,14 +263,6 @@ PosT PosValueMapper< PosT, ValueT >::GetPosFromValue( ValueT nValue ) const // Single control wrappers -template< typename ControlT, typename ValueT > -inline void SingleControlWrapper< ControlT, ValueT >::ModifyControl( TriState eShow ) -{ - if( eShow != TRISTATE_INDET ) - mrControl.Show( eShow == TRISTATE_TRUE ); -} - - template< typename ValueT > ValueT ListBoxWrapper< ValueT >::GetControlValue() const { diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx deleted file mode 100644 index 377a60eb7bd6..000000000000 --- a/include/sfx2/itemconnect.hxx +++ /dev/null @@ -1,196 +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_ITEMCONNECT_HXX -#define INCLUDED_SFX2_ITEMCONNECT_HXX - -#include <sal/config.h> -#include <o3tl/typed_flags_set.hxx> -#include <sfx2/dllapi.h> -#include <sfx2/itemwrapper.hxx> -#include <sfx2/controlwrapper.hxx> -#include <svl/itemset.hxx> -#include <memory> - - -enum class ItemConnFlags -{ -/** No special state for the connection. */ - NONE = 0x0000, -/** Hide control(s), if the item is unknown. */ - HideUnknown = 0x0001, -}; -namespace o3tl -{ - template<> struct typed_flags<ItemConnFlags> : is_typed_flags<ItemConnFlags, 0x0001> {}; -} - -namespace sfx { - -// Base connection classes - - -/** A helper for SfxTabPages to connect controls to items. - - This is the base class of all control connection classes. Their purpose is - to connect one or more controls from an SfxTabPage with an item from an - item set. The goal is to omit any additional code in the virtual functions - Reset() and FillItemSet() in classes derived from SfxTabPage. - - Examples of connections: - - A check box with an SfxBoolItem, - - A metric (spin) field with an SfxInt32Item. - - A group of radio buttons with an SfxEnumItem. - - Each SfxTabPage will contain a list of connection objects (derived from - this class). The connection objects remember the item and control(s) they - have to work on. The SfxTabPage will call the DoApplyFlags(), DoReset(), - and DoFillItemSet() functions of all connection objects it knows. The code - to initialize control(s) from the item value and fill the item from - control(s) has to be written only once for each control type. - - Additional flags passed in the constructor allow to control the behaviour - of the control(s) if the item is supported/unsupported in the currently - used item set. For example, it is possible to specify that a control will - be disabled or hidden if the item is not supported. This is done before - each call of Reset(). - - The special flag ITEMCONN_CLONE_ITEM controls how to create new items in - the DoFillItemSet() function. The standard (and faster) method is to create - a temporary item on the stack and put it into the item set. But this does - not work if the item set expects a special item type derived from a common - item class, i.e. a Boolean item derived from SfxBoolItem providing special - item representation text. As this code does not know the item type, the - item cannot be created on the stack. For this case the flag specifies to - use the virtual Clone() method of the pool default item. This will create - an item of the correct type but can still be used in conjunction with i.e. - the standard BoolItemWrapper. - - How to use the item connection feature: - - A) Single item <-> single control connection - - Example: An SfxBoolItem and a check box. - - A1) Create a new item wrapper class derived from the SingleItemWrapper - template, or use the template directly, or use one of the - predefined item wrappers. See documentation of the - SingleItemWrapper template for details (itemwrapper.hxx). - A2) Create a new control wrapper class derived from the - SingleControlWrapper template and implement the abstract functions, - or use one of the predefined control wrappers. See documentation of - the SingleControlWrapper template for details (controlwrapper.hxx). - A3) Create a new connection class derived from one of the following - base classes, and implement the abstract functions, or use the - ItemControlConnection template directly, or use one of the - predefined connections. - A4) Create connection objects in the constructor of the tab page, and - insert them into the tab page with SfxTabPage::AddItemConnection(). - A5) Remove old code from the tab page's Reset() and FillItemSet() - functions, if necessary. - - B) Single item <-> multiple controls connections - - B1) See step A1. If the item contains multiple values (and not a - structure that contains all the values for the different controls), - the best way is to use the IdentItemWrapper template, that works - with the item itself. This way it is possible to provide a 'data - type' that contains the values for all controls. - B2) Create a new control wrapper class derived from the - MultiControlWrapper template. Add single control wrapper members - for all controls to this class and register them in the - constructor, using the RegisterControlWrapper() function. Implement - the abstract functions GetControlValue() and SetControlValue(). - These functions should call the respective functions of the own - single control wrappers and either fill a new data object (the item - itself in most cases, see step B1) with all the values from the - controls, or fill all the controls from the data object. - B3) Create a new connection class derived from ItemControlConnection, - or use the ItemControlConnection template directly. The multiple - control wrapper from step B2 acts like a single control, therefore - it is possible to use the ItemControlConnection. - B4) See steps A4 and A5. - - C) Multiple items <-> single control connections - - todo - - D) Multiple items <-> multiple controls connections - - todo - - The current tree of base classes/templates and standard connections: - - ItemConnectionBase - | - +- DummyItemConnection [1] - | - +- ItemControlConnection< ItemWrpT, ControlWrpT > - | | - | +- NumericConnection< ItemWrpT > [1] - | | | - | | +- [ValueType]NumericConnection [1] [2] - | | - | +- ListBoxConnection< ItemWrpT > [1] - | | - | +- [ValueType]ListBoxConnection [1] [2] - | - +- ItemConnectionArray [1] - - Notes: - [1] Standard connections ready to use. - [2] [ValueType] is one of Int16, UInt16, Int32, UInt32. - */ -class SFX2_DLLPUBLIC ItemConnectionBase -{ -public: - virtual ~ItemConnectionBase(); - - /** Calls the virtual ApplyFlags() function, if connection is active. */ - void DoApplyFlags( const SfxItemSet* pItemSet ); - /** Calls the virtual Reset() function, if connection is active. */ - void DoReset( const SfxItemSet* pItemSet ); - /** Calls the virtual FillItemSet() function, if connection is active. */ - bool DoFillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ); - -protected: - explicit ItemConnectionBase( ItemConnFlags nFlags ); - - /** Derived classes implement actions according to current flags here. */ - virtual void ApplyFlags( const SfxItemSet* pItemSet ) = 0; - /** Derived classes implement initializing controls from item sets here. */ - virtual void Reset( const SfxItemSet* pItemSet ) = 0; - /** Derived classes implement filling item sets from controls here. */ - virtual bool FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ) = 0; - - /** Returns whether to show a control, according to current flags. */ - TriState GetShowState( bool bKnown ) const; - -private: - ItemConnectionBase( const ItemConnectionBase& ) = delete; - ItemConnectionBase& operator=( const ItemConnectionBase& ) = delete; - - ItemConnFlags mnFlags; /// Flags for additional options. -}; - -} // namespace sfx - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/itemwrapper.hxx b/include/sfx2/itemwrapper.hxx deleted file mode 100644 index 193cd012e550..000000000000 --- a/include/sfx2/itemwrapper.hxx +++ /dev/null @@ -1,60 +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_ITEMWRAPPER_HXX -#define INCLUDED_SFX2_ITEMWRAPPER_HXX - -#include <sal/config.h> -#include <sfx2/dllapi.h> -#include <svl/eitem.hxx> -#include <svl/intitem.hxx> - -class SfxItemSet; - -namespace sfx { - - -// Helpers - - -class SFX2_DLLPUBLIC ItemWrapperHelper -{ -public: - /** Returns the WID of the passed SID in the item set. */ - static sal_uInt16 GetWhichId( const SfxItemSet& rItemSet, sal_uInt16 nSlot ); - - /** Returns true, if the passed item set supports the SID. */ - static bool IsKnownItem( const SfxItemSet& rItemSet, sal_uInt16 nSlot ); - - /** Returns an item from an item set, if it is not in "don't know" state. - @return Pointer to item, or 0 if it has "don't know" state. */ - static const SfxPoolItem* GetUniqueItem( const SfxItemSet& rItemSet, sal_uInt16 nSlot ); - - /** Returns the default item from the pool of the passed item set. */ - static const SfxPoolItem& GetDefaultItem( const SfxItemSet& rItemSet, sal_uInt16 nSlot ); - - /** Removes an item from rDestSet, if it is default in rOldSet. */ - static void RemoveDefaultItem( SfxItemSet& rDestSet, const SfxItemSet& rOldSet, sal_uInt16 nSlot ); -}; - -} // namespace sfx - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 9f38a6ff76c0..c4df5127375c 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -686,7 +686,6 @@ public: void SetSpaceBetweenEntries( short nSpace ); short GetSpaceBetweenEntries() const {return nEntryHeightOffs;} Point GetEntryPosition( SvTreeListEntry* ) const; - void ShowEntry( SvTreeListEntry* ); // !!!OBSOLETE, use MakeVisible void MakeVisible( SvTreeListEntry* pEntry ); void MakeVisible( SvTreeListEntry* pEntry, bool bMoveToTop ); diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index 44a8291d7435..ae3205d3b8c1 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -24,7 +24,6 @@ #include <vcl/ctrl.hxx> #include <vcl/customweld.hxx> #include <vcl/weld.hxx> -#include <sfx2/itemconnect.hxx> #include <svx/svxdllapi.h> class NumericField; diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index ab2bc673292a..6718e7351eb5 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -216,30 +216,6 @@ public: /************************************************************************/ -class SAL_WARN_UNUSED SVX_DLLPUBLIC HatchingLB : public ListBox -{ -public: - explicit HatchingLB(vcl::Window* pParent, WinBits aWB); -}; - -/************************************************************************/ - -class SAL_WARN_UNUSED SVX_DLLPUBLIC GradientLB : public ListBox -{ -public: - explicit GradientLB(vcl::Window* pParent, WinBits aWB); -}; - -/************************************************************************/ - -class SAL_WARN_UNUSED SVX_DLLPUBLIC BitmapLB : public ListBox -{ -public: - explicit BitmapLB(vcl::Window* pParent, WinBits aWB); -}; - -/************************************************************************/ - class SAL_WARN_UNUSED SVX_DLLPUBLIC FillTypeLB : public ListBox { @@ -262,10 +238,6 @@ public: void Fill(const XDashListRef &pList); bool getAddStandardFields() const { return mbAddStandardFields; } - void setAddStandardFields(bool bNew); - - void Append(const XDashEntry& rEntry, const BitmapEx& rBitmap ); - void Modify(const XDashEntry& rEntry, sal_Int32 nPos, const BitmapEx& rBitmap ); }; class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxLineLB diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx index fe9c3b3ce19e..13d0cf43721c 100644 --- a/include/svx/fontlb.hxx +++ b/include/svx/fontlb.hxx @@ -35,10 +35,6 @@ private: public: SvLBoxFontString(); - SvLBoxFontString( - const OUString& rString, - const vcl::Font& rFont, - const Color* pColor ); virtual ~SvLBoxFontString() override; diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx index 72455bef1770..a6aeb8ed2eb5 100644 --- a/include/svx/frmdirlbox.hxx +++ b/include/svx/frmdirlbox.hxx @@ -22,7 +22,6 @@ #include <vcl/lstbox.hxx> #include <vcl/weld.hxx> -#include <sfx2/itemconnect.hxx> #include <editeng/frmdir.hxx> #include <svx/svxdllapi.h> diff --git a/include/svx/orienthelper.hxx b/include/svx/orienthelper.hxx index c5cf59892b93..6fb516f831b0 100644 --- a/include/svx/orienthelper.hxx +++ b/include/svx/orienthelper.hxx @@ -22,7 +22,6 @@ #include <memory> #include <vcl/window.hxx> -#include <sfx2/itemconnect.hxx> #include <svx/svxdllapi.h> class NumericField; diff --git a/lotuswordpro/source/filter/lwplaypiece.hxx b/lotuswordpro/source/filter/lwplaypiece.hxx index 90d98dc9c3a2..f19833e26c3a 100644 --- a/lotuswordpro/source/filter/lwplaypiece.hxx +++ b/lotuswordpro/source/filter/lwplaypiece.hxx @@ -203,7 +203,6 @@ public: LwpColumnInfo(); ~LwpColumnInfo(); void Read(LwpObjectStream *pStrm); - double GetWidth(){return LwpTools::ConvertFromUnitsToMetric(m_nWidth);} double GetGap(){return LwpTools::ConvertFromUnitsToMetric(m_nGap);} private: sal_Int32 m_nWidth; diff --git a/sc/inc/pch/precompiled_vbaobj.hxx b/sc/inc/pch/precompiled_vbaobj.hxx index d702cb26c03c..006e1effbded 100644 --- a/sc/inc/pch/precompiled_vbaobj.hxx +++ b/sc/inc/pch/precompiled_vbaobj.hxx @@ -339,7 +339,6 @@ #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> -#include <sfx2/itemwrapper.hxx> #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> #include <sfx2/sfxdlg.hxx> diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index 89f732bfcf9c..d7db0bf76530 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -33,7 +33,7 @@ #include <vcl/field.hxx> #include <vcl/weld.hxx> #include <svx/checklbx.hxx> -#include <sfx2/itemconnect.hxx> +#include <sfx2/controlwrapper.hxx> #include <pivot.hxx> #include <memory> diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index 5e8a377c9d05..b006e89dd4ba 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -23,6 +23,7 @@ #include <scitems.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> +#include <svl/intitem.hxx> #include <svx/algitem.hxx> #include <svx/rotmodit.hxx> #include <svx/dlgutil.hxx> diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 2cc08802e24f..a323618f47c2 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -132,7 +132,6 @@ #include <sfx2/bindings.hxx> #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> -#include <sfx2/itemwrapper.hxx> #include <sc.hrc> #include <unonames.hxx> diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 80b9e84d72d7..46b2bc880c58 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -23,7 +23,6 @@ #include <sfx2/bindings.hxx> #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> -#include <sfx2/itemwrapper.hxx> #include <svl/itemset.hxx> #include <svl/eitem.hxx> diff --git a/sfx2/source/dialog/itemconnect.cxx b/sfx2/source/dialog/itemconnect.cxx index 3b40dc46d82d..3f1d3ab2b418 100644 --- a/sfx2/source/dialog/itemconnect.cxx +++ b/sfx2/source/dialog/itemconnect.cxx @@ -18,55 +18,13 @@ */ #include <svl/itempool.hxx> -#include <sfx2/itemconnect.hxx> +#include <sfx2/controlwrapper.hxx> #include <vector> #include <memory> namespace sfx { -// Helpers - - -namespace { - -TriState lclConvertToTriState( bool bKnown, bool bIsUnknownFlag ) -{ - return (!bKnown && bIsUnknownFlag) ? TRISTATE_FALSE : TRISTATE_INDET; -} - -} // namespace - - -sal_uInt16 ItemWrapperHelper::GetWhichId( const SfxItemSet& rItemSet, sal_uInt16 nSlot ) -{ - return rItemSet.GetPool()->GetWhich( nSlot ); -} - -bool ItemWrapperHelper::IsKnownItem( const SfxItemSet& rItemSet, sal_uInt16 nSlot ) -{ - return rItemSet.GetItemState( GetWhichId( rItemSet, nSlot ) ) != SfxItemState::UNKNOWN; -} - -const SfxPoolItem* ItemWrapperHelper::GetUniqueItem( const SfxItemSet& rItemSet, sal_uInt16 nSlot ) -{ - sal_uInt16 nWhich = GetWhichId( rItemSet, nSlot ); - return (rItemSet.GetItemState( nWhich ) >= SfxItemState::DEFAULT) ? rItemSet.GetItem( nWhich ) : nullptr; -} - -const SfxPoolItem& ItemWrapperHelper::GetDefaultItem( const SfxItemSet& rItemSet, sal_uInt16 nSlot ) -{ - return rItemSet.GetPool()->GetDefaultItem( GetWhichId( rItemSet, nSlot ) ); -} - -void ItemWrapperHelper::RemoveDefaultItem( SfxItemSet& rDestSet, const SfxItemSet& rOldSet, sal_uInt16 nSlot ) -{ - sal_uInt16 nWhich = GetWhichId( rDestSet, nSlot ); - if( rOldSet.GetItemState( nWhich, false ) == SfxItemState::DEFAULT ) - rDestSet.ClearItem( nWhich ); -} - - // Base control wrapper classes @@ -75,56 +33,6 @@ ControlWrapperBase::~ControlWrapperBase() } -// Single control wrappers - - -DummyWindowWrapper::DummyWindowWrapper( vcl::Window& rWindow ) : - SingleControlWrapperType( rWindow ) -{ -} - -void* DummyWindowWrapper::GetControlValue() const -{ - return nullptr; -} - -void DummyWindowWrapper::SetControlValue( void* ) -{ -} - -// Base connection classes - - -ItemConnectionBase::ItemConnectionBase( ItemConnFlags nFlags ) : - mnFlags( nFlags ) -{ -} - -ItemConnectionBase::~ItemConnectionBase() -{ -} - -void ItemConnectionBase::DoApplyFlags( const SfxItemSet* pItemSet ) -{ - ApplyFlags( pItemSet ); -} - -void ItemConnectionBase::DoReset( const SfxItemSet* pItemSet ) -{ - Reset( pItemSet ); -} - -bool ItemConnectionBase::DoFillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ) -{ - return FillItemSet( rDestSet, rOldSet ); -} - -TriState ItemConnectionBase::GetShowState( bool bKnown ) const -{ - return lclConvertToTriState( bKnown, bool(mnFlags & ItemConnFlags::HideUnknown) ); -} - - } // namespace sfx /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 1b9f24a6c8a6..3c6a86f1080c 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -6805,8 +6805,6 @@ include/sfx2/htmlmode.hxx include/sfx2/infobar.hxx include/sfx2/inputdlg.hxx include/sfx2/ipclient.hxx -include/sfx2/itemconnect.hxx -include/sfx2/itemwrapper.hxx include/sfx2/linkmgr.hxx include/sfx2/linksrc.hxx include/sfx2/lnkbase.hxx diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index d3a667d5abb4..f6018223344c 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -2408,11 +2408,6 @@ Point SvTreeListBox::GetEntryPosition( SvTreeListEntry* pEntry ) const return pImpl->GetEntryPosition( pEntry ); } -void SvTreeListBox::ShowEntry( SvTreeListEntry* pEntry ) -{ - MakeVisible( pEntry ); -} - void SvTreeListBox::MakeVisible( SvTreeListEntry* pEntry ) { pImpl->MakeVisible(pEntry); diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index ec723151fdcc..12b008ad7961 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -354,7 +354,6 @@ #include <sfx2/dispatch.hxx> #include <sfx2/dllapi.h> #include <sfx2/dockwin.hxx> -#include <sfx2/itemconnect.hxx> #include <sfx2/module.hxx> #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 5cdff4da8a07..37c647280206 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -907,30 +907,6 @@ void SvxPixelCtl::Reset() Invalidate(); } -// Fills the listbox (provisional) with strings - -HatchingLB::HatchingLB( vcl::Window* pParent, WinBits nWinStyle) -: ListBox( pParent, nWinStyle ) -{ - SetEdgeBlending(true); -} - -// Fills the listbox (provisional) with strings - -GradientLB::GradientLB( vcl::Window* pParent, WinBits aWB) -: ListBox( pParent, aWB ) -{ - SetEdgeBlending(true); -} - -// BitmapLB Constructor - -BitmapLB::BitmapLB( vcl::Window* pParent, WinBits aWB) -: ListBox( pParent, aWB ) -{ - SetEdgeBlending(true); -} - void FillTypeLB::Fill() { SetUpdateMode( false ); @@ -953,14 +929,6 @@ LineLB::LineLB(vcl::Window* pParent, WinBits aWB) // No EdgeBlending for LineStyle/Dash SetEdgeBlending(true); } -void LineLB::setAddStandardFields(bool bNew) -{ - if(getAddStandardFields() != bNew) - { - mbAddStandardFields = bNew; - } -} - // Fills the listbox (provisional) with strings void LineLB::Fill( const XDashListRef &pList ) @@ -1001,34 +969,6 @@ void LineLB::Fill( const XDashListRef &pList ) SetUpdateMode( true ); } -void LineLB::Append( const XDashEntry& rEntry, const BitmapEx& rBitmap ) -{ - if(!rBitmap.IsEmpty()) - { - InsertEntry(rEntry.GetName(), Image(rBitmap)); - } - else - { - InsertEntry( rEntry.GetName() ); - } - - AdaptDropDownLineCountToMaximum(); -} - -void LineLB::Modify( const XDashEntry& rEntry, sal_Int32 nPos, const BitmapEx& rBitmap ) -{ - RemoveEntry( nPos ); - - if(!rBitmap.IsEmpty()) - { - InsertEntry( rEntry.GetName(), Image(rBitmap), nPos ); - } - else - { - InsertEntry( rEntry.GetName(), nPos ); - } -} - SvxLineLB::SvxLineLB(std::unique_ptr<weld::ComboBox> pControl) : m_xControl(std::move(pControl)) , mbAddStandardFields(true) diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index 497e2f70f5f4..3aacda90bec2 100644 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -31,17 +31,6 @@ SvLBoxFontString::SvLBoxFontString() { } -SvLBoxFontString::SvLBoxFontString( const OUString& rString, - const vcl::Font& rFont, const Color* pColor ) : - SvLBoxString( rString ), - maFont( rFont ), - mbUseColor( pColor != nullptr ) -{ - SetText(rString); - if(pColor) - maFont.SetColor(*pColor); -} - SvLBoxFontString::~SvLBoxFontString() { } diff --git a/writerfilter/source/dmapper/TableData.hxx b/writerfilter/source/dmapper/TableData.hxx index bb2060a8356a..8381a9899125 100644 --- a/writerfilter/source/dmapper/TableData.hxx +++ b/writerfilter/source/dmapper/TableData.hxx @@ -166,17 +166,6 @@ public: } /** - Add properties to a cell of the row. - - @param i index of the cell - @param pProps the properties to add - */ - void insertCellProperties(unsigned int i, TablePropertyMapPtr pProps) - { - mCells[i]->insertProperties(pProps); - } - - /** Add properties to the last cell of the row. */ void insertCellProperties(TablePropertyMapPtr pProps) |