diff options
author | Heiko Tietze <tietze.heiko@gmail.com> | 2022-09-13 14:38:51 +0200 |
---|---|---|
committer | Heiko Tietze <heiko.tietze@documentfoundation.org> | 2022-10-06 18:55:20 +0200 |
commit | 27f98935f9207465186da96c85467f3c005662a6 (patch) | |
tree | 2f185eebd492b7a9d7902ef24240d917fcffdcdb /sd | |
parent | d6a5214c70b82df5cef3cbac87a255c7f56b6726 (diff) |
[API CHANGE] Resolves tdf#131136 - Remove option "Use printer metrics"
Option is out-dated and access via UI confusing
* UI access removed from Tools > Options > General (Impress, Calc)
resp. > Compatibility (Writer)
* Unit tests updated
* Tip-Of-The-Day cleaned-up
* remove UsePrtMetrics value
Change-Id: Ib645f6e1f648455e0536a437be14c2c6a7b25a49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139863
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/dlg/tpoption.cxx | 9 | ||||
-rw-r--r-- | sd/source/ui/inc/tpoption.hxx | 1 | ||||
-rw-r--r-- | sd/uiconfig/simpress/ui/optimpressgeneralpage.ui | 25 |
3 files changed, 3 insertions, 32 deletions
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 0c534682de13..8c1408de0b57 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -186,7 +186,6 @@ SdTpOptionsMisc::SdTpOptionsMisc(weld::Container* pPage, weld::DialogController* , m_xMtrFldTabstop(m_xBuilder->weld_metric_spin_button("metricFields", FieldUnit::MM)) , m_xCbxEnableSdremote(m_xBuilder->weld_check_button("enremotcont")) , m_xCbxEnablePresenterScreen(m_xBuilder->weld_check_button("enprsntcons")) - , m_xCbxUsePrinterMetrics(m_xBuilder->weld_check_button("printermetrics")) , m_xCbxCompatibility(m_xBuilder->weld_check_button("cbCompatibility")) , m_xScaleFrame(m_xBuilder->weld_frame("scaleframe")) , m_xCbScale(m_xBuilder->weld_combo_box("scaleBox")) @@ -339,7 +338,6 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs ) m_xCbxEnableSdremote->get_state_changed_from_saved() || m_xCbxEnablePresenterScreen->get_state_changed_from_saved() || m_xCbxCompatibility->get_state_changed_from_saved() || - m_xCbxUsePrinterMetrics->get_state_changed_from_saved() || m_xCbxDistort->get_state_changed_from_saved()) { SdOptionsMiscItem aOptsItem; @@ -353,10 +351,6 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs ) aOptsItem.GetOptionsMisc().SetEnableSdremote( m_xCbxEnableSdremote->get_active() ); aOptsItem.GetOptionsMisc().SetEnablePresenterScreen( m_xCbxEnablePresenterScreen->get_active() ); aOptsItem.GetOptionsMisc().SetSummationOfParagraphs( m_xCbxCompatibility->get_active() ); - aOptsItem.GetOptionsMisc().SetPrinterIndependentLayout ( - m_xCbxUsePrinterMetrics->get_active() - ? css::document::PrinterIndependentLayout::DISABLED - : css::document::PrinterIndependentLayout::ENABLED); aOptsItem.GetOptionsMisc().SetCrookNoContortion( m_xCbxDistort->get_active() ); rAttrs->Put( aOptsItem ); @@ -406,7 +400,6 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs ) m_xCbxEnableSdremote->set_active( aOptsItem.GetOptionsMisc().IsEnableSdremote() ); m_xCbxEnablePresenterScreen->set_active( aOptsItem.GetOptionsMisc().IsEnablePresenterScreen() ); m_xCbxCompatibility->set_active( aOptsItem.GetOptionsMisc().IsSummationOfParagraphs() ); - m_xCbxUsePrinterMetrics->set_active( aOptsItem.GetOptionsMisc().GetPrinterIndependentLayout()==1 ); m_xCbxDistort->set_active( aOptsItem.GetOptionsMisc().IsCrookNoContortion() ); m_xCbxStartWithTemplate->save_state(); m_xCbxMarkedHitMovesAlways->save_state(); @@ -418,7 +411,6 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs ) m_xCbxEnableSdremote->save_state(); m_xCbxEnablePresenterScreen->save_state(); m_xCbxCompatibility->save_state(); - m_xCbxUsePrinterMetrics->save_state(); m_xCbxDistort->save_state(); // metric @@ -599,7 +591,6 @@ void SdTpOptionsMisc::UpdateCompatibilityControls() } m_xCbxCompatibility->set_sensitive(bIsEnabled); - m_xCbxUsePrinterMetrics->set_sensitive(bIsEnabled); } void SdTpOptionsMisc::PageCreated(const SfxAllItemSet& aSet) diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index 8657db27a243..d0f010a26332 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -88,7 +88,6 @@ private: std::unique_ptr<weld::CheckButton> m_xCbxEnableSdremote; std::unique_ptr<weld::CheckButton> m_xCbxEnablePresenterScreen; - std::unique_ptr<weld::CheckButton> m_xCbxUsePrinterMetrics; std::unique_ptr<weld::CheckButton> m_xCbxCompatibility; //Scale diff --git a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui index 2a944eac2fbe..449248536fb9 100644 --- a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui +++ b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.38.2 --> +<!-- Generated with glade 3.40.0 --> <interface domain="sd"> <requires lib="gtk+" version="3.20"/> <object class="GtkAdjustment" id="adjustment1"> @@ -169,7 +169,7 @@ <property name="label-xalign">0</property> <property name="shadow-type">none</property> <child> - <!-- n-columns=1 n-rows=2 --> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="grid6"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -178,25 +178,6 @@ <property name="row-spacing">6</property> <property name="column-spacing">12</property> <child> - <object class="GtkCheckButton" id="printermetrics"> - <property name="label" translatable="yes" context="optimpressgeneralpage|printermetrics">Us_e printer metrics for document formatting</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="draw-indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="printermetrics-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|printermetrics">Specifies that printer metrics are applied for printing and also for formatting the display on the screen. If this box is not checked, a printer independent layout will be used for screen display and printing.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> <object class="GtkCheckButton" id="cbCompatibility"> <property name="label" translatable="yes" context="optimpressgeneralpage|cbCompatibility">Add _spacing between paragraphs and tables</property> <property name="visible">True</property> @@ -212,7 +193,7 @@ </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">1</property> + <property name="top-attach">0</property> </packing> </child> </object> |