diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-06-29 13:53:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-06-29 17:34:00 +0200 |
| commit | 74cd0d0b281f8df75612bfb600df2eae62c4d21d (patch) | |
| tree | bbfb2e37d317ffad49267fe71fd270198fdb81e1 | |
| parent | 4c51f2e0dfdddfe0efb4218d2cd1deefd90b6eff (diff) | |
loplugin:unusedmethods
Change-Id: I95ab7581dec35b113cb657ce8e5ee27c89c73593
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153746
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
36 files changed, 192 insertions, 959 deletions
diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results index fcda4538fe36..4296a0144afd 100644 --- a/compilerplugins/clang/unusedmethods.results +++ b/compilerplugins/clang/unusedmethods.results @@ -1,7 +1,5 @@ basegfx/source/range/b2drangeclipper.cxx:686 type-parameter-?-? basegfx::(anonymous namespace)::eraseFromList(type-parameter-?-? &,const type-parameter-?-? &) -basegfx/test/boxclipper.hxx:28 - double basegfx2d::getRandomOrdinal(const unsigned long) basic/source/inc/buffer.hxx:40 void SbiBuffer::operator+=(signed char) basic/source/inc/buffer.hxx:41 @@ -134,20 +132,14 @@ cui/source/inc/GraphicsTestsDialog.hxx:48 void GraphicsTestsDialog::HandleResultViewRequest(weld::Button &) cui/source/inc/GraphicsTestsDialog.hxx:48 void GraphicsTestsDialog::LinkStubHandleResultViewRequest(void *,weld::Button &) -cui/source/inc/optdict.hxx:92 - _Bool SvxEditDictionaryDialog::InsertTextHdl(SvxEditDictionaryDialog *,rtl::OUString &) -cui/source/inc/optdict.hxx:92 - _Bool SvxEditDictionaryDialog::LinkStubInsertTextHdl(void *,rtl::OUString &) cui/source/inc/SvxNotebookbarConfigPage.hxx:40 void SvxNotebookbarConfigPage::SetElement() dbaccess/source/filter/hsqldb/fbalterparser.hxx:19 void dbahsql::FbAlterStmtParser::ensureProperTableLengths() const dbaccess/source/filter/hsqldb/parseschema.hxx:80 const std::map<rtl::OUString, std::vector<rtl::OUString> > & dbahsql::SchemaParser::getPrimaryKeys() const -dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx:235 - void dbaui::OPostgresConnectionPageSetup::LinkStubOnEditModified(void *,weld::Entry &) -dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx:264 - rtl::OUString dbaui::OPostgresConnectionPageSetup::getURLNoPrefix() const +dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx:252 + rtl::OUString dbaui::OPostgresConnectionPageSetup::impl_getURL() const dbaccess/source/ui/inc/dsmeta.hxx:87 __gnu_debug::_Safe_iterator<struct std::_Rb_tree_const_iterator<int>, std::set<int> > dbaui::FeatureSet::begin() const dbaccess/source/ui/inc/dsmeta.hxx:88 @@ -198,9 +190,9 @@ editeng/inc/edtspell.hxx:103 __gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<const struct editeng::MisspellRange *, std::__cxx1998::vector<struct editeng::MisspellRange> >, std::vector<struct editeng::MisspellRange> > WrongList::begin() const editeng/inc/edtspell.hxx:104 __gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<const struct editeng::MisspellRange *, std::__cxx1998::vector<struct editeng::MisspellRange> >, std::vector<struct editeng::MisspellRange> > WrongList::end() const -editeng/source/editeng/impedit.hxx:235 +editeng/source/editeng/impedit.hxx:234 tools::Rectangle LOKSpecialPositioning::GetWindowPos(const tools::Rectangle &,enum MapUnit) const -editeng/source/editeng/impedit.hxx:755 +editeng/source/editeng/impedit.hxx:759 double ImpEditEngine::scaleYFontValue(unsigned short) const embeddedobj/source/msole/olecomponent.hxx:75 _Bool OleComponent::InitializeObject_Impl() @@ -274,11 +266,15 @@ extensions/source/scanner/scanner.hxx:79 void ScannerManager::SetData(void *) extensions/source/scanner/scanner.hxx:83 com::sun::star::uno::Reference<com::sun::star::uno::XInterface> ScannerManager_CreateInstance(const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> &) +filter/source/svg/svgwriter.hxx:347 + Color SVGActionWriter::ImplGetColorWithIntensity(const Color &,unsigned short) hwpfilter/source/hiodev.h:63 unsigned long HIODev::read4b(void *,unsigned long) +i18npool/source/localedata/LocaleNode.hxx:52 + void OFileWriter::writeIntParameter(const char *,const short,short) const idl/source/prj/svidl.cxx:103 int main(int,char **) -include/basegfx/color/bcolormodifier.hxx:303 +include/basegfx/color/bcolormodifier.hxx:392 basegfx::BColorModifier_randomize::BColorModifier_randomize(double) include/basegfx/curve/b2dcubicbezier.hxx:50 _Bool basegfx::B2DCubicBezier::operator==(const basegfx::B2DCubicBezier &) const @@ -398,10 +394,8 @@ include/basegfx/tuple/Tuple2D.hxx:83 _Bool basegfx::Tuple2D::equal(const basegfx::Tuple2D<long> &) const include/basegfx/utils/b2dclipstate.hxx:72 _Bool basegfx::utils::B2DClipState::operator!=(const basegfx::utils::B2DClipState &) const -include/basegfx/utils/bgradient.hxx:290 - basegfx::BGradient::BGradient(const struct com::sun::star::awt::Gradient2 &) -include/basegfx/utils/bgradient.hxx:291 - basegfx::BGradient::BGradient(const com::sun::star::uno::Any &) +include/basegfx/utils/bgradient.hxx:132 + basegfx::BColorStops::BColorStops(__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<const basegfx::BColorStop *, std::__cxx1998::vector<basegfx::BColorStop> >, std::vector<basegfx::BColorStop> >,__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<const basegfx::BColorStop *, std::__cxx1998::vector<basegfx::BColorStop> >, std::vector<basegfx::BColorStop> >) include/basegfx/utils/canvastools.hxx:110 struct com::sun::star::geometry::AffineMatrix3D & basegfx::unotools::affineMatrixFromHomMatrix3D(struct com::sun::star::geometry::AffineMatrix3D &,const basegfx::B3DHomMatrix &) include/basegfx/utils/canvastools.hxx:130 @@ -424,6 +418,8 @@ include/basic/codecompletecache.hxx:82 std::basic_ostream<char> & operator<<(std::basic_ostream<char> &,const CodeCompleteDataCache &) include/basic/sbxvar.hxx:138 struct SbxValues * SbxValue::data() +include/codemaker/commoncpp.hxx:47 + rtl::OString codemaker::cpp::translateUnoToCppType(enum codemaker::UnoType::Sort,std::basic_string_view<char16_t>) include/codemaker/global.hxx:54 FileStream & operator<<(FileStream &,const rtl::OString *) include/codemaker/global.hxx:56 @@ -776,11 +772,11 @@ include/comphelper/proparrhlp.hxx:83 cppu::IPropertyArrayHelper * comphelper::OAggregationArrayUsageHelper::createArrayHelper() const include/comphelper/PropertyInfoHash.hxx:36 comphelper::PropertyInfo::PropertyInfo(const rtl::OUString &,int,const com::sun::star::uno::Type &,short) -include/comphelper/propmultiplex2.hxx:60 +include/comphelper/propmultiplex2.hxx:58 void comphelper::OPropertyChangeListener2::disposeAdapter(std::unique_lock<std::mutex> &) -include/comphelper/propmultiplex2.hxx:103 +include/comphelper/propmultiplex2.hxx:101 void comphelper::OPropertyChangeMultiplexer2::lock() -include/comphelper/propmultiplex2.hxx:105 +include/comphelper/propmultiplex2.hxx:103 void comphelper::OPropertyChangeMultiplexer2::unlock() include/comphelper/propshlp.hxx:67 comphelper::OPropertySetHelper::OPropertySetHelper(_Bool) @@ -818,16 +814,24 @@ include/connectivity/FValue.hxx:428 connectivity::TSetBound::TSetBound(_Bool) include/connectivity/FValue.hxx:429 void connectivity::TSetBound::operator()(connectivity::ORowSetValue &) const -include/connectivity/sqlparse.hxx:185 +include/connectivity/sqlparse.hxx:186 rtl::OUString connectivity::OSQLParser::RuleIDToStr(unsigned int) +include/connectivity/TTableHelper.hxx:153 + const rtl::OUString & connectivity::OTableHelper::getTableName() include/desktop/crashreport.hxx:104 rtl::OUString CrashReporter::getActiveSfxObjectName() include/desktop/crashreport.hxx:109 rtl::OUString CrashReporter::getLoggedUnoCommands() -include/docmodel/color/ComplexColor.hxx:101 +include/docmodel/color/ComplexColor.hxx:107 void model::ComplexColor::setTransformations(const std::vector<struct model::Transformation> &) -include/docmodel/color/ComplexColor.hxx:162 +include/docmodel/color/ComplexColor.hxx:126 + void model::ComplexColor::clearTransformations() +include/docmodel/color/ComplexColor.hxx:168 model::ThemeColor model::ComplexColor::createThemeColor() const +include/docmodel/color/ComplexColor.hxx:222 + const Color & model::ComplexColor::getFinalColor() const +include/docmodel/color/ComplexColor.hxx:246 + unsigned long std::hash::operator()(const model::ComplexColor &) const include/docmodel/theme/FormatScheme.hxx:452 model::FormatScheme::FormatScheme(const rtl::OUString &) include/docmodel/theme/Theme.hxx:125 @@ -836,6 +840,8 @@ include/docmodel/theme/Theme.hxx:150 void model::FontScheme::setMajorSupplementalFontList(const std::vector<struct model::ThemeSupplementalFont> &) include/docmodel/theme/Theme.hxx:175 void model::Theme::setFormatScheme(const model::FormatScheme &) +include/docmodel/theme/Theme.hxx:192 + std::vector<Color> model::Theme::GetColors() const include/docmodel/theme/ThemeColor.hxx:35 enum model::ThemeColorType model::ThemeColor::getType() const include/docmodel/theme/ThemeColor.hxx:39 @@ -880,8 +886,6 @@ include/drawinglayer/processor2d/cairopixelprocessor2d.hxx:84 drawinglayer::processor2d::CairoPixelProcessor2D::CairoPixelProcessor2D(const drawinglayer::geometry::ViewInformation2D &) include/drawinglayer/tools/primitive2dxmldump.hxx:45 void drawinglayer::Primitive2dXmlDump::dump(const drawinglayer::primitive2d::Primitive2DContainer &,const rtl::OUString &) -include/editeng/colritem.hxx:66 - const Color & SvxColorItem::getColor() const include/editeng/editeng.hxx:246 _Bool EditEngine::GetVertical() const include/editeng/editeng.hxx:248 @@ -890,6 +894,8 @@ include/editeng/hyphenzoneitem.hxx:67 _Bool SvxHyphenZoneItem::IsPageEnd() const include/editeng/lrspitem.hxx:67 SvxLeftMarginItem::SvxLeftMarginItem(const long,const unsigned short) +include/editeng/outliner.hxx:787 + const Link<LinkParamNone *, void> & Outliner::GetModifyHdl() const include/editeng/outlobj.hxx:146 std::optional::optional(struct std::in_place_t,type-parameter-?-? &&...) include/editeng/outlobj.hxx:165 @@ -1106,13 +1112,13 @@ include/o3tl/typed_flags_set.hxx:313 typename typed_flags<type-parameter-?-?>::Self operator^=(type-parameter-?-? &,typename typed_flags<type-parameter-?-?>::Wrap) include/o3tl/vector_pool.hxx:84 o3tl::detail::struct_from_value::type::type() -include/oox/drawingml/clrscheme.hxx:95 +include/oox/drawingml/clrscheme.hxx:80 const rtl::OUString & oox::drawingml::ClrScheme::GetName() const -include/oox/drawingml/clrscheme.hxx:97 +include/oox/drawingml/clrscheme.hxx:82 void oox::drawingml::ClrScheme::ToAny(com::sun::star::uno::Any &) const -include/oox/drawingml/clrscheme.hxx:98 +include/oox/drawingml/clrscheme.hxx:83 void oox::drawingml::ClrScheme::fill(model::ColorSet &) const -include/oox/drawingml/color.hxx:118 +include/oox/drawingml/color.hxx:127 _Bool oox::drawingml::Color::equals(const oox::drawingml::Color &,const oox::GraphicHelper &,Color) const include/oox/drawingml/ThemeFilterBase.hxx:35 void oox::drawingml::ThemeFilterBase::setCurrentTheme(const std::shared_ptr<oox::drawingml::Theme> &) @@ -1120,9 +1126,11 @@ include/oox/export/DMLPresetShapeExport.hxx:100 _Bool oox::drawingml::DMLPresetShapeExporter::HasHandleValue() const include/oox/export/DMLPresetShapeExport.hxx:129 com::sun::star::uno::Any oox::drawingml::DMLPresetShapeExporter::FindHandleValue(com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue>,std::basic_string_view<char16_t>) -include/oox/export/drawingml.hxx:362 +include/oox/export/drawingml.hxx:326 + _Bool oox::drawingml::DrawingML::EqualGradients(const struct com::sun::star::awt::Gradient2 &,const struct com::sun::star::awt::Gradient2 &) +include/oox/export/drawingml.hxx:363 _Bool oox::drawingml::DrawingML::WriteCharColor(const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> &) -include/oox/export/drawingml.hxx:503 +include/oox/export/drawingml.hxx:504 Color oox::drawingml::DrawingML::ColorWithIntensity(unsigned int,unsigned int) include/oox/helper/attributelist.hxx:69 long oox::AttributeConversion::decodeHyper(std::basic_string_view<char16_t>) @@ -1158,6 +1166,8 @@ include/opencl/openclconfig.hxx:95 std::basic_ostream<char> & operator<<(std::basic_ostream<char> &,const struct OpenCLConfig &) include/sax/tools/converter.hxx:206 _Bool sax::Converter::convertAngle(short &,std::basic_string_view<char16_t>,_Bool) +include/sfx2/charwin.hxx:90 + void SfxCharmapContainer::LinkStubCharClickHdl(void *,SvxCharView *) include/sfx2/childwin.hxx:120 void SfxChildWindow::ClearController() include/sfx2/docfilt.hxx:81 @@ -1170,7 +1180,9 @@ include/sfx2/lokcomponenthelpers.hxx:49 void LokChartHelper::Invalidate() include/sfx2/msg.hxx:120 const std::type_info * SfxType0::Type() const -include/sfx2/viewsh.hxx:451 +include/sfx2/thumbnailviewitem.hxx:103 + void ThumbnailViewItem::setPinned(_Bool) +include/sfx2/viewsh.hxx:462 enum LOKDeviceFormFactor SfxViewShell::GetLOKDeviceFormFactor() const include/svl/itemiter.hxx:44 _Bool SfxItemIter::IsAtEnd() const @@ -1186,6 +1198,8 @@ include/svl/ondemand.hxx:346 const CharClass & OnDemandCharClass::operator*() const include/svl/poolitem.hxx:169 type-parameter-?-? * SfxPoolItem::DynamicWhichCast(TypedWhichId<type-parameter-?-?>) +include/svl/SfxBroadcaster.hxx:62 + std::vector<SfxListener *> SfxBroadcaster::GetListenersForUnitTest() const include/svl/typedwhich.hxx:31 TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<CntUInt16Item, derived_type>, int>::type) include/svl/typedwhich.hxx:31 @@ -1205,6 +1219,8 @@ include/svl/typedwhich.hxx:31 include/svl/typedwhich.hxx:31 TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<OfaXColorListItem, derived_type>, int>::type) include/svl/typedwhich.hxx:31 + TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<OptionalBoolItem, derived_type>, int>::type) +include/svl/typedwhich.hxx:31 TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SbxItem, derived_type>, int>::type) include/svl/typedwhich.hxx:31 TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScCondFormatDlgItem, derived_type>, int>::type) @@ -1465,6 +1481,8 @@ include/svl/typedwhich.hxx:31 include/svl/typedwhich.hxx:31 TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxHyphenRegionItem, derived_type>, int>::type) include/svl/typedwhich.hxx:31 + TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxImageItem, derived_type>, int>::type) +include/svl/typedwhich.hxx:31 TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxInt16Item, derived_type>, int>::type) include/svl/typedwhich.hxx:31 TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxInt32Item, derived_type>, int>::type) @@ -1483,6 +1501,8 @@ include/svl/typedwhich.hxx:31 include/svl/typedwhich.hxx:31 TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxPoolItem, derived_type>, int>::type) include/svl/typedwhich.hxx:31 + TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxRangeItem, derived_type>, int>::type) +include/svl/typedwhich.hxx:31 TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxRectangleItem, derived_type>, int>::type) include/svl/typedwhich.hxx:31 TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxScriptOrganizerItem, derived_type>, int>::type) @@ -1501,6 +1521,8 @@ include/svl/typedwhich.hxx:31 include/svl/typedwhich.hxx:31 TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxUnoFrameItem, derived_type>, int>::type) include/svl/typedwhich.hxx:31 + TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxVisibilityItem, derived_type>, int>::type) +include/svl/typedwhich.hxx:31 TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxVoidItem, derived_type>, int>::type) include/svl/typedwhich.hxx:31 TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SfxWatermarkItem, derived_type>, int>::type) @@ -2026,6 +2048,8 @@ include/svl/typedwhich.hxx:31 TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<XSecondaryFillColorItem, derived_type>, int>::type) include/svl/typedwhich.hxx:31 TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<const SfxStringItem, derived_type>, int>::type) +include/svl/typedwhich.hxx:43 + _Bool operator==(const TypedWhichId<type-parameter-?-?> &,TypedWhichId<type-parameter-?-?>) include/svl/whichranges.hxx:52 void svl::Items_t::fill(struct std::pair<unsigned short, unsigned short> *) include/svtools/ctrlbox.hxx:403 @@ -2052,20 +2076,22 @@ include/svx/dlgctrl.hxx:263 void SvxLineEndLB::set_active_text(const rtl::OUString &) include/svx/framelink.hxx:168 _Bool svx::frame::operator>(const svx::frame::Style &,const svx::frame::Style &) -include/svx/gallery1.hxx:58 - const std::unique_ptr<GalleryFileStorageEntry> & GalleryThemeEntry::getGalleryStorageEngineEntry() const include/svx/hlnkitem.hxx:104 void SvxHyperlinkItem::SetReplacementText(const rtl::OUString &) -include/svx/langbox.hxx:97 +include/svx/langbox.hxx:95 void SvxLanguageBox::set_size_request(int,int) include/svx/sidebar/InspectorTextPanel.hxx:49 std::unique_ptr<PanelLayout> svx::sidebar::InspectorTextPanel::Create(weld::Widget *) include/svx/svdlayer.hxx:74 _Bool SdrLayer::operator==(const SdrLayer &) const +include/svx/svdpage.hxx:330 + void SdrPageProperties::sendLOKitThemeChangedCallback() include/svx/svdpntv.hxx:445 _Bool SdrPaintView::IsSwapAsynchron() const include/svx/svdtrans.hxx:246 _Bool IsMetric(enum MapUnit) +include/svx/svdview.hxx:235 + SvtAccessibilityOptions & SdrView::getAccessibilityOptions() include/svx/txencbox.hxx:81 void SvxTextEncodingBox::grab_focus() include/svx/txencbox.hxx:135 @@ -2146,14 +2172,16 @@ include/tools/date.hxx:218 _Bool Date::operator>=(const Date &) const include/tools/date.hxx:244 _Bool Date::IsValidDate(unsigned short,unsigned short,short) -include/tools/datetime.hxx:47 +include/tools/datetime.hxx:52 DateTime::DateTime(const tools::Time &) -include/tools/datetime.hxx:88 +include/tools/datetime.hxx:98 DateTime operator-(const DateTime &,int) -include/tools/datetime.hxx:90 +include/tools/datetime.hxx:100 DateTime operator-(const DateTime &,double) -include/tools/datetime.hxx:93 +include/tools/datetime.hxx:103 DateTime operator-(const DateTime &,const tools::Time &) +include/tools/datetime.hxx:105 + tools::Duration operator-(const DateTime &,const DateTime &) include/tools/fract.hxx:41 Fraction::Fraction(double,double) include/tools/fract.hxx:68 @@ -2230,9 +2258,9 @@ include/tools/XmlWriter.hxx:61 void tools::XmlWriter::element(const rtl::OString &) include/unotest/directories.hxx:46 rtl::OUString test::Directories::getPathFromWorkdir(std::basic_string_view<char16_t>) const -include/unotools/charclass.hxx:98 +include/unotools/charclass.hxx:101 _Bool CharClass::isAlphaNumericType(int) -include/unotools/localedatawrapper.hxx:239 +include/unotools/localedatawrapper.hxx:243 const rtl::OUString & LocaleDataWrapper::getLongDateYearSep() const include/unotools/moduleoptions.hxx:165 _Bool SvtModuleOptions::IsDataBase() const @@ -2250,15 +2278,11 @@ include/unotools/weakref.hxx:73 unotools::WeakReference::WeakReference<interface_type>(type-parameter-?-? &) include/vcl/alpha.hxx:47 _Bool AlphaMask::operator!=(const AlphaMask &) const -include/vcl/alpha.hxx:72 - void AlphaMask::ImplSetBitmap(const Bitmap &) include/vcl/animate/Animation.hxx:42 _Bool Animation::operator!=(const Animation &) const include/vcl/animate/AnimationFrame.hxx:67 _Bool AnimationFrame::operator!=(const struct AnimationFrame &) const -include/vcl/bitmap.hxx:400 - _Bool Bitmap::Replace(const Bitmap &,const Color &) -include/vcl/bitmap.hxx:539 +include/vcl/bitmap.hxx:527 const basegfx::SystemDependentDataHolder * Bitmap::accessSystemDependentDataHolder() const include/vcl/BitmapBasicMorphologyFilter.hxx:63 BitmapDilateFilter::BitmapDilateFilter(int,unsigned char) @@ -2308,15 +2332,13 @@ include/vcl/filter/pdfdocument.hxx:128 unsigned long vcl::filter::PDFObjectElement::GetArrayLength() const include/vcl/filter/pdfdocument.hxx:188 vcl::filter::PDFNumberElement & vcl::filter::PDFReferenceElement::GetObjectElement() const -include/vcl/filter/PDFiumLibrary.hxx:96 - std::unique_ptr<vcl::pdf::PDFiumPageObject> vcl::pdf::PDFiumAnnotation::getObject(int) include/vcl/filter/PDFiumLibrary.hxx:102 basegfx::B2DSize vcl::pdf::PDFiumAnnotation::getBorderCornerRadius() include/vcl/font/Feature.hxx:50 vcl::font::FeatureParameter::FeatureParameter(unsigned int,struct TranslateId) include/vcl/font/Feature.hxx:77 vcl::font::FeatureDefinition::FeatureDefinition(unsigned int,struct TranslateId,std::vector<struct vcl::font::FeatureParameter>) -include/vcl/gdimtf.hxx:108 +include/vcl/gdimtf.hxx:111 _Bool GDIMetaFile::operator!=(const GDIMetaFile &) const include/vcl/GestureEventRotate.hxx:36 GestureEventRotate::GestureEventRotate(int,int,enum GestureEventRotateType,double) @@ -2345,12 +2367,18 @@ include/vcl/lazydelete.hxx:93 include/vcl/lazydelete.hxx:93 std::optional<BitmapEx> vcl::DeleteOnDeinit::set(type-parameter-?-? &&...) include/vcl/lazydelete.hxx:93 + std::optional<EditDLL> vcl::DeleteOnDeinit::set(type-parameter-?-? &&...) +include/vcl/lazydelete.hxx:93 std::optional<SalLayoutGlyphsCache> vcl::DeleteOnDeinit::set(type-parameter-?-? &&...) include/vcl/lazydelete.hxx:93 std::optional<VclPtr<OutputDevice> > vcl::DeleteOnDeinit::set(type-parameter-?-? &&...) include/vcl/lazydelete.hxx:93 std::optional<Wallpaper> vcl::DeleteOnDeinit::set(type-parameter-?-? &&...) include/vcl/lazydelete.hxx:93 + std::optional<com::sun::star::uno::Reference<com::sun::star::i18n::XBreakIterator> > vcl::DeleteOnDeinit::set(type-parameter-?-? &&...) +include/vcl/lazydelete.hxx:93 + std::optional<com::sun::star::uno::Reference<com::sun::star::i18n::XLocaleData4> > vcl::DeleteOnDeinit::set(type-parameter-?-? &&...) +include/vcl/lazydelete.hxx:93 std::optional<drawinglayer::primitive2d::DiscreteShadow> vcl::DeleteOnDeinit::set(type-parameter-?-? &&...) include/vcl/lazydelete.hxx:93 std::optional<o3tl::lru_map<rtl::OUString, std::shared_ptr<const vcl::text::TextLayoutCache>, struct vcl::text::FirstCharsStringHash, struct vcl::text::FastStringCompareEqual, struct vcl::text::(anonymous namespace)::TextLayoutCacheCost> > vcl::DeleteOnDeinit::set(type-parameter-?-? &&...) @@ -2362,6 +2390,28 @@ include/vcl/lazydelete.hxx:93 std::optional<struct (anonymous namespace)::WavyLineCache> vcl::DeleteOnDeinit::set(type-parameter-?-? &&...) include/vcl/lok.hxx:23 void vcl::lok::unregisterPollCallbacks() +include/vcl/menubarupdateicon.hxx:74 + MenuBarUpdateIconManager::MenuBarUpdateIconManager() +include/vcl/menubarupdateicon.hxx:77 + void MenuBarUpdateIconManager::SetShowMenuIcon(_Bool) +include/vcl/menubarupdateicon.hxx:78 + void MenuBarUpdateIconManager::SetShowBubble(_Bool) +include/vcl/menubarupdateicon.hxx:79 + void MenuBarUpdateIconManager::SetBubbleImage(const Image &) +include/vcl/menubarupdateicon.hxx:80 + void MenuBarUpdateIconManager::SetBubbleTitle(const rtl::OUString &) +include/vcl/menubarupdateicon.hxx:81 + void MenuBarUpdateIconManager::SetBubbleText(const rtl::OUString &) +include/vcl/menubarupdateicon.hxx:83 + void MenuBarUpdateIconManager::SetClickHdl(const Link<LinkParamNone *, void> &) +include/vcl/menubarupdateicon.hxx:85 + _Bool MenuBarUpdateIconManager::GetShowMenuIcon() const +include/vcl/menubarupdateicon.hxx:86 + _Bool MenuBarUpdateIconManager::GetShowBubble() const +include/vcl/menubarupdateicon.hxx:87 + const rtl::OUString & MenuBarUpdateIconManager::GetBubbleTitle() const +include/vcl/menubarupdateicon.hxx:88 + const rtl::OUString & MenuBarUpdateIconManager::GetBubbleText() const include/vcl/opengl/OpenGLHelper.hxx:70 void OpenGLHelper::renderToFile(long,long,const rtl::OUString &) include/vcl/opengl/OpenGLHelper.hxx:103 @@ -2378,23 +2428,23 @@ include/vcl/salnativewidgets.hxx:408 _Bool TabitemValue::isBothAligned() const include/vcl/salnativewidgets.hxx:409 _Bool TabitemValue::isNotAligned() const -include/vcl/settings.hxx:427 +include/vcl/settings.hxx:430 const Color & StyleSettings::GetAlternatingRowColor() const -include/vcl/settings.hxx:438 - void StyleSettings::SetUseFlatBorders(_Bool) include/vcl/settings.hxx:441 + void StyleSettings::SetUseFlatBorders(_Bool) +include/vcl/settings.hxx:444 void StyleSettings::SetUseFlatMenus(_Bool) -include/vcl/settings.hxx:453 +include/vcl/settings.hxx:456 void StyleSettings::SetHideDisabledMenuItems(_Bool) -include/vcl/settings.hxx:518 +include/vcl/settings.hxx:521 void StyleSettings::SetSpinSize(int) -include/vcl/settings.hxx:551 +include/vcl/settings.hxx:554 Size StyleSettings::GetToolbarIconSizePixel() const -include/vcl/settings.hxx:650 +include/vcl/settings.hxx:653 int MiscSettings::GetDarkMode() -include/vcl/settings.hxx:673 +include/vcl/settings.hxx:676 _Bool HelpSettings::operator!=(const HelpSettings &) const -include/vcl/settings.hxx:734 +include/vcl/settings.hxx:737 _Bool AllSettings::operator!=(const AllSettings &) const include/vcl/split.hxx:92 void Splitter::SetHorizontal(_Bool) @@ -2402,10 +2452,6 @@ include/vcl/svapp.hxx:167 ApplicationEvent::ApplicationEvent(enum ApplicationEvent::Type,std::vector<rtl::OUString> &&) include/vcl/svapp.hxx:809 void Application::AppEvent(const ApplicationEvent &) -include/vcl/svapp.hxx:1319 - void Application::EndAllDialogs() -include/vcl/svapp.hxx:1323 - void Application::EndAllPopups() include/vcl/TaskStopwatch.hxx:91 void TaskStopwatch::reset() include/vcl/TaskStopwatch.hxx:102 @@ -2456,45 +2502,45 @@ include/vcl/weld.hxx:653 rtl::OUString weld::Assistant::get_current_page_ident() const include/vcl/weld.hxx:659 rtl::OUString weld::Assistant::get_page_title(const rtl::OUString &) const -include/vcl/weld.hxx:1073 +include/vcl/weld.hxx:1079 _Bool weld::TreeView::get_sensitive(int,int) const -include/vcl/weld.hxx:1176 +include/vcl/weld.hxx:1182 void weld::TreeView::set_text_align(const weld::TreeIter &,double,int) -include/vcl/weld.hxx:1346 +include/vcl/weld.hxx:1352 const rtl::OUString & weld::TreeView::get_saved_value() const -include/vcl/weld.hxx:1460 +include/vcl/weld.hxx:1475 _Bool weld::IconView::get_cursor(weld::TreeIter *) const -include/vcl/weld.hxx:1470 +include/vcl/weld.hxx:1486 void weld::IconView::select_all() -include/vcl/weld.hxx:1476 +include/vcl/weld.hxx:1492 void weld::IconView::save_value() -include/vcl/weld.hxx:1477 +include/vcl/weld.hxx:1493 const rtl::OUString & weld::IconView::get_saved_value() const -include/vcl/weld.hxx:1478 +include/vcl/weld.hxx:1494 _Bool weld::IconView::get_value_changed_from_saved() const -include/vcl/weld.hxx:1607 +include/vcl/weld.hxx:1623 void weld::MenuButton::append_item_radio(const rtl::OUString &,const rtl::OUString &) -include/vcl/weld.hxx:1615 +include/vcl/weld.hxx:1631 void weld::MenuButton::append_item(const rtl::OUString &,const rtl::OUString &,VirtualDevice &) -include/vcl/weld.hxx:1696 +include/vcl/weld.hxx:1712 rtl::OUString weld::ProgressBar::get_text() const -include/vcl/weld.hxx:1906 +include/vcl/weld.hxx:1922 void weld::EntryTreeView::EntryModifyHdl(const weld::Entry &) -include/vcl/weld.hxx:2142 +include/vcl/weld.hxx:2155 Size weld::MetricSpinButton::get_size_request() const -include/vcl/weld.hxx:2154 +include/vcl/weld.hxx:2167 void weld::MetricSpinButton::set_position(int) -include/vcl/weld.hxx:2258 +include/vcl/weld.hxx:2271 int weld::TextView::vadjustment_get_lower() const -include/vcl/weld.hxx:2486 +include/vcl/weld.hxx:2499 rtl::OUString weld::Toolbar::get_item_label(const rtl::OUString &) const -include/vcl/weld.hxx:2534 +include/vcl/weld.hxx:2547 void weld::Scrollbar::adjustment_configure(int,int,int,int,int,int) -include/vcl/weld.hxx:2550 +include/vcl/weld.hxx:2563 int weld::Scrollbar::get_scroll_thickness() const -include/vcl/weld.hxx:2579 +include/vcl/weld.hxx:2592 std::unique_ptr<weld::MenuToggleButton> weld::Builder::weld_menu_toggle_button(const rtl::OUString &) -include/vcl/weld.hxx:2691 +include/vcl/weld.hxx:2704 rtl::OUString weld::MessageDialogController::get_secondary_text() const include/vcl/weldutils.hxx:198 const com::sun::star::uno::Reference<com::sun::star::frame::XFrame> & weld::WidgetStatusListener::getFrame() const @@ -2548,10 +2594,6 @@ oox/source/drawingml/diagram/diagramlayoutatoms.hxx:331 const std::vector<std::shared_ptr<oox::drawingml::Shape> > & oox::drawingml::LayoutNode::getNodeShapes() const oox/source/drawingml/diagram/diagramlayoutatoms.hxx:340 const oox::drawingml::LayoutNode * oox::drawingml::LayoutNode::getParentLayoutNode() const -package/inc/ByteChucker.hxx:74 - void ByteChucker::WriteInt64(long) -package/source/zipapi/MemoryByteGrabber.hxx:95 - long MemoryByteGrabber::ReadInt64() sal/osl/unx/uunxapi.hxx:39 int mkdir_c(const rtl::OString &,unsigned int) sal/osl/unx/uunxapi.hxx:74 @@ -2586,7 +2628,7 @@ sc/inc/bigrange.hxx:70 _Bool ScBigAddress::operator!=(const ScBigAddress &) const sc/inc/column.hxx:138 const type-parameter-?-? & ScColumnData::GetAttr(int,TypedWhichId<type-parameter-?-?>,int &,int &) const -sc/inc/column.hxx:294 +sc/inc/column.hxx:295 _Bool ScColumn::HasDataAt(struct sc::ColumnBlockPosition &,int,struct ScDataAreaExtras *) sc/inc/columniterator.hxx:81 int sc::ColumnIterator::getType() const @@ -2598,10 +2640,6 @@ sc/inc/datamapper.hxx:79 void sc::ExternalDataSource::setProvider(const rtl::OUString &) sc/inc/document.hxx:896 rtl::OUString ScDocument::MaxRowAsString() const -sc/inc/document.hxx:2039 - int ScDocument::CountHiddenRows(int,int,short) const -sc/inc/document.hxx:2040 - short ScDocument::CountHiddenCols(int,int,short) const sc/inc/dpfilteredcache.hxx:148 void ScDPFilteredCache::dump() const sc/inc/formulacell.hxx:511 @@ -2678,6 +2716,10 @@ sc/inc/rangecache.hxx:94 unsigned long ScSortedRangeCache::size() const sc/inc/scdll.hxx:35 ScDLL::ScDLL() +sc/inc/scmod.hxx:189 + SvtAccessibilityOptions & ScModule::GetAccessOptions() +sc/inc/scmod.hxx:190 + SvtCTLOptions & ScModule::GetCTLOptions() sc/inc/scopetools.hxx:80 void sc::DelayFormulaGroupingSwitch::reset() sc/inc/segmenttree.hxx:149 @@ -2704,17 +2746,19 @@ sc/inc/stlalgorithm.hxx:60 _Bool sc::AlignedAllocator::operator==(const AlignedAllocator<T, Alignment> &) const sc/inc/stlalgorithm.hxx:61 _Bool sc::AlignedAllocator::operator!=(const AlignedAllocator<T, Alignment> &) const -sc/inc/table.hxx:349 +sc/inc/table.hxx:352 _Bool ScTable::IsColRowTabValid(const short,const int,const short) const -sc/inc/table.hxx:748 +sc/inc/table.hxx:752 const type-parameter-?-? * ScTable::GetAttr(short,int,TypedWhichId<type-parameter-?-?>,int &,int &) const -sc/inc/userlist.hxx:89 - __gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<const std::unique_ptr<ScUserListData> *, std::__cxx1998::vector<std::unique_ptr<ScUserListData> > >, std::vector<std::unique_ptr<ScUserListData> > > ScUserList::begin() const +sc/inc/table.hxx:986 + int ScTable::CountHiddenRows(int,int) const +sc/inc/table.hxx:990 + short ScTable::CountHiddenCols(short,short) const sc/qa/unit/helper/qahelper.hxx:77 std::basic_ostream<char> & operator<<(std::basic_ostream<char> &,const enum OpCode &) sc/qa/unit/helper/qahelper.hxx:83 std::basic_string<char> print(const ScAddress &) -sc/qa/unit/ucalc_copypaste.cxx:10712 +sc/qa/unit/ucalc_copypaste.cxx:10755 int main() sc/source/core/inc/interpre.hxx:71 basic_ostream<type-parameter-?-?, type-parameter-?-?> & sc::operator<<(basic_ostream<type-parameter-?-?, type-parameter-?-?> &,const struct sc::ParamIfsResult &) @@ -2768,8 +2812,6 @@ sc/source/filter/inc/xiescher.hxx:154 Color XclImpDrawObjBase::GetSolidLineColor(const struct XclObjLineData &) const sc/source/filter/inc/xlformula.hxx:408 _Bool XclTokenArray::operator==(const XclTokenArray &) const -sc/source/filter/xml/XMLExportIterator.hxx:88 - _Bool ScMyShapesContainer::HasShapes() const sc/source/filter/xml/xmltransformationi.hxx:159 ScXMLDateTimeContext::ScXMLDateTimeContext(ScXMLImport &,const rtl::Reference<sax_fastparser::FastAttributeList> &) sc/source/ui/inc/dataprovider.hxx:56 @@ -2808,6 +2850,8 @@ sc/source/ui/inc/datatransformation.hxx:223 int sc::SwapRowsTransformation::getFirstRow() const sc/source/ui/inc/datatransformation.hxx:224 int sc::SwapRowsTransformation::getSecondRow() const +sc/source/ui/inc/fusel.hxx:39 + void FuSelection::ActivateNoteHandles(SdrObject *) sc/source/ui/inc/hfedtdlg.hxx:85 ScHFEditFirstHeaderDlg::ScHFEditFirstHeaderDlg(weld::Window *,const SfxItemSet &,std::basic_string_view<char16_t>) sc/source/ui/inc/hfedtdlg.hxx:106 @@ -2840,6 +2884,8 @@ sd/source/filter/eppt/epptooxml.hxx:93 void oox::core::PowerPointExport::WriteDefaultColorSchemes(const std::shared_ptr<sax_fastparser::FastSerializerHelper> &) sd/source/filter/ppt/pptinanimations.hxx:107 void ppt::AnimationImporter::dump(const char *,long) +sd/source/ui/inc/DrawViewShell.hxx:255 + _Bool sd::DrawViewShell::IsVisible(unsigned short) sd/source/ui/inc/filedlg.hxx:54 _Bool SdOpenSoundFileDialog::IsInsertAsLinkSelected() const sd/source/ui/inc/GraphicViewShell.hxx:43 @@ -2864,8 +2910,8 @@ sd/source/ui/inc/PaneShells.hxx:33 void sd::LeftImpressPaneShell::RegisterInterface(const SfxModule *) sd/source/ui/inc/PaneShells.hxx:50 void sd::LeftDrawPaneShell::RegisterInterface(const SfxModule *) -sd/source/ui/inc/SlideSorter.hxx:190 - sd::slidesorter::SlideSorter::SlideSorter(sd::ViewShellBase &,vcl::Window &) +sd/source/ui/inc/SlideSorter.hxx:125 + void sd::slidesorter::SlideSorter::Paint(const tools::Rectangle &) sd/source/ui/inc/unomodel.hxx:137 _Bool SdXImpressDocument::operator==(const SdXImpressDocument &) const sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx:199 @@ -3026,7 +3072,7 @@ starmath/inc/mathml/mathmlMo.hxx:88 enum moOpDF operator&(enum moOpDF,enum moOpDF) starmath/inc/mathml/mathmlMo.hxx:98 enum moOpDP operator&(enum moOpDP,enum moOpDP) -starmath/inc/mathml/starmathdatabase.hxx:294 +starmath/inc/mathml/starmathdatabase.hxx:286 struct SmColorTokenTableEntry starmathdatabase::Identify_Color_DVIPSNAMES(unsigned int) starmath/inc/node.hxx:508 SmNode * SmStructureNode::GetSubNodeBinMo(unsigned long) const @@ -3050,9 +3096,9 @@ starmath/inc/token.hxx:200 _Bool SmColorTokenTableEntry::equals(std::basic_string_view<char16_t>) const starmath/inc/token.hxx:207 _Bool SmColorTokenTableEntry::equals(Color) const -svgio/inc/svgstyleattributes.hxx:348 +svgio/inc/svgstyleattributes.hxx:352 svgio::svgreader::SvgNumber svgio::svgreader::SvgStyleAttributes::getStrokeDashOffset() const -svgio/inc/svgstyleattributes.hxx:372 +svgio/inc/svgstyleattributes.hxx:376 enum svgio::svgreader::FontStretch svgio::svgreader::SvgStyleAttributes::getFontStretch() const svgio/inc/svgtspannode.hxx:45 double svgio::svgreader::SvgTspanNode::getCurrentFontSize() const @@ -3072,8 +3118,6 @@ svl/source/misc/gridprinter.cxx:42 void rtl::mdds_mtv_prepend_values(mdds::mtv::base_element_block &,const rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &) svl/source/misc/gridprinter.cxx:42 void rtl::mdds_mtv_set_values(mdds::mtv::base_element_block &,unsigned long,const rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &) -svx/inc/galleryfilestorage.hxx:57 - const INetURLObject & GalleryFileStorage::GetStrURL() const svx/inc/sdr/contact/viewcontactofgraphic.hxx:52 SdrGrafObj & sdr::contact::ViewContactOfGraphic::GetGrafObject() sw/inc/calbck.hxx:305 @@ -3192,16 +3236,12 @@ sw/inc/IDocumentMarkAccess.hxx:105 _Bool IDocumentMarkAccess::iterator::operator>=(const IDocumentMarkAccess::iterator &) const sw/inc/modcfg.hxx:344 _Bool SwModuleOptions::IsFileEncryptedFromColumn() const -sw/inc/ndarr.hxx:226 - SwGrfNode * SwNodes::MakeGrfNode(SwNode &,const GraphicObject &,SwGrfFormatColl *) +sw/inc/ndgrf.hxx:64 + SwGrfNode::SwGrfNode(SwNode &,const GraphicObject &,SwGrfFormatColl *,const SwAttrSet *) sw/inc/ndindex.hxx:63 SwNodeIndex::SwNodeIndex(SwNodes &,int) sw/inc/ndindex.hxx:114 SwNodeIndex & SwNodeIndex::Assign(const SwNodes &,struct o3tl::strong_int<int, struct Tag_SwNodeOffset>) -sw/inc/ndindex.hxx:126 - std::basic_ostream<char> & operator<<(std::basic_ostream<char> &,const SwNodeIndex &) -sw/inc/ndtxt.hxx:543 - void SwTextNode::ClearLRSpaceItemDueToListLevelIndents(std::unique_ptr<SvxFirstLineIndentItem> &,std::unique_ptr<SvxTextLeftMarginItem> &) const sw/inc/node.hxx:261 const IDocumentStylePoolAccess & SwNode::getIDocumentStylePoolAccess() const sw/inc/node.hxx:265 @@ -3242,6 +3282,10 @@ sw/inc/swcrsr.hxx:311 SwTableCursor * SwTableCursor::GetPrev() sw/inc/swcrsr.hxx:312 const SwTableCursor * SwTableCursor::GetPrev() const +sw/inc/swmodule.hxx:178 + SvtAccessibilityOptions & SwModule::GetAccessibilityOptions() +sw/inc/swmodule.hxx:179 + SvtCTLOptions & SwModule::GetCTLOptions() sw/inc/swrect.hxx:102 SwRect & SwRect::operator-=(const Point &) sw/inc/swrect.hxx:108 @@ -3262,18 +3306,16 @@ sw/inc/viscrs.hxx:229 SwShellTableCursor * SwShellTableCursor::GetPrev() sw/inc/viscrs.hxx:230 const SwShellTableCursor * SwShellTableCursor::GetPrev() const -sw/qa/inc/swmodeltestbase.hxx:252 +sw/qa/inc/swmodeltestbase.hxx:245 com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> SwModelTestBase::getParagraphAnchoredObject(const int,const com::sun::star::uno::Reference<com::sun::star::text::XTextRange> &) const sw/source/core/access/accportions.cxx:55 unsigned long FindBreak(const vector<type-parameter-?-?, allocator<type-parameter-?-?> > &,type-parameter-?-?) sw/source/core/access/accportions.cxx:59 unsigned long FindLastBreak(const vector<type-parameter-?-?, allocator<type-parameter-?-?> > &,type-parameter-?-?) -sw/source/core/inc/AccessibilityIssue.hxx:52 +sw/source/core/inc/AccessibilityIssue.hxx:55 const std::vector<rtl::OUString> & sw::AccessibilityIssue::getAdditionalInfo() const -sw/source/core/inc/AccessibilityIssue.hxx:54 +sw/source/core/inc/AccessibilityIssue.hxx:57 void sw::AccessibilityIssue::setAdditionalInfo(std::vector<rtl::OUString> &&) -sw/source/core/inc/dflyobj.hxx:49 - SwFlyDrawObj::SwFlyDrawObj(SdrModel &,const SwFlyDrawObj &) sw/source/core/inc/frame.hxx:942 void SwFrame::dumpTopMostAsXml(struct _xmlTextWriter *) const sw/source/core/inc/frame.hxx:1389 @@ -3290,12 +3332,12 @@ sw/source/core/text/txtpaint.hxx:72 DbgBackColor::DbgBackColor(OutputDevice *,const _Bool) sw/source/core/text/txtpaint.hxx:79 DbgRect::DbgRect(OutputDevice *,const tools::Rectangle &,const _Bool,Color) -sw/source/filter/ww8/writerhelper.hxx:320 - void sw::util::DeduplicateItems(std::map<unsigned short, const SfxPoolItem *, sw::util::ItemSort> &) -sw/source/filter/ww8/ww8par.hxx:1920 - _Bool SwWW8ImplReader::SearchTableEnd(WW8PLCFx_Cp_FKP *) const +sw/source/filter/ww8/ww8par.hxx:1042 + WW8PostProcessAttrsInfo::WW8PostProcessAttrsInfo(int,int,SwPaM &) sw/source/uibase/inc/conttree.hxx:192 std::unique_ptr<weld::TreeIter> SwContentTree::GetEntryAtAbsPos(unsigned long) const +sw/source/uibase/inc/shdwcrsr.hxx:45 + tools::Rectangle SwShadowCursor::GetRect() const sw/source/uibase/inc/swcont.hxx:89 _Bool SwContent::operator==(const SwContent &) const sw/source/uibase/inc/unomod.hxx:36 @@ -3314,6 +3356,8 @@ ucb/source/ucp/gio/gio_mount.cxx:37 void * ooo_mount_operation_get_instance_private(struct OOoMountOperation *) unoxml/inc/node.hxx:116 void DOM::CNode::checkNoParent(const com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode> &) +vcl/inc/bitmap/BitmapWriteAccess.hxx:42 + void BitmapWriteAccess::SetPaletteEntryCount(unsigned short) vcl/inc/bitmap/BitmapWriteAccess.hxx:73 void BitmapWriteAccess::SetFillColor() vcl/inc/bitmap/ScanlineTools.hxx:23 @@ -3414,20 +3458,20 @@ vcl/inc/skia/utils.hxx:257 void SkiaHelper::dump(const SkBitmap &,const char *) vcl/inc/skia/zone.hxx:25 void SkiaZone::relaxWatchdogTimings() +vcl/inc/svdata.hxx:171 + void ImplSVAppData::LinkStubImplEndAllDialogsMsg(void *,void *) +vcl/inc/svdata.hxx:172 + void ImplSVAppData::LinkStubImplEndAllPopupsMsg(void *,void *) vcl/inc/unx/gtk/gtkframe.hxx:301 void GtkSalFrame::DrawingAreaFocusInOut(enum SalEvent) vcl/inc/unx/gtk/gtksalmenu.hxx:81 const GtkSalFrame * GtkSalMenu::GetFrame() const vcl/inc/unx/printergfx.hxx:93 _Bool psp::PrinterColor::operator!=(const psp::PrinterColor &) const -vcl/inc/unx/saldisp.hxx:96 - Color SalVisual::GetTCColor(unsigned long) const -vcl/inc/unx/saldisp.hxx:357 - _Bool SalDisplay::XIfEventWithTimeout(union _XEvent *,char *,int (*)(struct _XDisplay *, union _XEvent *, char *)) const +vcl/inc/unx/saldisp.hxx:155 + unsigned long SalColormap::GetPixel(std::optional<Color>) const vcl/inc/unx/salframe.h:188 enum SalFrameStyleFlags X11SalFrame::GetStyle() const -vcl/inc/unx/salgdi.h:78 - unsigned long X11Common::GetPixel(Color) const vcl/inc/unx/saltype.h:21 _Bool SalX11Screen::operator==(const SalX11Screen &) const vcl/qa/cppunit/lifecycle.cxx:197 @@ -3440,8 +3484,6 @@ vcl/source/edit/textdat2.hxx:87 __gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<const TETextPortion *, std::__cxx1998::vector<TETextPortion> >, std::vector<TETextPortion> > TETextPortionList::end() const vcl/source/filter/FilterConfigCache.hxx:70 rtl::OUString FilterConfigCache::GetImportFormatMediaType(unsigned short) -vcl/source/filter/graphicfilter_internal.hxx:25 - unsigned char * ImplSearchEntry(unsigned char *,const unsigned char *,unsigned long,unsigned long) vcl/source/fontsubset/xlat.hxx:30 unsigned short vcl::TranslateChar12(unsigned short) vcl/source/fontsubset/xlat.hxx:31 @@ -3492,13 +3534,11 @@ vcl/unx/gtk3/gloactiongroup.cxx:51 void * g_lo_action_get_instance_private(struct (anonymous namespace)::GLOAction *) vcl/unx/gtk3/glomenu.cxx:32 void * g_lo_menu_get_instance_private(struct GLOMenu *) -writerfilter/source/dmapper/DomainMapper_Impl.hxx:417 - writerfilter::dmapper::FloatingTableInfo::FloatingTableInfo(com::sun::star::uno::Reference<com::sun::star::text::XTextRange>,com::sun::star::uno::Reference<com::sun::star::text::XTextRange>,const com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> &,int,int,_Bool) -writerfilter/source/dmapper/DomainMapper_Impl.hxx:429 - com::sun::star::uno::Any writerfilter::dmapper::FloatingTableInfo::getPropertyValue(std::basic_string_view<char16_t>) -writerfilter/source/dmapper/DomainMapperTableManager.hxx:100 +writerfilter/source/dmapper/CellColorHandler.hxx:74 + model::ComplexColor writerfilter::dmapper::CellColorHandler::getComplexColor() const +writerfilter/source/dmapper/DomainMapperTableManager.hxx:98 writerfilter::dmapper::TablePositionHandler * writerfilter::dmapper::DomainMapperTableManager::getCurrentTableRealPosition() -writerfilter/source/dmapper/PropertyMap.hxx:378 +writerfilter/source/dmapper/PropertyMap.hxx:377 int writerfilter::dmapper::SectionPropertyMap::GetBreakType() const writerfilter/source/dmapper/TablePositionHandler.hxx:39 int writerfilter::dmapper::TablePositionHandler::getY() const diff --git a/compilerplugins/clang/unusedmethods.unused-returns.results b/compilerplugins/clang/unusedmethods.unused-returns.results index 0b2092e840d4..e72682757c4a 100644 --- a/compilerplugins/clang/unusedmethods.unused-returns.results +++ b/compilerplugins/clang/unusedmethods.unused-returns.results @@ -40,9 +40,9 @@ include/basic/sbstar.hxx:62 _Bool StarBASIC::RTError(ErrCode,const rtl::OUString &,int,int,int) include/comphelper/backupfilehelper.hxx:205 _Bool comphelper::BackupFileHelper::tryPush_extensionInfo(std::basic_string_view<char16_t>) -include/editeng/editview.hxx:267 +include/editeng/editview.hxx:277 ErrCode EditView::Read(SvStream &,enum EETextFormat,SvKeyValueIterator *) -include/editeng/outliner.hxx:280 +include/editeng/outliner.hxx:282 _Bool OutlinerView::Command(const CommandEvent &) include/oox/crypto/AgileEngine.hxx:120 _Bool oox::crypto::AgileEngine::decryptHmacKey() @@ -152,6 +152,8 @@ include/svx/dlgctrl.hxx:99 Point SvxRectCtl::SetActualRPWithoutInvalidate(enum RectPoint) include/svx/framelink.hxx:159 svx::frame::Style & svx::frame::Style::MirrorSelf() +include/svx/PaletteManager.hxx:85 + _Bool PaletteManager::GetLumModOff(unsigned short,unsigned short,short &,short &) include/test/a11y/AccessibilityTools.hxx:118 com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleContext> AccessibilityTools::getAccessibleObjectForName(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleContext> &,const short,std::basic_string_view<char16_t>,type-parameter-?-?...) include/test/a11y/AccessibilityTools.hxx:148 @@ -172,13 +174,13 @@ include/tools/multisel.hxx:94 _Bool StringRangeEnumerator::insertRange(int,int,_Bool) include/tools/urlobj.hxx:738 _Bool INetURLObject::SetParam(std::basic_string_view<char16_t>,enum INetURLObject::EncodeMechanism,unsigned short) -include/unotools/localedatawrapper.hxx:159 +include/unotools/localedatawrapper.hxx:163 const com::sun::star::uno::Sequence<struct com::sun::star::lang::Locale> & LocaleDataWrapper::getAllInstalledLocaleNames() const include/vcl/BinaryDataContainer.hxx:61 unsigned long BinaryDataContainer::writeToStream(SvStream &) const include/vcl/bitmap.hxx:263 _Bool Bitmap::Blend(const AlphaMask &,const Color &) -include/vcl/bitmapex.hxx:226 +include/vcl/bitmapex.hxx:227 _Bool BitmapEx::Rotate(struct o3tl::strong_int<short, struct FractionTag<10> >,const Color &) include/vcl/filter/SvmReader.hxx:36 SvStream & SvmReader::Read(GDIMetaFile &,struct ImplMetaReadData *) @@ -212,7 +214,7 @@ lotuswordpro/inc/lwpsvstream.hxx:81 LwpSvStream & LwpSvStream::ReadUInt16(unsigned short &) lotuswordpro/inc/lwpsvstream.hxx:82 LwpSvStream & LwpSvStream::ReadUInt32(unsigned int &) -sc/inc/column.hxx:677 +sc/inc/column.hxx:678 _Bool ScColumn::DeleteSparkline(int) sc/inc/orcusfilters.hxx:44 _Bool ScOrcusFilters::importODS_Styles(ScDocument &,rtl::OUString &) const @@ -272,7 +274,7 @@ sc/source/ui/vba/vbaformat.hxx:145 com::sun::star::uno::Any ScVbaFormat::getMergeCells() sc/source/ui/vba/vbaformat.hxx:151 com::sun::star::uno::Any ScVbaFormat::getReadingOrder() -sd/source/filter/eppt/pptx-epptooxml.cxx:135 +sd/source/filter/eppt/pptx-epptooxml.cxx:136 oox::drawingml::ShapeExport & oox::core::PowerPointShapeExport::WritePageShape(const com::sun::star::uno::Reference<com::sun::star::drawing::XShape> &,enum PageType,_Bool) sd/source/ui/inc/DrawViewShell.hxx:253 _Bool sd::DrawViewShell::SelectPage(unsigned short,unsigned short) @@ -292,13 +294,13 @@ slideshow/source/engine/animationnodes/animationbasenode.hxx:62 _Bool slideshow::internal::AnimationBaseNode::enqueueActivity() const svl/source/fsstor/fsstorage.hxx:56 ucbhelper::Content & FSStorage::GetContent() -svx/inc/galleryfilestorage.hxx:103 +svx/inc/galleryfilestorage.hxx:102 SvStream & GalleryFileStorage::writeGalleryTheme(SvStream &,const GalleryTheme &,const GalleryThemeEntry *) svx/inc/galleryfilestorageentry.hxx:56 std::unique_ptr<GalleryTheme> & GalleryFileStorageEntry::getCachedTheme(std::unique_ptr<GalleryTheme> &) sw/inc/calc.hxx:125 SwSbxValue & SwSbxValue::MakeDouble() -sw/inc/crsrsh.hxx:599 +sw/inc/crsrsh.hxx:600 _Bool SwCursorShell::TrySelectOuterTable() sw/inc/docary.hxx:300 _Bool SwExtraRedlineTable::DeleteAllTableRedlines(SwDoc &,const SwTable &,_Bool,enum RedlineType) @@ -308,11 +310,11 @@ sw/inc/docary.hxx:302 _Bool SwExtraRedlineTable::DeleteTableCellRedline(SwDoc *,const SwTableBox &,_Bool,enum RedlineType) sw/inc/editsh.hxx:493 _Bool SwEditShell::OutlineUpDown(short) -sw/inc/editsh.hxx:649 +sw/inc/editsh.hxx:656 const GraphicAttr * SwEditShell::GetGraphicAttr(GraphicAttr &) const -sw/inc/editsh.hxx:662 +sw/inc/editsh.hxx:669 _Bool SwEditShell::GetGrfSize(Size &) const -sw/inc/editsh.hxx:827 +sw/inc/editsh.hxx:834 unsigned short SwEditShell::GetRefMarks(std::vector<rtl::OUString> *) const sw/inc/IDocumentUndoRedo.hxx:99 _Bool IDocumentUndoRedo::Undo() @@ -396,7 +398,7 @@ vcl/inc/salprn.hxx:113 _Bool SalPrinter::EndJob() vcl/inc/salvtables.hxx:1771 _Bool SalInstanceTreeView::get_iter_abs_pos(weld::TreeIter &,int) const -vcl/inc/unx/gtk/gtkdata.hxx:336 +vcl/inc/unx/gtk/gtkdata.hxx:337 int GtkSalDisplay::CaptureMouse(SalFrame *) vcl/inc/unx/salframe.h:169 _Bool X11SalFrame::Dispatch(union _XEvent *) @@ -412,9 +414,9 @@ workdir/../vcl/inc/qt5/QtXAccessible.hxx:27 QString QtXAccessible::tr(const char *,const char *,int) workdir/../vcl/inc/qt5/QtXAccessible.hxx:27 QString QtXAccessible::trUtf8(const char *,const char *,int) -workdir/../vcl/unx/kf5/KF5FilePicker.hxx:29 - QString KF5FilePicker::tr(const char *,const char *,int) -workdir/../vcl/unx/kf5/KF5FilePicker.hxx:29 - QString KF5FilePicker::trUtf8(const char *,const char *,int) +workdir/../vcl/unx/kf5/KFFilePicker.hxx:29 + QString KFFilePicker::tr(const char *,const char *,int) +workdir/../vcl/unx/kf5/KFFilePicker.hxx:29 + QString KFFilePicker::trUtf8(const char *,const char *,int) writerfilter/source/dmapper/TagLogger.hxx:59 typename enable_if<std::is_integral_v<T>, void>::type writerfilter::TagLogger::attribute(const std::basic_string<char> &,type-parameter-?-?) diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 5f9e9fe16a45..22cdefdd6c31 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -625,14 +625,6 @@ using namespace ::com::sun::star; impl_setURL( _rURL, true); } - OUString OPostgresConnectionPageSetup::impl_getURL() const - { - // get the pure text - OUString sURL = m_xConnectionURL->GetTextNoPrefix(); - OSL_ENSURE( m_pCollection, "OConnectionHelper::impl_getURL: have no interpreter for the URLs!" ); - return sURL; - } - // OMySQLJDBCConnectionPageSetup OJDBCConnectionPageSetup::OJDBCConnectionPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs) : OConnectionTabPageSetup(pPage, pController, "dbaccess/ui/jdbcconnectionpage.ui", "JDBCConnectionPage", rCoreAttrs, diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 776337ebacb1..909cfede5806 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -248,9 +248,7 @@ namespace dbaui void impl_setURL( std::u16string_view _rURL, bool _bPrefix ); void setURLNoPrefix( std::u16string_view _rURL ); void setURL( std::u16string_view _rURL ); - OUString impl_getURL() const; bool commitURL(); - }; diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx index c3a672499ef5..e4d0386cf2c0 100644 --- a/editeng/source/outliner/outlin2.cxx +++ b/editeng/source/outliner/outlin2.cxx @@ -108,11 +108,6 @@ void Outliner::SetModifyHdl( const Link<LinkParamNone*,void>& rLink ) pEditEngine->SetModifyHdl( rLink ); } -Link<LinkParamNone*,void> const & Outliner::GetModifyHdl() const -{ - return pEditEngine->GetModifyHdl(); -} - void Outliner::SetNotifyHdl( const Link<EENotify&,void>& rLink ) { pEditEngine->aOutlinerNotifyHdl = rLink; diff --git a/i18npool/source/localedata/LocaleNode.hxx b/i18npool/source/localedata/LocaleNode.hxx index e5d45f4cef42..495c696b4291 100644 --- a/i18npool/source/localedata/LocaleNode.hxx +++ b/i18npool/source/localedata/LocaleNode.hxx @@ -49,7 +49,6 @@ public: void writeOUStringRefFunction2(const char *func, std::u16string_view useLocale) const; void writeOUStringFunction3(const char *func, const char *style, const char* levels, const char* attr, const char *array) const; void writeOUStringRefFunction3(const char *func, std::u16string_view useLocale) const; - void writeIntParameter(const char* pAsciiStr, const sal_Int16 count, sal_Int16 val) const; void writeOUStringLiteralIntParameter(const char* pAsciiStr, const sal_Int16 count, sal_Int16 val) const; bool writeOUStringLiteralDefaultParameter(const char* pAsciiStr, std::u16string_view str, sal_Int16 count) const; void writeOUStringLiteralParameter(const char* pAsciiStr, std::u16string_view aChars) const; diff --git a/i18npool/source/localedata/filewriter.cxx b/i18npool/source/localedata/filewriter.cxx index d9167ed1e950..5f0fabe66ab0 100644 --- a/i18npool/source/localedata/filewriter.cxx +++ b/i18npool/source/localedata/filewriter.cxx @@ -132,11 +132,6 @@ void OFileWriter::writeOUStringRefFunction3(const char *func, std::u16string_vie fprintf(m_f, "\treturn %s%s(nStyles, nLevels, nAttributes);\n}\n", func, locale); } -void OFileWriter::writeIntParameter(const char* pAsciiStr, const sal_Int16 count, sal_Int16 val) const -{ - fprintf(m_f, "static const sal_Unicode %s%d[] = {%d};\n", pAsciiStr, count, val); -} - void OFileWriter::writeOUStringLiteralIntParameter(const char* pAsciiStr, const sal_Int16 count, sal_Int16 val) const { fprintf(m_f, "static constexpr OUStringLiteral %s%d = u\"\\x%x\";\n", pAsciiStr, count, val); diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 0b9b06395dba..71ffd00a73e4 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -784,7 +784,6 @@ public: void SetPaintFirstLineHdl(const Link<PaintFirstLineInfo*,void>& rLink) { maPaintFirstLineHdl = rLink; } void SetModifyHdl( const Link<LinkParamNone*,void>& rLink ); - Link<LinkParamNone*,void> const & GetModifyHdl() const; void SetNotifyHdl( const Link<EENotify&,void>& rLink ); diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx index e34985c799d3..64644b772d64 100644 --- a/include/sfx2/thumbnailviewitem.hxx +++ b/include/sfx2/thumbnailviewitem.hxx @@ -100,8 +100,6 @@ public: bool isPinned () const { return mbPinned; } - void setPinned (bool state); - /** Updates own highlight status based on the aPoint position. Returns rectangle that needs to be invalidated. diff --git a/include/svl/SfxBroadcaster.hxx b/include/svl/SfxBroadcaster.hxx index fba30061f574..b026f4c7e4a6 100644 --- a/include/svl/SfxBroadcaster.hxx +++ b/include/svl/SfxBroadcaster.hxx @@ -57,10 +57,6 @@ public: return true to break the loop. */ void ForAllListeners(std::function<bool(SfxListener*)> f) const; - /** Get a vector of the current listeners - used by unit test code. - */ - std::vector<SfxListener*> GetListenersForUnitTest() const; - friend class SfxListener; friend class ::SfxBroadcasterTest; }; diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx index e43b1bf00d0b..aeb364a985dc 100644 --- a/include/svx/svdview.hxx +++ b/include/svx/svdview.hxx @@ -232,8 +232,6 @@ public: // and more... OUString GetStatusText(); - SvtAccessibilityOptions& getAccessibilityOptions() { return maAccessibilityOptions;} - virtual void onAccessibilityOptionsChanged(); // Do not create ObjectContact locally, but offer a call to allow override diff --git a/include/vcl/menubarupdateicon.hxx b/include/vcl/menubarupdateicon.hxx deleted file mode 100644 index 99aea9581a4f..000000000000 --- a/include/vcl/menubarupdateicon.hxx +++ /dev/null @@ -1,93 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#pragma once - -#include <tools/link.hxx> -#include <vcl/idle.hxx> -#include <vcl/image.hxx> - -class BubbleWindow; -class MenuBar; -class SystemWindow; -class VclSimpleEvent; -class VclWindowEvent; -struct MenuBarButtonCallbackArg; - -class VCL_DLLPUBLIC MenuBarUpdateIconManager -{ -private: - OUString maBubbleTitle; - OUString maBubbleText; - Image maBubbleImage; - VclPtr<BubbleWindow> mpBubbleWin; - VclPtr<SystemWindow> mpActiveSysWin; - VclPtr<MenuBar> mpActiveMBar; - std::vector<VclPtr<MenuBar>> maIconMBars; - std::vector<sal_uInt16> maIconIDs; - - Link<VclWindowEvent&, void> maWindowEventHdl; - Link<VclSimpleEvent&, void> maApplicationEventHdl; - Link<LinkParamNone*, void> maClickHdl; - - Timer maTimeoutTimer; - Idle maWaitIdle; - - bool mbShowMenuIcon; - bool mbShowBubble; - bool mbBubbleChanged; - - DECL_DLLPRIVATE_LINK(UserEventHdl, void*, void); - DECL_DLLPRIVATE_LINK(TimeOutHdl, Timer*, void); - DECL_DLLPRIVATE_LINK(WindowEventHdl, VclWindowEvent&, void); - DECL_DLLPRIVATE_LINK(ApplicationEventHdl, VclSimpleEvent&, void); - DECL_DLLPRIVATE_LINK(WaitTimeOutHdl, Timer*, void); - DECL_DLLPRIVATE_LINK(ClickHdl, MenuBarButtonCallbackArg&, bool); - DECL_DLLPRIVATE_LINK(HighlightHdl, MenuBarButtonCallbackArg&, bool); - - VclPtr<BubbleWindow> GetBubbleWindow(); - void SetBubbleChanged(); - - sal_uInt16 GetIconID(MenuBar* pMenuBar) const; - - void AddMenuBarIcon(SystemWindow& rSysWin, bool bAddEventHdl); - void RemoveMenuBarIcon(MenuBar* pMenuBar); - void RemoveMenuBarIcons(); - -public: - MenuBarUpdateIconManager(); - ~MenuBarUpdateIconManager(); - - void SetShowMenuIcon(bool bShowMenuIcon); - void SetShowBubble(bool bShowBubble); - void SetBubbleImage(const Image& rImage); - void SetBubbleTitle(const OUString& rTitle); - void SetBubbleText(const OUString& rText); - - void SetClickHdl(const Link<LinkParamNone*, void>& rHdl) { maClickHdl = rHdl; } - - bool GetShowMenuIcon() const { return mbShowMenuIcon; } - bool GetShowBubble() const { return mbShowBubble; } - const OUString& GetBubbleTitle() const { return maBubbleTitle; } - const OUString& GetBubbleText() const { return maBubbleText; } - - void RemoveBubbleWindow(); -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index 89c524784776..f95da4a46280 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -186,8 +186,6 @@ public: ScNavipiCfg& GetNavipiCfg(); ScAddInCfg& GetAddInCfg(); svtools::ColorConfig& GetColorConfig(); - SvtAccessibilityOptions& GetAccessOptions(); - SvtCTLOptions& GetCTLOptions(); SC_DLLPUBLIC SvtUserOptions& GetUserOptions(); void ModifyOptions( const SfxItemSet& rOptSet ); diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 1a62a7e56321..1742aa4a43fd 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -983,11 +983,9 @@ public: SCROW FirstVisibleRow(SCROW nStartRow, SCROW nEndRow) const; SCROW LastVisibleRow(SCROW nStartRow, SCROW nEndRow) const; SCROW CountVisibleRows(SCROW nStartRow, SCROW nEndRow) const; - SCROW CountHiddenRows(SCROW nStartRow, SCROW nEndRow) const; tools::Long GetTotalRowHeight(SCROW nStartRow, SCROW nEndRow, bool bHiddenAsZero = true) const; SCCOL CountVisibleCols(SCCOL nStartCol, SCCOL nEndCol) const; - SCCOL CountHiddenCols(SCCOL nStartCol, SCCOL nEndCol) const; SCCOLROW LastHiddenColRow(SCCOLROW nPos, bool bCol) const; diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx index a238cde6c32d..39837464ca71 100644 --- a/sc/source/core/data/table5.cxx +++ b/sc/source/core/data/table5.cxx @@ -776,27 +776,6 @@ SCROW ScTable::CountVisibleRows(SCROW nStartRow, SCROW nEndRow) const return nCount; } -SCROW ScTable::CountHiddenRows(SCROW nStartRow, SCROW nEndRow) const -{ - SCROW nCount = 0; - SCROW nRow = nStartRow; - ScFlatBoolRowSegments::RangeData aData; - while (nRow <= nEndRow) - { - if (!mpHiddenRows->getRangeData(nRow, aData)) - break; - - if (aData.mnRow2 > nEndRow) - aData.mnRow2 = nEndRow; - - if (aData.mbValue) - nCount += aData.mnRow2 - nRow + 1; - - nRow = aData.mnRow2 + 1; - } - return nCount; -} - tools::Long ScTable::GetTotalRowHeight(SCROW nStartRow, SCROW nEndRow, bool bHiddenAsZero) const { tools::Long nHeight = 0; @@ -842,27 +821,6 @@ SCCOL ScTable::CountVisibleCols(SCCOL nStartCol, SCCOL nEndCol) const return nCount; } -SCCOL ScTable::CountHiddenCols(SCCOL nStartCol, SCCOL nEndCol) const -{ - SCCOL nCount = 0; - SCCOL nCol = nStartCol; - ScFlatBoolColSegments::RangeData aData; - while (nCol <= nEndCol) - { - if (!mpHiddenCols->getRangeData(nCol, aData)) - break; - - if (aData.mnCol2 > nEndCol) - aData.mnCol2 = nEndCol; - - if (aData.mbValue) - nCount += aData.mnCol2 - nCol + 1; - - nCol = aData.mnCol2 + 1; - } - return nCount; -} - SCCOLROW ScTable::LastHiddenColRow(SCCOLROW nPos, bool bCol) const { if (bCol) diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index ed36be728df3..b78d9fea6750 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -895,28 +895,6 @@ svtools::ColorConfig& ScModule::GetColorConfig() return *m_pColorConfig; } -SvtAccessibilityOptions& ScModule::GetAccessOptions() -{ - if ( !m_pAccessOptions ) - { - m_pAccessOptions.reset( new SvtAccessibilityOptions ); - m_pAccessOptions->AddListener(this); - } - - return *m_pAccessOptions; -} - -SvtCTLOptions& ScModule::GetCTLOptions() -{ - if ( !m_pCTLOptions ) - { - m_pCTLOptions.reset( new SvtCTLOptions ); - m_pCTLOptions->AddListener(this); - } - - return *m_pCTLOptions; -} - SvtUserOptions& ScModule::GetUserOptions() { if( !m_pUserOptions ) diff --git a/sc/source/ui/drawfunc/fusel2.cxx b/sc/source/ui/drawfunc/fusel2.cxx index 0d18fea87d00..4ce7c2be290d 100644 --- a/sc/source/ui/drawfunc/fusel2.cxx +++ b/sc/source/ui/drawfunc/fusel2.cxx @@ -146,14 +146,4 @@ bool FuSelection::IsNoteCaptionClicked( const Point& rPos ) const return false; } -void FuSelection::ActivateNoteHandles(SdrObject* pObject) -{ - if( pView && ScDrawLayer::IsNoteCaption( pObject ) ) - { - // Leave the internal layer unlocked - relock in ScDrawView::MarkListHasChanged() - pView->UnlockInternalLayer(); - pView->MarkObj( pObject, pView->GetSdrPageView() ); - } -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxx index 2326e5ad7d99..fcb5815630da 100644 --- a/sc/source/ui/inc/fusel.hxx +++ b/sc/source/ui/inc/fusel.hxx @@ -36,8 +36,6 @@ public: virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; - void ActivateNoteHandles(SdrObject* pObj); - private: bool TestDetective( const SdrPageView* pPV, const Point& rPos ); // -> fusel2 diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index d3047cdeaf94..bf20af800f7e 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -252,7 +252,6 @@ public: */ bool SelectPage(sal_uInt16 nPage, sal_uInt16 nSelect); bool IsSelected(sal_uInt16 nPage); - bool IsVisible(sal_uInt16 nPage); void GotoBookmark(std::u16string_view rBookmark); //Realize multi-selection of objects, If object is marked, the diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx index c922e5ce4238..cbd15bd6ac11 100644 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -122,8 +122,6 @@ public: */ ViewShellBase* GetViewShellBase() const { return mpViewShellBase;} - void Paint (const ::tools::Rectangle& rRepaintArea); - /** Place and size the controls and windows. You may want to call this method when something has changed that for instance affects the visibility state of the scroll bars. diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 534a7aa2fbf6..3428f1980468 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -158,13 +158,6 @@ Reference<frame::XController> SlideSorter::GetXController() const return xController; } -void SlideSorter::Paint (const ::tools::Rectangle& rRepaintArea) -{ - GetController().Paint( - rRepaintArea, - GetContentWindow()); -} - void SlideSorter::SetupControls() { GetVerticalScrollBar()->Show(); diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index e41e87b08d55..f9378e1ec4fd 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -821,16 +821,6 @@ bool DrawViewShell::IsSelected(sal_uInt16 nPage) return false; } -bool DrawViewShell::IsVisible(sal_uInt16 nPage) -{ - slidesorter::SlideSorterViewShell* pVShell - = slidesorter::SlideSorterViewShell::GetSlideSorter(GetViewShellBase()); - if (pVShell != nullptr) - return pVShell->GetSlideSorter().GetController().GetPageSelector().IsPageVisible(nPage); - - return false; -} - /** * Switch to desired page. * nSelectPage refers to the current EditMode diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx index 077a9b3c6bcc..b2c3ef75274b 100644 --- a/sfx2/source/control/thumbnailviewitem.cxx +++ b/sfx2/source/control/thumbnailviewitem.cxx @@ -86,11 +86,6 @@ void ThumbnailViewItem::setHighlight (bool state) mbHover = state; } -void ThumbnailViewItem::setPinned (bool state) -{ - mbPinned = state; -} - ::tools::Rectangle ThumbnailViewItem::updateHighlight(bool bVisible, const Point& rPoint) { bool bNeedsPaint = false; diff --git a/svl/source/notify/SfxBroadcaster.cxx b/svl/source/notify/SfxBroadcaster.cxx index c1c5bee51f34..e9b0e1e1a552 100644 --- a/svl/source/notify/SfxBroadcaster.cxx +++ b/svl/source/notify/SfxBroadcaster.cxx @@ -141,18 +141,6 @@ void SfxBroadcaster::ForAllListeners(std::function<bool(SfxListener*)> f) const } } -std::vector<SfxListener*> SfxBroadcaster::GetListenersForUnitTest() const -{ - std::vector<SfxListener*> rv; - for (size_t i = 0; i < m_Listeners.size(); ++i) - { - SfxListener* const pListener = m_Listeners[i]; - if (pListener) - rv.push_back(pListener); - } - return rv; -} - bool SfxBroadcaster::HasListeners() const { return GetListenerCount() != 0; } size_t SfxBroadcaster::GetListenerCount() const diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 7acfb62b371d..955ada009aae 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -61,10 +61,6 @@ class SW_DLLPUBLIC SwGrfNode final: public SwNoTextNode std::u16string_view rGrfName, const OUString& rFltName, SwGrfFormatColl* pGrfColl, SwAttrSet const * pAutoAttr ); - SwGrfNode( SwNode& rWhere, - const GraphicObject& rGrfObj, - SwGrfFormatColl* pGrfColl, - SwAttrSet const * pAutoAttr ); void InsertLink( std::u16string_view rGrfName, const OUString& rFltName ); diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index e3bc91614c08..03140bf6220d 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -175,8 +175,6 @@ public: SwToolbarConfigItem*GetWebToolbarConfig() { return m_pWebToolbarConfig.get(); } SwDBConfig* GetDBConfig(); svtools::ColorConfig& GetColorConfig(); - SvtAccessibilityOptions& GetAccessibilityOptions(); - SvtCTLOptions& GetCTLOptions(); SvtUserOptions& GetUserOptions(); // Iterate over views. diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 5d7d60052926..7a26709a8de3 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -76,21 +76,6 @@ SwGrfNode::SwGrfNode( ReRead(rGrfName, rFltName, pGraphic, false); } -SwGrfNode::SwGrfNode( SwNode& rWhere, - const GraphicObject& rGrfObj, - SwGrfFormatColl *pGrfColl, - SwAttrSet const * pAutoAttr ) : - SwNoTextNode( rWhere, SwNodeType::Grf, pGrfColl, pAutoAttr ), - maGrfObj(rGrfObj), - mbInBaseLinkSwapIn(true), - // #i73788# - mbLinkedInputStreamReady( false ), - mbIsStreamReadOnly( false ) -{ - mbInSwapIn = mbChangeTwipSize = - mbFrameInPaint = mbScaleImageMap = false; -} - /** Create new SW/G reader. * * Use this ctor if you want to read a linked graphic. diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 26a08b03c00b..3222db5688a9 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -1074,26 +1074,6 @@ svtools::ColorConfig& SwModule::GetColorConfig() return *m_pColorConfig; } -SvtAccessibilityOptions& SwModule::GetAccessibilityOptions() -{ - if(!m_pAccessibilityOptions) - { - m_pAccessibilityOptions.reset(new SvtAccessibilityOptions); - m_pAccessibilityOptions->AddListener(this); - } - return *m_pAccessibilityOptions; -} - -SvtCTLOptions& SwModule::GetCTLOptions() -{ - if(!m_pCTLOptions) - { - m_pCTLOptions.reset(new SvtCTLOptions); - m_pCTLOptions->AddListener(this); - } - return *m_pCTLOptions; -} - SvtUserOptions& SwModule::GetUserOptions() { if(!m_pUserOptions) diff --git a/sw/source/uibase/inc/shdwcrsr.hxx b/sw/source/uibase/inc/shdwcrsr.hxx index 4118b3965a99..c3743077818b 100644 --- a/sw/source/uibase/inc/shdwcrsr.hxx +++ b/sw/source/uibase/inc/shdwcrsr.hxx @@ -40,8 +40,6 @@ public: ~SwShadowCursor(); void SetPos( const Point& rPt, tools::Long nHeight, sal_uInt16 nMode ); - - tools::Rectangle GetRect() const; }; #endif diff --git a/sw/source/uibase/utlui/shdwcrsr.cxx b/sw/source/uibase/utlui/shdwcrsr.cxx index 71c2b6ca4ba6..f89787840872 100644 --- a/sw/source/uibase/utlui/shdwcrsr.cxx +++ b/sw/source/uibase/utlui/shdwcrsr.cxx @@ -53,25 +53,4 @@ void SwShadowCursor::DrawCursor( sal_uInt16 nMode ) m_pWin->SetPointer(PointerStyle::AutoScrollW); } -tools::Rectangle SwShadowCursor::GetRect() const -{ - tools::Long nH = m_nOldHeight; - Point aPt( m_aOldPt ); - - nH = (((nH / 4)+1) * 4) + 1; - tools::Long nWidth = nH / 4 + 3 + 1; - - Size aSz( nWidth, nH ); - - if( text::HoriOrientation::RIGHT == m_nOldMode ) - aPt.AdjustX( -(aSz.Width()) ); - else if( text::HoriOrientation::CENTER == m_nOldMode ) - { - aPt.AdjustX( -(aSz.Width()) ); - aSz.setWidth( aSz.Width() * 2 ); - } - - return m_pWin->PixelToLogic( tools::Rectangle( aPt, aSz ) ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/bitmap/BitmapWriteAccess.hxx b/vcl/inc/bitmap/BitmapWriteAccess.hxx index bc903769d679..216eb16806e4 100644 --- a/vcl/inc/bitmap/BitmapWriteAccess.hxx +++ b/vcl/inc/bitmap/BitmapWriteAccess.hxx @@ -39,13 +39,6 @@ public: mpBuffer->maPalette = rPalette; } - void SetPaletteEntryCount(sal_uInt16 nCount) - { - assert(mpBuffer && "Access is not valid!"); - - mpBuffer->maPalette.SetEntryCount(nCount); - } - void SetPaletteColor(sal_uInt16 nColor, const BitmapColor& rBitmapColor) { assert(mpBuffer && "Access is not valid!"); diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 448262492054..ad788f3a1345 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -168,8 +168,6 @@ struct ImplSVAppData bool m_bUseSystemLoop = false; DECL_STATIC_LINK(ImplSVAppData, ImplQuitMsg, void*, void); - DECL_STATIC_LINK(ImplSVAppData, ImplEndAllDialogsMsg, void*, void); - DECL_STATIC_LINK(ImplSVAppData, ImplEndAllPopupsMsg, void*, void); }; /// Cache multiple scalings for the same bitmap diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 867393896233..0aad2b684d61 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -152,7 +152,6 @@ public: int r, int g, int b ) const; - Pixel GetPixel( std::optional<Color> nColor ) const; }; class SalI18N_InputMethod; diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 6ee03f1ed9d4..535af17dfb87 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -290,23 +290,6 @@ const vcl::KeyCode* Application::GetReservedKeyCode( size_t i ) return &ReservedKeys[i]; } -IMPL_STATIC_LINK_NOARG( ImplSVAppData, ImplEndAllPopupsMsg, void*, void ) -{ - ImplSVData* pSVData = ImplGetSVData(); - while (pSVData->mpWinData->mpFirstFloat) - pSVData->mpWinData->mpFirstFloat->EndPopupMode(FloatWinPopupEndFlags::Cancel); -} - -IMPL_STATIC_LINK_NOARG( ImplSVAppData, ImplEndAllDialogsMsg, void*, void ) -{ - vcl::Window* pAppWindow = Application::GetFirstTopLevelWindow(); - while (pAppWindow) - { - vcl::EndAllDialogs(pAppWindow); - pAppWindow = Application::GetNextTopLevelWindow(pAppWindow); - } -} - void Application::notifyWindow(vcl::LOKWindowId /*nLOKWindowId*/, const OUString& /*rAction*/, const std::vector<vcl::LOKPayloadItem>& /*rPayload = std::vector<LOKPayloadItem>()*/) const diff --git a/vcl/source/window/bubblewindow.cxx b/vcl/source/window/bubblewindow.cxx index 9b8432a14a9a..fa04cec00fa3 100644 --- a/vcl/source/window/bubblewindow.cxx +++ b/vcl/source/window/bubblewindow.cxx @@ -19,7 +19,6 @@ #include <rtl/ustrbuf.hxx> #include <utility> -#include <vcl/menubarupdateicon.hxx> #include <vcl/lineinfo.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> @@ -215,377 +214,4 @@ void BubbleWindow::RecalcTextRects() maTextRect.Move( 2*BUBBLE_BORDER, BUBBLE_BORDER + TIP_HEIGHT + maTitleRect.GetHeight() + aBoldFont.GetFontHeight() * 3 / 4 ); } -MenuBarUpdateIconManager::MenuBarUpdateIconManager() - : maTimeoutTimer("MenuBarUpdateIconManager") - , maWaitIdle("vcl MenuBarUpdateIconManager maWaitIdle") - , mbShowMenuIcon(false) - , mbShowBubble(false) - , mbBubbleChanged( false ) -{ - maTimeoutTimer.SetTimeout( 10000 ); - maTimeoutTimer.SetInvokeHandler(LINK(this, MenuBarUpdateIconManager, TimeOutHdl)); - - maWaitIdle.SetPriority( TaskPriority::LOWEST ); - maWaitIdle.SetInvokeHandler(LINK(this, MenuBarUpdateIconManager, WaitTimeOutHdl)); - - maApplicationEventHdl = LINK(this, MenuBarUpdateIconManager, ApplicationEventHdl); - Application::AddEventListener( maApplicationEventHdl ); - - maWindowEventHdl = LINK(this, MenuBarUpdateIconManager, WindowEventHdl); -} - -sal_uInt16 MenuBarUpdateIconManager::GetIconID(MenuBar* pMenuBar) const -{ - auto aI = std::find(maIconMBars.begin(), maIconMBars.end(), pMenuBar); - if (aI == maIconMBars.end()) - return 0; - return maIconIDs[std::distance(maIconMBars.begin(), aI)]; -} - -VclPtr<BubbleWindow> MenuBarUpdateIconManager::GetBubbleWindow() -{ - if (!mpActiveSysWin) - return nullptr; - - tools::Rectangle aIconRect = mpActiveMBar->GetMenuBarButtonRectPixel(GetIconID(mpActiveMBar)); - if( aIconRect.IsEmpty() ) - return nullptr; - - auto pBubbleWin = mpBubbleWin; - - if ( !pBubbleWin ) { - pBubbleWin = VclPtr<BubbleWindow>::Create( mpActiveSysWin, maBubbleTitle, - maBubbleText, maBubbleImage ); - mbBubbleChanged = false; - } - else if ( mbBubbleChanged ) { - pBubbleWin->SetTitleAndText( maBubbleTitle, maBubbleText, - maBubbleImage ); - mbBubbleChanged = false; - } - - Point aWinPos = aIconRect.BottomCenter(); - - pBubbleWin->SetTipPosPixel( aWinPos ); - - return pBubbleWin; -} - -IMPL_LINK_NOARG(MenuBarUpdateIconManager, TimeOutHdl, Timer *, void) -{ - RemoveBubbleWindow(); -} - -IMPL_LINK(MenuBarUpdateIconManager, WindowEventHdl, VclWindowEvent&, rEvent, void) -{ - VclEventId nEventID = rEvent.GetId(); - - if ( VclEventId::ObjectDying == nEventID ) - { - if (mpActiveSysWin == rEvent.GetWindow()) - { - RemoveBubbleWindow(); - mpActiveSysWin = nullptr; - mpActiveMBar = nullptr; - } - } - else if ( VclEventId::WindowMenubarAdded == nEventID ) - { - vcl::Window *pWindow = rEvent.GetWindow(); - if ( pWindow ) - { - SystemWindow *pSysWin = pWindow->GetSystemWindow(); - if (pSysWin) - AddMenuBarIcon(*pSysWin, false); - } - } - else if ( VclEventId::WindowMenubarRemoved == nEventID ) - { - MenuBar *pMBar = static_cast<MenuBar*>(rEvent.GetData()); - if (pMBar) - { - if (pMBar == mpActiveMBar) - { - RemoveBubbleWindow(); - mpActiveMBar = nullptr; - } - RemoveMenuBarIcon(pMBar); - } - } - else if ( ( nEventID == VclEventId::WindowMove ) || - ( nEventID == VclEventId::WindowResize ) ) - { - if ( mpActiveSysWin == rEvent.GetWindow() && - mpBubbleWin && mpActiveMBar ) - { - tools::Rectangle aIconRect = mpActiveMBar->GetMenuBarButtonRectPixel(GetIconID(mpActiveMBar)); - Point aWinPos = aIconRect.BottomCenter(); - mpBubbleWin->SetTipPosPixel( aWinPos ); - if ( mpBubbleWin->IsVisible() ) - mpBubbleWin->Show(); // This will recalc the screen position of the bubble - } - } -} - -IMPL_LINK(MenuBarUpdateIconManager, ApplicationEventHdl, VclSimpleEvent&, rEvent, void) -{ - switch (rEvent.GetId()) - { - case VclEventId::WindowShow: - case VclEventId::WindowActivate: - case VclEventId::WindowGetFocus: { - - vcl::Window *pWindow = static_cast< VclWindowEvent * >(&rEvent)->GetWindow(); - if ( pWindow && pWindow->IsTopWindow() ) - { - SystemWindow *pSysWin = pWindow->GetSystemWindow(); - MenuBar *pMBar = pSysWin ? pSysWin->GetMenuBar() : nullptr; - if (pMBar) - AddMenuBarIcon(*pSysWin, true); - } - break; - } - default: break; - } -} - -IMPL_LINK_NOARG(MenuBarUpdateIconManager, UserEventHdl, void*, void) -{ - vcl::Window *pTopWin = Application::GetFirstTopLevelWindow(); - vcl::Window *pActiveWin = Application::GetActiveTopWindow(); - SystemWindow *pActiveSysWin = nullptr; - - vcl::Window *pBubbleWin = nullptr; - if ( mpBubbleWin ) - pBubbleWin = mpBubbleWin; - - if ( pActiveWin && ( pActiveWin != pBubbleWin ) && pActiveWin->IsTopWindow() ) - pActiveSysWin = pActiveWin->GetSystemWindow(); - - if ( pActiveWin == pBubbleWin ) - pActiveSysWin = nullptr; - - while ( !pActiveSysWin && pTopWin ) - { - if ( ( pTopWin != pBubbleWin ) && pTopWin->IsTopWindow() ) - pActiveSysWin = pTopWin->GetSystemWindow(); - if ( !pActiveSysWin ) - pTopWin = Application::GetNextTopLevelWindow( pTopWin ); - } - - if ( pActiveSysWin ) - AddMenuBarIcon(*pActiveSysWin, true); -} - -IMPL_LINK_NOARG(MenuBarUpdateIconManager, ClickHdl, MenuBarButtonCallbackArg&, bool) -{ - maWaitIdle.Stop(); - if ( mpBubbleWin ) - mpBubbleWin->Show( false ); - - maClickHdl.Call(nullptr); - - return false; -} - -IMPL_LINK(MenuBarUpdateIconManager, HighlightHdl, MenuBarButtonCallbackArg&, rData, bool) -{ - if ( rData.bHighlight ) - maWaitIdle.Start(); - else - RemoveBubbleWindow(); - - return false; -} - -IMPL_LINK_NOARG(MenuBarUpdateIconManager, WaitTimeOutHdl, Timer *, void) -{ - mpBubbleWin = GetBubbleWindow(); - - if ( mpBubbleWin ) - { - mpBubbleWin->Show(); - } -} - -MenuBarUpdateIconManager::~MenuBarUpdateIconManager() -{ - Application::RemoveEventListener( maApplicationEventHdl ); - - RemoveBubbleWindow(); - RemoveMenuBarIcons(); -} - -void MenuBarUpdateIconManager::RemoveMenuBarIcons() -{ - while (!maIconMBars.empty()) - RemoveMenuBarIcon(maIconMBars[0]); -} - -void MenuBarUpdateIconManager::SetShowMenuIcon(bool bShowMenuIcon) -{ - if ( bShowMenuIcon != mbShowMenuIcon ) - { - mbShowMenuIcon = bShowMenuIcon; - if ( bShowMenuIcon ) - Application::PostUserEvent(LINK(this, MenuBarUpdateIconManager, UserEventHdl)); - else - { - RemoveBubbleWindow(); - RemoveMenuBarIcons(); - } - } -} - -void MenuBarUpdateIconManager::SetShowBubble(bool bShowBubble) -{ - mbShowBubble = bShowBubble; - if ( mbShowBubble ) - Application::PostUserEvent(LINK(this, MenuBarUpdateIconManager, UserEventHdl)); - else if ( mpBubbleWin ) - mpBubbleWin->Show( false ); -} - -void MenuBarUpdateIconManager::SetBubbleChanged() -{ - mbBubbleChanged = true; - if (mbBubbleChanged && mpBubbleWin) - mpBubbleWin->Show( false ); -} - -void MenuBarUpdateIconManager::SetBubbleImage(const Image& rImage) -{ - maBubbleImage = rImage; - SetBubbleChanged(); -} - -void MenuBarUpdateIconManager::SetBubbleTitle(const OUString& rTitle) -{ - if (rTitle != maBubbleTitle) - { - maBubbleTitle = rTitle; - SetBubbleChanged(); - } -} - -void MenuBarUpdateIconManager::SetBubbleText(const OUString& rText) -{ - if (rText != maBubbleText) - { - maBubbleText = rText; - SetBubbleChanged(); - } -} - -namespace { -Image GetMenuBarIcon( MenuBar const * pMBar ) -{ - OUString sResID; - vcl::Window *pMBarWin = pMBar->GetWindow(); - sal_uInt32 nMBarHeight = 20; - - if ( pMBarWin ) - nMBarHeight = pMBarWin->GetOutputSizePixel().getHeight(); - - if (nMBarHeight >= 35) - sResID = RID_UPDATE_AVAILABLE_26; - else - sResID = RID_UPDATE_AVAILABLE_16; - - return Image(StockImage::Yes, sResID); -} -} - -void MenuBarUpdateIconManager::AddMenuBarIcon(SystemWindow& rSysWin, bool bAddEventHdl) -{ - if (!mbShowMenuIcon) - return; - - MenuBar *pActiveMBar = rSysWin.GetMenuBar(); - if (&rSysWin != mpActiveSysWin || pActiveMBar != mpActiveMBar) - RemoveBubbleWindow(); - - auto aI = std::find(maIconMBars.begin(), maIconMBars.end(), pActiveMBar); - if (aI == maIconMBars.end()) - { - if (pActiveMBar) - { - OUStringBuffer aBuf; - if( !maBubbleTitle.isEmpty() ) - aBuf.append( maBubbleTitle ); - if( !maBubbleText.isEmpty() ) - { - if( !maBubbleTitle.isEmpty() ) - aBuf.append( "\n\n" ); - aBuf.append( maBubbleText ); - } - - Image aImage = GetMenuBarIcon( pActiveMBar ); - sal_uInt16 nIconID = pActiveMBar->AddMenuBarButton( aImage, - LINK( this, MenuBarUpdateIconManager, ClickHdl ), - aBuf.makeStringAndClear() ); - maIconMBars.push_back(pActiveMBar); - maIconIDs.push_back(nIconID); - } - - if (bAddEventHdl) - rSysWin.AddEventListener( maWindowEventHdl ); - } - - if (mpActiveMBar != pActiveMBar) - { - if (mpActiveMBar) - { - mpActiveMBar->SetMenuBarButtonHighlightHdl(GetIconID(mpActiveMBar), - Link<MenuBarButtonCallbackArg&,bool>()); - } - mpActiveMBar = pActiveMBar; - if (mpActiveMBar) - { - mpActiveMBar->SetMenuBarButtonHighlightHdl(GetIconID(mpActiveMBar), - LINK(this, MenuBarUpdateIconManager, HighlightHdl)); - } - } - - mpActiveSysWin = &rSysWin; - - if (mbShowBubble && pActiveMBar) - { - mpBubbleWin = GetBubbleWindow(); - if ( mpBubbleWin ) - { - mpBubbleWin->Show(); - maTimeoutTimer.Start(); - } - mbShowBubble = false; - } -} - -void MenuBarUpdateIconManager::RemoveMenuBarIcon(MenuBar* pMenuBar) -{ - auto aI = std::find(maIconMBars.begin(), maIconMBars.end(), pMenuBar); - if (aI == maIconMBars.end()) - return; - - auto aIconI = maIconIDs.begin() + std::distance(maIconMBars.begin(), aI); - - try - { - pMenuBar->RemoveMenuBarButton(*aIconI); - } - catch (...) - { - } - - maIconMBars.erase(aI); - maIconIDs.erase(aIconI); -} - -void MenuBarUpdateIconManager::RemoveBubbleWindow() -{ - maWaitIdle.Stop(); - maTimeoutTimer.Stop(); - mpBubbleWin.disposeAndClear(); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 92f6f3457c70..6f6f0e22b864 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -2648,108 +2648,4 @@ bool SalColormap::GetXPixels( XColor &rColor, return GetXPixel( rColor, r^0xFF, g^0xFF, b^0xFF ); } -Pixel SalColormap::GetPixel( std::optional<Color> oColor ) const -{ - if( !oColor ) return 0; - if( COL_BLACK == oColor ) return m_nBlackPixel; - if( COL_WHITE == oColor ) return m_nWhitePixel; - - Color nColor = *oColor; - - if( m_aVisual.GetClass() == TrueColor ) - return m_aVisual.GetTCPixel( nColor ); - - if( m_aLookupTable.empty() ) - { - if( m_aPalette.empty() - && m_hColormap - && m_aVisual.GetDepth() <= 12 - && m_aVisual.GetClass() == PseudoColor ) // what else ??? - const_cast<SalColormap*>(this)->GetPalette(); - - if( !m_aPalette.empty() ) - for( Pixel i = 0; i < m_nUsed; i++ ) - if( m_aPalette[i] == nColor ) - return i; - - if( m_hColormap ) - { - // DirectColor, StaticColor, StaticGray, GrayScale (PseudoColor) - XColor aColor; - - if( GetXPixel( aColor, - nColor.GetRed(), - nColor.GetGreen(), - nColor.GetBlue() ) ) - { - if( !m_aPalette.empty() && m_aPalette[aColor.pixel] == Color(0) ) - { - const_cast<SalColormap*>(this)->m_aPalette[aColor.pixel] = nColor; - - if( !(aColor.pixel & 1) && m_aPalette[aColor.pixel+1] == Color(0) ) - { - XColor aInversColor; - - Color nInversColor(ColorTransparency, sal_uInt32(nColor) ^ 0xFFFFFF); - - GetXPixel( aInversColor, - nInversColor.GetRed(), - nInversColor.GetGreen(), - nInversColor.GetBlue() ); - - if( m_aPalette[aInversColor.pixel] == Color(0) ) - const_cast<SalColormap*>(this)->m_aPalette[aInversColor.pixel] = nInversColor; -#ifdef DBG_UTIL - else - SAL_INFO("vcl.app", "SalColormap::GetPixel() " - << std::showbase << std::setfill('0') - << std::setw(6) << std::hex - << static_cast< unsigned long >( - sal_uInt32(nColor)) - << "=" - << std::dec - << aColor.pixel << " " - << std::showbase << std::setfill('0') - << std::setw(6) << std::hex - << static_cast< unsigned long >( - sal_uInt32(nInversColor)) - << "=" - << std::dec - << aInversColor.pixel); -#endif - } - } - - return aColor.pixel; - } - -#ifdef DBG_UTIL - SAL_INFO("vcl.app", "SalColormap::GetPixel() !XAllocColor " - << std::hex - << static_cast< unsigned long >(sal_uInt32(nColor))); -#endif - } - - if( m_aPalette.empty() ) - { -#ifdef DBG_UTIL - SAL_INFO("vcl.app", "SalColormap::GetPixel() Palette empty " - << std::hex - << static_cast< unsigned long >(sal_uInt32(nColor))); -#endif - return sal_uInt32(nColor); - } - - const_cast<SalColormap*>(this)->GetLookupTable(); - } - - // color matching via palette - sal_uInt16 r = nColor.GetRed(); - sal_uInt16 g = nColor.GetGreen(); - sal_uInt16 b = nColor.GetBlue(); - return m_aLookupTable[ (((r+8)/17) << 8) - + (((g+8)/17) << 4) - + ((b+8)/17) ]; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |