From 821c5a97049c55fe14b0cb8cb280fe77281d91a5 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Wed, 17 Jan 2018 15:58:10 +0100 Subject: tdf#115032: Above as default position for Autocaption pref Change-Id: Idcd4e4a409476fe269340ac9d8f3ceacc6fbd7f3 (cherry picked from commit 48c47db6e7e79f0accb3221a34ec03202e8fa413) Reviewed-on: https://gerrit.libreoffice.org/49529 Tested-by: Jenkins Reviewed-by: Heiko Tietze --- sw/source/ui/config/optload.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 544aa7e7fe20..4bcee49414b5 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -777,9 +777,11 @@ IMPL_LINK_NOARG(SwCaptionOptPage, ShowEntryHdl, SvTreeListBox*, void) m_pPosBox->InsertEntry(m_sEnd); break; } - m_pPosBox->SelectEntryPos(pOpt->GetPos()); m_pPosBox->Enable( m_pPosBox->IsEnabled() ); - m_pPosBox->SelectEntryPos(pOpt->GetPos()); + if (m_pPosBox->IsEnabled()) + m_pPosBox->SelectEntryPos(pOpt->GetPos()); + else + m_pPosBox->SelectEntryPos(0); sal_Int32 nLevelPos = ( pOpt->GetLevel() < MAXLEVEL ) ? pOpt->GetLevel() + 1 : 0; m_pLbLevel->SelectEntryPos( nLevelPos ); -- cgit v1.2.3