[Libreoffice-commits] core.git: Branch 'distro/collabora/lov-6.1' - cui/source

[Libreoffice Gerrit user]

 cui/source/dialogs/about.cxx |   23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

New commits:
commit f3ad7d68a83b623201b31a4e07b2dff93f60e5de
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Thu Nov 22 21:02:20 2018 +0200
Commit:     Tor Lillqvist <tml at iki.fi>
CommitDate: Thu Nov 22 21:40:16 2018 +0200

    For some reason drawing the SVG logo takes several minutes so don't do it then
    
    For some reason it does not happen in the TDF build of 6.1, but does
    happen in the LibreOffice Vanilla build. Whatever. This fixes the
    problem.
    
    Change-Id: Ie7a3587ece5de8ca0561ad61811c7511f43cad01

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index df8a0b131319..14ad603534a1 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -197,27 +197,8 @@ void AboutDialog::StyleControls()
 
 void AboutDialog::SetLogo()
 {
-    long nWidth = get_content_area()->get_preferred_size().Width();
-
-    // fdo#67401 set AntiAliasing for SVG logo
-    SvtOptionsDrawinglayer aDrawOpt;
-    bool bOldAntiAliasSetting = aDrawOpt.IsAntiAliasing();
-    aDrawOpt.SetAntiAliasing(true);
-
-    // load svg logo, specify desired width, scale height isotropically
-    if (SfxApplication::loadBrandSvg("flat_logo", aLogoBitmap, nWidth) &&
-        !aLogoBitmap.IsEmpty())
-    {
-        m_pLogoImage->SetImage(Image(aLogoBitmap));
-        m_pLogoReplacement->Hide();
-        m_pLogoImage->Show();
-    }
-    else
-    {
-        m_pLogoImage->Hide();
-        m_pLogoReplacement->Show();
-    }
-    aDrawOpt.SetAntiAliasing(bOldAntiAliasSetting);
+    m_pLogoImage->Hide();
+    m_pLogoReplacement->Show();
 }
 
 void AboutDialog::Resize()