Resolves: fdo#36668 allow image captions above image

orientation is the *second* argument, not the first,
which may be why this was never implemented, because
setting BOTTOM "didn't work".

Change-Id: Ief9b7f3ef7f696d38a3da73f9e38fe30a2d6c855

sw/source/core/doc/doclay.cxx

@@ -1347,8 +1347,10 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
 
                 pNewSet->Put( SwFmtSurround( SURROUND_NONE ) );
                 pNewSet->Put( SvxOpaqueItem( RES_OPAQUE, sal_True ) );
-                pNewSet->Put( SwFmtVertOrient( text::VertOrientation::TOP ) );
-                pNewSet->Put( SwFmtHoriOrient( text::HoriOrientation::CENTER ) );
+
+                sal_Int16 eVert = bBefore ? text::VertOrientation::BOTTOM : text::VertOrientation::TOP;
+                pNewSet->Put( SwFmtVertOrient( 0, eVert ) );
+                pNewSet->Put( SwFmtHoriOrient( 0, text::HoriOrientation::CENTER ) );
 
                 aFrmSize = pOldFmt->GetFrmSize();
                 aFrmSize.SetWidthPercent( 100 );

sw/source/ui/frmdlg/cption.cxx

@@ -239,11 +239,6 @@ SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) :
             break;
     }
     m_pPosBox->SelectEntryPos(1);
-    if (eType & (nsSelectionType::SEL_GRF|nsSelectionType::SEL_DRW))
-    {
-        m_pPosText->Enable( sal_False );
-        m_pPosBox->Enable( sal_False );
-    }
 
     m_pCategoryBox->GetModifyHdl().Call(m_pCategoryBox);