extensions/source/propctrlr/browserlistbox.cxx | 9 +++------ extensions/source/propctrlr/formcontroller.cxx | 4 ++-- extensions/source/propctrlr/formcontroller.hxx | 6 ++---- 3 files changed, 7 insertions(+), 12 deletions(-)
New commits: commit 20fe1e89132b1cee2405c6dda09497b83bbb13a7 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Jan 20 14:30:13 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Jan 22 11:14:28 2026 +0100 propctrlr: Simplify assert Change-Id: I440da9459abb87eba1ec3d0dece3a26134b1ddc7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197671 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 669870d71a8a..42758f536f30 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -454,14 +454,11 @@ void OBrowserListBox::InsertEntry(const OLineDescriptor& rPropertyData, sal_uInt BrowserLinePointer pBrowserLine = std::make_shared<OBrowserLine>( rPropertyData.sName, m_xLinesPlayground.get(), m_xSizeGroup.get(), m_pInitialControlParent); - // check that the name is unique for (auto const& line : m_aLines) { - if (line.aName == rPropertyData.sName) - { - // already have another line for this name! - assert(false); - } + // check that the name is unique + assert(line.aName != rPropertyData.sName && "already have another line for this name!"); + (void)line; } ListBoxLine aNewLine(rPropertyData.sName, pBrowserLine, rPropertyData.xPropertyHandler); commit d617158480ea632ccc3b7905821df3e897f9b715 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Jan 20 09:25:24 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Jan 22 11:14:19 2026 +0100 propctrlr: Drop FormController_PropertyBase1 typedef Just use cppu::OPropertySetHelper directly. Change-Id: Ie6bd9818509f02571ce81203aff87b3736b0cfed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197632 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx index 8ebfe136dac7..1301b3f1ab89 100644 --- a/extensions/source/propctrlr/formcontroller.cxx +++ b/extensions/source/propctrlr/formcontroller.cxx @@ -61,7 +61,7 @@ namespace pcr const css::uno::Sequence<OUString>& aSupportedServiceNames, bool _bUseFormFormComponentHandlers ) :OPropertyBrowserController( _rxContext ) - ,FormController_PropertyBase1( m_aBHelper ) + ,cppu::OPropertySetHelper(m_aBHelper) ,m_sImplementationName(std::move( sImplementationName )) ,m_aSupportedServiceNames( aSupportedServiceNames ) { @@ -82,7 +82,7 @@ namespace pcr } - IMPLEMENT_FORWARD_XINTERFACE2( FormController, OPropertyBrowserController, FormController_PropertyBase1 ) + IMPLEMENT_FORWARD_XINTERFACE2(FormController, OPropertyBrowserController, cppu::OPropertySetHelper) Sequence< Type > SAL_CALL FormController::getTypes( ) diff --git a/extensions/source/propctrlr/formcontroller.hxx b/extensions/source/propctrlr/formcontroller.hxx index 376bf57a492b..1a164f5f486e 100644 --- a/extensions/source/propctrlr/formcontroller.hxx +++ b/extensions/source/propctrlr/formcontroller.hxx @@ -27,15 +27,13 @@ namespace pcr { - typedef ::cppu::OPropertySetHelper FormController_PropertyBase1; - /** Legacy implementation of com.sun.star.form.PropertyBrowserController Nowadays only a wrapper around an ObjectInspector using a DefaultFormComponentInspectorModel. */ class FormController : public OPropertyBrowserController, - public FormController_PropertyBase1, + public cppu::OPropertySetHelper, public comphelper::OPropertyArrayUsageHelper<FormController> { private: @@ -76,7 +74,7 @@ namespace pcr css::uno::Any& rValue, sal_Int32 nHandle ) const override; private: - using FormController_PropertyBase1::getFastPropertyValue; + using cppu::OPropertySetHelper::getFastPropertyValue; };
