strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sw image anchor type: add style UI for this

Browse source 
A frame style contains RES_ANCHOR, and SwFormatAnchor::m_eAnchorId
already describes an anchor type. This is even exposed on the UNO API as
the AnchorType property and its ODF import/export is also implemented.

Enable UI for this, so that templates can decide the default anchor type
when inserting images. Still keep the "to frame" anchor type disabled as
its meaning is unclear for frame styles.

Change-Id: I5d8ef63af9c8f2efa6485c4ec827ba9aef9b8956
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116990
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Miklos Vajna 2021-06-10 15:11:03 +02:00
parent 71070e7df2
commit 5951da5175
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sw/source/ui/frmdlg/frmpage.cxx
View file

@ -884,8 +884,8 @@ void SwFramePage::Reset( const SfxItemSet *rSet )
if (m_bFormat) if (m_bFormat)
{ {
// at formats no anchor editing // at formats no to-fly anchor
m_xAnchorFrame->set_sensitive(false); m_xAnchorAtFrameRB->set_sensitive(false);
if (rSet->GetItemState(FN_KEEP_ASPECT_RATIO) != SfxItemState::SET) if (rSet->GetItemState(FN_KEEP_ASPECT_RATIO) != SfxItemState::SET)
{ {
m_xFixedRatioCB->set_sensitive(false); m_xFixedRatioCB->set_sensitive(false);
@ -1047,7 +1047,7 @@ bool SwFramePage::FillItemSet(SfxItemSet *rSet)
RndStdIds eAnchorId = GetAnchor(); RndStdIds eAnchorId = GetAnchor();
if ( !m_bFormat ) if ( !m_bFormat || eAnchorId != RndStdIds::FLY_AT_FLY )
{ {
pOldItem = GetOldItem(*rSet, RES_ANCHOR); pOldItem = GetOldItem(*rSet, RES_ANCHOR);
if (m_bNew || !pOldItem || eAnchorId != static_cast<const SwFormatAnchor*>(pOldItem)->GetAnchorId()) if (m_bNew || !pOldItem || eAnchorId != static_cast<const SwFormatAnchor*>(pOldItem)->GetAnchorId())
@ -2287,7 +2287,7 @@ void SwFramePage::SetFormatUsed(bool bFormatUsed)
{ {
m_bFormat = bFormatUsed; m_bFormat = bFormatUsed;
if (m_bFormat) if (m_bFormat)
m_xAnchorFrame->hide(); m_xAnchorAtFrameRB->hide();
} }
void SwFramePage::EnableVerticalPositioning( bool bEnable ) void SwFramePage::EnableVerticalPositioning( bool bEnable )