diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2020-12-18 20:01:58 +0100 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2020-12-19 09:52:31 +0100 |
commit | 746da2e47d92c9de4d6bcec22155c34cece5c331 (patch) | |
tree | 1db749bdf8d5b4262faddc1618a30b138c83f128 | |
parent | 817c22456408b3d8af022be85c9734989604deb5 (diff) |
Related tdf#138715: kill last Mork refs
Change-Id: Id655f533a6957257329f9c1f9e4c082516e149f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107978
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
-rw-r--r-- | bin/find-can-be-private-symbols.classes.results | 1 | ||||
-rw-r--r-- | compilerplugins/clang/unusedenumconstants.readonly.results | 2 | ||||
-rw-r--r-- | extensions/source/abpilot/abspilot.cxx | 5 | ||||
-rw-r--r-- | extensions/source/abpilot/addresssettings.hxx | 1 | ||||
-rw-r--r-- | extensions/source/abpilot/datasourcehandling.cxx | 7 | ||||
-rw-r--r-- | extensions/source/abpilot/datasourcehandling.hxx | 3 | ||||
-rw-r--r-- | extensions/source/abpilot/typeselectionpage.cxx | 5 | ||||
-rw-r--r-- | extensions/source/abpilot/typeselectionpage.hxx | 1 | ||||
-rw-r--r-- | extensions/uiconfig/sabpilot/ui/selecttypepage.ui | 21 |
9 files changed, 2 insertions, 44 deletions
diff --git a/bin/find-can-be-private-symbols.classes.results b/bin/find-can-be-private-symbols.classes.results index 9cd21a2986ca..fa75e6edb01b 100644 --- a/bin/find-can-be-private-symbols.classes.results +++ b/bin/find-can-be-private-symbols.classes.results @@ -41,7 +41,6 @@ IndexerPreProcessor KeyListenerMultiplexer MetaAction MetaGradientExAction -MorkParser MouseListenerMultiplexer MouseMotionListenerMultiplexer MyThes diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results b/compilerplugins/clang/unusedenumconstants.readonly.results index 4f7e508b38ff..085974a05544 100644 --- a/compilerplugins/clang/unusedenumconstants.readonly.results +++ b/compilerplugins/clang/unusedenumconstants.readonly.results @@ -236,8 +236,6 @@ emfio/inc/mtftools.hxx:48 enum emfio::BkMode Transparent emfio/inc/mtftools.hxx:82 enum emfio::WMFRasterOp Nop -extensions/source/abpilot/addresssettings.hxx:31 - enum abp::AddressSourceType AST_MORK framework/inc/xml/imagesdocumenthandler.hxx:40 enum framework::OReadImagesDocumentHandler::Image_XML_Entry IMG_ELEMENT_IMAGECONTAINER framework/inc/xml/imagesdocumenthandler.hxx:41 diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index 11376effb3a9..fee75664d983 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -276,7 +276,6 @@ namespace abp const char* pGuess = nullptr; switch ( getSettings().eType ) { - case AST_MORK : case AST_THUNDERBIRD : pGuess = "Personal Address book"; break; case AST_EVOLUTION : case AST_EVOLUTION_GROUPWISE: @@ -314,10 +313,6 @@ namespace abp switch (m_aSettings.eType) { - case AST_MORK: - m_aNewDataSource = aContext.createNewMORK( m_aSettings.sDataSourceName ); - break; - case AST_THUNDERBIRD: m_aNewDataSource = aContext.createNewThunderbird( m_aSettings.sDataSourceName ); break; diff --git a/extensions/source/abpilot/addresssettings.hxx b/extensions/source/abpilot/addresssettings.hxx index 63f0df25eaed..542a2fe67e87 100644 --- a/extensions/source/abpilot/addresssettings.hxx +++ b/extensions/source/abpilot/addresssettings.hxx @@ -28,7 +28,6 @@ namespace abp enum AddressSourceType { - AST_MORK, AST_THUNDERBIRD, AST_EVOLUTION, AST_EVOLUTION_GROUPWISE, diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index 73795a3939ad..ceb5e90f2515 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -242,13 +242,6 @@ namespace abp _rNames = m_pImpl->aDataSourceNames; } - - ODataSource ODataSourceContext::createNewMORK( const OUString& _rName) - { - return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:mozilla" ); - } - - ODataSource ODataSourceContext::createNewThunderbird( const OUString& _rName ) { return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:thunderbird" ); diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx index 6f2b96eef68b..4f8a0cbc28d7 100644 --- a/extensions/source/abpilot/datasourcehandling.hxx +++ b/extensions/source/abpilot/datasourcehandling.hxx @@ -58,9 +58,6 @@ namespace abp /// disambiguates the given name by appending successive numbers void disambiguate(OUString& _rDataSourceName); - /// creates a new MORK data source - ODataSource createNewMORK( const OUString& _rName ); - /// creates a new Thunderbird data source ODataSource createNewThunderbird( const OUString& _rName ); diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx index 6b58097ab0b3..6e923b00aff6 100644 --- a/extensions/source/abpilot/typeselectionpage.cxx +++ b/extensions/source/abpilot/typeselectionpage.cxx @@ -36,14 +36,13 @@ namespace abp , m_xEvolution(m_xBuilder->weld_radio_button("evolution")) , m_xEvolutionGroupwise(m_xBuilder->weld_radio_button("groupwise")) , m_xEvolutionLdap(m_xBuilder->weld_radio_button("evoldap")) - , m_xMORK(m_xBuilder->weld_radio_button("firefox")) , m_xThunderbird(m_xBuilder->weld_radio_button("thunderbird")) , m_xKab(m_xBuilder->weld_radio_button("kde")) , m_xMacab(m_xBuilder->weld_radio_button("macosx")) , m_xOther(m_xBuilder->weld_radio_button("other")) { //TODO: For now, try to keep offering the same choices like before the - // Mozilla/MORK cleanup, even if the status of what driver actually + // Mozilla cleanup, even if the status of what driver actually // provides which functionality is somewhat unclear, see the discussions // of fdo#57285 "Address Book Data Source Wizard lists 'macOS address // book' on Linux" and fdo#57322 "Moz-free LDAP Address Book driver." @@ -59,7 +58,7 @@ namespace abp // - OTHER // // On Windows: - // - MORK, THUNDERBIRD + // - THUNDERBIRD // - OTHER #if !defined(_WIN32) diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx index 2ee3a31a4cc7..9caaeb8e1c4e 100644 --- a/extensions/source/abpilot/typeselectionpage.hxx +++ b/extensions/source/abpilot/typeselectionpage.hxx @@ -31,7 +31,6 @@ namespace abp std::unique_ptr<weld::RadioButton> m_xEvolution; std::unique_ptr<weld::RadioButton> m_xEvolutionGroupwise; std::unique_ptr<weld::RadioButton> m_xEvolutionLdap; - std::unique_ptr<weld::RadioButton> m_xMORK; std::unique_ptr<weld::RadioButton> m_xThunderbird; std::unique_ptr<weld::RadioButton> m_xKab; std::unique_ptr<weld::RadioButton> m_xMacab; diff --git a/extensions/uiconfig/sabpilot/ui/selecttypepage.ui b/extensions/uiconfig/sabpilot/ui/selecttypepage.ui index bd47ababf712..490ea7036297 100644 --- a/extensions/uiconfig/sabpilot/ui/selecttypepage.ui +++ b/extensions/uiconfig/sabpilot/ui/selecttypepage.ui @@ -101,27 +101,6 @@ This wizard helps you create the data source.</property> </packing> </child> <child> - <object class="GtkRadioButton" id="firefox"> - <property name="label" translatable="yes" context="selecttypepage|firefox">Firefox</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">evolution</property> - <child internal-child="accessible"> - <object class="AtkObject" id="firefox-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="selecttypepage|extended_tip|firefox">Select this option if you already use an address book in Firefox or Iceweasel.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> <object class="GtkRadioButton" id="thunderbird"> <property name="label" translatable="yes" context="selecttypepage|thunderbird">Thunderbird</property> <property name="visible">True</property> |