diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-05-03 12:48:04 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-05-03 12:48:04 +0000 |
| commit | c1a3a8f8d55aa5e14018064a5893efb94dd94a27 (patch) | |
| tree | 7975b3b178587334f2e51de6cf03fbecc247ef6e /fpicker | |
| parent | 13eafdf10edee52ad031af498e45ca4451929b84 (diff) | |
INTEGRATION: CWS cmcfixes4 (1.4.4); FILE MERGED
2005/04/01 12:12:39 cmc 1.4.4.1: #i46017# to and from system locale encoding when url is file:///
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/unx/gnome/SalGtkFolderPicker.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx index 68f5dab5c694..1289c6c1f5ca 100644 --- a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx +++ b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx @@ -2,9 +2,9 @@ * * $RCSfile: SalGtkFolderPicker.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2005-03-18 09:49:04 $ + * last change: $Author: obo $ $Date: 2005-05-03 13:48:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -173,7 +173,7 @@ void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const rtl::OUString& aDir OSL_ASSERT( m_pDialog != NULL ); ::vos::OGuard aGuard( Application::GetSolarMutex() ); - OString aTxt = OUStringToOString( aDirectory, RTL_TEXTENCODING_UTF8 ); + OString aTxt = unicodetouri( aDirectory ); if( aTxt.lastIndexOf('/') == aTxt.getLength() - 1 ) aTxt = aTxt.copy( 0, aTxt.getLength() - 1 ); @@ -191,9 +191,7 @@ rtl::OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory() throw( uno::Run gchar* pCurrentFolder = gtk_file_chooser_get_current_folder_uri( GTK_FILE_CHOOSER( m_pDialog ) ); - ::rtl::OUString aCurrentFolderName = - ::rtl::OUString( const_cast<const sal_Char *>( pCurrentFolder ), - strlen( pCurrentFolder ), RTL_TEXTENCODING_UTF8 ); + ::rtl::OUString aCurrentFolderName = uritounicode(pCurrentFolder); g_free( pCurrentFolder ); return aCurrentFolderName; |