diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-05-08 13:53:19 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-05-08 13:53:19 +0000 |
| commit | 06b0e55c94b85c07c3b61973652206b919742601 (patch) | |
| tree | 1a9d2ee5131d2c1ec7f524d2a3f47ef771782b3e /sfx2/source/appl/appuno.cxx | |
| parent | c8a6bf85ace48b68fd9b696259828e46574c3b25 (diff) | |
INTEGRATION: CWS mbapp3 (1.114.16); FILE MERGED
2006/04/26 06:22:33 mav 1.114.16.2: #i64599# NoAutoSave argument
2006/04/24 09:54:34 mav 1.114.16.1: #i64599# NoAutoSave argument
Diffstat (limited to 'sfx2/source/appl/appuno.cxx')
| -rw-r--r-- | sfx2/source/appl/appuno.cxx | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 9b03f018258d..53c114f79df9 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -4,9 +4,9 @@ * * $RCSfile: appuno.cxx,v $ * - * $Revision: 1.115 $ + * $Revision: 1.116 $ * - * last change: $Author: rt $ $Date: 2006-05-02 16:18:18 $ + * last change: $Author: hr $ $Date: 2006-05-08 14:53:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -270,6 +270,7 @@ static const String sComponentContext = String::CreateFromAscii( "ComponentConte static const String sDocumentBaseURL = String::CreateFromAscii( "DocumentBaseURL" ); static const String sHierarchicalDocumentName = String::CreateFromAscii( "HierarchicalDocumentName" ); static const String sCopyStreamIfPossible = String::CreateFromAscii( "CopyStreamIfPossible" ); +static const String sNoAutoSave = String::CreateFromAscii( "NoAutoSave" ); void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs, SfxAllItemSet& rSet, const SfxSlot* pSlot ) { @@ -877,6 +878,14 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque if (bOK) rSet.Put( SfxBoolItem( SID_COPY_STREAM_IF_POSSIBLE, bVal ) ); } + else if ( aName == sNoAutoSave ) + { + sal_Bool bVal = sal_False; + sal_Bool bOK = (rProp.Value >>= bVal); + DBG_ASSERT( bOK, "invalid type for NoAutoSave" ) + if (bOK) + rSet.Put( SfxBoolItem( SID_NOAUTOSAVE, bVal ) ); + } #ifdef DBG_UTIL else --nFoundArgs; @@ -1058,6 +1067,8 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta nAdditional++; if ( rSet.GetItemState( SID_COPY_STREAM_IF_POSSIBLE ) == SFX_ITEM_SET ) nAdditional++; + if ( rSet.GetItemState( SID_NOAUTOSAVE ) == SFX_ITEM_SET ) + nAdditional++; // consider additional arguments nProps += nAdditional; @@ -1183,6 +1194,8 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta continue; if ( nId == SID_COPY_STREAM_IF_POSSIBLE ) continue; + if ( nId == SID_NOAUTOSAVE ) + continue; // used only internally if ( nId == SID_SAVETO ) @@ -1515,6 +1528,12 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta pValue[nActProp].Name = sCopyStreamIfPossible; pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } + if ( rSet.GetItemState( SID_NOAUTOSAVE, sal_False, &pItem ) == SFX_ITEM_SET ) + { + pValue[nActProp].Name = sNoAutoSave; + pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); + } + } } |