summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-08-19 09:06:21 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-08-19 09:13:33 +0200
commit6d64afb31eefcbd8f1413aa30d952338e35771e4 (patch)
treea2e8d7cf2b9f6d18ad696f58cdbe0d6e52227674 /sfx2
parent7f527276606f3b23c91f8c6ac00d744d6b9b3a06 (diff)
Replace utl::LocalFileHelper::IsLocalFile -> ...::IsFileUrl
...given that vnd.sun.star.wfs is long gone. Note that the old code could have behaved differently in that for one it could have worked for relative URL input (as osl_getSystemPathFromFileURL is allowed to accept relative URLs) and for another could have failed for some file URLs (for which osl_getSystemPathFromFileURL would return something other than osl_File_E_None for whatever reason), but it looks plausible to assume that what the call sites are really interested in is whether a given URL is a file URL. Simplifies those call sites that already have a INetURLObject instance even further. Change-Id: Iaee4595d933a760b8321e42414a9ef0865311833
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx3
-rw-r--r--sfx2/source/doc/docfile.cxx19
-rw-r--r--sfx2/source/doc/objcont.cxx4
3 files changed, 13 insertions, 13 deletions
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 2ed3a4b7910d..464b098bf9bb 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1963,8 +1963,7 @@ void FileDialogHelper_Impl::saveConfig()
if ( ! mbIsSaveDlg )
{
OUString aPath = getPath();
- if ( !aPath.isEmpty() &&
- utl::LocalFileHelper::IsLocalFile( aPath ) )
+ if ( utl::LocalFileHelper::IsFileUrl( aPath ) )
{
SetToken( aUserData, 1, ' ', aPath );
bWriteConfig = true;
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 845ed0e702f0..e04b3ce22d54 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -383,7 +383,7 @@ void SfxMedium::CheckFileDate( const util::DateTime& aInitDate )
bool SfxMedium::DocNeedsFileDateCheck() const
{
- return ( !IsReadOnly() && ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) );
+ return !IsReadOnly() && GetURLObject().GetProtocol() == INetProtocol::File;
}
util::DateTime SfxMedium::GetInitFileDate( bool bIgnoreOldValue )
@@ -733,7 +733,7 @@ void SfxMedium::StorageBackup_Impl()
bool bBasedOnOriginalFile = ( !pImp->pTempFile && !( !pImp->m_aLogicName.isEmpty() && pImp->m_bSalvageMode )
&& !GetURLObject().GetMainURL( INetURLObject::NO_DECODE ).isEmpty()
- && ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) )
+ && GetURLObject().GetProtocol() == INetProtocol::File
&& ::utl::UCBContentHelper::IsDocument( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) );
if ( bBasedOnOriginalFile && pImp->m_aBackupURL.isEmpty()
@@ -948,7 +948,8 @@ void SfxMedium::LockOrigFileOnDemand( bool bLoading, bool bNoUI )
try
{
- if ( pImp->m_bLocked && bLoading && ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) )
+ if ( pImp->m_bLocked && bLoading
+ && GetURLObject().GetProtocol() == INetProtocol::File )
{
// if the document is already locked the system locking might be temporarely off after storing
// check whether the system file locking should be taken again
@@ -967,7 +968,7 @@ void SfxMedium::LockOrigFileOnDemand( bool bLoading, bool bNoUI )
if ( !bResult && !IsReadOnly() )
{
bool bContentReadonly = false;
- if ( bLoading && ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) )
+ if ( bLoading && GetURLObject().GetProtocol() == INetProtocol::File )
{
// let the original document be opened to check the possibility to open it for editing
// and to let the writable stream stay open to hold the lock on the document
@@ -1024,7 +1025,7 @@ void SfxMedium::LockOrigFileOnDemand( bool bLoading, bool bNoUI )
sal_Int8 bUIStatus = LOCK_UI_NOLOCK;
// check whether system file locking has been used, the default value is false
- bool bUseSystemLock = ::utl::LocalFileHelper::IsLocalFile( pImp->m_aLogicName ) && IsSystemFileLockingUsed();
+ bool bUseSystemLock = ::utl::LocalFileHelper::IsFileUrl( pImp->m_aLogicName ) && IsSystemFileLockingUsed();
// TODO/LATER: This implementation does not allow to detect the system lock on saving here, actually this is no big problem
// if system lock is used the writeable stream should be available
@@ -1857,7 +1858,7 @@ void SfxMedium::Transfer_Impl()
OUString aDestURL( aDest.GetMainURL( INetURLObject::NO_DECODE ) );
- if ( ::utl::LocalFileHelper::IsLocalFile( aDestURL ) || !aDest.removeSegment() )
+ if ( ::utl::LocalFileHelper::IsFileUrl( aDestURL ) || !aDest.removeSegment() )
{
TransactedTransferForFS_Impl( aSource, aDest, xComEnv );
@@ -2180,7 +2181,7 @@ void SfxMedium::ClearBackup_Impl()
void SfxMedium::GetLockingStream_Impl()
{
- if ( ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) )
+ if ( GetURLObject().GetProtocol() == INetProtocol::File
&& !pImp->m_xLockingStream.is() )
{
SFX_ITEMSET_ARG( pImp->m_pSet, pWriteStreamItem, SfxUnoAnyItem, SID_STREAM, false);
@@ -2293,7 +2294,7 @@ void SfxMedium::GetMedium_Impl()
aMedium.erase( utl::MediaDescriptor::PROP_READONLY() );
aMedium.addInputStream();
}
- else if ( ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) )
+ else if ( GetURLObject().GetProtocol() == INetProtocol::File )
{
// use the special locking approach only for file URLs
aMedium.addInputStreamOwnLock();
@@ -3254,7 +3255,7 @@ void SfxMedium::CreateTempFile( bool bReplace )
bool bTransferSuccess = false;
if ( GetContent().is()
- && ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) )
+ && GetURLObject().GetProtocol() == INetProtocol::File
&& ::utl::UCBContentHelper::IsDocument( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) )
{
// if there is already such a document, we should copy it
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 53fd6f2548b1..6ed6fe8eec42 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -387,7 +387,7 @@ void SfxObjectShell::UpdateFromTemplate_Impl( )
if ( !pFile )
return;
- if ( !::utl::LocalFileHelper::IsLocalFile( pFile->GetName() ) )
+ if ( !::utl::LocalFileHelper::IsFileUrl( pFile->GetName() ) )
// update only for documents loaded from the local file system
return;
@@ -532,7 +532,7 @@ void SfxObjectShell::ResetFromTemplate( const OUString& rTemplateName, const OUS
// TODO/REFACTOR:
// Title?
- if( ::utl::LocalFileHelper::IsLocalFile( rFileName ) )
+ if( ::utl::LocalFileHelper::IsFileUrl( rFileName ) )
{
OUString aFoundName;
if( SfxGetpApp()->Get_Impl()->GetDocumentTemplates()->GetFull( OUString(), rTemplateName, aFoundName ) )