ditch the font/screen-scaling thing

its of limited utility wrt the vcl layout work and optimal size widgets,
and its confuses people looking for hidpi settings

Change-Id: I37d21b480446f9fe2845b3a2d9fd59cdeddf1a93

3 files changed, 10 insertions, 53 deletions

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index bba62a3cf18f..1f6019fc98ba 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -619,7 +619,6 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     , mpDrawinglayerOpt(new SvtOptionsDrawinglayer)
     , mpOpenGLConfig(new svt::OpenGLCfg)
 {
-    get(m_pWindowSizeMF, "windowsize");
     get(m_pIconSizeLB, "iconsize");
     get(m_pSidebarIconSizeLB, "sidebariconsize");
     get(m_pIconStyleLB, "iconstyle");
@@ -701,7 +700,6 @@ void OfaViewTabPage::dispose()
     pCanvasSettings = nullptr;
     delete pAppearanceCfg;
     pAppearanceCfg = nullptr;
-    m_pWindowSizeMF.clear();
     m_pIconSizeLB.clear();
     m_pSidebarIconSizeLB.clear();
     m_pIconStyleLB.clear();
@@ -795,17 +793,6 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
 
     bool bAppearanceChanged = false;
 
-
-    // Screen Scaling
-    sal_uInt16 nOldScale = pAppearanceCfg->GetScaleFactor();
-    sal_uInt16 nNewScale = (sal_uInt16)m_pWindowSizeMF->GetValue();
-
-    if ( nNewScale != nOldScale )
-    {
-        pAppearanceCfg->SetScaleFactor(nNewScale);
-        bAppearanceChanged = true;
-    }
-
     // Mouse Snap Mode
     SnapType eOldSnap = pAppearanceCfg->GetSnapMode();
     SnapType eNewSnap = (SnapType)m_pMousePosLB->GetSelectEntryPos();
@@ -941,8 +928,6 @@ void OfaViewTabPage::Reset( const SfxItemSet* )
     m_pIconStyleLB->SelectEntryPos( nStyleLB_InitialSelection );
     m_pIconStyleLB->SaveValue();
 
-    // Screen Scaling
-    m_pWindowSizeMF->SetValue ( pAppearanceCfg->GetScaleFactor() );
     // Mouse Snap
     m_pMousePosLB->SelectEntryPos((sal_Int32)pAppearanceCfg->GetSnapMode());
     m_pMousePosLB->SaveValue();
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 60df261b5de9..89d76b497f6b 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -79,7 +79,6 @@ class SvtTabAppearanceCfg;
 class OfaViewTabPage : public SfxTabPage
 {
 private:
-    VclPtr<MetricField>    m_pWindowSizeMF;
     VclPtr<ListBox>        m_pIconSizeLB;
     VclPtr<ListBox>        m_pSidebarIconSizeLB;
     VclPtr<ListBox>        m_pIconStyleLB;
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index 537853cd37d3..deca7251f5a9 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.19.0 -->
+<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -306,33 +306,6 @@
                         <property name="row_spacing">6</property>
                         <property name="column_spacing">12</property>
                         <child>
-                          <object class="GtkLabel" id="label7">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="halign">end</property>
-                            <property name="label" translatable="yes">Sc_aling:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">windowsize:0%</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="windowsize:0%">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="halign">start</property>
-                            <property name="invisible_char">•</property>
-                            <property name="adjustment">adjustment1</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
                           <object class="GtkLabel" id="label8">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -343,7 +316,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
+                            <property name="top_attach">0</property>
                           </packing>
                         </child>
                         <child>
@@ -367,7 +340,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="top_attach">3</property>
+                            <property name="top_attach">2</property>
                           </packing>
                         </child>
                         <child>
@@ -382,7 +355,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
+                            <property name="top_attach">0</property>
                           </packing>
                         </child>
                         <child>
@@ -396,7 +369,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">3</property>
+                            <property name="top_attach">2</property>
                           </packing>
                         </child>
                         <child>
@@ -411,7 +384,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">4</property>
+                            <property name="top_attach">3</property>
                             <property name="width">2</property>
                           </packing>
                         </child>
@@ -426,7 +399,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">5</property>
+                            <property name="top_attach">4</property>
                           </packing>
                         </child>
                         <child>
@@ -439,7 +412,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="top_attach">5</property>
+                            <property name="top_attach">4</property>
                           </packing>
                         </child>
                         <child>
@@ -453,7 +426,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">2</property>
+                            <property name="top_attach">1</property>
                           </packing>
                         </child>
                         <child>
@@ -468,7 +441,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="top_attach">2</property>
+                            <property name="top_attach">1</property>
                           </packing>
                         </child>
                       </object>