diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-02-15 13:52:26 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-02-15 13:52:35 +0000 |
commit | 1dd8cffc10d953ca645252ae2d8f11363186d21a (patch) | |
tree | fc7b24393418cdae427f2347e4887e7c4372ffbb /offapi | |
parent | Resolves: rhbz#910176 cannot select directory with gnome folder picker (diff) | |
download | core-1dd8cffc10d953ca645252ae2d8f11363186d21a.tar.gz core-1dd8cffc10d953ca645252ae2d8f11363186d21a.zip |
fix grammar with use of conform/conforming/conforms
Change-Id: Ie41651359f26a267273bf87c947ee58568983e5c
Diffstat (limited to 'offapi')
7 files changed, 11 insertions, 11 deletions
diff --git a/offapi/com/sun/star/datatransfer/DataFlavor.idl b/offapi/com/sun/star/datatransfer/DataFlavor.idl index 0e065cf892b5..da4a7d77a523 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 143eb3e7394d..e3cc4c1daf6f 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 e00c85d4cb39..ea8373c0994b 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 a023f2330912..449abd8b4815 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 ccdda1ea44c3..b8164ba4f457 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 73ed36c15698..91189a6f9f15 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 a911c6ec64d1..26f02dd31737 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 |