diff options
| -rw-r--r-- | extensions/source/propctrlr/formcomponenthandler.cxx | 4 | ||||
| -rw-r--r-- | reportdesign/source/ui/inspection/DataProviderHandler.cxx | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 20a21ad8ae72..30568b56b7d8 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -243,6 +243,10 @@ namespace pcr { const PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) ); + // tdf#117159 crash with chart in database report + if (!m_xComponent) + return Any(); + Any aPropertyValue( m_xComponent->getPropertyValue( _rPropertyName ) ); Reference< resource::XStringResourceResolver > xStringResourceResolver diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index a6c1214704a7..389074a903c5 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -182,7 +182,8 @@ uno::Any SAL_CALL DataProviderHandler::getPropertyValue(const OUString & Propert //} break; case PROPERTY_ID_PREVIEW_COUNT: - aPropertyValue <<= m_xDataProvider->getRowLimit(); + if (m_xDataProvider) // tdf#117159 crash with chart in database report otherwise + aPropertyValue <<= m_xDataProvider->getRowLimit(); break; default: aPropertyValue = m_xFormComponentHandler->getPropertyValue( PropertyName ); |