diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-02 15:58:06 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-02 16:30:34 +0200 |
| commit | 44b3e56bb4a4df59f53447c4ca4d8e02fe926206 (patch) | |
| tree | 71a9efde3a6a2a00688e8feb8e3086cb32eceb4f /sw/source/ui | |
| parent | 0b4965bcd7ec911951e7ca3a4cd48062843b2634 (diff) | |
Change INetProtocol to scoped enumeration
...and fix o3tl::enumarray::operator [] const overload
Change-Id: I749b1b9d68686b03a97074253478d9d2d9d32b0b
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/envelp/mailmrge.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/fldui/javaedit.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/vba/vbadocument.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/vba/vbadocuments.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/vba/vbasystem.cxx | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 7316fb8022b3..592f643645ad 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -314,7 +314,7 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell, sPath = aPathOpt.GetWorkPath(); } INetURLObject aURL(sPath); - if(aURL.GetProtocol() == INET_PROT_FILE) + if(aURL.GetProtocol() == INetProtocol::FILE) m_pPathED->SetText(aURL.PathToFileName()); else m_pPathED->SetText(aURL.GetFull()); @@ -605,7 +605,7 @@ IMPL_LINK_NOARG(SwMailMergeDlg, InsertPathHdl) if( xFP->execute() == RET_OK ) { INetURLObject aURL(xFP->getDirectory()); - if(aURL.GetProtocol() == INET_PROT_FILE) + if(aURL.GetProtocol() == INetProtocol::FILE) m_pPathED->SetText(aURL.PathToFileName()); else m_pPathED->SetText(aURL.GetFull()); diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index 0e270865bf2e..2271593839c9 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -161,7 +161,7 @@ void SwJavaEditDialog::CheckTravel() if(!sURL.isEmpty()) { INetURLObject aINetURL(sURL); - if(INET_PROT_FILE == aINetURL.GetProtocol()) + if(INetProtocol::FILE == aINetURL.GetProtocol()) sURL = aINetURL.PathToFileName(); } m_pUrlED->SetText(sURL); @@ -267,7 +267,7 @@ IMPL_LINK_NOARG(SwJavaEditDialog, DlgClosedHdl) if ( !sFileName.isEmpty() ) { INetURLObject aINetURL( sFileName ); - if ( INET_PROT_FILE == aINetURL.GetProtocol() ) + if ( INetProtocol::FILE == aINetURL.GetProtocol() ) sFileName = aINetURL.PathToFileName(); } m_pUrlED->SetText( sFileName ); diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx index b3979f5be7e8..912cf162c9bb 100644 --- a/sw/source/ui/vba/vbadocument.cxx +++ b/sw/source/ui/vba/vbadocument.cxx @@ -270,7 +270,7 @@ SwVbaDocument::setAttachedTemplate( const css::uno::Any& _attachedtemplate ) thr OUString aURL; INetURLObject aObj; aObj.SetURL( sTemplate ); - bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID; + bool bIsURL = aObj.GetProtocol() != INetProtocol::NOT_VALID; if ( bIsURL ) aURL = sTemplate; else diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx index 87ad6169eaf4..d2b4e6b6f6ee 100644 --- a/sw/source/ui/vba/vbadocuments.cxx +++ b/sw/source/ui/vba/vbadocuments.cxx @@ -132,7 +132,7 @@ SwVbaDocuments::Open( const OUString& Filename, const uno::Any& /*ConfirmConvers OUString aURL; INetURLObject aObj; aObj.SetURL( Filename ); - bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID; + bool bIsURL = aObj.GetProtocol() != INetProtocol::NOT_VALID; if ( bIsURL ) aURL = Filename; else diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx index b2de217a8d2d..6e2fd2f6c203 100644 --- a/sw/source/ui/vba/vbasystem.cxx +++ b/sw/source/ui/vba/vbasystem.cxx @@ -249,7 +249,7 @@ SwVbaSystem::PrivateProfileString( const OUString& rFilename, const OUString& rS { INetURLObject aObj; aObj.SetURL( rFilename ); - bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID; + bool bIsURL = aObj.GetProtocol() != INetProtocol::NOT_VALID; if ( bIsURL ) sFileUrl = rFilename; else |