diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-02 18:32:36 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-02 18:33:37 +0200 |
| commit | 54e87df11faf697d3b2666198a3d20b3ee091419 (patch) | |
| tree | 8cfe316f012a4969ca6980fa6ac2fdb3a9424118 /svtools/source/dialogs | |
| parent | 3aac11a1233f679ea813fee8b8de134553d7db60 (diff) | |
Change INetProtocol enumerators to CamelCase
...to avoid clashes with macros and poor warnings about hiding global FILE
Change-Id: I444e8b958f029201b228937e088efabc4b6d3050
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 263a533903f9..f7aebdf36b40 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() == INetProtocol::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() == INetProtocol::CMIS; + bool bSuccess = rUrl.GetProtocol() == INetProtocol::Cmis; if ( bSuccess ) { diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 9d0729160d9b..419b2b9efcc3 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() != INetProtocol::NOT_VALID ) + if( aURL.GetProtocol() != INetProtocol::NotValid ) { 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() != INetProtocol::NOT_VALID || m_xDatabaseContext->hasByName(sSelectedDS) ) + if ( aURL.GetProtocol() != INetProtocol::NotValid || 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() != INetProtocol::NOT_VALID ) + if( aURL.GetProtocol() != INetProtocol::NotValid ) { OFileNotation aFileNotation( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); sName = aFileNotation.get(OFileNotation::N_SYSTEM); |