xmlhelp/source/treeview/tvfactory.cxx | 2 +- xmloff/source/chart/ColorPropertySet.cxx | 2 +- xmloff/source/forms/eventexport.cxx | 4 ++-- xmloff/source/forms/gridcolumnproptranslator.cxx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit af623298ca32543017672bb687e356bf5819b128 Author: Mike Kaganski <[email protected]> AuthorDate: Sun Apr 23 20:15:51 2023 +0300 Commit: Mike Kaganski <[email protected]> CommitDate: Sat May 6 12:27:52 2023 +0200 Use getXWeak in xmloff Change-Id: I3e40f0731c219cb40019d38a0a986a53776cce83 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150888 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx index 76050be40f71..237888980d6a 100644 --- a/xmloff/source/chart/ColorPropertySet.cxx +++ b/xmloff/source/chart/ColorPropertySet.cxx @@ -63,7 +63,7 @@ Property SAL_CALL lcl_ColorPropertySetInfo::getPropertyByName( const OUString& a { if( aName == g_aColorPropName ) return m_aColorProp; - throw UnknownPropertyException( g_aColorPropName, static_cast< uno::XWeak * >( this )); + throw UnknownPropertyException( g_aColorPropName, getXWeak()); } sal_Bool SAL_CALL lcl_ColorPropertySetInfo::hasPropertyByName( const OUString& Name ) diff --git a/xmloff/source/forms/eventexport.cxx b/xmloff/source/forms/eventexport.cxx index 25548fb0a66f..9a8e0d37c12b 100644 --- a/xmloff/source/forms/eventexport.cxx +++ b/xmloff/source/forms/eventexport.cxx @@ -86,7 +86,7 @@ namespace xmloff void SAL_CALL OEventDescriptorMapper::replaceByName( const OUString&, const Any& ) { throw IllegalArgumentException( - "replacing is not implemented for this wrapper class.", static_cast< ::cppu::OWeakObject* >(this), 1); + "replacing is not implemented for this wrapper class.", getXWeak(), 1); } Any SAL_CALL OEventDescriptorMapper::getByName( const OUString& _rName ) @@ -95,7 +95,7 @@ namespace xmloff if (m_aMappedEvents.end() == aPos) throw NoSuchElementException( "There is no element named " + _rName, - static_cast< ::cppu::OWeakObject* >(this)); + getXWeak()); return Any(aPos->second); } diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx index b10357b84c26..af52a89602b4 100644 --- a/xmloff/source/forms/gridcolumnproptranslator.cxx +++ b/xmloff/source/forms/gridcolumnproptranslator.cxx @@ -256,7 +256,7 @@ namespace xmloff { if (aTranslatedNames.getLength() != aTranslatedValues.getLength()) throw css::lang::IllegalArgumentException( - "lengths do not match", static_cast<cppu::OWeakObject*>(this), -1); + "lengths do not match", getXWeak(), -1); aTranslatedNames.getArray()[ nParaAlignPos ] = getAlignProperty(); valueParaAdjustToAlign( aTranslatedValues.getArray()[ nParaAlignPos ] ); } commit 31a5426172f4db94a3ae6d735bc79fc86140535e Author: Mike Kaganski <[email protected]> AuthorDate: Sun Apr 23 20:15:48 2023 +0300 Commit: Mike Kaganski <[email protected]> CommitDate: Sat May 6 12:27:42 2023 +0200 Use getXWeak in xmlhelp Change-Id: Iaea6bf7c539d1ab5e0399e07531be08f2764f488 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150887 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx index 04bba6e6f663..99a55580f9e0 100644 --- a/xmlhelp/source/treeview/tvfactory.cxx +++ b/xmlhelp/source/treeview/tvfactory.cxx @@ -84,7 +84,7 @@ TVFactory::createInstanceWithArguments( { if( ! m_xHDS.is() ) { - m_xHDS = static_cast<cppu::OWeakObject*>(new TVChildTarget( m_xContext )); + m_xHDS = cppu::getXWeak(new TVChildTarget( m_xContext )); } OUString hierview;
