summaryrefslogtreecommitdiff
path: root/udkapi
diff options
context:
space:
mode:
Diffstat (limited to 'udkapi')
-rw-r--r--udkapi/com/sun/star/beans/XIntrospection.idl4
-rw-r--r--udkapi/com/sun/star/bridge/ModelDependent.idl10
-rw-r--r--udkapi/com/sun/star/connection/XAcceptor.idl1
-rw-r--r--udkapi/com/sun/star/connection/XConnection.idl2
-rw-r--r--udkapi/com/sun/star/connection/XConnector.idl2
-rw-r--r--udkapi/com/sun/star/container/XContentEnumerationAccess.idl2
-rw-r--r--udkapi/com/sun/star/container/XIndexAccess.idl2
-rw-r--r--udkapi/com/sun/star/io/AlreadyConnectedException.idl2
-rw-r--r--udkapi/com/sun/star/io/BufferSizeExceededException.idl2
-rw-r--r--udkapi/com/sun/star/io/ConnectException.idl2
-rw-r--r--udkapi/com/sun/star/io/DataInputStream.idl2
-rw-r--r--udkapi/com/sun/star/io/DataOutputStream.idl2
-rw-r--r--udkapi/com/sun/star/io/DataTransferEvent.idl4
-rw-r--r--udkapi/com/sun/star/io/IOException.idl2
-rw-r--r--udkapi/com/sun/star/io/NoRouteToHostException.idl2
-rw-r--r--udkapi/com/sun/star/io/NotConnectedException.idl2
-rw-r--r--udkapi/com/sun/star/io/ObjectInputStream.idl2
-rw-r--r--udkapi/com/sun/star/io/ObjectOutputStream.idl2
-rw-r--r--udkapi/com/sun/star/io/Pipe.idl2
-rw-r--r--udkapi/com/sun/star/io/Pump.idl2
-rw-r--r--udkapi/com/sun/star/io/SequenceInputStream.idl2
-rw-r--r--udkapi/com/sun/star/io/SocketException.idl2
-rw-r--r--udkapi/com/sun/star/io/UnexpectedEOFException.idl2
-rw-r--r--udkapi/com/sun/star/io/UnknownHostException.idl2
-rw-r--r--udkapi/com/sun/star/io/WrongFormatException.idl2
-rw-r--r--udkapi/com/sun/star/io/XActiveDataControl.idl10
-rw-r--r--udkapi/com/sun/star/io/XActiveDataSink.idl6
-rw-r--r--udkapi/com/sun/star/io/XActiveDataSource.idl6
-rw-r--r--udkapi/com/sun/star/io/XActiveDataStreamer.idl6
-rw-r--r--udkapi/com/sun/star/io/XConnectable.idl10
-rw-r--r--udkapi/com/sun/star/io/XDataExporter.idl6
-rw-r--r--udkapi/com/sun/star/io/XDataImporter.idl6
-rw-r--r--udkapi/com/sun/star/io/XDataInputStream.idl20
-rw-r--r--udkapi/com/sun/star/io/XDataOutputStream.idl20
-rw-r--r--udkapi/com/sun/star/io/XDataTransferEventListener.idl6
-rw-r--r--udkapi/com/sun/star/io/XInputStream.idl12
-rw-r--r--udkapi/com/sun/star/io/XMarkableStream.idl10
-rw-r--r--udkapi/com/sun/star/io/XOutputStream.idl8
-rw-r--r--udkapi/com/sun/star/io/XPersist.idl6
-rw-r--r--udkapi/com/sun/star/io/XPersistObject.idl4
-rw-r--r--udkapi/com/sun/star/io/XSeekable.idl8
-rw-r--r--udkapi/com/sun/star/io/XStream.idl6
-rw-r--r--udkapi/com/sun/star/io/XStreamListener.idl10
-rw-r--r--udkapi/com/sun/star/java/XJavaThreadRegister_11.idl8
-rw-r--r--udkapi/com/sun/star/java/XJavaVM.idl8
-rw-r--r--udkapi/com/sun/star/lang/ArrayIndexOutOfBoundsException.idl2
-rw-r--r--udkapi/com/sun/star/lang/ClassNotFoundException.idl2
-rw-r--r--udkapi/com/sun/star/lang/DisposedException.idl2
-rw-r--r--udkapi/com/sun/star/lang/EventObject.idl3
-rw-r--r--udkapi/com/sun/star/lang/IllegalAccessException.idl2
-rw-r--r--udkapi/com/sun/star/lang/IndexOutOfBoundsException.idl2
-rw-r--r--udkapi/com/sun/star/lang/InvalidListenerException.idl2
-rw-r--r--udkapi/com/sun/star/lang/ListenerExistException.idl2
-rw-r--r--udkapi/com/sun/star/lang/Locale.idl7
-rw-r--r--udkapi/com/sun/star/lang/NoSuchFieldException.idl2
-rw-r--r--udkapi/com/sun/star/lang/NoSuchMethodException.idl2
-rw-r--r--udkapi/com/sun/star/lang/NullPointerException.idl2
-rw-r--r--udkapi/com/sun/star/lang/ServiceNotRegisteredException.idl2
-rw-r--r--udkapi/com/sun/star/lang/SystemDependent.idl18
-rw-r--r--udkapi/com/sun/star/lang/WrappedTargetException.idl4
-rw-r--r--udkapi/com/sun/star/lang/XComponent.idl8
-rw-r--r--udkapi/com/sun/star/lang/XConnectionPoint.idl12
-rw-r--r--udkapi/com/sun/star/lang/XConnectionPointContainer.idl10
-rw-r--r--udkapi/com/sun/star/lang/XEventListener.idl4
-rw-r--r--udkapi/com/sun/star/lang/XInitialization.idl4
-rw-r--r--udkapi/com/sun/star/lang/XLocalizable.idl6
-rw-r--r--udkapi/com/sun/star/lang/XServiceName.idl4
-rw-r--r--udkapi/com/sun/star/registry/CannotRegisterImplementationException.idl2
-rw-r--r--udkapi/com/sun/star/registry/DefaultRegistry.idl3
-rw-r--r--udkapi/com/sun/star/registry/ImplementationRegistration.idl2
-rw-r--r--udkapi/com/sun/star/registry/InvalidRegistryException.idl2
-rw-r--r--udkapi/com/sun/star/registry/InvalidValueException.idl2
-rw-r--r--udkapi/com/sun/star/registry/MergeConflictException.idl2
-rw-r--r--udkapi/com/sun/star/registry/NestedRegistry.idl5
-rw-r--r--udkapi/com/sun/star/registry/RegistryKeyType.idl6
-rw-r--r--udkapi/com/sun/star/registry/RegistryValueType.idl18
-rw-r--r--udkapi/com/sun/star/registry/SimpleRegistry.idl2
-rw-r--r--udkapi/com/sun/star/registry/XImplementationRegistration.idl10
-rw-r--r--udkapi/com/sun/star/script/Engine.idl2
-rw-r--r--udkapi/com/sun/star/script/XDebugging.idl2
-rw-r--r--udkapi/com/sun/star/task/XInteractionAbort.idl2
-rw-r--r--udkapi/com/sun/star/task/XInteractionContinuation.idl2
-rw-r--r--udkapi/com/sun/star/task/XInteractionHandler.idl4
-rw-r--r--udkapi/com/sun/star/task/XInteractionRequest.idl4
-rw-r--r--udkapi/com/sun/star/task/XInteractionRetry.idl2
-rw-r--r--udkapi/com/sun/star/uno/Exception.idl2
-rw-r--r--udkapi/com/sun/star/uno/XAdapter.idl6
-rw-r--r--udkapi/com/sun/star/uno/XInterface.idl4
-rw-r--r--udkapi/com/sun/star/uno/XReference.idl4
-rw-r--r--udkapi/com/sun/star/uno/XWeak.idl4
90 files changed, 0 insertions, 431 deletions
diff --git a/udkapi/com/sun/star/beans/XIntrospection.idl b/udkapi/com/sun/star/beans/XIntrospection.idl
index 064c30d38368..e0eaed34dd49 100644
--- a/udkapi/com/sun/star/beans/XIntrospection.idl
+++ b/udkapi/com/sun/star/beans/XIntrospection.idl
@@ -27,8 +27,6 @@
module com { module sun { module star { module beans {
-
-// DocMerge from xml: interface com::sun::star::beans::XIntrospection
/** allows the inspection of an object's properties and methods.
<p><strong>Important note:</strong>An object can only be
@@ -41,8 +39,6 @@
*/
published interface XIntrospection: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::beans::XIntrospection::inspect
/** inspects the given object.
<p>It identifies all properties supported by the object
diff --git a/udkapi/com/sun/star/bridge/ModelDependent.idl b/udkapi/com/sun/star/bridge/ModelDependent.idl
index 5b8739a86bfa..be54618960c8 100644
--- a/udkapi/com/sun/star/bridge/ModelDependent.idl
+++ b/udkapi/com/sun/star/bridge/ModelDependent.idl
@@ -23,8 +23,6 @@
module com { module sun { module star { module bridge {
-
-// DocMerge from idl: constants com::sun::star::bridge::ModelDependent
/** These constants are used to specify model-dependant representations.
<p>They are only used for creating bridges to other component models.
@@ -34,23 +32,15 @@
published constants ModelDependent
{
// DOCUMENTATION OMITTED FOR constants::1
-
- // DocMerge: empty anyway
const short UNO = 1;
// DOCUMENTATION OMITTED FOR constants::2
-
- // DocMerge: empty anyway
const short OLE = 2;
// DOCUMENTATION OMITTED FOR constants::3
-
- // DocMerge: empty anyway
const short JAVA = 3;
// DOCUMENTATION OMITTED FOR constants::4
-
- // DocMerge: empty anyway
const short CORBA = 4;
};
diff --git a/udkapi/com/sun/star/connection/XAcceptor.idl b/udkapi/com/sun/star/connection/XAcceptor.idl
index 367fffb15902..c75469d81236 100644
--- a/udkapi/com/sun/star/connection/XAcceptor.idl
+++ b/udkapi/com/sun/star/connection/XAcceptor.idl
@@ -34,7 +34,6 @@ module com { module sun { module star { module connection {
*/
published interface XAcceptor: com::sun::star::uno::XInterface
{
- // DocMerge from xml: method com::sun::star::connection::XAcceptor::accept
/** accepts an interprocess connection. Waits until someone connects to the resource.
<p>
After a successful return, the method may be called again to accept
diff --git a/udkapi/com/sun/star/connection/XConnection.idl b/udkapi/com/sun/star/connection/XConnection.idl
index d69a44934d08..ebd0adceb46a 100644
--- a/udkapi/com/sun/star/connection/XConnection.idl
+++ b/udkapi/com/sun/star/connection/XConnection.idl
@@ -52,8 +52,6 @@ published interface XConnection: com::sun::star::uno::XInterface
long read( [out] sequence < byte > aReadBytes , [in] long nBytesToRead )
raises( com::sun::star::io::IOException );
-
- // DocMerge from xml: method com::sun::star::connection::XConnection::write
/** writes the given bytesequence to the stream.
<p>The method blocks until the whole sequence is written.
diff --git a/udkapi/com/sun/star/connection/XConnector.idl b/udkapi/com/sun/star/connection/XConnector.idl
index 4e4c7140ebf2..080346a5ef33 100644
--- a/udkapi/com/sun/star/connection/XConnector.idl
+++ b/udkapi/com/sun/star/connection/XConnector.idl
@@ -32,8 +32,6 @@ module com { module sun { module star { module connection {
*/
published interface XConnector: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::connection::XConnector::connect
/** creates a new connection interprocess connection.
<p>
Tries to connect to an <type>XAcceptor</type>. Behavior is unspecified
diff --git a/udkapi/com/sun/star/container/XContentEnumerationAccess.idl b/udkapi/com/sun/star/container/XContentEnumerationAccess.idl
index a64c6688be1a..762398efc876 100644
--- a/udkapi/com/sun/star/container/XContentEnumerationAccess.idl
+++ b/udkapi/com/sun/star/container/XContentEnumerationAccess.idl
@@ -48,8 +48,6 @@ published interface XContentEnumerationAccess: com::sun::star::uno::XInterface
*/
com::sun::star::container::XEnumeration createContentEnumeration( [in] string aServiceName );
-
- // DocMerge from idl: method com::sun::star::container::XContentEnumerationAccess::getAvailableServiceNames
/** @returns
all names of services of which instances exist in this object.
diff --git a/udkapi/com/sun/star/container/XIndexAccess.idl b/udkapi/com/sun/star/container/XIndexAccess.idl
index f5a745f29f7c..78196da8a0c1 100644
--- a/udkapi/com/sun/star/container/XIndexAccess.idl
+++ b/udkapi/com/sun/star/container/XIndexAccess.idl
@@ -44,8 +44,6 @@ published interface XIndexAccess: com::sun::star::container::XElementAccess
*/
long getCount();
-
- // DocMerge from idl: method com::sun::star::container::XIndexAccess::getByIndex
/** @returns
the element at the specified index.
diff --git a/udkapi/com/sun/star/io/AlreadyConnectedException.idl b/udkapi/com/sun/star/io/AlreadyConnectedException.idl
index 223c4bd8ad7f..a7d70e208df6 100644
--- a/udkapi/com/sun/star/io/AlreadyConnectedException.idl
+++ b/udkapi/com/sun/star/io/AlreadyConnectedException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: exception com::sun::star::io::AlreadyConnectedException
/** is thrown when a client tries to connect to a resource to which he is
already connected.
*/
diff --git a/udkapi/com/sun/star/io/BufferSizeExceededException.idl b/udkapi/com/sun/star/io/BufferSizeExceededException.idl
index c14d71ef4464..c12c07e8df38 100644
--- a/udkapi/com/sun/star/io/BufferSizeExceededException.idl
+++ b/udkapi/com/sun/star/io/BufferSizeExceededException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: exception com::sun::star::io::BufferSizeExceededException
/** is thrown by instances which need to buffer data.
<p>It indicates that not enough system resources are available for
extending the buffer. (May also indicate that the internal buffer
diff --git a/udkapi/com/sun/star/io/ConnectException.idl b/udkapi/com/sun/star/io/ConnectException.idl
index f82ae4875a09..aaee88d0219c 100644
--- a/udkapi/com/sun/star/io/ConnectException.idl
+++ b/udkapi/com/sun/star/io/ConnectException.idl
@@ -24,8 +24,6 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: exception com::sun::star::io::ConnectException
/** Signals that an error occurred while attempting to connect a
socket to a remote address and port. Typically, the connection
was refused remotely (e.g., no process is listening on the remote
diff --git a/udkapi/com/sun/star/io/DataInputStream.idl b/udkapi/com/sun/star/io/DataInputStream.idl
index 2585700ded01..a0ecc7937bf3 100644
--- a/udkapi/com/sun/star/io/DataInputStream.idl
+++ b/udkapi/com/sun/star/io/DataInputStream.idl
@@ -29,8 +29,6 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: service com::sun::star::io::DataInputStream
/** reads structured data from a chained <type>XInputStream</type>.
<p>
An implementation of this service in general does not need
diff --git a/udkapi/com/sun/star/io/DataOutputStream.idl b/udkapi/com/sun/star/io/DataOutputStream.idl
index d17a8cadba9f..d772c98be051 100644
--- a/udkapi/com/sun/star/io/DataOutputStream.idl
+++ b/udkapi/com/sun/star/io/DataOutputStream.idl
@@ -27,8 +27,6 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: service com::sun::star::io::DataOutputStream
/** writes structured data to a chained <type>XOutputStream</type>.
<p>
diff --git a/udkapi/com/sun/star/io/DataTransferEvent.idl b/udkapi/com/sun/star/io/DataTransferEvent.idl
index f2dd78dc7135..9f347bb0132e 100644
--- a/udkapi/com/sun/star/io/DataTransferEvent.idl
+++ b/udkapi/com/sun/star/io/DataTransferEvent.idl
@@ -25,15 +25,11 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: struct com::sun::star::io::DataTransferEvent
/** is broadcast by a filter.
@see XDataTransferEventListener
*/
published struct DataTransferEvent: com::sun::star::lang::EventObject
{
-
- // DocMerge from xml: field com::sun::star::io::DataTransferEvent::aException
/** specifies an occurred exception.
*/
any aException;
diff --git a/udkapi/com/sun/star/io/IOException.idl b/udkapi/com/sun/star/io/IOException.idl
index 6892ae3ae4b9..cdc25e547d71 100644
--- a/udkapi/com/sun/star/io/IOException.idl
+++ b/udkapi/com/sun/star/io/IOException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: exception com::sun::star::io::IOException
/** is thrown when an input or output error has occurred.
*/
published exception IOException: com::sun::star::uno::Exception
diff --git a/udkapi/com/sun/star/io/NoRouteToHostException.idl b/udkapi/com/sun/star/io/NoRouteToHostException.idl
index ae2d32acef17..46f201457e9e 100644
--- a/udkapi/com/sun/star/io/NoRouteToHostException.idl
+++ b/udkapi/com/sun/star/io/NoRouteToHostException.idl
@@ -24,8 +24,6 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: exception com::sun::star::io::NoRouteToHostException
/** Signals that an error occurred while attempting to connect a socket to
a remote address and port. Typically, the remote host cannot be reached
because of an intervening firewall, or if an intermediate router is down.
diff --git a/udkapi/com/sun/star/io/NotConnectedException.idl b/udkapi/com/sun/star/io/NotConnectedException.idl
index 04bd4a8b14f1..ca36c5620e96 100644
--- a/udkapi/com/sun/star/io/NotConnectedException.idl
+++ b/udkapi/com/sun/star/io/NotConnectedException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: exception com::sun::star::io::NotConnectedException
/** is thrown when a read/write operation is tried on an instance that has
not been chained properly.
*/
diff --git a/udkapi/com/sun/star/io/ObjectInputStream.idl b/udkapi/com/sun/star/io/ObjectInputStream.idl
index 1e539c854923..df5a2b8b1540 100644
--- a/udkapi/com/sun/star/io/ObjectInputStream.idl
+++ b/udkapi/com/sun/star/io/ObjectInputStream.idl
@@ -31,8 +31,6 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: service com::sun::star::io::ObjectInputStream
/** is a stream which allows reading the data of persistent objects.
<p>Implementations of this service must fulfill the specifications of the
diff --git a/udkapi/com/sun/star/io/ObjectOutputStream.idl b/udkapi/com/sun/star/io/ObjectOutputStream.idl
index 1b472c2b0ec9..d31b231fc338 100644
--- a/udkapi/com/sun/star/io/ObjectOutputStream.idl
+++ b/udkapi/com/sun/star/io/ObjectOutputStream.idl
@@ -29,8 +29,6 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: service com::sun::star::io::ObjectOutputStream
/** is a stream which allows writing the data of persistent objects.
<p>Implementations of this service must fulfill the specifications of the
diff --git a/udkapi/com/sun/star/io/Pipe.idl b/udkapi/com/sun/star/io/Pipe.idl
index 5ecdc361a3c2..51e716b67207 100644
--- a/udkapi/com/sun/star/io/Pipe.idl
+++ b/udkapi/com/sun/star/io/Pipe.idl
@@ -23,8 +23,6 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: service com::sun::star::io::Pipe
/** the implementation of an output stream and an input stream.
<p>
All data written through the outputstream is buffered until it is
diff --git a/udkapi/com/sun/star/io/Pump.idl b/udkapi/com/sun/star/io/Pump.idl
index 9294b5965209..ab3ecd545d3c 100644
--- a/udkapi/com/sun/star/io/Pump.idl
+++ b/udkapi/com/sun/star/io/Pump.idl
@@ -29,8 +29,6 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: service com::sun::star::io::Pump
/** the implementation of a data source and a data sink.
<p>A thread will be created that reads from the input stream and writes
the data to the connected output stream. Data will not be buffered by
diff --git a/udkapi/com/sun/star/io/SequenceInputStream.idl b/udkapi/com/sun/star/io/SequenceInputStream.idl
index 0bf730eaed4f..4a86f7df6f2c 100644
--- a/udkapi/com/sun/star/io/SequenceInputStream.idl
+++ b/udkapi/com/sun/star/io/SequenceInputStream.idl
@@ -27,8 +27,6 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: service com::sun::star::io::SequenceInputStream
/** This service allows to wrap a sequence of bytes with a stream object.
*/
published service SequenceInputStream : XSeekableInputStream
diff --git a/udkapi/com/sun/star/io/SocketException.idl b/udkapi/com/sun/star/io/SocketException.idl
index fdc73a4e3c2c..1ff4f1b584ca 100644
--- a/udkapi/com/sun/star/io/SocketException.idl
+++ b/udkapi/com/sun/star/io/SocketException.idl
@@ -24,8 +24,6 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: exception com::sun::star::io::SocketException
/** Thrown to indicate that there is an error in the underlying
protocol, such as a TCP error.
*/
diff --git a/udkapi/com/sun/star/io/UnexpectedEOFException.idl b/udkapi/com/sun/star/io/UnexpectedEOFException.idl
index 9732aad4d122..77f0e4649425 100644
--- a/udkapi/com/sun/star/io/UnexpectedEOFException.idl
+++ b/udkapi/com/sun/star/io/UnexpectedEOFException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: exception com::sun::star::io::UnexpectedEOFException
/** is thrown when the <code>EOF/code> is reached during reading a datatype
(<code>long</code>, <code>string</code>, etc.).
*/
diff --git a/udkapi/com/sun/star/io/UnknownHostException.idl b/udkapi/com/sun/star/io/UnknownHostException.idl
index ab11cf7f621a..2f533921470c 100644
--- a/udkapi/com/sun/star/io/UnknownHostException.idl
+++ b/udkapi/com/sun/star/io/UnknownHostException.idl
@@ -24,8 +24,6 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: exception com::sun::star::io::UnknownHostException
/** is thrown when the IP address of a host could not be determined.
*/
exception UnknownHostException: com::sun::star::io::IOException
diff --git a/udkapi/com/sun/star/io/WrongFormatException.idl b/udkapi/com/sun/star/io/WrongFormatException.idl
index 207d59c68e04..77ecd470fced 100644
--- a/udkapi/com/sun/star/io/WrongFormatException.idl
+++ b/udkapi/com/sun/star/io/WrongFormatException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: exception com::sun::star::io::WrongFormatException
/** is thrown when inconsistent data comes up while reading a complex
data type (<code>string</code> or object).
*/
diff --git a/udkapi/com/sun/star/io/XActiveDataControl.idl b/udkapi/com/sun/star/io/XActiveDataControl.idl
index 02b727e4a93c..f23975dea46f 100644
--- a/udkapi/com/sun/star/io/XActiveDataControl.idl
+++ b/udkapi/com/sun/star/io/XActiveDataControl.idl
@@ -27,8 +27,6 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: interface com::sun::star::io::XActiveDataControl
/** makes it possible to control an active data source.
<p>This interface should be supported by objects which implement
@@ -36,16 +34,12 @@ module com { module sun { module star { module io {
*/
published interface XActiveDataControl: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::io::XActiveDataControl::addListener
/** registers an object to receive events from this data source.
<p>It is suggested to allow multiple registration of the same listener,
thus for each time a listener is added, it has to be removed.
*/
void addListener( [in] com::sun::star::io::XStreamListener aListener );
-
- // DocMerge from xml: method com::sun::star::io::XActiveDataControl::removeListener
/** unregisters an object to receive events from this data source.
<p>It is suggested to allow multiple registration of the same listener,
@@ -53,8 +47,6 @@ published interface XActiveDataControl: com::sun::star::uno::XInterface
*/
void removeListener( [in] com::sun::star::io::XStreamListener aListener );
-
- // DocMerge from xml: method com::sun::star::io::XActiveDataControl::start
/** starts I/O.
<p>Either <member>XActiveDataControl::setInputStream()</member> or
@@ -66,8 +58,6 @@ published interface XActiveDataControl: com::sun::star::uno::XInterface
*/
void start();
-
- // DocMerge from xml: method com::sun::star::io::XActiveDataControl::terminate
/** does a weak abort.
<p>It closes all connected resources and calls
diff --git a/udkapi/com/sun/star/io/XActiveDataSink.idl b/udkapi/com/sun/star/io/XActiveDataSink.idl
index 266fde3c920f..4eb55715769a 100644
--- a/udkapi/com/sun/star/io/XActiveDataSink.idl
+++ b/udkapi/com/sun/star/io/XActiveDataSink.idl
@@ -27,8 +27,6 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: interface com::sun::star::io::XActiveDataSink
/** makes it possible to read the corresponding object from an input stream.
<p>If you want to allow control from outside, also implement the
@@ -36,8 +34,6 @@ module com { module sun { module star { module io {
*/
published interface XActiveDataSink: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::io::XActiveDataSink::setInputStream
/** plugs the input stream.
<p>If <type>XConnectable</type> is also implemented, this
@@ -46,8 +42,6 @@ published interface XActiveDataSink: com::sun::star::uno::XInterface
*/
void setInputStream( [in] com::sun::star::io::XInputStream aStream );
-
- // DocMerge from idl: method com::sun::star::io::XActiveDataSink::getInputStream
/** @returns
the plugged stream.
*/
diff --git a/udkapi/com/sun/star/io/XActiveDataSource.idl b/udkapi/com/sun/star/io/XActiveDataSource.idl
index 7dc43a2b03e4..9c4e65548409 100644
--- a/udkapi/com/sun/star/io/XActiveDataSource.idl
+++ b/udkapi/com/sun/star/io/XActiveDataSource.idl
@@ -27,16 +27,12 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: interface com::sun::star::io::XActiveDataSource
/** has to be implemented if the class should be able to write into an output
stream.
@see XActiveDataControl.
*/
published interface XActiveDataSource: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::io::XActiveDataSource::setOutputStream
/** plugs the output stream.
<p>If <type>XConnectable</type> is also implemented, this
@@ -46,8 +42,6 @@ published interface XActiveDataSource: com::sun::star::uno::XInterface
*/
void setOutputStream( [in] com::sun::star::io::XOutputStream aStream );
-
- // DocMerge from idl: method com::sun::star::io::XActiveDataSource::getOutputStream
/** @returns
the plugged stream.
*/
diff --git a/udkapi/com/sun/star/io/XActiveDataStreamer.idl b/udkapi/com/sun/star/io/XActiveDataStreamer.idl
index a65796d6ce04..4f04ad625873 100644
--- a/udkapi/com/sun/star/io/XActiveDataStreamer.idl
+++ b/udkapi/com/sun/star/io/XActiveDataStreamer.idl
@@ -27,8 +27,6 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: interface com::sun::star::io::XActiveDataStreamer
/** makes it possible to read and write the corresponding stream.
@@ -37,8 +35,6 @@ module com { module sun { module star { module io {
*/
published interface XActiveDataStreamer: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::io::XActiveDataStreamer::setStream
/** plugs the input/output stream.
<p>If <type>XConnectable</type> is also implemented, this
@@ -47,8 +43,6 @@ published interface XActiveDataStreamer: com::sun::star::uno::XInterface
*/
void setStream( [in] com::sun::star::io::XStream aStream );
-
- // DocMerge from idl: method com::sun::star::io::XActiveDataStreamer::getStream
/** @returns
the plugged stream.
*/
diff --git a/udkapi/com/sun/star/io/XConnectable.idl b/udkapi/com/sun/star/io/XConnectable.idl
index 04cb3f0fc712..f0e5d7e55143 100644
--- a/udkapi/com/sun/star/io/XConnectable.idl
+++ b/udkapi/com/sun/star/io/XConnectable.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: interface com::sun::star::io::XConnectable
/** makes it possible to connect data sinks and sources.
<p>The predecessor-member is the element in the connection that is
@@ -40,27 +38,19 @@
*/
published interface XConnectable: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::io::XConnectable::setPredecessor
/** sets the source of the data flow for this object.
*/
void setPredecessor( [in] com::sun::star::io::XConnectable aPredecessor );
-
- // DocMerge from idl: method com::sun::star::io::XConnectable::getPredecessor
/** @returns
the predecessor of this object.
*/
com::sun::star::io::XConnectable getPredecessor();
-
- // DocMerge from xml: method com::sun::star::io::XConnectable::setSuccessor
/** sets the sink of the data flow for this object.
*/
void setSuccessor( [in] com::sun::star::io::XConnectable aSuccessor );
-
- // DocMerge from idl: method com::sun::star::io::XConnectable::getSuccessor
/** @returns
the successor of this object.
*/
diff --git a/udkapi/com/sun/star/io/XDataExporter.idl b/udkapi/com/sun/star/io/XDataExporter.idl
index 99a68a009690..a51d54a8a808 100644
--- a/udkapi/com/sun/star/io/XDataExporter.idl
+++ b/udkapi/com/sun/star/io/XDataExporter.idl
@@ -31,8 +31,6 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: interface com::sun::star::io::XDataExporter
/** makes it possible to export data from a component into a data sink.
<p>Exporter objects are registered for specific components and data types.
@@ -40,16 +38,12 @@ module com { module sun { module star { module io {
*/
published interface XDataExporter: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::io::XDataExporter::exportData
/** exports data for a component into an output stream.
*/
void exportData( [in] com::sun::star::io::XOutputStream aOutputStream,
[in] com::sun::star::lang::XComponent Component,
[in] com::sun::star::io::XDataTransferEventListener aListener );
-
- // DocMerge from xml: method com::sun::star::io::XDataExporter::cancel
/** cancels the export process.
*/
void cancel();
diff --git a/udkapi/com/sun/star/io/XDataImporter.idl b/udkapi/com/sun/star/io/XDataImporter.idl
index b5938b0975eb..af4073997e00 100644
--- a/udkapi/com/sun/star/io/XDataImporter.idl
+++ b/udkapi/com/sun/star/io/XDataImporter.idl
@@ -31,24 +31,18 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: interface com::sun::star::io::XDataImporter
/** makes it possible to import data from a data source into a component.
<p>Importer objects are registered for specific components and data types.</p>
*/
published interface XDataImporter: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::io::XDataImporter::importData
/** imports data for a component from an active data source.
*/
void importData( [in] com::sun::star::io::XActiveDataSource aActiveSource,
[in] com::sun::star::lang::XComponent Component,
[in] com::sun::star::io::XDataTransferEventListener aListener );
-
- // DocMerge from xml: method com::sun::star::io::XDataImporter::cancel
/** cancels the import process.
*/
void cancel();
diff --git a/udkapi/com/sun/star/io/XDataInputStream.idl b/udkapi/com/sun/star/io/XDataInputStream.idl
index d2148a31eb11..ea22ae5ea67e 100644
--- a/udkapi/com/sun/star/io/XDataInputStream.idl
+++ b/udkapi/com/sun/star/io/XDataInputStream.idl
@@ -27,73 +27,53 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: interface com::sun::star::io::XDataInputStream
/** makes it possible to read machine-independent simple data types from a
stream.
@see com::sun::star::io::XDataOutputStream
*/
published interface XDataInputStream: com::sun::star::io::XInputStream
{
-
- // DocMerge from xml: method com::sun::star::io::XDataInputStream::readBoolean
/** reads in a boolean. It is an 8-bit value. 0 means FALSE; all
other values mean TRUE.
*/
byte readBoolean()
raises( com::sun::star::io::IOException );
-
- // DocMerge from xml: method com::sun::star::io::XDataInputStream::readByte
/** reads an 8-bit byte.
*/
byte readByte()
raises( com::sun::star::io::IOException );
-
- // DocMerge from xml: method com::sun::star::io::XDataInputStream::readChar
/** reads a 16-bit unicode character.
*/
char readChar()
raises( com::sun::star::io::IOException );
-
- // DocMerge from xml: method com::sun::star::io::XDataInputStream::readShort
/** reads a 16-bit big endian integer.
*/
short readShort()
raises( com::sun::star::io::IOException );
-
- // DocMerge from xml: method com::sun::star::io::XDataInputStream::readLong
/** reads a 32-bit big endian integer.
*/
long readLong()
raises( com::sun::star::io::IOException );
-
- // DocMerge from xml: method com::sun::star::io::XDataInputStream::readHyper
/** reads a 64-bit big endian integer.
*/
hyper readHyper()
raises( com::sun::star::io::IOException );
-
- // DocMerge from xml: method com::sun::star::io::XDataInputStream::readFloat
/** reads a 32-bit IEEE float.
*/
float readFloat()
raises( com::sun::star::io::IOException );
-
- // DocMerge from xml: method com::sun::star::io::XDataInputStream::readDouble
/** reads a 64-bit IEEE double.
*/
double readDouble()
raises( com::sun::star::io::IOException );
-
- // DocMerge from xml: method com::sun::star::io::XDataInputStream::readUTF
/** reads a string of UTF encoded characters.
*/
string readUTF()
diff --git a/udkapi/com/sun/star/io/XDataOutputStream.idl b/udkapi/com/sun/star/io/XDataOutputStream.idl
index 69836652496b..5a0e7b2f0787 100644
--- a/udkapi/com/sun/star/io/XDataOutputStream.idl
+++ b/udkapi/com/sun/star/io/XDataOutputStream.idl
@@ -27,73 +27,53 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: interface com::sun::star::io::XDataOutputStream
/** makes it possible to write machine-independent simple data types to a
stream.
@see com::sun::star::io::XDataInputStream
*/
published interface XDataOutputStream: com::sun::star::io::XOutputStream
{
-
- // DocMerge from xml: method com::sun::star::io::XDataOutputStream::writeBoolean
/** writes a boolean. It is an 8-bit value. 0 means FALSE; all other
values mean TRUE.
*/
void writeBoolean( [in] boolean Value )
raises( com::sun::star::io::IOException );
-
- // DocMerge from xml: method com::sun::star::io::XDataOutputStream::writeByte
/** writes an 8-bit byte.
*/
void writeByte( [in] byte Value )
raises( com::sun::star::io::IOException );
-
- // DocMerge from xml: method com::sun::star::io::XDataOutputStream::writeChar
/** writes a 16-bit character.
*/
void writeChar( [in] char Value )
raises( com::sun::star::io::IOException );
-
- // DocMerge from xml: method com::sun::star::io::XDataOutputStream::writeShort
/** writes a 16-bit big endian integer.
*/
void writeShort( [in] short Value )
raises( com::sun::star::io::IOException );
-
- // DocMerge from xml: method com::sun::star::io::XDataOutputStream::writeLong
/** writes a 32-bit big endian integer.
*/
void writeLong( [in] long Value )
raises( com::sun::star::io::IOException );
-
- // DocMerge from xml: method com::sun::star::io::XDataOutputStream::writeHyper
/** writes a 64-bit big endian integer.
*/
void writeHyper( [in] hyper Value )
raises( com::sun::star::io::IOException );
-
- // DocMerge from xml: method com::sun::star::io::XDataOutputStream::writeFloat
/** writes a 32-bit IEEE float.
*/
void writeFloat( [in] float Value )
raises( com::sun::star::io::IOException );
-
- // DocMerge from xml: method com::sun::star::io::XDataOutputStream::writeDouble
/** writes a 64-bit IEEE double.
*/
void writeDouble( [in] double Value )
raises( com::sun::star::io::IOException );
-
- // DocMerge from xml: method com::sun::star::io::XDataOutputStream::writeUTF
/** writes a string in UTF format.
*/
void writeUTF( [in] string Value )
diff --git a/udkapi/com/sun/star/io/XDataTransferEventListener.idl b/udkapi/com/sun/star/io/XDataTransferEventListener.idl
index 15c7b97991ce..ffde32b661ee 100644
--- a/udkapi/com/sun/star/io/XDataTransferEventListener.idl
+++ b/udkapi/com/sun/star/io/XDataTransferEventListener.idl
@@ -27,20 +27,14 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: interface com::sun::star::io::XDataTransferEventListener
/** is used to receive callbacks from an importer or exporter.
*/
published interface XDataTransferEventListener: com::sun::star::lang::XEventListener
{
-
- // DocMerge from xml: method com::sun::star::io::XDataTransferEventListener::finished
/** is called when an import or export process has finished.
*/
void finished( [in] com::sun::star::io::DataTransferEvent aEvent );
-
- // DocMerge from xml: method com::sun::star::io::XDataTransferEventListener::cancelled
/** is called when an import or export process has been cancelled.
*/
void cancelled( [in] com::sun::star::io::DataTransferEvent aEvent );
diff --git a/udkapi/com/sun/star/io/XInputStream.idl b/udkapi/com/sun/star/io/XInputStream.idl
index 90af38667849..9e65585914e5 100644
--- a/udkapi/com/sun/star/io/XInputStream.idl
+++ b/udkapi/com/sun/star/io/XInputStream.idl
@@ -29,8 +29,6 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: interface com::sun::star::io::XInputStream
/** This is the basic interface to read data from a stream.
<p>
See the <a href="http://udk.openoffice.org/common/man/concept/streams.html">
@@ -38,8 +36,6 @@ module com { module sun { module star { module io {
*/
published interface XInputStream: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::io::XInputStream::readBytes
/** reads the specified number of bytes in the given sequence.
<p>The return value specifies the number of bytes which have been
@@ -81,8 +77,6 @@ published interface XInputStream: com::sun::star::uno::XInterface
com::sun::star::io::BufferSizeExceededException,
com::sun::star::io::IOException);
-
- // DocMerge from xml: method com::sun::star::io::XInputStream::readSomeBytes
/** reads the available number of bytes, at maximum
<var>nMaxBytesToRead</var>.
@@ -104,8 +98,6 @@ published interface XInputStream: com::sun::star::uno::XInterface
com::sun::star::io::BufferSizeExceededException,
com::sun::star::io::IOException );
-
- // DocMerge from xml: method com::sun::star::io::XInputStream::skipBytes
/** skips the next <var>nBytesToSkip</var> bytes (must be positive).
<p>It is up to the implementation whether this method is
@@ -118,8 +110,6 @@ published interface XInputStream: com::sun::star::uno::XInterface
com::sun::star::io::BufferSizeExceededException,
com::sun::star::io::IOException );
-
- // DocMerge from xml: method com::sun::star::io::XInputStream::available
/** states how many bytes can be read or skipped without blocking.
<p>Note: This method offers no information on whether the EOF
@@ -130,8 +120,6 @@ published interface XInputStream: com::sun::star::uno::XInterface
com::sun::star::io::IOException
);
-
- // DocMerge from xml: method com::sun::star::io::XInputStream::closeInput
/** closes the stream.
<p>Users must close the stream explicitly when no further
diff --git a/udkapi/com/sun/star/io/XMarkableStream.idl b/udkapi/com/sun/star/io/XMarkableStream.idl
index d85cf6c9b6fd..61f80a4e8dba 100644
--- a/udkapi/com/sun/star/io/XMarkableStream.idl
+++ b/udkapi/com/sun/star/io/XMarkableStream.idl
@@ -29,21 +29,15 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: interface com::sun::star::io::XMarkableStream
/** makes it possible to set and remove seekable marks to a stream.
*/
published interface XMarkableStream: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::io::XMarkableStream::createMark
/** creates a mark of the current postion and returns an identifier to it.
*/
long createMark()
raises( com::sun::star::io::IOException );
-
- // DocMerge from xml: method com::sun::star::io::XMarkableStream::deleteMark
/** deletes the mark that you previously created with
<member>XMarkableStream::createMark</member>.
@@ -56,8 +50,6 @@ published interface XMarkableStream: com::sun::star::uno::XInterface
raises( com::sun::star::io::IOException,
com::sun::star::lang::IllegalArgumentException );
-
- // DocMerge from xml: method com::sun::star::io::XMarkableStream::jumpToMark
/** jumps to a previously created mark.
*/
void jumpToMark( [in] long nMark )
@@ -74,8 +66,6 @@ published interface XMarkableStream: com::sun::star::uno::XInterface
void jumpToFurthest()
raises( com::sun::star::io::IOException );
-
- // DocMerge from idl: method com::sun::star::io::XMarkableStream::offsetToMark
/** @returns
the offset from the current stream position to the
mark ("current position" - "mark position").
diff --git a/udkapi/com/sun/star/io/XOutputStream.idl b/udkapi/com/sun/star/io/XOutputStream.idl
index bfd81c30a6a2..83f4dd52dc20 100644
--- a/udkapi/com/sun/star/io/XOutputStream.idl
+++ b/udkapi/com/sun/star/io/XOutputStream.idl
@@ -29,8 +29,6 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: interface com::sun::star::io::XOutputStream
/** This is the basic interface to write data to a stream.
<p>
See the <a href="http://udk.openoffice.org/common/man/concept/streams.html">
@@ -38,8 +36,6 @@ module com { module sun { module star { module io {
*/
published interface XOutputStream: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::io::XOutputStream::writeBytes
/** writes the whole sequence to the stream. (blocking call)
*/
void writeBytes( [in] sequence<byte> aData )
@@ -47,8 +43,6 @@ published interface XOutputStream: com::sun::star::uno::XInterface
com::sun::star::io::BufferSizeExceededException,
com::sun::star::io::IOException);
-
- // DocMerge from xml: method com::sun::star::io::XOutputStream::flush
/** flushes out of the stream any data that may exist in buffers.
<p>The semantics of this method are rather vague. See
@@ -61,8 +55,6 @@ published interface XOutputStream: com::sun::star::uno::XInterface
com::sun::star::io::BufferSizeExceededException,
com::sun::star::io::IOException);
-
- // DocMerge from xml: method com::sun::star::io::XOutputStream::closeOutput
/** gets called to indicate that all data has been written.
<p>If this method has not yet been called, no attached
diff --git a/udkapi/com/sun/star/io/XPersist.idl b/udkapi/com/sun/star/io/XPersist.idl
index 578e952c9177..1df555eaa21a 100644
--- a/udkapi/com/sun/star/io/XPersist.idl
+++ b/udkapi/com/sun/star/io/XPersist.idl
@@ -27,20 +27,14 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: interface com::sun::star::io::XPersist
/** makes it possible to write this object to an URL or read it from an URL.
*/
published interface XPersist: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::io::XPersist::write
/** writes all the persistent data of the object to the URL.
*/
void write ( [in] string URL ) raises ( com::sun::star::io::IOException ) ;
-
- // DocMerge from xml: method com::sun::star::io::XPersist::read
/** reads all the persistent data of the object from the URL.
*/
void read ( [in] string URL ) raises ( com::sun::star::io::IOException ) ;
diff --git a/udkapi/com/sun/star/io/XPersistObject.idl b/udkapi/com/sun/star/io/XPersistObject.idl
index 19a9808f101e..af02ad0b9cff 100644
--- a/udkapi/com/sun/star/io/XPersistObject.idl
+++ b/udkapi/com/sun/star/io/XPersistObject.idl
@@ -67,8 +67,6 @@ published interface XPersistObject: com::sun::star::uno::XInterface
*/
string getServiceName();
-
- // DocMerge from xml: method com::sun::star::io::XPersistObject::write
/** writes all the persistent data of the object to the stream.
<p>The implementation
must write the data in the order documented in the service specification.
@@ -78,8 +76,6 @@ published interface XPersistObject: com::sun::star::uno::XInterface
void write( [in] com::sun::star::io::XObjectOutputStream OutStream )
raises( com::sun::star::io::IOException );
-
- // DocMerge from xml: method com::sun::star::io::XPersistObject::read
/** reads all the persistent data of the object from the stream.
<p>In case
other XPersistObjects are read from the stream, the implementation uses a factory
diff --git a/udkapi/com/sun/star/io/XSeekable.idl b/udkapi/com/sun/star/io/XSeekable.idl
index c377924e21c4..55355c2d0f87 100644
--- a/udkapi/com/sun/star/io/XSeekable.idl
+++ b/udkapi/com/sun/star/io/XSeekable.idl
@@ -27,8 +27,6 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: interface com::sun::star::io::XSeekable
/** makes it possible to seek to a certain position within a stream.
<p>This interface should be supported, if it is possible to access the
@@ -38,8 +36,6 @@ module com { module sun { module star { module io {
*/
published interface XSeekable: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::io::XSeekable::seek
/** changes the seek pointer to a new location relative to the beginning of the stream.
@@ -52,8 +48,6 @@ published interface XSeekable: com::sun::star::uno::XInterface
void seek( [in] hyper location )
raises( com::sun::star::lang::IllegalArgumentException, com::sun::star::io::IOException );
-
- // DocMerge from xml: method com::sun::star::io::XSeekable::getPosition
/** returns the current offset of the stream.
@returns
the current offset in this stream.
@@ -61,8 +55,6 @@ published interface XSeekable: com::sun::star::uno::XInterface
hyper getPosition()
raises( com::sun::star::io::IOException );
-
- // DocMerge from xml: method com::sun::star::io::XSeekable::getLength
/** returns the length of the stream.
@returns
the length of the storage medium on which the stream works.
diff --git a/udkapi/com/sun/star/io/XStream.idl b/udkapi/com/sun/star/io/XStream.idl
index e6ede57f1f8f..e4d0445f043c 100644
--- a/udkapi/com/sun/star/io/XStream.idl
+++ b/udkapi/com/sun/star/io/XStream.idl
@@ -27,14 +27,10 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: interface com::sun::star::io::XStream
/** offers read and write access to the same stream.
*/
published interface XStream: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::io::XStream::getInputStream
/** @returns
the <type>XInputStream</type> part of the stream. Closing the returned
<type>XInputStream</type> also closes any <type>XOutputStream</type> part.
@@ -42,8 +38,6 @@ published interface XStream: com::sun::star::uno::XInterface
XInputStream getInputStream();
-
- // DocMerge from xml: method com::sun::star::io::XStream::getOutputStream
/** @returns
the <type>XInputStream</type> part of the stream. Closing the returned
<type>XOutputStream</type> also closes the <type>XInputStream</type> part.
diff --git a/udkapi/com/sun/star/io/XStreamListener.idl b/udkapi/com/sun/star/io/XStreamListener.idl
index fa19b3790fe4..ed8faa0dba4e 100644
--- a/udkapi/com/sun/star/io/XStreamListener.idl
+++ b/udkapi/com/sun/star/io/XStreamListener.idl
@@ -25,20 +25,14 @@
module com { module sun { module star { module io {
-
-// DocMerge from xml: interface com::sun::star::io::XStreamListener
/** makes it possible to receive events from an active data control.
*/
published interface XStreamListener: com::sun::star::lang::XEventListener
{
-
- // DocMerge from xml: method com::sun::star::io::XStreamListener::started
/** gets called as soon as data transfer has started.
*/
void started();
-
- // DocMerge from xml: method com::sun::star::io::XStreamListener::closed
/** gets called when data transfer terminates normally or when data
transfer is terminated from outside.
@@ -47,14 +41,10 @@ published interface XStreamListener: com::sun::star::lang::XEventListener
*/
void closed();
-
- // DocMerge from xml: method com::sun::star::io::XStreamListener::terminated
/** gets called when <member>XActiveDataControl::terminate()</member> is called.
*/
void terminated();
-
- // DocMerge from xml: method com::sun::star::io::XStreamListener::error
/** gets called when an internal error in source or sink has occurred.
<p>After the method is called, the close is called on the
diff --git a/udkapi/com/sun/star/java/XJavaThreadRegister_11.idl b/udkapi/com/sun/star/java/XJavaThreadRegister_11.idl
index b5298d4de8f4..5337675567d6 100644
--- a/udkapi/com/sun/star/java/XJavaThreadRegister_11.idl
+++ b/udkapi/com/sun/star/java/XJavaThreadRegister_11.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module java {
-
-// DocMerge from xml: interface com::sun::star::java::XJavaThreadRegister_11
/** must be implemented by the user of the XJavaThreadRegister_11.
@incomplete
@@ -34,14 +32,10 @@ module com { module sun { module star { module java {
*/
published interface XJavaThreadRegister_11: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::java::XJavaThreadRegister_11::isThreadAttached
/** returns <true/> if the current thread is already attached to the VM otherwise <false/>.
*/
boolean isThreadAttached();
-
- // DocMerge from xml: method com::sun::star::java::XJavaThreadRegister_11::registerThread
/** registers the current thread.
<p>This method should be called every time a JNI function is called from Java. </p>
@@ -49,8 +43,6 @@ published interface XJavaThreadRegister_11: com::sun::star::uno::XInterface
void registerThread();
-
- // DocMerge from xml: method com::sun::star::java::XJavaThreadRegister_11::revokeThread
/** revokes the current thread from the list of registerd threads.
<p>This method should be called at the end of every JNI call from Java. </p>
diff --git a/udkapi/com/sun/star/java/XJavaVM.idl b/udkapi/com/sun/star/java/XJavaVM.idl
index 002dc607115e..ca51ab3a3b31 100644
--- a/udkapi/com/sun/star/java/XJavaVM.idl
+++ b/udkapi/com/sun/star/java/XJavaVM.idl
@@ -24,8 +24,6 @@
module com { module sun { module star { module java {
-
-// DocMerge from xml: interface com::sun::star::java::XJavaVM
/** must be implemented by the user of the XJavaVM.
@deprecated
@@ -38,8 +36,6 @@ module com { module sun { module star { module java {
*/
published interface XJavaVM: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::java::XJavaVM::getJavaVM
/** returns the address of the Java Virtual Machine.
<p>If the VM is not already instantiated, it will be now.</p>
@@ -100,14 +96,10 @@ published interface XJavaVM: com::sun::star::uno::XInterface
*/
any getJavaVM( [in] sequence<byte> processID );
-
- // DocMerge from xml: method com::sun::star::java::XJavaVM::isVMStarted
/** returns <true/> if the VM is started successfully, otherwise <false/>.
*/
boolean isVMStarted();
-
- // DocMerge from xml: method com::sun::star::java::XJavaVM::isVMEnabled
/** Returns <true/> if the VM is enabled.
<p>It is only possible to get the VM, if this method return 0. </p>
diff --git a/udkapi/com/sun/star/lang/ArrayIndexOutOfBoundsException.idl b/udkapi/com/sun/star/lang/ArrayIndexOutOfBoundsException.idl
index 432026d567f4..a0deac4edcd5 100644
--- a/udkapi/com/sun/star/lang/ArrayIndexOutOfBoundsException.idl
+++ b/udkapi/com/sun/star/lang/ArrayIndexOutOfBoundsException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module lang {
-
-// DocMerge from xml: exception com::sun::star::lang::ArrayIndexOutOfBoundsException
/** This exception is thrown to indicate that an array has been
accessed with an illegal index.
diff --git a/udkapi/com/sun/star/lang/ClassNotFoundException.idl b/udkapi/com/sun/star/lang/ClassNotFoundException.idl
index 5780755c080c..ef3c228a3112 100644
--- a/udkapi/com/sun/star/lang/ClassNotFoundException.idl
+++ b/udkapi/com/sun/star/lang/ClassNotFoundException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module lang {
-
-// DocMerge from xml: exception com::sun::star::lang::ClassNotFoundException
/** This exception is thrown when an application tries to load
the information on the type through its string name.
*/
diff --git a/udkapi/com/sun/star/lang/DisposedException.idl b/udkapi/com/sun/star/lang/DisposedException.idl
index f10db6a6d543..6f26cc899d3d 100644
--- a/udkapi/com/sun/star/lang/DisposedException.idl
+++ b/udkapi/com/sun/star/lang/DisposedException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module lang {
-
-// DocMerge from xml: exception com::sun::star::lang::DisposedException
/** This exception occurs if the object behind this interface has been
disposed before and can't uphold its method specification anymore.
diff --git a/udkapi/com/sun/star/lang/EventObject.idl b/udkapi/com/sun/star/lang/EventObject.idl
index 1061cd23af11..3fa039fb334d 100644
--- a/udkapi/com/sun/star/lang/EventObject.idl
+++ b/udkapi/com/sun/star/lang/EventObject.idl
@@ -25,14 +25,11 @@
module com { module sun { module star { module lang {
-
-// DocMerge from xml: struct com::sun::star::lang::EventObject
/** specifies the base for all event objects and identifies the
source of the event.
*/
published struct EventObject
{
- // DocMerge from xml: field com::sun::star::lang::EventObject::Source
/** refers to the object that fired the event.
*/
com::sun::star::uno::XInterface Source;
diff --git a/udkapi/com/sun/star/lang/IllegalAccessException.idl b/udkapi/com/sun/star/lang/IllegalAccessException.idl
index 8c13be4c6329..e4fb8fd7b110 100644
--- a/udkapi/com/sun/star/lang/IllegalAccessException.idl
+++ b/udkapi/com/sun/star/lang/IllegalAccessException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module lang {
-
-// DocMerge from xml: exception com::sun::star::lang::IllegalAccessException
/** This exception is thrown when an application tries to change
a constant property.
*/
diff --git a/udkapi/com/sun/star/lang/IndexOutOfBoundsException.idl b/udkapi/com/sun/star/lang/IndexOutOfBoundsException.idl
index 18d02e76717d..6c64ef7a07b7 100644
--- a/udkapi/com/sun/star/lang/IndexOutOfBoundsException.idl
+++ b/udkapi/com/sun/star/lang/IndexOutOfBoundsException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module lang {
-
-// DocMerge from xml: exception com::sun::star::lang::IndexOutOfBoundsException
/** This exception is thrown to indicate that a container has been
accessed with an illegal index.
diff --git a/udkapi/com/sun/star/lang/InvalidListenerException.idl b/udkapi/com/sun/star/lang/InvalidListenerException.idl
index be451657352e..44324fe80810 100644
--- a/udkapi/com/sun/star/lang/InvalidListenerException.idl
+++ b/udkapi/com/sun/star/lang/InvalidListenerException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module lang {
-
-// DocMerge from xml: exception com::sun::star::lang::InvalidListenerException
/** is thrown by the <member>XConnectionPoint::advice</member> method
to indicate that the listener has not supplied the necessary
interface.
diff --git a/udkapi/com/sun/star/lang/ListenerExistException.idl b/udkapi/com/sun/star/lang/ListenerExistException.idl
index 27c72b1ed05d..35d9d3d0ca7f 100644
--- a/udkapi/com/sun/star/lang/ListenerExistException.idl
+++ b/udkapi/com/sun/star/lang/ListenerExistException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module lang {
-
-// DocMerge from xml: exception com::sun::star::lang::ListenerExistException
/** is thrown by the <member>XConnectionPoint::advise</member> method
to indicate that there is only one listener allowed.
diff --git a/udkapi/com/sun/star/lang/Locale.idl b/udkapi/com/sun/star/lang/Locale.idl
index 88e0baed5165..3bcf06d52b27 100644
--- a/udkapi/com/sun/star/lang/Locale.idl
+++ b/udkapi/com/sun/star/lang/Locale.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module lang {
-
-// DocMerge from xml: struct com::sun::star::lang::Locale
/** object represents a specific geographical, political, or cultural region.
<p>An operation that requires a <code>Locale</code> to perform
@@ -53,7 +51,6 @@ module com { module sun { module star { module lang {
*/
published struct Locale
{
- // DocMerge from xml: field com::sun::star::lang::Locale::Language
/** specifies an <strong>ISO Language Code</strong>.
<p>These codes are the lower-case two-letter codes as defined by
@@ -68,8 +65,6 @@ published struct Locale
*/
string Language;
-
- // DocMerge from xml: field com::sun::star::lang::Locale::Country
/** specifies an <strong>ISO Country Code.</strong>
<p>These codes are the upper-case two-letter codes as
@@ -84,8 +79,6 @@ published struct Locale
*/
string Country;
-
- // DocMerge from xml: field com::sun::star::lang::Locale::Variant
/** contains a variant of the locale; codes are vendor and
browser-specific.
diff --git a/udkapi/com/sun/star/lang/NoSuchFieldException.idl b/udkapi/com/sun/star/lang/NoSuchFieldException.idl
index 677a4885b229..72c2125e2248 100644
--- a/udkapi/com/sun/star/lang/NoSuchFieldException.idl
+++ b/udkapi/com/sun/star/lang/NoSuchFieldException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module lang {
-
-// DocMerge from xml: exception com::sun::star::lang::NoSuchFieldException
/** signals that the class does not have a field of a specified name.
*/
published exception NoSuchFieldException: com::sun::star::uno::Exception
diff --git a/udkapi/com/sun/star/lang/NoSuchMethodException.idl b/udkapi/com/sun/star/lang/NoSuchMethodException.idl
index d7ae3175ba84..5511cc489b55 100644
--- a/udkapi/com/sun/star/lang/NoSuchMethodException.idl
+++ b/udkapi/com/sun/star/lang/NoSuchMethodException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module lang {
-
-// DocMerge from xml: exception com::sun::star::lang::NoSuchMethodException
/** signals that the interface does not have a method of a specified name.
*/
published exception NoSuchMethodException: com::sun::star::uno::Exception
diff --git a/udkapi/com/sun/star/lang/NullPointerException.idl b/udkapi/com/sun/star/lang/NullPointerException.idl
index 05169bce9404..e3bed8468dab 100644
--- a/udkapi/com/sun/star/lang/NullPointerException.idl
+++ b/udkapi/com/sun/star/lang/NullPointerException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module lang {
-
-// DocMerge from xml: exception com::sun::star::lang::NullPointerException
/** This exception is thrown when an application attempts to use
<NULL/> in a case where an object is required.
diff --git a/udkapi/com/sun/star/lang/ServiceNotRegisteredException.idl b/udkapi/com/sun/star/lang/ServiceNotRegisteredException.idl
index 3cf7ec3b98c5..bbf7447d32fe 100644
--- a/udkapi/com/sun/star/lang/ServiceNotRegisteredException.idl
+++ b/udkapi/com/sun/star/lang/ServiceNotRegisteredException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module lang {
-
-// DocMerge from xml: exception com::sun::star::lang::ServiceNotRegisteredException
/** This exception is thrown when a needed service is not found.
<p>Applications should throw instances of this class to indicate
diff --git a/udkapi/com/sun/star/lang/SystemDependent.idl b/udkapi/com/sun/star/lang/SystemDependent.idl
index 9c22fc95fd4d..89447b467f59 100644
--- a/udkapi/com/sun/star/lang/SystemDependent.idl
+++ b/udkapi/com/sun/star/lang/SystemDependent.idl
@@ -23,8 +23,6 @@
module com { module sun { module star { module lang {
-
-// DocMerge from idl: constants com::sun::star::lang::SystemDependent
/** These constants are used to specify systems which depend on return values.
<p> You should avoid system-dependent methods if possible.
@@ -48,24 +46,18 @@ module com { module sun { module star { module lang {
*/
published constants SystemDependent
{
-
- // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_WIN32
/** The called interface method returns a value specified for Windows.
<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 16-bit Windows.
<p>This is Windows 3.11. </p>
*/
const short SYSTEM_WIN16 = 2;
-
- // DocMerge from idl: value com::sun::star::lang::SystemDependent::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>,
@@ -77,31 +69,21 @@ published constants SystemDependent
*/
const short SYSTEM_JAVA = 3;
-
- // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_OS2
/** 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 <em>Mac OS X</em>.
*/
const short SYSTEM_MAC = 5;
-
- // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW
/** 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;
diff --git a/udkapi/com/sun/star/lang/WrappedTargetException.idl b/udkapi/com/sun/star/lang/WrappedTargetException.idl
index 86a81a04a072..de07139b82c0 100644
--- a/udkapi/com/sun/star/lang/WrappedTargetException.idl
+++ b/udkapi/com/sun/star/lang/WrappedTargetException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module lang {
-
-// DocMerge from xml: exception com::sun::star::lang::WrappedTargetException
/** This is a checked exception that wraps an exception thrown
by the original target.
@@ -38,8 +36,6 @@ module com { module sun { module star { module lang {
*/
published exception WrappedTargetException: com::sun::star::uno::Exception
{
-
- // DocMerge from xml: field com::sun::star::lang::WrappedTargetException::TargetException
/** The exception is thrown by the target.
*/
any TargetException;
diff --git a/udkapi/com/sun/star/lang/XComponent.idl b/udkapi/com/sun/star/lang/XComponent.idl
index f7bc63967e55..a40e24f0b7ad 100644
--- a/udkapi/com/sun/star/lang/XComponent.idl
+++ b/udkapi/com/sun/star/lang/XComponent.idl
@@ -26,8 +26,6 @@ module com { module sun { module star { module lang {
published interface XEventListener;
-
-// DocMerge from xml: interface com::sun::star::lang::XComponent
/** allows to exclicitly free resources and break cyclic references.
<p>Actually the real lifetime of an UNO object is controlled by
@@ -43,8 +41,6 @@ module com { module sun { module star { module lang {
*/
published interface XComponent: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::lang::XComponent::dispose
/** The owner of an object calls this method to explicitly free all
resources kept by this object and thus break cyclic references.
@@ -76,8 +72,6 @@ published interface XComponent: com::sun::star::uno::XInterface
*/
void dispose();
-
- // DocMerge from xml: method com::sun::star::lang::XComponent::addEventListener
/** adds an event listener to the object.
<p>The broadcaster fires the disposing method of this listener
@@ -100,8 +94,6 @@ published interface XComponent: com::sun::star::uno::XInterface
*/
void addEventListener( [in] XEventListener xListener );
-
- // DocMerge from xml: method com::sun::star::lang::XComponent::removeEventListener
/** removes an event listener from the listener list.
<p>It is a "noop" if the specified listener is not registered.</p>
diff --git a/udkapi/com/sun/star/lang/XConnectionPoint.idl b/udkapi/com/sun/star/lang/XConnectionPoint.idl
index 08b78b23c9d6..90e9dcd0bbee 100644
--- a/udkapi/com/sun/star/lang/XConnectionPoint.idl
+++ b/udkapi/com/sun/star/lang/XConnectionPoint.idl
@@ -30,8 +30,6 @@
module com { module sun { module star { module lang {
-
-// DocMerge from idl: interface com::sun::star::lang::XConnectionPoint
/** supports connection points for connectable objects.
<p>Connectable objects support the following features: </p>
@@ -90,8 +88,6 @@ module com { module sun { module star { module lang {
*/
published interface XConnectionPoint: com::sun::star::uno::XInterface
{
-
- // DocMerge from idl: method com::sun::star::lang::XConnectionPoint::getConnectionType
/** @returns
the type of the outgoing interface managed by this
connection point.
@@ -108,8 +104,6 @@ published interface XConnectionPoint: com::sun::star::uno::XInterface
*/
type getConnectionType();
-
- // DocMerge from idl: method com::sun::star::lang::XConnectionPoint::getConnectionPointContainer
/** @returns
the <type>XConnectionPointContainer</type> interface on
the parent connectable object.
@@ -118,8 +112,6 @@ published interface XConnectionPoint: com::sun::star::uno::XInterface
*/
com::sun::star::lang::XConnectionPointContainer getConnectionPointContainer();
-
- // DocMerge from idl: method com::sun::star::lang::XConnectionPoint::advise
/** creates a connection between a connection point and a
client's sink, where the sink implements the outgoing interface
supported by this connection point.
@@ -147,8 +139,6 @@ published interface XConnectionPoint: com::sun::star::uno::XInterface
raises( com::sun::star::lang::ListenerExistException,
com::sun::star::lang::InvalidListenerException );
-
- // DocMerge from idl: method com::sun::star::lang::XConnectionPoint::unadvise
/** terminates a notification previously set up with advise.
<p>A few <code>remove...Listener</code> methods need additional
@@ -164,8 +154,6 @@ published interface XConnectionPoint: com::sun::star::uno::XInterface
*/
void unadvise( [in] com::sun::star::uno::XInterface xListener );
-
- // DocMerge from idl: method com::sun::star::lang::XConnectionPoint::getConnections
/** @returns
a sequence of all currently advised connections.
*/
diff --git a/udkapi/com/sun/star/lang/XConnectionPointContainer.idl b/udkapi/com/sun/star/lang/XConnectionPointContainer.idl
index 54ca701e989d..7135e975d58d 100644
--- a/udkapi/com/sun/star/lang/XConnectionPointContainer.idl
+++ b/udkapi/com/sun/star/lang/XConnectionPointContainer.idl
@@ -26,8 +26,6 @@ module com { module sun { module star { module lang {
published interface XConnectionPoint;
-
-// DocMerge from xml: interface com::sun::star::lang::XConnectionPointContainer
/** makes it possible to locate a specific connection point
for a specified UIK and manages a sequence of connections points.
@@ -40,16 +38,12 @@ module com { module sun { module star { module lang {
*/
published interface XConnectionPointContainer: com::sun::star::uno::XInterface
{
-
- // DocMerge from idl: method com::sun::star::lang::XConnectionPointContainer::getConnectionPointTypes
/** @returns
a sequence of all outgoing types; specifies which are supported
by this connectable object.
*/
sequence<type> getConnectionPointTypes();
-
- // DocMerge from idl: method com::sun::star::lang::XConnectionPointContainer::queryConnectionPoint
/** @returns
an <type>XConnectionPoint</type> interface of a
connection point for a specified type if that type
@@ -61,8 +55,6 @@ published interface XConnectionPointContainer: com::sun::star::uno::XInterface
*/
XConnectionPoint queryConnectionPoint( [in] type aType );
-
- // DocMerge from xml: method com::sun::star::lang::XConnectionPointContainer::advise
/** creates a connection between this object and a
client's sink, where the sink implements the outgoing
interface specified with ID.
@@ -80,8 +72,6 @@ published interface XConnectionPointContainer: com::sun::star::uno::XInterface
void advise( [in] type aType,
[in] com::sun::star::uno::XInterface xListener );
-
- // DocMerge from xml: method com::sun::star::lang::XConnectionPointContainer::unadvise
/** terminates a notification previously set up with
advise at the container or at the suitable connection point.
diff --git a/udkapi/com/sun/star/lang/XEventListener.idl b/udkapi/com/sun/star/lang/XEventListener.idl
index 6faef728f0c2..7b8aaf23448c 100644
--- a/udkapi/com/sun/star/lang/XEventListener.idl
+++ b/udkapi/com/sun/star/lang/XEventListener.idl
@@ -27,14 +27,10 @@
module com { module sun { module star { module lang {
-
-// DocMerge from xml: interface com::sun::star::lang::XEventListener
/** base interface for all event listeners interfaces.
*/
published interface XEventListener: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::lang::XEventListener::disposing
/** gets called when the broadcaster is about to be disposed.
<p>All listeners and all other objects, which reference the
diff --git a/udkapi/com/sun/star/lang/XInitialization.idl b/udkapi/com/sun/star/lang/XInitialization.idl
index 36e494527d39..f2f19e3cf9ef 100644
--- a/udkapi/com/sun/star/lang/XInitialization.idl
+++ b/udkapi/com/sun/star/lang/XInitialization.idl
@@ -27,8 +27,6 @@
module com { module sun { module star { module lang {
-
-// DocMerge from xml: interface com::sun::star::lang::XInitialization
/** initializes an object directly after its creation.
<p>This interface works together with factories. If you want to
@@ -47,8 +45,6 @@ module com { module sun { module star { module lang {
*/
published interface XInitialization: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::lang::XInitialization::initialize
/** initializes the object.
<p>It should be called directly after the object is created.
diff --git a/udkapi/com/sun/star/lang/XLocalizable.idl b/udkapi/com/sun/star/lang/XLocalizable.idl
index c556348ad714..da79f4f1018b 100644
--- a/udkapi/com/sun/star/lang/XLocalizable.idl
+++ b/udkapi/com/sun/star/lang/XLocalizable.idl
@@ -26,20 +26,14 @@
module com { module sun { module star { module lang {
-
-// DocMerge from xml: interface com::sun::star::lang::XLocalizable
/** makes it possible to set a <type>Locale</type> to be used by the object.
*/
published interface XLocalizable: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::lang::XLocalizable::setLocale
/** sets the locale to be used by this object.
*/
void setLocale( [in] Locale eLocale );
-
- // DocMerge from idl: method com::sun::star::lang::XLocalizable::getLocale
/** @returns
the locale, which is used by this object.
*/
diff --git a/udkapi/com/sun/star/lang/XServiceName.idl b/udkapi/com/sun/star/lang/XServiceName.idl
index cf8935c06d0d..74da0504348c 100644
--- a/udkapi/com/sun/star/lang/XServiceName.idl
+++ b/udkapi/com/sun/star/lang/XServiceName.idl
@@ -25,15 +25,11 @@
module com { module sun { module star { module lang {
-
-// DocMerge from xml: interface com::sun::star::lang::XServiceName
/** identifies the object with a service name which can be used to create
such an object by a factory.
*/
published interface XServiceName: com::sun::star::uno::XInterface
{
-
- // DocMerge from idl: method com::sun::star::lang::XServiceName::getServiceName
/** @returns
the service name that can be used to create such an object
by a factory.
diff --git a/udkapi/com/sun/star/registry/CannotRegisterImplementationException.idl b/udkapi/com/sun/star/registry/CannotRegisterImplementationException.idl
index 2f8677462340..1a3d1346168d 100644
--- a/udkapi/com/sun/star/registry/CannotRegisterImplementationException.idl
+++ b/udkapi/com/sun/star/registry/CannotRegisterImplementationException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module registry {
-
-// DocMerge from xml: exception com::sun::star::registry::CannotRegisterImplementationException
/** is thrown when an application tries to register a new component (implementation) using the
<member>XImplementationRegistration::registerImplementation()</member>
method, but the component cannot be registered. The reason for this exception could be:<br>
diff --git a/udkapi/com/sun/star/registry/DefaultRegistry.idl b/udkapi/com/sun/star/registry/DefaultRegistry.idl
index ad0972659b0f..d68811b61e10 100644
--- a/udkapi/com/sun/star/registry/DefaultRegistry.idl
+++ b/udkapi/com/sun/star/registry/DefaultRegistry.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module registry {
-
-// DocMerge from xml: service com::sun::star::registry::DefaultRegistry
/** implicitly supports a local registry and a read-only
system registry for global information.
In the context of this service,
@@ -136,7 +134,6 @@
*/
published service DefaultRegistry
{
- // DocMerge: empty anyway
interface com::sun::star::registry::XSimpleRegistry;
};
diff --git a/udkapi/com/sun/star/registry/ImplementationRegistration.idl b/udkapi/com/sun/star/registry/ImplementationRegistration.idl
index bc2446c06f2f..80fbd1df2517 100644
--- a/udkapi/com/sun/star/registry/ImplementationRegistration.idl
+++ b/udkapi/com/sun/star/registry/ImplementationRegistration.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module registry {
-
-// DocMerge from xml: service com::sun::star::registry::ImplementationRegistration
/** is the implementation of the interface <type>XImplementationRegistration</type>.
This service can be used to install or uninstall components (implementations).
Further, it is possible to check if all runtime dependencies (needed services) are
diff --git a/udkapi/com/sun/star/registry/InvalidRegistryException.idl b/udkapi/com/sun/star/registry/InvalidRegistryException.idl
index 141ea2c8e665..e5c3d48c608d 100644
--- a/udkapi/com/sun/star/registry/InvalidRegistryException.idl
+++ b/udkapi/com/sun/star/registry/InvalidRegistryException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module registry {
-
-// DocMerge from xml: exception com::sun::star::registry::InvalidRegistryException
/** signals that the registry is invalid or an operation on the registry
failed.
*/
diff --git a/udkapi/com/sun/star/registry/InvalidValueException.idl b/udkapi/com/sun/star/registry/InvalidValueException.idl
index 1b3919ca7523..81bd011d1760 100644
--- a/udkapi/com/sun/star/registry/InvalidValueException.idl
+++ b/udkapi/com/sun/star/registry/InvalidValueException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module registry {
-
-// DocMerge from xml: exception com::sun::star::registry::InvalidValueException
/** signals that the value of the key is invalid or does not have the
appropriate key type.
*/
diff --git a/udkapi/com/sun/star/registry/MergeConflictException.idl b/udkapi/com/sun/star/registry/MergeConflictException.idl
index 6c77b4ffae11..676e63ebab0d 100644
--- a/udkapi/com/sun/star/registry/MergeConflictException.idl
+++ b/udkapi/com/sun/star/registry/MergeConflictException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module registry {
-
-// DocMerge from xml: exception com::sun::star::registry::MergeConflictException
/** is thrown if entries of two registries are contradictory in the context of
<member>XSimpleRegistry::mergeKey()e</member> method.
*/
diff --git a/udkapi/com/sun/star/registry/NestedRegistry.idl b/udkapi/com/sun/star/registry/NestedRegistry.idl
index d44e8d6f3003..95c7a33426a6 100644
--- a/udkapi/com/sun/star/registry/NestedRegistry.idl
+++ b/udkapi/com/sun/star/registry/NestedRegistry.idl
@@ -26,8 +26,6 @@
module com { module sun { module star { module registry {
-
-// DocMerge from xml: service com::sun::star::registry::NestedRegistry
/** supports a shared view on two different registries. The registry
files will be opened in two different modes, registry1 will be opened with read/write
rights and registry2 will be opened read-only.
@@ -130,10 +128,7 @@
*/
published service NestedRegistry
{
- // DocMerge: empty anyway
interface com::sun::star::registry::XSimpleRegistry;
-
- // DocMerge: empty anyway
interface com::sun::star::lang::XInitialization;
};
diff --git a/udkapi/com/sun/star/registry/RegistryKeyType.idl b/udkapi/com/sun/star/registry/RegistryKeyType.idl
index f1c85e1ee7d4..00157b57c93d 100644
--- a/udkapi/com/sun/star/registry/RegistryKeyType.idl
+++ b/udkapi/com/sun/star/registry/RegistryKeyType.idl
@@ -23,8 +23,6 @@
module com { module sun { module star { module registry {
-
-// DocMerge from xml: enum com::sun::star::registry::RegistryKeyType
/** represents all possible types of a key.
<p>A key can be a normal key with a value and subkeys, or it can be a
@@ -33,13 +31,9 @@
published enum RegistryKeyType
{
// DOCUMENTATION OMITTED FOR RegistryKeyType:: KEY,
-
- // DocMerge: empty anyway
KEY,
// DOCUMENTATION OMITTED FOR RegistryKeyType:: LINK
-
- // DocMerge: empty anyway
LINK
};
diff --git a/udkapi/com/sun/star/registry/RegistryValueType.idl b/udkapi/com/sun/star/registry/RegistryValueType.idl
index 6abcc2c07b43..11bfbf6a67d4 100644
--- a/udkapi/com/sun/star/registry/RegistryValueType.idl
+++ b/udkapi/com/sun/star/registry/RegistryValueType.idl
@@ -23,8 +23,6 @@
module com { module sun { module star { module registry {
-
-// DocMerge from xml: enum com::sun::star::registry::RegistryValueType
/** represents all possible types of a key value.
<p>An ASCII value and a string value will both be handled with type
@@ -34,57 +32,41 @@
published enum RegistryValueType
{
// DOCUMENTATION OMITTED FOR RegistryValueType:: NOT_DEFINED,
-
- // DocMerge from xml: value com::sun::star::registry::RegistryValueType::NOT_DEFINED
/** the type of the key is not defined.
*/
NOT_DEFINED,
// DOCUMENTATION OMITTED FOR RegistryValueType:: LONG,
-
- // DocMerge from xml: value com::sun::star::registry::RegistryValueType::LONG
/** the type of the key is long.
*/
LONG,
// DOCUMENTATION OMITTED FOR RegistryValueType:: ASCII,
-
- // DocMerge from xml: value com::sun::star::registry::RegistryValueType::ASCII
/** the type of the key is ASCII.
*/
ASCII,
// DOCUMENTATION OMITTED FOR RegistryValueType:: STRING,
-
- // DocMerge from xml: value com::sun::star::registry::RegistryValueType::STRING
/** the type of the key is a string.
*/
STRING,
// DOCUMENTATION OMITTED FOR RegistryValueType:: BINARY,
-
- // DocMerge from xml: value com::sun::star::registry::RegistryValueType::BINARY
/** the type of the key is binary.
*/
BINARY,
// DOCUMENTATION OMITTED FOR RegistryValueType:: LONGLIST,
-
- // DocMerge from xml: value com::sun::star::registry::RegistryValueType::LONGLIST
/** the type of the key is LONGLIST.
*/
LONGLIST,
// DOCUMENTATION OMITTED FOR RegistryValueType:: ASCIILIST,
-
- // DocMerge from xml: value com::sun::star::registry::RegistryValueType::ASCIILIST
/** the type of the key is a ASCIILIST.
*/
ASCIILIST,
// DOCUMENTATION OMITTED FOR RegistryValueType:: STRINGLIST
-
- // DocMerge from xml: value com::sun::star::registry::RegistryValueType::STRINGLIST
/** the type of the key is a STRINGLIST.
*/
STRINGLIST
diff --git a/udkapi/com/sun/star/registry/SimpleRegistry.idl b/udkapi/com/sun/star/registry/SimpleRegistry.idl
index 161d4719a6a3..14fe698916fc 100644
--- a/udkapi/com/sun/star/registry/SimpleRegistry.idl
+++ b/udkapi/com/sun/star/registry/SimpleRegistry.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module registry {
-
-// DocMerge from xml: service com::sun::star::registry::SimpleRegistry
/** makes it possible to create, open, or close a registry. Further, it is
possible to merge a registry under a specified key in the open registry.
diff --git a/udkapi/com/sun/star/registry/XImplementationRegistration.idl b/udkapi/com/sun/star/registry/XImplementationRegistration.idl
index df6822a26eb8..13d031771b85 100644
--- a/udkapi/com/sun/star/registry/XImplementationRegistration.idl
+++ b/udkapi/com/sun/star/registry/XImplementationRegistration.idl
@@ -29,15 +29,11 @@
module com { module sun { module star { module registry {
-
-// DocMerge from xml: interface com::sun::star::registry::XImplementationRegistration
/** offers a registry for implementation objects and provides information
about the registered implementations.
*/
published interface XImplementationRegistration: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::registry::XImplementationRegistration::registerImplementation
/** registers a component which provides one or more implementations.
@param aLocation
@@ -53,8 +49,6 @@ published interface XImplementationRegistration: com::sun::star::uno::XInterface
[in] com::sun::star::registry::XSimpleRegistry xReg )
raises( com::sun::star::registry::CannotRegisterImplementationException );
-
- // DocMerge from xml: method com::sun::star::registry::XImplementationRegistration::revokeImplementation
/** revokes a component and all their provided implementations from the registry.
@param aLocation
@@ -69,8 +63,6 @@ published interface XImplementationRegistration: com::sun::star::uno::XInterface
[in] com::sun::star::registry::XSimpleRegistry xReg );
// DOCUMENTATION CHANGED FOR XImplementationRegistration::getImplementations
-
- // DocMerge from idl: method com::sun::star::registry::XImplementationRegistration::getImplementations
/** @returns
the names of the implementations registered by the url location.
@@ -86,8 +78,6 @@ published interface XImplementationRegistration: com::sun::star::uno::XInterface
[in] string aLocation );
// DOCUMENTATION CHANGED FOR XImplementationRegistration::checkInstantiation
-
- // DocMerge from idl: method com::sun::star::registry::XImplementationRegistration::checkInstantiation
/** @returns
a sequence with names of the missing services to create an instance of this implementation.
diff --git a/udkapi/com/sun/star/script/Engine.idl b/udkapi/com/sun/star/script/Engine.idl
index 95ba668ae54f..a3e59284f1e8 100644
--- a/udkapi/com/sun/star/script/Engine.idl
+++ b/udkapi/com/sun/star/script/Engine.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module script {
-
-// DocMerge from xml: service com::sun::star::script::Engine
/** service that any scripting engine must implement.
<p>The implementation of this
diff --git a/udkapi/com/sun/star/script/XDebugging.idl b/udkapi/com/sun/star/script/XDebugging.idl
index 2cd9b0f95659..da98b39d282a 100644
--- a/udkapi/com/sun/star/script/XDebugging.idl
+++ b/udkapi/com/sun/star/script/XDebugging.idl
@@ -27,8 +27,6 @@
module com { module sun { module star { module script {
-
-// DocMerge from xml: interface com::sun::star::script::XDebugging
/** makes it possible to set breakpoints in an interpreter.
@deprecated
*/
diff --git a/udkapi/com/sun/star/task/XInteractionAbort.idl b/udkapi/com/sun/star/task/XInteractionAbort.idl
index 82845236f590..85a1047432c5 100644
--- a/udkapi/com/sun/star/task/XInteractionAbort.idl
+++ b/udkapi/com/sun/star/task/XInteractionAbort.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module task {
-
-// DocMerge from xml: interface com::sun::star::task::XInteractionAbort
/** An interaction continuation specifing to abort executing the process that
issued the request.
*/
diff --git a/udkapi/com/sun/star/task/XInteractionContinuation.idl b/udkapi/com/sun/star/task/XInteractionContinuation.idl
index fb1770998f19..639d2f742e50 100644
--- a/udkapi/com/sun/star/task/XInteractionContinuation.idl
+++ b/udkapi/com/sun/star/task/XInteractionContinuation.idl
@@ -32,8 +32,6 @@
*/
published interface XInteractionContinuation: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::task::XInteractionContinuation::select
/** Select this way of continuing from an
<type scope="com::sun::star::task">XInteractionRequest</type> (given a
choice of various
diff --git a/udkapi/com/sun/star/task/XInteractionHandler.idl b/udkapi/com/sun/star/task/XInteractionHandler.idl
index 999f02edb468..26e765c5e3fa 100644
--- a/udkapi/com/sun/star/task/XInteractionHandler.idl
+++ b/udkapi/com/sun/star/task/XInteractionHandler.idl
@@ -27,14 +27,10 @@
module com { module sun { module star { module task {
-
-// DocMerge from xml: interface com::sun::star::task::XInteractionHandler
/** An interaction request handler.
*/
published interface XInteractionHandler: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::task::XInteractionHandler::handle
/** Handle an interaction request.
*/
void handle( [in] com::sun::star::task::XInteractionRequest Request );
diff --git a/udkapi/com/sun/star/task/XInteractionRequest.idl b/udkapi/com/sun/star/task/XInteractionRequest.idl
index b9bd38194570..fdb14fde1298 100644
--- a/udkapi/com/sun/star/task/XInteractionRequest.idl
+++ b/udkapi/com/sun/star/task/XInteractionRequest.idl
@@ -27,14 +27,10 @@
module com { module sun { module star { module task {
-
-// DocMerge from xml: interface com::sun::star::task::XInteractionRequest
/** The description of an interaction request.
*/
published interface XInteractionRequest: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::task::XInteractionRequest::getRequest
/** Get information about the request itself.
@returns
diff --git a/udkapi/com/sun/star/task/XInteractionRetry.idl b/udkapi/com/sun/star/task/XInteractionRetry.idl
index 6f92b16d903d..ddef7526eea2 100644
--- a/udkapi/com/sun/star/task/XInteractionRetry.idl
+++ b/udkapi/com/sun/star/task/XInteractionRetry.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module task {
-
-// DocMerge from xml: interface com::sun::star::task::XInteractionRetry
/** An interaction continuation specifing to try to re-execute the process
that issued the request.
*/
diff --git a/udkapi/com/sun/star/uno/Exception.idl b/udkapi/com/sun/star/uno/Exception.idl
index b218803194a0..80b151930e0f 100644
--- a/udkapi/com/sun/star/uno/Exception.idl
+++ b/udkapi/com/sun/star/uno/Exception.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module uno {
-
-// DocMerge from xml: exception com::sun::star::uno::Exception
/** the base of all UNO exceptions
<p>All exceptions defined in UNO idl should derive from this exception.</p>
diff --git a/udkapi/com/sun/star/uno/XAdapter.idl b/udkapi/com/sun/star/uno/XAdapter.idl
index 222ca548c433..74815ed6e0f3 100644
--- a/udkapi/com/sun/star/uno/XAdapter.idl
+++ b/udkapi/com/sun/star/uno/XAdapter.idl
@@ -39,14 +39,10 @@
*/
published interface XAdapter: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::uno::XAdapter::queryAdapted
/** queries the adapted object if it is alive.
*/
com::sun::star::uno::XInterface queryAdapted();
-
- // DocMerge from xml: method com::sun::star::uno::XAdapter::addReference
/** adds a reference to the adapter.
@@ -57,8 +53,6 @@ published interface XAdapter: com::sun::star::uno::XInterface
*/
void addReference( [in] com::sun::star::uno::XReference xRef );
-
- // DocMerge from xml: method com::sun::star::uno::XAdapter::removeReference
/** removes a reference from the adapter.
*/
void removeReference( [in] com::sun::star::uno::XReference xRef );
diff --git a/udkapi/com/sun/star/uno/XInterface.idl b/udkapi/com/sun/star/uno/XInterface.idl
index 231f11956782..483b2e721566 100644
--- a/udkapi/com/sun/star/uno/XInterface.idl
+++ b/udkapi/com/sun/star/uno/XInterface.idl
@@ -22,8 +22,6 @@
module com { module sun { module star { module uno {
-
-// DocMerge from xml: interface com::sun::star::uno::XInterface
/** base interface of all UNO interfaces
<p> It provides lifetime control by reference counting and the
@@ -101,8 +99,6 @@ published interface XInterface
*/
void acquire();
-
- // DocMerge from xml: method com::sun::star::uno::XInterface::release
/** decreases the reference counter by one.
<p>When the reference counter reaches 0, the object gets deleted.</p>
<p>Calling release() on the object is often called releasing
diff --git a/udkapi/com/sun/star/uno/XReference.idl b/udkapi/com/sun/star/uno/XReference.idl
index 2d17fad4ca8f..f1d1f86374c3 100644
--- a/udkapi/com/sun/star/uno/XReference.idl
+++ b/udkapi/com/sun/star/uno/XReference.idl
@@ -25,15 +25,11 @@
module com { module sun { module star { module uno {
-
-// DocMerge from xml: interface com::sun::star::uno::XReference
/** must be implemented by anyone who holds the adapter on the client side.@see XWeak
for decription af concepts.
*/
published interface XReference: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::uno::XReference::dispose
/** removes all references to the adapter.
diff --git a/udkapi/com/sun/star/uno/XWeak.idl b/udkapi/com/sun/star/uno/XWeak.idl
index 62e6039b775f..f6a296a11235 100644
--- a/udkapi/com/sun/star/uno/XWeak.idl
+++ b/udkapi/com/sun/star/uno/XWeak.idl
@@ -27,8 +27,6 @@
module com { module sun { module star { module uno {
-
-// DocMerge from xml: interface com::sun::star::uno::XWeak
/** the server-side interface to a weak object.
@@ -82,8 +80,6 @@
*/
published interface XWeak: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::uno::XWeak::queryAdapter
/** queries the weak adapter.