compilerplugins/clang/unusedmethods.results | 154 ++++---- compilerplugins/clang/unusedmethods.unused-returns.results | 52 +- include/svtools/calendar.hxx | 1 include/vcl/lstbox.hxx | 2 sfx2/source/control/thumbnailviewacc.cxx | 25 - sfx2/source/control/thumbnailviewacc.hxx | 4 svtools/source/contnr/imivctl.hxx | 4 svtools/source/contnr/imivctl1.cxx | 241 ------------- svtools/source/control/calendar.cxx | 8 sw/source/core/access/accpara.cxx | 34 - sw/source/core/access/accpara.hxx | 2 vcl/source/control/listbox.cxx | 5 12 files changed, 106 insertions(+), 426 deletions(-)
New commits: commit 70a60cece0666b226c4f36d87d85ec9841bfb67c Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Fri Nov 16 21:26:21 2018 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Sat Nov 17 07:31:54 2018 +0100 loplugin:unusedmethods most of the removal is ripple effect from removing SvxIconChoiceCtrl_Impl::EditEntry which became dead after commit 630b5db9a10cd49d24d5e563374bd68f1fe670f5 Date: Tue Nov 13 08:40:07 2018 +0200 loplugin:singlevalfields in svtools Change-Id: Ibfaa7c925cc5549a4858cc62c59d848aab72f460 Reviewed-on: https://gerrit.libreoffice.org/63481 Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> Tested-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results index 33a9408b48b0..8615e583236e 100644 --- a/compilerplugins/clang/unusedmethods.results +++ b/compilerplugins/clang/unusedmethods.results @@ -72,10 +72,6 @@ desktop/inc/lib/init.hxx:49 _Bool desktop::CallbackFlushHandler::isPartTilePainting() const drawinglayer/source/tools/emfpcustomlinecap.hxx:37 void emfplushelper::EMFPCustomLineCap::SetAttributes(struct com::sun::star::rendering::StrokeAttributes &) -drawinglayer/source/tools/emfpfont.hxx:38 - _Bool emfplushelper::EMFPFont::Underline() const -drawinglayer/source/tools/emfpfont.hxx:39 - _Bool emfplushelper::EMFPFont::Strikeout() const drawinglayer/source/tools/emfppen.hxx:71 void emfplushelper::EMFPPen::SetStrokeWidth(struct com::sun::star::rendering::StrokeAttributes &,const struct emfplushelper::EmfPlusHelperData &,const class basegfx::B2DHomMatrix &) drawinglayer/source/tools/emfppen.hxx:73 @@ -96,8 +92,6 @@ drawinglayer/source/tools/emfpstringformat.hxx:57 _Bool emfplushelper::EMFPStringFormat::NoClip() const drawinglayer/source/tools/emfpstringformat.hxx:58 _Bool emfplushelper::EMFPStringFormat::BypassGDI() const -editeng/inc/editdoc.hxx:432 - _Bool TextPortion::HasValidSize() const 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 @@ -522,12 +516,6 @@ include/o3tl/typed_flags_set.hxx:348 typename typed_flags<type-parameter-?-?>::Self operator^=(type-parameter-?-? &,typename typed_flags<type-parameter-?-?>::Wrap) include/o3tl/vector_pool.hxx:83 o3tl::detail::struct_from_value::type::type() -include/oox/core/filterbase.hxx:136 - const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> & oox::core::FilterBase::getParentShape() const -include/oox/drawingml/shape.hxx:184 - void oox::drawingml::Shape::addChildren(class oox::core::XmlFilterBase &,const class oox::drawingml::Theme *,const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShapes> &,const class basegfx::B2DHomMatrix &) -include/oox/drawingml/shape.hxx:190 - void oox::drawingml::Shape::setXShape(const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> &) include/oox/helper/containerhelper.hxx:51 _Bool oox::ValueRange::operator!=(const struct oox::ValueRange &) const include/oox/helper/containerhelper.hxx:99 @@ -572,10 +560,12 @@ include/sfx2/msg.hxx:120 const class std::type_info * SfxType0::Type() const include/sfx2/sidebar/Context.hxx:55 _Bool sfx2::sidebar::Context::operator==(const class sfx2::sidebar::Context &) const -include/svl/itempool.hxx:167 +include/svl/itempool.hxx:162 const type-parameter-?-? * SfxItemPool::GetItem2Default(TypedWhichId<type-parameter-?-?>) const -include/svl/itempool.hxx:196 +include/svl/itempool.hxx:191 void SfxItemPool::dumpAsXml(struct _xmlTextWriter *) const +include/svtools/calendar.hxx:195 + void Calendar::ImplInvertDropPos() include/svtools/ctrlbox.hxx:208 long LineListBox::GetWidth() const include/svx/ClassificationEditView.hxx:41 @@ -586,11 +576,11 @@ include/svx/ClassificationField.hxx:48 const class rtl::OUString & svx::ClassificationResult::getDisplayText() const include/svx/ClassificationField.hxx:53 _Bool svx::ClassificationResult::operator==(const class svx::ClassificationResult &) const -include/svx/dlgctrl.hxx:272 +include/svx/dlgctrl.hxx:267 void SvxLineLB::set_sensitive(_Bool) -include/svx/dlgctrl.hxx:273 +include/svx/dlgctrl.hxx:268 _Bool SvxLineLB::get_sensitive() const -include/svx/dlgctrl.hxx:295 +include/svx/dlgctrl.hxx:290 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 &) @@ -646,7 +636,7 @@ include/tools/poly.hxx:162 _Bool tools::Polygon::operator!=(const class tools::Polygon &) const include/tools/poly.hxx:249 _Bool tools::PolyPolygon::operator!=(const class tools::PolyPolygon &) const -include/tools/stream.hxx:511 +include/tools/stream.hxx:508 class rtl::OString read_uInt32_lenPrefixed_uInt8s_ToOString(class SvStream &) include/tools/weakbase.h:101 _Bool tools::WeakReference::operator==(const type-parameter-?-? *) const @@ -674,7 +664,7 @@ include/vcl/commandevent.hxx:272 CommandSwipeData::CommandSwipeData() include/vcl/commandevent.hxx:289 CommandLongPressData::CommandLongPressData() -include/vcl/cursor.hxx:96 +include/vcl/cursor.hxx:95 _Bool vcl::Cursor::operator!=(const class vcl::Cursor &) const include/vcl/customweld.hxx:71 void weld::CustomWidgetController::SetAccessibleName(const class rtl::OUString &) @@ -702,6 +692,8 @@ include/vcl/inputctx.hxx:63 _Bool InputContext::operator!=(const class InputContext &) const include/vcl/ITiledRenderable.hxx:288 class Pointer vcl::ITiledRenderable::getPointer() +include/vcl/lstbox.hxx:140 + long ListBox::CalcWindowSizePixel(unsigned short) const include/vcl/opengl/OpenGLHelper.hxx:61 void OpenGLHelper::renderToFile(long,long,const class rtl::OUString &) include/vcl/opengl/OpenGLHelper.hxx:91 @@ -728,7 +720,7 @@ include/vcl/settings.hxx:495 void StyleSettings::SetSpinSize(long) include/vcl/settings.hxx:654 _Bool HelpSettings::operator!=(const class HelpSettings &) const -include/vcl/settings.hxx:708 +include/vcl/settings.hxx:709 _Bool AllSettings::operator!=(const class AllSettings &) const include/vcl/svapp.hxx:178 ApplicationEvent::ApplicationEvent(enum ApplicationEvent::Type,const class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &) @@ -746,91 +738,93 @@ include/vcl/threadex.hxx:98 vcl::solarthread::detail::GenericSolarThreadExecutor::GenericSolarThreadExecutor<type-parameter-?-?, void>(const type-parameter-?-? &) include/vcl/txtattr.hxx:57 _Bool TextAttrib::operator!=(const class TextAttrib &) const -include/vcl/uitest/uiobject.hxx:272 +include/vcl/uitest/uiobject.hxx:273 TabPageUIObject::TabPageUIObject(const class VclPtr<class TabPage> &) -include/vcl/uitest/uiobject.hxx:280 +include/vcl/uitest/uiobject.hxx:281 class std::unique_ptr<class UIObject, struct std::default_delete<class UIObject> > TabPageUIObject::create(class vcl::Window *) -include/vcl/uitest/uiobject.hxx:343 +include/vcl/uitest/uiobject.hxx:344 SpinUIObject::SpinUIObject(const class VclPtr<class SpinButton> &) -include/vcl/uitest/uiobject.hxx:351 +include/vcl/uitest/uiobject.hxx:352 class std::unique_ptr<class UIObject, struct std::default_delete<class UIObject> > SpinUIObject::create(class vcl::Window *) include/vcl/wall.hxx:98 _Bool Wallpaper::operator!=(const class Wallpaper &) const -include/vcl/weld.hxx:72 +include/vcl/weld.hxx:74 class rtl::OString weld::Widget::get_buildable_name() const -include/vcl/weld.hxx:77 +include/vcl/weld.hxx:79 int weld::Widget::get_grid_left_attach() const -include/vcl/weld.hxx:83 +include/vcl/weld.hxx:85 _Bool weld::Widget::get_hexpand() const -include/vcl/weld.hxx:84 +include/vcl/weld.hxx:86 void weld::Widget::set_vexpand(_Bool) -include/vcl/weld.hxx:85 +include/vcl/weld.hxx:87 _Bool weld::Widget::get_vexpand() const -include/vcl/weld.hxx:147 +include/vcl/weld.hxx:149 void weld::ScrolledWindow::vadjustment_set_upper(int) -include/vcl/weld.hxx:148 +include/vcl/weld.hxx:150 void weld::ScrolledWindow::set_hpolicy(enum VclPolicyType) -include/vcl/weld.hxx:149 +include/vcl/weld.hxx:151 enum VclPolicyType weld::ScrolledWindow::get_hpolicy() const -include/vcl/weld.hxx:179 +include/vcl/weld.hxx:181 class rtl::OUString weld::Notebook::get_tab_label_text(const class rtl::OString &) const -include/vcl/weld.hxx:213 +include/vcl/weld.hxx:215 struct SystemEnvData weld::Window::get_system_data() const -include/vcl/weld.hxx:393 +include/vcl/weld.hxx:395 void weld::TreeView::append(const class rtl::OUString &,const class rtl::OUString &,class VirtualDevice &) -include/vcl/weld.hxx:406 +include/vcl/weld.hxx:408 void weld::TreeView::set_top_entry(int) -include/vcl/weld.hxx:437 +include/vcl/weld.hxx:439 void weld::TreeView::select_all() -include/vcl/weld.hxx:529 +include/vcl/weld.hxx:531 void weld::MenuButton::append_item(const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:537 +include/vcl/weld.hxx:539 void weld::MenuButton::append_item(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:541 +include/vcl/weld.hxx:543 void weld::MenuButton::append_item(const class rtl::OUString &,const class rtl::OUString &,class VirtualDevice &) -include/vcl/weld.hxx:594 +include/vcl/weld.hxx:596 void weld::Entry::signal_insert_text(class rtl::OUString &) -include/vcl/weld.hxx:606 +include/vcl/weld.hxx:608 int weld::Entry::get_position() const -include/vcl/weld.hxx:666 +include/vcl/weld.hxx:668 int weld::SpinButton::get_min() const -include/vcl/weld.hxx:943 +include/vcl/weld.hxx:710 + void weld::FormattedSpinButton::set_max(double) +include/vcl/weld.hxx:969 class Size weld::MetricSpinButton::get_size_request() const -include/vcl/weld.hxx:954 +include/vcl/weld.hxx:980 void weld::MetricSpinButton::set_position(int) -include/vcl/weld.hxx:1001 +include/vcl/weld.hxx:1027 _Bool weld::TimeSpinButton::get_sensitive() const -include/vcl/weld.hxx:1002 +include/vcl/weld.hxx:1028 _Bool weld::TimeSpinButton::get_visible() const -include/vcl/weld.hxx:1003 +include/vcl/weld.hxx:1029 void weld::TimeSpinButton::grab_focus() -include/vcl/weld.hxx:1004 +include/vcl/weld.hxx:1030 _Bool weld::TimeSpinButton::has_focus() const -include/vcl/weld.hxx:1005 +include/vcl/weld.hxx:1031 void weld::TimeSpinButton::show(_Bool) -include/vcl/weld.hxx:1006 +include/vcl/weld.hxx:1032 void weld::TimeSpinButton::hide() -include/vcl/weld.hxx:1007 +include/vcl/weld.hxx:1033 void weld::TimeSpinButton::save_value() -include/vcl/weld.hxx:1008 +include/vcl/weld.hxx:1034 _Bool weld::TimeSpinButton::get_value_changed_from_saved() const -include/vcl/weld.hxx:1099 +include/vcl/weld.hxx:1125 void weld::DrawingArea::connect_key_release(const class Link<const class KeyEvent &, _Bool> &) -include/vcl/weld.hxx:1126 +include/vcl/weld.hxx:1152 void weld::Menu::set_active(const class rtl::OString &,_Bool) -include/vcl/weld.hxx:1136 +include/vcl/weld.hxx:1162 void weld::Menu::append_check(const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:1140 +include/vcl/weld.hxx:1166 void weld::Menu::append(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:1156 +include/vcl/weld.hxx:1182 void weld::SizeGroup::set_mode(enum VclSizeGroupMode) -include/vcl/weld.hxx:1178 +include/vcl/weld.hxx:1204 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:1286 +include/vcl/weld.hxx:1314 class rtl::OUString weld::MessageDialogController::get_primary_text() const include/vcl/window.hxx:430 const char * ImplDbgCheckWindow(const void *) -include/vcl/window.hxx:1239 +include/vcl/window.hxx:1241 class Size vcl::Window::PaintActiveFloatingWindow(class VirtualDevice &) const libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx:35 void openLokDialog(struct _GtkWidget *,void *) @@ -842,13 +836,11 @@ o3tl/qa/cow_wrapper_clients.hxx:142 _Bool o3tltests::cow_wrapper_client4::operator<(const class o3tltests::cow_wrapper_client4 &) const o3tl/qa/cow_wrapper_clients.hxx:193 _Bool o3tltests::cow_wrapper_client5::operator!=(const class o3tltests::cow_wrapper_client5 &) const -oox/inc/drawingml/diagram/diagram.hxx:45 - void oox::drawingml::loadDiagram(const class std::shared_ptr<class oox::drawingml::Shape> &,class oox::core::XmlFilterBase &,const class com::sun::star::uno::Reference<class com::sun::star::xml::dom::XDocument> &,const class com::sun::star::uno::Reference<class com::sun::star::xml::dom::XDocument> &,const class com::sun::star::uno::Reference<class com::sun::star::xml::dom::XDocument> &,const class com::sun::star::uno::Reference<class com::sun::star::xml::dom::XDocument> &) oox/inc/drawingml/textliststyle.hxx:49 void oox::drawingml::TextListStyle::dump() const oox/inc/drawingml/textparagraphproperties.hxx:100 void oox::drawingml::TextParagraphProperties::setLineSpacing(const class oox::drawingml::TextSpacing &) -sc/inc/address.hxx:651 +sc/inc/address.hxx:652 _Bool ScRange::operator<=(const class ScRange &) const sc/inc/bigrange.hxx:73 _Bool ScBigAddress::operator!=(const class ScBigAddress &) const @@ -862,7 +854,7 @@ sc/inc/datamapper.hxx:83 void sc::ExternalDataSource::setProvider(const class rtl::OUString &) sc/inc/dpfilteredcache.hxx:143 void ScDPFilteredCache::dump() const -sc/inc/formulacell.hxx:459 +sc/inc/formulacell.hxx:483 void ScFormulaCell::Dump() const sc/inc/formulagroup.hxx:141 void sc::FormulaGroupInterpreter::enableOpenCL_UnitTestsOnly() @@ -902,15 +894,15 @@ sc/qa/unit/ucalc.hxx:528 void Test::testCondFormatListenToOwnRange() sc/source/core/inc/interpre.hxx:73 basic_ostream<type-parameter-?-?, type-parameter-?-?> & sc::operator<<(basic_ostream<type-parameter-?-?, type-parameter-?-?> &,const struct sc::ParamIfsResult &) -sc/source/core/opencl/formulagroupcl.cxx:907 +sc/source/core/opencl/formulagroupcl.cxx:914 void sc::opencl::DynamicKernelMixedArgument::GenNumDeclRef(class std::__cxx11::basic_stringstream<char> &) const -sc/source/core/opencl/formulagroupcl.cxx:1254 +sc/source/core/opencl/formulagroupcl.cxx:1261 unsigned long sc::opencl::ParallelReductionVectorRef::GetArrayLength() const -sc/source/core/opencl/formulagroupcl.cxx:1256 +sc/source/core/opencl/formulagroupcl.cxx:1263 unsigned long sc::opencl::ParallelReductionVectorRef::GetWindowSize() const -sc/source/core/opencl/formulagroupcl.cxx:1258 +sc/source/core/opencl/formulagroupcl.cxx:1265 _Bool sc::opencl::ParallelReductionVectorRef::GetStartFixed() const -sc/source/core/opencl/formulagroupcl.cxx:1260 +sc/source/core/opencl/formulagroupcl.cxx:1267 _Bool sc::opencl::ParallelReductionVectorRef::GetEndFixed() const sc/source/core/opencl/op_statistical.hxx:204 sc::opencl::OpGeoMean::OpGeoMean() @@ -928,7 +920,7 @@ sc/source/filter/inc/xestream.hxx:103 class XclExpStream & XclExpStream::operator<<(float) sc/source/filter/inc/xiescher.hxx:154 class Color XclImpDrawObjBase::GetSolidLineColor(const struct XclObjLineData &) const -sc/source/filter/xml/xmltransformationi.hxx:160 +sc/source/filter/xml/xmltransformationi.hxx:161 ScXMLDateTimeContext::ScXMLDateTimeContext(class ScXMLImport &,const class rtl::Reference<class sax_fastparser::FastAttributeList> &) sc/source/ui/inc/dataprovider.hxx:56 _Bool sc::CSVFetchThread::IsRequestedTerminate() @@ -984,6 +976,8 @@ sfx2/source/appl/shutdownicon.hxx:115 class rtl::OUString ShutdownIcon::GetUrlDescription(const class rtl::OUString &) sfx2/source/appl/shutdownicon.hxx:117 void ShutdownIcon::SetVeto(_Bool) +sfx2/source/control/thumbnailviewacc.hxx:183 + void ThumbnailViewItemAcc::FireAccessibleEvent(short,const class com::sun::star::uno::Any &,const class com::sun::star::uno::Any &) slideshow/source/engine/activities/activitiesfactory.cxx:173 void slideshow::internal::(anonymous namespace)::FromToByActivity::startAnimation() slideshow/source/engine/activities/activitiesfactory.cxx:242 @@ -1022,6 +1016,10 @@ svgio/inc/svgstyleattributes.hxx:346 class svgio::svgreader::SvgNumber svgio::svgreader::SvgStyleAttributes::getStrokeDashOffset() const svgio/inc/svgstyleattributes.hxx:370 enum svgio::svgreader::FontStretch svgio::svgreader::SvgStyleAttributes::getFontStretch() const +svtools/source/contnr/imivctl.hxx:416 + _Bool SvxIconChoiceCtrl_Impl::IsTextHit(class SvxIconChoiceCtrlEntry *,const class Point &) +svtools/source/contnr/imivctl.hxx:429 + void SvxIconChoiceCtrl_Impl::EditEntry(class SvxIconChoiceCtrlEntry *) svx/inc/sdr/contact/viewcontactofgraphic.hxx:56 class SdrGrafObj & sdr::contact::ViewContactOfGraphic::GetGrafObject() svx/source/svdraw/svdpdf.hxx:92 @@ -1162,6 +1160,12 @@ sw/qa/extras/inc/swmodeltestbase.hxx:621 class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> SwModelTestBase::getParagraphAnchoredObject(const int,const class com::sun::star::uno::Reference<class com::sun::star::text::XTextRange> &) const sw/qa/extras/uiwriter/uiwriter.cxx:6529 int main() +sw/source/core/access/accpara.hxx:162 + struct SwTOXSortTabBase * SwAccessibleParagraph::GetTOXSortTabBase() +sw/source/core/access/accportions.cxx:69 + unsigned long FindBreak(const vector<type-parameter-?-?, allocator<type-parameter-?-?> > &,type-parameter-?-?) +sw/source/core/access/accportions.cxx:73 + unsigned long FindLastBreak(const vector<type-parameter-?-?, allocator<type-parameter-?-?> > &,type-parameter-?-?) sw/source/core/inc/frame.hxx:907 void SwFrame::dumpTopMostAsXml(struct _xmlTextWriter *) const sw/source/core/inc/frame.hxx:1340 @@ -1180,7 +1184,7 @@ 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:243 WW8_BRCVer6::WW8_BRCVer6() -sw/source/uibase/inc/swcont.hxx:86 +sw/source/uibase/inc/swcont.hxx:85 _Bool SwContent::operator==(const class SwContent &) const test/source/sheet/xsubtotalfield.cxx:28 _Bool CppUnit::assertion_traits::equal(const class com::sun::star::uno::Sequence<struct com::sun::star::sheet::SubTotalColumn> &,const class com::sun::star::uno::Sequence<struct com::sun::star::sheet::SubTotalColumn> &) @@ -1206,7 +1210,7 @@ vcl/inc/fontinstance.hxx:89 void LogicalFontInstance::ReleaseHbFont() vcl/inc/fontselect.hxx:49 _Bool FontSelectPattern::operator!=(const class FontSelectPattern &) const -vcl/inc/headless/svpgdi.hxx:246 +vcl/inc/headless/svpgdi.hxx:244 void SvpSalGraphics::drawBitmap(const struct SalTwoRect &,struct BitmapBuffer *,enum _cairo_operator) vcl/inc/impgraph.hxx:57 _Bool GraphicID::operator==(const class GraphicID &) const @@ -1242,7 +1246,7 @@ vcl/inc/PhysicalFontFamily.hxx:58 const class rtl::OUString & PhysicalFontFamily::GetAliasNames() const vcl/inc/regionband.hxx:27 const char * ImplDbgTestRegionBand(const void *) -vcl/inc/salgdi.hxx:214 +vcl/inc/salgdi.hxx:215 class basegfx::B2DHomMatrix SalGraphics::mirror(const class basegfx::B2DHomMatrix &,const class OutputDevice *) const vcl/inc/salmenu.hxx:46 SalMenuButtonItem::SalMenuButtonItem() @@ -1292,8 +1296,6 @@ vcl/source/fontsubset/xlat.hxx:34 unsigned short vcl::TranslateChar15(unsigned short) vcl/source/fontsubset/xlat.hxx:35 unsigned short vcl::TranslateChar16(unsigned short) -vcl/source/gdi/pdfbuildin_fonts.hxx:56 - class rtl::OString vcl::pdf::BuildinFontInstance::getNameObject() const workdir/LexTarget/l10ntools/source/cfglex.cxx:3721 void YYWarning(const char *) workdir/LexTarget/l10ntools/source/xrmlex.cxx:715 diff --git a/compilerplugins/clang/unusedmethods.unused-returns.results b/compilerplugins/clang/unusedmethods.unused-returns.results index 5c0195a00c5d..60f3f7f5c82f 100644 --- a/compilerplugins/clang/unusedmethods.unused-returns.results +++ b/compilerplugins/clang/unusedmethods.unused-returns.results @@ -42,31 +42,31 @@ include/LibreOfficeKit/LibreOfficeKit.hxx:97 char * lok::Document::getPartPageRectangles() include/LibreOfficeKit/LibreOfficeKit.hxx:121 char * lok::Document::getPartHash(int) -include/LibreOfficeKit/LibreOfficeKit.hxx:342 +include/LibreOfficeKit/LibreOfficeKit.hxx:349 char * lok::Document::getTextSelection(const char *,char **) -include/LibreOfficeKit/LibreOfficeKit.hxx:354 +include/LibreOfficeKit/LibreOfficeKit.hxx:361 _Bool lok::Document::paste(const char *,const char *,unsigned long) -include/LibreOfficeKit/LibreOfficeKit.hxx:385 +include/LibreOfficeKit/LibreOfficeKit.hxx:392 char * lok::Document::getCommandValues(const char *) -include/LibreOfficeKit/LibreOfficeKit.hxx:467 +include/LibreOfficeKit/LibreOfficeKit.hxx:474 int lok::Document::getView() -include/LibreOfficeKit/LibreOfficeKit.hxx:475 +include/LibreOfficeKit/LibreOfficeKit.hxx:482 int lok::Document::getViewsCount() -include/LibreOfficeKit/LibreOfficeKit.hxx:484 +include/LibreOfficeKit/LibreOfficeKit.hxx:491 unsigned char * lok::Document::renderFont(const char *,const char *,int *,int *) -include/LibreOfficeKit/LibreOfficeKit.hxx:523 +include/LibreOfficeKit/LibreOfficeKit.hxx:530 _Bool lok::Document::getViewIds(int *,unsigned long) -include/LibreOfficeKit/LibreOfficeKit.hxx:584 +include/LibreOfficeKit/LibreOfficeKit.hxx:591 _Bool lok::Document::insertCertificate(const unsigned char *,const int,const unsigned char *,const int) -include/LibreOfficeKit/LibreOfficeKit.hxx:598 +include/LibreOfficeKit/LibreOfficeKit.hxx:605 _Bool lok::Document::addCertificate(const unsigned char *,const int) -include/LibreOfficeKit/LibreOfficeKit.hxx:610 +include/LibreOfficeKit/LibreOfficeKit.hxx:617 int lok::Document::getSignatureState() -include/LibreOfficeKit/LibreOfficeKit.hxx:705 +include/LibreOfficeKit/LibreOfficeKit.hxx:712 char * lok::Office::getFilterTypes() -include/LibreOfficeKit/LibreOfficeKit.hxx:759 +include/LibreOfficeKit/LibreOfficeKit.hxx:766 char * lok::Office::getVersionInfo() -include/LibreOfficeKit/LibreOfficeKit.hxx:773 +include/LibreOfficeKit/LibreOfficeKit.hxx:780 _Bool lok::Office::runMacro(const char *) include/oox/crypto/AgileEngine.hxx:121 _Bool oox::core::AgileEngine::decryptHmacKey() @@ -152,7 +152,7 @@ include/sfx2/lnkbase.hxx:103 class sfx2::SvLinkSource * sfx2::SvBaseLink::GetRealObject() include/svl/macitem.hxx:92 class SvStream & SvxMacroTableDtor::Write(class SvStream &) const -include/svl/poolitem.hxx:173 +include/svl/poolitem.hxx:169 class SvStream & SfxPoolItem::Store(class SvStream &,unsigned short) const include/svx/dlgctrl.hxx:105 class Point SvxRectCtl::SetActualRPWithoutInvalidate(enum RectPoint) @@ -172,7 +172,7 @@ include/test/sheet/xspreadsheets2.hxx:40 class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> apitest::XSpreadsheets2::getComponent() include/test/sheet/xstyleloader.hxx:27 class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> apitest::XStyleLoader::getTargetComponent() -include/test/sheet/xusedareacursor.hxx:25 +include/test/sheet/xusedareacursor.hxx:22 class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> apitest::XUsedAreaCursor::init() include/tools/color.hxx:151 class SvStream & Color::Read(class SvStream &) @@ -202,9 +202,9 @@ include/vcl/texteng.hxx:279 _Bool TextEngine::Read(class SvStream &,const class TextSelection *) include/vcl/toolbox.hxx:514 _Bool ToolBox::ChangeHighlightUpDn(_Bool) -include/vcl/weld.hxx:355 +include/vcl/weld.hxx:357 _Bool weld::ComboBox::get_entry_selection_bounds(int &,int &) -include/vcl/weld.hxx:1033 +include/vcl/weld.hxx:1059 _Bool weld::TextView::get_selection_bounds(int &,int &) lotuswordpro/inc/lwpsvstream.hxx:76 class LwpSvStream & LwpSvStream::ReadUInt8(unsigned char &) @@ -212,15 +212,17 @@ lotuswordpro/inc/lwpsvstream.hxx:77 class LwpSvStream & LwpSvStream::ReadUInt16(unsigned short &) lotuswordpro/inc/lwpsvstream.hxx:78 class LwpSvStream & LwpSvStream::ReadUInt32(unsigned int &) +sc/inc/document.hxx:2107 + const struct ScDocumentThreadSpecific & ScDocument::CalculateInColumnInThread(struct ScInterpreterContext &,const class ScAddress &,unsigned long,unsigned int,unsigned int) sc/inc/orcusfilters.hxx:44 _Bool ScOrcusFilters::importODS_Styles(class ScDocument &,class rtl::OUString &) const -sc/source/core/opencl/formulagroupcl.cxx:990 +sc/source/core/opencl/formulagroupcl.cxx:997 unsigned long sc::opencl::DynamicKernelSlidingArgument::GenReductionLoopHeader(class std::__cxx11::basic_stringstream<char> &,_Bool &) -sc/source/core/opencl/formulagroupcl.cxx:1230 +sc/source/core/opencl/formulagroupcl.cxx:1237 unsigned long sc::opencl::ParallelReductionVectorRef::GenReductionLoopHeader(class std::__cxx11::basic_stringstream<char> &,int,_Bool &) sc/source/filter/inc/workbookhelper.hxx:259 _Bool oox::xls::WorkbookHelper::importOoxFragment(const class rtl::Reference<class oox::core::FragmentHandler> &,class oox::core::FastParser &) -sc/source/filter/xml/XMLStylesExportHelper.hxx:179 +sc/source/filter/xml/XMLStylesExportHelper.hxx:178 _Bool ScFormatRangeStyles::AddStyleName(const class rtl::OUString &,int &,const _Bool) sc/source/ui/inc/select.hxx:72 _Bool ScViewFunctionSet::SetCursorAtCell(short,int,_Bool) @@ -264,9 +266,9 @@ sd/source/ui/remotecontrol/IBluetoothSocket.hxx:37 int sd::IBluetoothSocket::write(const void *,unsigned int) sw/inc/calc.hxx:113 class SwSbxValue & SwSbxValue::MakeDouble() -sw/inc/doc.hxx:1063 +sw/inc/doc.hxx:1066 _Bool SwDoc::ReplaceNumRule(const struct SwPosition &,const class rtl::OUString &,const class rtl::OUString &) -sw/inc/doc.hxx:1245 +sw/inc/doc.hxx:1252 _Bool SwDoc::SplitTable(const struct SwPosition &,enum SplitTable_HeadlineOption,_Bool) sw/inc/editsh.hxx:264 _Bool SwEditShell::GetPaMParAttr(class SwPaM *,class SfxItemSet &) const @@ -304,14 +306,16 @@ vcl/inc/opengl/texture.hxx:112 _Bool OpenGLTexture::CopyData(int,int,int,int,const unsigned char *) vcl/inc/salframe.hxx:222 _Bool SalFrame::SetPluginParent(struct SystemParentData *) -vcl/inc/salgdi.hxx:211 +vcl/inc/salgdi.hxx:212 class basegfx::B2DPoint SalGraphics::mirror(const class basegfx::B2DPoint &,const class OutputDevice *) const -vcl/inc/salgdi.hxx:394 +vcl/inc/salgdi.hxx:395 _Bool SalGraphics::BlendBitmap(const struct SalTwoRect &,const class SalBitmap &,const class OutputDevice *) vcl/inc/unx/gtk/gtkdata.hxx:164 int GtkSalDisplay::CaptureMouse(class SalFrame *) vcl/inc/unx/saldisp.hxx:316 _Bool SalDisplay::Dispatch(union _XEvent *) +vcl/inc/WidgetDrawInterface.hxx:97 + _Bool vcl::WidgetDrawInterface::updateSettings(class AllSettings &) vcl/source/gdi/pdfwriter_impl.hxx:1230 _Bool vcl::PDFWriterImpl::setCurrentStructureElement(int) vcl/source/gdi/pdfwriter_impl.hxx:1231 diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index a44fe7d2a5d3..bd52eadc1d6a 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -192,7 +192,6 @@ class SVT_DLLPUBLIC Calendar final : public Control SVT_DLLPRIVATE void ImplUpdate( bool bCalcNew = false ); using Window::ImplScroll; SVT_DLLPRIVATE void ImplScroll( bool bPrev ); - SVT_DLLPRIVATE void ImplInvertDropPos(); SVT_DLLPRIVATE void ImplShowMenu( const Point& rPos, const Date& rDate ); SVT_DLLPRIVATE void ImplTracking( const Point& rPos, bool bRepeat ); SVT_DLLPRIVATE void ImplEndTracking( bool bCancel ); diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index 332233158b98..115645b17ab8 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -137,8 +137,6 @@ public: tools::Rectangle GetDropDownPosSizePixel() const; - long CalcWindowSizePixel(sal_uInt16 nLines) const; - void AdaptDropDownLineCountToMaximum(); void SetDropDownLineCount( sal_uInt16 nLines ); sal_uInt16 GetDropDownLineCount() const; diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx index 01451c3d47f6..532823332c1e 100644 --- a/sfx2/source/control/thumbnailviewacc.cxx +++ b/sfx2/source/control/thumbnailviewacc.cxx @@ -563,31 +563,6 @@ ThumbnailViewItemAcc::~ThumbnailViewItemAcc() { } -void ThumbnailViewItemAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValue, const uno::Any& rNewValue ) -{ - if( nEventId ) - { - ::std::vector< uno::Reference< accessibility::XAccessibleEventListener > > aTmpListeners( mxEventListeners ); - accessibility::AccessibleEventObject aEvtObject; - - aEvtObject.EventId = nEventId; - aEvtObject.Source = static_cast<uno::XWeak*>(this); - aEvtObject.NewValue = rNewValue; - aEvtObject.OldValue = rOldValue; - - for (auto const& tmpListener : aTmpListeners) - { - try - { - tmpListener->notifyEvent( aEvtObject ); - } - catch(const uno::Exception&) - { - } - } - } -} - void ThumbnailViewItemAcc::ParentDestroyed() { const ::osl::MutexGuard aGuard( maMutex ); diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx index 938fb9026096..12015243635e 100644 --- a/sfx2/source/control/thumbnailviewacc.hxx +++ b/sfx2/source/control/thumbnailviewacc.hxx @@ -180,10 +180,6 @@ public: ThumbnailViewItemAcc( ThumbnailViewItem* pParent, bool bIsTransientChildrenDisabled ); virtual ~ThumbnailViewItemAcc() override; - void FireAccessibleEvent( short nEventId, - const css::uno::Any& rOldValue, - const css::uno::Any& rNewValue ); - void ParentDestroyed(); static ThumbnailViewItemAcc* getImplementation( const css::uno::Reference< css::uno::XInterface >& rxData ) throw(); diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index c6749bc3886f..b3d9f4361a3b 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -171,7 +171,6 @@ class SvxIconChoiceCtrl_Impl long nMaxVirtHeight; // max. height aVirtOutputSize for ALIGN_LEFT std::vector< SvxIconChoiceCtrlEntry* > maZOrderList; std::unique_ptr<SvxIconChoiceCtrlColumnInfoMap> m_pColumns; - VclPtr<IcnViewEdit_Impl> pEdit; WinBits nWinBits; long nMaxBoundHeight; // height of highest BoundRects IconChoiceFlags nFlags; @@ -413,7 +412,6 @@ public: std::vector<tools::Rectangle>* pOtherRects ); - bool IsTextHit( SvxIconChoiceCtrlEntry* pEntry, const Point& rDocPos ); void MakeVisible( const tools::Rectangle& rDocPos, bool bInScrollBarEvent=false @@ -426,8 +424,6 @@ public: ); #endif bool IsEntryEditing() const { return (pCurEditedEntry!=nullptr); } - void EditEntry( SvxIconChoiceCtrlEntry* pEntry ); - void StopEntryEditing(); size_t GetEntryCount() const { return aEntries.size(); } SvxIconChoiceCtrlEntry* GetEntry( size_t nPos ) { diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index b9f5f5276e0a..7c9f9cf333ad 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -39,9 +39,6 @@ #include <memory> #include <vcl/idle.hxx> -#define IMPICNVIEW_ACC_RETURN 1 -#define IMPICNVIEW_ACC_ESCAPE 2 - static constexpr auto DRAWTEXT_FLAGS_ICON = DrawTextFlags::Center | DrawTextFlags::Top | DrawTextFlags::EndEllipsis | DrawTextFlags::Clip | DrawTextFlags::MultiLine | DrawTextFlags::WordBreak | DrawTextFlags::Mnemonic; @@ -53,39 +50,6 @@ static constexpr auto DRAWTEXT_FLAGS_ICON = static bool bEndScrollInvalidate = true; -class IcnViewEdit_Impl : public MultiLineEdit -{ - Link<LinkParamNone*,void> const aCallBackHdl; - Accelerator aAccReturn; - Accelerator aAccEscape; - Idle maLoseFocusIdle; - bool bCanceled; - bool bAlreadyInCallback; - bool bGrabFocus; - - void CallCallBackHdl_Impl(); - DECL_LINK(Timeout_Impl, Timer *, void); - DECL_LINK( ReturnHdl_Impl, Accelerator&, void ); - DECL_LINK( EscapeHdl_Impl, Accelerator&, void ); - -public: - - IcnViewEdit_Impl( - SvtIconChoiceCtrl* pParent, - const Point& rPos, - const Size& rSize, - const OUString& rData, - const Link<LinkParamNone*,void>& rNotifyEditEnd ); - - virtual ~IcnViewEdit_Impl() override; - virtual void dispose() override; - virtual void KeyInput( const KeyEvent& rKEvt ) override; - virtual bool PreNotify( NotifyEvent& rNEvt ) override; - bool EditingCanceled() const { return bCanceled; } - void StopEditing(); - bool IsGrabFocus() const { return bGrabFocus; } -}; - SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl( SvtIconChoiceCtrl* pCurView, WinBits nWinStyle @@ -104,7 +68,6 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl( pEntryPaintDev = nullptr; pCurEditedEntry = nullptr; pCurHighlightFrame = nullptr; - pEdit = nullptr; pAnchor = nullptr; pHdlEntry = nullptr; pHead = nullptr; @@ -160,7 +123,6 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl( SvxIconChoiceCtrl_Impl::~SvxIconChoiceCtrl_Impl() { pCurEditedEntry = nullptr; - pEdit.disposeAndClear(); Clear(false); CancelUserEvents(); pImpCursor.reset(); @@ -178,7 +140,6 @@ SvxIconChoiceCtrl_Impl::~SvxIconChoiceCtrl_Impl() void SvxIconChoiceCtrl_Impl::Clear( bool bInCtor ) { - StopEntryEditing(); nSelectionCount = 0; pCurHighlightFrame = nullptr; CancelUserEvents(); @@ -236,7 +197,6 @@ void SvxIconChoiceCtrl_Impl::SetStyle( WinBits nWinStyle ) IMPL_LINK( SvxIconChoiceCtrl_Impl, ScrollUpDownHdl, ScrollBar*, pScrollBar, void ) { - StopEntryEditing(); // arrow up: delta=-1; arrow down: delta=+1 Scroll( 0, pScrollBar->GetDelta() ); bEndScrollInvalidate = true; @@ -244,7 +204,6 @@ IMPL_LINK( SvxIconChoiceCtrl_Impl, ScrollUpDownHdl, ScrollBar*, pScrollBar, void IMPL_LINK( SvxIconChoiceCtrl_Impl, ScrollLeftRightHdl, ScrollBar*, pScrollBar, void ) { - StopEntryEditing(); // arrow left: delta=-1; arrow right: delta=+1 Scroll( pScrollBar->GetDelta(), 0 ); bEndScrollInvalidate = true; @@ -2603,12 +2562,6 @@ IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, DocRectChangedHdl, Timer *, void) aDocRectChangedIdle.Stop(); } -bool SvxIconChoiceCtrl_Impl::IsTextHit( SvxIconChoiceCtrlEntry* pEntry, const Point& rDocPos ) -{ - tools::Rectangle aRect( CalcTextRect( pEntry )); - return aRect.IsInside( rDocPos ); -} - #ifdef DBG_UTIL void SvxIconChoiceCtrl_Impl::SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry* pEntry ) { @@ -2719,75 +2672,6 @@ void SvxIconChoiceCtrl_Impl::InvalidateEntry( SvxIconChoiceCtrlEntry* pEntry ) ShowCursor( true ); } -void SvxIconChoiceCtrl_Impl::EditEntry( SvxIconChoiceCtrlEntry* pEntry ) -{ - DBG_ASSERT(pEntry,"EditEntry: Entry not set"); - if( !pEntry ) - return; - - StopEntryEditing(); - pEdit.disposeAndClear(); - SetNoSelection(); - - pCurEditedEntry = pEntry; - OUString aEntryText( SvtIconChoiceCtrl::GetEntryText( pEntry ) ); - tools::Rectangle aRect( CalcTextRect( pEntry, nullptr, true, &aEntryText ) ); - MakeVisible( aRect ); - Point aPos( aRect.TopLeft() ); - aPos = pView->GetPixelPos( aPos ); - aRect.SetPos( aPos ); - pView->HideFocus(); - pEdit = VclPtr<IcnViewEdit_Impl>::Create( - - pView, - aRect.TopLeft(), - aRect.GetSize(), - aEntryText, - LINK( this, SvxIconChoiceCtrl_Impl, TextEditEndedHdl ) ); -} - -IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, TextEditEndedHdl, LinkParamNone*, void) -{ - DBG_ASSERT(pEdit,"TextEditEnded: pEdit not set"); - if( !pEdit ) - { - pCurEditedEntry = nullptr; - return; - } - DBG_ASSERT(pCurEditedEntry,"TextEditEnded: pCurEditedEntry not set"); - - if( !pCurEditedEntry ) - { - pEdit->Hide(); - if( pEdit->IsGrabFocus() ) - pView->GrabFocus(); - return; - } - - OUString aText; - if ( !pEdit->EditingCanceled() ) - aText = pEdit->GetText(); - else - aText = pEdit->GetSavedValue(); - - InvalidateEntry( pCurEditedEntry ); - if( !GetSelectionCount() ) - SelectEntry( pCurEditedEntry, true ); - - pEdit->Hide(); - if( pEdit->IsGrabFocus() ) - pView->GrabFocus(); - // The edit can not be deleted here, because it is not within a handler. It - // will be deleted in the dtor or in the next EditEntry. - pCurEditedEntry = nullptr; -} - -void SvxIconChoiceCtrl_Impl::StopEntryEditing() -{ - if( pEdit ) - pEdit->StopEditing(); -} - SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetFirstSelectedEntry() const { if( !GetSelectionCount() ) @@ -2842,133 +2726,8 @@ void SvxIconChoiceCtrl_Impl::SelectAll() pAnchor = nullptr; } -IcnViewEdit_Impl::IcnViewEdit_Impl( SvtIconChoiceCtrl* pParent, const Point& rPos, - const Size& rSize, const OUString& rData, const Link<LinkParamNone*,void>& rNotifyEditEnd ) : - MultiLineEdit( pParent, (pParent->GetStyle() & WB_ICON) ? WB_CENTER : WB_LEFT), - aCallBackHdl( rNotifyEditEnd ), - bCanceled( false ), - bAlreadyInCallback( false ), - bGrabFocus( false ) -{ - maLoseFocusIdle.SetPriority(TaskPriority::REPAINT); - maLoseFocusIdle.SetInvokeHandler(LINK(this,IcnViewEdit_Impl,Timeout_Impl)); - maLoseFocusIdle.SetDebugName( "svx::IcnViewEdit_Impl maLoseFocusIdle" ); - - // FIXME: Outside of Paint Hierarchy - vcl::Font aFont(pParent->GetPointFont(*this)); - aFont.SetTransparent( false ); - SetControlFont(aFont); - SetControlBackground(aFont.GetFillColor()); - SetControlForeground(aFont.GetColor()); - SetPosPixel(rPos); - SetSizePixel(CalcAdjustedSize(rSize)); - SetText(rData); - SaveValue(); - - aAccReturn.InsertItem( IMPICNVIEW_ACC_RETURN, vcl::KeyCode(KEY_RETURN) ); - aAccEscape.InsertItem( IMPICNVIEW_ACC_ESCAPE, vcl::KeyCode(KEY_ESCAPE) ); - - aAccReturn.SetActivateHdl( LINK( this, IcnViewEdit_Impl, ReturnHdl_Impl) ); - aAccEscape.SetActivateHdl( LINK( this, IcnViewEdit_Impl, EscapeHdl_Impl) ); - Application::InsertAccel( &aAccReturn);//, ACCEL_ALWAYS ); - Application::InsertAccel( &aAccEscape);//, ACCEL_ALWAYS ); - Show(); - GrabFocus(); -} - -IcnViewEdit_Impl::~IcnViewEdit_Impl() -{ - disposeOnce(); -} - -void IcnViewEdit_Impl::dispose() -{ - if( !bAlreadyInCallback ) - { - Application::RemoveAccel( &aAccReturn ); - Application::RemoveAccel( &aAccEscape ); - } - MultiLineEdit::dispose(); -} - -void IcnViewEdit_Impl::CallCallBackHdl_Impl() -{ - maLoseFocusIdle.Stop(); - if ( !bAlreadyInCallback ) - { - bAlreadyInCallback = true; - Application::RemoveAccel( &aAccReturn ); - Application::RemoveAccel( &aAccEscape ); - Hide(); - aCallBackHdl.Call( nullptr ); - } -} - -IMPL_LINK_NOARG(IcnViewEdit_Impl, Timeout_Impl, Timer *, void) -{ - CallCallBackHdl_Impl(); -} - -IMPL_LINK_NOARG( IcnViewEdit_Impl, ReturnHdl_Impl, Accelerator&, void ) -{ - bCanceled = false; - bGrabFocus = true; - CallCallBackHdl_Impl(); -} - -IMPL_LINK_NOARG( IcnViewEdit_Impl, EscapeHdl_Impl, Accelerator&, void ) -{ - bCanceled = true; - bGrabFocus = true; - CallCallBackHdl_Impl(); -} - -void IcnViewEdit_Impl::KeyInput( const KeyEvent& rKEvt ) -{ - vcl::KeyCode aCode = rKEvt.GetKeyCode(); - sal_uInt16 nCode = aCode.GetCode(); - - switch ( nCode ) - { - case KEY_ESCAPE: - bCanceled = true; - bGrabFocus = true; - CallCallBackHdl_Impl(); - break; - case KEY_RETURN: - bCanceled = false; - bGrabFocus = true; - CallCallBackHdl_Impl(); - break; - default: - MultiLineEdit::KeyInput( rKEvt ); - } -} - -bool IcnViewEdit_Impl::PreNotify( NotifyEvent& rNEvt ) -{ - if( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS ) - { - if ( !bAlreadyInCallback && - ((!Application::GetFocusWindow()) || !IsChild(Application::GetFocusWindow()))) - { - bCanceled = false; - maLoseFocusIdle.Start(); - } - } - return false; -} - -void IcnViewEdit_Impl::StopEditing() -{ - if ( !bAlreadyInCallback ) - { - bCanceled = true; - CallCallBackHdl_Impl(); - } -} sal_Int32 SvxIconChoiceCtrl_Impl::GetEntryListPos( SvxIconChoiceCtrlEntry const * pEntry ) const { diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 6581f26be17f..b7de9d8ecd6a 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -871,14 +871,6 @@ void Calendar::ImplUpdate( bool bCalcNew ) mbFormat = true; } -void Calendar::ImplInvertDropPos() -{ - tools::Rectangle aRect = GetDateRect( maDropDate );//this is one Pixel to width and one to height - aRect.SetBottom( aRect.Top()+mnDayHeight-1 ); - aRect.SetRight( aRect.Left()+mnDayWidth-1 ); - Invert( aRect ); -} - void Calendar::ImplScroll( bool bPrev ) { Date aNewFirstMonth = GetFirstMonth(); diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index e1edeaa5c771..20da92283755 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -533,40 +533,6 @@ bool SwAccessibleParagraph::IsValidRange( return IsValidPosition(nBegin, nLength) && IsValidPosition(nEnd, nLength); } -SwTOXSortTabBase* SwAccessibleParagraph::GetTOXSortTabBase() -{ - SwTextFrame const*const pFrame(static_cast<SwTextFrame const*>(GetFrame())); - assert(pFrame); - const SwTextNode *const pTextNd = pFrame->GetTextNodeFirst(); - if( pTextNd ) - { - const SwSectionNode * pSectNd = pTextNd->FindSectionNode(); - if( pSectNd ) - { - const SwSection * pSect = &pSectNd->GetSection(); - const SwTOXBaseSection *pTOXBaseSect = static_cast<const SwTOXBaseSection *>(pSect); - if( pSect->GetType() == TOX_CONTENT_SECTION ) - { - SwTOXSortTabBase* pSortBase = nullptr; - size_t nSize = pTOXBaseSect->GetTOXSortTabBases().size(); - - for(size_t nIndex = 0; nIndex<nSize; nIndex++ ) - { - pSortBase = pTOXBaseSect->GetTOXSortTabBases()[nIndex].get(); - if( pSortBase->pTOXNd == pTextNd ) - break; - } - - if (pSortBase) - { - return pSortBase; - } - } - } - } - return nullptr; -} - //the function is to check whether the position is in a redline range. const SwRangeRedline* SwAccessibleParagraph::GetRedlineAtIndex() { diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx index 26afc0df73eb..5fd4766002c1 100644 --- a/sw/source/core/access/accpara.hxx +++ b/sw/source/core/access/accpara.hxx @@ -159,8 +159,6 @@ class SwAccessibleParagraph : std::vector< css::beans::PropertyValue >& rValues ); public: - SwTOXSortTabBase* GetTOXSortTabBase(); - bool IsHeading() const; protected: diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx index cfc5a83f97b1..b8472d0a583b 100644 --- a/vcl/source/control/listbox.cxx +++ b/vcl/source/control/listbox.cxx @@ -1241,11 +1241,6 @@ Size ListBox::CalcSubEditSize() const return aSz; } -long ListBox::CalcWindowSizePixel(sal_uInt16 nLines) const -{ - return mpImplLB->GetEntryHeight() * nLines; -} - Size ListBox::GetOptimalSize() const { return CalcMinimumSize(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits