diff options
| -rw-r--r-- | compilerplugins/clang/unusedmethods.results | 120 | ||||
| -rw-r--r-- | fpicker/source/office/contentenumeration.hxx | 5 | ||||
| -rw-r--r-- | include/sfx2/sidebar/ControllerItem.hxx | 6 | ||||
| -rw-r--r-- | include/svx/langbox.hxx | 41 | ||||
| -rw-r--r-- | include/vcl/syswin.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/toolkit/tabdlg.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/treelist.hxx | 1 | ||||
| -rw-r--r-- | include/vcl/treelistbox.hxx | 1 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 10 | ||||
| -rw-r--r-- | sfx2/source/sidebar/ControllerItem.cxx | 17 | ||||
| -rw-r--r-- | svx/source/dialog/langbox.cxx | 233 | ||||
| -rw-r--r-- | vcl/source/treelist/treelist.cxx | 18 | ||||
| -rw-r--r-- | vcl/source/treelist/treelistbox.cxx | 5 | ||||
| -rw-r--r-- | vcl/source/window/syswin.cxx | 12 | ||||
| -rw-r--r-- | vcl/source/window/tabdlg.cxx | 142 | ||||
| -rw-r--r-- | vcl/source/window/window2.cxx | 5 |
16 files changed, 53 insertions, 569 deletions
diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results index a81534046433..ac81e44a6754 100644 --- a/compilerplugins/clang/unusedmethods.results +++ b/compilerplugins/clang/unusedmethods.results @@ -64,8 +64,6 @@ connectivity/source/inc/OTypeInfo.hxx:46 _Bool connectivity::OTypeInfo::operator==(const struct connectivity::OTypeInfo &) const connectivity/source/inc/OTypeInfo.hxx:47 _Bool connectivity::OTypeInfo::operator!=(const struct connectivity::OTypeInfo &) const -cui/source/dialogs/screenshotannotationdlg.cxx:146 - void ScreenshotAnnotationDlg_Impl::CollectChildren(const class vcl::Window &,const class basegfx::B2IPoint &,class std::__debug::vector<class weld::ScreenShotEntry, class std::allocator<class weld::ScreenShotEntry> > &) cui/source/dialogs/SpellAttrib.hxx:73 _Bool svx::SpellErrorDescription::operator==(const struct svx::SpellErrorDescription &) const cui/source/inc/cfgutil.hxx:142 @@ -112,8 +110,6 @@ dbaccess/source/ui/inc/opendoccontrols.hxx:70 void dbaui::OpenDocumentListBox::grab_focus() dbaccess/source/ui/inc/SqlNameEdit.hxx:105 void dbaui::OSQLNameEntry::set_sensitive(_Bool) -dbaccess/source/ui/inc/UITools.hxx:227 - void dbaui::adjustToolBoxSize(class ToolBox *) dbaccess/source/ui/inc/WTypeSelect.hxx:76 void dbaui::OWizTypeSelectList::show() desktop/inc/lib/init.hxx:83 @@ -148,8 +144,8 @@ editeng/inc/edtspell.hxx:112 class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const struct editeng::MisspellRange *, class std::__cxx1998::vector<struct editeng::MisspellRange, class std::allocator<struct editeng::MisspellRange> > >, class std::__debug::vector<struct editeng::MisspellRange, class std::allocator<struct editeng::MisspellRange> >, struct std::random_access_iterator_tag> WrongList::end() const extensions/source/scanner/scanner.hxx:86 void ScannerManager::SetData(void *) -fpicker/source/office/fileview.hxx:118 - _Bool SvtFileView::Initialize(const class com::sun::star::uno::Reference<class com::sun::star::ucb::XContent> &) +fpicker/source/office/contentenumeration.hxx:132 + svt::FolderDescriptor::FolderDescriptor(const class ucbhelper::Content &) hwpfilter/source/mzstring.h:99 class MzString & MzString::operator<<(unsigned char) hwpfilter/source/mzstring.h:101 @@ -484,7 +480,7 @@ include/formula/opcode.hxx:520 class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > OpCodeEnumToString(enum OpCode) include/formula/tokenarray.hxx:182 class formula::FormulaTokenArrayReferencesIterator formula::FormulaTokenArrayReferencesIterator::operator++(int) -include/formula/tokenarray.hxx:573 +include/formula/tokenarray.hxx:577 basic_ostream<type-parameter-?-?, type-parameter-?-?> & formula::operator<<(basic_ostream<type-parameter-?-?, type-parameter-?-?> &,const class formula::FormulaTokenArray &) include/framework/addonsoptions.hxx:194 class rtl::OUString framework::AddonsOptions::GetAddonsNotebookBarResourceName(unsigned int) const @@ -556,6 +552,8 @@ include/sfx2/lokcharthelper.hxx:42 void LokChartHelper::Invalidate() include/sfx2/msg.hxx:120 const class std::type_info * SfxType0::Type() const +include/sfx2/sidebar/ControllerItem.hxx:69 + _Bool sfx2::sidebar::ControllerItem::IsEnabled(const enum SfxItemState) include/svl/itempool.hxx:171 const type-parameter-?-? * SfxItemPool::GetItem2Default(TypedWhichId<type-parameter-?-?>) const include/svl/itempool.hxx:207 @@ -584,18 +582,26 @@ include/svx/dlgctrl.hxx:279 void SvxLineEndLB::set_active_text(const class rtl::OUString &) include/svx/framelink.hxx:194 _Bool svx::frame::operator>(const class svx::frame::Style &,const class svx::frame::Style &) -include/svx/langbox.hxx:156 - void LanguageBox::show() +include/svx/langbox.hxx:57 + SvxLanguageBoxBase::SvxLanguageBoxBase() +include/svx/langbox.hxx:60 + void SvxLanguageBoxBase::SetLanguageList(enum SvxLanguageListFlags,_Bool,_Bool) +include/svx/langbox.hxx:67 + void SvxLanguageBoxBase::SelectLanguage(const struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>) +include/svx/langbox.hxx:68 + struct o3tl::strong_int<unsigned short, struct LanguageTypeTag> SvxLanguageBoxBase::GetSelectedLanguage() const +include/svx/langbox.hxx:77 + void SvxLanguageBoxBase::ImplLanguageBoxBaseInit() +include/svx/langbox.hxx:138 + void SvxLanguageBox::show() include/svx/svdlayer.hxx:74 _Bool SdrLayer::operator==(const class SdrLayer &) const include/svx/svdpntv.hxx:462 _Bool SdrPaintView::IsSwapAsynchron() const -include/svx/txencbox.hxx:60 - void SvxTextEncodingBox::FillWithMimeAndSelectBest() -include/svx/txencbox.hxx:135 - void TextEncodingBox::grab_focus() -include/svx/txencbox.hxx:199 - void TextEncodingTreeView::connect_changed(const class Link<class weld::TreeView &, void> &) +include/svx/txencbox.hxx:92 + void SvxTextEncodingBox::grab_focus() +include/svx/txencbox.hxx:158 + void SvxTextEncodingTreeView::connect_changed(const class Link<class weld::TreeView &, void> &) include/svx/xpoly.hxx:82 _Bool XPolygon::operator==(const class XPolygon &) const include/tools/bigint.hxx:80 @@ -662,6 +668,8 @@ include/tools/stream.hxx:506 class rtl::OString read_uInt32_lenPrefixed_uInt8s_ToOString(class SvStream &) include/tools/urlobj.hxx:448 _Bool INetURLObject::SetHost(const class rtl::OUString &) +include/tools/urlobj.hxx:952 + int INetURLObject::SubString::set(class rtl::OUString &,const class rtl::OUString &) include/tools/weakbase.h:101 _Bool tools::WeakReference::operator==(const type-parameter-?-? *) const include/tools/weakbase.h:110 @@ -670,8 +678,6 @@ include/tools/weakbase.h:113 _Bool tools::WeakReference::operator>(const WeakReference<reference_type> &) const include/unotest/directories.hxx:43 class rtl::OUString test::Directories::getPathFromWorkdir(const class rtl::OUString &) const -include/unotools/mediadescriptor.hxx:103 - const class rtl::OUString & utl::MediaDescriptor::PROP_LOCKCONTENTEXTRACTION() include/unotools/moduleoptions.hxx:166 _Bool SvtModuleOptions::IsDataBase() const include/unotools/textsearch.hxx:130 @@ -692,10 +698,6 @@ include/vcl/ColorMask.hxx:114 void ColorMask::SetColorFor16BitMSB(const class BitmapColor &,unsigned char *) const include/vcl/ColorMask.hxx:116 void ColorMask::SetColorFor16BitLSB(const class BitmapColor &,unsigned char *) const -include/vcl/combobox.hxx:94 - int ComboBox::GetEntryPos(const void *) const -include/vcl/combobox.hxx:121 - void ComboBox::EnableMultiSelection(_Bool) include/vcl/commandevent.hxx:249 CommandMediaData::CommandMediaData(enum MediaCommand) include/vcl/commandevent.hxx:256 @@ -712,8 +714,6 @@ include/vcl/customweld.hxx:74 void weld::CustomWidgetController::SetAccessibleName(const class rtl::OUString &) include/vcl/customweld.hxx:115 void weld::CustomWeld::queue_draw_area(int,int,int,int) -include/vcl/dialog.hxx:98 - Dialog::Dialog(class vcl::Window *,const class rtl::OUString &,const class rtl::OUString &) include/vcl/edit.hxx:184 _Bool Edit::IsSelectAllSingleClick() const include/vcl/edit.hxx:216 @@ -736,10 +736,6 @@ include/vcl/gradient.hxx:104 _Bool Gradient::operator!=(const class Gradient &) const include/vcl/hatch.hxx:55 _Bool Hatch::operator!=(const class Hatch &) const -include/vcl/headbar.hxx:296 - long HeaderBar::GetDragPos() const -include/vcl/headbar.hxx:314 - void HeaderBar::SetDragHdl(const class Link<class HeaderBar *, void> &) include/vcl/inputctx.hxx:62 _Bool InputContext::operator!=(const class InputContext &) const include/vcl/ITiledRenderable.hxx:193 @@ -754,14 +750,14 @@ include/vcl/menu.hxx:468 class tools::Rectangle MenuBar::GetMenuBarButtonRectPixel(unsigned short) include/vcl/menu.hxx:469 void MenuBar::RemoveMenuBarButton(unsigned short) +include/vcl/menu.hxx:521 + void PopupMenu::SetSelectedEntry(unsigned short) include/vcl/NotebookBarAddonsMerger.hxx:64 NotebookBarAddonsMerger::NotebookBarAddonsMerger() include/vcl/opengl/OpenGLHelper.hxx:67 void OpenGLHelper::renderToFile(long,long,const class rtl::OUString &) include/vcl/opengl/OpenGLHelper.hxx:97 void OpenGLHelper::debugMsgStreamWarn(const class std::__cxx11::basic_ostringstream<char> &) -include/vcl/pdfextoutdevdata.hxx:126 - _Bool vcl::PDFExtOutDevData::GetIsSinglePageSheets() const include/vcl/pdfread.hxx:48 unsigned long vcl::ImportPDF(const class rtl::OUString &,class std::__debug::vector<class Bitmap, class std::allocator<class Bitmap> > &,class std::__debug::vector<signed char, class std::allocator<signed char> > &,double) include/vcl/pngread.hxx:56 @@ -786,14 +782,12 @@ include/vcl/svapp.hxx:170 ApplicationEvent::ApplicationEvent(enum ApplicationEvent::Type,const class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &) include/vcl/svapp.hxx:801 void Application::AppEvent(const class ApplicationEvent &) -include/vcl/svtabbx.hxx:69 - unsigned short SvTabListBox::TabCount() const -include/vcl/svtabbx.hxx:71 - long SvTabListBox::GetTab(unsigned short) const -include/vcl/svtabbx.hxx:154 - void SvHeaderTabListBox::DisableTransientChildren() include/vcl/syswin.hxx:185 void SystemWindow::SetIdleDebugName(const char *) +include/vcl/syswin.hxx:288 + class std::__debug::vector<class rtl::OString, class std::allocator<class rtl::OString> > SystemWindow::getAllPageUIXMLDescriptions() const +include/vcl/syswin.hxx:289 + _Bool SystemWindow::selectPageByUIXMLDescription(const class rtl::OString &) include/vcl/TaskStopwatch.hxx:97 void TaskStopwatch::reset() include/vcl/TaskStopwatch.hxx:108 @@ -806,12 +800,14 @@ include/vcl/TaskStopwatch.hxx:118 void TaskStopwatch::setTimeSlice(unsigned int) include/vcl/textrectinfo.hxx:45 _Bool TextRectInfo::operator!=(const class TextRectInfo &) const -include/vcl/treelist.hxx:208 - void SvTreeList::Reverse() +include/vcl/treelist.hxx:116 + void SvTreeList::ReverseChildren(class SvTreeListEntry *) include/vcl/treelistbox.hxx:353 void SvTreeListBox::RemoveSelection() include/vcl/treelistbox.hxx:370 const class SvTreeListEntry * SvTreeListBox::GetParent(const class SvTreeListEntry *) const +include/vcl/treelistbox.hxx:552 + void SvTreeListBox::SetChildrenNotTransient() include/vcl/txtattr.hxx:56 _Bool TextAttrib::operator!=(const class TextAttrib &) const include/vcl/uitest/uiobject.hxx:274 @@ -834,8 +830,6 @@ include/vcl/weld.hxx:142 int weld::Widget::get_margin_bottom() const include/vcl/weld.hxx:144 int weld::Widget::get_margin_right() const -include/vcl/weld.hxx:288 - void weld::ScrolledWindow::hadjustment_configure(int,int,int,int,int,int) include/vcl/weld.hxx:294 void weld::ScrolledWindow::hadjustment_set_upper(int) include/vcl/weld.hxx:296 @@ -902,22 +896,22 @@ include/vcl/weld.hxx:1666 _Bool weld::TimeSpinButton::get_value_changed_from_saved() const include/vcl/weld.hxx:1726 int weld::TextView::vadjustment_get_lower() const -include/vcl/weld.hxx:1812 +include/vcl/weld.hxx:1820 void weld::Menu::append_check(const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:1843 +include/vcl/weld.hxx:1851 void weld::Toolbar::append_separator(const class rtl::OUString &) -include/vcl/weld.hxx:1852 +include/vcl/weld.hxx:1860 void weld::SizeGroup::set_mode(enum VclSizeGroupMode) -include/vcl/weld.hxx:1879 +include/vcl/weld.hxx:1887 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/window.hxx:410 const char * ImplDbgCheckWindow(const void *) +include/vcl/window.hxx:1158 + class rtl::OString vcl::Window::GetScreenshotId() const include/vcl/window.hxx:1222 class Size vcl::Window::PaintActiveFloatingWindow(class VirtualDevice &) const libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx:35 void openLokDialog(struct _GtkWidget *,void *) -linguistic/source/convdicxml.hxx:82 - ConvDicXMLTokenHandler::ConvDicXMLTokenHandler() 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 @@ -934,8 +928,6 @@ oox/source/drawingml/diagram/diagramlayoutatoms.hxx:257 const class std::__debug::vector<class std::shared_ptr<class oox::drawingml::Shape>, class std::allocator<class std::shared_ptr<class oox::drawingml::Shape> > > & oox::drawingml::LayoutNode::getNodeShapes() const oox/source/drawingml/diagram/diagramlayoutatoms.hxx:265 const class oox::drawingml::LayoutNode * oox::drawingml::LayoutNode::getParentLayoutNode() const -reportdesign/source/ui/dlg/Condition.hxx:64 - void rptui::ConditionColorWrapper::dispose() sal/osl/unx/uunxapi.hxx:35 int mkdir_c(const class rtl::OString &,unsigned int) sal/osl/unx/uunxapi.hxx:70 @@ -1048,6 +1040,8 @@ sc/source/ui/inc/condformatdlgentry.hxx:84 int ScCondFrmtEntry::get_grid_top_attach() const sc/source/ui/inc/condformatdlgentry.hxx:86 class Size ScCondFrmtEntry::get_preferred_size() const +sc/source/ui/inc/csvruler.hxx:142 + void ScCsvRuler::EndMouseTracking(_Bool) sc/source/ui/inc/dataprovider.hxx:56 _Bool sc::CSVFetchThread::IsRequestedTerminate() sc/source/ui/inc/dataprovider.hxx:57 @@ -1056,7 +1050,7 @@ sc/source/ui/inc/dataprovider.hxx:58 void sc::CSVFetchThread::EndThread() sc/source/ui/inc/dataprovider.hxx:83 const class rtl::OUString & sc::DataProvider::GetURL() const -sc/source/ui/inc/datatableview.hxx:115 +sc/source/ui/inc/datatableview.hxx:114 void ScDataTableView::getRowRange(int &,int &) const sc/source/ui/inc/impex.hxx:93 ScImportExport::ScImportExport(class ScDocument *,const class rtl::OUString &) @@ -1064,11 +1058,11 @@ sc/source/ui/inc/RandomNumberGeneratorDialog.hxx:64 void ScRandomNumberGeneratorDialog::GenerateNumbers(type-parameter-?-? &,const char *,const class boost::optional<signed char>) sc/source/ui/inc/TableFillingAndNavigationTools.hxx:121 unsigned long DataRangeIterator::size() -sc/source/ui/inc/viewdata.hxx:407 +sc/source/ui/inc/viewdata.hxx:409 long ScViewData::GetLOKDocWidthPixel() const -sc/source/ui/inc/viewdata.hxx:408 +sc/source/ui/inc/viewdata.hxx:410 long ScViewData::GetLOKDocHeightPixel() const -sc/source/ui/inc/viewdata.hxx:541 +sc/source/ui/inc/viewdata.hxx:543 _Bool ScViewData::IsGridMode() const scaddins/source/analysis/analysishelper.hxx:802 _Bool sca::analysis::ScaDate::operator>=(const class sca::analysis::ScaDate &) const @@ -1138,18 +1132,18 @@ slideshow/source/engine/activities/activitiesfactory.cxx:568 void slideshow::internal::(anonymous namespace)::ValuesActivity::perform(unsigned int,unsigned int) const slideshow/source/engine/activities/activitiesfactory.cxx:583 void slideshow::internal::(anonymous namespace)::ValuesActivity::performEnd() -slideshow/source/engine/animationfactory.cxx:443 - void slideshow::internal::(anonymous namespace)::GenericAnimation::prefetch(const class std::shared_ptr<class slideshow::internal::AnimatableShape> &,const class std::shared_ptr<class slideshow::internal::ShapeAttributeLayer> &) -slideshow/source/engine/animationfactory.cxx:447 +slideshow/source/engine/animationfactory.cxx:441 + void slideshow::internal::(anonymous namespace)::GenericAnimation::prefetch() +slideshow/source/engine/animationfactory.cxx:444 void slideshow::internal::(anonymous namespace)::GenericAnimation::start(const class std::shared_ptr<class slideshow::internal::AnimatableShape> &,const class std::shared_ptr<class slideshow::internal::ShapeAttributeLayer> &) -slideshow/source/engine/animationfactory.cxx:520 +slideshow/source/engine/animationfactory.cxx:517 _Bool slideshow::internal::(anonymous namespace)::GenericAnimation::operator()(const typename type-parameter-?-?::ValueType &) -slideshow/source/engine/animationfactory.cxx:535 +slideshow/source/engine/animationfactory.cxx:532 _Bool slideshow::internal::(anonymous namespace)::GenericAnimation::operator()(typename type-parameter-?-?::ValueType) -slideshow/source/engine/animationfactory.cxx:548 +slideshow/source/engine/animationfactory.cxx:545 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) + void OGLTransitionImpl::cleanup() starmath/inc/format.hxx:138 _Bool SmFormat::operator!=(const class SmFormat &) const svgio/inc/svgstyleattributes.hxx:348 @@ -1245,7 +1239,7 @@ sw/inc/fmtfollowtextflow.hxx:40 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 - _Bool IDocumentLinksAdministration::SetData(const class rtl::OUString &,const class rtl::OUString &,const class com::sun::star::uno::Any &) + _Bool IDocumentLinksAdministration::SetData(const class rtl::OUString &) sw/inc/IDocumentMarkAccess.hxx:92 class IDocumentMarkAccess::iterator IDocumentMarkAccess::iterator::operator++(int) sw/inc/IDocumentMarkAccess.hxx:95 @@ -1328,16 +1322,12 @@ sw/source/core/inc/frame.hxx:1392 long SwRectFnSet::RightDist(const class SwRect &,long) const sw/source/core/inc/mvsave.hxx:176 _Bool ZSortFly::operator==(const class ZSortFly &) const -sw/source/core/inc/UndoSplitMove.hxx:73 - void SwUndoMove::SetDestRange(const class SwPaM &,const struct SwPosition &,_Bool,_Bool) sw/source/core/text/porlin.hxx:118 _Bool SwLinePortion::IsTabRightPortion() const sw/source/core/text/txtpaint.hxx:66 DbgBackColor::DbgBackColor(class OutputDevice *,const _Bool) sw/source/core/text/txtpaint.hxx:73 DbgRect::DbgRect(class OutputDevice *,const class tools::Rectangle &,const _Bool,class Color) -sw/source/filter/ww8/ww8struc.hxx:246 - WW8_BRCVer6::WW8_BRCVer6() sw/source/ui/dbui/createaddresslistdialog.hxx:98 void SwFindEntryDialog::hide() sw/source/uibase/inc/bookmark.hxx:45 @@ -1474,8 +1464,6 @@ vcl/inc/salwtype.hxx:118 SalMenuEvent::SalMenuEvent() vcl/inc/schedulerimpl.hxx:38 const char * ImplSchedulerData::GetDebugName() const -vcl/inc/svdata.hxx:410 - unsigned long ControlCacheHashFunction::operator()(const class ControlCacheKey &) const vcl/inc/unx/glyphcache.hxx:68 void GlyphCache::ClearFontOptions() vcl/inc/unx/gtk/gtkframe.hxx:214 @@ -1484,8 +1472,6 @@ vcl/inc/unx/saldisp.hxx:378 class SalXLib * SalDisplay::GetXLib() const vcl/inc/unx/salframe.h:184 enum SalFrameStyleFlags X11SalFrame::GetStyle() const -vcl/inc/wizdlg.hxx:306 - void vcl::RoadmapWizard::implResetDefault(const class vcl::Window *) vcl/source/app/scheduler.cxx:83 basic_ostream<type-parameter-?-?, type-parameter-?-?> & (anonymous namespace)::operator<<(basic_ostream<type-parameter-?-?, type-parameter-?-?> &,const class Idle &) vcl/source/edit/textdat2.hxx:85 diff --git a/fpicker/source/office/contentenumeration.hxx b/fpicker/source/office/contentenumeration.hxx index 0e6c529e65b3..2b0be7d79a80 100644 --- a/fpicker/source/office/contentenumeration.hxx +++ b/fpicker/source/office/contentenumeration.hxx @@ -129,11 +129,6 @@ namespace svt FolderDescriptor() { } - explicit FolderDescriptor( const ::ucbhelper::Content& _rContent ) - :aContent( _rContent ) - { - } - explicit FolderDescriptor( const OUString& _rURL ) :sURL( _rURL ) { diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx index 521be277e45f..ddec5c8fc6af 100644 --- a/include/sfx2/sidebar/ControllerItem.hxx +++ b/include/sfx2/sidebar/ControllerItem.hxx @@ -62,12 +62,6 @@ public: virtual ~ControllerItem() override; - /** Returns </TRUE> when the slot/command has not been disabled. - Changes of this state are notified via the - ItemUpdateReceiverInterface::NotifyContextChang() method. - */ - static bool IsEnabled (const SfxItemState eState); - /** Force the controller item to call its NotifyItemUpdate callback with up-to-date data. */ diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index d693e684e1be..fe46cb0fad2d 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -48,47 +48,6 @@ namespace o3tl // load language strings from resource SVX_DLLPUBLIC OUString GetDicInfoStr( const OUString& rName, const LanguageType nLang, bool bNeg ); -class SVX_DLLPUBLIC SvxLanguageBoxBase -{ -private: - SvxLanguageBoxBase(const SvxLanguageBoxBase&) = delete; - SvxLanguageBoxBase& operator=(const SvxLanguageBoxBase&) = delete; -public: - explicit SvxLanguageBoxBase(); - virtual ~SvxLanguageBoxBase(); - - void SetLanguageList( SvxLanguageListFlags nLangList, - bool bHasLangNone, - bool bCheckSpellAvail ); - - void AddLanguages( const std::vector< LanguageType >& rLanguageTypes, SvxLanguageListFlags nLangList ); - - sal_Int32 InsertLanguage( const LanguageType eLangType ); - void SelectLanguage( const LanguageType eLangType ); - LanguageType GetSelectedLanguage() const; - -protected: - Image m_aNotCheckedImage; - Image m_aCheckedImage; - std::unique_ptr<css::uno::Sequence< sal_Int16 >> - m_pSpellUsedLang; - bool m_bWithCheckmark; - - SVX_DLLPRIVATE void ImplLanguageBoxBaseInit(); - SVX_DLLPRIVATE sal_Int32 ImplInsertLanguage(LanguageType, sal_Int32 nPos, sal_Int16 nType); - SVX_DLLPRIVATE sal_Int32 ImplTypeToPos( LanguageType eType ) const; - - SVX_DLLPRIVATE virtual sal_Int32 ImplInsertImgEntry( const OUString& rEntry, sal_Int32 nPos, bool bChecked ) = 0; - - SVX_DLLPRIVATE virtual void ImplClear() = 0; - SVX_DLLPRIVATE virtual sal_Int32 ImplInsertEntry( const OUString& rEntry, sal_Int32 nPos ) = 0; - SVX_DLLPRIVATE virtual void ImplSetEntryData( sal_Int32 nPos, void* pData ) = 0; - SVX_DLLPRIVATE virtual sal_Int32 ImplGetSelectedEntryPos() const = 0; - SVX_DLLPRIVATE virtual void* ImplGetEntryData( sal_Int32 nPos ) const = 0; - SVX_DLLPRIVATE virtual void ImplSelectEntryPos( sal_Int32 nPos, bool bSelect ) = 0; - SVX_DLLPRIVATE virtual sal_Int32 ImplGetEntryPos( const void* pData ) const = 0; -}; - class SVX_DLLPUBLIC SvxLanguageBox { public: diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index cb6d15d27ead..57ca00e619a7 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -285,8 +285,6 @@ public: virtual void doDeferredInit(WinBits nBits); // Screenshot interface - virtual std::vector<OString> getAllPageUIXMLDescriptions() const; - virtual bool selectPageByUIXMLDescription(const OString& rUIXMLDescription); void createScreenshot(VirtualDevice& rOutput); }; diff --git a/include/vcl/toolkit/tabdlg.hxx b/include/vcl/toolkit/tabdlg.hxx index ae8aa931d79d..5d883b826a52 100644 --- a/include/vcl/toolkit/tabdlg.hxx +++ b/include/vcl/toolkit/tabdlg.hxx @@ -40,10 +40,6 @@ public: virtual void dispose() override; virtual void StateChanged( StateChangedType nStateChange ) override; - - // Screenshot interface - virtual std::vector<OString> getAllPageUIXMLDescriptions() const override; - virtual bool selectPageByUIXMLDescription(const OString& rUIXMLDescription) override; }; #endif // INCLUDED_VCL_TABDLG_HXX diff --git a/include/vcl/treelist.hxx b/include/vcl/treelist.hxx index 15931d79f9d6..20045cb21804 100644 --- a/include/vcl/treelist.hxx +++ b/include/vcl/treelist.hxx @@ -113,7 +113,6 @@ class VCL_DLLPUBLIC SvTreeList final ); VCL_DLLPRIVATE void ResortChildren( SvTreeListEntry* pParent ); - VCL_DLLPRIVATE void ReverseChildren( SvTreeListEntry* pParent ); SvTreeList(const SvTreeList&) = delete; SvTreeList& operator= (const SvTreeList&) = delete; diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx index 4dcd516cea22..f370d284e59f 100644 --- a/include/vcl/treelistbox.hxx +++ b/include/vcl/treelistbox.hxx @@ -549,7 +549,6 @@ protected: void ImplEditEntry( SvTreeListEntry* pEntry ); bool AreChildrenTransient() const; - void SetChildrenNotTransient(); void AdjustEntryHeightAndRecalc(); public: diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 58dad46aeef2..071fe5f8bd26 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -1147,16 +1147,6 @@ public: void SetHelpId( const OString& ); const OString& GetHelpId() const; - /** String ID of this window for the purpose of creating a screenshot - - In default implementation this ID is the same as HelpId. Override this method - in windows (dialogs,tabpages) that need different IDs for different configurations - they can be in - - @return screenshot ID of this window - */ - virtual OString GetScreenshotId() const; - vcl::Window* FindWindow( const Point& rPos ) const; sal_uInt16 GetChildCount() const; diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx index dc44975a1ac8..088677115893 100644 --- a/sfx2/source/sidebar/ControllerItem.cxx +++ b/sfx2/source/sidebar/ControllerItem.cxx @@ -67,23 +67,6 @@ void ControllerItem::StateChanged ( mrItemUpdateReceiver.NotifyItemUpdate(nSID, eState, pState); } -bool ControllerItem::IsEnabled (SfxItemState eState) -{ - if (eState == SfxItemState::DISABLED) - return false; - else if ( ! SvtCommandOptions().HasEntries(SvtCommandOptions::CMDOPTION_DISABLED)) - { - // There are no disabled commands. - return true; - } - else - { - // We were not given a command name at construction and can - // not check the state now. Assume the best and return true. - return true; - } -} - void ControllerItem::RequestUpdate() { std::unique_ptr<SfxPoolItem> pState; diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index a524288b29ec..67681e491ff4 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -85,41 +85,6 @@ static bool lcl_SeqHasLang( const Sequence< sal_Int16 > & rLangSeq, sal_Int16 nL && std::find(rLangSeq.begin(), rLangSeq.end(), nLang) != rLangSeq.end(); } -SvxLanguageBoxBase::SvxLanguageBoxBase() - : m_bWithCheckmark(false) -{ -} - -void SvxLanguageBoxBase::ImplLanguageBoxBaseInit() -{ - m_aNotCheckedImage = Image(StockImage::Yes, RID_SVXBMP_NOTCHECKED); - m_aCheckedImage = Image(StockImage::Yes, RID_SVXBMP_CHECKED); - - if ( m_bWithCheckmark ) - { - sal_uInt32 nCount = SvtLanguageTable::GetLanguageEntryCount(); - for ( sal_uInt32 i = 0; i < nCount; i++ ) - { - LanguageType nLangType = SvtLanguageTable::GetLanguageTypeAtIndex( i ); - - bool bInsert = true; - if ((LANGUAGE_DONTKNOW == nLangType) || - (LANGUAGE_SYSTEM == nLangType)) - { - bInsert = false; - } - - if ( bInsert ) - InsertLanguage( nLangType ); - } - } -} - - -SvxLanguageBoxBase::~SvxLanguageBoxBase() -{ -} - namespace { bool lcl_isPrerequisite( LanguageType nLangType ) @@ -146,204 +111,6 @@ bool lcl_isScriptTypeRequested( LanguageType nLangType, SvxLanguageListFlags nLa } -void SvxLanguageBoxBase::AddLanguages( const std::vector< LanguageType >& rLanguageTypes, - SvxLanguageListFlags nLangList ) -{ - for ( auto const & nLangType : rLanguageTypes ) - { - if (lcl_isPrerequisite( nLangType )) - { - LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType ); - if (lcl_isScriptTypeRequested( nLang, nLangList)) - { - sal_Int32 nAt = ImplTypeToPos( nLang ); - if (nAt == LISTBOX_ENTRY_NOTFOUND) - InsertLanguage( nLang ); - } - } - } -} - -void SvxLanguageBoxBase::SetLanguageList( SvxLanguageListFlags nLangList, - bool bHasLangNone, bool bCheckSpellAvail ) -{ - ImplClear(); - - m_bWithCheckmark = bCheckSpellAvail; - - if ( SvxLanguageListFlags::EMPTY == nLangList ) - return; - - bool bAddAvailable = (!(nLangList & SvxLanguageListFlags::ONLY_KNOWN) && - ((nLangList & SvxLanguageListFlags::ALL) || - (nLangList & SvxLanguageListFlags::WESTERN) || - (nLangList & SvxLanguageListFlags::CTL) || - (nLangList & SvxLanguageListFlags::CJK))); - std::vector< LanguageType > aSpellAvailLang; - std::vector< LanguageType > aHyphAvailLang; - std::vector< LanguageType > aThesAvailLang; - Sequence< sal_Int16 > aSpellUsedLang; - Reference< XAvailableLocales > xAvail( LinguMgr::GetLngSvcMgr(), UNO_QUERY ); - if (xAvail.is()) - { - Sequence< css::lang::Locale > aTmp; - - if (bAddAvailable) - { - aTmp = xAvail->getAvailableLocales( SN_SPELLCHECKER ); - aSpellAvailLang = lcl_LocaleSeqToLangSeq( aTmp ); - } - if (bAddAvailable) - { - aTmp = xAvail->getAvailableLocales( SN_HYPHENATOR ); - aHyphAvailLang = lcl_LocaleSeqToLangSeq( aTmp ); - } - if (bAddAvailable) - { - aTmp = xAvail->getAvailableLocales( SN_THESAURUS ); - aThesAvailLang = lcl_LocaleSeqToLangSeq( aTmp ); - } - } - if (SvxLanguageListFlags::SPELL_USED & nLangList) - { - Reference< XSpellChecker1 > xTmp1 = LinguMgr::GetSpellChecker(); - if (xTmp1.is()) - aSpellUsedLang = xTmp1->getLanguages(); - } - - std::vector<LanguageType> aKnown; - sal_uInt32 nCount; - if ( nLangList & SvxLanguageListFlags::ONLY_KNOWN ) - { - aKnown = LocaleDataWrapper::getInstalledLanguageTypes(); - nCount = aKnown.size(); - } - else - { - nCount = SvtLanguageTable::GetLanguageEntryCount(); - } - for ( sal_uInt32 i = 0; i < nCount; i++ ) - { - LanguageType nLangType; - if ( nLangList & SvxLanguageListFlags::ONLY_KNOWN ) - nLangType = aKnown[i]; - else - nLangType = SvtLanguageTable::GetLanguageTypeAtIndex( i ); - if ( lcl_isPrerequisite( nLangType ) && - (lcl_isScriptTypeRequested( nLangType, nLangList) || - (bool(nLangList & SvxLanguageListFlags::FBD_CHARS) && - MsLangId::hasForbiddenCharacters(nLangType)) || - (bool(nLangList & SvxLanguageListFlags::SPELL_USED) && - lcl_SeqHasLang(aSpellUsedLang, static_cast<sal_uInt16>(nLangType))) - ) ) - InsertLanguage( nLangType ); - } - - if (bAddAvailable) - { - // Spell checkers, hyphenators and thesauri may add language tags - // unknown so far. - AddLanguages( aSpellAvailLang, nLangList); - AddLanguages( aHyphAvailLang, nLangList); - AddLanguages( aThesAvailLang, nLangList); - } - - if (bHasLangNone) - InsertLanguage( LANGUAGE_NONE ); -} - - -sal_Int32 SvxLanguageBoxBase::InsertLanguage( const LanguageType nLangType ) -{ - return ImplInsertLanguage( nLangType, LISTBOX_APPEND, css::i18n::ScriptType::WEAK ); -} - - -sal_Int32 SvxLanguageBoxBase::ImplInsertLanguage( const LanguageType nLangType, sal_Int32 nPos, sal_Int16 nType ) -{ - LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType); - // For obsolete and to be replaced languages check whether an entry of the - // replacement already exists and if so don't add an entry with identical - // string as would be returned by SvtLanguageTable::GetString(). - if (nLang != nLangType) - { - sal_Int32 nAt = ImplTypeToPos( nLang ); - if ( nAt != LISTBOX_ENTRY_NOTFOUND ) - return nAt; - } - - OUString aStrEntry = SvtLanguageTable::GetLanguageString( nLang ); - - LanguageType nRealLang = nLang; - if (nRealLang == LANGUAGE_SYSTEM) - { - nRealLang = MsLangId::resolveSystemLanguageByScriptType(nRealLang, nType); - aStrEntry += " - "; - aStrEntry += SvtLanguageTable::GetLanguageString( nRealLang ); - } else if (nRealLang == LANGUAGE_USER_SYSTEM_CONFIG) { - nRealLang = MsLangId::getSystemLanguage(); - aStrEntry += " - "; - aStrEntry += SvtLanguageTable::GetLanguageString( nRealLang ); - } - - aStrEntry = ApplyLreOrRleEmbedding( aStrEntry ); - - sal_Int32 nAt = 0; - if ( m_bWithCheckmark ) - { - bool bFound = false; - - if (!m_pSpellUsedLang) - { - Reference< XSpellChecker1 > xSpell = LinguMgr::GetSpellChecker(); - if ( xSpell.is() ) - m_pSpellUsedLang.reset( new Sequence< sal_Int16 >( xSpell->getLanguages() ) ); - } - bFound = m_pSpellUsedLang && - lcl_SeqHasLang( *m_pSpellUsedLang, static_cast<sal_uInt16>(nRealLang) ); - - nAt = ImplInsertImgEntry( aStrEntry, nPos, bFound ); - } - else - nAt = ImplInsertEntry( aStrEntry, nPos ); - - ImplSetEntryData( nAt, reinterpret_cast<void*>(static_cast<sal_uInt16>(nLangType)) ); - return nAt; -} - - -LanguageType SvxLanguageBoxBase::GetSelectedLanguage() const -{ - sal_Int32 nPos = ImplGetSelectedEntryPos(); - - if ( nPos != LISTBOX_ENTRY_NOTFOUND ) - return LanguageType( reinterpret_cast<sal_uIntPtr>(ImplGetEntryData(nPos)) ); - else - return LANGUAGE_DONTKNOW; -} - - -void SvxLanguageBoxBase::SelectLanguage( const LanguageType eLangType ) -{ - // If the core uses a LangID of an imported MS document and wants to select - // a language that is replaced, we need to select the replacement instead. - LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( eLangType); - - sal_Int32 nAt = ImplTypeToPos( nLang ); - - if ( nAt == LISTBOX_ENTRY_NOTFOUND ) - nAt = InsertLanguage( nLang ); // on-the-fly-ID - - if ( nAt != LISTBOX_ENTRY_NOTFOUND ) - ImplSelectEntryPos( nAt, true/*bSelect*/ ); -} - - -sal_Int32 SvxLanguageBoxBase::ImplTypeToPos( LanguageType eType ) const -{ - return ImplGetEntryPos( reinterpret_cast<void*>(static_cast<sal_uInt16>(eType)) ); -} - LanguageType SvxLanguageBox::get_active_id() const { diff --git a/vcl/source/treelist/treelist.cxx b/vcl/source/treelist/treelist.cxx index 03c1d9d4e831..681bef4d0c7d 100644 --- a/vcl/source/treelist/treelist.cxx +++ b/vcl/source/treelist/treelist.cxx @@ -1468,24 +1468,6 @@ void SvTreeList::ResortChildren( SvTreeListEntry* pParent ) SetListPositions(pParent->m_Children); // correct list position in target list } -void SvTreeList::ReverseChildren( SvTreeListEntry* pParent ) -{ - DBG_ASSERT(pParent,"Parent not set"); - - if (pParent->m_Children.empty()) - return; - - std::reverse(pParent->m_Children.begin(), pParent->m_Children.end()); - // Recursively sort child entries. - for (auto const& it : pParent->m_Children) - { - SvTreeListEntry& r = *it; - ReverseChildren(&r); - } - - SetListPositions(pParent->m_Children); // correct list position in target list -} - void SvTreeList::GetInsertionPos( SvTreeListEntry const * pEntry, SvTreeListEntry* pParent, sal_uLong& rPos ) { diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx index 529839943445..239325e2ba0c 100644 --- a/vcl/source/treelist/treelistbox.cxx +++ b/vcl/source/treelist/treelistbox.cxx @@ -2497,11 +2497,6 @@ bool SvTreeListBox::AreChildrenTransient() const return pImpl->AreChildrenTransient(); } -void SvTreeListBox::SetChildrenNotTransient() -{ - pImpl->SetChildrenNotTransient(); -} - void SvTreeListBox::EditedText( const OUString& rStr ) { diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 62ceb456c8a6..5d87ad141c7b 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -1154,18 +1154,6 @@ void SystemWindow::doDeferredInit(WinBits /*nBits*/) SAL_WARN("vcl.layout", "SystemWindow in layout without doDeferredInit impl"); } -std::vector<OString> SystemWindow::getAllPageUIXMLDescriptions() const -{ - // default has no pages - return std::vector<OString>(); -} - -bool SystemWindow::selectPageByUIXMLDescription(const OString& /*rUIXMLDescription*/) -{ - // default cannot select anything (which is okay, return true) - return true; -} - void SystemWindow::createScreenshot(VirtualDevice& rOutput) { // same prerequisites as in Execute() diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx index 47212cb7fc8a..ff621de78fba 100644 --- a/vcl/source/window/tabdlg.cxx +++ b/vcl/source/window/tabdlg.cxx @@ -181,146 +181,4 @@ void TabDialog::StateChanged( StateChangedType nType ) Dialog::StateChanged( nType ); } -static vcl::Window* findTabControl(vcl::Window* pCurrent) -{ - if (!pCurrent) - { - return nullptr; - } - - if (pCurrent->GetType() == WindowType::TABCONTROL) - { - return pCurrent; - } - - vcl::Window* pChild = pCurrent->GetWindow(GetWindowType::FirstChild); - - while (pChild) - { - - vcl::Window* pInorderChild = findTabControl(pChild); - - if (pInorderChild) - { - return pInorderChild; - } - - pChild = pChild->GetWindow(GetWindowType::Next); - } - - return nullptr; -} - -std::vector<OString> TabDialog::getAllPageUIXMLDescriptions() const -{ - std::vector<OString> aRetval; - - const TabControl* pTabCtrl = dynamic_cast<TabControl*>(findTabControl(const_cast<TabDialog*>(this))); - - if (pTabCtrl) - { - for (sal_uInt16 a(0); a < pTabCtrl->GetPageCount(); a++) - { - const sal_uInt16 nPageId(pTabCtrl->GetPageId(a)); - - if (TAB_PAGE_NOTFOUND != nPageId) - { - TabPage* pCandidate = pTabCtrl->GetTabPage(nPageId); - - if (pCandidate) - { - OString aNewName(pCandidate->getUIFile()); - - if (!aNewName.isEmpty()) - { - // we have to check for double entries, this may happen e.g. - // in the HeaderFooterDialog which has two times the same - // tabPage added. Add the PageID as hint to the name, separated - // by a token (using "|" here). Do not do this for 1st occurrence, - // that is used for detection and is not necessary. - // Use the UIXMLDescription without trailing '.ui', with one trailing '/' - bool bAlreadyAdded(false); - - for (auto const& elem : aRetval) - { - bAlreadyAdded = (elem == aNewName); - if (bAlreadyAdded) - break; - } - - if (bAlreadyAdded) - { - // add the PageId to be able to detect the correct tabPage in - // selectPageByUIXMLDescription below - aNewName += "|" + OString::number(nPageId); - } - - aRetval.push_back(aNewName); - } - } - } - } - } - - return aRetval; -} - -bool TabDialog::selectPageByUIXMLDescription(const OString& rUIXMLDescription) -{ - TabControl* pTabCtrl = dynamic_cast<TabControl*>(findTabControl(this)); - - if (pTabCtrl) - { - sal_uInt32 nTargetPageId(0); - OString aTargetName(rUIXMLDescription); - const sal_Int32 nIndexOfSeparator(rUIXMLDescription.indexOf("|")); - - if (-1 != nIndexOfSeparator) - { - // more than one tabPage with that UXMLDescription is added to this dialog, - // see getAllPageUIXMLDescriptions() above. Extract target PageId and - // strip the UXMLDescription name for comparison - nTargetPageId = rUIXMLDescription.copy(nIndexOfSeparator + 1).toUInt32(); - aTargetName = rUIXMLDescription.copy(0, nIndexOfSeparator); - } - - for (sal_uInt16 a(0); a < pTabCtrl->GetPageCount(); a++) - { - const sal_uInt16 nPageId(pTabCtrl->GetPageId(a)); - - if (TAB_PAGE_NOTFOUND != nPageId) - { - TabPage* pCandidate = pTabCtrl->GetTabPage(nPageId); - - if (pCandidate) - { - if (pCandidate->getUIFile() == aTargetName) - { - if (nTargetPageId) - { - // when multiple versions may exist, name is not sufficient. Also - // check for the given PageId to select the correct tabPage - // for cases where the same TabPage is used more than once - // in a tabDialog (e.g. HeaderFooterDialog) - if (nTargetPageId == nPageId) - { - pTabCtrl->SelectTabPage(nPageId); - return true; - } - } - else - { - // select that tabPage - pTabCtrl->SelectTabPage(nPageId); - return true; - } - } - } - } - } - } - - return false; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 3869ee771a7d..6f32ea52eafd 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -830,11 +830,6 @@ const OString& Window::GetHelpId() const return mpWindowImpl->maHelpId; } -OString Window::GetScreenshotId() const -{ - return GetHelpId(); -} - // --------- old inline methods --------------- vcl::Window* Window::ImplGetWindow() const |