diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-05-19 15:08:14 +0100 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2024-05-19 21:05:55 +0200 |
| commit | bf877f3e10c3a2ce7267335a0c9c7cd828c373ca (patch) | |
| tree | e0d29a0b1b73b2d2b132072fe8e3fedec836daa7 | |
| parent | 7472bf01dee87a45aa3345397ae6f072f5d57058 (diff) | |
Resolves: tdf#151382 we want to save the FN_KEEP_ASPECT_RATIO state
and not if it is implied to be toggled on by SwFormatFrameSize::SYNCED
in which case on "ok" FN_KEEP_ASPECT_RATIO is set from the ui state
so both tdf#151382 and tdf132591 work
Change-Id: I039de0e8f0f9adcc3c02f0e07c12d83cd807887b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167816
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
| -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 b3e2a873ad18..8a7ec8d4ffe0 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()) { |