summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2014-02-01 22:21:22 +0100
committerJulien Nabet <serval2412@yahoo.fr>2014-02-01 22:21:22 +0100
commit7a4e95b8c14d2cf64938d1cbe559576b4400e424 (patch)
tree52598ab98bbb8f884f79789678f6b23b9727cf03
parent896899b843d15aeb20a14ac11129b5989f3d7821 (diff)
Check if pDoc is null before using it
Change-Id: I8eede8774eebdf32c2749325777bcb5a9b1a720b
-rw-r--r--sc/source/ui/vba/vbarange.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 5a431f4b82d9..95123e3b09a5 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -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 );
sal_Bool bHasColHeader = false;
ScDocument* pDoc = pShell ? pShell->GetDocument() : NULL;
-
- 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;
+ 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;
+ }
xFiltProps->setPropertyValue( "ContainsHeader", uno::Any( bHasColHeader ) );
}