forms/source/helper/windowstateguard.cxx | 3 +-- sw/source/core/unocore/unodraw.cxx | 2 +- sw/source/core/unocore/unoframe.cxx | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-)
New commits: commit 0744890d23279d1f786e0269069d4dd45319a462 Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Mon Feb 23 16:06:33 2026 +0100 Commit: Samuel Mehrbrodt <[email protected]> CommitDate: Mon Mar 9 13:05:19 2026 +0100 Downgrade RelOrientation warnings to infos Change-Id: Ifdd56b52bcbe288797a74bc448683a65d05152ec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200067 Reviewed-by: Michael Stahl <[email protected]> Reviewed-by: Samuel Mehrbrodt <[email protected]> Tested-by: Jenkins (cherry picked from commit d12f7b60b2c96db507c2a8ed5c75666d970ce5ab) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201256 Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index fecc1edc2281..13f6cc450472 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -1283,7 +1283,7 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a aValue >>= nRelOrient; if (sw::GetAtPageRelOrientation(nRelOrient, true)) { - SAL_WARN("sw.core", "SwXShape: fixing invalid horizontal RelOrientation for at-page anchor"); + SAL_INFO("sw.core", "SwXShape: fixing invalid horizontal RelOrientation for at-page anchor"); value <<= nRelOrient; } SfxItemPropertySet::setPropertyValue( *pEntry, value, aSet ); diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 99b05427ea9a..152a629849d9 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -2744,7 +2744,7 @@ void SwXFrame::attachToRange(uno::Reference<text::XTextRange> const& xTextRange, sal_Int16 nRelOrient(aFrameSet.Get(RES_HORI_ORIENT).GetRelationOrient()); if (sw::GetAtPageRelOrientation(nRelOrient, true)) { - SAL_WARN("sw.core", "SwXFrame: fixing invalid horizontal RelOrientation for at-page anchor"); + SAL_INFO("sw.core", "SwXFrame: fixing invalid horizontal RelOrientation for at-page anchor"); SwFormatHoriOrient item(aFrameSet.Get(RES_HORI_ORIENT)); item.SetRelationOrient(nRelOrient); commit 8ce688ed573d1d9342de17cc0dc2139324e8a833 Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Mon Feb 23 15:37:57 2026 +0100 Commit: Samuel Mehrbrodt <[email protected]> CommitDate: Mon Mar 9 13:05:04 2026 +0100 Remove bogus assertion Comparison can fail for the same object due to UNO multiple inheritance. Fixes warnings like: warn:legacy.osl:1662530:1662530:forms/source/helper/windowstateguard.cxx:184: WindowStateGuard_Impl::disposing: where does this come from? Change-Id: I89de2832f61927dd8a6ee1762b3363a9cfe3a923 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200062 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <[email protected]> Reviewed-by: Noel Grandin <[email protected]> (cherry picked from commit 78dfcd5f5dd14afc197824042a5ecbe2404f359f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201257 Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/forms/source/helper/windowstateguard.cxx b/forms/source/helper/windowstateguard.cxx index 99bc71b1353a..3f1130703dd1 100644 --- a/forms/source/helper/windowstateguard.cxx +++ b/forms/source/helper/windowstateguard.cxx @@ -179,9 +179,8 @@ namespace frm } - void SAL_CALL WindowStateGuard_Impl::disposing( const EventObject& Source ) + void SAL_CALL WindowStateGuard_Impl::disposing( const EventObject& /*Source*/ ) { - OSL_ENSURE( Source.Source == m_xWindow, "WindowStateGuard_Impl::disposing: where does this come from?" ); dispose(); }
