diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-02-02 15:46:55 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-02-02 15:46:55 +0000 |
| commit | f248f1fb0ffa7b160c0249cec0fa50f8e79f1b05 (patch) | |
| tree | 39e4d3fdd068b01a273946a0f543ab27fed323df /sfx2/source/appl/appcfg.cxx | |
| parent | af44cc9be5b0325e54e9c9dabe81713efbb4b75e (diff) | |
INTEGRATION: CWS alienwarning (1.57.26); FILE MERGED
2005/01/28 09:29:16 mba 1.57.26.1: #i41506#: new option for alien warning
Diffstat (limited to 'sfx2/source/appl/appcfg.cxx')
| -rw-r--r-- | sfx2/source/appl/appcfg.cxx | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 528b2547671e..cf1b01c121b1 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appcfg.cxx,v $ * - * $Revision: 1.57 $ + * $Revision: 1.58 $ * - * last change: $Author: kz $ $Date: 2005-01-18 16:00:19 $ + * last change: $Author: rt $ $Date: 2005-02-02 16:46:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -343,6 +343,14 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet ) bRet = FALSE; } break; + case SID_ATTR_WARNALIENFORMAT: + { + bRet = TRUE; + if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_WARNALIENFORMAT)) + if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_WARNALIENFORMAT ), aSaveOptions.IsWarnAlienFormat()))) + bRet = FALSE; + } + break; case SID_ATTR_AUTOSAVE : { bRet = TRUE; @@ -776,6 +784,13 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet ) aSaveOptions.SetPrettyPrinting( static_cast< const SfxBoolItem*> ( pItem )->GetValue() ); } + // WarnAlienFormat + if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_ATTR_WARNALIENFORMAT ), TRUE, &pItem ) ) + { + DBG_ASSERT( pItem->ISA( SfxBoolItem ), "BoolItem expected" ); + aSaveOptions.SetWarnAlienFormat( static_cast< const SfxBoolItem*> ( pItem )->GetValue() ); + } + // AutoSave if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_AUTOSAVE), TRUE, &pItem)) { |