[Libreoffice-commits] core.git: cui/source cui/uiconfig instsetoo_native/util officecfg/registry postprocess/CustomTarget_registry.mk sfx2/source
Heiko Tietze (via logerrit)
logerrit at kemper.freedesktop.org
Mon Oct 12 15:06:19 UTC 2020
cui/source/inc/optlingu.hxx | 2
cui/source/options/optlingu.cxx | 15 ++++++
cui/uiconfig/ui/optlingupage.ui | 7 +--
instsetoo_native/util/openoffice.lst.README | 3 -
instsetoo_native/util/openoffice.lst.in | 4 -
officecfg/registry/data/org/openoffice/Office/Common.xcu | 5 --
postprocess/CustomTarget_registry.mk | 1
sfx2/source/appl/appserv.cxx | 33 ++-------------
8 files changed, 25 insertions(+), 45 deletions(-)
New commits:
commit acb1c390539730957fb509f18f469fc7f6133082
Author: Heiko Tietze <tietze.heiko at gmail.com>
AuthorDate: Thu Oct 1 15:44:32 2020 +0200
Commit: Heiko Tietze <heiko.tietze at documentfoundation.org>
CommitDate: Mon Oct 12 17:05:42 2020 +0200
Resolves tdf#137187 - More dictionaries via extensions dialog
UNO command and linkbutton interaction replaced with the internal dialog
DICT_REPO_URL removed, README adjusted
Change-Id: I401737b538da229ac0d432007e7564105672ff40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103769
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 6edc093cb169..365acfbbb0fb 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -66,6 +66,7 @@ class SvxEditModulesDlg : public weld::GenericDialogController
DECL_LINK( BackHdl_Impl, weld::Button&, void );
DECL_LINK( LangSelectListBoxHdl_Impl, weld::ComboBox&, void );
DECL_LINK( BoxCheckButtonHdl_Impl, const weld::TreeView::iter_col&, void );
+ DECL_STATIC_LINK( SvxEditModulesDlg, OnLinkClick, weld::LinkButton&, bool);
void LangSelectHdl_Impl(const SvxLanguageBox* pBox);
public:
@@ -128,6 +129,7 @@ private:
DECL_LINK( ModulesBoxCheckButtonHdl_Impl, const weld::TreeView::iter_col&, void );
DECL_LINK( DicsBoxCheckButtonHdl_Impl, const weld::TreeView::iter_col&, void );
DECL_LINK( PostDblClickHdl_Impl, void *, void);
+ DECL_STATIC_LINK( SvxLinguTabPage, OnLinkClick, weld::LinkButton&, bool);
void UpdateModulesBox_Impl();
void UpdateDicBox_Impl();
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 8d099ad0c884..09cdb0d9e1b5 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -30,6 +30,7 @@
#include <tools/debug.hxx>
#include <tools/urlobj.hxx>
#include <tools/diagnose_ex.h>
+#include <comphelper/dispatchcommand.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/linguistic2/LinguServiceManager.hpp>
#include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
@@ -871,6 +872,7 @@ SvxLinguTabPage::SvxLinguTabPage(weld::Container* pPage, weld::DialogController*
m_xLinguOptionsCLB->connect_changed( LINK( this, SvxLinguTabPage, SelectHdl_Impl ));
m_xLinguOptionsCLB->connect_row_activated(LINK(this, SvxLinguTabPage, BoxDoubleClickHdl_Impl));
+ m_xMoreDictsLink->connect_activate_link(LINK(this, SvxLinguTabPage, OnLinkClick));
if (officecfg::Office::Security::Hyperlinks::Open::get() == SvtExtendedSecurityOptions::OPEN_NEVER)
m_xMoreDictsLink->hide();
@@ -1535,6 +1537,12 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp )
}
}
+IMPL_STATIC_LINK_NOARG(SvxLinguTabPage, OnLinkClick, weld::LinkButton&, bool)
+{
+ comphelper::dispatchCommand(".uno:MoreDictionaries", {});
+ return true;
+}
+
SvxEditModulesDlg::SvxEditModulesDlg(weld::Window* pParent, SvxLinguData_Impl& rData)
: GenericDialogController(pParent, "cui/ui/editmodulesdialog.ui", "EditModulesDialog")
, sSpell(CuiResId(RID_SVXSTR_SPELL))
@@ -1568,6 +1576,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(weld::Window* pParent, SvxLinguData_Impl& r
m_xPrioUpPB->set_sensitive( false );
m_xPrioDownPB->set_sensitive( false );
+ m_xMoreDictsLink->connect_activate_link(LINK(this, SvxEditModulesDlg, OnLinkClick));
if (officecfg::Office::Security::Hyperlinks::Open::get() == SvtExtendedSecurityOptions::OPEN_NEVER)
m_xMoreDictsLink->hide();
@@ -1961,4 +1970,10 @@ IMPL_LINK_NOARG(SvxEditModulesDlg, BackHdl_Impl, weld::Button&, void)
LangSelectHdl_Impl(nullptr);
}
+IMPL_STATIC_LINK_NOARG(SvxEditModulesDlg, OnLinkClick, weld::LinkButton&, bool)
+{
+ comphelper::dispatchCommand(".uno:MoreDictionaries", {});
+ return true;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/uiconfig/ui/optlingupage.ui b/cui/uiconfig/ui/optlingupage.ui
index 3f574d3be664..8537e0d27d9e 100644
--- a/cui/uiconfig/ui/optlingupage.ui
+++ b/cui/uiconfig/ui/optlingupage.ui
@@ -106,7 +106,7 @@
<object class="GtkTreeViewColumn" id="treeviewcolumn4">
<property name="resizable">True</property>
<property name="spacing">6</property>
- <property name="alignment">0.50000000000000000000</property>
+ <property name="alignment">0,50000000000000000000</property>
<child>
<object class="GtkCellRendererToggle" id="cellrenderer5"/>
<attributes>
@@ -233,7 +233,7 @@
<object class="GtkTreeViewColumn" id="treeviewcolumn44">
<property name="resizable">True</property>
<property name="spacing">6</property>
- <property name="alignment">0.50000000000000000000</property>
+ <property name="alignment">0,50000000000000000000</property>
<child>
<object class="GtkCellRendererToggle" id="cellrenderer55"/>
<attributes>
@@ -390,7 +390,6 @@
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="xalign">0</property>
- <property name="uri">https://extensions.libreoffice.org/dictionaries/</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -423,7 +422,7 @@
<object class="GtkTreeViewColumn" id="treeviewcolumn444">
<property name="resizable">True</property>
<property name="spacing">6</property>
- <property name="alignment">0.50000000000000000000</property>
+ <property name="alignment">0,50000000000000000000</property>
<child>
<object class="GtkCellRendererToggle" id="cellrenderer555"/>
<attributes>
diff --git a/instsetoo_native/util/openoffice.lst.README b/instsetoo_native/util/openoffice.lst.README
index c87cef24f85f..9049c6100d19 100644
--- a/instsetoo_native/util/openoffice.lst.README
+++ b/instsetoo_native/util/openoffice.lst.README
@@ -35,9 +35,6 @@ STARTCENTER_ADDFEATURE_URL URL in start center to link to extension website
STARTCENTER_INFO_URL URL in start center to link to product homepage
STARTCENTER_TEMPLREP_URL URL in start center to link to templates website
-DICT_REPO_URL specifies a repository URL where users can
- download additional dictionaries
-
UPDATEURL URL for the application update functionality
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 758eaf0389f6..343cbfec2096 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -71,7 +71,6 @@ LibreOffice
STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/
STARTCENTER_INFO_URL https://www.libreoffice.org/
STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/
- DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/
}
active 1
compression 5
@@ -123,7 +122,6 @@ LibreOfficeDev
STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/
STARTCENTER_INFO_URL https://www.libreoffice.org/
STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/
- DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/
}
active 1
compression 5
@@ -164,7 +162,6 @@ LibreOffice_SDK
STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/
STARTCENTER_INFO_URL https://www.libreoffice.org/
STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/
- DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/
}
active 1
compression 5
@@ -209,7 +206,6 @@ LibreOfficeDev_SDK
STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/
STARTCENTER_INFO_URL https://www.libreoffice.org/
STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/
- DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/
}
active 1
compression 5
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 5ffefd05e419..2ae05c749fc6 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -49,11 +49,6 @@
<value install:module="wnt">WIN</value>
</prop>
</node>
- <node oor:name="Dictionaries">
- <prop oor:name="RepositoryURL">
- <value>${DICT_REPO_URL}</value>
- </prop>
- </node>
<node oor:name="VCL">
<prop oor:name="UseOpenGL" oor:type="xs:boolean">
<value install:module="macosx">false</value>
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 97db3e6fbdce..fd0f8d5a7377 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -557,7 +557,6 @@ $(foreach lang,$(gb_Configuration_LANGS),$(eval $(call postprocess_lang_deps,$(l
postprocess_main_SED := \
-e 's,$${ABOUTBOXPRODUCTVERSION},$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX),g' \
-e 's,$${ABOUTBOXPRODUCTVERSIONSUFFIX},$(LIBO_VERSION_SUFFIX_SUFFIX),g' \
- -e 's,$${DICT_REPO_URL},http://extensions.libreoffice.org/dictionaries/,g' \
-e 's,$${OOOVENDOR},$(if $(OOO_VENDOR),$(subst $(COMMA),\x2c,$(OOO_VENDOR)),The Document Foundation),g' \
-e 's,$${PRODUCTNAME},$(PRODUCTNAME),g' \
-e 's,$${PRODUCTVERSION},$(PRODUCTVERSION),g' \
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 4f6564dee9db..6e7ab0a96298 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -41,6 +41,7 @@
#include <com/sun/star/util/CloseVetoException.hpp>
#include <org/freedesktop/PackageKit/SyncDbusSessionHelper.hpp>
+#include <comphelper/dispatchcommand.hxx>
#include <comphelper/lok.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/processfactory.hxx>
@@ -1336,34 +1337,10 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
case SID_MORE_DICTIONARIES:
{
- try
- {
- uno::Reference< uno::XComponentContext > xContext =
- ::comphelper::getProcessComponentContext();
- uno::Reference< css::system::XSystemShellExecute > xSystemShell(
- css::system::SystemShellExecute::create(xContext) );
-
- // read repository URL from configuration
- OUString sTemplRepoURL(officecfg::Office::Common::Dictionaries::RepositoryURL::get());
-
- if ( xSystemShell.is() && !sTemplRepoURL.isEmpty() )
- {
- // read locale from configuration
- OUString sLocale(officecfg::Setup::L10N::ooLocale::get());
- if (sLocale.isEmpty())
- sLocale = "en-US";
-
- OUString aURLBuf = sTemplRepoURL + "?lang=" + sLocale;
- xSystemShell->execute(
- aURLBuf,
- OUString(),
- css::system::SystemShellExecuteFlags::URIS_ONLY );
- }
- }
- catch( const css::uno::Exception& )
- {
- TOOLS_WARN_EXCEPTION( "sfx.appl", "SfxApplication::OfaExec_Impl(SID_MORE_DICTIONARIES)" );
- }
+ uno::Sequence<beans::PropertyValue> aArgs(1);
+ aArgs[0].Name = "AdditionsTag";
+ aArgs[0].Value <<= OUString("Dictionary");
+ comphelper::dispatchCommand(".uno:AdditionsDialog", aArgs);
break;
}
#if HAVE_FEATURE_SCRIPTING
More information about the Libreoffice-commits
mailing list