diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-11-04 22:32:52 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-11-07 14:19:34 +0000 |
| commit | 6aa51640706ca332e6439e6097cc81a2b1dbb275 (patch) | |
| tree | ecbef3d5277add8e7d99eec58e85fdda435c3267 /vcl/unx/gtk/fpicker/SalGtkPicker.cxx | |
| parent | aeffd7f25f6bf664ee5536942bd48407447867f7 (diff) | |
gtk3: port file-picker, using more standard combobox APIs etc.
Diffstat (limited to 'vcl/unx/gtk/fpicker/SalGtkPicker.cxx')
| -rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkPicker.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx index 0520f2a823bc..7146b99f6b20 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx @@ -66,8 +66,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; -#if !GTK_CHECK_VERSION(3,0,0) - rtl::OUString SalGtkPicker::uritounicode(const gchar* pIn) { if (!pIn) @@ -92,7 +90,7 @@ rtl::OUString SalGtkPicker::uritounicode(const gchar* pIn) } else { - OUString aNewURL = Reference<uri::XExternalUriReferenceTranslator>(Reference<XMultiComponentFactory>(comphelper::getProcessServiceFactory(), UNO_QUERY_THROW)->createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.ExternalUriReferenceTranslator")), m_xContext), UNO_QUERY_THROW)->translateToInternal(sURL); + OUString aNewURL = uno::Reference<uri::XExternalUriReferenceTranslator>(uno::Reference<XMultiComponentFactory>(comphelper::getProcessServiceFactory(), UNO_QUERY_THROW)->createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.ExternalUriReferenceTranslator")), m_xContext), UNO_QUERY_THROW)->translateToInternal(sURL); if( aNewURL.getLength() ) sURL = aNewURL; } @@ -108,7 +106,7 @@ rtl::OString SalGtkPicker::unicodetouri(const rtl::OUString &rURL) INetURLObject aURL(rURL); if (INET_PROT_FILE == aURL.GetProtocol()) { - OUString aNewURL = Reference<uri::XExternalUriReferenceTranslator>(Reference<XMultiComponentFactory>(comphelper::getProcessServiceFactory(), UNO_QUERY_THROW)->createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.ExternalUriReferenceTranslator")), m_xContext ), UNO_QUERY_THROW)->translateToExternal( rURL ); + OUString aNewURL = uno::Reference<uri::XExternalUriReferenceTranslator>(uno::Reference<XMultiComponentFactory>(comphelper::getProcessServiceFactory(), UNO_QUERY_THROW)->createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.ExternalUriReferenceTranslator")), m_xContext ), UNO_QUERY_THROW)->translateToExternal( rURL ); if( aNewURL.getLength() ) { @@ -290,6 +288,4 @@ uno::Reference< uno::XInterface > SalGtkPicker::createInstance( const rtl::OUStr return m_xContext->getServiceManager()->createInstanceWithContext( rName, m_xContext ); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |