core.git: Branch 'distro/collabora/co-23.05' - sw/source sw/uiconfig
sw/source/ui/dialog/uiregionsw.cxx |2 ++ sw/source/uibase/inc/regionsw.hxx |1 + sw/uiconfig/swriter/ui/editsectiondialog.ui |2 +- 3 files changed, 4 insertions(+), 1 deletion(-) New commits: commit f9546a5e9e204fc058365aaddfb0dfa8f9a26418 Author: Méven Car AuthorDate: Wed Jan 10 10:26:38 2024 +0100 Commit: Miklos Vajna CommitDate: Fri Jan 12 15:50:54 2024 +0100 sw Edit Sections: hide Link section in LOK case In the LibreOfficeKit case the section does not make sense as the application has only restricted access to files, so hide it. Test: In Writer new document, insert a section, right click on section, Edit section..., Link section is visible. In LOK case the Link section is not present. Change-Id: I7aab8b384909d25e52f5fca2bf54f86e5c662b54 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161878 Tested-by: Jenkins CollaboraOffice Reviewed-by: Miklos Vajna diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index b3dff074fdc1..dfab16785270 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -357,6 +357,7 @@ SwEditRegionDlg::SwEditRegionDlg(weld::Window* pParent, SwWrtShell& rWrtSh) , m_xOptionsPB(m_xBuilder->weld_button("options")) , m_xDismiss(m_xBuilder->weld_button("remove")) , m_xHideFrame(m_xBuilder->weld_widget("hideframe")) +, m_xLinkFrame(m_xBuilder->weld_frame("linkframe")) { m_xTree->set_size_request(-1, m_xTree->get_height_rows(16)); m_xFileCB->set_state(TRISTATE_FALSE); @@ -418,6 +419,7 @@ SwEditRegionDlg::SwEditRegionDlg(weld::Window* pParent, SwWrtShell& rWrtSh) if(comphelper::LibreOfficeKit::isActive()) { +m_xLinkFrame->hide(); m_xDDECB->hide(); m_xDDECommandFT->hide(); m_xFileNameFT->hide(); diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index 8cd22491cc3a..dae59fc58362 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -77,6 +77,7 @@ class SwEditRegionDlg final : public SfxDialogController std::unique_ptr m_xOptionsPB; std::unique_ptr m_xDismiss; std::unique_ptr m_xHideFrame; +std::unique_ptr m_xLinkFrame; voidRecurseList(const SwSectionFormat* pFormat, const weld::TreeIter* pIter); size_t FindArrPos(const SwSectionFormat* pFormat); diff --git a/sw/uiconfig/swriter/ui/editsectiondialog.ui b/sw/uiconfig/swriter/ui/editsectiondialog.ui index 3a571100684f..2c358fa69fa5 100644 --- a/sw/uiconfig/swriter/ui/editsectiondialog.ui +++ b/sw/uiconfig/swriter/ui/editsectiondialog.ui @@ -237,7 +237,7 @@ 12 12 - + True False True
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/source sw/uiconfig
sw/source/core/fields/reffld.cxx | 21 + sw/uiconfig/swriter/ui/fldrefpage.ui |2 +- 2 files changed, 6 insertions(+), 17 deletions(-) New commits: commit 60c111838da81697a49b3011eebe8b1e05ad08bb Author: Skyler Grey AuthorDate: Tue Oct 24 10:19:52 2023 + Commit: Skyler Grey CommitDate: Wed Oct 25 16:36:51 2023 +0200 Improve STYLE_FROM_BOTTOM compatability with Word From my testing in Word, it doesn't honor the "search from bottom" flag when it is in the body, only in marginals. Additionally, it doesn't continue searching in the opposite order if the referenced content is not found on the current page, instead it searches in the same order as it would normally (i.e. pages above then pages below). This commit changes the behavior and UI of our from bottom flag to match. Change-Id: Id991c92b9aeaa054b136f7a3d9c7c8ea0026e514 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158382 Reviewed-by: Miklos Vajna Tested-by: Jenkins CollaboraOffice diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index 3a7bc4ae4e70..1f8aae4e3506 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -1385,8 +1385,6 @@ SwTextNode* SwGetRefFieldType::FindAnchor(SwDoc* pDoc, const OUString& rRefMark, case REF_STYLE: if (!pSelf) break; -bool bFlagFromBottom = (nFlags & REFFLDFLAG_STYLE_FROM_BOTTOM) == REFFLDFLAG_STYLE_FROM_BOTTOM; - const SwNodes& nodes = pDoc->GetNodes(); StyleRefElementType elementType = StyleRefElementType::Default; @@ -1435,6 +1433,8 @@ SwTextNode* SwGetRefFieldType::FindAnchor(SwDoc* pDoc, const OUString& rRefMark, // For marginals, styleref tries to act on the current page first // 1. Get the page we're on, search it from top to bottom +bool bFlagFromBottom = (nFlags & REFFLDFLAG_STYLE_FROM_BOTTOM) == REFFLDFLAG_STYLE_FROM_BOTTOM; + Point aPt; std::pair const tmp(aPt, false); @@ -1500,10 +1500,7 @@ SwTextNode* SwGetRefFieldType::FindAnchor(SwDoc* pDoc, const OUString& rRefMark, if (beforeStart) { -if (bFlagFromBottom) -pSearchThird.push_front(nodes[n]); -else -pSearchSecond.push_front(nodes[n]); +pSearchSecond.push_front(nodes[n]); } else if (beforeEnd) { @@ -1517,8 +1514,6 @@ SwTextNode* SwGetRefFieldType::FindAnchor(SwDoc* pDoc, const OUString& rRefMark, beforeEnd = false; } } -else if (bFlagFromBottom) -pSearchSecond.push_back(nodes[n]); else pSearchThird.push_back(nodes[n]); } @@ -1580,20 +1575,14 @@ SwTextNode* SwGetRefFieldType::FindAnchor(SwDoc* pDoc, const OUString& rRefMark, { if (beforeElement) { -if (bFlagFromBottom) -pSearchSecond.push_front(nodes[n]); -else -pSearchFirst.push_front(nodes[n]); +pSearchFirst.push_front(nodes[n]); if (*pReference == *nodes[n]) { beforeElement = false; } } -else if (bFlagFromBottom) -pSearchFirst.push_back(nodes[n]); -else -pSearchSecond.push_back(nodes[n]); +pSearchSecond.push_back(nodes[n]); } // 1. Search up until we hit the top of the document diff --git a/sw/uiconfig/swriter/ui/fldrefpage.ui b/sw/uiconfig/swriter/ui/fldrefpage.ui index 635cbb35fb41..8592211ef10e 100644 --- a/sw/uiconfig/swriter/ui/fldrefpage.ui +++ b/sw/uiconfig/swriter/ui/fldrefpage.ui @@ -201,7 +201,7 @@ top -Search from bottom to top +Search this page from bottom to top True True False
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/source sw/uiconfig vcl/jsdialog
sw/source/ui/frmdlg/column.cxx |2 +- sw/uiconfig/swriter/ui/columndialog.ui | 20 +--- vcl/jsdialog/enabled.cxx |1 + 3 files changed, 19 insertions(+), 4 deletions(-) New commits: commit f50d009885c499e55db35571ace83f2ed7effbfe Author: Pranam Lashkari AuthorDate: Mon Mar 20 18:35:31 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Mar 21 12:59:32 2023 + jsdialog: enable column dialog (writer) Change-Id: I4b91d271d766d8efeaddc3c3775513184036c5f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149167 Reviewed-by: Szymon Kłos Tested-by: Szymon Kłos diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 5692a906e279..c2a24ad18ef6 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -89,7 +89,7 @@ SwColumnDlg::SwColumnDlg(weld::Window* pParent, SwWrtShell& rSh) , m_bSectionChanged(false) , m_bSelSectionChanged(false) , m_bFrameChanged(false) -, m_xContentArea(m_xDialog->weld_content_area()) +, m_xContentArea(m_xBuilder->weld_container("content")) , m_xOkButton(m_xBuilder->weld_button("ok")) { SwRect aRect; diff --git a/sw/uiconfig/swriter/ui/columndialog.ui b/sw/uiconfig/swriter/ui/columndialog.ui index 5bf4d5d9d999..2162f1e5b2fd 100644 --- a/sw/uiconfig/swriter/ui/columndialog.ui +++ b/sw/uiconfig/swriter/ui/columndialog.ui @@ -17,6 +17,23 @@ False vertical 12 + + +True +False +vertical +12 + + + + + +False +True +begin +0 + + False @@ -74,9 +91,6 @@ 0 - - - diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 6595cf7971c0..7efb9de2bb84 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -128,6 +128,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/captionoptions.ui" || rUIFile == u"modules/swriter/ui/characterproperties.ui" || rUIFile == u"modules/swriter/ui/charurlpage.ui" +|| rUIFile == u"modules/swriter/ui/columndialog.ui" || rUIFile == u"modules/swriter/ui/columnpage.ui" || rUIFile == u"modules/swriter/ui/contentcontroldlg.ui" || rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui"