diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-02-28 12:59:11 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-02-28 14:43:17 +0000 |
| commit | 2a9c14730d93ea434cb456d248c37c7ff41fa6c0 (patch) | |
| tree | 340e5b0abc083a801f273f7a83a4238096ca4999 | |
| parent | 3ba44a1e25e63659b4b10840fa83067fb0008f7d (diff) | |
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
| -rw-r--r-- | sw/source/core/doc/doclay.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/frmdlg/cption.cxx | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index 2d0988247906..767f72514603 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/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 ); diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index ab1e5d8f30cb..ba236522f5f0 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/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); |