offapi/com/sun/star/datatransfer/DataFlavor.idl | 2 - offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl | 2 - offapi/com/sun/star/datatransfer/XMimeContentType.idl | 2 - offapi/com/sun/star/system/XSimpleMailMessage.idl | 4 +-- offapi/com/sun/star/ui/dialogs/XFilePicker.idl | 6 ++--- offapi/com/sun/star/ui/dialogs/XFilePicker2.idl | 2 - offapi/com/sun/star/ui/dialogs/XFolderPicker.idl | 4 +-- vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx | 13 ++++++++++-- 8 files changed, 22 insertions(+), 13 deletions(-)
New commits: commit 1dd8cffc10d953ca645252ae2d8f11363186d21a Author: Caolán McNamara <[email protected]> Date: Fri Feb 15 13:52:26 2013 +0000 fix grammar with use of conform/conforming/conforms Change-Id: Ie41651359f26a267273bf87c947ee58568983e5c diff --git a/offapi/com/sun/star/datatransfer/DataFlavor.idl b/offapi/com/sun/star/datatransfer/DataFlavor.idl index 0e065cf..da4a7d7 100644 --- a/offapi/com/sun/star/datatransfer/DataFlavor.idl +++ b/offapi/com/sun/star/datatransfer/DataFlavor.idl @@ -30,7 +30,7 @@ module com { module sun { module star { module datatransfer { published struct DataFlavor { /** The MIME content-type (type/subtype) string describing the data format - of the object to transfer. MimeType must be conform to <a href="ftp://ftp.isi.edu/in-notes/rfc2045.txt";>Rfc2045</a> and + of the object to transfer. MimeType must conform to <a href="ftp://ftp.isi.edu/in-notes/rfc2045.txt";>Rfc2045</a> and <a href="ftp://ftp.isi.edu/in-notes/rfc2046.txt";>Rfc2046</a>) */ string MimeType; diff --git a/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl b/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl index 143eb3e..e3cc4c1 100644 --- a/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl +++ b/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl @@ -28,7 +28,7 @@ module com { module sun { module star { module datatransfer { /** Used to create an instance that implement the interface <type>XMimeContentType</type> from a string - representation of such a MIME content-type that is conform to + representation of such a MIME content-type that conforms to <a href="ftp://ftp.isi.edu/in-notes/rfc2045.txt";>Rfc2045</a> and <a href="ftp://ftp.isi.edu/in-notes/rfc2046.txt";>Rfc2046</a>. diff --git a/offapi/com/sun/star/datatransfer/XMimeContentType.idl b/offapi/com/sun/star/datatransfer/XMimeContentType.idl index e00c85d..ea8373c 100644 --- a/offapi/com/sun/star/datatransfer/XMimeContentType.idl +++ b/offapi/com/sun/star/datatransfer/XMimeContentType.idl @@ -27,7 +27,7 @@ module com { module sun { module star { module datatransfer { /** An implementation of this interface represents a MIME content-type that - is conform to <a href="ftp://ftp.isi.edu/in-notes/rfc2045.txt";>Rfc2045</a> and + conforms to <a href="ftp://ftp.isi.edu/in-notes/rfc2045.txt";>Rfc2045</a> and <a href="ftp://ftp.isi.edu/in-notes/rfc2046.txt";>Rfc2046</a>. Instances that implement this interface could be created using the interface <type>XMimeContentTypeFactory</type>. diff --git a/offapi/com/sun/star/system/XSimpleMailMessage.idl b/offapi/com/sun/star/system/XSimpleMailMessage.idl index a023f23..449abd8 100644 --- a/offapi/com/sun/star/system/XSimpleMailMessage.idl +++ b/offapi/com/sun/star/system/XSimpleMailMessage.idl @@ -107,7 +107,7 @@ published interface XSimpleMailMessage: com::sun::star::uno::XInterface /** To set an attachment of a simple mail message. @param aAttachement Sets a sequence of file URLs specifying the files that should be - attached to the mail. The given file URLs must be conform to + attached to the mail. The given file URLs must conform to <a href="http://www.w3.org/Addressing/rfc1738.txt";>Rfc1738</a>. The method does not check if the specified file or files really exist. @@ -122,7 +122,7 @@ published interface XSimpleMailMessage: com::sun::star::uno::XInterface @returns A sequence of file URLs specifying the files that should be attached to the mail or an empty sequence if no attachments have been specified. - The returned file URLs are conform to <a href="http://www.w3.org/Addressing/rfc1738.txt";>Rfc1738</a>. + The returned file URLs conform to <a href="http://www.w3.org/Addressing/rfc1738.txt";>Rfc1738</a>. */ sequence< string > getAttachement( ); }; diff --git a/offapi/com/sun/star/ui/dialogs/XFilePicker.idl b/offapi/com/sun/star/ui/dialogs/XFilePicker.idl index ccdda1e..b8164ba 100644 --- a/offapi/com/sun/star/ui/dialogs/XFilePicker.idl +++ b/offapi/com/sun/star/ui/dialogs/XFilePicker.idl @@ -56,7 +56,7 @@ published interface XFilePicker: com::sun::star::ui::dialogs::XExecutableDialog /** Sets the directory that the file dialog initially displays. @param aDirectory - Specifies the initial directory in URL format. The given URL must be + Specifies the initial directory in URL format. The given URL must conform to <a href="http://www.w3.org/Addressing/rfc1738.txt";>Rfc1738</a>). @throws com::sun::star::lang::IllegalArgumentException @@ -70,12 +70,12 @@ published interface XFilePicker: com::sun::star::ui::dialogs::XExecutableDialog did cancel the dialog, the returned value is undefined. @returns - The directory in URL format, must be conform to <a href="http://www.w3.org/Addressing/rfc1738.txt";>Rfc1738</a>. + The directory in URL format, must conform to <a href="http://www.w3.org/Addressing/rfc1738.txt";>Rfc1738</a>. */ string getDisplayDirectory(); /** Returns a sequence of the selected files including path information in - URL format, conform to <a href="http://www.w3.org/Addressing/rfc1738.txt";>Rfc1738</a>. + URL format, conforming to <a href="http://www.w3.org/Addressing/rfc1738.txt";>Rfc1738</a>. <p>If the user closed the dialog with cancel an empty sequence will be returned.</p> diff --git a/offapi/com/sun/star/ui/dialogs/XFilePicker2.idl b/offapi/com/sun/star/ui/dialogs/XFilePicker2.idl index 73ed36c..91189a6 100644 --- a/offapi/com/sun/star/ui/dialogs/XFilePicker2.idl +++ b/offapi/com/sun/star/ui/dialogs/XFilePicker2.idl @@ -30,7 +30,7 @@ module com { module sun { module star { module ui { module dialogs { interface XFilePicker2 : ::com::sun::star::ui::dialogs::XFilePicker { /** Returns a sequence of the selected files including path information in - URL format, conform to <a href="http://www.w3.org/Addressing/rfc1738.txt";>Rfc1738</a>. + URL format, conforming to <a href="http://www.w3.org/Addressing/rfc1738.txt";>Rfc1738</a>. <p>If the user closed the dialog with cancel an empty sequence will be returned.</p> <br/> diff --git a/offapi/com/sun/star/ui/dialogs/XFolderPicker.idl b/offapi/com/sun/star/ui/dialogs/XFolderPicker.idl index a911c6ec..26f02dd 100644 --- a/offapi/com/sun/star/ui/dialogs/XFolderPicker.idl +++ b/offapi/com/sun/star/ui/dialogs/XFolderPicker.idl @@ -36,7 +36,7 @@ published interface XFolderPicker: com::sun::star::ui::dialogs::XExecutableDialo chooses if the specified root directory doesn't exist. @param aDirectory - Specifies the root directory in url format, conform to <a href="http://www.w3.org/Addressing/rfc1738.txt";>Rfc1738</a>. + Specifies the root directory in url format, conforming to <a href="http://www.w3.org/Addressing/rfc1738.txt";>Rfc1738</a>. @throws com::sun::star::lang::IllegalArgumentException if the given url is invalid. @@ -53,7 +53,7 @@ published interface XFolderPicker: com::sun::star::ui::dialogs::XExecutableDialo */ string getDisplayDirectory(); - /** Returns the selected directory as url conform to <a href="http://www.w3.org/Addressing/rfc1738.txt";>Rfc1738</a>. + /** Returns the selected directory as url conforming to <a href="http://www.w3.org/Addressing/rfc1738.txt";>Rfc1738</a>. @returns The selected directory as url if the user did close the dialog with Ok commit 914de32b27c7fe164b21f9247275ee3117c0864b Author: Caolán McNamara <[email protected]> Date: Fri Feb 15 13:41:11 2013 +0000 Resolves: rhbz#910176 cannot select directory with gnome folder picker << gtk documentation gtk_file_chooser_get_current_folder_uri () Gets the current folder of chooser as an URI. Note that this is the folder that the file chooser is currently displaying ... which is not the same as the currently-selected folder if the chooser is in GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER mode ... to get the currently-selected folder in that mode, use gtk_file_chooser_get_uri() as the usual way to get the selection. >> << offapi documentation XFolderPicker getDisplayDirectory: Returns the root directory that the FolderPicker is showing. getDirectory Returns the selected directory >> so getDisplayDirectory <-> gtk_file_chooser_get_current_folder_uri and getDirectory <-> gtk_file_chooser_get_uri Change-Id: Iaa5ab16a250cd59fe5e8bd02149298eef6d1dec2 diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx index 4da4b1e..6cd0531 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx @@ -96,7 +96,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 = uritounicode(pCurrentFolder); + OUString aCurrentFolderName = uritounicode(pCurrentFolder); g_free( pCurrentFolder ); return aCurrentFolderName; @@ -104,7 +104,16 @@ rtl::OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory() throw( uno::Run rtl::OUString SAL_CALL SalGtkFolderPicker::getDirectory() throw( uno::RuntimeException ) { - return getDisplayDirectory(); + SolarMutexGuard g; + + OSL_ASSERT( m_pDialog != NULL ); + + gchar* pSelectedFolder = + gtk_file_chooser_get_uri( GTK_FILE_CHOOSER( m_pDialog ) ); + OUString aSelectedFolderName = uritounicode(pSelectedFolder); + g_free( pSelectedFolder ); + + return aSelectedFolderName; } void SAL_CALL SalGtkFolderPicker::setDescription( const rtl::OUString& rDescription )
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
