summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2018-01-17 15:58:10 +0100
committerJulien Nabet <serval2412@yahoo.fr>2018-02-10 12:28:20 +0100
commit48c47db6e7e79f0accb3221a34ec03202e8fa413 (patch)
treeec2076e6423113c8c22a07da681f46a3f12f87e9
parent275a60e17ddfacae505df56374b334261a646a3b (diff)
tdf#115032: Above as default position for Autocaption pref
Change-Id: Idcd4e4a409476fe269340ac9d8f3ceacc6fbd7f3 Reviewed-on: https://gerrit.libreoffice.org/48058 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com> Tested-by: Heiko Tietze <tietze.heiko@gmail.com>
-rw-r--r--sw/source/ui/config/optload.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 7803dde3094f..d8f7f929e5ba 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -776,9 +776,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 );