diff options
Diffstat (limited to 'sfx2/source/doc')
-rw-r--r-- | sfx2/source/doc/guisaveas.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/objcont.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/objstor.cxx | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index e19e5172117a..1922cad4c5b7 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -1057,7 +1057,7 @@ bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, NULL ); const SfxPoolItem* pItem = NULL; - if ( bPreselectPassword && aDialogParams.GetItemState( SID_ENCRYPTIONDATA, true, &pItem ) != SFX_ITEM_SET ) + if ( bPreselectPassword && aDialogParams.GetItemState( SID_ENCRYPTIONDATA, true, &pItem ) != SfxItemState::SET ) { // the file dialog preselects the password checkbox if the provided mediadescriptor has encryption data entry // after dialog execution the password interaction flag will be either removed or not diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 33700ffc22f7..a5ec5c907ecc 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -352,7 +352,7 @@ void SfxObjectShell::LoadStyles for ( sal_uInt16 i = 0; i < nFound; ++i ) { - pFound[i].pDest->GetItemSet().PutExtended(pFound[i].pSource->GetItemSet(), SFX_ITEM_DONTCARE, SFX_ITEM_DEFAULT); + pFound[i].pDest->GetItemSet().PutExtended(pFound[i].pSource->GetItemSet(), SfxItemState::DONTCARE, SfxItemState::DEFAULT); if(pFound[i].pSource->HasParentSupport()) pFound[i].pDest->SetParent(pFound[i].pSource->GetParent()); if(pFound[i].pSource->HasFollowSupport()) diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index d534b6b958c0..41f05b33117c 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -917,11 +917,11 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo // we need some properties in the media descriptor, so we have to make sure that they are in Any aStreamAny; aStreamAny <<= pMedium->GetInputStream(); - if ( pSet->GetItemState( SID_INPUTSTREAM ) < SFX_ITEM_SET ) + if ( pSet->GetItemState( SID_INPUTSTREAM ) < SfxItemState::SET ) pSet->Put( SfxUnoAnyItem( SID_INPUTSTREAM, aStreamAny ) ); - if ( pSet->GetItemState( SID_FILE_NAME ) < SFX_ITEM_SET ) + if ( pSet->GetItemState( SID_FILE_NAME ) < SfxItemState::SET ) pSet->Put( SfxStringItem( SID_FILE_NAME, pMedium->GetName() ) ); - if ( pSet->GetItemState( SID_FILTER_NAME ) < SFX_ITEM_SET ) + if ( pSet->GetItemState( SID_FILTER_NAME ) < SfxItemState::SET ) pSet->Put( SfxStringItem( SID_FILTER_NAME, pFilter->GetName() ) ); Sequence< PropertyValue > rProperties; @@ -2666,7 +2666,7 @@ bool SfxObjectShell::CommonSaveAs_Impl } aParams->ClearItem( SID_COPY_STREAM_IF_POSSIBLE ); - pImp->bPasswd = SFX_ITEM_SET == aParams->GetItemState(SID_PASSWORD); + pImp->bPasswd = SfxItemState::SET == aParams->GetItemState(SID_PASSWORD); SfxMedium *pActMed = GetMedium(); const INetURLObject aActName(pActMed->GetName()); @@ -2680,7 +2680,7 @@ bool SfxObjectShell::CommonSaveAs_Impl return false; } - if( SFX_ITEM_SET != aParams->GetItemState(SID_UNPACK) && SvtSaveOptions().IsSaveUnpacked() ) + if( SfxItemState::SET != aParams->GetItemState(SID_UNPACK) && SvtSaveOptions().IsSaveUnpacked() ) aParams->Put( SfxBoolItem( SID_UNPACK, false ) ); OUString aTempFileURL; @@ -2788,7 +2788,7 @@ bool SfxObjectShell::PreDoSaveAs_Impl pMergedParams->Put( *pParams ); #ifdef DBG_UTIL - if ( pMergedParams->GetItemState( SID_DOC_SALVAGE) >= SFX_ITEM_SET ) + if ( pMergedParams->GetItemState( SID_DOC_SALVAGE) >= SfxItemState::SET ) SAL_WARN( "sfx.doc","Salvage item present in Itemset, check the parameters!"); #endif |