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 /svtools/source/dialogs | |
| parent | 0b4965bcd7ec911951e7ca3a4cd48062843b2634 (diff) | |
Change INetProtocol to scoped enumeration
...and fix o3tl::enumarray::operator [] const overload
Change-Id: I749b1b9d68686b03a97074253478d9d2d9d32b0b
Diffstat (limited to 'svtools/source/dialogs')
| -rw-r--r-- | svtools/source/dialogs/ServerDetailsControls.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/dialogs/addresstemplate.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index 71cec8c7b3ff..263a533903f9 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -225,7 +225,7 @@ INetURLObject SmbDetailsContainer::getUrl( ) bool SmbDetailsContainer::setUrl( const INetURLObject& rUrl ) { - bool bSuccess = rUrl.GetProtocol() == INET_PROT_SMB; + bool bSuccess = rUrl.GetProtocol() == INetProtocol::SMB; if ( bSuccess ) { @@ -324,7 +324,7 @@ INetURLObject CmisDetailsContainer::getUrl( ) bool CmisDetailsContainer::setUrl( const INetURLObject& rUrl ) { - bool bSuccess = rUrl.GetProtocol() == INET_PROT_CMIS; + bool bSuccess = rUrl.GetProtocol() == INetProtocol::CMIS; if ( bSuccess ) { diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 57a389531db3..9d0729160d9b 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -707,7 +707,7 @@ void AssignmentPersistentData::ImplCommit() { OUString sName = m_pImpl->pConfigData->getDatasourceName(); INetURLObject aURL( sName ); - if( aURL.GetProtocol() != INET_PROT_NOT_VALID ) + if( aURL.GetProtocol() != INetProtocol::NOT_VALID ) { OFileNotation aFileNotation( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); sName = aFileNotation.get(OFileNotation::N_SYSTEM); @@ -828,7 +828,7 @@ void AssignmentPersistentData::ImplCommit() // get the data source the user has chosen and let it build a connection INetURLObject aURL( sSelectedDS ); - if ( aURL.GetProtocol() != INET_PROT_NOT_VALID || m_xDatabaseContext->hasByName(sSelectedDS) ) + if ( aURL.GetProtocol() != INetProtocol::NOT_VALID || m_xDatabaseContext->hasByName(sSelectedDS) ) m_xDatabaseContext->getByName( sSelectedDS ) >>= xDS; } else @@ -1198,7 +1198,7 @@ void AssignmentPersistentData::ImplCommit() xProp->getPropertyValue("DataSourceName") >>= sName; INetURLObject aURL( sName ); - if( aURL.GetProtocol() != INET_PROT_NOT_VALID ) + if( aURL.GetProtocol() != INetProtocol::NOT_VALID ) { OFileNotation aFileNotation( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); sName = aFileNotation.get(OFileNotation::N_SYSTEM); |