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/envelp/mailmrge.cxx | |
| parent | 0b4965bcd7ec911951e7ca3a4cd48062843b2634 (diff) | |
Change INetProtocol to scoped enumeration
...and fix o3tl::enumarray::operator [] const overload
Change-Id: I749b1b9d68686b03a97074253478d9d2d9d32b0b
Diffstat (limited to 'sw/source/ui/envelp/mailmrge.cxx')
| -rw-r--r-- | sw/source/ui/envelp/mailmrge.cxx | 4 |
1 files changed, 2 insertions, 2 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()); |