[Libreoffice-commits] core.git: cui/source cui/uiconfig

[Julien Nabet]

 cui/source/options/optgdlg.cxx |   34 ----------------------------------
 cui/uiconfig/ui/optviewpage.ui |   16 ----------------
 2 files changed, 50 deletions(-)

New commits:
commit 324de04a408a77656a473cbfd2cc1ce77664b0c0
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Dec 5 13:21:36 2014 +0100

    Resolves fdo#87016 Kill "Use system font for user interface" for good
    
    Change-Id: Ica648d4a49ef4f36fdab557a98e7df9d31a3a240
    Reviewed-on: https://gerrit.libreoffice.org/13311
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index e68743d..e41c247 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -561,19 +561,6 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     get(m_pWindowSizeMF, "windowsize");
     get(m_pIconSizeLB, "iconsize");
     get(m_pIconStyleLB, "iconstyle");
-    get(m_pSystemFont, "systemfont");
-
-    VclContainer *pRef = get<VclContainer>("refgrid");
-    //fdo#65595, we need height-for-width support here, but for now we can
-    //bodge it
-    Size aPrefSize(m_pSystemFont->get_preferred_size());
-    Size aSize(pRef->get_preferred_size());
-    if (aPrefSize.Width() > aSize.Width())
-    {
-        aSize = m_pSystemFont->CalcMinimumSize(aSize.Width());
-        m_pSystemFont->set_width_request(aSize.Width());
-        m_pSystemFont->set_height_request(aSize.Height());
-    }
 
     get(m_pFontAntiAliasing, "aafont");
     get(m_pAAPointLimitLabel, "aafrom");
@@ -602,12 +589,6 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     // #i97672#
     m_pSelectionCB->SetToggleHdl( LINK( this, OfaViewTabPage, OnSelectionToggled ) );
 
-    if( ! Application::ValidateSystemFont() )
-    {
-        m_pSystemFont->Check(false);
-        m_pSystemFont->Enable(false);
-    }
-
     // Set known icon themes
     OUString sAutoStr( m_pIconStyleLB->GetEntry( 0 ) );
     m_pIconStyleLB->Clear();
@@ -826,21 +807,12 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
     }
 
     SvtAccessibilityOptions     aAccessibilityOptions;
-    if( aAccessibilityOptions.GetIsSystemFont() != m_pSystemFont->IsChecked() &&
-        m_pSystemFont->IsEnabled() )
-    {
-        aAccessibilityOptions.SetIsSystemFont( m_pSystemFont->IsChecked() );
-        bModified = true;
-        bMenuOptModified = true;
-    }
 
     if( bMenuOptModified )
     {
         // Set changed settings to the application instance
         AllSettings aAllSettings = Application::GetSettings();
         StyleSettings aStyleSettings = aAllSettings.GetStyleSettings();
-        if( m_pSystemFont->IsEnabled() )
-            aStyleSettings.SetUseSystemUIFonts( m_pSystemFont->IsChecked() );
         aAllSettings.SetStyleSettings(aStyleSettings);
         Application::MergeSystemSettings( aAllSettings );
         Application::SetSettings(aAllSettings);
@@ -888,12 +860,6 @@ void OfaViewTabPage::Reset( const SfxItemSet* )
     m_pIconStyleLB->SelectEntryPos( nStyleLB_InitialSelection );
     m_pIconStyleLB->SaveValue();
 
-    if( m_pSystemFont->IsEnabled() )
-    {
-        SvtAccessibilityOptions aAccessibilityOptions;
-        m_pSystemFont->Check( aAccessibilityOptions.GetIsSystemFont() );
-    }
-
     // Screen Scaling
     m_pWindowSizeMF->SetValue ( pAppearanceCfg->GetScaleFactor() );
     // Mouse Snap
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index a81d736..67105b9 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -428,22 +428,6 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="systemfont:wrap">
-                        <property name="label" translatable="yes">Use system _font for user interface</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="hexpand">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
-                    <child>
                       <object class="GtkCheckButton" id="aafont">
                         <property name="label" translatable="yes">Screen font antialiasin_g</property>
                         <property name="visible">True</property>