diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-04-01 15:15:47 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-04-01 15:15:47 +0000 |
| commit | 8e2f309e5eef2ca79e2fa9e2510f90368f0e2355 (patch) | |
| tree | 68c520eb39a711c734229eac64cdd347e247943c | |
| parent | e0b88ec41506cdc756da7cf8b22d83ce3181262a (diff) | |
INTEGRATION: CWS fwkfinal6 (1.109.10); FILE MERGED
2005/03/24 08:12:32 as 1.109.10.2: #i45855# comment what's happen
2005/03/24 08:09:32 as 1.109.10.1: #i45855# disable HelpOnOpen feature by default by using NIL value explicitly
| -rw-r--r-- | sfx2/source/appl/newhelp.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 99d6f8d5de46..c3a08e2ad3e0 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: newhelp.cxx,v $ * - * $Revision: 1.109 $ + * $Revision: 1.110 $ * - * last change: $Author: rt $ $Date: 2005-03-17 09:02:07 $ + * last change: $Author: rt $ $Date: 2005-04-01 16:15:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2342,7 +2342,11 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText ) sPath += sCurrentFactory; ::rtl::OUString sKey( KEY_HELP_ON_OPEN ); - bool bHideBox = false; + // Attention: This check boy knows two states: + // 1) Reading of the config key fails with an exception or by getting an empty Any (!) => check box must be hidden + // 2) We read TRUE/FALSE => check box must be shown and enabled/disabled + + bool bHideBox = true; sal_Bool bHelpAtStartup = sal_False; try { @@ -2351,7 +2355,8 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText ) if ( xConfiguration.is() ) { Any aAny = ConfigurationHelper::readRelativeKey( xConfiguration, sPath, sKey ); - aAny >>= bHelpAtStartup; + if (aAny >>= bHelpAtStartup) + bHideBox = false; } } catch( Exception& ) |