diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-03-30 07:41:22 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-03-30 07:41:22 +0000 |
| commit | 3756715d5bdc7e85a5a169723d340ca6016fd8f6 (patch) | |
| tree | e52bc56ea299ec9b4eb6ad8373b98a88f65e82a7 /sfx2/source/appl/appcfg.cxx | |
| parent | 81329f0b588f09b185aa14435f1e2c4303580483 (diff) | |
INTEGRATION: CWS fwkfinal3 (1.58.90); FILE MERGED
2005/03/17 12:56:50 pb 1.58.90.1: fix: #i45078# disable SID_ATTR_QUICKLAUNCHER if quickstart isn't installed
Diffstat (limited to 'sfx2/source/appl/appcfg.cxx')
| -rw-r--r-- | sfx2/source/appl/appcfg.cxx | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 9ea4abafdd..d97570f45f 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appcfg.cxx,v $ * - * $Revision: 1.61 $ + * $Revision: 1.62 $ * - * last change: $Author: vg $ $Date: 2005-03-24 09:49:53 $ + * last change: $Author: rt $ $Date: 2005-03-30 08:41:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -479,10 +479,24 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet ) bRet = TRUE; break; case SID_ATTR_QUICKLAUNCHER : - if(rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_ATTR_QUICKLAUNCHER ), - ShutdownIcon::GetAutostart() ) ) ) + { +#ifdef WNT + if ( ShutdownIcon::IsQuickstarterInstalled() ) + { +#endif + if ( rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_QUICKLAUNCHER ), + ShutdownIcon::GetAutostart() ) ) ) + bRet = TRUE; +#ifdef WNT + } + else + { + rSet.DisableItem( rPool.GetWhich( SID_ATTR_QUICKLAUNCHER ) ); bRet = TRUE; + } +#endif break; + } case SID_SAVEREL_INET : { bRet = TRUE; |