compilerplugins/clang/mergeclasses.results | 64 ++--
compilerplugins/clang/unnecessaryvirtual-dead.results | 18 -
compilerplugins/clang/unnecessaryvirtual.results | 286 ++++++++----------
toolkit/source/controls/table/tablecontrol_impl.hxx | 2
vcl/inc/qt5/QtInstanceMessageDialog.hxx | 2
5 files changed, 192 insertions(+), 180 deletions(-)
New commits:
commit 5ff1b4491a79644b6efdd6ddac86d5c41196f9f8
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Feb 5 14:32:02 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Feb 5 17:15:25 2025 +0100
loplugin:unnecessaryvirtual
Change-Id: I9fc9554f659beea6041b8c64f915c853478aebd6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181179
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/compilerplugins/clang/unnecessaryvirtual-dead.results
b/compilerplugins/clang/unnecessaryvirtual-dead.results
index ca225b0b7a04..069067a717d9 100644
--- a/compilerplugins/clang/unnecessaryvirtual-dead.results
+++ b/compilerplugins/clang/unnecessaryvirtual-dead.results
@@ -12,19 +12,25 @@ sc/source/core/opencl/opbase.hxx:447
void
sc::opencl::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class
sc::opencl::outputstream &,)
slideshow/source/engine/animationfactory.cxx:617
void slideshow::internal::(anonymous
namespace)::GenericAnimation::prefetch()
-ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:2002
+ux-gnu/../../../include/c++/14/bits/locale_facets_nonio.h:2002
void std::messages::do_close(int,)const
-ux-gnu/../../../include/c++/13/streambuf:583
+ux-gnu/../../../include/c++/14/streambuf:583
void std::basic_streambuf::imbue(const class std::locale &,)
vcl/inc/font/LogicalFontInstance.hxx:127
void LogicalFontInstance::ImplInitHbFont(struct hb_font_t *,)
-vcl/inc/salframe.hxx:145
+vcl/inc/salframe.hxx:147
void SalFrame::SetRepresentedURL(const class rtl::OUString &,)
-vcl/inc/salframe.hxx:214
+vcl/inc/salframe.hxx:219
void SalFrame::FlashWindow()const
-vcl/inc/salinst.hxx:203
+vcl/inc/salframe.hxx:319
+ void SalFrame::SetTaskBarProgress(int,)
+vcl/inc/salframe.hxx:320
+ void SalFrame::SetTaskBarState(enum VclTaskBarStates,)
+vcl/inc/salinst.hxx:210
void SalInstance::releaseMainThread()
-vcl/inc/salinst.hxx:212
+vcl/inc/salinst.hxx:219
void SalInstance::BeforeAbort(const class rtl::OUString &,_Bool,)
+vcl/inc/salmenu.hxx:77
+ void SalMenu::GetSystemMenuData(struct SystemMenuData &,)
vcl/inc/salobj.hxx:49
void SalObject::Enable(_Bool,)
diff --git a/compilerplugins/clang/unnecessaryvirtual.results
b/compilerplugins/clang/unnecessaryvirtual.results
index 82bd13690f35..13b721fedfff 100644
--- a/compilerplugins/clang/unnecessaryvirtual.results
+++ b/compilerplugins/clang/unnecessaryvirtual.results
@@ -212,8 +212,6 @@ canvas/inc/rendering/irendermodule.hxx:60
void canvas::IRenderModule::~IRenderModule()
canvas/inc/rendering/isurface.hxx:34
void canvas::ISurface::~ISurface()
-chart2/source/inc/WeakListenerAdapter.hxx:52
- void chart::WeakListenerAdapter::disposing(const struct
com::sun::star::lang::EventObject &,)
extensions/source/dbpilots/unoautopilot.hxx:81
class cppu::IPropertyArrayHelper *
dbp::OUnoAutoPilot::createArrayHelper()const
extensions/source/propctrlr/commoncontrol.hxx:129
@@ -272,7 +270,7 @@ include/svl/svdde.hxx:243
_Bool DdeTopic::StartAdviseLoop()
include/svl/svdde.hxx:300
void DdeService::~DdeService()
-include/svx/svdundo.hxx:768
+include/svx/svdundo.hxx:765
class std::unique_ptr<class SdrUndoAction>
SdrUndoFactory::CreateUndoDiagramModelData(class SdrObject &,class
std::shared_ptr<class svx::diagram::DiagramDataState> &,)
include/vbahelper/vbacollectionimpl.hxx:289
int ScVbaCollectionBase::getCount()
@@ -296,21 +294,11 @@ include/vbahelper/vbareturntypes.hxx:38
void ooo::vba::DefaultReturnHelper::setValue(type-parameter-0-0,)
include/vbahelper/vbareturntypes.hxx:39
type-parameter-0-0 ooo::vba::DefaultReturnHelper::getValue()
-include/vcl/BitmapArithmeticBlendFilter.hxx:24
- void BitmapArithmeticBlendFilter::~BitmapArithmeticBlendFilter()
-include/vcl/BitmapDarkenBlendFilter.hxx:25
- void BitmapDarkenBlendFilter::~BitmapDarkenBlendFilter()
-include/vcl/BitmapLightenBlendFilter.hxx:25
- void BitmapLightenBlendFilter::~BitmapLightenBlendFilter()
-include/vcl/BitmapMultiplyBlendFilter.hxx:25
- void BitmapMultiplyBlendFilter::~BitmapMultiplyBlendFilter()
-include/vcl/BitmapNormalBlendFilter.hxx:25
- void BitmapNormalBlendFilter::~BitmapNormalBlendFilter()
-include/vcl/BitmapScreenBlendFilter.hxx:25
- void BitmapScreenBlendFilter::~BitmapScreenBlendFilter()
include/vcl/customweld.hxx:45
class rtl::OUString weld::CustomWidgetController::GetHelpText()const
-include/vcl/weld.hxx:109
+include/vcl/menu.hxx:404
+ void Menu::DumpAsPropertyTree(class tools::JsonWriter &,)const
+include/vcl/weld.hxx:128
void weld::Widget::set_visible(_Bool,)
sc/source/core/opencl/opbase.hxx:446
_Bool
sc::opencl::DynamicKernelSlidingArgument::NeedParallelReduction()const
@@ -412,271 +400,279 @@ slideshow/source/engine/animationfactory.cxx:620
void slideshow::internal::(anonymous
namespace)::GenericAnimation::start(const class std::shared_ptr<class
slideshow::internal::AnimatableShape> &,const class std::shared_ptr<class
slideshow::internal::ShapeAttributeLayer> &,)
slideshow/source/inc/shape.hxx:221
void slideshow::internal::Shape::setIsForeground(const _Bool,)
-sw/source/core/inc/txtfrm.hxx:512
- _Bool SwTextFrame::IsInHyphenatedWord(class SwPaM *,_Bool,)const
-sw/source/writerfilter/dmapper/TableManager.hxx:490
+sw/source/writerfilter/dmapper/TableManager.hxx:495
void writerfilter::dmapper::TableManager::tableExceptionProps(const class
tools::SvRef<class writerfilter::dmapper::TablePropertyMap> &,)
toolkit/inc/controls/geometrycontrolmodel.hxx:185
void OGeometryControlModel::fillProperties(class
com::sun::star::uno::Sequence<struct com::sun::star::beans::Property> &,class
com::sun::star::uno::Sequence<struct com::sun::star::beans::Property> &,)const
-ux-gnu/../../../include/c++/13/bits/locale_classes.h:780
+toolkit/source/controls/table/tablecontrol_impl.hxx:257
+ _Bool svt::table::TableControl_Impl::dispatchAction(enum
svt::table::TableControlAction,)
+ux-gnu/../../../include/c++/14/bits/locale_classes.h:799
int std::collate::do_compare(const type-parameter-0-0 *,const
type-parameter-0-0 *,const type-parameter-0-0 *,const type-parameter-0-0
*,)const
-ux-gnu/../../../include/c++/13/bits/locale_classes.h:794
+ux-gnu/../../../include/c++/14/bits/locale_classes.h:813
basic_string<type-parameter-0-0, char_traits<type-parameter-0-0>,
allocator<type-parameter-0-0> > std::collate::do_transform(const
type-parameter-0-0 *,const type-parameter-0-0 *,)const
-ux-gnu/../../../include/c++/13/bits/locale_classes.h:807
+ux-gnu/../../../include/c++/14/bits/locale_classes.h:826
long std::collate::do_hash(const type-parameter-0-0 *,const
type-parameter-0-0 *,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:1092
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:1092
char std::ctype<char>::do_widen(char,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:1115
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:1115
const char * std::ctype<char>::do_widen(const char *,const char *,char
*,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:1142
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:1142
char std::ctype<char>::do_narrow(char,char,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:1168
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:1168
const char * std::ctype<char>::do_narrow(const char *,const char
*,char,char *,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:1831
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:1831
type-parameter-0-0 std::numpunct::do_decimal_point()const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:1843
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:1843
type-parameter-0-0 std::numpunct::do_thousands_sep()const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:1856
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:1856
class std::basic_string<char> std::numpunct::do_grouping()const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:1869
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:1869
basic_string<type-parameter-0-0, char_traits<type-parameter-0-0>,
allocator<type-parameter-0-0> > std::numpunct::do_truename()const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:1882
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:1882
basic_string<type-parameter-0-0, char_traits<type-parameter-0-0>,
allocator<type-parameter-0-0> > std::numpunct::do_falsename()const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:2220
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:2220
type-parameter-0-1
std::num_get::do_get(type-parameter-0-1,type-parameter-0-1,class std::ios_base
&,enum std::_Ios_Iostate &,_Bool &,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:2223
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:2223
type-parameter-0-1
std::num_get::do_get(type-parameter-0-1,type-parameter-0-1,class std::ios_base
&,enum std::_Ios_Iostate &,long &,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:2228
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:2228
type-parameter-0-1
std::num_get::do_get(type-parameter-0-1,type-parameter-0-1,class std::ios_base
&,enum std::_Ios_Iostate &,unsigned short &,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:2233
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:2233
type-parameter-0-1
std::num_get::do_get(type-parameter-0-1,type-parameter-0-1,class std::ios_base
&,enum std::_Ios_Iostate &,unsigned int &,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:2238
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:2238
type-parameter-0-1
std::num_get::do_get(type-parameter-0-1,type-parameter-0-1,class std::ios_base
&,enum std::_Ios_Iostate &,unsigned long &,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:2244
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:2244
type-parameter-0-1
std::num_get::do_get(type-parameter-0-1,type-parameter-0-1,class std::ios_base
&,enum std::_Ios_Iostate &,long long &,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:2249
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:2249
type-parameter-0-1
std::num_get::do_get(type-parameter-0-1,type-parameter-0-1,class std::ios_base
&,enum std::_Ios_Iostate &,unsigned long long &,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:2255
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:2255
type-parameter-0-1
std::num_get::do_get(type-parameter-0-1,type-parameter-0-1,class std::ios_base
&,enum std::_Ios_Iostate &,float &,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:2258
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:2258
type-parameter-0-1
std::num_get::do_get(type-parameter-0-1,type-parameter-0-1,class std::ios_base
&,enum std::_Ios_Iostate &,double &,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:2272
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:2272
type-parameter-0-1
std::num_get::do_get(type-parameter-0-1,type-parameter-0-1,class std::ios_base
&,enum std::_Ios_Iostate &,long double &,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:2277
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:2277
type-parameter-0-1
std::num_get::do_get(type-parameter-0-1,type-parameter-0-1,class std::ios_base
&,enum std::_Ios_Iostate &,void *&,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:2535
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:2535
type-parameter-0-1 std::num_put::do_put(type-parameter-0-1,class
std::ios_base &,type-parameter-0-0,_Bool,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:2538
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:2538
type-parameter-0-1 std::num_put::do_put(type-parameter-0-1,class
std::ios_base &,type-parameter-0-0,long,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:2542
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:2542
type-parameter-0-1 std::num_put::do_put(type-parameter-0-1,class
std::ios_base &,type-parameter-0-0,unsigned long,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:2548
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:2548
type-parameter-0-1 std::num_put::do_put(type-parameter-0-1,class
std::ios_base &,type-parameter-0-0,long long,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:2553
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:2553
type-parameter-0-1 std::num_put::do_put(type-parameter-0-1,class
std::ios_base &,type-parameter-0-0,unsigned long long,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets.h:2571
+ux-gnu/../../../include/c++/14/bits/locale_facets.h:2571
type-parameter-0-1 std::num_put::do_put(type-parameter-0-1,class
std::ios_base &,type-parameter-0-0,const void *,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:636
+ux-gnu/../../../include/c++/14/bits/locale_facets_nonio.h:636
enum std::time_base::dateorder std::time_get::do_date_order()const
-ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:654
+ux-gnu/../../../include/c++/14/bits/locale_facets_nonio.h:654
type-parameter-0-1
std::time_get::do_get_time(type-parameter-0-1,type-parameter-0-1,class
std::ios_base &,enum std::_Ios_Iostate &,struct tm *,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:673
+ux-gnu/../../../include/c++/14/bits/locale_facets_nonio.h:673
type-parameter-0-1
std::time_get::do_get_date(type-parameter-0-1,type-parameter-0-1,class
std::ios_base &,enum std::_Ios_Iostate &,struct tm *,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:692
+ux-gnu/../../../include/c++/14/bits/locale_facets_nonio.h:692
type-parameter-0-1
std::time_get::do_get_weekday(type-parameter-0-1,type-parameter-0-1,class
std::ios_base &,enum std::_Ios_Iostate &,struct tm *,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:711
+ux-gnu/../../../include/c++/14/bits/locale_facets_nonio.h:711
type-parameter-0-1
std::time_get::do_get_monthname(type-parameter-0-1,type-parameter-0-1,class
std::ios_base &,enum std::_Ios_Iostate &,struct tm *,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:730
+ux-gnu/../../../include/c++/14/bits/locale_facets_nonio.h:730
type-parameter-0-1
std::time_get::do_get_year(type-parameter-0-1,type-parameter-0-1,class
std::ios_base &,enum std::_Ios_Iostate &,struct tm *,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:755
+ux-gnu/../../../include/c++/14/bits/locale_facets_nonio.h:755
type-parameter-0-1
std::time_get::do_get(type-parameter-0-1,type-parameter-0-1,class std::ios_base
&,enum std::_Ios_Iostate &,struct tm *,char,char,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:922
+ux-gnu/../../../include/c++/14/bits/locale_facets_nonio.h:922
type-parameter-0-1 std::time_put::do_put(type-parameter-0-1,class
std::ios_base &,type-parameter-0-0,const struct tm *,char,char,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:1297
+ux-gnu/../../../include/c++/14/bits/locale_facets_nonio.h:1297
type-parameter-0-0 std::moneypunct::do_decimal_point()const
-ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:1309
+ux-gnu/../../../include/c++/14/bits/locale_facets_nonio.h:1309
type-parameter-0-0 std::moneypunct::do_thousands_sep()const
-ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:1322
+ux-gnu/../../../include/c++/14/bits/locale_facets_nonio.h:1322
class std::basic_string<char> std::moneypunct::do_grouping()const
-ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:1335
+ux-gnu/../../../include/c++/14/bits/locale_facets_nonio.h:1335
basic_string<type-parameter-0-0, char_traits<type-parameter-0-0>,
allocator<type-parameter-0-0> > std::moneypunct::do_curr_symbol()const
-ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:1348
+ux-gnu/../../../include/c++/14/bits/locale_facets_nonio.h:1348
basic_string<type-parameter-0-0, char_traits<type-parameter-0-0>,
allocator<type-parameter-0-0> > std::moneypunct::do_positive_sign()const
-ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:1361
+ux-gnu/../../../include/c++/14/bits/locale_facets_nonio.h:1361
basic_string<type-parameter-0-0, char_traits<type-parameter-0-0>,
allocator<type-parameter-0-0> > std::moneypunct::do_negative_sign()const
-ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:1375
+ux-gnu/../../../include/c++/14/bits/locale_facets_nonio.h:1375
int std::moneypunct::do_frac_digits()const
-ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:1389
+ux-gnu/../../../include/c++/14/bits/locale_facets_nonio.h:1389
struct std::money_base::pattern std::moneypunct::do_pos_format()const
-ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:1403
+ux-gnu/../../../include/c++/14/bits/locale_facets_nonio.h:1403
struct std::money_base::pattern std::moneypunct::do_neg_format()const
-ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:1613
+ux-gnu/../../../include/c++/14/bits/locale_facets_nonio.h:1613
type-parameter-0-1
std::money_get::do_get(type-parameter-0-1,type-parameter-0-1,_Bool,class
std::ios_base &,enum std::_Ios_Iostate &,long double &,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:1625
+ux-gnu/../../../include/c++/14/bits/locale_facets_nonio.h:1625
type-parameter-0-1
std::money_get::do_get(type-parameter-0-1,type-parameter-0-1,_Bool,class
std::ios_base &,enum std::_Ios_Iostate &,basic_string<type-parameter-0-0,
char_traits<type-parameter-0-0>, allocator<type-parameter-0-0> > &,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:1766
+ux-gnu/../../../include/c++/14/bits/locale_facets_nonio.h:1766
type-parameter-0-1 std::money_put::do_put(type-parameter-0-1,_Bool,class
std::ios_base &,type-parameter-0-0,long double,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:1790
+ux-gnu/../../../include/c++/14/bits/locale_facets_nonio.h:1790
type-parameter-0-1 std::money_put::do_put(type-parameter-0-1,_Bool,class
std::ios_base &,type-parameter-0-0,const basic_string<type-parameter-0-0,
char_traits<type-parameter-0-0>, allocator<type-parameter-0-0> > &,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:1975
+ux-gnu/../../../include/c++/14/bits/locale_facets_nonio.h:1975
int std::messages::do_open(const class std::basic_string<char> &,const
class std::locale &,)const
-ux-gnu/../../../include/c++/13/bits/locale_facets_nonio.h:2002
+ux-gnu/../../../include/c++/14/bits/locale_facets_nonio.h:2002
void std::messages::do_close(int,)const
-ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:427
+ux-gnu/../../../include/c++/14/bits/shared_ptr_base.h:427
void std::_Sp_counted_ptr::_M_dispose()
-ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:431
+ux-gnu/../../../include/c++/14/bits/shared_ptr_base.h:431
void std::_Sp_counted_ptr::_M_destroy()
-ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:435
+ux-gnu/../../../include/c++/14/bits/shared_ptr_base.h:435
void * std::_Sp_counted_ptr::_M_get_deleter(const class std::type_info &,)
-ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:526
+ux-gnu/../../../include/c++/14/bits/shared_ptr_base.h:526
void std::_Sp_counted_deleter::_M_dispose()
-ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:530
+ux-gnu/../../../include/c++/14/bits/shared_ptr_base.h:530
void std::_Sp_counted_deleter::_M_destroy()
-ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:538
+ux-gnu/../../../include/c++/14/bits/shared_ptr_base.h:538
void * std::_Sp_counted_deleter::_M_get_deleter(const class std::type_info
&,)
-ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:611
+ux-gnu/../../../include/c++/14/bits/shared_ptr_base.h:614
void std::_Sp_counted_ptr_inplace::_M_dispose()
-ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:618
+ux-gnu/../../../include/c++/14/bits/shared_ptr_base.h:621
void std::_Sp_counted_ptr_inplace::_M_destroy()
-ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:631
+ux-gnu/../../../include/c++/14/bits/shared_ptr_base.h:634
void * std::_Sp_counted_ptr_inplace::_M_get_deleter(const class
std::type_info &,)
-ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:695
+ux-gnu/../../../include/c++/14/bits/shared_ptr_base.h:697
void std::_Sp_counted_ptr_inplace<type-parameter-0-0, type-parameter-0-1,
_Lp>::_M_dispose()
-ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:702
+ux-gnu/../../../include/c++/14/bits/shared_ptr_base.h:704
void std::_Sp_counted_ptr_inplace<type-parameter-0-0, type-parameter-0-1,
_Lp>::_M_destroy()
-ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:845
+ux-gnu/../../../include/c++/14/bits/shared_ptr_base.h:843
void std::_Sp_counted_array::_M_dispose()
-ux-gnu/../../../include/c++/13/bits/shared_ptr_base.h:853
+ux-gnu/../../../include/c++/14/bits/shared_ptr_base.h:851
void std::_Sp_counted_array::_M_destroy()
-ux-gnu/../../../include/c++/13/cxxabi.h:307
+ux-gnu/../../../include/c++/14/cxxabi.h:307
_Bool __cxxabiv1::__pbase_type_info::__pointer_catch(const class
__cxxabiv1::__pbase_type_info *,void **,unsigned int,)const
-ux-gnu/../../../include/c++/13/fstream:379
+ux-gnu/../../../include/c++/14/fstream:412
long std::basic_filebuf::showmanyc()
-ux-gnu/../../../include/c++/13/fstream:387
+ux-gnu/../../../include/c++/14/fstream:420
typename type-parameter-0-1::int_type std::basic_filebuf::underflow()
-ux-gnu/../../../include/c++/13/fstream:390
+ux-gnu/../../../include/c++/14/fstream:423
typename type-parameter-0-1::int_type
std::basic_filebuf::pbackfail(typename type-parameter-0-1::int_type,)
-ux-gnu/../../../include/c++/13/fstream:400
+ux-gnu/../../../include/c++/14/fstream:433
typename type-parameter-0-1::int_type
std::basic_filebuf::overflow(typename type-parameter-0-1::int_type,)
-ux-gnu/../../../include/c++/13/fstream:420
+ux-gnu/../../../include/c++/14/fstream:453
basic_streambuf<type-parameter-0-0, type-parameter-0-1> *
std::basic_filebuf::setbuf(type-parameter-0-0 *,long,)
-ux-gnu/../../../include/c++/13/fstream:423
+ux-gnu/../../../include/c++/14/fstream:456
typename type-parameter-0-1::pos_type std::basic_filebuf::seekoff(typename
type-parameter-0-1::off_type,enum std::_Ios_Seekdir,enum std::_Ios_Openmode,)
-ux-gnu/../../../include/c++/13/fstream:427
+ux-gnu/../../../include/c++/14/fstream:460
typename type-parameter-0-1::pos_type std::basic_filebuf::seekpos(typename
type-parameter-0-1::pos_type,enum std::_Ios_Openmode,)
-ux-gnu/../../../include/c++/13/fstream:438
+ux-gnu/../../../include/c++/14/fstream:471
int std::basic_filebuf::sync()
-ux-gnu/../../../include/c++/13/fstream:441
+ux-gnu/../../../include/c++/14/fstream:474
void std::basic_filebuf::imbue(const class std::locale &,)
-ux-gnu/../../../include/c++/13/fstream:444
+ux-gnu/../../../include/c++/14/fstream:477
long std::basic_filebuf::xsgetn(type-parameter-0-0 *,long,)
-ux-gnu/../../../include/c++/13/fstream:447
+ux-gnu/../../../include/c++/14/fstream:480
long std::basic_filebuf::xsputn(const type-parameter-0-0 *,long,)
-ux-gnu/../../../include/c++/13/future:1488
+ux-gnu/../../../include/c++/14/future:1495
void std::__future_base::_Task_state<type-parameter-0-0,
type-parameter-0-1, type-parameter-0-2
(type-parameter-0-3...)>::_M_run(type-parameter-0-3 &&...,)
-ux-gnu/../../../include/c++/13/future:1498
+ux-gnu/../../../include/c++/14/future:1505
void std::__future_base::_Task_state<type-parameter-0-0,
type-parameter-0-1, type-parameter-0-2
(type-parameter-0-3...)>::_M_run_delayed(type-parameter-0-3 &&...,class
std::weak_ptr<class std::__future_base::_State_baseV2>,)
-ux-gnu/../../../include/c++/13/future:1509
+ux-gnu/../../../include/c++/14/future:1516
shared_ptr<_Task_state_base<type-parameter-0-2 (type-parameter-0-3...)> >
std::__future_base::_Task_state<type-parameter-0-0, type-parameter-0-1,
type-parameter-0-2 (type-parameter-0-3...)>::_M_reset()
-ux-gnu/../../../include/c++/13/sstream:346
+ux-gnu/../../../include/c++/14/sstream:346
long std::basic_stringbuf::showmanyc()
-ux-gnu/../../../include/c++/13/sstream:358
+ux-gnu/../../../include/c++/14/sstream:358
typename type-parameter-0-1::int_type std::basic_stringbuf::underflow()
-ux-gnu/../../../include/c++/13/sstream:361
+ux-gnu/../../../include/c++/14/sstream:361
typename type-parameter-0-1::int_type
std::basic_stringbuf::pbackfail(typename type-parameter-0-1::int_type,)
-ux-gnu/../../../include/c++/13/sstream:364
+ux-gnu/../../../include/c++/14/sstream:364
typename type-parameter-0-1::int_type
std::basic_stringbuf::overflow(typename type-parameter-0-1::int_type,)
-ux-gnu/../../../include/c++/13/sstream:378
+ux-gnu/../../../include/c++/14/sstream:378
basic_streambuf<type-parameter-0-0, type-parameter-0-1> *
std::basic_stringbuf::setbuf(type-parameter-0-0 *,long,)
-ux-gnu/../../../include/c++/13/sstream:397
+ux-gnu/../../../include/c++/14/sstream:397
typename type-parameter-0-1::pos_type
std::basic_stringbuf::seekoff(typename type-parameter-0-1::off_type,enum
std::_Ios_Seekdir,enum std::_Ios_Openmode,)
-ux-gnu/../../../include/c++/13/sstream:401
+ux-gnu/../../../include/c++/14/sstream:401
typename type-parameter-0-1::pos_type
std::basic_stringbuf::seekpos(typename type-parameter-0-1::pos_type,enum
std::_Ios_Openmode,)
-ux-gnu/../../../include/c++/13/streambuf:583
+ux-gnu/../../../include/c++/14/streambuf:583
void std::basic_streambuf::imbue(const class std::locale &,)
-ux-gnu/../../../include/c++/13/streambuf:598
+ux-gnu/../../../include/c++/14/streambuf:598
basic_streambuf<_CharT, _Traits> *
std::basic_streambuf::setbuf(type-parameter-0-0 *,long,)
-ux-gnu/../../../include/c++/13/streambuf:609
+ux-gnu/../../../include/c++/14/streambuf:609
typename type-parameter-0-1::pos_type
std::basic_streambuf::seekoff(typename type-parameter-0-1::off_type,enum
std::_Ios_Seekdir,enum std::_Ios_Openmode,)
-ux-gnu/../../../include/c++/13/streambuf:621
+ux-gnu/../../../include/c++/14/streambuf:621
typename type-parameter-0-1::pos_type
std::basic_streambuf::seekpos(typename type-parameter-0-1::pos_type,enum
std::_Ios_Openmode,)
-ux-gnu/../../../include/c++/13/streambuf:634
+ux-gnu/../../../include/c++/14/streambuf:634
int std::basic_streambuf::sync()
-ux-gnu/../../../include/c++/13/streambuf:656
+ux-gnu/../../../include/c++/14/streambuf:656
long std::basic_streambuf::showmanyc()
-ux-gnu/../../../include/c++/13/streambuf:672
+ux-gnu/../../../include/c++/14/streambuf:672
long std::basic_streambuf::xsgetn(type-parameter-0-0 *,long,)
-ux-gnu/../../../include/c++/13/streambuf:694
+ux-gnu/../../../include/c++/14/streambuf:694
typename type-parameter-0-1::int_type std::basic_streambuf::underflow()
-ux-gnu/../../../include/c++/13/streambuf:707
+ux-gnu/../../../include/c++/14/streambuf:707
typename type-parameter-0-1::int_type std::basic_streambuf::uflow()
-ux-gnu/../../../include/c++/13/streambuf:731
+ux-gnu/../../../include/c++/14/streambuf:731
typename type-parameter-0-1::int_type
std::basic_streambuf::pbackfail(typename type-parameter-0-1::int_type,)
-ux-gnu/../../../include/c++/13/streambuf:749
+ux-gnu/../../../include/c++/14/streambuf:749
long std::basic_streambuf::xsputn(const type-parameter-0-0 *,long,)
-ux-gnu/../../../include/c++/13/streambuf:775
+ux-gnu/../../../include/c++/14/streambuf:775
typename type-parameter-0-1::int_type
std::basic_streambuf::overflow(typename type-parameter-0-1::int_type,)
ux-gnu/qt5/QtGui/qpaintdevice.h:74
int QPaintDevice::devType()const
+ux-gnu/qt5/QtGui/qtextdocument.h:86
+ void QAbstractUndoItem::~QAbstractUndoItem()
vcl/inc/font/LogicalFontInstance.hxx:127
void LogicalFontInstance::ImplInitHbFont(struct hb_font_t *,)
-vcl/inc/jsdialog/jsdialogbuilder.hxx:161
- void JSDialogSender::sendFullUpdate(_Bool,)
-vcl/inc/jsdialog/jsdialogbuilder.hxx:168
- void JSDialogSender::sendClosePopup(unsigned int,)
-vcl/inc/jsdialog/jsdialogbuilder.hxx:394
+vcl/inc/jsdialog/jsdialogbuilder.hxx:296
void JSWidget::show()
-vcl/inc/jsdialog/jsdialogbuilder.hxx:407
+vcl/inc/jsdialog/jsdialogbuilder.hxx:309
void JSWidget::hide()
-vcl/inc/jsdialog/jsdialogbuilder.hxx:421
+vcl/inc/jsdialog/jsdialogbuilder.hxx:323
void JSWidget::set_sensitive(_Bool,)
-vcl/inc/jsdialog/jsdialogbuilder.hxx:434
+vcl/inc/jsdialog/jsdialogbuilder.hxx:336
class com::sun::star::uno::Reference<class
com::sun::star::datatransfer::dnd::XDropTarget> JSWidget::get_drop_target()
-vcl/inc/jsdialog/jsdialogbuilder.hxx:442
+vcl/inc/jsdialog/jsdialogbuilder.hxx:344
void JSWidget::freeze()
-vcl/inc/jsdialog/jsdialogbuilder.hxx:448
+vcl/inc/jsdialog/jsdialogbuilder.hxx:350
void JSWidget::thaw()
-vcl/inc/jsdialog/jsdialogbuilder.hxx:455
+vcl/inc/jsdialog/jsdialogbuilder.hxx:357
void JSWidget::grab_focus()
-vcl/inc/jsdialog/jsdialogbuilder.hxx:500
+vcl/inc/jsdialog/jsdialogbuilder.hxx:402
void JSWidget::set_buildable_name(const class rtl::OUString &,)
-vcl/inc/jsdialog/jsdialogbuilder.hxx:630
+vcl/inc/jsdialog/jsdialogbuilder.hxx:533
void JSComboBox::set_entry_text_without_notify(const class rtl::OUString
&,)
-vcl/inc/qt5/QtFrame.hxx:160
+vcl/inc/qt5/QtFrame.hxx:164
void QtFrame::registerDragSource(class QtDragSource *,)
-vcl/inc/qt5/QtFrame.hxx:161
+vcl/inc/qt5/QtFrame.hxx:165
void QtFrame::deregisterDragSource(const class QtDragSource *,)
-vcl/inc/qt5/QtFrame.hxx:162
+vcl/inc/qt5/QtFrame.hxx:166
void QtFrame::registerDropTarget(class QtDropTarget *,)
-vcl/inc/qt5/QtFrame.hxx:163
+vcl/inc/qt5/QtFrame.hxx:167
void QtFrame::deregisterDropTarget(const class QtDropTarget *,)
-vcl/inc/salframe.hxx:145
+vcl/inc/qt5/QtInstanceMessageDialog.hxx:47
+ class QPushButton * QtInstanceMessageDialog::buttonForResponseCode(int,)
+vcl/inc/salframe.hxx:147
void SalFrame::SetRepresentedURL(const class rtl::OUString &,)
-vcl/inc/salframe.hxx:194
+vcl/inc/salframe.hxx:199
void SalFrame::Flush(const class tools::Rectangle &,)
-vcl/inc/salframe.hxx:214
+vcl/inc/salframe.hxx:219
void SalFrame::FlashWindow()const
+vcl/inc/salframe.hxx:319
+ void SalFrame::SetTaskBarProgress(int,)
+vcl/inc/salframe.hxx:320
+ void SalFrame::SetTaskBarState(enum VclTaskBarStates,)
+vcl/inc/salgdiimpl.hxx:181
+ _Bool SalGraphicsImpl::drawEPS(long,long,long,long,void *,unsigned int,)
vcl/inc/salinst.hxx:95
_Bool SalInstance::SVMainHook(int *,)
-vcl/inc/salinst.hxx:203
+vcl/inc/salinst.hxx:210
void SalInstance::releaseMainThread()
-vcl/inc/salinst.hxx:212
+vcl/inc/salinst.hxx:219
void SalInstance::BeforeAbort(const class rtl::OUString &,_Bool,)
+vcl/inc/salmenu.hxx:77
+ void SalMenu::GetSystemMenuData(struct SystemMenuData &,)
vcl/inc/salobj.hxx:49
void SalObject::Enable(_Bool,)
vcl/inc/salprn.hxx:124
enum SalPrinterError SalPrinter::GetErrorCode()
-vcl/inc/skia/gdiimpl.hxx:230
+vcl/inc/skia/gdiimpl.hxx:225
void SkiaSalGraphicsImpl::createSurface()
-vcl/inc/skia/gdiimpl.hxx:240
+vcl/inc/skia/gdiimpl.hxx:235
void SkiaSalGraphicsImpl::flushSurfaceToWindowContext()
-vcl/inc/skia/gdiimpl.hxx:263
+vcl/inc/skia/gdiimpl.hxx:258
int SkiaSalGraphicsImpl::getWindowScaling()const
-vcl/inc/unx/gtk/gtkdata.hxx:332
+vcl/inc/unx/gtk/gtkdata.hxx:273
int GtkSalDisplay::CaptureMouse(class SalFrame *,)
vcl/inc/unx/saldata.hxx:48
void X11SalData::Init()
-vcl/inc/unx/saldisp.hxx:361
+vcl/inc/unx/saldisp.hxx:360
void SalX11Display::Yield()
vcl/inc/unx/salframe.h:208
void X11SalFrame::updateGraphics(_Bool,)
diff --git a/toolkit/source/controls/table/tablecontrol_impl.hxx
b/toolkit/source/controls/table/tablecontrol_impl.hxx
index 13f1f244fc46..33b0393f0f82 100644
--- a/toolkit/source/controls/table/tablecontrol_impl.hxx
+++ b/toolkit/source/controls/table/tablecontrol_impl.hxx
@@ -254,7 +254,7 @@ namespace svt::table
@see TableControlAction
*/
- virtual bool dispatchAction(TableControlAction
_eAction);
+ bool dispatchAction(TableControlAction
_eAction);
virtual SelectionEngine* getSelEngine() override;
virtual PTableModel getModel() const override;
diff --git a/vcl/inc/qt5/QtInstanceMessageDialog.hxx
b/vcl/inc/qt5/QtInstanceMessageDialog.hxx
index f8430e98a609..f016eb8b1b7a 100644
--- a/vcl/inc/qt5/QtInstanceMessageDialog.hxx
+++ b/vcl/inc/qt5/QtInstanceMessageDialog.hxx
@@ -44,7 +44,7 @@ public:
private:
void positionExtraControlsContainer();
- virtual QPushButton* buttonForResponseCode(int nResponse);
+ QPushButton* buttonForResponseCode(int nResponse);
protected slots:
virtual void dialogFinished(int nResult) override;
commit d1b17b71ae30b085e511ab1d262c4f568808b574
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Feb 5 14:25:37 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Feb 5 17:15:15 2025 +0100
loplugin:mergeclasses update
Change-Id: Ifb7918120ce827c438784faa5fa7b15dcc126e93
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181178
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/compilerplugins/clang/mergeclasses.results
b/compilerplugins/clang/mergeclasses.results
index e3ddbd3d0576..1517f8eda100 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -13,7 +13,9 @@ maybe merge (anonymous namespace)::Data with
cppu::PropertySetMixinImpl::Impl, i
merge (anonymous namespace)::DomVisitor with (anonymous namespace)::DomExport
maybe merge (anonymous namespace)::EventContainerTest with (anonymous
namespace)::testInsertOrder, in modules toolkit and workdir
maybe merge (anonymous namespace)::GluePointTest with (anonymous
namespace)::testTdf157543_5PointStar, in modules svx and workdir
+merge (anonymous namespace)::GtkInstanceButton with (anonymous
namespace)::GtkInstanceToggleButton
merge (anonymous namespace)::GtkInstanceCheckButton with (anonymous
namespace)::GtkInstanceRadioButton
+merge (anonymous namespace)::MMTest2 with (anonymous namespace)::testGrabBag
merge (anonymous namespace)::N with (anonymous namespace)::P
merge (anonymous namespace)::O with (anonymous namespace)::O2
merge (anonymous namespace)::ParserData with (anonymous namespace)::Entity
@@ -23,14 +25,14 @@ merge (anonymous namespace)::ReflectionTransition with
(anonymous namespace)::Ro
merge (anonymous namespace)::ScVbaControlContainer with (anonymous
namespace)::ScVbaButtonContainer
merge (anonymous namespace)::SimpleTransition with (anonymous
namespace)::DiamondTransition
merge (anonymous namespace)::StrEntries with (anonymous
namespace)::RemoveEditAttribsHandler
-maybe merge (anonymous namespace)::SwTiledRenderingTest with (anonymous
namespace)::testStatusBarPageNumber, in modules sw and workdir
maybe merge (anonymous namespace)::TestHFBase with (anonymous
namespace)::testHFLinkToPrev, in modules sw and workdir
maybe merge (anonymous namespace)::ThemeTest with (anonymous
namespace)::testPitchFamilyConversion, in modules svx and workdir
+maybe merge (anonymous namespace)::UniqueIdTest with (anonymous
namespace)::testUniqueness, in modules tools and workdir
merge (anonymous namespace)::VariableTextField with (anonymous
namespace)::VariableDateTimeField
merge (anonymous namespace)::empty with (anonymous namespace)::second
-merge AbstractMailMergeWizard with AbstractMailMergeWizard_Impl
+maybe merge AbstractMailMergeWizard with vcl::AbstractDialogImpl_BASE, in
modules sw and vcl
merge AbstractSmParser with SmParser5
-merge AbstractSwInsertDBColAutoPilot with AbstractSwInsertDBColAutoPilot_Impl
+maybe merge AbstractSwInsertDBColAutoPilot with vcl::AbstractDialogImpl_BASE,
in modules sw and vcl
merge AddressWalker with AddressWalkerWriter
merge AutoIdle with (anonymous namespace)::TestAutoIdleRR
merge B3dTransformationSet with B3dViewport
@@ -38,7 +40,7 @@ merge B3dViewport with B3dCamera
merge BaseJSWidget with JSWidget
merge BitmapConvolutionMatrixFilter with BitmapSharpenFilter
merge BrowseBox with svt::EditBrowseBox
-merge BuilderBase with VclBuilder
+merge BuilderBase with WidgetBuilder
merge CSS1Parser with SvxCSS1Parser
maybe merge DOM::CCharacterData with cppu::ImplInheritanceHelper, in modules
unoxml and cppuhelper
maybe merge DOM::CNode with cppu::ImplInheritanceHelper, in modules unoxml and
cppuhelper
@@ -68,6 +70,7 @@ merge GroupTable with PPTWriterBase
maybe merge Help with SfxHelp, in modules vcl and sfx2
merge HostDetailsContainer with DavDetailsContainer
merge IActionListener with UpdateCheck
+merge IComboListBoxHelper with VCLListBoxHelper
merge IDocumentChartDataProviderAccess with
sw::DocumentChartDataProviderManager
merge IDocumentContentOperations with sw::DocumentContentOperationsManager
merge IDocumentDeviceAccess with sw::DocumentDeviceManager
@@ -89,7 +92,6 @@ merge IDocumentTimerAccess with sw::DocumentTimerManager
merge IDocumentUndoRedo with sw::UndoManager
merge IFinishedThreadListener with ThreadListener
merge IStyleAccess with (anonymous namespace)::SwStyleManager
-merge IStylePoolIteratorAccess with (anonymous namespace)::Iterator
merge IXFAttrList with XFSaxAttrList
merge IXFStream with XFSaxStream
merge IXFStyle with XFStyle
@@ -110,8 +112,9 @@ merge PPTExBulletProvider with PPTWriter
merge PropertyAccessorBase with GenericPropertyAccessor
maybe merge PropertySetBase with cppu::ImplInheritanceHelper, in modules forms
and cppuhelper
merge PropertyWrapperBase with PropertyWrapper
-merge QtInstanceContainer with QtInstanceWindow
-merge QtInstanceWidget with QtInstanceContainer
+merge QtInstanceButton with QtInstanceToggleButton
+merge QtInstanceEntry with QtInstanceSpinButton
+merge QtInstanceToggleButton with QtInstanceMenuButton
merge QtInstanceWindow with QtInstanceDialog
maybe merge RtfTest with testFilter, in modules sw and workdir
merge SOParagraph with ParagraphObj
@@ -134,6 +137,7 @@ merge SalInstanceImage with JSWidget
merge SalInstanceLabel with JSWidget
merge SalInstanceLevelBar with JSWidget
merge SalInstanceLinkButton with JSWidget
+merge SalInstanceMenu with JSMenu
merge SalInstanceNotebook with JSWidget
merge SalInstanceRadioButton with JSWidget
merge SalInstanceScrolledWindow with JSWidget
@@ -148,7 +152,8 @@ merge SalSession with (anonymous namespace)::IceSalSession
merge SalSystem with SalGenericSystem
maybe merge ScAccessibleCsvControl with cppu::ImplInheritanceHelper, in
modules sc and cppuhelper
merge ScAccessibleTableBase with ScAccessibleSpreadsheet
-merge ScAsyncTabController with ScAsyncTabController_Impl
+merge ScAsyncTabController with (anonymous
namespace)::ScAsyncTabController_Impl
+maybe merge ScCellRangesBase with cppu::ImplInheritanceHelper, in modules sc
and cppuhelper
merge ScDBDataContainerBase with ScDBCollection::NamedDBs
merge ScDBFunc with ScTabViewShell
merge ScDPCache::DBConnector with (anonymous namespace)::DBConnector
@@ -165,7 +170,7 @@ merge ScRefHandlerCaller with ScTPValidationValue
merge ScRefHandlerHelper with ScValidationDlg
merge ScSimpleEditSourceHelper with ScEditEngineTextObj
merge ScTabView with ScViewFunc
-maybe merge ScVbaCollectionBaseImpl with (anonymous
namespace)::ScVbaRangeAreas, in modules vbahelper and sc
+maybe merge ScVbaCollectionBaseImpl with ScVbaRangeAreas, in modules vbahelper
and sc
maybe merge ScVbaCommandBarControl with cppu::ImplInheritanceHelper, in
modules vbahelper and cppuhelper
maybe merge ScVbaControlObjectBase with cppu::ImplInheritanceHelper, in
modules sc and cppuhelper
merge ScVbaGraphicObjectsBase with ScVbaButtons
@@ -202,7 +207,6 @@ merge SdrUndoNewPage with SdrUndoCopyPage
maybe merge SdrUndoObjSetText with sd::UndoObjectSetText, in modules svx and sd
maybe merge SdrUndoReplaceObj with sd::UndoReplaceObject, in modules svx and sd
maybe merge SecurityEngine with cppu::ImplInheritanceHelper, in modules
xmlsecurity and cppuhelper
-maybe merge Sfx2ViewTest with testReloadPage, in modules sfx2 and workdir
merge SfxExtItemPropertySetInfo_Base with SfxExtItemPropertySetInfo
maybe merge SfxHTMLParser with SwHTMLParser, in modules sfx2 and sw
merge SfxItemPropertySetInfo_Base with SfxItemPropertySetInfo
@@ -249,12 +253,15 @@ merge SwNumberTreeNode with SwNodeNum
merge SwSelPaintRects with SwShellCursor
merge SwTextAdjuster with SwTextCursor
merge SwUndoTextFormatCollCreate with SwUndoCondTextFormatCollCreate
+maybe merge SwXBaseStyle with cppu::ImplInheritanceHelper, in modules sw and
cppuhelper
maybe merge SwXFrame with cppu::ImplInheritanceHelper, in modules sw and
cppuhelper
merge SwXParaFrameEnumeration with (anonymous
namespace)::SwXParaFrameEnumerationImpl
merge SwXParagraphEnumeration with (anonymous
namespace)::SwXParagraphEnumerationImpl
+maybe merge SwXSection with cppu::ImplInheritanceHelper, in modules sw and
cppuhelper
merge SwXTextRanges with (anonymous namespace)::SwXTextRangesImpl
merge Task with Timer
maybe merge TaskStopwatch with (anonymous namespace)::IdleCalcTextWidthScope,
in modules vcl and sc
+maybe merge TestNanPayload with testNanPayload, in modules sc and workdir
merge TestShape with (anonymous namespace)::ImplTestShape
merge TestView with (anonymous namespace)::ImplTestView
maybe merge TestXPath with test_getXPath, in modules test and workdir
@@ -283,7 +290,6 @@ merge XFDateTimePart with XFTimePart
merge XMLNode with XMLChildNode
maybe merge XMLTextShapeImportHelper with (anonymous
namespace)::SvTextShapeImportHelper, in modules xmloff and sw
maybe merge XMLTextTableContext with SwXMLTableContext, in modules xmloff and
sw
-merge XMLTransformer with XMLTransformerBase
maybe merge XTableImportExportTest with testImportExport, in modules svx and
workdir
merge XclDebugObjCounter with XclRootData
merge XclExpChFutureRecordBase with XclExpChFrLabelProps
@@ -298,9 +304,7 @@ maybe merge _LibreOfficeKit with
desktop::LibLibreOffice_Impl, in modules LibreO
maybe merge _LibreOfficeKitDocument with desktop::LibLODocument_Impl, in
modules LibreOfficeKit and desktop
maybe merge _uno_ExtEnvironment with (anonymous
namespace)::uno_DefaultEnvironment, in modules uno and cppu
maybe merge accessibility::AccessibleSelectionBase with
accessibility::AccessibleDocumentViewBase, in modules editeng and sd
-maybe merge accessibility::AccessibleTabBarBase with
cppu::ImplInheritanceHelper, in modules accessibility and cppuhelper
-merge accessibility::GridControlAccessibleElement with
accessibility::AccessibleGridControlTableBase
-merge accessibility::IComboListBoxHelper with VCLListBoxHelper
+maybe merge accessibility::AccessibleTabBarBase with
cppu::ImplInheritanceHelper, in modules svtools and cppuhelper
merge animcore::(anonymous namespace)::AnimationNodeBase with
animcore::(anonymous namespace)::AnimationNode
maybe merge apitest::BaseIndex with (anonymous namespace)::SwXDocumentIndex,
in modules test and sw
maybe merge apitest::BaseIndexMark with (anonymous
namespace)::SwXDocumentIndexMark, in modules test and sw
@@ -423,6 +427,7 @@ merge basegfx::InterpolatorProvider3D with
basegfx::RasterConverter3D
maybe merge basegfx::RasterConverter3D with ZBufferRasterConverter3D, in
modules basegfx and drawinglayer
maybe merge basegfx::SystemDependentDataManager with (anonymous
namespace)::SystemDependentDataBuffer, in modules basegfx and vcl
merge basegfx::trapezoidhelper::(anonymous namespace)::TrDeSimpleEdge with
basegfx::trapezoidhelper::(anonymous namespace)::TrDeEdgeEntry
+maybe merge basic::SfxLibrary with cppu::ImplInheritanceHelper, in modules
basic and cppuhelper
merge bib::OComponentAdapterBase with bib::OLoadListenerAdapter
merge bib::OComponentListener with bib::OLoadListener
merge bib::OLoadListener with bib::FormControlContainer
@@ -443,6 +448,7 @@ merge chart::wrapper::ChartDocumentWrapper_Base with
chart::wrapper::ChartDocume
merge comphelper::ChainablePropertySetInfo_Base with
comphelper::ChainablePropertySetInfo
merge comphelper::ConfigurationListenerPropertyBase with
comphelper::ConfigurationListenerProperty
merge comphelper::ConfigurationListener_Base with
comphelper::ConfigurationListener
+merge comphelper::ICryptoImplementation with comphelper::(anonymous
namespace)::CryptoImplementationNSS
maybe merge comphelper::IPropertyInfoService with frm::ConcreteInfoService, in
modules comphelper and forms
maybe merge comphelper::MasterPropertySet with SwXDocumentSettings, in modules
comphelper and sw
merge comphelper::MasterPropertySetInfo_Base with
comphelper::MasterPropertySetInfo
@@ -466,6 +472,7 @@ merge comphelper::PropertySetInfo_BASE with
comphelper::PropertySetInfo
merge comphelper::TraceEvent with comphelper::NamedEvent
merge comphelper::WeakComponentImplHelperBase with
comphelper::WeakComponentImplHelper
merge comphelper::WeakImplHelperBase with comphelper::WeakImplHelper
+maybe merge connectivity::OConnectionWrapper with cppu::ImplInheritanceHelper,
in modules connectivity and cppuhelper
merge connectivity::OKeySet_Base with connectivity::OKeySet
merge connectivity::evoab::(anonymous namespace)::OEvoabVersion36Helper with
connectivity::evoab::(anonymous namespace)::OEvoabVersion38Helper
merge connectivity::evoab::OEvoabVersionHelper with
connectivity::evoab::(anonymous namespace)::OEvoabVersion36Helper
@@ -474,7 +481,8 @@ merge connectivity::hsqldb::IMethodGuardAccess with
connectivity::hsqldb::OHsqlC
merge connectivity::java_lang_Exception with
connectivity::java_sql_SQLException_BASE
merge connectivity::java_sql_Statement_Base with connectivity::OStatement_BASE2
merge connectivity::mysqlc::User with connectivity::mysqlc::OUserExtend
-merge connectivity::odbc::ODBCDriver with connectivity::odbc::(anonymous
namespace)::ORealOdbcDriver
+merge connectivity::odbc::Functions with (anonymous namespace)::ORealOdbcDriver
+merge connectivity::odbc::ODBCDriver with (anonymous
namespace)::ORealOdbcDriver
merge connectivity::odbc::OStatement_Base with
connectivity::odbc::OStatement_BASE2
merge connectivity::sdbcx::IObjectCollection with (anonymous
namespace)::OHardRefMap
merge connectivity::sdbcx::OKey with connectivity::OTableKeyHelper
@@ -515,6 +523,7 @@ maybe merge filter::config::BaseContainer with
cppu::ImplInheritanceHelper, in m
maybe merge formula::ExternalReferenceHelper with ScExternalRefManager, in
modules formula and sc
merge framework::OReadStatusBarDocumentHandler_Base with
framework::OReadStatusBarDocumentHandler
merge framework::OReadToolBoxDocumentHandler_Base with
framework::OReadToolBoxDocumentHandler
+maybe merge framework::PropertySetContainer with cppu::ImplInheritanceHelper,
in modules framework and cppuhelper
merge framework::SaxNamespaceFilter_Base with framework::SaxNamespaceFilter
maybe merge framework::XCUBasedAcceleratorConfiguration with
cppu::ImplInheritanceHelper, in modules framework and cppuhelper
maybe merge framework::XMLBasedAcceleratorConfiguration with
cppu::ImplInheritanceHelper, in modules framework and cppuhelper
@@ -530,6 +539,8 @@ merge gfx::GradientInfo with gfx::LinearGradientInfo
merge gio::Seekable with gio::OutputStream
merge http_dav_ucp::DAVAuthListener with http_dav_ucp::DAVAuthListener_Impl
merge http_dav_ucp::DAVSession with http_dav_ucp::CurlSession
+merge i18nutil::DirectionChangeScanner with i18nutil::(anonymous
namespace)::IcuDirectionChangeScanner
+merge i18nutil::ScriptChangeScanner with i18nutil::(anonymous
namespace)::GreedyScriptChangeScanner
merge io_stm::MemRingBuffer with io_stm::MemFIFO
merge oglcanvas::IBufferContext with oglcanvas::(anonymous
namespace)::BufferContextImpl
maybe merge oox::FormulaImExportBase with SmModel, in modules oox and starmath
@@ -593,6 +604,7 @@ merge sc::opencl::OpVarP with sc::opencl::OpVarPA
merge sc::opencl::PriceMat with sc::opencl::OpPriceMat
merge sc::opencl::SumOfProduct with sc::opencl::OpSumProduct
merge sc::opencl::XNPV with sc::opencl::OpXNPV
+merge sca::analysis::ConvertData with sca::analysis::ConvertDataLinear
merge sd::(anonymous namespace)::ModelTraverseHandler with sd::(anonymous
namespace)::GraphicSizeCheckHandler
merge sd::BroadcastHelperOwner with sd::DrawController
merge sd::ClientInfo with sd::ClientInfoInternal
@@ -609,6 +621,7 @@ merge sdext::presenter::PresenterScrollBar with
sdext::presenter::PresenterVerti
merge sdext::presenter::PresenterSlidePreview with
sdext::presenter::(anonymous namespace)::NextSlidePreview
merge sdr::SelectionController with sdr::table::SvxTableController
maybe merge sdr::annotation::Annotation with sd::Annotation, in modules svx
and sd
+maybe merge sdr::annotation::IAnnotationPopup with sd::AnnotationPopup, in
modules svx and sd
merge sdr::contact::ObjectContactOfPagePainter with
sdr::contact::PagePrimitiveExtractor
maybe merge sdr::table::FastPropertySet with cppu::ImplInheritanceHelper2, in
modules svx and cppuhelper
maybe merge sfx2::DigitalSignatures with (anonymous
namespace)::DocumentDigitalSignatures, in modules sfx2 and xmlsecurity
@@ -659,11 +672,11 @@ merge svt::FrameStatusListener with (anonymous
namespace)::ToolbarPopupStatusLis
merge svt::IEnumerationResultHandler with SvtFileView_Impl
merge svt::IFilePickerController with SvtFileDialog_Base
merge svt::IFilePickerListener with SvtFilePicker
+maybe merge svt::OCommonPicker with cppu::ImplInheritanceHelper, in modules
fpicker and cppuhelper
merge svt::PopupWindowController_Base with svt::PopupWindowController
merge svt::table::IColumnModel with svt::table::UnoGridColumnFacade
merge svt::table::ITableControl with svt::table::TableControl_Impl
merge svt::table::ITableDataSort with svt::table::UnoControlTableModel
-merge svt::table::ITableInputHandler with svt::table::DefaultInputHandler
merge svt::table::ITableModelListener with svt::table::TableControl_Impl
merge svt::table::ITableRenderer with svt::table::GridTableRenderer
merge svx::IContextRequestObserver with svx::FmTextControlShell
@@ -676,38 +689,36 @@ maybe merge svx::diagram::IDiagramHelper with
oox::drawingml::AdvancedDiagramHel
maybe merge svx::sidebar::InspectorTextPanel with
sw::sidebar::WriterInspectorTextPanel, in modules svx and sw
merge svx::sidebar::SvxShapeCommandsMap with svx::sidebar::DefaultShapesPanel
merge svxform::DispatchInterceptor with svxform::FormController
-merge sw::ClientIteratorBase with SwIterator
merge sw::ICoreFrameStyle with SwXFrameStyle
merge sw::IShellCursorSupplier with SwCursorShell
merge sw::Meta with sw::MetaField
-merge sw::WriterListener with SwClient
+merge sw::WriterListener with sw::ClientBase
merge sw::mark::Bookmark with sw::mark::CrossRefBookmark
merge sw::mark::ContentIdxStore with (anonymous namespace)::ContentIdxStoreImpl
merge sw::mark::DdeBookmark with sw::mark::Bookmark
-merge sw::mark::IBookmark with sw::mark::Bookmark
-merge sw::mark::ICheckboxFieldmark with sw::mark::CheckboxFieldmark
-merge sw::mark::IDateFieldmark with sw::mark::DateFieldmark
-merge sw::mark::IDropdownFieldmark with sw::mark::DropDownFieldmark
merge sw::util::WrtRedlineAuthor with WW8_WrtRedlineAuthor
merge test::EventPosterHelper with test::AccessibleEventPosterHelper
merge test::EventPosterHelperBase with test::EventPosterHelper
merge ucbhelper::ActiveDataSink_Base with ucbhelper::ActiveDataSink
merge ucbhelper::CommandEnvironment_Base with ucbhelper::CommandEnvironment
+maybe merge ucbhelper::InteractionContinuation with
cppu::ImplInheritanceHelper, in modules ucbhelper and cppuhelper
merge ucbhelper::InterceptedInteraction_Base with
ucbhelper::InterceptedInteraction
maybe merge uno_Enterable with cppu::Enterable, in modules uno and cppu
+maybe merge unocontrols::BaseContainerControl with
cppu::ImplInheritanceHelper, in modules UnoControls and cppuhelper
+maybe merge unocontrols::BaseControl with cppu::ImplInheritanceHelper, in
modules UnoControls and cppuhelper
maybe merge utl::ITerminationListener with frm::(anonymous
namespace)::StandardFormatsSupplier, in modules unotools and forms
maybe merge utl::OConfigurationValueContainer with
svxform::FmSearchConfigItem, in modules unotools and svx
merge utl::OInputStreamWrapper_Base with utl::OInputStreamWrapper
merge vcl::DeletionNotifier with SalFrame
merge vcl::ExtOutDevData with vcl::PDFExtOutDevData
-maybe merge vcl::IAccessibleBrowseBox with
accessibility::AccessibleBrowseBoxAccess, in modules vcl and accessibility
-maybe merge vcl::IAccessibleTabListBox with
accessibility::AccessibleTabListBox, in modules vcl and accessibility
+merge vcl::IAccessibleBrowseBox with AccessibleBrowseBoxAccess
maybe merge vcl::PDFOutputStream with (anonymous
namespace)::PDFExportStreamDoc, in modules vcl and filter
merge vcl::SolarThreadExecutor with
vcl::solarthread::detail::GenericSolarThreadExecutor
merge vcl::font::GlyphFallbackFontSubstitution with (anonymous
namespace)::FcGlyphFallbackSubstitution
merge vcl::font::PreMatchFontSubstitution with (anonymous
namespace)::FcPreMatchSubstitution
merge vcl::pdf::PDFium with vcl::pdf::(anonymous namespace)::PDFiumImpl
merge vcl::pdf::PDFiumAnnotation with vcl::pdf::(anonymous
namespace)::PDFiumAnnotationImpl
+merge vcl::pdf::PDFiumAttachment with vcl::pdf::(anonymous
namespace)::PDFiumAttachmentImpl
merge vcl::pdf::PDFiumBitmap with vcl::pdf::(anonymous
namespace)::PDFiumBitmapImpl
merge vcl::pdf::PDFiumDocument with vcl::pdf::(anonymous
namespace)::PDFiumDocumentImpl
merge vcl::pdf::PDFiumPage with vcl::pdf::(anonymous namespace)::PDFiumPageImpl
@@ -715,9 +726,9 @@ merge vcl::pdf::PDFiumPageObject with vcl::pdf::(anonymous
namespace)::PDFiumPag
merge vcl::pdf::PDFiumPathSegment with vcl::pdf::(anonymous
namespace)::PDFiumPathSegmentImpl
merge vcl::pdf::PDFiumSearchHandle with vcl::pdf::(anonymous
namespace)::PDFiumSearchHandleImpl
merge vcl::pdf::PDFiumSignature with vcl::pdf::(anonymous
namespace)::PDFiumSignatureImpl
+merge vcl::pdf::PDFiumStructureElement with vcl::pdf::(anonymous
namespace)::PDFiumStructureElementImpl
+merge vcl::pdf::PDFiumStructureTree with vcl::pdf::(anonymous
namespace)::PDFiumStructureTreeImpl
merge vcl::pdf::PDFiumTextPage with vcl::pdf::(anonymous
namespace)::PDFiumTextPageImpl
-maybe merge vcl::table::IAccessibleTable with svt::table::TableControl, in
modules vcl and toolkit
-maybe merge vcl::table::IAccessibleTableControl with
accessibility::AccessibleGridControlAccess, in modules vcl and accessibility
merge vclcanvas::CanvasCustomSpriteSpriteBase_Base with canvas::CanvasBase
merge vclcanvas::Sprite with vclcanvas::CanvasCustomSpriteSpriteBase_Base
merge vclcanvas::SpriteCanvasBaseSpriteSurface_Base with canvas::CanvasBase
@@ -729,7 +740,6 @@ merge writerfilter::dmapper::TableManager with
writerfilter::dmapper::DomainMapp
merge writerfilter::ooxml::OOXMLDocument with
writerfilter::ooxml::OOXMLDocumentImpl
merge writerfilter::ooxml::OOXMLFastContextHandlerLinear with
writerfilter::ooxml::OOXMLFastContextHandlerMath
merge writerfilter::ooxml::OOXMLStream with
writerfilter::ooxml::OOXMLStreamImpl
-merge writerfilter::ooxml::OOXMLUniversalMeasureValue with
writerfilter::ooxml::OOXMLNthPtMeasureValue
merge writerfilter::rtftok::RTFDocument with
writerfilter::rtftok::RTFDocumentImpl
merge ww8::WW8Struct with ww8::WW8Sttb
merge xforms::OValueLimitedType_Base with xforms::OValueLimitedType
