Kaydet (Commit) 4abb7335 authored tarafından Vasily Melenchuk's avatar Vasily Melenchuk Kaydeden (comit) Thorsten Behrens

tdf#124385: toolkit: do not fail if ResourceListener is not defined

If current control (for example TabPageContainer) is missing
resource listener property we should not fail script with
exception. Just behave as with empty ResourceListener.

Change-Id: I260feec775a5d197bebc9414b652dd6f89e35035
Reviewed-on: https://gerrit.libreoffice.org/69740
Tested-by: Jenkins
Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
üst de6f36cc
...@@ -1741,6 +1741,9 @@ void ControlContainerBase::ImplStartListingForResourceEvents() ...@@ -1741,6 +1741,9 @@ void ControlContainerBase::ImplStartListingForResourceEvents()
{ {
Reference< resource::XStringResourceResolver > xStringResourceResolver; Reference< resource::XStringResourceResolver > xStringResourceResolver;
if ( !ImplHasProperty(PROPERTY_RESOURCERESOLVER) )
return;
ImplGetPropertyValue( PROPERTY_RESOURCERESOLVER ) >>= xStringResourceResolver; ImplGetPropertyValue( PROPERTY_RESOURCERESOLVER ) >>= xStringResourceResolver;
// Add our helper as listener to retrieve notifications about changes // Add our helper as listener to retrieve notifications about changes
...@@ -1757,7 +1760,11 @@ void ControlContainerBase::ImplUpdateResourceResolver() ...@@ -1757,7 +1760,11 @@ void ControlContainerBase::ImplUpdateResourceResolver()
{ {
Reference< resource::XStringResourceResolver > xStringResourceResolver; Reference< resource::XStringResourceResolver > xStringResourceResolver;
ImplGetPropertyValue( PROPERTY_RESOURCERESOLVER ) >>= xStringResourceResolver; if ( !ImplHasProperty(PROPERTY_RESOURCERESOLVER) )
return;
ImplGetPropertyValue(PROPERTY_RESOURCERESOLVER) >>= xStringResourceResolver;
if ( !xStringResourceResolver.is() ) if ( !xStringResourceResolver.is() )
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment