commit a5fb58caa0f941caacb1fff78c22285bb7f63026
author Oliver Specht <oliver.specht@cib.de> Thu Dec 10 15:14:37 2015 +0100
committer Oliver Specht <oliver.specht@cib.de> Fri Dec 11 06:37:19 2015 +0000
tree a96847226bd136ef04a984f98a055f1678bd4101
parent feb59478cd3d0e81b1acbead259f3087c3434bec

tdf#33338: enable autocaption position 'above' for all object types

Change-Id: Idf82c1d7f1b5e149c3796f5999fd09cf2c31299f
Reviewed-on: https://gerrit.libreoffice.org/20603
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
Tested-by: Oliver Specht <oliver.specht@cib.de>

sw/source/ui/config/optload.cxx

diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 5637b5b..49c63a8 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -765,9 +765,7 @@ IMPL_LINK_NOARG_TYPED(SwCaptionOptPage, ShowEntryHdl, SvTreeListBox*, void)
                break;
        }
        m_pPosBox->SelectEntryPos(pOpt->GetPos());
        m_pPosBox->Enable( pOpt->GetObjType() != GRAPHIC_CAP &&
                pOpt->GetObjType() != OLE_CAP &&
                m_pPosBox->IsEnabled() );
        m_pPosBox->Enable( m_pPosBox->IsEnabled() );
        m_pPosBox->SelectEntryPos(pOpt->GetPos());

        sal_Int32 nLevelPos = ( pOpt->GetLevel() < MAXLEVEL ) ? pOpt->GetLevel() + 1 : 0;