core.git: sfx2/source
sfx2/source/control/unoctitm.cxx | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) New commits: commit a69e32a0ca800642a3fb542c0a49a13ba04faecc Author: Darshan11 AuthorDate: Wed Mar 13 16:34:38 2024 +0530 Commit: Caolán McNamara CommitDate: Wed Mar 27 13:09:37 2024 +0100 Send ParaRightToLeft state messageto client side - Before this patch in online text in paragraph was changing according to uno command but client was not getting and info about is RTL true or TRL true - this will send message [:unoParaRightToLeft=true || :unoParaLeftToRight=true] at client side - added more properties like disabled and state information to handle both case at same time in online - which will be helpful to our existing locgic where to add or from where to remove selected class on element according to response Change-Id: Ia443215342d6a81f4e60fa9237149f6b18420e16 Change-Id: I08fb7e474e099822b26c732fe1e5dac8e773c58f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164767 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164817 (cherry picked from commit fa93750070793cd548d028feb39e4d0e0e61ae5a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165324 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 1068b28e0ac8..f8c62b3dae19 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -1096,8 +1096,6 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra aEvent.FeatureURL.Path == "DeleteNote" || aEvent.FeatureURL.Path == "AcceptChanges" || aEvent.FeatureURL.Path == "SetDefault" || - aEvent.FeatureURL.Path == "ParaLeftToRight" || - aEvent.FeatureURL.Path == "ParaRightToLeft" || aEvent.FeatureURL.Path == "ParaspaceIncrease" || aEvent.FeatureURL.Path == "ParaspaceDecrease" || aEvent.FeatureURL.Path == "TableDialog" || @@ -1169,6 +1167,18 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra { aBuffer.append(aEvent.IsEnabled ? std::u16string_view(u"enabled") : std::u16string_view(u"disabled")); } +else if (aEvent.FeatureURL.Path == "ParaLeftToRight" || + aEvent.FeatureURL.Path == "ParaRightToLeft") +{ +tools::JsonWriter aTree; +bool bTemp = false; +aEvent.State >>= bTemp; +aTree.put("commandName", aEvent.FeatureURL.Complete); +aTree.put("disabled", !aEvent.IsEnabled); +aTree.put("state", bTemp ? "true" : "false"); + SfxViewShell::Current()->libreOfficeKitViewCallback(LOK_CALLBACK_STATE_CHANGED, aTree.finishAndGetAsOString()); +return; +} else if (aEvent.FeatureURL.Path == "AssignLayout" || aEvent.FeatureURL.Path == "StatusSelectionMode" || aEvent.FeatureURL.Path == "Signature" ||
core.git: cui/source
cui/source/tabpages/numpages.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit e08b69e25c27adffcde3466b5ff90be4da603347 Author: Darshan11 AuthorDate: Fri Mar 8 20:54:43 2024 +0530 Commit: Caolán McNamara CommitDate: Tue Mar 26 10:24:33 2024 +0100 Hide "Add and resize" button from numbering and bullets dialog for ONLINE - Image tab had "Add and resize" option for numbering and bullets dialog - which is not need in online - so we will just hide that browseBtn for online Change-Id: Ib87f1e7ae7e6df5256ab77122b477695a45cf441 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164587 Reviewed-by: Szymon Kłos Tested-by: Jenkins CollaboraOffice (cherry picked from commit 08a5c1352f4d65c180995cdfca5c981f88035901) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164818 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165215 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 8bba652c594e..cbdf7fc5a23d 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -731,6 +731,9 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(weld::Container* pPage, weld::DialogC m_xExamplesVS->SetDoubleClickHdl(LINK(this, SvxBitmapPickTabPage, DoubleClickHdl_Impl)); m_xBtBrowseFile->connect_clicked(LINK(this, SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl)); +if(comphelper::LibreOfficeKit::isActive()) +m_xBtBrowseFile->hide(); + eCoreUnit = rSet.GetPool()->GetMetric(rSet.GetPool()->GetWhichIDFromSlotID(SID_ATTR_NUMBERING_RULE)); // determine graphic name
core.git: Branch 'distro/collabora/co-23.05' - sfx2/source
sfx2/source/control/unoctitm.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c5e0b00374bf9ad96c0ec3ab4d8f9ed76f2f2882 Author: Darshan11 AuthorDate: Mon Mar 18 13:46:09 2024 +0530 Commit: Szymon Kłos CommitDate: Mon Mar 18 13:40:47 2024 +0100 Updated patch: Send ParaRightToLeft state messageto client - pass direct bool insted of string - We made some changes in 24 branch - so need to update same in 23.05 Change-Id: Ie06b85c6d7ec6d00461c178e19ab77cc435d92b4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164964 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index b31a93fc9c9b..10d2230007db 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -1136,8 +1136,8 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra bool bTemp = false; aEvent.State >>= bTemp; aTree.put("commandName", aEvent.FeatureURL.Complete); -aTree.put("disabled", std::to_string(aEvent.IsEnabled) == "0" ? "true" : "false"); -aTree.put("state", std::to_string(bTemp) == "1" ? "true" : "false"); +aTree.put("disabled", !aEvent.IsEnabled); +aTree.put("state", bTemp ? "true" : "false"); SfxViewShell::Current()->libreOfficeKitViewCallback(LOK_CALLBACK_STATE_CHANGED, aTree.extractData()); return; }
core.git: Branch 'distro/collabora/co-24.04' - sfx2/source
sfx2/source/control/unoctitm.cxx | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) New commits: commit fa93750070793cd548d028feb39e4d0e0e61ae5a Author: Darshan11 AuthorDate: Wed Mar 13 16:34:38 2024 +0530 Commit: Szymon Kłos CommitDate: Mon Mar 18 13:16:51 2024 +0100 Send ParaRightToLeft state messageto client side - Before this patch in online text in paragraph was changing according to uno command but client was not getting and info about is RTL true or TRL true - this will send message [:unoParaRightToLeft=true || :unoParaLeftToRight=true] at client side - added more properties like disabled and state information to handle both case at same time in online - which will be helpful to our existing locgic where to add or from where to remove selected class on element according to response Change-Id: Ia443215342d6a81f4e60fa9237149f6b18420e16 Change-Id: I08fb7e474e099822b26c732fe1e5dac8e773c58f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164767 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164817 diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index fade31109f35..8072e1a9ad8d 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -1096,8 +1096,6 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra aEvent.FeatureURL.Path == "DeleteNote" || aEvent.FeatureURL.Path == "AcceptChanges" || aEvent.FeatureURL.Path == "SetDefault" || - aEvent.FeatureURL.Path == "ParaLeftToRight" || - aEvent.FeatureURL.Path == "ParaRightToLeft" || aEvent.FeatureURL.Path == "ParaspaceIncrease" || aEvent.FeatureURL.Path == "ParaspaceDecrease" || aEvent.FeatureURL.Path == "TableDialog" || @@ -1169,6 +1167,18 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra { aBuffer.append(aEvent.IsEnabled ? std::u16string_view(u"enabled") : std::u16string_view(u"disabled")); } +else if (aEvent.FeatureURL.Path == "ParaLeftToRight" || + aEvent.FeatureURL.Path == "ParaRightToLeft") +{ +tools::JsonWriter aTree; +bool bTemp = false; +aEvent.State >>= bTemp; +aTree.put("commandName", aEvent.FeatureURL.Complete); +aTree.put("disabled", !aEvent.IsEnabled); +aTree.put("state", bTemp ? "true" : "false"); + SfxViewShell::Current()->libreOfficeKitViewCallback(LOK_CALLBACK_STATE_CHANGED, aTree.finishAndGetAsOString()); +return; +} else if (aEvent.FeatureURL.Path == "AssignLayout" || aEvent.FeatureURL.Path == "StatusSelectionMode" || aEvent.FeatureURL.Path == "Signature" ||
core.git: Branch 'distro/collabora/co-23.05' - sfx2/source
sfx2/source/control/unoctitm.cxx | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) New commits: commit 2a263f9114985fcdcab9e9bfc035c6593ec40f1c Author: Darshan11 AuthorDate: Wed Mar 13 16:34:38 2024 +0530 Commit: Szymon Kłos CommitDate: Fri Mar 15 10:05:47 2024 +0100 Send ParaRightToLeft state messageto client side - Before this patch in online text in paragraph was changing according to uno command but client was not getting and info about is RTL true or TRL true - this will send message [:unoParaRightToLeft=true || :unoParaLeftToRight=true] at client side - added more properties like disabled and state information to handle both case at same time in online - which will be helpful to our existing locgic where to add or from where to remove selected class on element according to response Change-Id: Ia443215342d6a81f4e60fa9237149f6b18420e16 Change-Id: I08fb7e474e099822b26c732fe1e5dac8e773c58f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164767 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 38db25888c1f..b31a93fc9c9b 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -1058,8 +1058,6 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra aEvent.FeatureURL.Path == "DeleteNote" || aEvent.FeatureURL.Path == "AcceptChanges" || aEvent.FeatureURL.Path == "SetDefault" || - aEvent.FeatureURL.Path == "ParaLeftToRight" || - aEvent.FeatureURL.Path == "ParaRightToLeft" || aEvent.FeatureURL.Path == "ParaspaceIncrease" || aEvent.FeatureURL.Path == "ParaspaceDecrease" || aEvent.FeatureURL.Path == "TableDialog" || @@ -1131,6 +1129,18 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra { aBuffer.append(aEvent.IsEnabled ? std::u16string_view(u"enabled") : std::u16string_view(u"disabled")); } +else if (aEvent.FeatureURL.Path == "ParaLeftToRight" || + aEvent.FeatureURL.Path == "ParaRightToLeft") +{ +tools::JsonWriter aTree; +bool bTemp = false; +aEvent.State >>= bTemp; +aTree.put("commandName", aEvent.FeatureURL.Complete); +aTree.put("disabled", std::to_string(aEvent.IsEnabled) == "0" ? "true" : "false"); +aTree.put("state", std::to_string(bTemp) == "1" ? "true" : "false"); + SfxViewShell::Current()->libreOfficeKitViewCallback(LOK_CALLBACK_STATE_CHANGED, aTree.extractData()); +return; +} else if (aEvent.FeatureURL.Path == "AssignLayout" || aEvent.FeatureURL.Path == "StatusSelectionMode" || aEvent.FeatureURL.Path == "Signature" ||
core.git: Branch 'distro/collabora/co-24.04' - cui/source
cui/source/tabpages/numpages.cxx |4 1 file changed, 4 insertions(+) New commits: commit 49ca3e30f22d7005e2afb4989c32fe0130805e5d Author: Darshan11 AuthorDate: Fri Mar 8 20:54:43 2024 +0530 Commit: Szymon Kłos CommitDate: Thu Mar 14 15:06:42 2024 +0100 Hide "Add and resize" button from numbering and bullets dialog for ONLINE - Image tab had "Add and resize" option for numbering and bullets dialog - which is not need in online - so we will just hide that browseBtn for online Change-Id: Ib87f1e7ae7e6df5256ab77122b477695a45cf441 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164587 Reviewed-by: Szymon Kłos Tested-by: Jenkins CollaboraOffice (cherry picked from commit 08a5c1352f4d65c180995cdfca5c981f88035901) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164818 diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index d1cb79341281..792b8b265ae6 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -739,6 +739,10 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(weld::Container* pPage, weld::DialogC m_xExamplesVS->SetDoubleClickHdl(LINK(this, SvxBitmapPickTabPage, DoubleClickHdl_Impl)); m_xBtBrowseFile->connect_clicked(LINK(this, SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl)); +if(comphelper::LibreOfficeKit::isActive()) +{ +m_xBtBrowseFile->hide(); +} eCoreUnit = rSet.GetPool()->GetMetric(rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE)); // determine graphic name
core.git: Branch 'distro/collabora/co-23.05' - cui/source
cui/source/tabpages/numpages.cxx |4 1 file changed, 4 insertions(+) New commits: commit 08a5c1352f4d65c180995cdfca5c981f88035901 Author: Darshan11 AuthorDate: Fri Mar 8 20:54:43 2024 +0530 Commit: Szymon Kłos CommitDate: Mon Mar 11 09:36:28 2024 +0100 Hide "Add and resize" button from numbering and bullets dialog for ONLINE - Image tab had "Add and resize" option for numbering and bullets dialog - which is not need in online - so we will just hide that browseBtn for online Change-Id: Ib87f1e7ae7e6df5256ab77122b477695a45cf441 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164587 Reviewed-by: Szymon Kłos Tested-by: Jenkins CollaboraOffice diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 1f5de3dc387b..f39afdd4318f 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -739,6 +739,10 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(weld::Container* pPage, weld::DialogC m_xExamplesVS->SetDoubleClickHdl(LINK(this, SvxBitmapPickTabPage, DoubleClickHdl_Impl)); m_xBtBrowseFile->connect_clicked(LINK(this, SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl)); +if(comphelper::LibreOfficeKit::isActive()) +{ +m_xBtBrowseFile->hide(); +} eCoreUnit = rSet.GetPool()->GetMetric(rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE)); // determine graphic name
core.git: vcl/source
vcl/source/treelist/svtabbx.cxx | 17 + 1 file changed, 17 insertions(+) New commits: commit 4030a043914217ee19487bcdd4389d0e184d Author: Darshan11 AuthorDate: Wed Dec 20 11:35:46 2023 +0530 Commit: Caolán McNamara CommitDate: Fri Jan 5 15:10:19 2024 +0100 Send checkboxtype property to online for webtreeview widget - webtreeview widget does not have any property that define that element is a checkbox or radio button - added `checboxtype` property - will help to identify the element type (radio/checbox) Change-Id: Ic8aa0c3eeb6373566f3507ebf01cee3427a57704 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161043 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161655 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx index 81f0f4e8b078..6f309bb9a85f 100644 --- a/vcl/source/treelist/svtabbx.cxx +++ b/vcl/source/treelist/svtabbx.cxx @@ -142,6 +142,23 @@ void SvTabListBox::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter) bool bCheckButtons = static_cast(nTreeFlags & SvTreeFlags::CHKBTN); +bool isRadioButton = false; +if (pCheckButtonData) +{ +isRadioButton = pCheckButtonData -> IsRadio(); +} + +OUString checkboxtype; +if (bCheckButtons) +{ +checkboxtype = "checkbox"; +if(isRadioButton) +{ +checkboxtype = "radio"; +} +} + +rJsonWriter.put("checkboxtype", checkboxtype); auto entriesNode = rJsonWriter.startArray("entries"); lcl_DumpEntryAndSiblings(rJsonWriter, First(), this, bCheckButtons); }
core.git: vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 01c9240947f21dec283fa0cb4b8b95e313073790 Author: Darshan11 AuthorDate: Wed Jan 3 16:19:39 2024 +0530 Commit: Szymon Kłos CommitDate: Thu Jan 4 09:18:56 2024 +0100 jsdialog: enabled objectdialog (Writer -> Chart -> properties jsdialog) - before this patch we were getting tunneled dialog in chart `properties` options - which causes to have multiple dialogs appear on screen - objectdialog is not enabled Change-Id: I083c3d05ded528412c36d917bc500e55778a01c4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161582 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos (cherry picked from commit e03b03128a4cfe853258f649f8ff6f96a2c8b851) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161567 Tested-by: Jenkins diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 993a6f45685e..cbeaf3335cbf 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -197,6 +197,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/linenumbering.ui" || rUIFile == u"modules/swriter/ui/newuserindexdialog.ui" || rUIFile == u"modules/swriter/ui/numparapage.ui" +|| rUIFile == u"modules/swriter/ui/objectdialog.ui" || rUIFile == u"modules/swriter/ui/pagenumberdlg.ui" || rUIFile == u"modules/swriter/ui/paradialog.ui" || rUIFile == u"modules/swriter/ui/picturedialog.ui"
core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit e03b03128a4cfe853258f649f8ff6f96a2c8b851 Author: Darshan11 AuthorDate: Wed Jan 3 16:19:39 2024 +0530 Commit: Szymon Kłos CommitDate: Wed Jan 3 14:16:43 2024 +0100 jsdialog: enabled objectdialog (Writer -> Chart -> properties jsdialog) - before this patch we were getting tunneled dialog in chart `properties` options - which causes to have multiple dialogs appear on screen - objectdialog is not enabled Change-Id: I083c3d05ded528412c36d917bc500e55778a01c4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161582 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 993a6f45685e..cbeaf3335cbf 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -197,6 +197,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/linenumbering.ui" || rUIFile == u"modules/swriter/ui/newuserindexdialog.ui" || rUIFile == u"modules/swriter/ui/numparapage.ui" +|| rUIFile == u"modules/swriter/ui/objectdialog.ui" || rUIFile == u"modules/swriter/ui/pagenumberdlg.ui" || rUIFile == u"modules/swriter/ui/paradialog.ui" || rUIFile == u"modules/swriter/ui/picturedialog.ui"
core.git: Branch 'distro/collabora/co-23.05' - vcl/source
vcl/source/treelist/svtabbx.cxx | 17 + 1 file changed, 17 insertions(+) New commits: commit dbe6721dc9bff868a83aaba3fb53d27efa5ffc17 Author: Darshan11 AuthorDate: Wed Dec 20 11:35:46 2023 +0530 Commit: Szymon Kłos CommitDate: Wed Dec 20 09:42:44 2023 +0100 Send checkboxtype property to online for webtreeview widget - webtreeview widget does not have any property that define that element is a checkbox or radio button - added `checboxtype` property - will help to identify the element type (radio/checbox) Change-Id: Ic8aa0c3eeb6373566f3507ebf01cee3427a57704 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161043 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx index 9b39429c20e7..8541a16c1fbc 100644 --- a/vcl/source/treelist/svtabbx.cxx +++ b/vcl/source/treelist/svtabbx.cxx @@ -140,6 +140,23 @@ void SvTabListBox::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter) bool bCheckButtons = static_cast(nTreeFlags & SvTreeFlags::CHKBTN); +bool isRadioButton = false; +if (pCheckButtonData) +{ +isRadioButton = pCheckButtonData -> IsRadio(); +} + +OUString checkboxtype; +if (bCheckButtons) +{ +checkboxtype = "checkbox"; +if(isRadioButton) +{ +checkboxtype = "radio"; +} +} + +rJsonWriter.put("checkboxtype", checkboxtype); auto entriesNode = rJsonWriter.startArray("entries"); lcl_DumpEntryAndSiblings(rJsonWriter, First(), this, bCheckButtons); }
core.git: sc/source
sc/source/ui/cctrl/checklistmenu.cxx |7 +++ 1 file changed, 7 insertions(+) New commits: commit a5aa5c7fad5ae07d8c4958d9f18bf0c2bd820b9a Author: Darshan11 AuthorDate: Wed Nov 29 17:02:44 2023 +0530 Commit: Szymon Kłos CommitDate: Thu Dec 14 09:31:41 2023 +0100 Disable Select/Unselect-current Filter Checkboxes in Calc Change-Id: I99a3d78bfbb65e751328452d7405d7844f810dd9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160082 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos (cherry picked from commit 5788f736578dc22bc9bcd46a6e75233237b82af2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160697 Tested-by: Jenkins diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 92e7096fc25a..ecee4dab0600 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -623,6 +623,13 @@ ScCheckListMenuControl::ScCheckListMenuControl(weld::Widget* pParent, ScViewData maSearchEditTimer.SetTimeout(EDIT_UPDATEDATA_TIMEOUT); maSearchEditTimer.SetInvokeHandler(LINK(this, ScCheckListMenuControl, SearchEditTimeoutHdl)); + +if (comphelper::LibreOfficeKit::isActive()) +{ +mxBtnSelectSingle->hide(); +mxBtnUnselectSingle->hide(); +} + } void ScCheckListMenuControl::GrabFocus()
core.git: vcl/source
vcl/source/window/dockwin.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1ad7c71892cc0d6ea451ab4026dc82f54ed48f6f Author: Darshan11 AuthorDate: Fri Dec 1 18:49:32 2023 +0530 Commit: Szymon Kłos CommitDate: Thu Dec 14 09:31:23 2023 +0100 Fix posx and posy for Filter by color in autofilter jsDialog Change-Id: I2d4cd198197250495cc87eb1ee68407baf8e6a1a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160216 Reviewed-by: Szymon Kłos Tested-by: Jenkins CollaboraOffice (cherry picked from commit 8b08a9927bc4ee66a9575c658934dd27f06be702) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160698 Tested-by: Jenkins diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 3f8853877b08..2bced4d8047b 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -927,7 +927,7 @@ Point DockingWindow::GetFloatingPos() const pWrapper->mpFloatWin->GetWindowState( aData ); AbsoluteScreenPixelPoint aPos(aData.x(), aData.y()); // LOK needs logic coordinates not absolute screen position for autofilter menu -if (!comphelper::LibreOfficeKit::isActive() || get_id() != "check_list_menu") +if (!comphelper::LibreOfficeKit::isActive()) return pWrapper->mpFloatWin->GetParent()->ImplGetFrameWindow()->AbsoluteScreenToOutputPixel( aPos ); return Point(aPos); }
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/source
vcl/source/window/dockwin.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8b08a9927bc4ee66a9575c658934dd27f06be702 Author: Darshan11 AuthorDate: Fri Dec 1 18:49:32 2023 +0530 Commit: Szymon Kłos CommitDate: Mon Dec 4 09:45:55 2023 +0100 Fix posx and posy for Filter by color in autofilter jsDialog Change-Id: I2d4cd198197250495cc87eb1ee68407baf8e6a1a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160216 Reviewed-by: Szymon Kłos Tested-by: Jenkins CollaboraOffice diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 74c18cca5159..dab053b3fba9 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -927,7 +927,7 @@ Point DockingWindow::GetFloatingPos() const pWrapper->mpFloatWin->GetWindowState( aData ); Point aPos(aData.x(), aData.y()); // LOK needs logic coordinates not absolute screen position for autofilter menu -if (!comphelper::LibreOfficeKit::isActive() || get_id() != "check_list_menu") +if (!comphelper::LibreOfficeKit::isActive()) aPos = pWrapper->mpFloatWin->GetParent()->ImplGetFrameWindow()->AbsoluteScreenToOutputPixel( aPos ); return aPos; }
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sc/source
sc/source/ui/cctrl/checklistmenu.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit 5788f736578dc22bc9bcd46a6e75233237b82af2 Author: Darshan11 AuthorDate: Wed Nov 29 17:02:44 2023 +0530 Commit: Szymon Kłos CommitDate: Sun Dec 3 19:17:46 2023 +0100 Disable Select/Unselect-current Filter Checkboxes in Calc Change-Id: I99a3d78bfbb65e751328452d7405d7844f810dd9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160082 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index a913bcfe55ef..1cb1565ab482 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -619,6 +619,11 @@ ScCheckListMenuControl::ScCheckListMenuControl(weld::Widget* pParent, ScViewData // bulk_insert_for_each mxTreeChecks->set_size_request(mnCheckWidthReq, nChecksHeight); mxListChecks->set_size_request(mnCheckWidthReq, nChecksHeight); +if (comphelper::LibreOfficeKit::isActive()) +{ +mxBtnSelectSingle->hide(); +mxBtnUnselectSingle->hide(); +} } void ScCheckListMenuControl::GrabFocus()