diff options
32 files changed, 1 insertions, 291 deletions
diff --git a/basctl/source/inc/bastype2.hxx b/basctl/source/inc/bastype2.hxx index 61c630855171..386a810b73cd 100644 --- a/basctl/source/inc/bastype2.hxx +++ b/basctl/source/inc/bastype2.hxx @@ -259,25 +259,6 @@ public: } void make_sorted() { m_xControl->make_sorted(); }; - void make_unsorted() { m_xControl->make_unsorted(); } - bool get_sort_order() const { return m_xControl->get_sort_order(); } - void set_sort_order(bool bAscending) { m_xControl->set_sort_order(bAscending); } - - void set_sort_indicator(TriState eState, int nColumn = -1) - { - m_xControl->set_sort_indicator(eState, nColumn); - } - TriState get_sort_indicator(int nColumn = -1) - { - return m_xControl->get_sort_indicator(nColumn); - } - - void set_sort_column(int nColumn) { m_xControl->set_sort_column(nColumn); } - - void set_sort_func(const std::function<int(const weld::TreeIter&, const weld::TreeIter&)>& func) - { - m_xControl->set_sort_func(func); - } void RemoveEntry(const weld::TreeIter& rIter); void RemoveEntry(const ScriptDocument&); diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results index e5e03c184cf3..983d7002db28 100644 --- a/compilerplugins/clang/unusedmethods.results +++ b/compilerplugins/clang/unusedmethods.results @@ -1,17 +1,3 @@ -basctl/source/inc/bastype2.hxx:262 - void basctl::SbTreeListBox::make_unsorted() -basctl/source/inc/bastype2.hxx:263 - _Bool basctl::SbTreeListBox::get_sort_order() const -basctl/source/inc/bastype2.hxx:264 - void basctl::SbTreeListBox::set_sort_order(_Bool) -basctl/source/inc/bastype2.hxx:266 - void basctl::SbTreeListBox::set_sort_indicator(enum TriState,int) -basctl/source/inc/bastype2.hxx:270 - enum TriState basctl::SbTreeListBox::get_sort_indicator(int) -basctl/source/inc/bastype2.hxx:275 - void basctl::SbTreeListBox::set_sort_column(int) -basctl/source/inc/bastype2.hxx:277 - void basctl::SbTreeListBox::set_sort_func(const class std::function<int (const class weld::TreeIter &, const class weld::TreeIter &)> &) basegfx/source/range/b2drangeclipper.cxx:688 type-parameter-?-? basegfx::(anonymous namespace)::eraseFromList(type-parameter-?-? &,const type-parameter-?-? &) basic/source/inc/buffer.hxx:41 @@ -102,32 +88,8 @@ connectivity/source/inc/OTypeInfo.hxx:47 _Bool connectivity::OTypeInfo::operator!=(const struct connectivity::OTypeInfo &) const cui/source/dialogs/SpellAttrib.hxx:72 _Bool svx::SpellErrorDescription::operator==(const struct svx::SpellErrorDescription &) const -cui/source/inc/cfg.hxx:336 - class rtl::OUString SvxMenuEntriesListBox::get_text(int) -cui/source/inc/cfg.hxx:337 - void SvxMenuEntriesListBox::set_image(int,const class com::sun::star::uno::Reference<class com::sun::star::graphic::XGraphic> &,int) -cui/source/inc/cfg.hxx:338 - void SvxMenuEntriesListBox::set_dropdown(int,int) -cui/source/inc/cfg.hxx:339 - void SvxMenuEntriesListBox::set_id(int,const class rtl::OUString &) -cui/source/inc/cfgutil.hxx:144 - _Bool CuiConfigFunctionListBox::get_iter_first(class weld::TreeIter &) const -cui/source/inc/cfgutil.hxx:146 - _Bool CuiConfigFunctionListBox::iter_next(class weld::TreeIter &) const -cui/source/inc/cfgutil.hxx:147 - _Bool CuiConfigFunctionListBox::iter_next_sibling(class weld::TreeIter &) const -cui/source/inc/cfgutil.hxx:149 - class rtl::OUString CuiConfigFunctionListBox::get_text(const class weld::TreeIter &) const -cui/source/inc/cfgutil.hxx:152 - class rtl::OUString CuiConfigFunctionListBox::get_id(int) const -cui/source/inc/cfgutil.hxx:166 - int CuiConfigFunctionListBox::get_selected_index() const -cui/source/inc/cfgutil.hxx:167 - void CuiConfigFunctionListBox::select(const class weld::TreeIter &) cui/source/inc/CustomNotebookbarGenerator.hxx:30 CustomNotebookbarGenerator::CustomNotebookbarGenerator() -cui/source/inc/hangulhanjadlg.hxx:244 - class rtl::OUString svx::SuggestionEdit::get_text() const cui/source/inc/SvxNotebookbarConfigPage.hxx:40 void SvxNotebookbarConfigPage::SetElement() dbaccess/source/filter/hsqldb/fbalterparser.hxx:20 @@ -150,18 +112,8 @@ dbaccess/source/ui/inc/indexcollection.hxx:62 class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const struct dbaui::OIndex *, class std::__cxx1998::vector<struct dbaui::OIndex, class std::allocator<struct dbaui::OIndex> > >, class std::__debug::vector<struct dbaui::OIndex, class std::allocator<struct dbaui::OIndex> >, struct std::random_access_iterator_tag> dbaui::OIndexCollection::find(const class rtl::OUString &) const dbaccess/source/ui/inc/indexcollection.hxx:64 class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const struct dbaui::OIndex *, class std::__cxx1998::vector<struct dbaui::OIndex, class std::allocator<struct dbaui::OIndex> > >, class std::__debug::vector<struct dbaui::OIndex, class std::allocator<struct dbaui::OIndex> >, struct std::random_access_iterator_tag> dbaui::OIndexCollection::findOriginal(const class rtl::OUString &) const -dbaccess/source/ui/inc/opendoccontrols.hxx:45 - _Bool dbaui::OpenDocumentButton::get_sensitive() const -dbaccess/source/ui/inc/opendoccontrols.hxx:68 - _Bool dbaui::OpenDocumentListBox::get_sensitive() const -dbaccess/source/ui/inc/opendoccontrols.hxx:69 - void dbaui::OpenDocumentListBox::grab_focus() dbaccess/source/ui/inc/sbamultiplex.hxx:385 class cppu::OInterfaceContainerHelper * dbaui::SbaXVetoableChangeMultiplexer::getContainer(const class rtl::OUString &) -dbaccess/source/ui/inc/SqlNameEdit.hxx:113 - void dbaui::OSQLNameEntry::set_sensitive(_Bool) -dbaccess/source/ui/inc/WTypeSelect.hxx:76 - void dbaui::OWizTypeSelectList::show() desktop/source/lib/lokclipboard.hxx:96 LOKClipboardFactory::LOKClipboardFactory() drawinglayer/inc/texture/texture.hxx:41 @@ -628,10 +580,6 @@ include/sax/fshelper.hxx:126 void sax_fastparser::FastSerializerHelper::singleElementNS(int,int,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XFastAttributeList> &) include/sax/fshelper.hxx:130 void sax_fastparser::FastSerializerHelper::startElementNS(int,int,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XFastAttributeList> &) -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/childwin.hxx:163 void SfxChildWindow::ClearController() include/sfx2/docfilt.hxx:80 @@ -658,14 +606,8 @@ include/svl/lockfilecommon.hxx:58 void svt::LockFileCommon::SetURL(const class rtl::OUString &) include/svtools/asynclink.hxx:44 void svtools::AsynchronLink::LinkStubHandleCall_Idle(void *,class Timer *) -include/svtools/ctrlbox.hxx:384 - class vcl::Font FontNameBox::get_font() include/svtools/DocumentToGraphicRenderer.hxx:106 _Bool DocumentToGraphicRenderer::isImpress() const -include/svtools/toolbarmenu.hxx:80 - class weld::Container * ToolbarPopupContainer::getContainer() -include/svtools/toolbarmenu.hxx:98 - class weld::Container * InterimToolbarPopup::getContainer() include/svx/autoformathelper.hxx:145 _Bool AutoFormatBase::operator==(const class AutoFormatBase &) const include/svx/ClassificationDialog.hxx:78 @@ -676,40 +618,18 @@ include/svx/ClassificationField.hxx:52 _Bool svx::ClassificationResult::operator==(const class svx::ClassificationResult &) const include/svx/DiagramDataInterface.hxx:33 class rtl::OUString DiagramDataInterface::getString() const -include/svx/dlgctrl.hxx:244 - void SvxLineLB::set_sensitive(_Bool) -include/svx/dlgctrl.hxx:245 - _Bool SvxLineLB::get_sensitive() const -include/svx/dlgctrl.hxx:267 - void SvxLineEndLB::set_active_text(const class rtl::OUString &) include/svx/framelink.hxx:170 _Bool svx::frame::operator>(const class svx::frame::Style &,const class svx::frame::Style &) include/svx/gallery1.hxx:58 const class std::unique_ptr<class GalleryBinaryEngineEntry, struct std::default_delete<class GalleryBinaryEngineEntry> > & GalleryThemeEntry::getGalleryBinaryEngineEntry() const include/svx/gallerybinaryengine.hxx:69 const class INetURLObject & GalleryBinaryEngine::GetStrURL() const -include/svx/langbox.hxx:94 - void SvxLanguageBox::show() -include/svx/pagenumberlistbox.hxx:33 - int SvxPageNumberListBox::get_count() const -include/svx/pagenumberlistbox.hxx:36 - int SvxPageNumberListBox::get_active() const -include/svx/pagenumberlistbox.hxx:37 - void SvxPageNumberListBox::set_active(int) -include/svx/relfld.hxx:61 - void SvxRelativeField::set_size_request(int,int) -include/svx/relfld.hxx:62 - void SvxRelativeField::grab_focus() -include/svx/relfld.hxx:63 - class Size SvxRelativeField::get_preferred_size() const include/svx/sidebar/InspectorTextPanel.hxx:50 class VclPtr<class vcl::Window> svx::sidebar::InspectorTextPanel::Create(class vcl::Window *,const class com::sun::star::uno::Reference<class com::sun::star::frame::XFrame> &) include/svx/svdlayer.hxx:74 _Bool SdrLayer::operator==(const class SdrLayer &) const include/svx/svdpntv.hxx:449 _Bool SdrPaintView::IsSwapAsynchron() const -include/svx/txencbox.hxx:92 - void SvxTextEncodingBox::grab_focus() include/svx/txencbox.hxx:146 void SvxTextEncodingTreeView::connect_changed(const class Link<class weld::TreeView &, void> &) include/svx/xpoly.hxx:82 @@ -808,8 +728,6 @@ include/vcl/BitmapColor.hxx:39 void BitmapColor::SetAlpha(unsigned char) include/vcl/builder.hxx:337 void VclBuilder::connectNumericFormatterAdjustment(const class rtl::OString &,const class rtl::OUString &) -include/vcl/builder.hxx:484 - class rtl::OString VclBuilderContainer::getUIFile() const include/vcl/builderpage.hxx:36 void BuilderPage::SetHelpId(const class rtl::OString &) include/vcl/ColorMask.hxx:113 @@ -954,12 +872,6 @@ include/vcl/weld.hxx:547 class rtl::OString weld::Assistant::get_current_page_ident() const include/vcl/weld.hxx:553 class rtl::OUString weld::Assistant::get_page_title(const class rtl::OString &) const -include/vcl/weld.hxx:883 - void weld::TreeView::append(const class weld::TreeIter *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:892 - void weld::TreeView::append(const class rtl::OUString &,const class rtl::OUString &,class VirtualDevice &) -include/vcl/weld.hxx:1000 - _Bool weld::TreeView::iter_next_visible(class weld::TreeIter &) const include/vcl/weld.hxx:1043 void weld::TreeView::set_text_align(const class weld::TreeIter &,double,int) include/vcl/weld.hxx:1171 @@ -986,8 +898,6 @@ include/vcl/weld.hxx:1441 void weld::Scale::get_increments(int &,int &) const include/vcl/weld.hxx:1458 class rtl::OUString weld::ProgressBar::get_text() const -include/vcl/weld.hxx:1477 - void weld::Entry::signal_insert_text(class rtl::OUString &) include/vcl/weld.hxx:1493 int weld::Entry::get_position() const include/vcl/weld.hxx:1667 @@ -1236,12 +1146,6 @@ sc/source/filter/inc/xlformula.hxx:409 _Bool XclTokenArray::operator==(const class XclTokenArray &) const sc/source/filter/xml/xmltransformationi.hxx:160 ScXMLDateTimeContext::ScXMLDateTimeContext(class ScXMLImport &,const class rtl::Reference<class sax_fastparser::FastAttributeList> &) -sc/source/ui/inc/condformatdlg.hxx:51 - class weld::ScrolledWindow * ScCondFormatList::GetWidget() -sc/source/ui/inc/condformatdlgentry.hxx:80 - int ScCondFrmtEntry::get_grid_top_attach() const -sc/source/ui/inc/condformatdlgentry.hxx:82 - class Size ScCondFrmtEntry::get_preferred_size() const sc/source/ui/inc/dataprovider.hxx:56 _Bool sc::CSVFetchThread::IsRequestedTerminate() sc/source/ui/inc/dataprovider.hxx:57 @@ -1306,16 +1210,6 @@ sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx:200 _Bool sd::slidesorter::view::InsertPosition::operator!=(const class sd::slidesorter::view::InsertPosition &) const sdext/source/pdfimport/pdfparse/pdfparse.cxx:111 long (anonymous namespace)::PDFGrammar<boost::spirit::classic::file_iterator<char, boost::spirit::classic::fileiter_impl::mmap_file_iterator<char>>>::pdf_string_parser::operator()(const type-parameter-?-? &,struct boost::spirit::classic::nil_t &) const -sfx2/inc/autoredactdialog.hxx:67 - void TargetsTable::SelectByName(const class rtl::OUString &) -sfx2/inc/autoredactdialog.hxx:71 - void TargetsTable::unselect_all() -sfx2/inc/autoredactdialog.hxx:72 - _Bool TargetsTable::has_focus() const -sfx2/inc/autoredactdialog.hxx:73 - int TargetsTable::n_children() const -sfx2/source/appl/newhelp.hxx:57 - class weld::Widget * HelpTabPage_Impl::GetLastFocusControl() sfx2/source/appl/shutdownicon.hxx:79 class rtl::OUString ShutdownIcon::getShortcutName() sfx2/source/appl/shutdownicon.hxx:95 @@ -1420,8 +1314,6 @@ svl/source/misc/gridprinter.cxx:47 void rtl::mdds_mtv_append_values(struct mdds::mtv::base_element_block &,const class rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &) svx/inc/sdr/contact/viewcontactofgraphic.hxx:52 class SdrGrafObj & sdr::contact::ViewContactOfGraphic::GetGrafObject() -svx/source/tbxctrls/tbcontrl.cxx:151 - void (anonymous namespace)::SvxStyleBox_Base::set_sensitive(_Bool) sw/inc/calbck.hxx:307 class sw::WriterListener * sw::ClientIteratorBase::GetLeftOfPos() sw/inc/dbgoutsw.hxx:53 @@ -1600,14 +1492,6 @@ sw/source/core/text/txtpaint.hxx:71 DbgBackColor::DbgBackColor(class OutputDevice *,const _Bool) sw/source/core/text/txtpaint.hxx:78 DbgRect::DbgRect(class OutputDevice *,const class tools::Rectangle &,const _Bool,class Color) -sw/source/ui/dbui/createaddresslistdialog.hxx:98 - void SwFindEntryDialog::hide() -sw/source/uibase/inc/bookmark.hxx:45 - void BookmarkTable::remove(const class weld::TreeIter &) -sw/source/uibase/inc/condedit.hxx:53 - _Bool ConditionEdit::get_sensitive() const -sw/source/uibase/inc/conttree.hxx:348 - int SwGlobalTree::count_selected_rows() const sw/source/uibase/inc/numfmtlb.hxx:130 _Bool SwNumFormatTreeView::get_value_changed_from_saved() const sw/source/uibase/inc/numfmtlb.hxx:131 diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 430822380296..dab1f2e2244a 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -333,10 +333,6 @@ public: void remove(int nPos) { m_xControl->remove(nPos); } int n_children() const { return m_xControl->n_children(); } void set_text(int row, const OUString& rText, int col) { m_xControl->set_text(row, rText, col); } - OUString get_text(int row) { return m_xControl->get_text(row); } - void set_image(int row, const css::uno::Reference<css::graphic::XGraphic>& rImage, int col) { m_xControl->set_image(row, rImage, col); } - void set_dropdown(int row, int col) { m_xControl->set_image(row, *m_xDropDown, col); } - void set_id(int row, const OUString& rId) { m_xControl->set_id(row, rId); } void clear() { m_xControl->clear(); } //need frees ? void set_toggle(int row, TriState eState) { m_xControl->set_toggle(row, eState); } void scroll_to_row(int pos) { m_xControl->scroll_to_row(pos); } diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index b3b7d091b61a..eac3bf0d9171 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -141,15 +141,9 @@ public: void expand_row(const weld::TreeIter& rIter) { m_xTreeView->expand_row(rIter); } int n_children() const { return m_xTreeView->n_children(); } std::unique_ptr<weld::TreeIter> make_iterator(const weld::TreeIter* pOrig = nullptr) const { return m_xTreeView->make_iterator(pOrig); } - bool get_iter_first(weld::TreeIter& rIter) const { return m_xTreeView->get_iter_first(rIter); } - // set iter to point to next node, depth first, then sibling - bool iter_next(weld::TreeIter& rIter) const { return m_xTreeView->iter_next(rIter); } - bool iter_next_sibling(weld::TreeIter& rIter) const { return m_xTreeView->iter_next_sibling(rIter); } bool iter_has_child(const weld::TreeIter& rIter) const { return m_xTreeView->iter_has_child(rIter); } - OUString get_text(const weld::TreeIter& rIter) const { return m_xTreeView->get_text(rIter); } OUString get_text(int nPos) const { return m_xTreeView->get_text(nPos); } OUString get_id(const weld::TreeIter& rIter) const { return m_xTreeView->get_id(rIter); } - OUString get_id(int nPos) const { return m_xTreeView->get_id(nPos); } bool get_selected(weld::TreeIter* pIter) const { return m_xTreeView->get_selected(pIter); } OUString get_selected_text() const { @@ -163,8 +157,6 @@ public: return OUString(); return m_xTreeView->get_id(*m_xScratchIter); } - int get_selected_index() const { return m_xTreeView->get_selected_index(); } - void select(const weld::TreeIter& rIter) { m_xTreeView->select(rIter); } void select(int pos) { m_xTreeView->select(pos); } void set_size_request(int nWidth, int nHeight) { m_xTreeView->set_size_request(nWidth, nHeight); } Size get_size_request() const { return m_xTreeView->get_size_request(); } diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 056aee15977d..35c62650fec0 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -241,7 +241,6 @@ namespace svx void init(weld::ScrolledWindow* pScrollBar, SuggestionEdit* pPrev, SuggestionEdit* pNext); void grab_focus() { m_xEntry->grab_focus(); } - OUString get_text() const { return m_xEntry->get_text(); } void set_text(const OUString& rText) { m_xEntry->set_text(rText); } void connect_changed(const Link<weld::Entry&, void>& rLink) { m_xEntry->connect_changed(rLink); } }; diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx index 609382af40fa..97c42cfdc6b2 100644 --- a/dbaccess/source/ui/inc/SqlNameEdit.hxx +++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx @@ -110,7 +110,6 @@ namespace dbaui OUString get_text() const { return m_xEntry->get_text(); } void set_text(const OUString& rText) { m_xEntry->set_text(rText); } void set_max_length(int nLen) { m_xEntry->set_max_length(nLen); } - void set_sensitive(bool bSensitive) { m_xEntry->set_sensitive(bSensitive); } virtual void save_value() override { m_xEntry->save_value(); } virtual bool get_value_changed_from_saved() const override { diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx index ddcbf17fa409..343383a27be9 100644 --- a/dbaccess/source/ui/inc/WTypeSelect.hxx +++ b/dbaccess/source/ui/inc/WTypeSelect.hxx @@ -73,7 +73,6 @@ namespace dbaui void SetPKey(bool bPKey) { m_bPKey = bPKey; } weld::TreeView* GetWidget() { return m_xControl.get(); } OUString get_selected_id() const { return m_xControl->get_selected_id(); } - void show() { m_xControl->show(); } void clear() { m_xControl->clear(); } void append(const OUString& rId, const OUString& rStr) { diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx b/dbaccess/source/ui/inc/opendoccontrols.hxx index 9ab29b624dee..6642585a9511 100644 --- a/dbaccess/source/ui/inc/opendoccontrols.hxx +++ b/dbaccess/source/ui/inc/opendoccontrols.hxx @@ -42,7 +42,6 @@ namespace dbaui OpenDocumentButton(std::unique_ptr<weld::Button> xControl, const char* _pAsciiModuleName); void set_sensitive(bool bSensitive) { m_xControl->set_sensitive(bSensitive); } - bool get_sensitive() const { return m_xControl->get_sensitive(); } void connect_clicked(const Link<weld::Button&, void>& rLink) { m_xControl->connect_clicked(rLink); } private: @@ -65,8 +64,6 @@ namespace dbaui OUString GetSelectedDocumentURL() const; void set_sensitive(bool bSensitive) { m_xControl->set_sensitive(bSensitive); } - bool get_sensitive() const { return m_xControl->get_sensitive(); } - void grab_focus() { m_xControl->grab_focus(); } int get_count() const { return m_xControl->get_count(); } void set_active(int nPos) { m_xControl->set_active(nPos); } void connect_changed(const Link<weld::ComboBox&, void>& rLink) { m_xControl->connect_changed(rLink); } diff --git a/include/sfx2/charwin.hxx b/include/sfx2/charwin.hxx index 26337be0913d..81481dba4c8f 100644 --- a/include/sfx2/charwin.hxx +++ b/include/sfx2/charwin.hxx @@ -60,9 +60,6 @@ public: Size get_preferred_size() const { return GetDrawingArea()->get_preferred_size(); } - void connect_focus_in(const Link<weld::Widget&, void>& rLink); - void connect_focus_out(const Link<weld::Widget&, void>& rLink); - void setMouseClickHdl(const Link<SvxCharView*,void> &rLink); void setClearClickHdl(const Link<SvxCharView*,void> &rLink); void setClearAllClickHdl(const Link<SvxCharView*,void> &rLink); diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 367b3ff42872..7411976b1642 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -381,7 +381,6 @@ public: void set_max_mru_count(int nCount) { m_xComboBox->set_max_mru_count(nCount); } // font size is in points, not pixels, e.g. see Window::[G]etPointFont - vcl::Font get_font() { return m_xComboBox->get_font(); } void set_entry_font(const vcl::Font& rFont) { m_xComboBox->set_entry_font(rFont); } vcl::Font get_entry_font() { return m_xComboBox->get_entry_font(); } diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index 6e8aa5588de2..95738fe93fa6 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -77,7 +77,6 @@ public: ToolbarPopupContainer(weld::Widget* pParent); ~ToolbarPopupContainer(); weld::Container* getTopLevel() { return m_xTopLevel.get(); } - weld::Container* getContainer() { return m_xContainer.get(); } void setPopover(std::unique_ptr<WeldToolbarPopup> xPopup); WeldToolbarPopup* getPopover() const { return m_xPopup.get(); } @@ -95,7 +94,6 @@ private: public: InterimToolbarPopup(const css::uno::Reference<css::frame::XFrame>& rFrame, vcl::Window* pParent, std::unique_ptr<WeldToolbarPopup> xPopup); - weld::Container* getContainer() { return m_xContainer.get(); } virtual void dispose() override; virtual ~InterimToolbarPopup() override; diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index d6d299849e95..3fd0dc2f8b9e 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -241,8 +241,6 @@ public: void append_text(const OUString& rStr) { m_xControl->append_text(rStr); } bool get_value_changed_from_saved() const { return m_xControl->get_value_changed_from_saved(); } void save_value() { m_xControl->save_value(); } - void set_sensitive(bool bSensitive) { m_xControl->set_sensitive(bSensitive); } - bool get_sensitive() const { return m_xControl->get_sensitive(); } }; /************************************************************************/ diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index 46956955a872..0fc4c59c91cb 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -91,7 +91,6 @@ public: void save_active_id() { m_eSavedLanguage = get_active_id(); } LanguageType get_saved_active_id() const { return m_eSavedLanguage; } bool get_active_id_changed_from_saved() const { return m_eSavedLanguage != get_active_id(); } - void show() { m_xControl->show(); } void hide() { m_xControl->hide(); } void set_visible(bool bShow) { m_xControl->set_visible(bShow); } void set_sensitive(bool bSensitive) { m_xControl->set_sensitive(bSensitive); } diff --git a/include/svx/pagenumberlistbox.hxx b/include/svx/pagenumberlistbox.hxx index aa2137e66d42..9885d982230f 100644 --- a/include/svx/pagenumberlistbox.hxx +++ b/include/svx/pagenumberlistbox.hxx @@ -30,11 +30,8 @@ private: std::unique_ptr<weld::ComboBox> m_xControl; public: SvxPageNumberListBox(std::unique_ptr<weld::ComboBox> pControl); - int get_count() const { return m_xControl->get_count(); } SvxNumType get_active_id() const { return static_cast<SvxNumType>(m_xControl->get_active_id().toInt32()); } void set_active_id(SvxNumType eId) const { m_xControl->set_active_id(OUString::number(static_cast<sal_Int32>(eId))); } - int get_active() const { return m_xControl->get_active(); } - void set_active(int pos) { m_xControl->set_active(pos); } void save_value() { m_xControl->save_value(); } bool get_value_changed_from_saved() const { return m_xControl->get_value_changed_from_saved(); } void connect_changed(const Link<weld::ComboBox&, void>& rLink) { m_xControl->connect_changed(rLink); } diff --git a/include/svx/relfld.hxx b/include/svx/relfld.hxx index 58301c2a484f..4b78a1383517 100644 --- a/include/svx/relfld.hxx +++ b/include/svx/relfld.hxx @@ -58,9 +58,6 @@ public: void set_text(const OUString& rText) { m_xSpinButton->set_text(rText); } void save_value() { m_xSpinButton->save_value(); } bool get_value_changed_from_saved() const { return m_xSpinButton->get_value_changed_from_saved(); } - void set_size_request(int nWidth, int nHeight) { m_xSpinButton->set_size_request(nWidth, nHeight); } - void grab_focus() { m_xSpinButton->grab_focus(); } - Size get_preferred_size() const { return m_xSpinButton->get_preferred_size(); } weld::SpinButton& get_widget() { return m_xSpinButton->get_widget(); } int GetCoreValue(MapUnit eUnit) const { return ::GetCoreValue(*m_xSpinButton, eUnit); } diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index 6a642a1c7149..58397cea2c05 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -481,15 +481,6 @@ public: return; m_pUIBuilder->setDeferredProperties(); } - OString getUIFile() const - { - if (m_pUIBuilder) - { - return m_pUIBuilder->getUIFile(); - } - - return OString(); - } protected: std::unique_ptr<VclBuilder> m_pUIBuilder; diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index 62a143a8565b..c90baaa642a7 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -880,19 +880,10 @@ public: { insert(nullptr, -1, &rStr, &rId, &rImage, nullptr, false, nullptr); } - void append(const TreeIter* pParent, const OUString& rId, const OUString& rStr, - const OUString& rImage) - { - insert(pParent, -1, &rStr, &rId, &rImage, nullptr, false, nullptr); - } void append(const TreeIter* pParent, const OUString& rStr) { insert(pParent, -1, &rStr, nullptr, nullptr, nullptr, false, nullptr); } - void append(const OUString& rId, const OUString& rStr, VirtualDevice& rImage) - { - insert(nullptr, -1, &rStr, &rId, nullptr, &rImage, false, nullptr); - } virtual void insert_separator(int pos, const OUString& rId) = 0; void append_separator(const OUString& rId) { insert_separator(-1, rId); } @@ -996,8 +987,7 @@ public: virtual bool iter_next(TreeIter& rIter) const = 0; // set iter to point to previous node, sibling first then depth virtual bool iter_previous(TreeIter& rIter) const = 0; - // set iter to point to next node, depth first but only if expanded, then sibling - virtual bool iter_next_visible(TreeIter& rIter) const = 0; + // set iter to point to first child node virtual bool iter_children(TreeIter& rIter) const = 0; bool iter_nth_sibling(TreeIter& rIter, int nChild) const { @@ -1474,7 +1464,6 @@ protected: void signal_changed() { m_aChangeHdl.Call(*this); } void signal_cursor_position() { m_aCursorPositionHdl.Call(*this); } - void signal_insert_text(OUString& rString); public: virtual void set_text(const OUString& rText) = 0; diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index aedc4e7024a7..30c81b6dafdc 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -48,7 +48,6 @@ public: ScCondFormatList(ScCondFormatDlg* pParent, std::unique_ptr<weld::ScrolledWindow> xWindow, std::unique_ptr<weld::Container> xGrid); - weld::ScrolledWindow* GetWidget() { return mxScrollWindow.get(); } weld::Container* GetContainer() { return mxGrid.get(); } ~ScCondFormatList(); diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index 9f868d8e849b..bf2d80fba2e0 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -77,9 +77,6 @@ public: void Show() { mxGrid->show(); } void set_grid_top_attach(int nAttach) { mxBorder->set_grid_top_attach(nAttach); } - int get_grid_top_attach() const { return mxBorder->get_grid_top_attach(); } - - Size get_preferred_size() const { return mxBorder->get_preferred_size(); } void SetPos(const ScAddress& rPos) { maPos = rPos; }; bool IsSelected() const { return mbActive;} diff --git a/sfx2/inc/autoredactdialog.hxx b/sfx2/inc/autoredactdialog.hxx index d43d88e774b1..1410d75dd44d 100644 --- a/sfx2/inc/autoredactdialog.hxx +++ b/sfx2/inc/autoredactdialog.hxx @@ -64,13 +64,9 @@ class TargetsTable public: TargetsTable(std::unique_ptr<weld::TreeView> xControl); void InsertTarget(RedactionTarget* pTarget); - void SelectByName(const OUString& sName); RedactionTarget* GetTargetByName(const OUString& sName); OUString GetNameProposal() const; - void unselect_all() { m_xControl->unselect_all(); } - bool has_focus() const { return m_xControl->has_focus(); } - int n_children() const { return m_xControl->n_children(); } int get_selected_index() const { return m_xControl->get_selected_index(); } std::vector<int> get_selected_rows() const { return m_xControl->get_selected_rows(); } void clear() { m_xControl->clear(); } @@ -80,9 +76,6 @@ public: // Sync data on the targets box with the data on the target void setRowData(int nRowIndex, const RedactionTarget* pTarget); - - //void connect_changed(const Link<weld::TreeView&, void>& rLink) { m_xControl->connect_changed(rLink); } - //void connect_row_activated(const Link<weld::TreeView&, void>& rLink) { m_xControl->connect_row_activated(rLink); } }; namespace sfx2 diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 049e888d6f78..72637cbcdcaf 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -368,11 +368,6 @@ ContentTabPage_Impl::~ContentTabPage_Impl() } } -weld::Widget* ContentTabPage_Impl::GetLastFocusControl() -{ - return m_xContentBox.get(); -} - void IndexTabPage_Impl::SelectExecutableEntry() { sal_Int32 nPos = m_xIndexList->find_text(m_xIndexEntry->get_text()); @@ -800,11 +795,6 @@ void IndexTabPage_Impl::Activate() } } -weld::Widget* IndexTabPage_Impl::GetLastFocusControl() -{ - return m_xOpenBtn.get(); -} - void IndexTabPage_Impl::SetDoubleClickHdl(const Link<LinkParamNone*, void>& rLink) { aDoubleClickHdl = rLink; @@ -1051,11 +1041,6 @@ IMPL_LINK(SearchTabPage_Impl, ModifyHdl, weld::ComboBox&, rComboBox, void) Search(); } -weld::Widget* SearchTabPage_Impl::GetLastFocusControl() -{ - return m_xOpenBtn.get(); -} - IMPL_LINK_NOARG(SearchTabPage_Impl, DoubleClickHdl, weld::TreeView&, bool) { aDoubleClickHdl.Call(nullptr); @@ -1219,11 +1204,6 @@ IMPL_LINK_NOARG(BookmarksTabPage_Impl, OpenHdl, weld::Button&, void) aDoubleClickHdl.Call(nullptr); } -weld::Widget* BookmarksTabPage_Impl::GetLastFocusControl() -{ - return m_xBookmarksPB.get(); -} - IMPL_LINK_NOARG(BookmarksTabPage_Impl, DoubleClickHdl, weld::TreeView&, bool) { aDoubleClickHdl.Call(nullptr); diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 973f4c7089cc..73df300dd6e3 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -53,8 +53,6 @@ public: HelpTabPage_Impl(weld::Widget* pParent, SfxHelpIndexWindow_Impl* _pIdxWin, const OString& rID, const OUString& rUIXMLDescription); virtual ~HelpTabPage_Impl() override; - - virtual weld::Widget* GetLastFocusControl() = 0; }; // class ContentTabPage_Impl --------------------------------------------- @@ -80,8 +78,6 @@ public: ContentTabPage_Impl(weld::Widget* pParent, SfxHelpIndexWindow_Impl* _pIdxWin); virtual ~ContentTabPage_Impl() override; - virtual weld::Widget* GetLastFocusControl() override; - void SetDoubleClickHdl(const Link<LinkParamNone*, void>& rLink); OUString GetSelectedEntry() const; void SetFocusOnBox() { m_xContentBox->grab_focus(); } @@ -131,7 +127,6 @@ public: virtual ~IndexTabPage_Impl() override; virtual void Activate() override; - virtual weld::Widget* GetLastFocusControl() override; void SetDoubleClickHdl(const Link<LinkParamNone*, void>& rLink); void SetFactory( const OUString& rFactory ); @@ -180,8 +175,6 @@ public: SearchTabPage_Impl(weld::Widget* pParent, SfxHelpIndexWindow_Impl* pIdxWin); virtual ~SearchTabPage_Impl() override; - virtual weld::Widget* GetLastFocusControl() override; - void SetDoubleClickHdl(const Link<LinkParamNone*, void>& rLink); void SetFactory( const OUString& rFactory ) { aFactory = rFactory; } OUString GetSelectedEntry() const; @@ -212,8 +205,6 @@ public: BookmarksTabPage_Impl(weld::Widget* pParent, SfxHelpIndexWindow_Impl* pIdxWin); virtual ~BookmarksTabPage_Impl() override; - virtual weld::Widget* GetLastFocusControl() override; - void SetDoubleClickHdl(const Link<LinkParamNone*, void>& rLink); OUString GetSelectedEntry() const; void AddBookmarks( const OUString& rTitle, const OUString& rURL ); diff --git a/sfx2/source/doc/autoredactdialog.cxx b/sfx2/source/doc/autoredactdialog.cxx index 19d1923b21ac..2fea27f6975b 100644 --- a/sfx2/source/doc/autoredactdialog.cxx +++ b/sfx2/source/doc/autoredactdialog.cxx @@ -137,14 +137,6 @@ void TargetsTable::InsertTarget(RedactionTarget* pTarget) nRow, pTarget->bWholeWords ? SfxResId(STR_REDACTION_YES) : SfxResId(STR_REDACTION_NO), 4); } -void TargetsTable::SelectByName(const OUString& sName) -{ - int nEntry = GetRowByTargetName(sName); - if (nEntry == -1) - return; - select(nEntry); -} - RedactionTarget* TargetsTable::GetTargetByName(const OUString& sName) { int nEntry = GetRowByTargetName(sName); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index dbb0ea75c97c..f64b0ba95435 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -148,11 +148,6 @@ public: m_xWidget->insert_separator(pos, rId); } - virtual void set_sensitive(bool bSensitive) - { - m_xWidget->set_sensitive(bSensitive); - } - void set_active_or_entry_text(const OUString& rText) { const int nFound = m_xWidget->find_text(rText); @@ -255,15 +250,6 @@ public: private: - virtual void set_sensitive(bool bSensitive) override - { - m_xWidget->set_sensitive(bSensitive); - if (bSensitive) - InterimItemWindow::Enable(); - else - InterimItemWindow::Disable(); - } - virtual void DataChanged(const DataChangedEvent& rDCEvt) override; void SetOptimalSize(); }; diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx index a5fd9bd0d130..d4f3e030bf74 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.hxx +++ b/sw/source/ui/dbui/createaddresslistdialog.hxx @@ -95,7 +95,6 @@ public: void show() { m_xDialog->show(); } void set_visible(bool bVisible) { m_xDialog->set_visible(bVisible); } - void hide() { m_xDialog->hide(); } bool get_visible() const { return m_xDialog->get_visible(); } weld::ComboBox& GetFieldsListBox() diff --git a/sw/source/uibase/inc/bookmark.hxx b/sw/source/uibase/inc/bookmark.hxx index 2708f771cf29..2699c03eefe3 100644 --- a/sw/source/uibase/inc/bookmark.hxx +++ b/sw/source/uibase/inc/bookmark.hxx @@ -42,7 +42,6 @@ public: bool has_focus() const { return m_xControl->has_focus(); } std::unique_ptr<weld::TreeIter> get_selected() const; void clear() { m_xControl->clear(); } - void remove(const weld::TreeIter& rIter) { m_xControl->remove(rIter); } void select(const weld::TreeIter& rIter) { m_xControl->select(rIter); } void remove_selection() { m_xControl->remove_selection(); } OUString get_id(const weld::TreeIter& rIter) const { return m_xControl->get_id(rIter); } diff --git a/sw/source/uibase/inc/condedit.hxx b/sw/source/uibase/inc/condedit.hxx index 974fecf95544..a5714d6120bb 100644 --- a/sw/source/uibase/inc/condedit.hxx +++ b/sw/source/uibase/inc/condedit.hxx @@ -50,7 +50,6 @@ public: void set_text(const OUString& rText) { m_xControl->set_text(rText); } void set_visible(bool bVisible) { m_xControl->set_visible(bVisible); } void set_accessible_name(const OUString& rName) { m_xControl->set_accessible_name(rName); } - bool get_sensitive() const { return m_xControl->get_sensitive(); } void save_value() { m_xControl->save_value(); } bool get_value_changed_from_saved() const { return m_xControl->get_value_changed_from_saved(); } void set_sensitive(bool bSensitive) { m_xControl->set_sensitive(bSensitive); } diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index 640bda8c2e6e..282a714d5634 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -345,11 +345,6 @@ public: FocusInHdl(*m_xTreeView); } - int count_selected_rows() const - { - return m_xTreeView->count_selected_rows(); - } - void set_selection_mode(SelectionMode eMode) { m_xTreeView->set_selection_mode(eMode); diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index a152131338b3..4859706e0ffe 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -4363,15 +4363,6 @@ public: return rVclIter.iter != nullptr; } - virtual bool iter_next_visible(weld::TreeIter& rIter) const override - { - SalInstanceTreeIter& rVclIter = static_cast<SalInstanceTreeIter&>(rIter); - rVclIter.iter = m_xTreeView->NextVisible(rVclIter.iter); - if (rVclIter.iter && IsDummyEntry(rVclIter.iter)) - return iter_next_visible(rVclIter); - return rVclIter.iter != nullptr; - } - virtual bool iter_children(weld::TreeIter& rIter) const override { SalInstanceTreeIter& rVclIter = static_cast<SalInstanceTreeIter&>(rIter); diff --git a/vcl/source/control/imivctl.hxx b/vcl/source/control/imivctl.hxx index 5dfa9c06946e..5c23cee3c0d1 100644 --- a/vcl/source/control/imivctl.hxx +++ b/vcl/source/control/imivctl.hxx @@ -110,7 +110,6 @@ class SvxIconChoiceCtrl_Impl friend class IcnCursor_Impl; friend class IcnGridMap_Impl; - bool bChooseWithCursor; std::vector< std::unique_ptr<SvxIconChoiceCtrlEntry> > maEntries; VclPtr<ScrollBar> aVerSBar; VclPtr<ScrollBar> aHorSBar; diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx index 14dd3e302c1e..4410d7241378 100644 --- a/vcl/source/control/imivctl1.cxx +++ b/vcl/source/control/imivctl1.cxx @@ -53,7 +53,6 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl( SvtIconChoiceCtrl* pCurView, WinBits nWinStyle ) : - bChooseWithCursor(false), aVerSBar( VclPtr<ScrollBar>::Create(pCurView, WB_DRAG | WB_VSCROLL) ), aHorSBar( VclPtr<ScrollBar>::Create(pCurView, WB_DRAG | WB_HSCROLL) ), aScrBarBox( VclPtr<ScrollBarBox>::Create(pCurView) ), @@ -904,14 +903,6 @@ bool SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent& rKEvt ) MakeVisible( aRect ); } } - - if ( bChooseWithCursor && pNewCursor != nullptr ) - { - pHdlEntry = pNewCursor;//GetCurEntry(); - pCurHighlightFrame = pHdlEntry; - pView->ClickIcon(); - pCurHighlightFrame = nullptr; - } } break; @@ -924,14 +915,6 @@ bool SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent& rKEvt ) else pNewCursor=pImpCursor->GoPageUpDown( pCursor,true ); SetCursor_Impl( pOldCursor, pNewCursor, bMod1, bShift ); - - if ( bChooseWithCursor && pNewCursor != nullptr) - { - pHdlEntry = pNewCursor;//GetCurEntry(); - pCurHighlightFrame = pHdlEntry; - pView->ClickIcon(); - pCurHighlightFrame = nullptr; - } } break; diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index e08da5a04a10..a8c9dc9815fc 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -11112,11 +11112,6 @@ public: return false; } - virtual bool iter_next_visible(weld::TreeIter& rIter) const override - { - return iter_next(rIter, true); - } - virtual bool iter_children(weld::TreeIter& rIter) const override { GtkInstanceTreeIter& rGtkIter = static_cast<GtkInstanceTreeIter&>(rIter); |