summaryrefslogtreecommitdiff
path: root/offapi/com/sun/star/ui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-02-15 13:52:26 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-02-15 13:52:35 +0000
commit1dd8cffc10d953ca645252ae2d8f11363186d21a (patch)
treefc7b24393418cdae427f2347e4887e7c4372ffbb /offapi/com/sun/star/ui
parent914de32b27c7fe164b21f9247275ee3117c0864b (diff)
fix grammar with use of conform/conforming/conforms
Change-Id: Ie41651359f26a267273bf87c947ee58568983e5c
Diffstat (limited to 'offapi/com/sun/star/ui')
-rw-r--r--offapi/com/sun/star/ui/dialogs/XFilePicker.idl6
-rw-r--r--offapi/com/sun/star/ui/dialogs/XFilePicker2.idl2
-rw-r--r--offapi/com/sun/star/ui/dialogs/XFolderPicker.idl4
3 files changed, 6 insertions, 6 deletions
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