Kaydet (Commit) 45739fad authored tarafından Caolán McNamara's avatar Caolán McNamara

fix sfx2 build

Change-Id: I17b8ab426e7aabeb5db9d49391e0c1be99e63a51
üst 321bd3a0
...@@ -551,7 +551,7 @@ sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter** ...@@ -551,7 +551,7 @@ sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter**
sal_Bool bPreview = rMedium.IsPreview_Impl(); sal_Bool bPreview = rMedium.IsPreview_Impl();
SFX_ITEMSET_ARG(rMedium.GetItemSet(), pReferer, SfxStringItem, SID_REFERER, sal_False); SFX_ITEMSET_ARG(rMedium.GetItemSet(), pReferer, SfxStringItem, SID_REFERER, sal_False);
if ( bPreview && rMedium.IsRemote() && ( !pReferer || pReferer->GetValue().CompareToAscii("private:searchfolder:",21 ) != COMPARE_EQUAL ) ) if ( bPreview && rMedium.IsRemote() && ( !pReferer || !pReferer->GetValue().match("private:searchfolder:") ) )
return ERRCODE_ABORT; return ERRCODE_ABORT;
ErrCode nErr = GuessFilter( rMedium, &pFilter ); ErrCode nErr = GuessFilter( rMedium, &pFilter );
......
...@@ -1721,12 +1721,12 @@ sal_Bool SfxMedium::TryDirectTransfer( const ::rtl::OUString& aURL, SfxItemSet& ...@@ -1721,12 +1721,12 @@ sal_Bool SfxMedium::TryDirectTransfer( const ::rtl::OUString& aURL, SfxItemSet&
SFX_ITEMSET_ARG( &aTargetSet, pNewPassItem, SfxStringItem, SID_PASSWORD, false ); SFX_ITEMSET_ARG( &aTargetSet, pNewPassItem, SfxStringItem, SID_PASSWORD, false );
SFX_ITEMSET_ARG( GetItemSet(), pOldPassItem, SfxStringItem, SID_PASSWORD, false ); SFX_ITEMSET_ARG( GetItemSet(), pOldPassItem, SfxStringItem, SID_PASSWORD, false );
if ( ( !pNewPassItem && !pOldPassItem ) if ( ( !pNewPassItem && !pOldPassItem )
|| ( pNewPassItem && pOldPassItem && pNewPassItem->GetValue().Equals( pOldPassItem->GetValue() ) ) ) || ( pNewPassItem && pOldPassItem && pNewPassItem->GetValue() == pOldPassItem->GetValue() ) )
{ {
// the filter must be the same // the filter must be the same
SFX_ITEMSET_ARG( &aTargetSet, pNewFilterItem, SfxStringItem, SID_FILTER_NAME, false ); SFX_ITEMSET_ARG( &aTargetSet, pNewFilterItem, SfxStringItem, SID_FILTER_NAME, false );
SFX_ITEMSET_ARG( GetItemSet(), pOldFilterItem, SfxStringItem, SID_FILTER_NAME, false ); SFX_ITEMSET_ARG( GetItemSet(), pOldFilterItem, SfxStringItem, SID_FILTER_NAME, false );
if ( pNewFilterItem && pOldFilterItem && pNewFilterItem->GetValue().Equals( pOldFilterItem->GetValue() ) ) if ( pNewFilterItem && pOldFilterItem && pNewFilterItem->GetValue() == pOldFilterItem->GetValue() )
{ {
// get the input stream and copy it // get the input stream and copy it
// in case of success return true // in case of success return true
...@@ -2459,7 +2459,7 @@ void SfxMedium::Init_Impl() ...@@ -2459,7 +2459,7 @@ void SfxMedium::Init_Impl()
pImp->bDisposeStorage = false; pImp->bDisposeStorage = false;
SFX_ITEMSET_ARG( pImp->m_pSet, pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false); SFX_ITEMSET_ARG( pImp->m_pSet, pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false);
if ( pSalvageItem && !pSalvageItem->GetValue().Len() ) if ( pSalvageItem && pSalvageItem->GetValue().isEmpty() )
{ {
pSalvageItem = NULL; pSalvageItem = NULL;
pImp->m_pSet->ClearItem( SID_DOC_SALVAGE ); pImp->m_pSet->ClearItem( SID_DOC_SALVAGE );
...@@ -2492,7 +2492,7 @@ void SfxMedium::Init_Impl() ...@@ -2492,7 +2492,7 @@ void SfxMedium::Init_Impl()
} }
} }
if ( pSalvageItem && pSalvageItem->GetValue().Len() ) if ( pSalvageItem && !pSalvageItem->GetValue().isEmpty() )
{ {
pImp->m_aLogicName = pSalvageItem->GetValue(); pImp->m_aLogicName = pSalvageItem->GetValue();
DELETEZ( pImp->m_pURLObj ); DELETEZ( pImp->m_pURLObj );
...@@ -2894,7 +2894,7 @@ SfxMedium::SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::b ...@@ -2894,7 +2894,7 @@ SfxMedium::SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::b
if( pSalvageItem ) if( pSalvageItem )
{ {
// QUESTION: there is some treatment of Salvage in Init_Impl; align! // QUESTION: there is some treatment of Salvage in Init_Impl; align!
if ( pSalvageItem->GetValue().Len() ) if ( !pSalvageItem->GetValue().isEmpty() )
{ {
// if an URL is provided in SalvageItem that means that the FileName refers to a temporary file // if an URL is provided in SalvageItem that means that the FileName refers to a temporary file
// that must be copied here // that must be copied here
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment