strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS kdesettings2 (1.2.6); FILE MERGED

Browse source 
2006/06/13 11:43:50 kendy 1.2.6.1: #i66264#
Fix crasher with KDE < 3.2.2
This commit is contained in:
Ivo Hinkelmann 2006-06-27 10:51:58 +00:00
parent dd3fe9bbaa
commit c7830bf311
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
shell/source/backends/kdebe/kdebecdef.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: kdebecdef.cxx,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: hr $ $Date: 2006-06-22 10:13:58 $
* last change: $Author: ihi $ $Date: 2006-06-27 11:51:58 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -49,6 +49,8 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#endif
#include <kapplication.h>
#include "uno/current_context.hxx"
namespace css = com::sun::star ;
@ -69,7 +71,7 @@ static uno::Reference<uno::XInterface> SAL_CALL createKDEBackend(const uno::Refe
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "system.desktop-environment" ) ) );
rtl::OUString aDesktopEnvironment;
if ( (aValue >>= aDesktopEnvironment) && (aDesktopEnvironment.equalsAscii("KDE")) )
if ( (aValue >>= aDesktopEnvironment) && (aDesktopEnvironment.equalsAscii("KDE")) && (KApplication::kApplication() != NULL) )
return * KDEBackend::createInstance(xContext);
}