sw/source/ui/frmdlg/frmpage.cxx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
New commits: commit 191940560d24e20cff3e9967b95c917dffbd1918 Author: Justin Luth <[email protected]> AuthorDate: Tue Nov 11 10:53:52 2025 -0500 Commit: Justin Luth <[email protected]> CommitDate: Thu Nov 13 15:03:10 2025 +0100 NFC sw frmpage.cxx: m_bFormat guaranteed to be false Since commit 17fe1e19e01f8b23bcd23cc7c1789e8f7064d06e Author: Michael Stahl on Tue Sep 26 16:56:31 2017 +0200 tdf#112574 sw: don't insert RES_ANCHOR into style item sets Change-Id: I94116c054d96f8df0b72f5f234ff976d93d29c0e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193909 Reviewed-by: Justin Luth <[email protected]> Tested-by: Jenkins diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index bebfcd36ab2f..ef931a4ca65d 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -1861,8 +1861,7 @@ DeactivateRC SwFramePage::DeactivatePage(SfxItemSet * _pSet) { //FillItemSet doesn't set the anchor into the set when it matches //the original. But for the other pages we need the current anchor. - SwWrtShell* pSh = m_bFormat ? ::GetActiveWrtShell() - : getFrameDlgParentShell(); + SwWrtShell* pSh = getFrameDlgParentShell(); if (pSh) { RndStdIds eAnchorId = GetAnchor(); commit fe2381cb811d970453bd3fc1e67e1e36fa8f9abf Author: Justin Luth <[email protected]> AuthorDate: Wed Nov 12 13:07:15 2025 -0500 Commit: Justin Luth <[email protected]> CommitDate: Thu Nov 13 15:03:02 2025 +0100 tdf#169219 swrelpagesize ui: update on relation changes Without this patch, when you open up sw/qa/extras/odfexport/data/relh-page-tdf80282.odt, go to the image properties, and change relative from 'Entire Page' to 'Entire Paragraph Area' and change the updated percent back to 100%, then when switching to the Crop tab, the width wasn't reduced. It remained at 4.1 inches. Now with this patch, the width properly indicates 2.5 inches and returning to the Position and Size tab remains at 100%. Change-Id: Ifb8b3b469fb6a70e7c6c7e5953ccccb0e8f1a3b1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193908 Tested-by: Jenkins Reviewed-by: Justin Luth <[email protected]> diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 271ba3ced41d..bebfcd36ab2f 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -1282,8 +1282,10 @@ bool SwFramePage::FillItemSet(SfxItemSet *rSet) aSz.SetHeightPercentRelation(text::RelOrientation::PAGE_FRAME); } - bool bValueModified = m_xWidthED->get_value_changed_from_saved() || - m_xHeightED->get_value_changed_from_saved(); + bool bValueModified = m_xWidthED->get_value_changed_from_saved() + || m_xHeightED->get_value_changed_from_saved() + || m_xRelWidthRelationLB->get_value_changed_from_saved() + || m_xRelHeightRelationLB->get_value_changed_from_saved(); bool bCheckChanged = m_xRelWidthCB->get_state_changed_from_saved() || m_xRelHeightCB->get_state_changed_from_saved() || m_xFixedRatioCB->get_state_changed_from_saved();
