diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:22:12 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:22:12 +0200 |
| commit | 47c07b3fed09df9add221955721b678ef8496eaf (patch) | |
| tree | 6822ae8da1f86d7b30353430a0c191d4dca6be83 /ridljar/com | |
| parent | 1c19f9039a98691492235c2a71fac1dd717ebda9 (diff) | |
recreated tag OOO_BUILD_3_2_98_1 which had these commits:
commit 29cfbb4c6fa5e17dc2101ec0124cd98d44d038e0 (tag: refs/tags/OOO_BUILD_3_2_98_1)
Author: Petr Mladek <pmladek@walk.suse.cz>
Date: Wed Sep 15 19:03:29 2010 +0200
Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1)
commit 0d7590496217e8f39e76acada9c57b8776b9dd3b
Author: Petr Mladek <pmladek@walk.suse.cz>
Date: Tue Sep 14 20:19:08 2010 +0200
idlc-error-offset.diff: yylineno is not defined by default
i#81780
idlc/source/scanner.ll | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
commit 55c5db853fc0d96179874b4c01dba2774ecf5cd1
Author: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date: Tue Sep 14 14:20:04 2010 +0200
idlc-error-offset.diff: Add character offset for idlc errors
i#81780
idlc/inc/idlc/idlc.hxx | 8 ++++++++
idlc/source/errorhandler.cxx | 15 ++++++++++++---
idlc/source/idlc.cxx | 2 ++
idlc/source/parser.y | 7 ++++++-
idlc/source/scanner.ll | 33 +++++++++++++++++++++++----------
5 files changed, 51 insertions(+), 14 deletions(-)
commit 97cffceb1d46e0e3cfb49f31e08033864230d4d3
Author: Tor Lillqvist <tlillqvist@novell.com>
Date: Tue Sep 14 13:24:04 2010 +0200
win32-invalid-names.diff: Allow technically illegal pathname components
n#277603
Allow some technically illegal pathname components on Win32
(directories with trailing spaces or periods) because some SMB
servers like Netware (and Samba, if mangled names = No) do serve
such directories if they exist on the server's host system.
sal/osl/w32/file_url.cxx | 16 +++++++++++-----
sal/osl/w32/file_url.h | 1 +
2 files changed, 12 insertions(+), 5 deletions(-)
commit a957fc8910fb1739877e1e3d3dd850c20b776633
Author: Thorsten Behrens <tbehrens@novell.com>
Date: Tue Sep 14 13:12:26 2010 +0200
win32-vs2005-compat.diff: Fix build with Visual Studio 2005
cppu/inc/com/sun/star/uno/Reference.h | 4 ++--
cppu/inc/com/sun/star/uno/Sequence.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
commit 90a90958ea59b3866a71c1d9abd2ddfbb641e72c
Author: Thorsten Behrens <tbehrens@novell.com>
Date: Tue Sep 14 12:58:29 2010 +0200
win32-force-version-fix.diff: force WINVER when using non-std win api
sal/osl/w32/file_dirvol.cxx | 2 +-
sal/osl/w32/file_error.c | 2 +-
sal/osl/w32/file_url.cxx | 2 +-
sal/osl/w32/tempfile.cxx | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
commit 76399b1c8c7c62d8b2c3593dfae020bbc970a03c
Merge: f9ef138 b549687
Author: Jan Holesovsky <kendy@suse.cz>
Date: Wed Sep 8 11:34:19 2010 +0200
Merge commit 'ooo/OOO330_m7'
commit f9ef138393f1ee4c24b0d8fe41e1a56fa9673465
Merge: 90e8b7d 165163b
Author: Jan Holesovsky <kendy@suse.cz>
Date: Tue Sep 7 09:33:09 2010 +0200
Merge commit 'ooo/OOO330_m6'
commit b5496876a7f4e9b271adf2630e7adfb00562f796 (tag: refs/tags/ooo/OOO330_m7)
Merge: dfe63d4 28afbb9
Author: Kurt Zenker <kz@openoffice.org>
Date: Fri Sep 3 14:39:55 2010 +0200
CWS-TOOLING: integrate CWS fs33a
commit dfe63d4f1b365aba9c7552161ab8dfa6deb840c1
Merge: 165163b b445aad
Author: Kurt Zenker <kz@openoffice.org>
Date: Tue Aug 31 15:26:29 2010 +0200
CWS-TOOLING: integrate CWS sb130
commit 28afbb92e9861b5414baa0d14611b62c48949279
Merge: ff47f09 5ccdcb4
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date: Wed Aug 25 16:07:39 2010 +0200
fs33a: merge after pulling OOO330.m5's changes
commit 165163b89a47786e0bdf88e4186f502ccce1dffd (tag: refs/tags/ooo/OOO330_m6)
Merge: 5ccdcb4 50cb935
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Aug 25 14:29:06 2010 +0200
CWS-TOOLING: integrate CWS ooo33gsl06
commit b445aadbdca8a67b322828c33ad98dfd0cf9e5f2
Merge: 2190f32 5ccdcb4
Author: sb <sb@openoffice.org>
Date: Wed Aug 25 14:21:49 2010 +0200
sb130: merged in OOO330_m5
commit 50cb935be4339482f4916cc838065e73f9c843a0
Author: Herbert Duerr [hdu] <duerr@sun.com>
Date: Thu Aug 19 14:04:41 2010 +0200
#i1138511# allow symbol-aliasing in adobe single-byte encodings
sal/textenc/convertadobe.tab | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
commit 5ccdcb471976d739a43597b47660d5254a137f6f (tag: refs/tags/ooo/OOO330_m5)
Merge: 8050668 18221f7
Author: Kurt Zenker <kz@openoffice.org>
Date: Wed Aug 18 12:00:05 2010 +0200
CWS-TOOLING: integrate CWS jl154
commit 18221f76d06cf85da6d42e38a2fed759aef679da
Merge: e72339c bb67de3
Author: Joerg Skottke [jsk] <jsk@openoffice.org>
Date: Fri Aug 13 07:28:35 2010 +0200
jl154: Local merge
commit 2190f32ab0bfa95d8c268ca6a162d2f375b959e2
Author: sb <sb@openoffice.org>
Date: Thu Aug 12 10:22:02 2010 +0200
sb130: #i113096# introduced com.sun.star.configuration.XUpdate.removeExtensionXcuFile
offapi/com/sun/star/configuration/XUpdate.idl | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
commit bb67de3dc5a2f859180606505cbf9b1ac6b56603
Merge: 8050668 e72339c
Author: Joerg Skottke [jsk] <jsk@openoffice.org>
Date: Wed Aug 11 08:57:13 2010 +0200
jl154: Local merge
commit ff47f09f9e28c9a653f3fbebd25fbda4c79d19bc
Merge: 736f56f 8050668
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date: Tue Aug 10 14:53:21 2010 +0200
merging in latest changes from OOO330(m3)
commit 736f56fc89292923ddc6844fe10fa85e8f5f1f1c
Merge: 68fe561 0cd895e
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date: Tue Aug 10 14:21:53 2010 +0200
merging in latest changes from CWS unoawt2
commit e72339c37a724f4bdaba87c6f944ebd58415ea2a
Merge: 1588f8b 69df64a
Author: Joachim Lingner <jl@openoffice.org>
Date: Mon Aug 2 15:39:29 2010 +0200
jl154 merging with OOO330m2
commit 1588f8b510855be60cb6d62867446967faddeca5
Merge: 52782ca e96a6bc
Author: Joachim Lingner <jl@openoffice.org>
Date: Fri Jul 16 15:45:18 2010 +0200
jl154 merging with OOO300_m1
commit 68fe561b0096bd6a292daf4a04cb7f0bda2f0622
Merge: 9b1e23f 93e1dd3
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Tue Jul 6 15:24:32 2010 +0200
Automated merge with ssh://hg@hg.services.openoffice.org/cws/unoawt2
commit 52782ca48f788bbe817ea12e35cc099687aca60e
Author: Joachim Lingner <jl@openoffice.org>
Date: Mon Jul 5 15:46:50 2010 +0200
jl154 #i112934# replace old license headers introduced by CWS jl152
.../star/deployment/ExtensionRemovedException.idl | 5 +----
.../InvalidRemovedParameterException.idl | 5 +----
offapi/com/sun/star/deployment/Prerequisites.idl | 5 +----
offapi/com/sun/star/script/XLibraryContainer3.idl | 5 +----
4 files changed, 4 insertions(+), 16 deletions(-)
commit 0cd895e70c17a03a6c70eb46d2766ea7987cd741
Author: Ocke Janssen [oj] <Ocke.Janssen@sun.com>
Date: Thu Jul 1 11:52:27 2010 +0200
unoawt2: add XItemList same as for listbox model
.../com/sun/star/awt/UnoControlComboBoxModel.idl | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
commit 216eb3aa22f9c950981d11545caa8f2d7b5172f4
Merge: 6aa8dd9 2902d48
Author: Joachim Lingner <jl@openoffice.org>
Date: Wed Jun 30 17:12:59 2010 +0200
jl154 merge with DEV300_m84
commit 93e1dd367a4f317914d6006ab376c7e6b8942fa3
Merge: 67fd04b 3d0fa53
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Sun Jun 20 00:48:29 2010 +0200
Automated merge with ssh://hg@hg.services.openoffice.org/cws/unoawt2
commit 3d0fa53f98bc015eaf13bdd18e78130945e9806e
Merge: 3173637 67fd04b
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Thu Jun 17 23:37:32 2010 +0200
fs33a: merged CWS unoawt2, implicit rebase to m83
commit 31736374e2f401d10b48a05b32761be0aeb4ad40
Merge: 732952c fcc2791
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Thu Jun 17 11:47:25 2010 +0200
fs33a: merge after pulling latest changes from DEV300 (m81)
commit 732952c50a76812f04c1f058c9fb6ff8916349ef
Merge: 27f1f79 46020e7
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Wed Jun 16 15:55:22 2010 +0200
Automated merge with ssh://hg@hg.services.openoffice.org/cws/fs33a
commit 46020e7ef2fceba95ccd1783db3876f790312f51
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Wed Jun 16 14:29:22 2010 +0200
fs33a: oops, forgot this addition to the documentation of the UnoControlListBoxModel in CWS unoawt
offapi/com/sun/star/awt/UnoControlListBoxModel.idl | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
commit 27f1f791481d5948af79bbc0fad5a4e93e07c5df
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Thu Apr 29 15:29:46 2010 +0200
fs33a: #i111238# [s|g]etUserData -> [s|g]etItemData
offapi/com/sun/star/awt/XItemList.idl | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
commit d3021fad695af7e3186246cbfdef404db72cf56c
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Thu Apr 29 14:10:03 2010 +0200
fs33a: #i111238# now with UserData support
offapi/com/sun/star/awt/XItemList.idl | 37 +++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
commit a7bb53b95ae34bc93a81977939f660bba15ed869
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Thu Apr 29 10:15:25 2010 +0200
fs33a: #i111238# add (optional, since the thing is published) support for XItemList
offapi/com/sun/star/awt/UnoControlListBoxModel.idl | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
commit 92d9db82ceab3dfdeabb7de9228ecd05d1b27392
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Thu Apr 29 10:05:04 2010 +0200
fs33a: #i111238# add support for images to AWT's ListBoxControl/Model
offapi/com/sun/star/awt/ItemListEvent.idl | 76 ++++++++
offapi/com/sun/star/awt/XItemList.idl | 246 +++++++++++++++++++++++++
offapi/com/sun/star/awt/XItemListListener.idl | 85 +++++++++
offapi/com/sun/star/awt/makefile.mk | 5 +-
4 files changed, 411 insertions(+), 1 deletions(-)
Notes
Notes:
split repo tag: ure_OOO_BUILD_3_2_98_1
Diffstat (limited to 'ridljar/com')
26 files changed, 64 insertions, 64 deletions
diff --git a/ridljar/com/sun/star/lib/uno/typedesc/FieldDescription.java b/ridljar/com/sun/star/lib/uno/typedesc/FieldDescription.java index ec291f1a8470..c21abb2f1a97 100644 --- a/ridljar/com/sun/star/lib/uno/typedesc/FieldDescription.java +++ b/ridljar/com/sun/star/lib/uno/typedesc/FieldDescription.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/ridljar/com/sun/star/lib/uno/typedesc/MemberDescriptionHelper.java b/ridljar/com/sun/star/lib/uno/typedesc/MemberDescriptionHelper.java index 0bc714374d64..125c93bdf2cd 100644 --- a/ridljar/com/sun/star/lib/uno/typedesc/MemberDescriptionHelper.java +++ b/ridljar/com/sun/star/lib/uno/typedesc/MemberDescriptionHelper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/ridljar/com/sun/star/lib/uno/typedesc/MethodDescription.java b/ridljar/com/sun/star/lib/uno/typedesc/MethodDescription.java index 56792fc913aa..97ea16273378 100644 --- a/ridljar/com/sun/star/lib/uno/typedesc/MethodDescription.java +++ b/ridljar/com/sun/star/lib/uno/typedesc/MethodDescription.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java b/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java index 35113bed0d47..d83be2e2a57e 100644 --- a/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java +++ b/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/ridljar/com/sun/star/lib/uno/typeinfo/AttributeTypeInfo.java b/ridljar/com/sun/star/lib/uno/typeinfo/AttributeTypeInfo.java index e0d7bd3cc1e2..ea7af7d70635 100644 --- a/ridljar/com/sun/star/lib/uno/typeinfo/AttributeTypeInfo.java +++ b/ridljar/com/sun/star/lib/uno/typeinfo/AttributeTypeInfo.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/ridljar/com/sun/star/lib/uno/typeinfo/ConstantTypeInfo.java b/ridljar/com/sun/star/lib/uno/typeinfo/ConstantTypeInfo.java index 44f9f9bc371d..e794285a756b 100644 --- a/ridljar/com/sun/star/lib/uno/typeinfo/ConstantTypeInfo.java +++ b/ridljar/com/sun/star/lib/uno/typeinfo/ConstantTypeInfo.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/ridljar/com/sun/star/lib/uno/typeinfo/MemberTypeInfo.java b/ridljar/com/sun/star/lib/uno/typeinfo/MemberTypeInfo.java index 384295bb9cad..4f1094ae7440 100644 --- a/ridljar/com/sun/star/lib/uno/typeinfo/MemberTypeInfo.java +++ b/ridljar/com/sun/star/lib/uno/typeinfo/MemberTypeInfo.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ public class MemberTypeInfo extends TypeInfo int m_index; private final Type m_unoType; // @since UDK 3.2 private final int m_typeParameterIndex; // @since UDK 3.2 - + /** Create a member type info with a UNO type that cannot unambiguously be represented as a Java 1.2 type. diff --git a/ridljar/com/sun/star/lib/uno/typeinfo/MethodTypeInfo.java b/ridljar/com/sun/star/lib/uno/typeinfo/MethodTypeInfo.java index 4b8ebe65a260..5c7d36a93dc3 100644 --- a/ridljar/com/sun/star/lib/uno/typeinfo/MethodTypeInfo.java +++ b/ridljar/com/sun/star/lib/uno/typeinfo/MethodTypeInfo.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/ridljar/com/sun/star/lib/uno/typeinfo/ParameterTypeInfo.java b/ridljar/com/sun/star/lib/uno/typeinfo/ParameterTypeInfo.java index 3aecce7a6891..09d9d6bdd381 100644 --- a/ridljar/com/sun/star/lib/uno/typeinfo/ParameterTypeInfo.java +++ b/ridljar/com/sun/star/lib/uno/typeinfo/ParameterTypeInfo.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,8 +30,8 @@ import com.sun.star.uno.Type; public class ParameterTypeInfo extends TypeInfo { - protected int m_index; - protected String m_methodName; + protected int m_index; + protected String m_methodName; private final Type m_unoType; // @since UDK 3.2 /** diff --git a/ridljar/com/sun/star/lib/uno/typeinfo/TypeInfo.java b/ridljar/com/sun/star/lib/uno/typeinfo/TypeInfo.java index 40745df56b44..ec334cee35bc 100644 --- a/ridljar/com/sun/star/lib/uno/typeinfo/TypeInfo.java +++ b/ridljar/com/sun/star/lib/uno/typeinfo/TypeInfo.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,18 +27,18 @@ package com.sun.star.lib.uno.typeinfo; -/** Defines a class to describe additional type information. +/** Defines a class to describe additional type information. */ public class TypeInfo { - public static final int IN = 0x00000001; - public static final int OUT = 0x00000002; - public static final int UNSIGNED = 0x00000004; - public static final int READONLY = 0x00000008; - public static final int ONEWAY = 0x00000010; - public static final int CONST = 0x00000020; - public static final int ANY = 0x00000040; - public static final int INTERFACE = 0x00000080; + public static final int IN = 0x00000001; + public static final int OUT = 0x00000002; + public static final int UNSIGNED = 0x00000004; + public static final int READONLY = 0x00000008; + public static final int ONEWAY = 0x00000010; + public static final int CONST = 0x00000020; + public static final int ANY = 0x00000040; + public static final int INTERFACE = 0x00000080; /** Marks an extended attribute of an interface type as bound. @@ -50,8 +50,8 @@ public class TypeInfo */ public static final int BOUND = 0x00000100; - protected int m_flags; - protected String m_name; + protected int m_flags; + protected String m_name; public TypeInfo(String name, int flags) { diff --git a/ridljar/com/sun/star/lib/util/DisposeListener.java b/ridljar/com/sun/star/lib/util/DisposeListener.java index a53834148708..7b67371b6711 100644 --- a/ridljar/com/sun/star/lib/util/DisposeListener.java +++ b/ridljar/com/sun/star/lib/util/DisposeListener.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/ridljar/com/sun/star/lib/util/DisposeNotifier.java b/ridljar/com/sun/star/lib/util/DisposeNotifier.java index 7ef8bf740d01..055157d7cf74 100644 --- a/ridljar/com/sun/star/lib/util/DisposeNotifier.java +++ b/ridljar/com/sun/star/lib/util/DisposeNotifier.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/ridljar/com/sun/star/lib/util/WeakMap.java b/ridljar/com/sun/star/lib/util/WeakMap.java index 7c2ccde1ded1..d13b01ab4f7f 100644 --- a/ridljar/com/sun/star/lib/util/WeakMap.java +++ b/ridljar/com/sun/star/lib/util/WeakMap.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/ridljar/com/sun/star/uno/Any.java b/ridljar/com/sun/star/uno/Any.java index d83d6a5951ea..d24b315619d9 100644 --- a/ridljar/com/sun/star/uno/Any.java +++ b/ridljar/com/sun/star/uno/Any.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ package com.sun.star.uno; * an explicit interface type, so the remote counterpart doesn't need to invoke * a queryInterface). * <p> - * @version $Revision: 1.11 $ $ $Date: 2008-04-11 11:11:43 $ + * @version $Revision: 1.11 $ $ $Date: 2008-04-11 11:11:43 $ */ public class Any { /** @@ -54,12 +54,12 @@ public class Any { * @see #getObject */ protected Object _object; - + public static final Any VOID = new Any(new Type("void", TypeClass.VOID), null); // do not use Type.VOID here to avoid circular dependencies between // static members of Any and Type - + /** * Constructs a new any. * <p> diff --git a/ridljar/com/sun/star/uno/Enum.java b/ridljar/com/sun/star/uno/Enum.java index eb509096c503..f9d5769dc2c1 100644 --- a/ridljar/com/sun/star/uno/Enum.java +++ b/ridljar/com/sun/star/uno/Enum.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,20 +27,20 @@ package com.sun.star.uno; -/** - * The Enum class is the base class for all classes generated +/** + * The Enum class is the base class for all classes generated * as java binding for the IDL type enum. - * Each java mapped enum class provides static member of this class + * Each java mapped enum class provides static member of this class * which represents the enum values. - * You cannot create a object of this class or subclass direct, to + * You cannot create a object of this class or subclass direct, to * avoid enum values with integer values outside the defined range. * <p> - * @version $Revision: 1.5 $ $ $Date: 2008-04-11 11:11:59 $ + * @version $Revision: 1.5 $ $ $Date: 2008-04-11 11:11:59 $ */ public abstract class Enum { private int m_value; - /** + /** * Constructs a enum value. * <p> * @param value the integer value of this enum value. @@ -49,13 +49,13 @@ public abstract class Enum { m_value = value; } - /** + /** * Get the integer value of an enum value. * <p> * @return the integer value. */ public final int getValue() { - return m_value; + return m_value; } } diff --git a/ridljar/com/sun/star/uno/IBridge.java b/ridljar/com/sun/star/uno/IBridge.java index f1150b661e1d..cdb137c6f246 100644 --- a/ridljar/com/sun/star/uno/IBridge.java +++ b/ridljar/com/sun/star/uno/IBridge.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/ridljar/com/sun/star/uno/IEnvironment.java b/ridljar/com/sun/star/uno/IEnvironment.java index 028aff0916d8..9db8f0c947e0 100644 --- a/ridljar/com/sun/star/uno/IEnvironment.java +++ b/ridljar/com/sun/star/uno/IEnvironment.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/ridljar/com/sun/star/uno/IFieldDescription.java b/ridljar/com/sun/star/uno/IFieldDescription.java index f68baca7f817..002e4f99c4bf 100644 --- a/ridljar/com/sun/star/uno/IFieldDescription.java +++ b/ridljar/com/sun/star/uno/IFieldDescription.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/ridljar/com/sun/star/uno/IMapping.java b/ridljar/com/sun/star/uno/IMapping.java index 5bb39ac890f3..ebc0d78690d2 100644 --- a/ridljar/com/sun/star/uno/IMapping.java +++ b/ridljar/com/sun/star/uno/IMapping.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/ridljar/com/sun/star/uno/IMemberDescription.java b/ridljar/com/sun/star/uno/IMemberDescription.java index c65441f9cb96..6a01eb1e0138 100644 --- a/ridljar/com/sun/star/uno/IMemberDescription.java +++ b/ridljar/com/sun/star/uno/IMemberDescription.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,7 +66,7 @@ public interface IMemberDescription { boolean isInterface(); /** - * Gives the relative index of this member in the declaring + * Gives the relative index of this member in the declaring * interface or struct (including superclasses). * <p> * @return the relative index of this member diff --git a/ridljar/com/sun/star/uno/IMethodDescription.java b/ridljar/com/sun/star/uno/IMethodDescription.java index 3e1664042bb9..71910283c559 100644 --- a/ridljar/com/sun/star/uno/IMethodDescription.java +++ b/ridljar/com/sun/star/uno/IMethodDescription.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/ridljar/com/sun/star/uno/IQueryInterface.java b/ridljar/com/sun/star/uno/IQueryInterface.java index cb9a79c8b9d4..b59e616aeb02 100644 --- a/ridljar/com/sun/star/uno/IQueryInterface.java +++ b/ridljar/com/sun/star/uno/IQueryInterface.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/ridljar/com/sun/star/uno/ITypeDescription.java b/ridljar/com/sun/star/uno/ITypeDescription.java index 51a32c6f5484..04d5bdf292a5 100644 --- a/ridljar/com/sun/star/uno/ITypeDescription.java +++ b/ridljar/com/sun/star/uno/ITypeDescription.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ public interface ITypeDescription { /** * Gets the <code>IMethodDescription</code> for every - * method, if this type is an interface. Otherwise + * method, if this type is an interface. Otherwise * returns <code>null</code>. * <p> * @return the <code>IMethodDescription[]</code>. @@ -64,7 +64,7 @@ public interface ITypeDescription { /** * Gets the <code>IMethodDescription</code> for the - * method with the name <code>name</code>, if it exists, + * method with the name <code>name</code>, if it exists, * otherwise returns <code>null</code>. * <p> * @return the <code>IMethodDescription</code>. @@ -73,7 +73,7 @@ public interface ITypeDescription { /** * Gets the <code>IFieldDescription</code> for every - * field, if this type is an interface. Otherwise + * field, if this type is an interface. Otherwise * returns <code>null</code>. * <p> * @return the <code>IFieldDescription[]</code>. @@ -82,7 +82,7 @@ public interface ITypeDescription { /** * Gets the <code>IFieldDescription</code> for the - * field with the name <code>name</code>, if it exists, + * field with the name <code>name</code>, if it exists, * otherwise returns <code>null</code>. * <p> * @return the <code>IFieldDescription</code>. @@ -163,7 +163,7 @@ public interface ITypeDescription { * @return the type name. */ String getTypeName(); - + /** * Gets the (Java) array type name. * @@ -178,7 +178,7 @@ public interface ITypeDescription { * @return the array type name. */ String getArrayTypeName(); - + /** * Gets the corresponding java class for the type. * <p> diff --git a/ridljar/com/sun/star/uno/Type.java b/ridljar/com/sun/star/uno/Type.java index b87674ccdf63..c1b816fa2177 100644 --- a/ridljar/com/sun/star/uno/Type.java +++ b/ridljar/com/sun/star/uno/Type.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/ridljar/com/sun/star/uno/Union.java b/ridljar/com/sun/star/uno/Union.java index 5edb1988c820..bc7d45f9adb7 100644 --- a/ridljar/com/sun/star/uno/Union.java +++ b/ridljar/com/sun/star/uno/Union.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,24 +27,24 @@ package com.sun.star.uno; -/** - * The Union class is the base class for all classes generated +/** + * The Union class is the base class for all classes generated * as java binding for the IDL type union. * <p> * Note: The idl type <code>union<code> is currently not fully * integrated into the UNO framework, so don't use it. - * - * @version $Revision: 1.5 $ $ $Date: 2008-04-11 11:15:07 $ + * + * @version $Revision: 1.5 $ $ $Date: 2008-04-11 11:15:07 $ */ public class Union { /** * Get the value in the union. * The representation of the value is an any. * <p> - * @return the any value. + * @return the any value. */ public final Object getValue() { - return m_value; + return m_value; } protected Object m_value; diff --git a/ridljar/com/sun/star/uno/UnoRuntime.java b/ridljar/com/sun/star/uno/UnoRuntime.java index 188ea54a74a6..d1503346a703 100644 --- a/ridljar/com/sun/star/uno/UnoRuntime.java +++ b/ridljar/com/sun/star/uno/UnoRuntime.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |