summaryrefslogtreecommitdiff
path: root/sfx2/source/doc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-09-10 17:53:41 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-09-12 06:08:32 +0000
commitea733ab5b632109d28bb8f1dc37116340b26229b (patch)
tree78a5c4d6cad5d6f2c58a89745ba0af130ef0e188 /sfx2/source/doc
parentcc3294e127a6aedb8f6da5741ac9063da1cc2135 (diff)
Turn SfxItemState into a C++11 scoped enumeration
...to gain further confidence in the claim "that none of the existing code tries to uses combinations of these enum values" (d92602c5b13d0a60439d86c5a033d124178726ca "more fixes for SfxItemState") Change-Id: I987922d945e8738e38adfde83b869adf3ff35b13 Reviewed-on: https://gerrit.libreoffice.org/11384 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sfx2/source/doc')
-rw-r--r--sfx2/source/doc/guisaveas.cxx2
-rw-r--r--sfx2/source/doc/objcont.cxx2
-rw-r--r--sfx2/source/doc/objstor.cxx12
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