diff options
| author | Noel Grandin <noel@peralex.com> | 2013-05-03 16:45:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-05-06 11:27:49 +0200 |
| commit | e4f37435a0fdd66b2d58633c991c6df720790f39 (patch) | |
| tree | 0fac864b1c2e6b4e609bd95492098c67541db31c | |
| parent | 2ac38d1eac981a411f89b666c6f72aef88fa1f73 (diff) | |
fdo#46808, Use service constructor for uri::ExternalUriReferenceTranslator
Change-Id: I723b1baf50b75f6aaea86a4784ee10a3d2196e83
| -rw-r--r-- | udkapi/com/sun/star/uri/ExternalUriReferenceTranslator.idl | 4 | ||||
| -rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkPicker.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/udkapi/com/sun/star/uri/ExternalUriReferenceTranslator.idl b/udkapi/com/sun/star/uri/ExternalUriReferenceTranslator.idl index 30b4d81a27ec..baf7cdb3b5b8 100644 --- a/udkapi/com/sun/star/uri/ExternalUriReferenceTranslator.idl +++ b/udkapi/com/sun/star/uri/ExternalUriReferenceTranslator.idl @@ -20,9 +20,9 @@ #ifndef __com_sun_star_uri_ExternalUriReferenceTranslator_idl__ #define __com_sun_star_uri_ExternalUriReferenceTranslator_idl__ -module com { module sun { module star { module uri { +#include <com/sun/star/uri/XExternalUriReferenceTranslator.idl> -published interface XExternalUriReferenceTranslator; +module com { module sun { module star { module uri { /** translates between external and internal URI references. diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx index f69adf4a6bdf..d14c00bf4c6b 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx @@ -24,7 +24,7 @@ #endif #include <com/sun/star/lang/XMultiComponentFactory.hpp> -#include <com/sun/star/uri/XExternalUriReferenceTranslator.hpp> +#include <com/sun/star/uri/ExternalUriReferenceTranslator.hpp> #include <comphelper/processfactory.hxx> #include <rtl/process.h> #include <osl/diagnose.h> @@ -66,7 +66,7 @@ OUString SalGtkPicker::uritounicode(const gchar* pIn) } else { - OUString aNewURL = uno::Reference<uri::XExternalUriReferenceTranslator>(uno::Reference<XMultiComponentFactory>(comphelper::getProcessServiceFactory(), UNO_QUERY_THROW)->createInstanceWithContext(OUString("com.sun.star.uri.ExternalUriReferenceTranslator"), m_xContext), UNO_QUERY_THROW)->translateToInternal(sURL); + OUString aNewURL = uri::ExternalUriReferenceTranslator::create( m_xContext )->translateToInternal(sURL); if( !aNewURL.isEmpty() ) sURL = aNewURL; } @@ -82,7 +82,7 @@ OString SalGtkPicker::unicodetouri(const OUString &rURL) INetURLObject aURL(rURL); if (INET_PROT_FILE == aURL.GetProtocol()) { - OUString aNewURL = uno::Reference<uri::XExternalUriReferenceTranslator>(uno::Reference<XMultiComponentFactory>(comphelper::getProcessServiceFactory(), UNO_QUERY_THROW)->createInstanceWithContext(OUString("com.sun.star.uri.ExternalUriReferenceTranslator"), m_xContext ), UNO_QUERY_THROW)->translateToExternal( rURL ); + OUString aNewURL = uri::ExternalUriReferenceTranslator::create( m_xContext )->translateToInternal(rURL); if( !aNewURL.isEmpty() ) { |