sw/source/ui/chrdlg/chardlg.cxx | 6 +++++-
vcl/jsdialog/enabled.cxx | 15 ++++++++++++++-
2 files changed, 19 insertions(+), 2 deletions(-)
New commits:
commit 7aafc76f1a9df21ae3d9f69461d9bc515b07dc3f
Author: Pranam Lashkari <lpra...@collabora.com>
AuthorDate: Fri Mar 3 07:00:22 2023 +0530
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Tue Mar 7 09:13:23 2023 +0000
jsdialog: enabled format Character dialog (calc)
can be found from:
Tabbed view > Format > Character
Compact view > Format > Character
Change-Id: I80c15237a29ef19303c71101965df9a18791cb4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148208
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
Tested-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 5e95b1291d57..42a22b70efa0 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -53,6 +53,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"cui/ui/widgettestdialog.ui"
// scalc
|| rUIFile == u"modules/scalc/ui/analysisofvariancedialog.ui"
+ || rUIFile == u"modules/scalc/ui/chardialog.ui"
|| rUIFile == u"modules/scalc/ui/chisquaretestdialog.ui"
|| rUIFile == u"modules/scalc/ui/colwidthdialog.ui"
|| rUIFile == u"modules/scalc/ui/correlationdialog.ui"
commit 0b9a589f0cb4a1a0b74788d4a1733a490c58a644
Author: Pranam Lashkari <lpra...@collabora.com>
AuthorDate: Fri Mar 3 02:30:55 2023 +0530
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Tue Mar 7 09:13:13 2023 +0000
jsdialog: enabled format Character dialog (writer)
can be found from:
Tabbed view > Format > Character
Sidebar > Character
Compact view > Format > Character
Change-Id: I43f9dc63a1941345a7ef55bfecd8bb38f652208e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148207
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
Tested-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 0cf38a652bec..efa16ce22797 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -47,6 +47,7 @@
#include <SwStyleNameMapper.hxx>
#include <sfx2/filedlghelper.hxx>
#include <sfx2/frame.hxx>
+#include <comphelper/lok.hxx>
#include <svx/svxdlg.hxx>
#include <svx/flagsdef.hxx>
@@ -167,7 +168,10 @@ SwCharURLPage::SwCharURLPage(weld::Container* pPage,
weld::DialogController* pCo
m_xCharStyleContainer->hide();
}
- m_xURLPB->connect_clicked(LINK( this, SwCharURLPage, InsertFileHdl));
+ if(comphelper::LibreOfficeKit::isActive())
+ m_xURLPB->hide(); // Hide browse button in online (not supported yet)
+ else
+ m_xURLPB->connect_clicked(LINK( this, SwCharURLPage, InsertFileHdl));
m_xEventPB->connect_clicked(LINK( this, SwCharURLPage, EventHdl));
SwView *pView = ::GetActiveView();
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 3f1abace986e..5e95b1291d57 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -34,12 +34,22 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
}
if (// cui
- rUIFile == u"cui/ui/formatnumberdialog.ui"
+ rUIFile == u"cui/ui/areatabpage.ui"
+ || rUIFile == u"cui/ui/borderpage.ui"
+ || rUIFile == u"cui/ui/charnamepage.ui"
+ || rUIFile == u"cui/ui/colorpage.ui"
+ || rUIFile == u"cui/ui/effectspage.ui"
+ || rUIFile == u"cui/ui/eventassigndialog.ui"
+ || rUIFile == u"cui/ui/fontfeaturesdialog.ui"
+ || rUIFile == u"cui/ui/formatnumberdialog.ui"
|| rUIFile == u"cui/ui/macroselectordialog.ui"
|| rUIFile == u"cui/ui/numberingformatpage.ui"
|| rUIFile == u"cui/ui/password.ui"
+ || rUIFile == u"cui/ui/positionpage.ui"
+ || rUIFile == u"cui/ui/queryduplicatedialog.ui"
|| rUIFile == u"cui/ui/similaritysearchdialog.ui"
|| rUIFile == u"cui/ui/splitcellsdialog.ui"
+ || rUIFile == u"cui/ui/twolinespage.ui"
|| rUIFile == u"cui/ui/widgettestdialog.ui"
// scalc
|| rUIFile == u"modules/scalc/ui/analysisofvariancedialog.ui"
@@ -73,6 +83,8 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"modules/scalc/ui/ztestdialog.ui"
// swriter
|| 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/contentcontroldlg.ui"
|| rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui"
|| rUIFile == u"modules/swriter/ui/dropdownfielddialog.ui"
