From f8cb50799e34b0adb0c36c392502deb7baf556c5 Mon Sep 17 00:00:00 2001
From: Andrea Gelmini
The {@code DocumentMerger} object is created by a the + *
The {@code DocumentMerger} object is created by the * {@code DocumentMergerFactory} {@link * org.openoffice.xmerge.DocumentMergerFactory#createDocumentMerger * createDocumenMerger} method. When it is constructed, the "Original @@ -71,4 +71,4 @@ public interface DocumentMerger { * @throws MergeException If any merge error occurs. */ void merge(Document modifiedDoc) throws MergeException; -} \ No newline at end of file +} diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java index c31e07c54ef1..87f5da1c2fe4 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java @@ -25,10 +25,10 @@ import java.io.IOException; * "Office" {@code Document} to a "Device" {@code Document} * format. * - *
The {@code DocumentSerializer} object is created by a the + *
The {@code DocumentSerializer} object is created by the * {@code PluginFactory} {@link * org.openoffice.xmerge.DocumentSerializerFactory#createDocumentSerializer - * createDocumentSerializer} method. When it is constructed, a + * createDocumentSerializer} method. When it is constructed, an * "Office" {@code Document} object is passed in to be used as input. *
* @@ -51,4 +51,4 @@ public interface DocumentSerializer { * @throws IOException If any I/O error occurs. */ ConvertData serialize() throws ConvertException, IOException; -} \ No newline at end of file +} diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx index 2f95767a5721..a08727902dbb 100644 --- a/xmloff/source/forms/propertyimport.hxx +++ b/xmloff/source/forms/propertyimport.hxx @@ -123,7 +123,7 @@ namespace xmloff /** determine if the element imported by the object had a given attribute.Please be aware of the fact that the name given must be a local name, i.e. not contain a namespace. - All form relevant attributes are in the same namespace, so this would be an redundant information.
+ All form relevant attributes are in the same namespace, so this would be a redundant information. */ bool encounteredAttribute(const OUString& _rAttributeName) const;