[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - vcl/unx

Andras Timar andras.timar at collabora.com
Thu Mar 16 13:20:45 UTC 2017


 vcl/unx/generic/app/gensys.cxx |   18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

New commits:
commit d4cccc733f19a3e57f5067bae73108f21ec5a099
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Nov 5 21:58:31 2015 +0100

    Collabora Office: hackish fix of repaint problem of vcl widgets
    
    Change-Id: Ib0eaba0767ff18d03464ba7d1ec1ffdd2ba3ca78
    (cherry picked from commit 55066180e80b77cdf8520b11cc60dec73c6e0d58)

diff --git a/vcl/unx/generic/app/gensys.cxx b/vcl/unx/generic/app/gensys.cxx
index c5ab3db09b88..707abde2ec86 100644
--- a/vcl/unx/generic/app/gensys.cxx
+++ b/vcl/unx/generic/app/gensys.cxx
@@ -146,21 +146,9 @@ const char* SalGenericSystem::getFrameResName()
 
 const char* SalGenericSystem::getFrameClassName()
 {
-    static OStringBuffer aClassName;
-    if( aClassName.isEmpty() )
-    {
-        OUString aIni, aProduct;
-        rtl::Bootstrap::get( "BRAND_BASE_DIR", aIni );
-        aIni += "/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap" );
-        rtl::Bootstrap aBootstrap( aIni );
-        aBootstrap.getFrom( "ProductKey", aProduct );
-
-        if( !aProduct.isEmpty() )
-            aClassName.append( OUStringToOString( aProduct, osl_getThreadTextEncoding() ) );
-        else
-            aClassName.append( OUStringToOString( utl::ConfigManager::getProductName(), osl_getThreadTextEncoding()));
-    }
-    return aClassName.getStr();
+    // Someone somewhere hard coded LibreOffice. If frame class name is not LibreOffice, strange repaint
+    // problems occur with edit boxes, dropdown list boxes, etc.
+    return "LibreOffice";
 }
 
 #endif


More information about the Libreoffice-commits mailing list