cui/source/options/optlingu.cxx | 14 -------------- cui/uiconfig/ui/editmodulesdialog.ui | 16 ---------------- cui/uiconfig/ui/optlingupage.ui | 17 ----------------- include/sfx2/templatedlg.hxx | 1 - sfx2/source/doc/templatedlg.cxx | 3 --- sfx2/uiconfig/ui/templatedlg.ui | 16 ---------------- 6 files changed, 67 deletions(-)
New commits: commit 91998c71c4604daf14ab5fad53eb838192c83312 Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Thu Jan 20 17:12:32 2022 +0100 Commit: Thorsten Behrens <[email protected]> CommitDate: Mon Jan 24 10:22:15 2022 +0100 Remove external link from spell check options Change-Id: Ifb998eb3fc150109bda7b1293a6148310d22b7ca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128695 Tested-by: Thorsten Behrens <[email protected]> Reviewed-by: Thorsten Behrens <[email protected]> diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 419b93b9d1bd..073a856f73ef 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -837,7 +837,6 @@ SvxLinguTabPage::SvxLinguTabPage(weld::Container* pPage, weld::DialogController* , m_xLinguDicsDelPB(m_xBuilder->weld_button("lingudictsdelete")) , m_xLinguOptionsCLB(m_xBuilder->weld_tree_view("linguoptions")) , m_xLinguOptionsEditPB(m_xBuilder->weld_button("linguoptionsedit")) - , m_xMoreDictsLink(m_xBuilder->weld_link_button("moredictslink")) { std::vector<int> aWidths; aWidths.push_back(m_xLinguModulesCLB->get_checkbox_column_width()); @@ -863,9 +862,6 @@ 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)); - if ( SvtExtendedSecurityOptions().GetOpenHyperlinkMode() == SvtExtendedSecurityOptions::OPEN_NEVER ) - m_xMoreDictsLink->hide(); - xProp = LinguMgr::GetLinguPropertySet(); xDicList.set( LinguMgr::GetDictionaryList(), UNO_QUERY ); if (xDicList.is()) @@ -1521,12 +1517,6 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp ) m_xLinguModulesFT->hide(); m_xLinguModulesCLB->hide(); m_xLinguModulesEditPB->hide(); - - if ( SvtExtendedSecurityOptions().GetOpenHyperlinkMode() - != SvtExtendedSecurityOptions::OPEN_NEVER ) - { - m_xMoreDictsLink->show(); - } } } @@ -1541,7 +1531,6 @@ SvxEditModulesDlg::SvxEditModulesDlg(weld::Window* pParent, SvxLinguData_Impl& r , m_xPrioUpPB(m_xBuilder->weld_button("up")) , m_xPrioDownPB(m_xBuilder->weld_button("down")) , m_xBackPB(m_xBuilder->weld_button("back")) - , m_xMoreDictsLink(m_xBuilder->weld_link_button("moredictslink")) , m_xClosePB(m_xBuilder->weld_button("close")) , m_xLanguageLB(new SvxLanguageBox(m_xBuilder->weld_combo_box("language"))) { @@ -1565,9 +1554,6 @@ SvxEditModulesDlg::SvxEditModulesDlg(weld::Window* pParent, SvxLinguData_Impl& r m_xPrioUpPB->set_sensitive( false ); m_xPrioDownPB->set_sensitive( false ); - if ( SvtExtendedSecurityOptions().GetOpenHyperlinkMode() == SvtExtendedSecurityOptions::OPEN_NEVER ) - m_xMoreDictsLink->hide(); - // set that we want the checkbox shown if spellchecking is available m_xLanguageLB->SetLanguageList(SvxLanguageListFlags::EMPTY, false, false, true); diff --git a/cui/uiconfig/ui/editmodulesdialog.ui b/cui/uiconfig/ui/editmodulesdialog.ui index 77b8af666236..23ab7e81cdff 100644 --- a/cui/uiconfig/ui/editmodulesdialog.ui +++ b/cui/uiconfig/ui/editmodulesdialog.ui @@ -110,22 +110,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="row_spacing">12</property> - <child> - <object class="GtkLinkButton" id="moredictslink"> - <property name="label" translatable="yes" context="editmodulesdialog|moredictslink">Get more dictionaries online...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="has_tooltip">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> - <property name="top_attach">2</property> - </packing> - </child> <child> <object class="GtkBox" id="box1"> <property name="visible">True</property> diff --git a/cui/uiconfig/ui/optlingupage.ui b/cui/uiconfig/ui/optlingupage.ui index 114bfde51ca2..954813abedaa 100644 --- a/cui/uiconfig/ui/optlingupage.ui +++ b/cui/uiconfig/ui/optlingupage.ui @@ -360,23 +360,6 @@ <property name="vexpand">True</property> <property name="row_spacing">3</property> <property name="column_spacing">12</property> - <child> - <object class="GtkLinkButton" id="moredictslink"> - <property name="label" translatable="yes" context="optlingupage|moredictslink">Get more dictionaries online...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="has_tooltip">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> - <property name="top_attach">1</property> - <property name="width">2</property> - </packing> - </child> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> commit 1e94ab8a1a9d710451a41a2bc1dd3b62acf1f407 Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Thu Jan 20 17:06:06 2022 +0100 Commit: Thorsten Behrens <[email protected]> CommitDate: Mon Jan 24 10:22:04 2022 +0100 Remove external links from template dialog Change-Id: I8b8e00c16d06207c93dcd9dd0e013ea9ded4a400 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128694 Tested-by: Thorsten Behrens <[email protected]> Reviewed-by: Thorsten Behrens <[email protected]> diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index ad910e2dd664..84f4a5c1b20a 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -130,7 +130,6 @@ protected: std::unique_ptr<weld::Button> mxMoveButton; std::unique_ptr<weld::Button> mxExportButton; std::unique_ptr<weld::Button> mxImportButton; - std::unique_ptr<weld::Button> mxLinkButton; std::unique_ptr<weld::CheckButton> mxCBXHideDlg; std::unique_ptr<weld::MenuButton> mxActionBar; std::unique_ptr<TemplateSearchView> mxSearchView; diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 90c8c4dda017..5940792599a5 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -161,7 +161,6 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(weld::Window *pParent) , mxMoveButton(m_xBuilder->weld_button("move_btn")) , mxExportButton(m_xBuilder->weld_button("export_btn")) , mxImportButton(m_xBuilder->weld_button("import_btn")) - , mxLinkButton(m_xBuilder->weld_button("online_link")) , mxCBXHideDlg(m_xBuilder->weld_check_button("hidedialogcb")) , mxActionBar(m_xBuilder->weld_menu_button("action_menu")) , mxSearchView(new TemplateSearchView(m_xBuilder->weld_scrolled_window("scrollsearch"), @@ -214,7 +213,6 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(weld::Window *pParent) mxMoveButton->connect_clicked(LINK(this, SfxTemplateManagerDlg, MoveClickHdl)); mxExportButton->connect_clicked(LINK(this, SfxTemplateManagerDlg, ExportClickHdl)); mxImportButton->connect_clicked(LINK(this, SfxTemplateManagerDlg, ImportClickHdl)); - mxLinkButton->connect_clicked(LINK(this, SfxTemplateManagerDlg, LinkClickHdl)); mxSearchFilter->connect_changed(LINK(this, SfxTemplateManagerDlg, SearchUpdateHdl)); mxSearchFilter->connect_focus_in(LINK( this, SfxTemplateManagerDlg, GetFocusHdl )); @@ -1360,7 +1358,6 @@ SfxTemplateSelectionDlg::SfxTemplateSelectionDlg(weld::Window* pParent) mxCBApp->set_sensitive(false); mxActionBar->hide(); - mxLinkButton->hide(); mxMoveButton->hide(); mxExportButton->hide(); mxCBXHideDlg->show(); diff --git a/sfx2/uiconfig/ui/templatedlg.ui b/sfx2/uiconfig/ui/templatedlg.ui index 4008332ca4a4..19a9abf74d3a 100644 --- a/sfx2/uiconfig/ui/templatedlg.ui +++ b/sfx2/uiconfig/ui/templatedlg.ui @@ -353,22 +353,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="online_link"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="templatedlg|online_link|tooltip_text">Browse online templates</property> - <property name="image">image5</property> - <property name="relief">none</property> - <property name="always_show_image">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> <child> <object class="GtkCheckButton" id="hidedialogcb"> <property name="label" translatable="yes" context="templatedlg|hidedialogcb">Show this dialog at startup</property>
