diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 09:27:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 12:49:02 +0200 |
| commit | 50151db9f740afee7f11a10cc5c61b437bf87caf (patch) | |
| tree | b41921d86a46931bc06457172994fb3a7dabe92b /sfx2/source | |
| parent | bfde4866e07746eafa2f0d6173c29d805cc35ad0 (diff) | |
convert FSysStyle to o3tl::typed_flags
Change-Id: I58a63a0e6f619442f21827064644ecd8ca57b8ff
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/appl/shutdowniconaqua.mm | 2 | ||||
| -rw-r--r-- | sfx2/source/control/recentdocsviewitem.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/guisaveas.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm index 2d466b48458c..a969e07831b4 100644 --- a/sfx2/source/appl/shutdowniconaqua.mm +++ b/sfx2/source/appl/shutdowniconaqua.mm @@ -217,7 +217,7 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper< css::util::XStrin { // Do handle file URL differently => convert it to a system // path and abbreviate it with a special function: - ::rtl::OUString aSystemPath( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) ); + ::rtl::OUString aSystemPath( aURL.getFSysPath( FSysStyle::Detect ) ); ::rtl::OUString aCompactedSystemPath; oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, nullptr ); diff --git a/sfx2/source/control/recentdocsviewitem.cxx b/sfx2/source/control/recentdocsviewitem.cxx index 0c12f38e9ce3..5260f0540e6d 100644 --- a/sfx2/source/control/recentdocsviewitem.cxx +++ b/sfx2/source/control/recentdocsviewitem.cxx @@ -43,7 +43,7 @@ RecentDocsViewItem::RecentDocsViewItem(ThumbnailView &rView, const OUString &rUR INetURLObject aURLObj(rURL); if( aURLObj.GetProtocol() == INetProtocol::File ) - m_sHelpText = aURLObj.getFSysPath(INetURLObject::FSYS_DETECT); + m_sHelpText = aURLObj.getFSysPath(FSysStyle::Detect); if( m_sHelpText.isEmpty() ) m_sHelpText = aURLObj.GetURLNoPass(); diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index cf93b3cb6f43..f7aa774126a7 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -1241,7 +1241,7 @@ OUString ModelData_Impl::GetRecommendedName( const OUString& aSuggestedName, con if ( xTypeDetection.is() ) { INetURLObject aObj( "c:/" + aRecommendedName, INetProtocol::File, - INetURLObject::EncodeMechanism::All, RTL_TEXTENCODING_UTF8, INetURLObject::FSYS_DOS ); + INetURLObject::EncodeMechanism::All, RTL_TEXTENCODING_UTF8, FSysStyle::Dos ); OUString aExtension = GetRecommendedExtension( aTypeName ); if ( !aExtension.isEmpty() ) diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 3e18546749a3..42d97d8ab626 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -408,7 +408,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) bool bIsWebDAV = aMedObj.isAnyKnownWebDAVScheme(); if ( ( !bNeedsReload && ( ( aMedObj.GetProtocol() == INetProtocol::File && - aMedObj.getFSysPath( INetURLObject::FSYS_DETECT ) != aPhysObj.getFSysPath( INetURLObject::FSYS_DETECT ) && + aMedObj.getFSysPath( FSysStyle::Detect ) != aPhysObj.getFSysPath( FSysStyle::Detect ) && !bPhysObjIsYounger ) || ( bIsWebDAV && !bPhysObjIsYounger ) || ( pMed->IsRemote() && !bIsWebDAV ) ) ) |