dbaccess/source/core/dataaccess/databasecontext.cxx | 5 ----- toolkit/source/controls/unocontrolmodel.cxx | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-)
New commits: commit ea43b6506ea51141652a68e51023f1e32d1d4c73 Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Mon Feb 23 15:34:18 2026 +0100 Commit: Samuel Mehrbrodt <[email protected]> CommitDate: Thu Feb 26 07:46:58 2026 +0100 Add missing BASEPROPERTY_REFERER default Fixes warnings like: warn:legacy.osl:1638172:1638172:toolkit/source/controls/unocontrolmodel.cxx:376: ImplGetDefaultValue - unknown Property Change-Id: I4118c01770fc3404c064b58deeba94655d83e670 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200061 Reviewed-by: Samuel Mehrbrodt <[email protected]> Tested-by: Jenkins diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index d6fdfd77ceac..994bb3558b4a 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -210,7 +210,8 @@ css::uno::Any UnoControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const case BASEPROPERTY_BACKGROUNDCOLOR: case BASEPROPERTY_FILLCOLOR: case BASEPROPERTY_HIGHLIGHT_COLOR: - case BASEPROPERTY_HIGHLIGHT_TEXT_COLOR: break; // Void + case BASEPROPERTY_HIGHLIGHT_TEXT_COLOR: + case BASEPROPERTY_REFERER: break; // Void case BASEPROPERTY_FONTRELIEF: case BASEPROPERTY_FONTEMPHASISMARK: commit 7f9e03fb5305cb1b1ffd568c2400e16a7e17f37d Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Mon Feb 23 15:14:48 2026 +0100 Commit: Samuel Mehrbrodt <[email protected]> CommitDate: Thu Feb 26 07:46:47 2026 +0100 remove bogus assert A data source can legitimately have a non-empty name but not be registered in the object cache, e.g. when loading fails before attachResource is called, or during context disposal. This removes warnings like: warn:legacy.osl:1611319:1611319:dbaccess/source/core/dataaccess/databasecontext.cxx:489: ODatabaseContext::storeTransientProperties: a non-empty data source which I do not know?! Change-Id: I75e878107396d984f2fcf3d7d6a6e7678bc9b0c0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200060 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <[email protected]> diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index f6dfcfed57c4..17409743db65 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -484,11 +484,6 @@ void ODatabaseContext::storeTransientProperties( ODatabaseModelImpl& _rModelImpl // all the code should have been changed so that registration is by URL only m_aDatasourceProperties[ _rModelImpl.m_sName ] = aRememberProps.getPropertyValues(); } - else - { - OSL_ENSURE( sDocumentURL.isEmpty() && _rModelImpl.m_sName.isEmpty() , - "ODatabaseContext::storeTransientProperties: a non-empty data source which I do not know?!" ); - } } void SAL_CALL ODatabaseContext::addContainerListener( const Reference< XContainerListener >& _rxListener )
