summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-11-01 09:34:49 +0000
committerKurt Zenker <kz@openoffice.org>2005-11-01 09:34:49 +0000
commit1e19c0770bc0c6025b319be9465b2ef543eb6d00 (patch)
tree6c09f51ff13b2c0c6e41722aef14c42953822391 /vcl
parentf86c7bef9b922737ba1f9d58c7fc56ebecd0602d (diff)
INTEGRATION: CWS vcl42 (1.215.110); FILE MERGED
2005/10/06 06:53:14 pl 1.215.110.2: RESYNC: (1.215-1.217); FILE MERGED 2005/08/09 13:51:00 pl 1.215.110.1: SAL_NO_NWF
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/window.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 48fbbe6be5cd..2595887a8c70 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: window.cxx,v $
*
- * $Revision: 1.218 $
+ * $Revision: 1.219 $
*
- * last change: $Author: rt $ $Date: 2005-10-24 08:36:16 $
+ * last change: $Author: kz $ $Date: 2005-11-01 10:34:49 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -9102,6 +9102,10 @@ LanguageType Window::GetInputLanguage() const
void Window::EnableNativeWidget( BOOL bEnable )
{
+ static const char* pNoNWF = getenv( "SAL_NO_NWF" );
+ if( pNoNWF && *pNoNWF )
+ bEnable = FALSE;
+
if( bEnable != ImplGetWinData()->mbEnableNativeWidget )
{
ImplGetWinData()->mbEnableNativeWidget = bEnable;