diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-02 11:14:43 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-02 16:30:32 +0200 |
| commit | 796ca9ba61ab14e4bdb7b244c64f7fb2c6bf5f65 (patch) | |
| tree | 5f390c2b42d6f8d4977cb9f3037289068fac8325 | |
| parent | 6e74c9fd90b3c416dbdfaf091fa3c1c26e70d1de (diff) | |
Remove obsolete INET_PROT_PRIVATE alias
Change-Id: I6c82dad9d69e19d5596f23eacfbd20768f9f6442
| -rw-r--r-- | desktop/source/app/dispatchwatcher.cxx | 2 | ||||
| -rw-r--r-- | include/tools/urlobj.hxx | 1 | ||||
| -rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/misc/imagemgr.cxx | 4 |
4 files changed, 5 insertions, 6 deletions
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index d1aa2f2a796f..ce5c2ac83c7f 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -395,7 +395,7 @@ bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatchRequ else { INetURLObject aObj( aName ); - if ( aObj.GetProtocol() == INET_PROT_PRIVATE ) + if ( aObj.GetProtocol() == INET_PROT_PRIV_SOFFICE ) aTarget = "_default"; // Set "AsTemplate" argument according to request type diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx index 3032b45c8c0b..b28b5cee69c6 100644 --- a/include/tools/urlobj.hxx +++ b/include/tools/urlobj.hxx @@ -74,7 +74,6 @@ enum INetProtocol INET_PROT_VND_SUN_STAR_WEBDAV = 5, INET_PROT_NEWS = 6, INET_PROT_PRIV_SOFFICE = 7, - INET_PROT_PRIVATE = INET_PROT_PRIV_SOFFICE, // obsolete INET_PROT_VND_SUN_STAR_HELP = 8, INET_PROT_HTTPS = 9, INET_PROT_SLOT = 10, diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 36d31f3a6ed1..5928480a3650 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -988,7 +988,7 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet ) // determine name INetURLObject aURL(aFile); OUString aName = aURL.GetName( INetURLObject::DECODE_WITH_CHARSET ); - if ( aName.isEmpty() || aURL.GetProtocol() == INET_PROT_PRIVATE ) + if ( aName.isEmpty() || aURL.GetProtocol() == INET_PROT_PRIV_SOFFICE ) aName = SfxResId( STR_NONAME ).toString(); m_pNameED->SetText( aName ); @@ -1030,7 +1030,7 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet ) OUString aText( aPath.PathToFileName() ); //! (pb) MaxLen? m_pFileValFt->SetText( aText ); } - else if ( aURL.GetProtocol() != INET_PROT_PRIVATE ) + else if ( aURL.GetProtocol() != INET_PROT_PRIV_SOFFICE ) m_pFileValFt->SetText( aURL.GetPartBeforeLastName() ); // handle access data diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 9df68a72ef77..250d140c13d6 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -356,7 +356,7 @@ static sal_uInt16 GetImageId_Impl( const INetURLObject& rObject, bool bDetectFol OUString aExt, sURL = rObject.GetMainURL( INetURLObject::NO_DECODE ); sal_uInt16 nImage = IMG_FILE; - if ( rObject.GetProtocol() == INET_PROT_PRIVATE ) + if ( rObject.GetProtocol() == INET_PROT_PRIV_SOFFICE ) { OUString aURLPath = sURL.copy( URL_PREFIX_PRIV_SOFFICE_LEN ); OUString aType = aURLPath.getToken( 0, '/' ); @@ -534,7 +534,7 @@ OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rOb { if ( !bDetected ) { - if ( rObject.GetProtocol() == INET_PROT_PRIVATE ) + if ( rObject.GetProtocol() == INET_PROT_PRIV_SOFFICE ) { OUString aURLPath = sURL.copy( URL_PREFIX_PRIV_SOFFICE_LEN ); OUString aType = aURLPath.getToken( 0, '/' ); |