summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-06-24 20:44:26 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-06-25 20:26:01 +0200
commit8e50fedfb390cc6a2759dd755f97f36b23ec1311 (patch)
tree76afc68c031380f63369ecfcfd220251f4f2d00c /svx
parent1e8c8d68dcf61a930d1521e7fd312c9e7a1b6392 (diff)
nActiveTerm is -1 in an empty filter navigator
Change-Id: Ia6eed6291375f136abbe8e50abae51e6f796911f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97052 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/form/filtnav.cxx4
1 files changed, 1 insertions, 3 deletions
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 3c6c04108ea2..2b6dee83ebd8 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -635,7 +635,6 @@ FmFormItem* FmFilterModel::Find(const ::std::vector<std::unique_ptr<FmFilterData
return nullptr;
}
-
void FmFilterModel::SetCurrentController(const Reference< XFormController > & xCurrent)
{
if ( xCurrent == m_xController )
@@ -651,7 +650,7 @@ void FmFilterModel::SetCurrentController(const Reference< XFormController > & xC
{
Reference< XFilterController > xFilterController( m_xController, UNO_QUERY_THROW );
const sal_Int32 nActiveTerm( xFilterController->getActiveTerm() );
- if ( pItem->GetChildren().size() > o3tl::make_unsigned(nActiveTerm) )
+ if (nActiveTerm != -1 && pItem->GetChildren().size() > o3tl::make_unsigned(nActiveTerm))
{
SetCurrentItems( static_cast< FmFilterItems* >( pItem->GetChildren()[ nActiveTerm ].get() ) );
}
@@ -662,7 +661,6 @@ void FmFilterModel::SetCurrentController(const Reference< XFormController > & xC
}
}
-
void FmFilterModel::AppendFilterItems( FmFormItem& _rFormItem )
{
// insert the condition behind the last filter items