summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2011-07-15 01:33:21 +0300
committerTor Lillqvist <tml@iki.fi>2011-07-15 01:33:21 +0300
commit1a798a5ebc545ca9047550db1983ea65c910293d (patch)
treed6d1ac8499cfe97f0190e003cf8d981e93c6e758
parent1e301dd23a0f3957274dd72d3bd3b2aab7291342 (diff)
Add values for iOS and Android, style improvements
-rw-r--r--udkapi/com/sun/star/lang/SystemDependent.idl32
1 files changed, 22 insertions, 10 deletions
diff --git a/udkapi/com/sun/star/lang/SystemDependent.idl b/udkapi/com/sun/star/lang/SystemDependent.idl
index 22cf54841..62555a447 100644
--- a/udkapi/com/sun/star/lang/SystemDependent.idl
+++ b/udkapi/com/sun/star/lang/SystemDependent.idl
@@ -61,18 +61,16 @@ published constants SystemDependent
//-------------------------------------------------------------------------
// DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_WIN32
- /** The called interface method returns a value specified for the
- 32-bit Windows systems.
+ /** The called interface method returns a value specified for Windows.
- <p>These are Windows NT, Windows 95, Windows 98 or higher. </p>
+ <p>These are Windows XP or higher. </p>
*/
const short SYSTEM_WIN32 = 1;
//-------------------------------------------------------------------------
// DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_WIN16
- /** The called interface method returns a value specified for
- the 16-bit Windows system.
+ /** The called interface method returns a value specified for 16-bit Windows.
<p>This is Windows 3.11. </p>
*/
@@ -81,12 +79,12 @@ published constants SystemDependent
//-------------------------------------------------------------------------
// DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_JAVA
- /** The called interface method returns a value specified for the system java.
+ /** The called interface method returns a value specified for Java.
<p>These are <em>JRE 1.1</em>, <em>JRE 1.2</em>, <em>JDK 1.1</em>,
<em>JDK 1.2</em> or higher. </p>
- <p>The return should be a handle to a java object locked with
+ <p>The return should be a handle to a Java object locked with
the call <code>JavaEnvironment->NewGlobalRef( ... )</code>
by the callee. </p>
*/
@@ -95,12 +93,12 @@ published constants SystemDependent
//-------------------------------------------------------------------------
// DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_OS2
- /** The called interface method returns a value specified for the <em>OS/2</em> system.
+ /** The called interface method returns a value specified for <em>OS/2</em>.
*/
const short SYSTEM_OS2 = 4;
// DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_MAC
- /** The called interface method returns a value specified for the <em>MAC-OS</em> system.
+ /** The called interface method returns a value specified for <em>Mac OS X</em>.
*/
const short SYSTEM_MAC = 5;
@@ -110,7 +108,21 @@ published constants SystemDependent
/** The called interface method returns a value specified for the <em>X Window System</em>.
*/
const short SYSTEM_XWINDOW = 6;
-
+
+ //-------------------------------------------------------------------------
+
+ // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_IOS
+ /** The called interface method returns a value specified for <em>iOS</em>.
+ */
+ const short SYSTEM_IOS = 7;
+
+ //-------------------------------------------------------------------------
+
+ // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_ANDROID
+ /** The called interface method returns a value specified for <em>Android</em>.
+ */
+ const short SYSTEM_ANDROID = 8;
+
};
//=============================================================================