Skip to content

C
core
Kaydet (Commit) 7a4e95b8 authored tarafından Julien Nabet's avatar Julien Nabet
Dosyalara gözat
Seçenekler

Check if pDoc is null before using it 

Change-Id: I8eede8774eebdf32c2749325777bcb5a9b1a720b
üst 896899b8
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
sc/source/ui/vba/vbarange.cxx
Dosyayı görüntüle @ 7a4e95b8
...@@ -4483,8 +4483,10 @@ ScVbaRange::AutoFilter( const uno::Any& aField, const uno::Any& Criteria1, const ...@@ -4483,8 +4483,10 @@ ScVbaRange::AutoFilter( const uno::Any& aField, const uno::Any& Criteria1, const
uno::Reference< beans::XPropertySet > xFiltProps( xDataBaseRange->getFilterDescriptor(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xFiltProps( xDataBaseRange->getFilterDescriptor(), uno::UNO_QUERY_THROW );
sal_Bool bHasColHeader = false; sal_Bool bHasColHeader = false;
ScDocument* pDoc = pShell ? pShell->GetDocument() : NULL; ScDocument* pDoc = pShell ? pShell->GetDocument() : NULL;
if (pDoc)
bHasColHeader = pDoc->HasColHeader( static_cast< SCCOL >( autoFiltAddress.StartColumn ), static_cast< SCROW >( autoFiltAddress.StartRow ), static_cast< SCCOL >( autoFiltAddress.EndColumn ), static_cast< SCROW >( autoFiltAddress.EndRow ), static_cast< SCTAB >( autoFiltAddress.Sheet ) ) ? sal_True : false; {
bHasColHeader = pDoc->HasColHeader( static_cast< SCCOL >( autoFiltAddress.StartColumn ), static_cast< SCROW >( autoFiltAddress.StartRow ), static_cast< SCCOL >( autoFiltAddress.EndColumn ), static_cast< SCROW >( autoFiltAddress.EndRow ), static_cast< SCTAB >( autoFiltAddress.Sheet ) ) ? sal_True : false;
}
xFiltProps->setPropertyValue( "ContainsHeader", uno::Any( bHasColHeader ) ); xFiltProps->setPropertyValue( "ContainsHeader", uno::Any( bHasColHeader ) );
} }
......
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