comphelper/source/misc/componentmodule.cxx | 32 -- compilerplugins/clang/unusedfields.only-used-in-constructor.results | 34 +- compilerplugins/clang/unusedfields.readonly.results | 34 +- compilerplugins/clang/unusedfields.untouched.results | 32 +- compilerplugins/clang/unusedfields.writeonly.results | 42 +-- compilerplugins/clang/unusedmethods.results | 114 ++++------ extensions/source/propctrlr/formcontroller.hxx | 9 extensions/source/propctrlr/modulepcr.hxx | 12 - include/comphelper/componentmodule.hxx | 58 ----- include/vcl/edit.hxx | 1 include/vcl/toolkit/field.hxx | 1 include/vcl/toolkit/longcurr.hxx | 1 vcl/source/control/field.cxx | 7 vcl/source/control/longcurr.cxx | 2 14 files changed, 127 insertions(+), 252 deletions(-)
New commits: commit 5c1916763d73f2d46c4a2d5f929297685035fbff Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Fri Jul 24 20:49:26 2020 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Sat Jul 25 08:57:13 2020 +0200 loplugin:unusedmethods Change-Id: I3a35c988b1c55b16958172ed5ef4e2d5cb410e55 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99413 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx index d4e23c70f48e..2fb5c31d9144 100644 --- a/comphelper/source/misc/componentmodule.cxx +++ b/comphelper/source/misc/componentmodule.cxx @@ -67,38 +67,6 @@ namespace comphelper m_pImpl->m_aRegisteredComponents.push_back( _rComp ); } - void OModule::registerImplementation( const OUString& _rImplementationName, const css::uno::Sequence< OUString >& _rServiceNames, - ::cppu::ComponentFactoryFunc _pCreateFunction ) - { - ComponentDescription aComponent( _rImplementationName, _rServiceNames, _pCreateFunction, ::cppu::createSingleComponentFactory ); - registerImplementation( aComponent ); - } - - Reference< XInterface > OModule::getComponentFactory( const OUString& _rImplementationName ) - { - Reference< XInterface > xReturn; - - for (const auto& rComponent : m_pImpl->m_aRegisteredComponents) - { - if ( rComponent.sImplementationName == _rImplementationName ) - { - xReturn = rComponent.pFactoryCreationFunc( - rComponent.pComponentCreationFunc, - rComponent.sImplementationName, - rComponent.aSupportedServices, - nullptr - ); - if ( xReturn.is() ) - { - xReturn->acquire(); - return xReturn.get(); - } - } - } - - return nullptr; - } - } // namespace comphelper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results index 5dee9cd67049..61578439f7a0 100644 --- a/compilerplugins/clang/unusedmethods.results +++ b/compilerplugins/clang/unusedmethods.results @@ -56,8 +56,6 @@ canvas/source/vcl/impltools.hxx:103 vclcanvas::tools::LocalGuard::LocalGuard() chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx:55 void chart::ThreeD_SceneIllumination_TabPage::LinkStubfillControlsFromModel(void *,void *) -comphelper/source/inc/comphelper_module.hxx:36 - class comphelper::module::ComphelperModule & comphelper::module::ComphelperModule::getInstance() connectivity/inc/sdbcx/VGroup.hxx:61 connectivity::sdbcx::OGroup::OGroup(_Bool) connectivity/inc/sdbcx/VGroup.hxx:62 @@ -94,8 +92,8 @@ connectivity/source/inc/OColumn.hxx:105 _Bool connectivity::OColumn::isDefinitelyWritable() const connectivity/source/inc/odbc/OConnection.hxx:118 class connectivity::odbc::ODBCDriver * connectivity::odbc::OConnection::getDriver() const -connectivity/source/inc/odbc/ODriver.hxx:77 - const class com::sun::star::uno::Reference<class com::sun::star::lang::XMultiServiceFactory> & connectivity::odbc::ODBCDriver::getORB() const +connectivity/source/inc/odbc/ODriver.hxx:72 + const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> & connectivity::odbc::ODBCDriver::getContext() const connectivity/source/inc/odbc/OPreparedStatement.hxx:71 void connectivity::odbc::OPreparedStatement::setScalarParameter(int,int,unsigned long,const type-parameter-?-?) connectivity/source/inc/odbc/OPreparedStatement.hxx:72 @@ -162,7 +160,7 @@ dbaccess/source/ui/inc/opendoccontrols.hxx:69 void dbaui::OpenDocumentListBox::grab_focus() dbaccess/source/ui/inc/sbamultiplex.hxx:385 class cppu::OInterfaceContainerHelper * dbaui::SbaXVetoableChangeMultiplexer::getContainer(const class rtl::OUString &) -dbaccess/source/ui/inc/SqlNameEdit.hxx:105 +dbaccess/source/ui/inc/SqlNameEdit.hxx:113 void dbaui::OSQLNameEntry::set_sensitive(_Bool) dbaccess/source/ui/inc/WTypeSelect.hxx:76 void dbaui::OWizTypeSelectList::show() @@ -192,7 +190,15 @@ editeng/inc/edtspell.hxx:104 class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const struct editeng::MisspellRange *, class std::__cxx1998::vector<struct editeng::MisspellRange, class std::allocator<struct editeng::MisspellRange> > >, class std::__debug::vector<struct editeng::MisspellRange, class std::allocator<struct editeng::MisspellRange> >, struct std::random_access_iterator_tag> WrongList::begin() const editeng/inc/edtspell.hxx:105 class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const struct editeng::MisspellRange *, class std::__cxx1998::vector<struct editeng::MisspellRange, class std::allocator<struct editeng::MisspellRange> > >, class std::__debug::vector<struct editeng::MisspellRange, class std::allocator<struct editeng::MisspellRange> >, struct std::random_access_iterator_tag> WrongList::end() const -extensions/source/scanner/scanner.hxx:83 +extensions/source/propctrlr/formcontroller.hxx:99 + class rtl::OUString pcr::DialogController::getImplementationName_static() +extensions/source/propctrlr/formcontroller.hxx:101 + class com::sun::star::uno::Sequence<class rtl::OUString> pcr::DialogController::getSupportedServiceNames_static() +extensions/source/propctrlr/formcontroller.hxx:103 + class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> pcr::DialogController::Create(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &) +extensions/source/propctrlr/modulepcr.hxx:45 + pcr::OAutoRegistration::OAutoRegistration<TYPE>() +extensions/source/scanner/scanner.hxx:79 void ScannerManager::SetData(void *) hwpfilter/source/mzstring.h:99 class MzString & MzString::operator<<(unsigned char) @@ -400,6 +406,12 @@ include/comphelper/basicio.hxx:52 const class com::sun::star::uno::Reference<class com::sun::star::io::XObjectInputStream> & comphelper::operator>>(const class com::sun::star::uno::Reference<class com::sun::star::io::XObjectInputStream> &,unsigned int &) include/comphelper/basicio.hxx:53 const class com::sun::star::uno::Reference<class com::sun::star::io::XObjectOutputStream> & comphelper::operator<<(const class com::sun::star::uno::Reference<class com::sun::star::io::XObjectOutputStream> &,unsigned int) +include/comphelper/componentmodule.hxx:102 + void comphelper::OModule::registerImplementation(const class rtl::OUString &,const class com::sun::star::uno::Sequence<class rtl::OUString> &,class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> (*)(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &)) +include/comphelper/componentmodule.hxx:118 + class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> comphelper::OModule::getComponentFactory(const class rtl::OUString &) +include/comphelper/componentmodule.hxx:146 + comphelper::OAutoRegistration::OAutoRegistration<TYPE>(class comphelper::OModule &) include/comphelper/configuration.hxx:248 type-parameter-?-? comphelper::ConfigurationLocalizedProperty::get(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &) include/comphelper/configuration.hxx:264 @@ -600,14 +612,14 @@ include/o3tl/strong_int.hxx:112 strong_int<UNDERLYING_TYPE, PHANTOM_TYPE> o3tl::strong_int::operator--(int) include/o3tl/strong_int.hxx:121 _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<int, struct ViewShellIdTag>,type-parameter-?-?...) const +include/o3tl/strong_int.hxx:121 + _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<unsigned short, struct SfxInterfaceIdTag>,type-parameter-?-?...) const include/o3tl/strong_int.hxx:121 _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<unsigned char, struct SdrLayerIDTag>,type-parameter-?-?...) const include/o3tl/strong_int.hxx:121 _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,type-parameter-?-?...) const include/o3tl/strong_int.hxx:121 _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<int, struct ViewShellDocIdTag>,type-parameter-?-?...) const -include/o3tl/strong_int.hxx:121 - _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<unsigned short, struct SfxInterfaceIdTag>,type-parameter-?-?...) const include/o3tl/strong_int.hxx:121 _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<int, struct Tag_TextFrameIndex>,type-parameter-?-?...) const include/o3tl/typed_flags_set.hxx:114 @@ -702,6 +714,10 @@ include/svx/dlgctrl.hxx:267 void SvxLineEndLB::set_active_text(const class rtl::OUString &) include/svx/framelink.hxx:198 _Bool svx::frame::operator>(const class svx::frame::Style &,const class svx::frame::Style &) +include/svx/gallery1.hxx:58 + const class std::unique_ptr<class GalleryBinaryEngineEntry, struct std::default_delete<class GalleryBinaryEngineEntry> > & GalleryThemeEntry::getGalleryBinaryEngineEntry() const +include/svx/gallerybinaryengine.hxx:58 + const class INetURLObject & GalleryBinaryEngine::GetStrURL() const include/svx/langbox.hxx:94 void SvxLanguageBox::show() include/svx/pagenumberlistbox.hxx:33 @@ -712,9 +728,11 @@ include/svx/pagenumberlistbox.hxx:37 void SvxPageNumberListBox::set_active(int) include/svx/relfld.hxx:61 void SvxRelativeField::set_size_request(int,int) +include/svx/relfld.hxx:62 + void SvxRelativeField::grab_focus() include/svx/relfld.hxx:63 class Size SvxRelativeField::get_preferred_size() const -include/svx/sidebar/InspectorTextPanel.hxx:37 +include/svx/sidebar/InspectorTextPanel.hxx:50 class VclPtr<class vcl::Window> svx::sidebar::InspectorTextPanel::Create(class vcl::Window *,const class com::sun::star::uno::Reference<class com::sun::star::frame::XFrame> &) include/svx/svdlayer.hxx:74 _Bool SdrLayer::operator==(const class SdrLayer &) const @@ -808,10 +826,6 @@ include/unotools/moduleoptions.hxx:166 _Bool SvtModuleOptions::IsDataBase() const include/unotools/textsearch.hxx:121 basic_ostream<type-parameter-?-?, type-parameter-?-?> & utl::operator<<(basic_ostream<type-parameter-?-?, type-parameter-?-?> &,const enum utl::SearchParam::SearchType &) -include/vbahelper/helperdecl.hxx:42 - comphelper::service_decl::vba_service_class_::vba_service_class_(const type-parameter-?-? &) -include/vbahelper/helperdecl.hxx:42 - comphelper::service_decl::vba_service_class_::vba_service_class_<ImplT_, WithArgsT>(const type-parameter-?-? &) include/vcl/alpha.hxx:47 _Bool AlphaMask::operator==(const class AlphaMask &) const include/vcl/alpha.hxx:48 @@ -824,6 +838,8 @@ include/vcl/BitmapBasicMorphologyFilter.hxx:63 BitmapDilateFilter::BitmapDilateFilter(int,unsigned char) include/vcl/BitmapColor.hxx:39 void BitmapColor::SetAlpha(unsigned char) +include/vcl/builder.hxx:338 + void VclBuilder::connectNumericFormatterAdjustment(const class rtl::OString &,const class rtl::OUString &) include/vcl/builder.hxx:482 class rtl::OString VclBuilderContainer::getUIFile() const include/vcl/builderpage.hxx:36 @@ -850,6 +866,8 @@ include/vcl/customweld.hxx:138 void weld::CustomWeld::queue_draw_area(int,int,int,int) include/vcl/customweld.hxx:153 void weld::CustomWeld::set_visible(_Bool) +include/vcl/edit.hxx:209 + _Bool Edit::IsValueChangedFromSaved() const include/vcl/errcode.hxx:86 _Bool ErrCode::operator<(const class ErrCode &) const include/vcl/errcode.hxx:87 @@ -878,14 +896,6 @@ include/vcl/ITiledRenderable.hxx:214 enum PointerStyle vcl::ITiledRenderable::getPointer() include/vcl/lok.hxx:22 void vcl::lok::unregisterPollCallbacks() -include/vcl/menu.hxx:456 - unsigned short MenuBar::AddMenuBarButton(const class Image &,const class Link<struct MenuBar::MenuBarButtonCallbackArg &, _Bool> &,const class rtl::OUString &) -include/vcl/menu.hxx:460 - void MenuBar::SetMenuBarButtonHighlightHdl(unsigned short,const class Link<struct MenuBar::MenuBarButtonCallbackArg &, _Bool> &) -include/vcl/menu.hxx:464 - class tools::Rectangle MenuBar::GetMenuBarButtonRectPixel(unsigned short) -include/vcl/menu.hxx:465 - void MenuBar::RemoveMenuBarButton(unsigned short) include/vcl/menu.hxx:517 void PopupMenu::SetSelectedEntry(unsigned short) include/vcl/NotebookBarAddonsMerger.hxx:64 @@ -894,9 +904,9 @@ include/vcl/opengl/OpenGLHelper.hxx:67 void OpenGLHelper::renderToFile(long,long,const class rtl::OUString &) include/vcl/opengl/OpenGLHelper.hxx:100 void OpenGLHelper::debugMsgStreamWarn(const class std::__cxx11::basic_ostringstream<char> &) -include/vcl/outdev.hxx:1740 +include/vcl/outdev.hxx:1738 class basegfx::B2DPolyPolygon OutputDevice::LogicToPixel(const class basegfx::B2DPolyPolygon &,const class MapMode &) const -include/vcl/outdev.hxx:1760 +include/vcl/outdev.hxx:1758 class basegfx::B2DPolyPolygon OutputDevice::PixelToLogic(const class basegfx::B2DPolyPolygon &,const class MapMode &) const include/vcl/pngread.hxx:56 void vcl::PNGReader::SetIgnoreGammaChunk(_Bool) @@ -936,32 +946,8 @@ include/vcl/TaskStopwatch.hxx:118 void TaskStopwatch::setTimeSlice(unsigned int) include/vcl/textrectinfo.hxx:45 _Bool TextRectInfo::operator!=(const class TextRectInfo &) const -include/vcl/toolkit/longcurr.hxx:41 - void LongCurrencyFormatter::SetUseThousandSep(_Bool) -include/vcl/toolkit/longcurr.hxx:44 - void LongCurrencyFormatter::SetCurrencySymbol(const class rtl::OUString &) -include/vcl/toolkit/longcurr.hxx:47 - void LongCurrencyFormatter::SetMin(const class BigInt &) -include/vcl/toolkit/longcurr.hxx:48 - const class BigInt & LongCurrencyFormatter::GetMin() const include/vcl/toolkit/longcurr.hxx:49 - void LongCurrencyFormatter::SetMax(const class BigInt &) -include/vcl/toolkit/longcurr.hxx:50 - const class BigInt & LongCurrencyFormatter::GetMax() const -include/vcl/toolkit/longcurr.hxx:84 - LongCurrencyField::LongCurrencyField(class vcl::Window *,long) -include/vcl/toolkit/longcurr.hxx:94 - void LongCurrencyField::SetFirst(const class BigInt &) -include/vcl/toolkit/longcurr.hxx:95 - const class BigInt & LongCurrencyField::GetFirst() const -include/vcl/toolkit/longcurr.hxx:96 - void LongCurrencyField::SetLast(const class BigInt &) -include/vcl/toolkit/longcurr.hxx:97 - const class BigInt & LongCurrencyField::GetLast() const -include/vcl/toolkit/longcurr.hxx:98 - void LongCurrencyField::SetSpinSize(const class BigInt &) -include/vcl/toolkit/longcurr.hxx:99 - const class BigInt & LongCurrencyField::GetSpinSize() const + class BigInt LongCurrencyFormatter::GetValue() const include/vcl/treelist.hxx:171 const class SvTreeListEntry * SvTreeList::GetParent(const class SvTreeListEntry *) const include/vcl/treelistbox.hxx:368 @@ -1056,20 +1042,28 @@ include/vcl/weld.hxx:1470 void weld::Entry::signal_insert_text(class rtl::OUString &) include/vcl/weld.hxx:1486 int weld::Entry::get_position() const -include/vcl/weld.hxx:1657 +include/vcl/weld.hxx:1660 void weld::EntryTreeView::EntryModifyHdl(const class weld::Entry &) -include/vcl/weld.hxx:1893 +include/vcl/weld.hxx:1896 class Size weld::MetricSpinButton::get_size_request() const -include/vcl/weld.hxx:1905 +include/vcl/weld.hxx:1908 void weld::MetricSpinButton::set_position(int) -include/vcl/weld.hxx:1985 +include/vcl/weld.hxx:1989 int weld::TextView::vadjustment_get_lower() const -include/vcl/weld.hxx:2142 +include/vcl/weld.hxx:2146 class rtl::OUString weld::Toolbar::get_item_label(const class rtl::OString &) const -include/vcl/weld.hxx:2152 +include/vcl/weld.hxx:2156 void weld::Toolbar::append_separator(const class rtl::OUString &) -include/vcl/weld.hxx:2195 +include/vcl/weld.hxx:2199 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/weldutils.hxx:304 + void weld::DateFormatter::CursorChangedHdl(class weld::Entry &) +include/vcl/weldutils.hxx:304 + void weld::DateFormatter::LinkStubCursorChangedHdl(void *,class weld::Entry &) +include/vcl/weldutils.hxx:332 + void weld::PatternFormatter::connect_focus_out(const class Link<class weld::Widget &, void> &) +include/vcl/weldutils.hxx:333 + void weld::PatternFormatter::connect_focus_in(const class Link<class weld::Widget &, void> &) include/vcl/window.hxx:409 const char * ImplDbgCheckWindow(const void *) include/xmloff/txtimp.hxx:385 @@ -1092,10 +1086,10 @@ libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx:72 void ::operator()(struct _GtkBuilder *) const libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx:31 void * gtv_comments_sidebar_get_instance_private(struct GtvCommentsSidebar *) -libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx:49 - void ::operator()(struct _GList *) const libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx:80 void ::operator()(struct _GtkTargetList *) const +libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx:255 + void ::operator()(struct _GList *) const libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx:35 void openLokDialog(struct _GtkWidget *,void *) lotuswordpro/source/filter/clone.hxx:28 @@ -1214,7 +1208,7 @@ sc/inc/stlalgorithm.hxx:61 _Bool sc::AlignedAllocator::operator==(const AlignedAllocator<T, Alignment> &) const sc/inc/stlalgorithm.hxx:62 _Bool sc::AlignedAllocator::operator!=(const AlignedAllocator<T, Alignment> &) const -sc/inc/table.hxx:320 +sc/inc/table.hxx:322 _Bool ScTable::IsColRowTabValid(const short,const int,const short) const sc/inc/userlist.hxx:88 class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> > *, class std::__cxx1998::vector<class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> >, class std::allocator<class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> > > > >, class std::__debug::vector<class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> >, class std::allocator<class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> > > >, struct std::random_access_iterator_tag> ScUserList::begin() const @@ -1268,9 +1262,9 @@ sc/source/core/tool/interpr1.cxx:6495 double ::operator()(const struct sc::ParamIfsResult &) const sc/source/core/tool/interpr3.cxx:4442 double ::operator()(double,unsigned long) const -sc/source/core/tool/scmatrix.cxx:2298 +sc/source/core/tool/scmatrix.cxx:2300 type-parameter-?-? * (anonymous namespace)::wrapped_iterator::operator->() const -sc/source/core/tool/scmatrix.cxx:3304 +sc/source/core/tool/scmatrix.cxx:3306 const class svl::SharedString & matop::(anonymous namespace)::COp::operator()(char,type-parameter-?-?,double,double,const class svl::SharedString &) const sc/source/filter/inc/htmlpars.hxx:60 void ScHTMLStyles::add(const char *,unsigned long,const char *,unsigned long,const class rtl::OUString &,const class rtl::OUString &) diff --git a/extensions/source/propctrlr/formcontroller.hxx b/extensions/source/propctrlr/formcontroller.hxx index b66b9de604ca..ddf689df8eef 100644 --- a/extensions/source/propctrlr/formcontroller.hxx +++ b/extensions/source/propctrlr/formcontroller.hxx @@ -93,15 +93,6 @@ namespace pcr */ class DialogController { - public: - // XServiceInfo - static versions - /// @throws css::uno::RuntimeException - static OUString getImplementationName_static( ); - /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_static( ); - static css::uno::Reference< css::uno::XInterface > - Create(const css::uno::Reference< css::uno::XComponentContext >&); - private: DialogController( const DialogController& ) = delete; DialogController& operator=( const DialogController& ) = delete; diff --git a/extensions/source/propctrlr/modulepcr.hxx b/extensions/source/propctrlr/modulepcr.hxx index 6fcbfef5100f..d29c2fd2c969 100644 --- a/extensions/source/propctrlr/modulepcr.hxx +++ b/extensions/source/propctrlr/modulepcr.hxx @@ -35,18 +35,6 @@ namespace pcr PcrModule(); }; - /* -------------------------------------------------------------------- */ - template < class TYPE > - class OAutoRegistration : public ::comphelper::OAutoRegistration< TYPE > - { - private: - typedef ::comphelper::OAutoRegistration< TYPE > BaseClass; - public: - OAutoRegistration() : BaseClass( PcrModule::getInstance() ) - { - } - }; - OUString PcrRes(const char* pId); } // namespace pcr diff --git a/include/comphelper/componentmodule.hxx b/include/comphelper/componentmodule.hxx index 0ca1b7e5a457..78d71138d519 100644 --- a/include/comphelper/componentmodule.hxx +++ b/include/comphelper/componentmodule.hxx @@ -89,73 +89,15 @@ namespace comphelper virtual ~OModule(); - /** register a component implementing a service with the given data. - @param _rImplementationName - the implementation name of the component - @param _rServiceNames - the services the component supports - @param _pCreateFunction - a function for creating an instance of the component - @param _pFactoryFunction - a function for creating a factory for that component - */ - void registerImplementation( - const OUString& _rImplementationName, - const css::uno::Sequence< OUString >& _rServiceNames, - ::cppu::ComponentFactoryFunc _pCreateFunction ); - /** registers a component given by ComponentDescription */ void registerImplementation( const ComponentDescription& _rComp ); - /** creates a Factory for the component with the given implementation name. - <p>Usually used from within component_getFactory.<p/> - @param _pImplementationName - the implementation name of the component - @return - the XInterface access to a factory for the component - */ - css::uno::Reference< css::uno::XInterface > getComponentFactory( - const OUString& _rImplementationName ); - private: OModule( const OModule& ) = delete; OModule& operator=( const OModule& ) = delete; }; - - //= OAutoRegistration - - template <class TYPE> - class OAutoRegistration - { - public: - /** automatically provides all component information to an OModule instance - <p>Assumed that the template argument has the three methods - <ul> - <li><code>static OUString getImplementationName_static()</code><li/> - <li><code>static css::uno::Sequence< OUString > getSupportedServiceNames_static()</code><li/> - <li><code>static css::uno::Reference< css::uno::XInterface > - Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&)</code> - </li> - <ul/> - the instantiation of this object will automatically register the class via <member>OModule::registerImplementation</member>. - <p/> - The factory creation function used is <code>::cppu::createSingleComponentFactory</code>. - */ - OAutoRegistration( OModule& _rModule ); - }; - - template <class TYPE> - OAutoRegistration<TYPE>::OAutoRegistration( OModule& _rModule ) - { - _rModule.registerImplementation( - TYPE::getImplementationName_static(), - TYPE::getSupportedServiceNames_static(), - TYPE::Create - ); - } - } // namespace comphelper diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 5b733dc42ef6..7edc7686e1fb 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -206,7 +206,6 @@ public: void SaveValue() { maSaveValue = GetText(); } const OUString& GetSavedValue() const { return maSaveValue; } - bool IsValueChangedFromSaved() const { return maSaveValue != GetText(); } virtual void SetModifyHdl( const Link<Edit&,void>& rLink ) { maModifyHdl = rLink; } virtual const Link<Edit&,void>& GetModifyHdl() const { return maModifyHdl; } commit c9e13a9f18af433a306a489e996f680aba442da4 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Fri Jul 24 20:37:12 2020 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Sat Jul 25 08:57:06 2020 +0200 loplugin:unusedfields Change-Id: Ia2fb09dcd6f266e7eab04fceb893839531ab3e00 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99412 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results index 620901b860b1..2a78b9c55a76 100644 --- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results +++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results @@ -128,18 +128,20 @@ cppu/source/uno/check.cxx:134 (anonymous namespace)::Char3 c3 char cppu/source/uno/check.cxx:138 (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3 -cui/source/dialogs/AdditionsDialog.cxx:82 - (anonymous namespace)::AdditionInfo sDescription class rtl::OUString -cui/source/dialogs/AdditionsDialog.cxx:84 - (anonymous namespace)::AdditionInfo sReleaseVersion class rtl::OUString -cui/source/dialogs/AdditionsDialog.cxx:88 - (anonymous namespace)::AdditionInfo sRating class rtl::OUString -cui/source/dialogs/AdditionsDialog.cxx:90 - (anonymous namespace)::AdditionInfo sDownloadURL class rtl::OUString cui/source/dialogs/colorpicker.cxx:736 cui::(anonymous namespace)::ColorPickerDialog m_aColorPrevious class cui::(anonymous namespace)::ColorPreviewControl cui/source/factory/dlgfact.cxx:1410 (anonymous namespace)::SvxMacroAssignDialog m_aItems class SfxItemSet +cui/source/inc/AdditionsDialog.hxx:74 + AdditionInfo sDescription class rtl::OUString +cui/source/inc/AdditionsDialog.hxx:76 + AdditionInfo sReleaseVersion class rtl::OUString +cui/source/inc/AdditionsDialog.hxx:80 + AdditionInfo sRating class rtl::OUString +cui/source/inc/AdditionsDialog.hxx:82 + AdditionInfo sDownloadURL class rtl::OUString +cui/source/inc/AdditionsDialog.hxx:109 + AdditionsDialog m_sTag class rtl::OString cui/source/inc/cfgutil.hxx:241 SvxScriptSelectorDialog m_aStylesInfo struct SfxStylesInfo_Impl cui/source/inc/cuitabarea.hxx:224 @@ -438,7 +440,7 @@ pyuno/source/module/pyuno_impl.hxx:237 pyuno::stRuntimeImpl ob_base PyObject reportdesign/source/core/api/ReportDefinition.cxx:236 reportdesign::(anonymous namespace)::OStyle m_aSize awt::Size -reportdesign/source/filter/xml/xmlExport.cxx:1230 +reportdesign/source/filter/xml/xmlExport.cxx:1202 sal_Int32 sal/qa/osl/condition/osl_Condition.cxx:72 osl_Condition::ctors bRes1 _Bool @@ -806,7 +808,7 @@ vcl/inc/salmenu.hxx:44 SalMenuButtonItem maToolTipText class rtl::OUString vcl/inc/salvtables.hxx:559 SalInstanceEntry m_aTextFilter class WeldTextFilter -vcl/inc/salvtables.hxx:935 +vcl/inc/salvtables.hxx:939 SalInstanceComboBoxWithEdit m_aTextFilter class WeldTextFilter vcl/inc/svimpbox.hxx:121 SvImpLBox m_aFctSet class ImpLBSelEng @@ -854,17 +856,17 @@ vcl/unx/gtk3/gtk3gloactiongroup.cxx:27 (anonymous namespace)::GLOAction parent_instance GObject vcl/unx/gtk3/gtk3glomenu.cxx:14 GLOMenu parent_instance const GMenuModel -vcl/unx/gtk3/gtk3gtkinst.cxx:4806 +vcl/unx/gtk3/gtk3gtkinst.cxx:4808 (anonymous namespace)::GtkInstanceAssistant m_pButtonBox GtkButtonBox * -vcl/unx/gtk3/gtk3gtkinst.cxx:5179 +vcl/unx/gtk3/gtk3gtkinst.cxx:5181 (anonymous namespace)::CrippledViewport viewport GtkViewport -vcl/unx/gtk3/gtk3gtkinst.cxx:5322 +vcl/unx/gtk3/gtk3gtkinst.cxx:5324 (anonymous namespace)::CustomCellRendererSurface parent GtkCellRendererText -vcl/unx/gtk3/gtk3gtkinst.cxx:5330 +vcl/unx/gtk3/gtk3gtkinst.cxx:5332 (anonymous namespace)::CustomCellRendererSurfaceClass parent_class GtkCellRendererTextClass -vcl/unx/gtk3/gtk3gtkinst.cxx:13056 +vcl/unx/gtk3/gtk3gtkinst.cxx:13068 (anonymous namespace)::GtkInstanceComboBox m_pOverlay GtkOverlay * -vcl/unx/gtk3/gtk3gtkinst.cxx:13062 +vcl/unx/gtk3/gtk3gtkinst.cxx:13074 (anonymous namespace)::GtkInstanceComboBox m_pMenuTextRenderer GtkCellRenderer * writerfilter/source/dmapper/PropertyMap.hxx:219 writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32 diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results index 3d37f77855a6..a90bc0aa9109 100644 --- a/compilerplugins/clang/unusedfields.readonly.results +++ b/compilerplugins/clang/unusedfields.readonly.results @@ -194,30 +194,32 @@ editeng/source/editeng/impedit.hxx:504 ImpEditEngine maColorConfig svtools::ColorConfig embeddedobj/source/inc/commonembobj.hxx:104 OCommonEmbeddedObject m_aClassName class rtl::OUString -embeddedobj/source/inc/oleembobj.hxx:124 +embeddedobj/source/inc/oleembobj.hxx:125 OleEmbeddedObject m_pOleComponent class OleComponent * -embeddedobj/source/inc/oleembobj.hxx:144 +embeddedobj/source/inc/oleembobj.hxx:145 OleEmbeddedObject m_xClosePreventer css::uno::Reference<css::util::XCloseListener> -embeddedobj/source/inc/oleembobj.hxx:166 - OleEmbeddedObject m_bHasSizeToSet _Bool embeddedobj/source/inc/oleembobj.hxx:167 - OleEmbeddedObject m_aSizeToSet css::awt::Size + OleEmbeddedObject m_bHasSizeToSet _Bool embeddedobj/source/inc/oleembobj.hxx:168 + OleEmbeddedObject m_aSizeToSet css::awt::Size +embeddedobj/source/inc/oleembobj.hxx:169 OleEmbeddedObject m_nAspectToSet sal_Int64 -embeddedobj/source/inc/oleembobj.hxx:173 - OleEmbeddedObject m_bGotStatus _Bool embeddedobj/source/inc/oleembobj.hxx:174 - OleEmbeddedObject m_nStatus sal_Int64 + OleEmbeddedObject m_bGotStatus _Bool embeddedobj/source/inc/oleembobj.hxx:175 + OleEmbeddedObject m_nStatus sal_Int64 +embeddedobj/source/inc/oleembobj.hxx:176 OleEmbeddedObject m_nStatusAspect sal_Int64 -embeddedobj/source/inc/oleembobj.hxx:183 +embeddedobj/source/inc/oleembobj.hxx:184 OleEmbeddedObject m_aLinkURL class rtl::OUString -embeddedobj/source/inc/oleembobj.hxx:189 +embeddedobj/source/inc/oleembobj.hxx:190 OleEmbeddedObject m_bFromClipboard _Bool extensions/source/propctrlr/eformshelper.hxx:61 pcr::EFormsHelper m_aSubmissionUINames pcr::MapStringToPropertySet extensions/source/propctrlr/eformshelper.hxx:63 pcr::EFormsHelper m_aBindingUINames pcr::MapStringToPropertySet +extensions/source/update/check/updatehdl.hxx:86 + UpdateHandler mbStringsLoaded _Bool filter/source/graphicfilter/eps/eps.cxx:114 (anonymous namespace)::PSWriter pVDev ScopedVclPtrInstance<class VirtualDevice> filter/source/graphicfilter/icgm/cgm.hxx:58 @@ -362,8 +364,10 @@ include/vcl/opengl/OpenGLContext.hxx:48 OpenGLCapabilitySwitch mbLimitedShaderRegisters _Bool include/vcl/opengl/OpenGLContext.hxx:167 OpenGLContext mpLastFramebuffer class OpenGLFramebuffer * -include/vcl/toolkit/button.hxx:96 - CheckBox mbLegacyNoTextAlign _Bool +include/vcl/toolkit/field.hxx:129 + NumericFormatter mbWrapOnLimits _Bool +include/vcl/toolkit/longcurr.hxx:61 + LongCurrencyFormatter maCurrencySymbol class rtl::OUString io/source/stm/odata.cxx:558 io_stm::(anonymous namespace)::ODataOutputStream::writeDouble(double)::(anonymous union)::(anonymous) n1 sal_uInt32 io/source/stm/odata.cxx:558 @@ -566,9 +570,9 @@ svx/source/inc/datanavi.hxx:488 svxform::AddSubmissionDialog m_aMethodString class svxform::MethodString svx/source/inc/datanavi.hxx:489 svxform::AddSubmissionDialog m_aReplaceString class svxform::ReplaceString -svx/source/inc/gridcell.hxx:527 - DbPatternField m_pValueFormatter ::std::unique_ptr< ::dbtools::FormattedColumnValue> svx/source/inc/gridcell.hxx:528 + DbPatternField m_pValueFormatter ::std::unique_ptr< ::dbtools::FormattedColumnValue> +svx/source/inc/gridcell.hxx:529 DbPatternField m_pPaintFormatter ::std::unique_ptr< ::dbtools::FormattedColumnValue> svx/source/inc/svdpdf.hxx:71 ImpSdrPdfImport maDash class XDash @@ -628,7 +632,7 @@ sw/source/uibase/dbui/mmconfigitem.cxx:116 SwMailMergeConfigItem_Impl m_aNeutralGreetingLines std::vector<OUString> sw/source/uibase/inc/fldmgr.hxx:79 SwInsertField_Data m_aDBDataSource css::uno::Any -toolkit/source/awt/vclxtoolkit.cxx:434 +toolkit/source/awt/vclxtoolkit.cxx:435 (anonymous namespace)::VCLXToolkit mxSelection css::uno::Reference<css::datatransfer::clipboard::XClipboard> ucb/source/ucp/gio/gio_mount.hxx:74 OOoMountOperationClass parent_class GMountOperationClass diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results index 6acb6fa82e35..2fd81add477e 100644 --- a/compilerplugins/clang/unusedfields.untouched.results +++ b/compilerplugins/clang/unusedfields.untouched.results @@ -36,14 +36,14 @@ cppu/source/threadpool/threadpool.cxx:365 _uno_ThreadPool dummy sal_Int32 cppu/source/typelib/typelib.cxx:60 (anonymous namespace)::AlignSize_Impl nInt16 sal_Int16 -cui/source/dialogs/AdditionsDialog.cxx:82 - (anonymous namespace)::AdditionInfo sDescription class rtl::OUString -cui/source/dialogs/AdditionsDialog.cxx:84 - (anonymous namespace)::AdditionInfo sReleaseVersion class rtl::OUString -cui/source/dialogs/AdditionsDialog.cxx:88 - (anonymous namespace)::AdditionInfo sRating class rtl::OUString -cui/source/dialogs/AdditionsDialog.cxx:90 - (anonymous namespace)::AdditionInfo sDownloadURL class rtl::OUString +cui/source/inc/AdditionsDialog.hxx:74 + AdditionInfo sDescription class rtl::OUString +cui/source/inc/AdditionsDialog.hxx:76 + AdditionInfo sReleaseVersion class rtl::OUString +cui/source/inc/AdditionsDialog.hxx:80 + AdditionInfo sRating class rtl::OUString +cui/source/inc/AdditionsDialog.hxx:82 + AdditionInfo sDownloadURL class rtl::OUString dbaccess/source/core/inc/databasecontext.hxx:85 dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL dbaccess/source/sdbtools/inc/connectiondependent.hxx:115 @@ -160,22 +160,22 @@ include/sfx2/msg.hxx:143 SfxType13 aAttrib struct SfxTypeAttrib [13] include/sfx2/msg.hxx:143 SfxType13 nAttribs sal_uInt16 +include/sfx2/msg.hxx:144 + SfxType14 pType const std::type_info * include/sfx2/msg.hxx:144 SfxType14 aAttrib struct SfxTypeAttrib [14] include/sfx2/msg.hxx:144 SfxType14 nAttribs sal_uInt16 -include/sfx2/msg.hxx:144 - SfxType14 pType const std::type_info * include/sfx2/msg.hxx:144 SfxType14 createSfxPoolItemFunc std::function<SfxPoolItem *(void)> +include/sfx2/msg.hxx:145 + SfxType16 nAttribs sal_uInt16 include/sfx2/msg.hxx:145 SfxType16 aAttrib struct SfxTypeAttrib [16] include/sfx2/msg.hxx:145 SfxType16 createSfxPoolItemFunc std::function<SfxPoolItem *(void)> include/sfx2/msg.hxx:145 SfxType16 pType const std::type_info * -include/sfx2/msg.hxx:145 - SfxType16 nAttribs sal_uInt16 include/sfx2/msg.hxx:146 SfxType17 pType const std::type_info * include/sfx2/msg.hxx:146 @@ -260,7 +260,7 @@ pyuno/source/module/pyuno_impl.hxx:137 pyuno::(anonymous) ob_base PyObject pyuno/source/module/pyuno_impl.hxx:237 pyuno::stRuntimeImpl ob_base PyObject -reportdesign/source/filter/xml/xmlExport.cxx:1230 +reportdesign/source/filter/xml/xmlExport.cxx:1202 sal_Int32 reportdesign/source/ui/inc/ReportWindow.hxx:52 rptui::OReportWindow m_pObjFac std::unique_ptr<DlgEdFactory, o3tl::default_delete<DlgEdFactory> > @@ -458,11 +458,11 @@ vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx:31 (anonymous namespace)::HyperLink atk_hyper_link const AtkHyperlink vcl/unx/gtk3/gtk3gloactiongroup.cxx:27 (anonymous namespace)::GLOAction parent_instance GObject -vcl/unx/gtk3/gtk3gtkinst.cxx:5179 +vcl/unx/gtk3/gtk3gtkinst.cxx:5181 (anonymous namespace)::CrippledViewport viewport GtkViewport -vcl/unx/gtk3/gtk3gtkinst.cxx:5322 +vcl/unx/gtk3/gtk3gtkinst.cxx:5324 (anonymous namespace)::CustomCellRendererSurface parent GtkCellRendererText -vcl/unx/gtk3/gtk3gtkinst.cxx:5330 +vcl/unx/gtk3/gtk3gtkinst.cxx:5332 (anonymous namespace)::CustomCellRendererSurfaceClass parent_class GtkCellRendererTextClass writerfilter/source/ooxml/OOXMLStreamImpl.hxx:42 writerfilter::ooxml::OOXMLStreamImpl mxFastParser css::uno::Reference<css::xml::sax::XFastParser> diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results index 059c157ac567..9da75fac493e 100644 --- a/compilerplugins/clang/unusedfields.writeonly.results +++ b/compilerplugins/clang/unusedfields.writeonly.results @@ -4,7 +4,7 @@ basctl/source/inc/basidesh.hxx:87 basctl::Shell m_aNotifier class basctl::DocumentEventNotifier basctl/source/inc/bastype2.hxx:183 basctl::SbTreeListBox m_aNotifier class basctl::DocumentEventNotifier -basctl/source/inc/IDEComboBox.hxx:121 +basctl/source/inc/IDEComboBox.hxx:114 basctl::DocListenerBox maNotifier class basctl::DocumentEventNotifier basegfx/source/polygon/b2dpolygontriangulator.cxx:113 basegfx::(anonymous namespace)::Triangulator maNewEdgeEntries std::vector<std::unique_ptr<EdgeEntry> > @@ -106,6 +106,8 @@ codemaker/source/javamaker/classfile.cxx:508 floatBytes float codemaker/source/javamaker/classfile.cxx:540 doubleBytes double +comphelper/qa/container/comphelper_ifcontainer.cxx:44 + (anonymous namespace)::ContainerListener m_pStats struct (anonymous namespace)::ContainerStats *const comphelper/qa/unit/parallelsorttest.cxx:44 ParallelSortTest mnThreads size_t comphelper/source/misc/asyncnotification.cxx:86 @@ -214,8 +216,6 @@ cppu/source/uno/copy.hxx:39 cppu::(anonymous namespace)::SequencePrefix nRefCount sal_Int32 cppu/source/uno/copy.hxx:40 cppu::(anonymous namespace)::SequencePrefix nElements sal_Int32 -cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx:45 - (anonymous namespace)::ContainerListener m_pStats struct (anonymous namespace)::ContainerStats * cppuhelper/source/access_control.cxx:79 cppu::(anonymous namespace)::permission m_str1 rtl_uString * cppuhelper/source/access_control.cxx:80 @@ -284,23 +284,23 @@ drawinglayer/source/attribute/sdrfillgraphicattribute.cxx:45 drawinglayer::attribute::ImpSdrFillGraphicAttribute mbLogSize _Bool drawinglayer/source/attribute/sdrsceneattribute3d.cxx:30 drawinglayer::attribute::ImpSdrSceneAttribute mfDistance double -embeddedobj/source/inc/oleembobj.hxx:132 +embeddedobj/source/inc/oleembobj.hxx:133 OleEmbeddedObject m_nTargetState sal_Int32 -embeddedobj/source/inc/oleembobj.hxx:144 +embeddedobj/source/inc/oleembobj.hxx:145 OleEmbeddedObject m_xClosePreventer css::uno::Reference<css::util::XCloseListener> -embeddedobj/source/inc/oleembobj.hxx:166 - OleEmbeddedObject m_bHasSizeToSet _Bool embeddedobj/source/inc/oleembobj.hxx:167 - OleEmbeddedObject m_aSizeToSet css::awt::Size + OleEmbeddedObject m_bHasSizeToSet _Bool embeddedobj/source/inc/oleembobj.hxx:168 + OleEmbeddedObject m_aSizeToSet css::awt::Size +embeddedobj/source/inc/oleembobj.hxx:169 OleEmbeddedObject m_nAspectToSet sal_Int64 -embeddedobj/source/inc/oleembobj.hxx:173 - OleEmbeddedObject m_bGotStatus _Bool embeddedobj/source/inc/oleembobj.hxx:174 - OleEmbeddedObject m_nStatus sal_Int64 + OleEmbeddedObject m_bGotStatus _Bool embeddedobj/source/inc/oleembobj.hxx:175 + OleEmbeddedObject m_nStatus sal_Int64 +embeddedobj/source/inc/oleembobj.hxx:176 OleEmbeddedObject m_nStatusAspect sal_Int64 -embeddedobj/source/inc/oleembobj.hxx:189 +embeddedobj/source/inc/oleembobj.hxx:190 OleEmbeddedObject m_bFromClipboard _Bool emfio/inc/mtftools.hxx:512 emfio::MtfTools mrclBounds tools::Rectangle @@ -402,7 +402,7 @@ include/svx/galctrl.hxx:39 GalleryPreview mxDragDropTargetHelper std::unique_ptr<GalleryDragDrop> include/svx/galctrl.hxx:92 GalleryIconView mxDragDropTargetHelper std::unique_ptr<GalleryDragDrop> -include/svx/gridctrl.hxx:256 +include/svx/gridctrl.hxx:257 DbGridControl m_pCursorDisposeListener std::unique_ptr<DisposeListenerGridBridge> include/svx/ofaitem.hxx:44 OfaRefItem mxRef rtl::Reference<reference_type> @@ -424,10 +424,6 @@ include/test/beans/xpropertyset.hxx:56 apitest::XPropertySet::PropsToTest constrained std::vector<OUString> include/unotools/fontcfg.hxx:159 utl::FontSubstConfiguration maSubstHash utl::FontSubstConfiguration::UniqueSubstHash -include/vcl/edit.hxx:71 - Edit mbModified _Bool -include/vcl/menu.hxx:451 - MenuBar::MenuBarButtonCallbackArg bHighlight _Bool include/vcl/NotebookBarAddonsMerger.hxx:54 AddonNotebookBarItem sTarget class rtl::OUString include/vcl/NotebookBarAddonsMerger.hxx:55 @@ -450,8 +446,6 @@ include/vcl/sysdata.hxx:69 SystemEnvData pSalFrame void * include/vcl/textrectinfo.hxx:32 TextRectInfo mnLineCount sal_uInt16 -include/vcl/toolkit/button.hxx:89 - CheckBox meSaveValue enum TriState include/vcl/vclenum.hxx:202 ItalicMatrix yy double include/vcl/vclenum.hxx:202 @@ -526,7 +520,7 @@ sc/inc/compiler.hxx:265 ScCompiler::AddInMap pUpper const char * sc/inc/compressedarray.hxx:70 ScCompressedArray::RangeData mnRow2 A -sc/inc/document.hxx:2639 +sc/inc/document.hxx:2644 ScMutationDisable mpDocument class ScDocument * sc/inc/patattr.hxx:55 ScPatternAttr mxHashCode std::optional<size_t> @@ -872,7 +866,7 @@ svx/source/sidebar/text/TextPropertyPanel.hxx:68 svx::sidebar::TextPropertyPanel mxPositionBarDispatch std::unique_ptr<ToolbarUnoDispatcher> svx/source/sidebar/text/TextPropertyPanel.hxx:70 svx::sidebar::TextPropertyPanel mxSpacingBarDispatch std::unique_ptr<ToolbarUnoDispatcher> -svx/source/tbxctrls/tbcontrl.cxx:312 +svx/source/tbxctrls/tbcontrl.cxx:306 (anonymous namespace)::SvxFontNameBox_Base m_aOwnFontList ::std::unique_ptr<FontList> sw/inc/accmap.hxx:96 SwAccessibleMap mvShapes SwShapeList_Impl @@ -1132,7 +1126,7 @@ vcl/unx/gtk3/gtk3glomenu.cxx:14 GLOMenu parent_instance const GMenuModel vcl/unx/gtk3/gtk3gtkinst.cxx:1613 in char * -vcl/unx/gtk3/gtk3gtkinst.cxx:13066 +vcl/unx/gtk3/gtk3gtkinst.cxx:13078 (anonymous namespace)::GtkInstanceComboBox m_xCustomMenuButtonHelper std::unique_ptr<CustomRenderMenuButtonHelper> vcl/unx/gtk3/gtk3hudawareness.cxx:18 (anonymous namespace)::HudAwarenessHandle connection GDBusConnection * @@ -1140,10 +1134,8 @@ vcl/unx/gtk3/gtk3hudawareness.cxx:21 (anonymous namespace)::HudAwarenessHandle notify GDestroyNotify vcl/workben/vcldemo.cxx:1748 (anonymous namespace)::DemoWin mxThread rtl::Reference<RenderThread> -writerfilter/source/dmapper/DomainMapperTableHandler.cxx:226 +writerfilter/source/dmapper/DomainMapperTableHandler.cxx:227 writerfilter::dmapper::TableInfo aTablePropertyIds std::vector<PropertyIds> -writerfilter/source/dmapper/DomainMapperTableManager.hxx:42 - writerfilter::dmapper::DomainMapperTableManager m_nGridAfter sal_uInt32 writerfilter/source/dmapper/PropertyMap.hxx:219 writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32 writerfilter/source/dmapper/SettingsTable.cxx:264 diff --git a/include/vcl/toolkit/field.hxx b/include/vcl/toolkit/field.hxx index f4a2874aedae..9fc31208798c 100644 --- a/include/vcl/toolkit/field.hxx +++ b/include/vcl/toolkit/field.hxx @@ -126,7 +126,6 @@ protected: sal_Int64 mnLastValue; sal_Int64 mnMin; sal_Int64 mnMax; - bool mbWrapOnLimits; bool mbFormatting; // the members below are used in all derivatives of NumericFormatter diff --git a/include/vcl/toolkit/longcurr.hxx b/include/vcl/toolkit/longcurr.hxx index 10fd75dbed9a..bec4ff286b3f 100644 --- a/include/vcl/toolkit/longcurr.hxx +++ b/include/vcl/toolkit/longcurr.hxx @@ -58,7 +58,6 @@ private: friend bool ImplLongCurrencyReformat( const OUString&, BigInt const &, BigInt const &, sal_uInt16, const LocaleDataWrapper&, OUString&, LongCurrencyFormatter const & ); SAL_DLLPRIVATE void ImpInit(); - OUString maCurrencySymbol; sal_uInt16 mnDecimalDigits; bool mbThousandSep; diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index bc6328d1adfc..65089351795d 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -546,7 +546,6 @@ NumericFormatter::NumericFormatter(Edit* pEdit) // a "large" value substantially smaller than SAL_MAX_INT64, to avoid // overflow in computations using this "dummy" value , mnMax(SAL_MAX_INT32) - , mbWrapOnLimits(false) , mbFormatting(false) , mnSpinSize(1) // for fields @@ -768,11 +767,9 @@ void NumericFormatter::ImplNewFieldValue( sal_Int64 nNewValue ) sal_Int64 NumericFormatter::ClipAgainstMinMax(sal_Int64 nValue) const { if (nValue > mnMax) - nValue = mbWrapOnLimits ? ((nValue - mnMin) % (mnMax + 1)) + mnMin - : mnMax; + nValue = mnMax; else if (nValue < mnMin) - nValue = mbWrapOnLimits ? ((nValue + mnMax + 1 - mnMin) % (mnMax + 1)) + mnMin - : mnMin; + nValue = mnMin; return nValue; } diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index 42a79fffd400..b4368c3e10a6 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -291,7 +291,7 @@ LongCurrencyFormatter::~LongCurrencyFormatter() OUString const & LongCurrencyFormatter::GetCurrencySymbol() const { - return !maCurrencySymbol.isEmpty() ? maCurrencySymbol : GetLocaleDataWrapper().getCurrSymbol(); + return GetLocaleDataWrapper().getCurrSymbol(); } void LongCurrencyFormatter::SetValue(const BigInt& rNewValue) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits