chart2/source/inc/MediaDescriptorHelper.hxx | 6 chart2/source/tools/MediaDescriptorHelper.cxx | 20 - compilerplugins/clang/unusedfields.only-used-in-constructor.results | 46 -- compilerplugins/clang/unusedfields.readonly.results | 28 - compilerplugins/clang/unusedfields.untouched.results | 52 +- compilerplugins/clang/unusedfields.writeonly.results | 20 - compilerplugins/clang/unusedmethods.results | 194 ++++------ compilerplugins/clang/unusedmethods.unused-returns.results | 14 cui/source/customize/cfg.cxx | 1 cui/source/inc/cfg.hxx | 1 extensions/source/propctrlr/formcomponenthandler.hxx | 18 include/svx/checklbx.hxx | 11 include/vcl/outdev.hxx | 2 include/vcl/treelistbox.hxx | 1 svx/source/dialog/checklbx.cxx | 62 --- sw/source/uibase/inc/numfmtlb.hxx | 3 sw/source/uibase/utlui/numfmtlb.cxx | 12 vcl/source/treelist/treelistbox.cxx | 13 18 files changed, 164 insertions(+), 340 deletions(-)
New commits: commit c196d70337f6b755cfc4c34beda05554c6fab114 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Wed Mar 13 15:03:37 2019 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu Mar 14 08:48:09 2019 +0100 loplugin:unusedmethods Change-Id: Ief7cdb14e2c0fe4b0332cd90e063d649065bf3b6 Reviewed-on: https://gerrit.libreoffice.org/69171 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results index 63d19d42b302..02bb0d181978 100644 --- a/compilerplugins/clang/unusedmethods.results +++ b/compilerplugins/clang/unusedmethods.results @@ -48,21 +48,19 @@ 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/inc/cfgutil.hxx:120 - class rtl::OUString SfxConfigFunctionListBox::GetCurCommand() -cui/source/inc/cfgutil.hxx:121 - class rtl::OUString SfxConfigFunctionListBox::GetCurLabel() +cui/source/inc/cfg.hxx:362 + void SvxMenuEntriesListBox::insert(int,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString *) cui/source/inc/cfgutil.hxx:147 _Bool CuiConfigFunctionListBox::get_iter_first(class weld::TreeIter &) const cui/source/inc/cfgutil.hxx:149 _Bool CuiConfigFunctionListBox::iter_next(class weld::TreeIter &) const -cui/source/inc/cfgutil.hxx:151 +cui/source/inc/cfgutil.hxx:152 class rtl::OUString CuiConfigFunctionListBox::get_text(const class weld::TreeIter &) const -cui/source/inc/hangulhanjadlg.hxx:49 - void svx::SuggestionSet::ClearSet() -cui/source/inc/hangulhanjadlg.hxx:84 - _Bool svx::SuggestionDisplay::hasCurrentControl() -cui/source/inc/hangulhanjadlg.hxx:253 +cui/source/inc/cfgutil.hxx:155 + class rtl::OUString CuiConfigFunctionListBox::get_id(int) const +cui/source/inc/cfgutil.hxx:169 + int CuiConfigFunctionListBox::get_selected_index() const +cui/source/inc/hangulhanjadlg.hxx:251 class rtl::OUString svx::SuggestionEdit::get_text() const dbaccess/source/filter/hsqldb/fbalterparser.hxx:20 void dbahsql::FbAlterStmtParser::ensureProperTableLengths() const @@ -80,16 +78,12 @@ dbaccess/source/ui/inc/indexcollection.hxx:63 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> > > dbaui::OIndexCollection::find(const class rtl::OUString &) const dbaccess/source/ui/inc/indexcollection.hxx:65 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> > > dbaui::OIndexCollection::findOriginal(const class rtl::OUString &) const -dbaccess/source/ui/inc/opendoccontrols.hxx:62 - class rtl::OUString dbaui::OpenDocumentListBox::GetSelectedDocumentFilter() const desktop/inc/lib/init.hxx:83 void desktop::CallbackFlushHandler::setEventLatch(const _Bool) desktop/inc/lib/init.hxx:88 _Bool desktop::CallbackFlushHandler::isEventLatchOn() const desktop/inc/lib/init.hxx:90 _Bool desktop::CallbackFlushHandler::isPartTilePainting() const -desktop/source/deployment/gui/dp_gui_updatedialog.hxx:105 - void dp_gui::UpdateDialog::setIgnoredUpdate(const struct dp_gui::UpdateDialog::Index *,_Bool,_Bool) drawinglayer/source/tools/emfpcustomlinecap.hxx:38 void emfplushelper::EMFPCustomLineCap::SetAttributes(struct com::sun::star::rendering::StrokeAttributes &) drawinglayer/source/tools/emfpstringformat.hxx:51 @@ -112,12 +106,10 @@ 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> > > WrongList::begin() const editeng/inc/edtspell.hxx:113 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> > > WrongList::end() const -extensions/source/bibliography/general.hxx:160 - const class rtl::Reference<class BibGeneralPageFocusListener> & BibGeneralPage::GetFocusListener() +extensions/source/propctrlr/formcomponenthandler.hxx:449 + pcr::WaitCursor::WaitCursor(class vcl::Window *) extensions/source/scanner/scanner.hxx:81 void ScannerManager::SetData(void *) -framework/inc/jobs/jobresult.hxx:94 - framework::JobResult::JobResult() framework/source/uiconfiguration/ImageList.hxx:53 _Bool ImageList::operator!=(const class ImageList &) const hwpfilter/source/mzstring.h:99 @@ -404,17 +396,17 @@ include/comphelper/unique_disposing_ptr.hxx:46 type-parameter-?-? & comphelper::unique_disposing_ptr::operator*() const include/comphelper/unwrapargs.hxx:50 void comphelper::detail::unwrapArgs(const class com::sun::star::uno::Sequence<class com::sun::star::uno::Any> &,int,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &) -include/connectivity/dbcharset.hxx:139 +include/connectivity/dbcharset.hxx:138 const class dbtools::OCharsetMap::CharsetIterator & dbtools::OCharsetMap::CharsetIterator::operator--() include/connectivity/FValue.hxx:318 unsigned short connectivity::ORowSetValue::operator unsigned short() const include/connectivity/FValue.hxx:387 unsigned char connectivity::ORowSetValue::getUInt8() const -include/connectivity/sdbcx/VGroup.hxx:67 +include/connectivity/sdbcx/VGroup.hxx:63 connectivity::sdbcx::OGroup::OGroup(_Bool) -include/connectivity/sdbcx/VGroup.hxx:68 +include/connectivity/sdbcx/VGroup.hxx:64 connectivity::sdbcx::OGroup::OGroup(const class rtl::OUString &,_Bool) -include/connectivity/sqlparse.hxx:197 +include/connectivity/sqlparse.hxx:191 class rtl::OUString connectivity::OSQLParser::RuleIDToStr(unsigned int) include/desktop/crashreport.hxx:46 class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > CrashReporter::getIniFileName() @@ -444,7 +436,7 @@ include/formula/tokenarray.hxx:180 class formula::FormulaTokenArrayReferencesIterator formula::FormulaTokenArrayReferencesIterator::operator++(int) include/formula/tokenarray.hxx:571 basic_ostream<type-parameter-?-?, type-parameter-?-?> & formula::operator<<(basic_ostream<type-parameter-?-?, type-parameter-?-?> &,const class formula::FormulaTokenArray &) -include/i18nlangtag/languagetag.hxx:261 +include/i18nlangtag/languagetag.hxx:263 enum LanguageTag::ScriptType LanguageTag::getScriptType() const include/o3tl/any.hxx:155 class boost::optional<const struct o3tl::detail::Void> o3tl::tryAccess(const class com::sun::star::uno::Any &) @@ -522,10 +514,18 @@ include/svtools/ctrlbox.hxx:322 void SvtCalendarBox::set_sensitive(_Bool) include/svtools/DocumentToGraphicRenderer.hxx:106 _Bool DocumentToGraphicRenderer::isImpress() const -include/svx/checklbx.hxx:56 - void SvxCheckListBox::SetNormalStaticImage(const class Image &) +include/svx/checklbx.hxx:59 + void SvxCheckListBox::InsertEntry(const class rtl::OUString &,unsigned long,void *,enum SvLBoxButtonKind) +include/svx/checklbx.hxx:63 + void SvxCheckListBox::RemoveEntry(unsigned long) include/svx/checklbx.hxx:68 - void * SvxCheckListBox::GetSelectedEntryData() const + class rtl::OUString SvxCheckListBox::GetText(unsigned long) const +include/svx/checklbx.hxx:69 + unsigned long SvxCheckListBox::GetCheckedEntryCount() const +include/svx/checklbx.hxx:74 + void * SvxCheckListBox::SetEntryData(unsigned long,void *) +include/svx/checklbx.hxx:75 + void * SvxCheckListBox::GetEntryData(unsigned long) const include/svx/ClassificationEditView.hxx:41 void svx::ClassificationEditView::SetCharAttributes() include/svx/ClassificationEditView.hxx:47 @@ -542,8 +542,6 @@ include/svx/dlgctrl.hxx:283 void SvxLineEndLB::set_active_text(const class rtl::OUString &) include/svx/framelink.hxx:201 _Bool svx::frame::operator>(const class svx::frame::Style &,const class svx::frame::Style &) -include/svx/langbox.hxx:90 - void SvxLanguageBoxBase::ImplRemoveEntryAt(int) include/svx/svdlayer.hxx:75 _Bool SdrLayer::operator==(const class SdrLayer &) const include/svx/svdpntv.hxx:459 @@ -620,16 +618,6 @@ include/vcl/alpha.hxx:48 _Bool AlphaMask::operator!=(const class AlphaMask &) const include/vcl/animate.hxx:94 _Bool Animation::operator!=(const class Animation &) const -include/vcl/button.hxx:90 - void Button::SetFocusRect(const class tools::Rectangle &) -include/vcl/button.hxx:322 - void RadioButton::SetMouseRect(const class tools::Rectangle &) -include/vcl/button.hxx:323 - void RadioButton::SetStateRect(const class tools::Rectangle &) -include/vcl/button.hxx:327 - void RadioButton::DrawRadioButtonState(class OutputDevice &) -include/vcl/button.hxx:355 - const class Image & RadioButton::GetModeRadioImage() const include/vcl/commandevent.hxx:245 CommandMediaData::CommandMediaData(enum MediaCommand) include/vcl/commandevent.hxx:252 @@ -668,12 +656,14 @@ include/vcl/hatch.hxx:55 _Bool Hatch::operator!=(const class Hatch &) const include/vcl/inputctx.hxx:62 _Bool InputContext::operator!=(const class InputContext &) const -include/vcl/ITiledRenderable.hxx:287 +include/vcl/ITiledRenderable.hxx:238 enum PointerStyle vcl::ITiledRenderable::getPointer() include/vcl/opengl/OpenGLHelper.hxx:62 void OpenGLHelper::renderToFile(long,long,const class rtl::OUString &) include/vcl/opengl/OpenGLHelper.hxx:92 void OpenGLHelper::debugMsgStreamWarn(const class std::__cxx11::basic_ostringstream<char> &) +include/vcl/outdev.hxx:312 + struct _cairo_surface * get_underlying_alpha_cairo_surface(const class VirtualDevice &) include/vcl/pngread.hxx:56 void vcl::PNGReader::SetIgnoreGammaChunk(_Bool) include/vcl/salbtype.hxx:120 @@ -706,8 +696,8 @@ include/vcl/tabdlg.hxx:49 class vcl::Window * TabDialog::GetViewWindow() const include/vcl/textrectinfo.hxx:45 _Bool TextRectInfo::operator!=(const class TextRectInfo &) const -include/vcl/toolbox.hxx:347 - void ToolBox::SetPageScroll(_Bool) +include/vcl/treelistbox.hxx:618 + void SvTreeListBox::SetCheckButtonInvisible(class SvTreeListEntry *) include/vcl/txtattr.hxx:56 _Bool TextAttrib::operator!=(const class TextAttrib &) const include/vcl/uitest/uiobject.hxx:274 @@ -718,107 +708,103 @@ include/vcl/uitest/uiobject.hxx:345 SpinUIObject::SpinUIObject(const class VclPtr<class SpinButton> &) include/vcl/uitest/uiobject.hxx:353 class std::unique_ptr<class UIObject, struct std::default_delete<class UIObject> > SpinUIObject::create(class vcl::Window *) -include/vcl/vclmedit.hxx:166 - void VclMultiLineEdit::SetLeftMargin(unsigned short) include/vcl/wall.hxx:99 _Bool Wallpaper::operator!=(const class Wallpaper &) const -include/vcl/weld.hxx:103 +include/vcl/weld.hxx:107 class rtl::OString weld::Widget::get_buildable_name() const -include/vcl/weld.hxx:108 +include/vcl/weld.hxx:112 int weld::Widget::get_grid_left_attach() const -include/vcl/weld.hxx:114 +include/vcl/weld.hxx:118 _Bool weld::Widget::get_hexpand() const -include/vcl/weld.hxx:116 +include/vcl/weld.hxx:120 _Bool weld::Widget::get_vexpand() const -include/vcl/weld.hxx:222 +include/vcl/weld.hxx:231 void weld::ScrolledWindow::hadjustment_configure(int,int,int,int,int,int) -include/vcl/weld.hxx:228 +include/vcl/weld.hxx:237 void weld::ScrolledWindow::hadjustment_set_upper(int) -include/vcl/weld.hxx:230 +include/vcl/weld.hxx:239 void weld::ScrolledWindow::set_hpolicy(enum VclPolicyType) -include/vcl/weld.hxx:231 +include/vcl/weld.hxx:240 enum VclPolicyType weld::ScrolledWindow::get_hpolicy() const -include/vcl/weld.hxx:236 +include/vcl/weld.hxx:245 int weld::ScrolledWindow::get_hscroll_height() const -include/vcl/weld.hxx:244 +include/vcl/weld.hxx:253 void weld::ScrolledWindow::vadjustment_set_upper(int) -include/vcl/weld.hxx:247 +include/vcl/weld.hxx:256 void weld::ScrolledWindow::vadjustment_set_lower(int) -include/vcl/weld.hxx:277 +include/vcl/weld.hxx:286 class rtl::OUString weld::Notebook::get_tab_label_text(const class rtl::OString &) const -include/vcl/weld.hxx:310 +include/vcl/weld.hxx:319 struct SystemEnvData weld::Window::get_system_data() const -include/vcl/weld.hxx:547 - void weld::TreeView::append(class weld::TreeIter *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:556 +include/vcl/weld.hxx:562 + void weld::TreeView::append(const class weld::TreeIter *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &) +include/vcl/weld.hxx:571 void weld::TreeView::append(const class rtl::OUString &,const class rtl::OUString &,class VirtualDevice &) -include/vcl/weld.hxx:581 +include/vcl/weld.hxx:601 void weld::TreeView::set_top_entry(int) -include/vcl/weld.hxx:665 +include/vcl/weld.hxx:694 void weld::TreeView::select_all() -include/vcl/weld.hxx:675 +include/vcl/weld.hxx:704 enum TriState weld::TreeView::get_sort_indicator(int) const -include/vcl/weld.hxx:778 +include/vcl/weld.hxx:807 void weld::MenuButton::append_item(const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:786 +include/vcl/weld.hxx:815 void weld::MenuButton::append_item(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:790 +include/vcl/weld.hxx:819 void weld::MenuButton::append_item(const class rtl::OUString &,const class rtl::OUString &,class VirtualDevice &) -include/vcl/weld.hxx:820 +include/vcl/weld.hxx:850 class rtl::OUString weld::LinkButton::get_label() const -include/vcl/weld.hxx:822 +include/vcl/weld.hxx:852 class rtl::OUString weld::LinkButton::get_uri() const -include/vcl/weld.hxx:824 +include/vcl/weld.hxx:854 void weld::LinkButton::clicked() -include/vcl/weld.hxx:826 +include/vcl/weld.hxx:856 void weld::LinkButton::connect_clicked(const class Link<class weld::LinkButton &, void> &) -include/vcl/weld.hxx:855 +include/vcl/weld.hxx:885 class rtl::OUString weld::ProgressBar::get_text() const -include/vcl/weld.hxx:872 +include/vcl/weld.hxx:902 void weld::Entry::signal_insert_text(class rtl::OUString &) -include/vcl/weld.hxx:884 +include/vcl/weld.hxx:914 int weld::Entry::get_position() const -include/vcl/weld.hxx:946 - int weld::SpinButton::get_min() const -include/vcl/weld.hxx:988 +include/vcl/weld.hxx:1018 void weld::FormattedSpinButton::set_max(double) -include/vcl/weld.hxx:1036 +include/vcl/weld.hxx:1066 void weld::EntryTreeView::EntryModifyHdl(const class weld::Entry &) -include/vcl/weld.hxx:1269 +include/vcl/weld.hxx:1299 class Size weld::MetricSpinButton::get_size_request() const -include/vcl/weld.hxx:1280 +include/vcl/weld.hxx:1310 void weld::MetricSpinButton::set_position(int) -include/vcl/weld.hxx:1327 +include/vcl/weld.hxx:1357 _Bool weld::TimeSpinButton::get_sensitive() const -include/vcl/weld.hxx:1328 +include/vcl/weld.hxx:1358 _Bool weld::TimeSpinButton::get_visible() const -include/vcl/weld.hxx:1329 +include/vcl/weld.hxx:1359 void weld::TimeSpinButton::grab_focus() -include/vcl/weld.hxx:1330 +include/vcl/weld.hxx:1360 _Bool weld::TimeSpinButton::has_focus() const -include/vcl/weld.hxx:1331 +include/vcl/weld.hxx:1361 void weld::TimeSpinButton::show(_Bool) -include/vcl/weld.hxx:1332 +include/vcl/weld.hxx:1362 void weld::TimeSpinButton::hide() -include/vcl/weld.hxx:1333 +include/vcl/weld.hxx:1363 void weld::TimeSpinButton::save_value() -include/vcl/weld.hxx:1334 +include/vcl/weld.hxx:1364 _Bool weld::TimeSpinButton::get_value_changed_from_saved() const -include/vcl/weld.hxx:1383 +include/vcl/weld.hxx:1413 int weld::TextView::vadjustment_get_lower() const -include/vcl/weld.hxx:1447 +include/vcl/weld.hxx:1477 void weld::Menu::set_sensitive(const class rtl::OString &,_Bool) -include/vcl/weld.hxx:1448 +include/vcl/weld.hxx:1478 void weld::Menu::set_active(const class rtl::OString &,_Bool) -include/vcl/weld.hxx:1458 +include/vcl/weld.hxx:1488 void weld::Menu::append_check(const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:1462 +include/vcl/weld.hxx:1492 void weld::Menu::append(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:1478 +include/vcl/weld.hxx:1508 void weld::SizeGroup::set_mode(enum VclSizeGroupMode) -include/vcl/weld.hxx:1500 +include/vcl/weld.hxx:1530 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:1617 +include/vcl/weld.hxx:1647 class rtl::OUString weld::MessageDialogController::get_primary_text() const include/vcl/window.hxx:407 const char * ImplDbgCheckWindow(const void *) @@ -932,10 +918,6 @@ sc/source/filter/inc/xiescher.hxx:154 class Color XclImpDrawObjBase::GetSolidLineColor(const struct XclObjLineData &) const sc/source/filter/xml/xmltransformationi.hxx:160 ScXMLDateTimeContext::ScXMLDateTimeContext(class ScXMLImport &,const class rtl::Reference<class sax_fastparser::FastAttributeList> &) -sc/source/ui/inc/AccessibleSpreadsheet.hxx:235 - class tools::Rectangle ScAccessibleSpreadsheet::GetVisArea(class ScTabViewShell *,enum ScSplitPos) -sc/source/ui/inc/AccessibleSpreadsheet.hxx:236 - class tools::Rectangle ScAccessibleSpreadsheet::GetVisCells(const class tools::Rectangle &) sc/source/ui/inc/dataprovider.hxx:56 _Bool sc::CSVFetchThread::IsRequestedTerminate() sc/source/ui/inc/dataprovider.hxx:57 @@ -980,8 +962,6 @@ sd/source/ui/inc/unomodel.hxx:137 _Bool SdXImpressDocument::operator==(const class SdXImpressDocument &) const sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx:200 _Bool sd::slidesorter::view::InsertPosition::operator!=(const class sd::slidesorter::view::InsertPosition &) const -sdext/source/presenter/PresenterSpritePane.hxx:60 - const class std::shared_ptr<class sdext::presenter::PresenterSprite> & sdext::presenter::PresenterSpritePane::GetSprite() sfx2/source/appl/shutdownicon.hxx:82 class rtl::OUString ShutdownIcon::getShortcutName() sfx2/source/appl/shutdownicon.hxx:98 @@ -1196,20 +1176,6 @@ 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:244 WW8_BRCVer6::WW8_BRCVer6() -sw/source/uibase/inc/numfmtlb.hxx:94 - void SwNumFormatListBox::SetOneArea(_Bool) -sw/source/uibase/inc/numfmtlb.hxx:97 - enum SvNumFormatType SwNumFormatListBox::GetFormatType() const -sw/source/uibase/inc/numfmtlb.hxx:101 - struct o3tl::strong_int<unsigned short, struct LanguageTypeTag> SwNumFormatListBox::GetCurLanguage() const -sw/source/uibase/inc/numfmtlb.hxx:102 - void SwNumFormatListBox::SetLanguage(struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>) -sw/source/uibase/inc/numfmtlb.hxx:104 - void SwNumFormatListBox::SetAutomaticLanguage(_Bool) -sw/source/uibase/inc/numfmtlb.hxx:105 - _Bool SwNumFormatListBox::IsAutomaticLanguage() const -sw/source/uibase/inc/numfmtlb.hxx:107 - void SwNumFormatListBox::SetShowLanguageControl(_Bool) sw/source/uibase/inc/swcont.hxx:85 _Bool SwContent::operator==(const class SwContent &) const test/source/sheet/xsubtotalfield.cxx:28 diff --git a/compilerplugins/clang/unusedmethods.unused-returns.results b/compilerplugins/clang/unusedmethods.unused-returns.results index 1351b08554ea..7b04154cb03a 100644 --- a/compilerplugins/clang/unusedmethods.unused-returns.results +++ b/compilerplugins/clang/unusedmethods.unused-returns.results @@ -160,8 +160,6 @@ include/svl/macitem.hxx:92 class SvStream & SvxMacroTableDtor::Write(class SvStream &) const include/svl/poolitem.hxx:170 class SvStream & SfxPoolItem::Store(class SvStream &,unsigned short) const -include/svx/checklbx.hxx:76 - void * SvxCheckListBox::SetEntryData(unsigned long,void *) include/svx/dlgctrl.hxx:106 class Point SvxRectCtl::SetActualRPWithoutInvalidate(enum RectPoint) include/svx/framelink.hxx:195 @@ -192,7 +190,7 @@ include/vcl/bitmap.hxx:171 _Bool Bitmap::Dither() include/vcl/bitmapex.hxx:241 _Bool BitmapEx::Rotate(long,const class Color &) -include/vcl/filter/PngImageReader.hxx:31 +include/vcl/filter/PngImageReader.hxx:29 _Bool vcl::PngImageReader::read(class BitmapEx &) include/vcl/fontcharmap.hxx:49 class tools::SvRef<class FontCharMap> FontCharMap::GetDefaultMap(_Bool) @@ -208,13 +206,13 @@ include/vcl/menu.hxx:389 _Bool Menu::HandleMenuDeActivateEvent(class Menu *) const include/vcl/texteng.hxx:275 _Bool TextEngine::Read(class SvStream &,const class TextSelection *) -include/vcl/toolbox.hxx:513 +include/vcl/toolbox.hxx:510 _Bool ToolBox::ChangeHighlightUpDn(_Bool) -include/vcl/weld.hxx:342 +include/vcl/weld.hxx:356 _Bool weld::Dialog::runAsync(const class std::function<void (int)> &) -include/vcl/weld.hxx:628 +include/vcl/weld.hxx:656 _Bool weld::TreeView::iter_nth_child(class weld::TreeIter &,int) const -include/vcl/weld.hxx:1366 +include/vcl/weld.hxx:1396 _Bool weld::TextView::get_selection_bounds(int &,int &) lotuswordpro/inc/lwpsvstream.hxx:76 class LwpSvStream & LwpSvStream::ReadUInt8(unsigned char &) @@ -330,7 +328,7 @@ vcl/inc/opengl/salbmp.hxx:103 _Bool OpenGLSalBitmap::ImplScaleArea(const class rtl::Reference<class OpenGLContext> &,double,double) vcl/inc/opengl/texture.hxx:112 _Bool OpenGLTexture::CopyData(int,int,int,int,const unsigned char *) -vcl/inc/salframe.hxx:222 +vcl/inc/salframe.hxx:231 _Bool SalFrame::SetPluginParent(struct SystemParentData *) vcl/inc/salgdi.hxx:213 class basegfx::B2DPoint SalGraphics::mirror(const class basegfx::B2DPoint &,const class OutputDevice *) const diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index 955995bd0509..05a30b1a1b90 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.hxx @@ -436,24 +436,6 @@ namespace pcr }; - //= WaitCursor - - /** wrapper around a ->WaitObject which can cope with a NULL window - */ - class WaitCursor - { - private: - std::unique_ptr< WaitObject > m_aWaitObject; - - public: - explicit WaitCursor( vcl::Window* _pWindow ) - { - if ( _pWindow ) - m_aWaitObject.reset( new WaitObject( _pWindow ) ); - } - }; - - } // namespace pcr diff --git a/include/svx/checklbx.hxx b/include/svx/checklbx.hxx index 2253f5d2f3a6..a10e5b999b10 100644 --- a/include/svx/checklbx.hxx +++ b/include/svx/checklbx.hxx @@ -56,24 +56,13 @@ public: virtual ~SvxCheckListBox() override; virtual void dispose() override; - void InsertEntry ( const OUString& rStr, - sal_uLong nPos = TREELIST_APPEND, - void* pUserData = nullptr, - SvLBoxButtonKind eButtonKind = SvLBoxButtonKind::EnabledCheckbox ); - void RemoveEntry ( sal_uLong nPos ); - void SelectEntryPos ( sal_uLong nPos ); sal_uLong GetSelectedEntryPos () const; - OUString GetText ( sal_uLong nPos ) const; - sal_uLong GetCheckedEntryCount() const; void CheckEntryPos ( sal_uLong nPos, bool bCheck = true ); bool IsChecked ( sal_uLong nPos ) const; void ToggleCheckButton ( SvTreeListEntry* pEntry ); - void* SetEntryData ( sal_uLong nPos, void* pNewData ); - void* GetEntryData ( sal_uLong nPos ) const; - virtual void MouseButtonDown ( const MouseEvent& rMEvt ) override; virtual void KeyInput ( const KeyEvent& rKEvt ) override; }; diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 4beb600f3e02..8e79c0f646ee 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -309,8 +309,6 @@ class VCL_DLLPUBLIC OutputDevice : public virtual VclReferenceBase friend class WorkWindow; friend void ImplHandleResize( vcl::Window* pWindow, long nNewWidth, long nNewHeight ); - friend cairo_surface_t* get_underlying_alpha_cairo_surface(const VirtualDevice&); - private: OutputDevice(const OutputDevice&) = delete; OutputDevice& operator=(const OutputDevice&) = delete; diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx index c03f300d84a1..7031c0954acd 100644 --- a/include/vcl/treelistbox.hxx +++ b/include/vcl/treelistbox.hxx @@ -615,7 +615,6 @@ public: void SetDefaultCollapsedEntryBmp( const Image& rBmp ); void SetCheckButtonState( SvTreeListEntry*, SvButtonState ); - void SetCheckButtonInvisible( SvTreeListEntry* ); SvButtonState GetCheckButtonState( SvTreeListEntry* ) const; void SetEntryText(SvTreeListEntry*, const OUString& ); diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx index 335f9ae5740d..bec5b7fb2583 100644 --- a/svx/source/dialog/checklbx.cxx +++ b/svx/source/dialog/checklbx.cxx @@ -49,22 +49,6 @@ void SvxCheckListBox::Init_Impl() EnableCheckButton( pCheckButton.get() ); } -void SvxCheckListBox::InsertEntry( const OUString& rStr, sal_uLong nPos, - void* pUserData, - SvLBoxButtonKind eButtonKind ) -{ - SvTreeListBox::InsertEntry( rStr, nullptr, false, nPos, pUserData, - eButtonKind ); -} - - -void SvxCheckListBox::RemoveEntry( sal_uLong nPos ) -{ - if ( nPos < GetEntryCount() ) - SvTreeListBox::GetModel()->Remove( GetEntry( nPos ) ); -} - - void SvxCheckListBox::SelectEntryPos( sal_uLong nPos ) { if ( nPos < GetEntryCount() ) @@ -82,30 +66,6 @@ sal_uLong SvxCheckListBox::GetSelectedEntryPos() const } -OUString SvxCheckListBox::GetText( sal_uLong nPos ) const -{ - SvTreeListEntry* pEntry = GetEntry( nPos ); - - if ( pEntry ) - return GetEntryText( pEntry ); - return OUString(); -} - - -sal_uLong SvxCheckListBox::GetCheckedEntryCount() const -{ - sal_uLong nCheckCount = 0; - sal_uLong nCount = GetEntryCount(); - - for ( sal_uLong i = 0; i < nCount; ++i ) - { - if ( IsChecked( i ) ) - nCheckCount++; - } - return nCheckCount; -} - - void SvxCheckListBox::CheckEntryPos( sal_uLong nPos, bool bCheck ) { if ( nPos < GetEntryCount() ) @@ -122,28 +82,6 @@ bool SvxCheckListBox::IsChecked( sal_uLong nPos ) const } -void* SvxCheckListBox::SetEntryData ( sal_uLong nPos, void* pNewData ) -{ - void* pOld = nullptr; - - if ( nPos < GetEntryCount() ) - { - pOld = GetEntry( nPos )->GetUserData(); - GetEntry( nPos )->SetUserData( pNewData ); - } - return pOld; -} - - -void* SvxCheckListBox::GetEntryData( sal_uLong nPos ) const -{ - if ( nPos < GetEntryCount() ) - return GetEntry( nPos )->GetUserData(); - else - return nullptr; -} - - void SvxCheckListBox::ToggleCheckButton( SvTreeListEntry* pEntry ) { if ( pEntry ) diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx index f24ef9089694..1a2bb1e9d65f 100644 --- a/vcl/source/treelist/treelistbox.cxx +++ b/vcl/source/treelist/treelistbox.cxx @@ -1750,19 +1750,6 @@ void SvTreeListBox::SetCheckButtonState( SvTreeListEntry* pEntry, SvButtonState InvalidateEntry( pEntry ); } -void SvTreeListBox::SetCheckButtonInvisible( SvTreeListEntry* pEntry) -{ - SvLBoxButton* pItem = (nTreeFlags & SvTreeFlags::CHKBTN) ? - static_cast<SvLBoxButton*>(pEntry->GetFirstItem(SvLBoxItemType::Button)) : - nullptr; - - if (!pItem) - return; - - pItem->SetStateInvisible(); - InvalidateEntry(pEntry); -} - SvButtonState SvTreeListBox::GetCheckButtonState( SvTreeListEntry* pEntry ) const { SvButtonState eState = SvButtonState::Unchecked; commit 527977d5cac51a9edd522d675f0ccf575d2f2dc0 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Wed Mar 13 14:21:27 2019 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu Mar 14 08:48:04 2019 +0100 loplugin:unusedfields Change-Id: Id6792f0955a25533d33f6da6ed8c3e993f578c3f Reviewed-on: https://gerrit.libreoffice.org/69170 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx index cd78408c92b9..d91b36652883 100644 --- a/chart2/source/inc/MediaDescriptorHelper.hxx +++ b/chart2/source/inc/MediaDescriptorHelper.hxx @@ -52,12 +52,6 @@ public: //all properties given in the constructor are stored in the following three sequences - css::uno::Sequence< css::beans::PropertyValue > - m_aRegularProperties; //these are the properties which are described in service com.sun.star.document.MediaDescriptor and not marked as deprecated - - css::uno::Sequence< css::beans::PropertyValue > - m_aDeprecatedProperties; //these are properties which are described in service com.sun.star.document.MediaDescriptor but are marked as deprecated - //properties which should be given to a model are additionally stored in this sequence (not documented properties and deprecated properties are not included!) css::uno::Sequence< css::beans::PropertyValue > m_aModelProperties; //these are properties which are not described in service com.sun.star.document.MediaDescriptor diff --git a/chart2/source/tools/MediaDescriptorHelper.cxx b/chart2/source/tools/MediaDescriptorHelper.cxx index 8307bc38a31c..ab5de9574667 100644 --- a/chart2/source/tools/MediaDescriptorHelper.cxx +++ b/chart2/source/tools/MediaDescriptorHelper.cxx @@ -31,18 +31,20 @@ namespace apphelper MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< beans::PropertyValue > & rMediaDescriptor ) - : m_aRegularProperties(rMediaDescriptor.getLength()) - , m_aDeprecatedProperties(rMediaDescriptor.getLength()) - , m_aModelProperties(rMediaDescriptor.getLength()) + : m_aModelProperties(rMediaDescriptor.getLength()) { + css::uno::Sequence< css::beans::PropertyValue > + aRegularProperties(rMediaDescriptor.getLength()); //these are the properties which are described in service com.sun.star.document.MediaDescriptor and not marked as deprecated + css::uno::Sequence< css::beans::PropertyValue > + aDeprecatedProperties(rMediaDescriptor.getLength()); //these are properties which are described in service com.sun.star.document.MediaDescriptor but are marked as deprecated impl_init(); sal_Int32 nRegularCount = 0; sal_Int32 nDeprecatedCount = 0; sal_Int32 nModelCount = 0; - auto addRegularProp = [this, &nRegularCount](const beans::PropertyValue& rRegularProp) + auto addRegularProp = [&aRegularProperties, &nRegularCount](const beans::PropertyValue& rRegularProp) { - m_aRegularProperties[nRegularCount] = rRegularProp; + aRegularProperties[nRegularCount] = rRegularProp; ++nRegularCount; }; auto addModelProp = [this, &nModelCount, &addRegularProp](const beans::PropertyValue& rModelProp) @@ -51,9 +53,9 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< m_aModelProperties[nModelCount] = rModelProp; ++nModelCount; }; - auto addDepreciatedProp = [this, &nDeprecatedCount](const beans::PropertyValue& rDeprecatedProp) + auto addDepreciatedProp = [&aDeprecatedProperties, &nDeprecatedCount](const beans::PropertyValue& rDeprecatedProp) { - m_aDeprecatedProperties[nDeprecatedCount] = rDeprecatedProp; + aDeprecatedProperties[nDeprecatedCount] = rDeprecatedProp; ++nDeprecatedCount; }; @@ -236,8 +238,8 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< } } - m_aRegularProperties.realloc(nRegularCount); - m_aDeprecatedProperties.realloc(nDeprecatedCount); + aRegularProperties.realloc(nRegularCount); + aDeprecatedProperties.realloc(nDeprecatedCount); m_aModelProperties.realloc(nModelCount); } diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results index 86d82428863a..6e89b56e1fa0 100644 --- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results +++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results @@ -9,9 +9,9 @@ avmedia/source/vlc/wrapper/Types.hxx:44 avmedia/source/vlc/wrapper/Types.hxx:45 libvlc_event_t::(anonymous union)::(anonymous) dummy2 const char * avmedia/source/vlc/wrapper/Types.hxx:46 - libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/noel/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:43:7) + libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/noel/disk2/libo6/avmedia/source/vlc/wrapper/Types.hxx:43:7) avmedia/source/vlc/wrapper/Types.hxx:47 - libvlc_event_t u union (anonymous union at /media/noel/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:41:5) + libvlc_event_t u union (anonymous union at /media/noel/disk2/libo6/avmedia/source/vlc/wrapper/Types.hxx:41:5) avmedia/source/vlc/wrapper/Types.hxx:53 libvlc_track_description_t psz_name char * basegfx/source/polygon/b2dtrapezoid.cxx:202 @@ -28,12 +28,14 @@ canvas/workben/canvasdemo.cxx:82 DemoRenderer maColorWhite uno::Sequence<double> chart2/source/controller/accessibility/AccessibleChartShape.hxx:79 chart::AccessibleChartShape m_aShapeTreeInfo ::accessibility::AccessibleShapeTreeInfo -chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:392 - (anonymous namespace)::WrappedLineStyleProperty m_aDefaultValue class com::sun::star::uno::Any chart2/source/controller/inc/dlg_View3D.hxx:53 chart::View3DDialog m_aControllerLocker class chart::ControllerLockHelper chart2/source/controller/inc/RangeSelectionListener.hxx:63 chart::RangeSelectionListener m_aControllerLockGuard class chart::ControllerLockGuardUNO +chart2/source/inc/MediaDescriptorHelper.hxx:56 + apphelper::MediaDescriptorHelper m_aRegularProperties css::uno::Sequence<css::beans::PropertyValue> +chart2/source/inc/MediaDescriptorHelper.hxx:59 + apphelper::MediaDescriptorHelper m_aDeprecatedProperties css::uno::Sequence<css::beans::PropertyValue> connectivity/source/commontools/RowFunctionParser.cxx:374 connectivity::(anonymous namespace)::ExpressionGrammar::definition unaryFunction ::boost::spirit::rule<ScannerT> connectivity/source/commontools/RowFunctionParser.cxx:375 @@ -132,9 +134,11 @@ cppu/source/uno/check.cxx:138 (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3 cui/source/dialogs/colorpicker.cxx:719 cui::ColorPickerDialog m_aColorPrevious class cui::ColorPreviewControl -cui/source/factory/dlgfact.cxx:1386 +cui/source/factory/dlgfact.cxx:1357 SvxMacroAssignDialog m_aItems class SfxItemSet -cui/source/inc/cfgutil.hxx:227 +cui/source/inc/cfg.hxx:335 + SvxMenuEntriesListBox m_bIsInternalDrag _Bool +cui/source/inc/cfgutil.hxx:242 SvxScriptSelectorDialog m_aStylesInfo struct SfxStylesInfo_Impl cui/source/inc/cuitabarea.hxx:230 SvxAreaTabPage maFixed_ChangeType enum ChangeType @@ -148,8 +152,6 @@ cui/source/inc/tabstpge.hxx:90 SvxTabulatorTabPage m_aCenterWin class TabWin_Impl cui/source/inc/tabstpge.hxx:91 SvxTabulatorTabPage m_aDezWin class TabWin_Impl -cui/source/inc/treeopt.hxx:84 - OptionsNode m_sPageURL class rtl::OUString dbaccess/source/core/api/RowSet.hxx:111 dbaccess::ORowSet m_aURL class rtl::OUString dbaccess/source/core/api/RowSet.hxx:125 @@ -168,7 +170,7 @@ dbaccess/source/core/api/RowSet.hxx:460 dbaccess::ORowSetClone m_nFetchSize sal_Int32 dbaccess/source/core/api/RowSet.hxx:461 dbaccess::ORowSetClone m_bIsBookmarkable _Bool -dbaccess/source/core/dataaccess/connection.hxx:101 +dbaccess/source/core/dataaccess/connection.hxx:102 dbaccess::OConnection m_nInAppend std::atomic<std::size_t> drawinglayer/source/tools/emfphelperdata.hxx:153 emfplushelper::EmfPlusHelperData mnFrameRight sal_Int32 @@ -502,6 +504,8 @@ sc/inc/token.hxx:400 SingleDoubleRefModifier aDub struct ScComplexRefData sc/qa/unit/ucalc_column.cxx:104 aInputs aName const char * +sc/qa/unit/ucalc_formula.cxx:3011 + class Test * sc/source/core/data/document.cxx:1239 (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch const sc::AutoCalcSwitch sc/source/core/data/document.cxx:1240 @@ -532,14 +536,6 @@ sc/source/filter/xml/xmldrani.hxx:72 ScXMLDatabaseRangeContext bIsSelection _Bool sc/source/filter/xml/xmlexternaltabi.hxx:113 ScXMLExternalRefCellContext mnCellType sal_Int16 -sc/source/filter/xml/xmlfilti.hxx:157 - ScXMLDPFilterContext aOutputPosition class ScAddress -sc/source/filter/xml/xmlfilti.hxx:158 - ScXMLDPFilterContext aConditionSourceRangeAddress class ScRange -sc/source/filter/xml/xmlfilti.hxx:162 - ScXMLDPFilterContext bCopyOutputData _Bool -sc/source/filter/xml/xmlfilti.hxx:166 - ScXMLDPFilterContext bConditionSourceRange _Bool sc/source/filter/xml/xmltransformationi.hxx:155 ScXMLDateTimeContext aType class rtl::OUString sc/source/ui/inc/acredlin.hxx:51 @@ -601,12 +597,12 @@ sdext/source/pdfimport/pdfparse/pdfparse.cxx:262 sdext/source/pdfimport/pdfparse/pdfparse.cxx:262 PDFGrammar::definition simple_type rule<ScannerT> sdext/source/pdfimport/pdfparse/pdfparse.cxx:262 - PDFGrammar::definition null_object rule<ScannerT> -sdext/source/pdfimport/pdfparse/pdfparse.cxx:262 PDFGrammar::definition stringtype rule<ScannerT> sdext/source/pdfimport/pdfparse/pdfparse.cxx:262 PDFGrammar::definition boolean rule<ScannerT> sdext/source/pdfimport/pdfparse/pdfparse.cxx:262 + PDFGrammar::definition null_object rule<ScannerT> +sdext/source/pdfimport/pdfparse/pdfparse.cxx:262 PDFGrammar::definition name rule<ScannerT> sdext/source/pdfimport/pdfparse/pdfparse.cxx:262 PDFGrammar::definition stream rule<ScannerT> @@ -636,8 +632,6 @@ sdext/source/pdfimport/pdfparse/pdfparse.cxx:265 PDFGrammar::definition trailer rule<ScannerT> sdext/source/pdfimport/pdfparse/pdfparse.cxx:265 PDFGrammar::definition xref rule<ScannerT> -sfx2/source/bastyp/progress.cxx:53 - SfxProgress_Impl aStateText class rtl::OUString sfx2/source/doc/doctempl.cxx:117 DocTempl::DocTempl_EntryData_Impl mxObjShell const class SfxObjectShellLock slideshow/source/engine/animationnodes/animationbasenode.hxx:89 @@ -734,10 +728,8 @@ sw/source/core/layout/dbg_lay.cxx:170 SwImplEnterLeave nAction const enum DbgAction sw/source/core/text/inftxt.hxx:686 SwTextSlot aText class rtl::OUString -sw/source/core/text/porfld.cxx:140 +sw/source/core/text/porfld.cxx:141 SwFieldSlot aText class rtl::OUString -sw/source/filter/xml/xmltbli.cxx:382 - SwXMLTableCellContext_Impl mXmlId class rtl::OUString sw/source/ui/dbui/mmaddressblockpage.hxx:208 SwCustomizeAddressBlockDialog m_aTextFilter class TextFilter sw/source/uibase/docvw/romenu.hxx:35 @@ -812,15 +804,15 @@ vcl/inc/WidgetThemeLibrary.hxx:90 vcl::ControlDrawParameters eState enum ControlState vcl/inc/WidgetThemeLibrary.hxx:106 vcl::WidgetThemeLibrary_t nSize uint32_t -vcl/source/app/salvtables.cxx:2018 +vcl/source/app/salvtables.cxx:2041 SalInstanceEntry m_aTextFilter class (anonymous namespace)::WeldTextFilter -vcl/source/app/salvtables.cxx:3924 +vcl/source/app/salvtables.cxx:4013 SalInstanceComboBoxWithEdit m_aTextFilter class (anonymous namespace)::WeldTextFilter vcl/source/gdi/jobset.cxx:36 ImplOldJobSetupData cDeviceName char [32] vcl/source/gdi/jobset.cxx:37 ImplOldJobSetupData cPortName char [32] -vcl/unx/gtk3/gtk3gtkinst.cxx:2853 +vcl/unx/gtk3/gtk3gtkinst.cxx:2882 CrippledViewport viewport GtkViewport vcl/unx/gtk/a11y/atkhypertext.cxx:29 HyperLink atk_hyper_link const AtkHyperlink diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results index 1b27983bc34c..4c26af85692e 100644 --- a/compilerplugins/clang/unusedfields.readonly.results +++ b/compilerplugins/clang/unusedfields.readonly.results @@ -158,8 +158,6 @@ cppu/source/uno/check.cxx:134 (anonymous namespace)::Char3 c3 char cppu/source/uno/check.cxx:138 (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3 -cui/source/inc/cfgutil.hxx:109 - SfxConfigFunctionListBox aArr SfxGroupInfoArr_Impl cui/source/options/optcolor.cxx:255 ColorConfigWindow_Impl aModuleOptions class SvtModuleOptions cui/source/options/optpath.cxx:80 @@ -172,7 +170,7 @@ dbaccess/source/core/api/RowSetBase.hxx:96 dbaccess::ORowSetBase m_aErrors ::connectivity::SQLError dbaccess/source/core/dataaccess/documentcontainer.cxx:64 dbaccess::LocalNameApproval m_aErrors ::connectivity::SQLError -dbaccess/source/core/inc/ContentHelper.hxx:108 +dbaccess/source/core/inc/ContentHelper.hxx:109 dbaccess::OContentHelper m_aErrorHelper const ::connectivity::SQLError dbaccess/source/filter/hsqldb/parseschema.hxx:36 dbahsql::SchemaParser m_PrimaryKeys std::map<OUString, std::vector<OUString> > @@ -292,17 +290,17 @@ include/basic/sbstar.hxx:50 StarBASIC aErrorHdl Link<class StarBASIC *, _Bool> include/basic/sbstar.hxx:51 StarBASIC aBreakHdl Link<class StarBASIC *, enum BasicDebugFlags> -include/connectivity/DriversConfig.hxx:76 +include/connectivity/DriversConfig.hxx:75 connectivity::DriversConfig m_aNode connectivity::DriversConfig::OSharedConfigNode -include/connectivity/sdbcx/VCatalog.hxx:67 +include/connectivity/sdbcx/VCatalog.hxx:69 connectivity::sdbcx::OCatalog m_pGroups std::unique_ptr<OCollection> -include/connectivity/sdbcx/VDescriptor.hxx:56 +include/connectivity/sdbcx/VDescriptor.hxx:53 connectivity::sdbcx::ODescriptor m_aCase comphelper::UStringMixEqual -include/connectivity/sdbcx/VGroup.hxx:58 +include/connectivity/sdbcx/VGroup.hxx:54 connectivity::sdbcx::OGroup m_pUsers rtl::Reference<OUsers> -include/connectivity/sdbcx/VUser.hxx:56 +include/connectivity/sdbcx/VUser.hxx:54 connectivity::sdbcx::OUser m_pGroups rtl::Reference<OGroups> -include/connectivity/sqlparse.hxx:115 +include/connectivity/sqlparse.hxx:109 connectivity::OSQLParser_Data aErrors ::connectivity::SQLError include/drawinglayer/processor3d/defaultprocessor3d.hxx:94 drawinglayer::processor3d::DefaultProcessor3D maDrawinglayerOpt const class SvtOptionsDrawinglayer @@ -375,7 +373,7 @@ include/test/sheet/xnamedranges.hxx:49 include/test/sheet/xspreadsheets2.hxx:46 apitest::XSpreadsheets2 xDocument css::uno::Reference<css::sheet::XSpreadsheetDocument> include/unoidl/unoidl.hxx:443 - unoidl::ConstantValue union unoidl::ConstantValue::(anonymous at /media/noel/disk2/libo4/include/unoidl/unoidl.hxx:443:5) + unoidl::ConstantValue union unoidl::ConstantValue::(anonymous at /media/noel/disk2/libo6/include/unoidl/unoidl.hxx:443:5) include/unoidl/unoidl.hxx:444 unoidl::ConstantValue::(anonymous) booleanValue _Bool include/unoidl/unoidl.hxx:445 @@ -461,7 +459,7 @@ sal/rtl/uuid.cxx:65 sc/inc/compiler.hxx:126 ScRawToken::(anonymous union)::(anonymous) eItem const class ScTableRefToken::Item sc/inc/compiler.hxx:127 - ScRawToken::(anonymous) table const struct (anonymous struct at /media/noel/disk2/libo4/sc/inc/compiler.hxx:124:9) + ScRawToken::(anonymous) table const struct (anonymous struct at /media/noel/disk2/libo6/sc/inc/compiler.hxx:124:9) sc/inc/compiler.hxx:132 ScRawToken::(anonymous) pMat class ScMatrix *const sc/inc/formulagroup.hxx:39 @@ -664,6 +662,10 @@ sw/source/uibase/inc/dbtree.hxx:69 DBTreeList bShowColumns _Bool sw/source/uibase/inc/fldmgr.hxx:79 SwInsertField_Data m_aDBDataSource const css::uno::Any +sw/source/uibase/inc/numfmtlb.hxx:74 + SwNumFormatListBox bOneArea _Bool +sw/source/uibase/inc/numfmtlb.hxx:77 + SwNumFormatListBox bShowLanguageControl _Bool toolkit/source/awt/vclxtoolkit.cxx:435 (anonymous namespace)::VCLXToolkit mxSelection css::uno::Reference<css::datatransfer::clipboard::XClipboard> ucb/source/ucp/gio/gio_mount.hxx:46 @@ -722,9 +724,9 @@ vcl/inc/salwtype.hxx:202 SalSurroundingTextSelectionChangeEvent mnEnd const sal_uLong vcl/inc/salwtype.hxx:208 SalQueryCharPositionEvent mnCharPos sal_uLong -vcl/inc/svdata.hxx:281 +vcl/inc/svdata.hxx:285 ImplSVNWFData mbMenuBarDockingAreaCommonBG _Bool -vcl/inc/svdata.hxx:303 +vcl/inc/svdata.hxx:307 ImplSVNWFData mbRolloverMenubar _Bool vcl/inc/toolbox.h:108 vcl::ToolBoxLayoutData m_aLineItemIds std::vector<sal_uInt16> diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results index 890daa44f22b..1b714dc15d26 100644 --- a/compilerplugins/clang/unusedfields.untouched.results +++ b/compilerplugins/clang/unusedfields.untouched.results @@ -5,9 +5,9 @@ avmedia/source/vlc/wrapper/Types.hxx:44 avmedia/source/vlc/wrapper/Types.hxx:45 libvlc_event_t::(anonymous union)::(anonymous) dummy2 const char * avmedia/source/vlc/wrapper/Types.hxx:46 - libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/noel/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:43:7) + libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/noel/disk2/libo6/avmedia/source/vlc/wrapper/Types.hxx:43:7) avmedia/source/vlc/wrapper/Types.hxx:47 - libvlc_event_t u union (anonymous union at /media/noel/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:41:5) + libvlc_event_t u union (anonymous union at /media/noel/disk2/libo6/avmedia/source/vlc/wrapper/Types.hxx:41:5) avmedia/source/vlc/wrapper/Types.hxx:53 libvlc_track_description_t psz_name char * basctl/source/inc/dlged.hxx:122 @@ -22,8 +22,6 @@ canvas/source/vcl/impltools.hxx:117 vclcanvas::tools::LocalGuard aSolarGuard class SolarMutexGuard canvas/workben/canvasdemo.cxx:82 DemoRenderer maColorWhite uno::Sequence<double> -chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:392 - (anonymous namespace)::WrappedLineStyleProperty m_aDefaultValue class com::sun::star::uno::Any chart2/source/controller/dialogs/res_DataLabel.hxx:86 chart::DataLabelResources m_xDC_Dial std::unique_ptr<weld::CustomWeld> chart2/source/controller/dialogs/tp_AxisLabel.hxx:60 @@ -38,7 +36,7 @@ chart2/source/controller/dialogs/tp_TitleRotation.hxx:44 chart::SchAlignmentTabPage m_xFtTextDirection std::unique_ptr<weld::Label> chart2/source/controller/inc/RangeSelectionListener.hxx:63 chart::RangeSelectionListener m_aControllerLockGuard class chart::ControllerLockGuardUNO -comphelper/source/container/enumerablemap.cxx:298 +comphelper/source/container/enumerablemap.cxx:293 comphelper::MapEnumeration m_xKeepMapAlive Reference<class com::sun::star::uno::XInterface> connectivity/source/drivers/evoab2/EApi.h:122 (anonymous) address_format char * @@ -58,9 +56,11 @@ cui/source/dialogs/colorpicker.cxx:723 cui::ColorPickerDialog m_xColorPreview std::unique_ptr<weld::CustomWeld> cui/source/inc/align.hxx:92 svx::AlignmentTabPage m_xBoxDirection std::unique_ptr<weld::Widget> -cui/source/inc/cfg.hxx:574 +cui/source/inc/cfg.hxx:335 + SvxMenuEntriesListBox m_bIsInternalDrag _Bool +cui/source/inc/cfg.hxx:584 SvxNewToolbarDialog m_xBtnOK std::unique_ptr<weld::Button> -cui/source/inc/cfg.hxx:607 +cui/source/inc/cfg.hxx:617 SvxIconSelectorDialog m_xTbSymbolWin std::unique_ptr<weld::CustomWeld> cui/source/inc/cuicharmap.hxx:100 SvxCharacterMap m_xShowChar std::unique_ptr<weld::CustomWeld> @@ -108,13 +108,13 @@ cui/source/inc/transfrm.hxx:187 SvxAngleTabPage m_xCtlRect std::unique_ptr<weld::CustomWeld> cui/source/inc/transfrm.hxx:190 SvxAngleTabPage m_xCtlAngle std::unique_ptr<weld::CustomWeld> -cui/source/inc/treeopt.hxx:84 - OptionsNode m_sPageURL class rtl::OUString +cui/source/options/optgdlg.hxx:48 + OfaMiscTabPage m_xPrintDlgFrame std::unique_ptr<weld::Widget> dbaccess/source/sdbtools/inc/connectiondependent.hxx:116 sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard ::osl::MutexGuard -dbaccess/source/ui/dlg/advancedsettings.hxx:95 - dbaui::GeneratedValuesPage m_xAutoIncrementLabel std::unique_ptr<weld::Label> dbaccess/source/ui/dlg/advancedsettings.hxx:97 + dbaui::GeneratedValuesPage m_xAutoIncrementLabel std::unique_ptr<weld::Label> +dbaccess/source/ui/dlg/advancedsettings.hxx:99 dbaui::GeneratedValuesPage m_xAutoRetrievingLabel std::unique_ptr<weld::Label> dbaccess/source/ui/dlg/detailpages.hxx:63 dbaui::OCommonBehaviourTabPage m_xAutoRetrievingEnabled std::unique_ptr<weld::CheckButton> @@ -175,9 +175,9 @@ include/sfx2/msg.hxx:136 include/sfx2/msg.hxx:136 SfxType2 pType const std::type_info * include/sfx2/msg.hxx:136 - SfxType2 aAttrib struct SfxTypeAttrib [2] -include/sfx2/msg.hxx:136 SfxType2 nAttribs sal_uInt16 +include/sfx2/msg.hxx:136 + SfxType2 aAttrib struct SfxTypeAttrib [2] include/sfx2/msg.hxx:137 SfxType3 nAttribs sal_uInt16 include/sfx2/msg.hxx:137 @@ -205,10 +205,10 @@ include/sfx2/msg.hxx:139 include/sfx2/msg.hxx:140 SfxType6 pType const std::type_info * include/sfx2/msg.hxx:140 - SfxType6 aAttrib struct SfxTypeAttrib [6] -include/sfx2/msg.hxx:140 SfxType6 createSfxPoolItemFunc std::function<SfxPoolItem *(void)> include/sfx2/msg.hxx:140 + SfxType6 aAttrib struct SfxTypeAttrib [6] +include/sfx2/msg.hxx:140 SfxType6 nAttribs sal_uInt16 include/sfx2/msg.hxx:141 SfxType7 createSfxPoolItemFunc std::function<SfxPoolItem *(void)> @@ -247,9 +247,9 @@ include/sfx2/msg.hxx:146 include/sfx2/msg.hxx:146 SfxType13 aAttrib struct SfxTypeAttrib [13] include/sfx2/msg.hxx:146 - SfxType13 nAttribs sal_uInt16 -include/sfx2/msg.hxx:146 SfxType13 createSfxPoolItemFunc std::function<SfxPoolItem *(void)> +include/sfx2/msg.hxx:146 + SfxType13 nAttribs sal_uInt16 include/sfx2/msg.hxx:147 SfxType14 pType const std::type_info * include/sfx2/msg.hxx:147 @@ -259,12 +259,12 @@ include/sfx2/msg.hxx:147 include/sfx2/msg.hxx:147 SfxType14 nAttribs sal_uInt16 include/sfx2/msg.hxx:148 + SfxType16 aAttrib struct SfxTypeAttrib [16] +include/sfx2/msg.hxx:148 SfxType16 createSfxPoolItemFunc std::function<SfxPoolItem *(void)> include/sfx2/msg.hxx:148 SfxType16 nAttribs sal_uInt16 include/sfx2/msg.hxx:148 - SfxType16 aAttrib struct SfxTypeAttrib [16] -include/sfx2/msg.hxx:148 SfxType16 pType const std::type_info * include/sfx2/msg.hxx:149 SfxType17 aAttrib struct SfxTypeAttrib [17] @@ -414,6 +414,8 @@ sal/qa/osl/security/osl_Security.cxx:191 osl_Security::getConfigDir bRes1 _Bool sc/qa/unit/ucalc_column.cxx:104 aInputs aName const char * +sc/qa/unit/ucalc_formula.cxx:3011 + class Test * sc/source/core/data/document.cxx:1239 (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch const sc::AutoCalcSwitch sc/source/core/data/document.cxx:1240 @@ -438,6 +440,8 @@ sc/source/ui/inc/pvfundlg.hxx:83 ScDPFunctionDlg mxBtnOk std::unique_ptr<weld::Button> sc/source/ui/inc/pvfundlg.hxx:123 ScDPSubtotalDlg mxBtnOk std::unique_ptr<weld::Button> +sc/source/ui/inc/retypepassdlg.hxx:32 + PassFragment m_xSheetsBox std::unique_ptr<weld::Container> sc/source/ui/inc/scuiimoptdlg.hxx:63 ScImportOptionsDlg m_xBtnOk std::unique_ptr<weld::Button> sd/source/ui/animations/CustomAnimationDialog.cxx:1736 @@ -490,8 +494,6 @@ sdext/source/pdfimport/pdfparse/pdfparse.cxx:263 PDFGrammar::definition array rule<ScannerT> sdext/source/pdfimport/pdfparse/pdfparse.cxx:263 PDFGrammar::definition value rule<ScannerT> -sfx2/source/bastyp/progress.cxx:53 - SfxProgress_Impl aStateText class rtl::OUString sfx2/source/doc/doctempl.cxx:117 DocTempl::DocTempl_EntryData_Impl mxObjShell const class SfxObjectShellLock sfx2/source/inc/sfxpicklist.hxx:33 @@ -511,9 +513,9 @@ sfx2/source/view/viewfrm.cxx:165 slideshow/source/engine/opengl/TransitionImpl.cxx:1990 (anonymous namespace)::ThreeFloats z GLfloat slideshow/source/engine/opengl/TransitionImpl.cxx:1990 - (anonymous namespace)::ThreeFloats x GLfloat -slideshow/source/engine/opengl/TransitionImpl.cxx:1990 (anonymous namespace)::ThreeFloats y GLfloat +slideshow/source/engine/opengl/TransitionImpl.cxx:1990 + (anonymous namespace)::ThreeFloats x GLfloat starmath/inc/dialog.hxx:90 SmFontDialog m_xShowFont std::unique_ptr<weld::CustomWeld> starmath/inc/dialog.hxx:330 @@ -644,7 +646,7 @@ vcl/inc/WidgetThemeLibrary.hxx:90 vcl::ControlDrawParameters eState enum ControlState vcl/inc/WidgetThemeLibrary.hxx:106 vcl::WidgetThemeLibrary_t nSize uint32_t -vcl/source/app/salvtables.cxx:779 +vcl/source/app/salvtables.cxx:796 SalInstanceContainer m_xContainer VclPtr<vcl::Window> vcl/source/gdi/jobset.cxx:36 ImplOldJobSetupData cDeviceName char [32] @@ -656,7 +658,7 @@ vcl/unx/generic/print/prtsetup.hxx:73 RTSPaperPage m_xContainer std::unique_ptr<weld::Widget> vcl/unx/generic/print/prtsetup.hxx:108 RTSDevicePage m_xContainer std::unique_ptr<weld::Widget> -vcl/unx/gtk3/gtk3gtkinst.cxx:2853 +vcl/unx/gtk3/gtk3gtkinst.cxx:2882 CrippledViewport viewport GtkViewport vcl/unx/gtk/a11y/atkhypertext.cxx:29 HyperLink atk_hyper_link const AtkHyperlink diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results index 560915e7a789..c7d64f814105 100644 --- a/compilerplugins/clang/unusedfields.writeonly.results +++ b/compilerplugins/clang/unusedfields.writeonly.results @@ -238,7 +238,7 @@ dbaccess/source/ui/browser/dbloader.cxx:69 DBContentLoader m_xListener Reference<class com::sun::star::frame::XLoadEventListener> desktop/qa/desktop_lib/test_desktop_lib.cxx:199 DesktopLOKTest m_bModified _Bool -desktop/source/deployment/gui/dp_gui_updatedialog.hxx:154 +desktop/source/deployment/gui/dp_gui_updatedialog.hxx:153 dp_gui::UpdateDialog m_xExtensionManager css::uno::Reference<css::deployment::XExtensionManager> desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx:117 dp_gui::UpdateCommandEnv m_installThread ::rtl::Reference<UpdateInstallDialog::Thread> @@ -638,12 +638,6 @@ sc/source/filter/xml/xmldrani.hxx:72 ScXMLDatabaseRangeContext bIsSelection _Bool sc/source/filter/xml/xmlexternaltabi.hxx:113 ScXMLExternalRefCellContext mnCellType sal_Int16 -sc/source/filter/xml/xmlfilti.hxx:157 - ScXMLDPFilterContext aOutputPosition class ScAddress -sc/source/filter/xml/xmlfilti.hxx:162 - ScXMLDPFilterContext bCopyOutputData _Bool -sc/source/filter/xml/xmlfilti.hxx:166 - ScXMLDPFilterContext bConditionSourceRange _Bool sc/source/ui/docshell/externalrefmgr.cxx:163 (anonymous namespace)::RemoveFormulaCell mpCell class ScFormulaCell *const sc/source/ui/inc/AccessibleText.hxx:194 @@ -692,8 +686,6 @@ sd/source/ui/sidebar/MasterPageContainerProviders.hxx:136 sd::sidebar::TemplatePreviewProvider msURL const class rtl::OUString sd/source/ui/sidebar/SlideBackground.hxx:93 sd::sidebar::SlideBackground m_pContainer VclPtr<class VclVBox> -sd/source/ui/slideshow/slideshowviewimpl.hxx:219 - sd::SlideShowView maPresentationArea ::tools::Rectangle sfx2/source/appl/fileobj.hxx:37 SvFileObject mxDelMed tools::SvRef<SfxMedium> sfx2/source/dialog/filtergrouping.cxx:339 @@ -768,8 +760,6 @@ svl/source/misc/inethist.cxx:48 INetURLHistory_Impl::head_entry m_nMagic sal_uInt32 svl/source/undo/undo.cxx:312 svl::undo::impl::UndoManagerGuard m_aUndoActionsCleanup ::std::vector<std::unique_ptr<SfxUndoAction> > -svtools/source/dialogs/addresstemplate.cxx:437 - svt::AddressBookSourceDialogData nLastVisibleListIndex sal_Int32 svx/inc/sdr/overlay/overlaytools.hxx:41 drawinglayer::primitive2d::OverlayStaticRectanglePrimitive mfRotation const double svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx:46 @@ -848,8 +838,6 @@ sw/source/core/layout/dbg_lay.cxx:131 SwImplProtocol aVars std::vector<long> sw/source/core/text/porfld.hxx:59 SwFieldPortion m_nAttrFieldType sal_uInt16 -sw/source/core/unocore/unoidx.cxx:1536 - SwXDocumentIndexMark::Impl m_sCitaitonText class rtl::OUString sw/source/filter/html/swhtml.hxx:369 SwHTMLParser m_aOrphanedTableBoxes std::vector<std::unique_ptr<SwTableBox> > sw/source/filter/inc/rtf.hxx:28 @@ -859,9 +847,7 @@ sw/source/filter/inc/rtf.hxx:29 sw/source/filter/inc/rtf.hxx:30 RTFSurround::(anonymous union)::(anonymous) nJunk sal_uInt8 sw/source/filter/inc/rtf.hxx:31 - RTFSurround::(anonymous) Flags struct (anonymous struct at /media/noel/disk2/libo4/sw/source/filter/inc/rtf.hxx:27:9) -sw/source/filter/xml/xmltbli.cxx:382 - SwXMLTableCellContext_Impl mXmlId class rtl::OUString + RTFSurround::(anonymous) Flags struct (anonymous struct at /media/noel/disk2/libo6/sw/source/filter/inc/rtf.hxx:27:9) sw/source/ui/frmdlg/frmpage.cxx:716 (anonymous namespace)::FrameMaps pMap const struct FrameMap * sw/source/ui/frmdlg/frmpage.cxx:775 @@ -988,7 +974,7 @@ vcl/inc/salwtype.hxx:247 SalSwipeEvent mnVelocityY double vcl/inc/sft.hxx:462 vcl::TrueTypeFont mapper sal_uInt32 (*)(const sal_uInt8 *, sal_uInt32, sal_uInt32) -vcl/inc/svdata.hxx:411 +vcl/inc/svdata.hxx:415 ImplSVEvent mpInstanceRef VclPtr<vcl::Window> vcl/inc/unx/gtk/gtkframe.hxx:88 GtkSalFrame::IMHandler::PreviousKeyPress window GdkWindow * diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index dd9219cd0b07..62288ab3a756 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -925,7 +925,6 @@ SvxMenuEntriesListBox::SvxMenuEntriesListBox(std::unique_ptr<weld::TreeView> xCo : m_xControl(std::move(xControl)) , m_xDropDown(m_xControl->create_virtual_device()) , pPage(pPg) - , m_bIsInternalDrag( false ) { CreateDropDown(); m_xControl->connect_key_press(LINK(this, SvxMenuEntriesListBox, KeyInputHdl)); diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 3ac0d4904384..8ae11c40271d 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -332,7 +332,6 @@ protected: std::unique_ptr<weld::TreeView> m_xControl; ScopedVclPtr<VirtualDevice> m_xDropDown; VclPtr<SvxConfigPage> pPage; - bool m_bIsInternalDrag; public: SvxMenuEntriesListBox(std::unique_ptr<weld::TreeView> xControl, SvxConfigPage* pPage); diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx index 358cf2babc3f..15749c65ec84 100644 --- a/sw/source/uibase/inc/numfmtlb.hxx +++ b/sw/source/uibase/inc/numfmtlb.hxx @@ -71,11 +71,8 @@ class SW_DLLPUBLIC SwNumFormatListBox SvNumFormatType nCurrFormatType; bool mbCurrFormatTypeNeedsInit; sal_Int32 nStdEntry; - bool bOneArea; sal_uInt32 nDefFormat; LanguageType eCurLanguage; - bool bShowLanguageControl; //determine whether the language control has - //to be shown in the number format dialog bool bUseAutomaticLanguage;//determine whether language is automatically assigned std::unique_ptr<weld::ComboBox> mxControl; diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx index d1748e953da9..a7766a505a1b 100644 --- a/sw/source/uibase/utlui/numfmtlb.cxx +++ b/sw/source/uibase/utlui/numfmtlb.cxx @@ -458,9 +458,7 @@ SwNumFormatListBox::SwNumFormatListBox(std::unique_ptr<weld::ComboBox> xControl) : nCurrFormatType(SvNumFormatType::ALL) , mbCurrFormatTypeNeedsInit(true) , nStdEntry(0) - , bOneArea(false) , nDefFormat(0) - , bShowLanguageControl(false) , bUseAutomaticLanguage(true) , mxControl(std::move(xControl)) { @@ -716,9 +714,9 @@ void SwNumFormatListBox::CallSelectHdl() SID_ATTR_NUMBERFORMAT_INFO ) ); if( (SvNumFormatType::DATE | SvNumFormatType::TIME) & nCurrFormatType ) - aCoreSet.Put(SfxBoolItem(SID_ATTR_NUMBERFORMAT_ONE_AREA, bOneArea)); + aCoreSet.Put(SfxBoolItem(SID_ATTR_NUMBERFORMAT_ONE_AREA, false)); - aCoreSet.Put(SfxBoolItem(SID_ATTR_NUMBERFORMAT_NOLANGUAGE, !bShowLanguageControl)); + aCoreSet.Put(SfxBoolItem(SID_ATTR_NUMBERFORMAT_NOLANGUAGE, true)); aCoreSet.Put(SfxBoolItem(SID_ATTR_NUMBERFORMAT_ADD_AUTO, bUseAutomaticLanguage)); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); @@ -747,11 +745,7 @@ void SwNumFormatListBox::CallSelectHdl() // SetDefFormat uses eCurLanguage to look for if this format already in the list SetDefFormat(nNumberFormat); } - if( bShowLanguageControl && SfxItemState::SET == pOutSet->GetItemState( - SID_ATTR_NUMBERFORMAT_ADD_AUTO, false, &pItem )) - { - bUseAutomaticLanguage = static_cast<const SfxBoolItem*>(pItem)->GetValue(); - } + } else SetDefFormat(nFormat); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits