diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-07 11:48:25 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-07 11:48:25 +0000 |
| commit | 9c0049cfae49c8e4ddef9125a69db2ad134c10c6 (patch) | |
| tree | 812a86c0eee63dfc5ace12f2622ed3ce9cd3d680 /sw/source/ui | |
| parent | Releasing progress-linux version 4:24.2.3-2~progress7.99u1. (diff) | |
| download | libreoffice-9c0049cfae49c8e4ddef9125a69db2ad134c10c6.tar.xz libreoffice-9c0049cfae49c8e4ddef9125a69db2ad134c10c6.zip | |
Merging upstream version 4:24.2.4.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/frmdlg/frmpage.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index b3e2a873ad..8a7ec8d4ff 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2306,6 +2306,8 @@ void SwFramePage::Init(const SfxItemSet& rSet) if (SfxItemState::SET == rSet.GetItemState(FN_KEEP_ASPECT_RATIO)) m_xFixedRatioCB->set_active(rSet.Get(FN_KEEP_ASPECT_RATIO).GetValue()); + // see tdf#132591 and tdf#151382 for some examples of FN_KEEP_ASPECT_RATIO cases + m_xFixedRatioCB->save_state(); // columns SwFormatCol aCol( rSet.Get(RES_COL) ); @@ -2364,7 +2366,6 @@ void SwFramePage::Init(const SfxItemSet& rSet) if (rSize.GetWidthPercent() == SwFormatFrameSize::SYNCED || rSize.GetHeightPercent() == SwFormatFrameSize::SYNCED) m_xFixedRatioCB->set_active(true); - m_xFixedRatioCB->save_state(); if (rSize.GetWidthPercent() && rSize.GetWidthPercent() != SwFormatFrameSize::SYNCED && !m_xRelWidthCB->get_active()) { |