desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 7 +++---- desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-)
New commits: commit 0298e58e93f72204ae32e22b84b96bd098e0f52f Author: Michael Weghorn <[email protected]> AuthorDate: Thu Oct 16 11:25:19 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Oct 17 12:12:41 2025 +0200 extension manager: Switch OSL_ASSERT -> assert Change-Id: I07727ad25c1ee462adfd7ca4777a7d6c87bcaeed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192489 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index d59b22c1234e..ad3f9b2213d6 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -253,7 +253,7 @@ sal_Int32 ExtensionBox_Impl::getSelIndex() const { if ( m_bHasActive ) { - OSL_ASSERT( m_nActive >= -1); + assert(m_nActive >= -1); return static_cast< sal_Int32 >( m_nActive ); } else commit 8c0f258c93b250bd616452f54a033cfd5a579210 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Oct 16 10:51:31 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Oct 17 12:12:34 2025 +0200 extension manager: Drop ExtensionBox_Impl::m_pLocale The locale is only used in ExtensionBox_Impl::Init, so doesn't need to be a class member. Change-Id: Iea59906142b4ed71eb070eec96d3d92bf4e2eb74 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192488 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 69987543d421..d59b22c1234e 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -219,9 +219,9 @@ void ExtensionBox_Impl::Init() m_xRemoveListener = new ExtensionRemovedListener( this ); - m_pLocale.reset( new lang::Locale( Application::GetSettings().GetLanguageTag().getLocale() ) ); m_oCollator.emplace( ::comphelper::getProcessComponentContext() ); - m_oCollator->loadDefaultCollator( *m_pLocale, i18n::CollatorOptions::CollatorOptions_IGNORE_CASE ); + m_oCollator->loadDefaultCollator(Application::GetSettings().GetLanguageTag().getLocale(), + i18n::CollatorOptions::CollatorOptions_IGNORE_CASE); } ExtensionBox_Impl::~ExtensionBox_Impl() @@ -240,7 +240,6 @@ ExtensionBox_Impl::~ExtensionBox_Impl() m_xRemoveListener.clear(); - m_pLocale.reset(); m_oCollator.reset(); } diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index 270437548e9e..8fe0c6b5e04f 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -134,7 +134,6 @@ class ExtensionBox_Impl : public weld::CustomWidgetController std::vector< TEntry_Impl > m_vEntries; std::vector< TEntry_Impl > m_vRemovedEntries; - std::unique_ptr<css::lang::Locale> m_pLocale; std::optional<CollatorWrapper> m_oCollator; //Holds weak references to extensions to which is we have added an XEventListener commit e9684e37e13d75bf0518f8702dff167fd58c4e95 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Oct 16 10:21:46 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Oct 17 12:12:27 2025 +0200 extension manager: Use usual indentation of 4 spaces Change-Id: I8d737ca65bb9b647f1c6cda3551ee80944167874 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192480 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index 8119cb00ae73..270437548e9e 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -76,7 +76,7 @@ struct Entry_Impl Entry_Impl(const css::uno::Reference<css::deployment::XPackage> &xPackage, const PackageState eState, const bool bReadOnly); - ~Entry_Impl(); + ~Entry_Impl(); sal_Int32 CompareTo(const CollatorWrapper& rCollator, const Entry_Impl& rEntry) const; void checkDependencies();
