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 /extensions/source/plugin | |
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 'extensions/source/plugin')
-rw-r--r-- | extensions/source/plugin/base/context.cxx | 2 | ||||
-rw-r--r-- | extensions/source/plugin/base/xplugin.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx index c4007ab8d30a..863e7a3dcf8a 100644 --- a/extensions/source/plugin/base/context.cxx +++ b/extensions/source/plugin/base/context.cxx @@ -131,7 +131,7 @@ void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlu if( target.isEmpty() ) { INetURLObject aURL; - aURL.SetSmartProtocol( INetProtocol::FILE ); + aURL.SetSmartProtocol( INetProtocol::File ); aURL.SetSmartURL( url ); OUString aUrl = aURL.GetMainURL(INetURLObject::DECODE_TO_IURI); diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index 41feb4e86f26..cd0ccd56bb98 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -1051,7 +1051,7 @@ void PluginInputStream::load() Guard< Mutex > aGuard( m_pPlugin->getMutex() ); INetURLObject aUrl; - aUrl.SetSmartProtocol( INetProtocol::FILE ); + aUrl.SetSmartProtocol( INetProtocol::File ); aUrl.SetSmartURL( OUString( getStream().url, strlen( getStream().url ), |