summaryrefslogtreecommitdiff
path: root/cui/source
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2021-05-30 11:37:19 +0200
committerCaolán McNamara <caolanm@redhat.com>2021-05-30 17:49:49 +0200
commit3fc89330a976cb2221a579ccc6d7230b9d20691b (patch)
tree7ca0eb617da1fadbf0a7dc39bacc920757c4845d /cui/source
parent33cacd2f3e06921e0d4d591b93febecc4afd4fbb (diff)
Drop GtkSalPrinter bits from option dialog
After commit ed07ec7606cb24cccaf6b7b81b2bd308debaa2e6 ("drop never completed GtkSalPrinter"), there is still the experimental option left, depending on ENABLE_GTK3. We can't drop the whole PrinterCapType::ExternalDialog, because the osx code actually uses it. Change-Id: Ibc4654d8c1ce1de7ee1c9dc7700bb8775af2f678 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116408 Tested-by: Jenkins Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui/source')
-rw-r--r--cui/source/options/optgdlg.cxx22
-rw-r--r--cui/source/options/optgdlg.hxx1
2 files changed, 0 insertions, 23 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index a4cf97811e75..fd79d34926f1 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -18,7 +18,6 @@
*/
#include <config_features.h>
-#include <config_vclplug.h>
#include <svl/zforlist.hxx>
#include <svl/currencytable.hxx>
#include <svtools/langhelp.hxx>
@@ -155,7 +154,6 @@ OfaMiscTabPage::OfaMiscTabPage(weld::Container* pPage, weld::DialogController* p
, m_xPopUpNoHelpCB(m_xBuilder->weld_check_button("popupnohelp"))
, m_xShowTipOfTheDay(m_xBuilder->weld_check_button("cbShowTipOfTheDay"))
, m_xFileDlgFrame(m_xBuilder->weld_widget("filedlgframe"))
- , m_xPrintDlgFrame(m_xBuilder->weld_widget("printdlgframe"))
, m_xFileDlgROImage(m_xBuilder->weld_widget("lockimage"))
, m_xFileDlgCB(m_xBuilder->weld_check_button("filedlg"))
, m_xPrintDlgCB(m_xBuilder->weld_check_button("printdlg"))
@@ -185,15 +183,6 @@ OfaMiscTabPage::OfaMiscTabPage(weld::Container* pPage, weld::DialogController* p
m_xFileDlgCB->set_sensitive(false);
}
-#if !ENABLE_GTK3
- m_xPrintDlgFrame->hide();
-#else
- if (!officecfg::Office::Common::Misc::ExperimentalMode::get())
- {
- m_xPrintDlgFrame->hide();
- }
-#endif
-
m_xQuickLaunchCB->show();
//Only available in Win or if building the gtk systray
@@ -248,15 +237,6 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
bModified = true;
}
- if ( m_xPrintDlgCB->get_state_changed_from_saved() )
- {
- std::shared_ptr< comphelper::ConfigurationChanges > xChanges(
- comphelper::ConfigurationChanges::create());
- officecfg::Office::Common::Misc::UseSystemPrintDialog::set( !m_xPrintDlgCB->get_active(), xChanges );
- xChanges->commit();
- bModified = true;
- }
-
if (m_xDocStatusCB->get_state_changed_from_saved())
{
officecfg::Office::Common::Print::PrintingModifiesDocument::set(m_xDocStatusCB->get_active(), batch);
@@ -316,8 +296,6 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
m_xShowTipOfTheDay->save_state();
m_xFileDlgCB->set_active( !officecfg::Office::Common::Misc::UseSystemFileDialog::get() );
m_xFileDlgCB->save_state();
- m_xPrintDlgCB->set_active( !officecfg::Office::Common::Misc::UseSystemPrintDialog::get() );
- m_xPrintDlgCB->save_state();
m_xDocStatusCB->set_active(officecfg::Office::Common::Print::PrintingModifiesDocument::get());
m_xDocStatusCB->save_state();
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 183ef409e2ca..1bd92980b1d5 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -37,7 +37,6 @@ private:
std::unique_ptr<weld::CheckButton> m_xPopUpNoHelpCB;
std::unique_ptr<weld::CheckButton> m_xShowTipOfTheDay;
std::unique_ptr<weld::Widget> m_xFileDlgFrame;
- std::unique_ptr<weld::Widget> m_xPrintDlgFrame;
std::unique_ptr<weld::Widget> m_xFileDlgROImage;
std::unique_ptr<weld::CheckButton> m_xFileDlgCB;
std::unique_ptr<weld::CheckButton> m_xPrintDlgCB;