fix WM_CLASS

VCLSalFrame is definitely not the name of any instance of LibreOffice.

Change-Id: Iba227061c0c0541290c90876c94d1016aa1e783e

4 files changed, 6 insertions, 15 deletions

diff --git a/vcl/generic/app/gensys.cxx b/vcl/generic/app/gensys.cxx
index 68d2192f00b5..c65f0e537e70 100644
--- a/vcl/generic/app/gensys.cxx
+++ b/vcl/generic/app/gensys.cxx
@@ -29,6 +29,7 @@
 #include <rtl/bootstrap.hxx>
 #include <osl/process.h>
 #include <osl/thread.h>
+#include <unotools/configmgr.hxx>
 
 #include "vcl/unohelp.hxx"
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -179,7 +180,8 @@ const char* SalGenericSystem::getFrameResName()
                 aResName.append( pEnv );
         }
         if( !aResName.getLength() )
-            aResName.append( "VCLSalFrame" );
+            aResName.append( OUStringToOString( utl::ConfigManager::getProductName().toAsciiLowerCase(),
+                osl_getThreadTextEncoding()));
     }
     return aResName.getStr();
 }
@@ -198,21 +200,11 @@ const char* SalGenericSystem::getFrameClassName()
         if( !aProduct.isEmpty() )
             aClassName.append( OUStringToOString( aProduct, osl_getThreadTextEncoding() ) );
         else
-            aClassName.append( "VCLSalFrame" );
+            aClassName.append( OUStringToOString( utl::ConfigManager::getProductName(), osl_getThreadTextEncoding()));
     }
     return aClassName.getStr();
 }
 
-OString SalGenericSystem::getFrameResName( SalExtStyle nStyle )
-{
-    OStringBuffer aBuf( 64 );
-    aBuf.append( getFrameResName() );
-    if( (nStyle & SAL_FRAME_EXT_STYLE_DOCUMENT) )
-        aBuf.append( ".DocumentWindow" );
-
-    return aBuf.makeStringAndClear();
-}
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/generic/gensys.h b/vcl/inc/generic/gensys.h
index d60cc1766b14..25d73a09743b 100644
--- a/vcl/inc/generic/gensys.h
+++ b/vcl/inc/generic/gensys.h
@@ -47,7 +47,6 @@ class VCL_DLLPUBLIC SalGenericSystem : public SalSystem
     // Simple helpers for X11 WM_CLASS hints
     static const char *getFrameResName();
     static const char *getFrameClassName();
-    static OString getFrameResName( SalExtStyle nStyle );
 #endif
 };
 
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 374fce0301ec..0ef369e6f4a7 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -2042,7 +2042,7 @@ void X11SalFrame::SetApplicationID( const OUString &rWMClass )
 void X11SalFrame::updateWMClass()
 {
     XClassHint* pClass = XAllocClassHint();
-    OString aResName = SalGenericSystem::getFrameResName( mnExtStyle );
+    OString aResName = SalGenericSystem::getFrameResName();
     pClass->res_name  = const_cast<char*>(aResName.getStr());
 
     OString aResClass = OUStringToOString(m_sWMClass, RTL_TEXTENCODING_ASCII_US);
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 0f53e935c780..254437f53a14 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -2170,7 +2170,7 @@ void GtkSalFrame::updateWMClass()
     if( IS_WIDGET_REALIZED( m_pWindow ) )
     {
         XClassHint* pClass = XAllocClassHint();
-        OString aResName = SalGenericSystem::getFrameResName( m_nExtStyle );
+        OString aResName = SalGenericSystem::getFrameResName();
         pClass->res_name  = const_cast<char*>(aResName.getStr());
         pClass->res_class = const_cast<char*>(pResClass);
         XSetClassHint( display,