summaryrefslogtreecommitdiff
path: root/offapi/com
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-03-13 10:32:24 +0200
committerTor Lillqvist <tml@iki.fi>2013-03-13 10:36:21 +0200
commitd1449a9b990bf054adeb66c2bab871ce396cca18 (patch)
tree59821f7dec938e0f1e0ff330b1de849e5cb9bc47 /offapi/com
parentbc7202aad393b17d0e2545001f7f869f683a7ec7 (diff)
Bin pointless "DocMerge" comment lines
Change-Id: I8eb2116b39929770f00e30d5ab9ca2c28c988e35
Diffstat (limited to 'offapi/com')
-rw-r--r--offapi/com/sun/star/drawing/Alignment.idl20
-rw-r--r--offapi/com/sun/star/drawing/Arrangement.idl10
-rw-r--r--offapi/com/sun/star/drawing/BezierPoint.idl7
-rw-r--r--offapi/com/sun/star/drawing/CircleKind.idl10
-rw-r--r--offapi/com/sun/star/drawing/ColorMode.idl10
-rw-r--r--offapi/com/sun/star/drawing/ConnectionType.idl14
-rw-r--r--offapi/com/sun/star/drawing/ConnectorType.idl10
-rw-r--r--offapi/com/sun/star/drawing/DashStyle.idl10
-rw-r--r--offapi/com/sun/star/drawing/Direction3D.idl7
-rw-r--r--offapi/com/sun/star/drawing/DrawPage.idl6
-rw-r--r--offapi/com/sun/star/drawing/DrawPages.idl2
-rw-r--r--offapi/com/sun/star/drawing/DrawViewMode.idl8
-rw-r--r--offapi/com/sun/star/drawing/FillStyle.idl12
-rw-r--r--offapi/com/sun/star/drawing/GenericDrawPage.idl30
-rw-r--r--offapi/com/sun/star/drawing/GluePoint.idl9
-rw-r--r--offapi/com/sun/star/drawing/Hatch.idl9
-rw-r--r--offapi/com/sun/star/drawing/HatchStyle.idl8
-rw-r--r--offapi/com/sun/star/drawing/HomogenMatrix.idl9
-rw-r--r--offapi/com/sun/star/drawing/HomogenMatrix3.idl2
-rw-r--r--offapi/com/sun/star/drawing/HomogenMatrix4.idl2
-rw-r--r--offapi/com/sun/star/drawing/HomogenMatrixLine.idl9
-rw-r--r--offapi/com/sun/star/drawing/HorizontalDimensioning.idl10
-rw-r--r--offapi/com/sun/star/drawing/Layer.idl12
-rw-r--r--offapi/com/sun/star/drawing/LayerManager.idl6
-rw-r--r--offapi/com/sun/star/drawing/LayerType.idl10
-rw-r--r--offapi/com/sun/star/drawing/LineCap.idl8
-rw-r--r--offapi/com/sun/star/drawing/LineDash.idl13
-rw-r--r--offapi/com/sun/star/drawing/LineEndType.idl12
-rw-r--r--offapi/com/sun/star/drawing/LineJoint.idl12
-rw-r--r--offapi/com/sun/star/drawing/LineStyle.idl8
-rw-r--r--offapi/com/sun/star/drawing/MasterPage.idl4
-rw-r--r--offapi/com/sun/star/drawing/MeasureKind.idl6
-rw-r--r--offapi/com/sun/star/drawing/MeasureTextHorzPos.idl10
-rw-r--r--offapi/com/sun/star/drawing/MeasureTextVertPos.idl12
-rw-r--r--offapi/com/sun/star/drawing/MirrorAxis.idl6
-rw-r--r--offapi/com/sun/star/drawing/NormalsKind.idl8
-rw-r--r--offapi/com/sun/star/drawing/PageShape.idl3
-rw-r--r--offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl5
-rw-r--r--offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl2
-rw-r--r--offapi/com/sun/star/drawing/PolyPolygonShape3D.idl7
-rw-r--r--offapi/com/sun/star/drawing/PolygonFlags.idl10
-rw-r--r--offapi/com/sun/star/drawing/PolygonKind.idl20
-rw-r--r--offapi/com/sun/star/drawing/Position3D.idl7
-rw-r--r--offapi/com/sun/star/drawing/ProjectionMode.idl6
-rw-r--r--offapi/com/sun/star/drawing/RectanglePoint.idl20
-rw-r--r--offapi/com/sun/star/drawing/ShadeMode.idl8
-rw-r--r--offapi/com/sun/star/drawing/Shapes.idl3
-rw-r--r--offapi/com/sun/star/drawing/SnapObjectType.idl8
-rw-r--r--offapi/com/sun/star/drawing/TextAdjust.idl12
-rw-r--r--offapi/com/sun/star/drawing/TextAnimationDirection.idl10
-rw-r--r--offapi/com/sun/star/drawing/TextAnimationKind.idl12
-rw-r--r--offapi/com/sun/star/drawing/TextFitToSizeType.idl2
-rw-r--r--offapi/com/sun/star/drawing/TextProperties.idl2
-rw-r--r--offapi/com/sun/star/drawing/TextVerticalAdjust.idl6
-rw-r--r--offapi/com/sun/star/drawing/TextureKind.idl6
-rw-r--r--offapi/com/sun/star/drawing/TextureMode.idl8
-rw-r--r--offapi/com/sun/star/drawing/TextureProjectionMode.idl8
-rw-r--r--offapi/com/sun/star/drawing/VerticalDimensioning.idl10
-rw-r--r--offapi/com/sun/star/drawing/XConnectableShape.idl4
-rw-r--r--offapi/com/sun/star/drawing/XConnectorShape.idl8
-rw-r--r--offapi/com/sun/star/drawing/XDrawPageSummarizer.idl4
-rw-r--r--offapi/com/sun/star/drawing/XDrawPageSupplier.idl4
-rw-r--r--offapi/com/sun/star/drawing/XShapeAligner.idl4
-rw-r--r--offapi/com/sun/star/drawing/XShapeArranger.idl14
-rw-r--r--offapi/com/sun/star/drawing/XShapeGroup.idl4
-rw-r--r--offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl4
-rw-r--r--offapi/com/sun/star/form/DataSelectionType.idl2
-rw-r--r--offapi/com/sun/star/form/ErrorEvent.idl2
-rw-r--r--offapi/com/sun/star/frame/DispatchStatement.idl11
-rw-r--r--offapi/com/sun/star/frame/DoubleInitializationException.idl2
-rw-r--r--offapi/com/sun/star/frame/IllegalArgumentIOException.idl2
-rw-r--r--offapi/com/sun/star/mozilla/MenuMultipleChange.idl19
-rw-r--r--offapi/com/sun/star/mozilla/MenuProxy.idl4
-rw-r--r--offapi/com/sun/star/mozilla/MenuProxyListener.idl4
-rw-r--r--offapi/com/sun/star/mozilla/MenuSingleChange.idl7
-rw-r--r--offapi/com/sun/star/mozilla/XCloseSessionListener.idl4
-rw-r--r--offapi/com/sun/star/mozilla/XMenuProxy.idl8
-rw-r--r--offapi/com/sun/star/mozilla/XMenuProxyListener.idl8
-rw-r--r--offapi/com/sun/star/mozilla/XPluginInstance.idl16
-rw-r--r--offapi/com/sun/star/mozilla/XPluginInstanceNotifySink.idl4
-rw-r--r--offapi/com/sun/star/mozilla/XPluginInstancePeer.idl14
-rw-r--r--offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl4
-rw-r--r--offapi/com/sun/star/mozilla/XPluginWindowPeer.idl4
-rw-r--r--offapi/com/sun/star/mozilla/XProfileManager.idl2
-rw-r--r--offapi/com/sun/star/mozilla/XProxyRunner.idl3
-rw-r--r--offapi/com/sun/star/packages/EncryptionNotAllowedException.idl2
-rw-r--r--offapi/com/sun/star/packages/NoEncryptionException.idl2
-rw-r--r--offapi/com/sun/star/packages/NoRawFormatException.idl2
-rw-r--r--offapi/com/sun/star/packages/WrongPasswordException.idl2
-rw-r--r--offapi/com/sun/star/presentation/AnimationEffect.idl226
-rw-r--r--offapi/com/sun/star/resource/XLocale.idl38
-rw-r--r--offapi/com/sun/star/sheet/DatabaseRange.idl13
-rw-r--r--offapi/com/sun/star/style/BreakType.idl16
-rw-r--r--offapi/com/sun/star/style/CaseMap.idl12
-rw-r--r--offapi/com/sun/star/style/DropCapFormat.idl7
-rw-r--r--offapi/com/sun/star/style/GraphicLocation.idl26
-rw-r--r--offapi/com/sun/star/style/HorizontalAlignment.idl8
-rw-r--r--offapi/com/sun/star/style/LineNumberPosition.idl10
-rw-r--r--offapi/com/sun/star/style/LineSpacing.idl5
-rw-r--r--offapi/com/sun/star/style/LineSpacingMode.idl10
-rw-r--r--offapi/com/sun/star/style/NumberingAlignment.idl10
-rw-r--r--offapi/com/sun/star/style/NumberingLevel.idl20
-rw-r--r--offapi/com/sun/star/style/NumberingRule.idl5
-rw-r--r--offapi/com/sun/star/style/ParagraphAdjust.idl12
-rw-r--r--offapi/com/sun/star/style/ParagraphStyleCategory.idl14
-rw-r--r--offapi/com/sun/star/style/StyleFamilies.idl6
-rw-r--r--offapi/com/sun/star/style/StyleFamily.idl8
-rw-r--r--offapi/com/sun/star/style/TabAlign.idl12
-rw-r--r--offapi/com/sun/star/style/TabStop.idl9
-rw-r--r--offapi/com/sun/star/style/VerticalAlignment.idl8
-rw-r--r--offapi/com/sun/star/style/XAutoStyleFamily.idl2
-rw-r--r--offapi/com/sun/star/style/XAutoStylesSupplier.idl2
-rw-r--r--offapi/com/sun/star/style/XStyleFamiliesSupplier.idl4
-rw-r--r--offapi/com/sun/star/style/XStyleLoader.idl4
-rw-r--r--offapi/com/sun/star/svg/XSVGPrinter.idl5
-rw-r--r--offapi/com/sun/star/svg/XSVGWriter.idl1
-rw-r--r--offapi/com/sun/star/task/ClassifiedInteractionRequest.idl4
-rw-r--r--offapi/com/sun/star/task/InteractionClassification.idl10
-rw-r--r--offapi/com/sun/star/task/XInteractionApprove.idl2
-rw-r--r--offapi/com/sun/star/task/XInteractionDisapprove.idl2
-rw-r--r--offapi/com/sun/star/text/AutoTextContainer.idl3
-rw-r--r--offapi/com/sun/star/text/AutoTextEntry.idl5
-rw-r--r--offapi/com/sun/star/text/AutoTextGroup.idl7
-rw-r--r--offapi/com/sun/star/text/BaseIndex.idl42
-rw-r--r--offapi/com/sun/star/text/Bibliography.idl3
-rw-r--r--offapi/com/sun/star/text/BibliographyDataField.idl64
-rw-r--r--offapi/com/sun/star/text/BibliographyDataType.idl46
-rw-r--r--offapi/com/sun/star/text/Bookmark.idl5
-rw-r--r--offapi/com/sun/star/text/Bookmarks.idl4
-rw-r--r--offapi/com/sun/star/text/ChapterFormat.idl12
-rw-r--r--offapi/com/sun/star/text/ChapterNumberingRule.idl5
-rw-r--r--offapi/com/sun/star/text/ContentIndex.idl1
-rw-r--r--offapi/com/sun/star/text/ContentIndexMark.idl2
-rw-r--r--offapi/com/sun/star/text/ControlCharacter.idl12
-rw-r--r--offapi/com/sun/star/text/DependentTextField.idl5
-rw-r--r--offapi/com/sun/star/text/DocumentIndexLevelFormat.idl3
-rw-r--r--offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl3
-rw-r--r--offapi/com/sun/star/text/DocumentStatistic.idl10
-rw-r--r--offapi/com/sun/star/text/FilenameDisplayFormat.idl10
-rw-r--r--offapi/com/sun/star/text/FootnoteNumbering.idl8
-rw-r--r--offapi/com/sun/star/text/Footnotes.idl4
-rw-r--r--offapi/com/sun/star/text/GraphicCrop.idl9
-rw-r--r--offapi/com/sun/star/text/HoriOrientation.idl18
-rw-r--r--offapi/com/sun/star/text/HoriOrientationFormat.idl9
-rw-r--r--offapi/com/sun/star/text/HorizontalAdjust.idl8
-rw-r--r--offapi/com/sun/star/text/InvalidTextContentException.idl4
-rw-r--r--offapi/com/sun/star/text/LineNumberingProperties.idl2
-rw-r--r--offapi/com/sun/star/text/NotePrintMode.idl10
-rw-r--r--offapi/com/sun/star/text/ObjectIndex.idl9
-rw-r--r--offapi/com/sun/star/text/PageFootnoteInfo.idl16
-rw-r--r--offapi/com/sun/star/text/PageNumberType.idl2
-rw-r--r--offapi/com/sun/star/text/PagePrintSettings.idl20
-rw-r--r--offapi/com/sun/star/text/Paragraph.idl10
-rw-r--r--offapi/com/sun/star/text/ParagraphEnumeration.idl4
-rw-r--r--offapi/com/sun/star/text/PlaceholderType.idl12
-rw-r--r--offapi/com/sun/star/text/PrintSettings.idl28
-rw-r--r--offapi/com/sun/star/text/RelOrientation.idl20
-rw-r--r--offapi/com/sun/star/text/SectionFileLink.idl5
-rw-r--r--offapi/com/sun/star/text/SetVariableType.idl10
-rw-r--r--offapi/com/sun/star/text/SizeType.idl8
-rw-r--r--offapi/com/sun/star/text/TemplateDisplayFormat.idl14
-rw-r--r--offapi/com/sun/star/text/TextColumn.idl7
-rw-r--r--offapi/com/sun/star/text/TextColumns.idl3
-rw-r--r--offapi/com/sun/star/text/TextContentAnchorType.idl12
-rw-r--r--offapi/com/sun/star/text/TextContentCollection.idl6
-rw-r--r--offapi/com/sun/star/text/TextCursor.idl17
-rw-r--r--offapi/com/sun/star/text/TextEmbeddedObject.idl3
-rw-r--r--offapi/com/sun/star/text/TextFieldMasters.idl4
-rw-r--r--offapi/com/sun/star/text/TextFields.idl4
-rw-r--r--offapi/com/sun/star/text/TextFrames.idl6
-rw-r--r--offapi/com/sun/star/text/TextLayoutCursor.idl5
-rw-r--r--offapi/com/sun/star/text/TextRanges.idl3
-rw-r--r--offapi/com/sun/star/text/TextSections.idl5
-rw-r--r--offapi/com/sun/star/text/TextSortDescriptor.idl25
-rw-r--r--offapi/com/sun/star/text/TextTables.idl5
-rw-r--r--offapi/com/sun/star/text/TextViewCursor.idl5
-rw-r--r--offapi/com/sun/star/text/UserDataPart.idl32
-rw-r--r--offapi/com/sun/star/text/UserFieldFormat.idl8
-rw-r--r--offapi/com/sun/star/text/VertOrientation.idl22
-rw-r--r--offapi/com/sun/star/text/VertOrientationFormat.idl7
-rw-r--r--offapi/com/sun/star/text/ViewSettings.idl45
-rw-r--r--offapi/com/sun/star/text/WrapTextMode.idl14
-rw-r--r--offapi/com/sun/star/text/XAutoTextContainer.idl6
-rw-r--r--offapi/com/sun/star/text/XAutoTextEntry.idl4
-rw-r--r--offapi/com/sun/star/text/XAutoTextGroup.idl10
-rw-r--r--offapi/com/sun/star/text/XBookmarkInsertTool.idl4
-rw-r--r--offapi/com/sun/star/text/XBookmarksSupplier.idl4
-rw-r--r--offapi/com/sun/star/text/XChapterNumberingSupplier.idl4
-rw-r--r--offapi/com/sun/star/text/XDocumentIndex.idl6
-rw-r--r--offapi/com/sun/star/text/XDocumentIndexMark.idl6
-rw-r--r--offapi/com/sun/star/text/XDocumentIndexesSupplier.idl4
-rw-r--r--offapi/com/sun/star/text/XEndnotesSettingsSupplier.idl4
-rw-r--r--offapi/com/sun/star/text/XEndnotesSupplier.idl6
-rw-r--r--offapi/com/sun/star/text/XFootnote.idl6
-rw-r--r--offapi/com/sun/star/text/XFootnotesSettingsSupplier.idl4
-rw-r--r--offapi/com/sun/star/text/XFootnotesSupplier.idl6
-rw-r--r--offapi/com/sun/star/text/XPageCursor.idl18
-rw-r--r--offapi/com/sun/star/text/XPagePrintable.idl2
-rw-r--r--offapi/com/sun/star/text/XReferenceMarksSupplier.idl4
-rw-r--r--offapi/com/sun/star/text/XRelativeTextContentInsert.idl6
-rw-r--r--offapi/com/sun/star/text/XRelativeTextContentRemove.idl6
-rw-r--r--offapi/com/sun/star/text/XTextColumns.idl12
-rw-r--r--offapi/com/sun/star/text/XTextDocument.idl6
-rw-r--r--offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier.idl4
-rw-r--r--offapi/com/sun/star/text/XTextField.idl4
-rw-r--r--offapi/com/sun/star/text/XTextFieldsSupplier.idl6
-rw-r--r--offapi/com/sun/star/text/XTextFrame.idl4
-rw-r--r--offapi/com/sun/star/text/XTextFramesSupplier.idl4
-rw-r--r--offapi/com/sun/star/text/XTextGraphicObjectsSupplier.idl4
-rw-r--r--offapi/com/sun/star/text/XTextRange.idl12
-rw-r--r--offapi/com/sun/star/text/XTextRangeCompare.idl6
-rw-r--r--offapi/com/sun/star/text/XTextRangeMover.idl4
-rw-r--r--offapi/com/sun/star/text/XTextSection.idl6
-rw-r--r--offapi/com/sun/star/text/XTextSectionsSupplier.idl4
-rw-r--r--offapi/com/sun/star/text/XTextShapesSupplier.idl4
-rw-r--r--offapi/com/sun/star/text/XTextViewCursor.idl8
-rw-r--r--offapi/com/sun/star/text/XTextViewCursorSupplier.idl4
-rw-r--r--offapi/com/sun/star/util/XImportable.idl6
218 files changed, 0 insertions, 2119 deletions
diff --git a/offapi/com/sun/star/drawing/Alignment.idl b/offapi/com/sun/star/drawing/Alignment.idl
index 8d74dd0294a3..20b38ed51d5a 100644
--- a/offapi/com/sun/star/drawing/Alignment.idl
+++ b/offapi/com/sun/star/drawing/Alignment.idl
@@ -23,56 +23,36 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::Alignment
/** The <type>Alignment</type> enumeration is a general way to specify the
alignment of an object or sub-object relative to another object.
*/
published enum Alignment
{
// DOCUMENTATION OMITTED FOR Alignment:: TOP_LEFT,
-
- // DocMerge: empty anyway
TOP_LEFT,
// DOCUMENTATION OMITTED FOR Alignment:: TOP,
-
- // DocMerge: empty anyway
TOP,
// DOCUMENTATION OMITTED FOR Alignment:: TOP_RIGHT,
-
- // DocMerge: empty anyway
TOP_RIGHT,
// DOCUMENTATION OMITTED FOR Alignment:: LEFT,
-
- // DocMerge: empty anyway
LEFT,
// DOCUMENTATION OMITTED FOR Alignment:: CENTER,
-
- // DocMerge: empty anyway
CENTER,
// DOCUMENTATION OMITTED FOR Alignment:: RIGHT,
-
- // DocMerge: empty anyway
RIGHT,
// DOCUMENTATION OMITTED FOR Alignment:: BOTTOM_LEFT,
-
- // DocMerge: empty anyway
BOTTOM_LEFT,
// DOCUMENTATION OMITTED FOR Alignment:: BOTTOM,
-
- // DocMerge: empty anyway
BOTTOM,
// DOCUMENTATION OMITTED FOR Alignment:: BOTTOM_RIGHT
-
- // DocMerge: empty anyway
BOTTOM_RIGHT
};
diff --git a/offapi/com/sun/star/drawing/Arrangement.idl b/offapi/com/sun/star/drawing/Arrangement.idl
index 4234c42a7e0f..131d6323c395 100644
--- a/offapi/com/sun/star/drawing/Arrangement.idl
+++ b/offapi/com/sun/star/drawing/Arrangement.idl
@@ -23,8 +23,6 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::Arrangement
/** With this enumeration you can arrange the relative position of an object
within the other objects.
@@ -32,26 +30,18 @@
*/
published enum Arrangement
{
-
- // DocMerge from xml: value com::sun::star::drawing::Arrangement::FRONT
/** Move this object in front of all other objects.
*/
FRONT,
-
- // DocMerge from xml: value com::sun::star::drawing::Arrangement::MORE_FRONT
/** Move this object one object more to the front.
*/
MORE_FRONT,
-
- // DocMerge from xml: value com::sun::star::drawing::Arrangement::MORE_BACK
/** Move this object one object more to the back.
*/
MORE_BACK,
-
- // DocMerge from xml: value com::sun::star::drawing::Arrangement::BACK
/** Move this object behind all other objects.
*/
BACK
diff --git a/offapi/com/sun/star/drawing/BezierPoint.idl b/offapi/com/sun/star/drawing/BezierPoint.idl
index d4564a29d3a6..b06b435c3d48 100644
--- a/offapi/com/sun/star/drawing/BezierPoint.idl
+++ b/offapi/com/sun/star/drawing/BezierPoint.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: struct com::sun::star::drawing::BezierPoint
/** This is a point on a Bezier curve.
<p>The two control points specify how the Bezier curve
@@ -36,19 +34,14 @@
*/
published struct BezierPoint
{
- // DocMerge from xml: field com::sun::star::drawing::BezierPoint::Position
/** This is the position of this point.
*/
com::sun::star::awt::Point Position;
-
- // DocMerge from xml: field com::sun::star::drawing::BezierPoint::ControlPoint1
/** This is the position of the first control point.
*/
com::sun::star::awt::Point ControlPoint1;
-
- // DocMerge from xml: field com::sun::star::drawing::BezierPoint::ControlPoint2
/** This is the position of the second control point.
*/
com::sun::star::awt::Point ControlPoint2;
diff --git a/offapi/com/sun/star/drawing/CircleKind.idl b/offapi/com/sun/star/drawing/CircleKind.idl
index 8495366b7656..a640a05896a0 100644
--- a/offapi/com/sun/star/drawing/CircleKind.idl
+++ b/offapi/com/sun/star/drawing/CircleKind.idl
@@ -23,32 +23,22 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::CircleKind
/** This enumeration defines a circle.
*/
published enum CircleKind
{
-
- // DocMerge from xml: value com::sun::star::drawing::CircleKind::FULL
/** a full circle
*/
FULL,
-
- // DocMerge from xml: value com::sun::star::drawing::CircleKind::SECTION
/** a circle with a cut connected by a line
*/
SECTION,
-
- // DocMerge from xml: value com::sun::star::drawing::CircleKind::CUT
/** a circle with a cut connected by two lines
*/
CUT,
-
- // DocMerge from xml: value com::sun::star::drawing::CircleKind::ARC
/** a circle with an open cut
*/
ARC
diff --git a/offapi/com/sun/star/drawing/ColorMode.idl b/offapi/com/sun/star/drawing/ColorMode.idl
index 53a40a17874f..df688b62636d 100644
--- a/offapi/com/sun/star/drawing/ColorMode.idl
+++ b/offapi/com/sun/star/drawing/ColorMode.idl
@@ -23,34 +23,24 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::ColorMode
/** The <type>ColorMode</type> defines the output style of colors
for a graphic.
*/
published enum ColorMode
{
-
- // DocMerge from xml: value com::sun::star::drawing::ColorMode::STANDARD
/** the graphic is rendered in the default color style of the output
device,
*/
STANDARD,
-
- // DocMerge from xml: value com::sun::star::drawing::ColorMode::GREYS
/** the graphic is rendered in grayscale on the output device,
*/
GREYS,
-
- // DocMerge from xml: value com::sun::star::drawing::ColorMode::MONO
/** the graphic is rendered in black and white only,
*/
MONO,
-
- // DocMerge from xml: value com::sun::star::drawing::ColorMode::WATERMARK
/** the graphic is rendered in a watermark like style,
*/
WATERMARK
diff --git a/offapi/com/sun/star/drawing/ConnectionType.idl b/offapi/com/sun/star/drawing/ConnectionType.idl
index 1a066c3821ef..7d04ea722e1a 100644
--- a/offapi/com/sun/star/drawing/ConnectionType.idl
+++ b/offapi/com/sun/star/drawing/ConnectionType.idl
@@ -23,45 +23,31 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::ConnectionType
/** the direction where the
connection line leaves the connection point.
*/
published enum ConnectionType
{
-
- // DocMerge from xml: value com::sun::star::drawing::ConnectionType::AUTO
/** the connection point is chosen automatically,
*/
AUTO,
-
- // DocMerge from xml: value com::sun::star::drawing::ConnectionType::LEFT
/** the connection line leaves the connected object to the left,
*/
LEFT,
-
- // DocMerge from xml: value com::sun::star::drawing::ConnectionType::TOP
/** the connection line leaves the connected object from the top,
*/
TOP,
-
- // DocMerge from xml: value com::sun::star::drawing::ConnectionType::RIGHT
/** the connection line leaves the connected object to the right,
*/
RIGHT,
-
- // DocMerge from xml: value com::sun::star::drawing::ConnectionType::BOTTOM
/** the connection line leaves the connected object from the bottom,
*/
BOTTOM,
-
- // DocMerge from xml: value com::sun::star::drawing::ConnectionType::SPECIAL
/** not implemented, yet.
*/
SPECIAL
diff --git a/offapi/com/sun/star/drawing/ConnectorType.idl b/offapi/com/sun/star/drawing/ConnectorType.idl
index 35a21087e75a..1d4d704d9dd4 100644
--- a/offapi/com/sun/star/drawing/ConnectorType.idl
+++ b/offapi/com/sun/star/drawing/ConnectorType.idl
@@ -23,33 +23,23 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::ConnectorType
/** The <type>ConnectorType</type> specifies the appearance of a connector.
*/
published enum ConnectorType
{
-
- // DocMerge from xml: value com::sun::star::drawing::ConnectorType::STANDARD
/** the connector is drawn with three lines, with the middle line
perpendicular to the other two
*/
STANDARD,
-
- // DocMerge from xml: value com::sun::star::drawing::ConnectorType::CURVE
/** the ConnectorShape is drawn as a curve
*/
CURVE,
-
- // DocMerge from xml: value com::sun::star::drawing::ConnectorType::LINE
/** the ConnectorShape is drawn as a straight line
*/
LINE,
-
- // DocMerge from xml: value com::sun::star::drawing::ConnectorType::LINES
/** the connector is drawn with three lines
*/
LINES
diff --git a/offapi/com/sun/star/drawing/DashStyle.idl b/offapi/com/sun/star/drawing/DashStyle.idl
index 06f89ad93a76..8b8217541317 100644
--- a/offapi/com/sun/star/drawing/DashStyle.idl
+++ b/offapi/com/sun/star/drawing/DashStyle.idl
@@ -23,33 +23,23 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::DashStyle
/** This enumeration defines the style of a dash on a line.
*/
published enum DashStyle
{
-
- // DocMerge from xml: value com::sun::star::drawing::DashStyle::RECT
/** the dash is a rectangle
*/
RECT,
-
- // DocMerge from xml: value com::sun::star::drawing::DashStyle::ROUND
/** the dash is a point
*/
ROUND,
-
- // DocMerge from xml: value com::sun::star::drawing::DashStyle::RECTRELATIVE
/** the dash is a rectangle, with the size of the dash given in
relation to the length of the line
*/
RECTRELATIVE,
-
- // DocMerge from xml: value com::sun::star::drawing::DashStyle::ROUNDRELATIVE
/** the dash is a point, with the size of the dash given in relation
to the length of the line
*/
diff --git a/offapi/com/sun/star/drawing/Direction3D.idl b/offapi/com/sun/star/drawing/Direction3D.idl
index c348340e9c36..6c5b5733998b 100644
--- a/offapi/com/sun/star/drawing/Direction3D.idl
+++ b/offapi/com/sun/star/drawing/Direction3D.idl
@@ -23,23 +23,16 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: struct com::sun::star::drawing::Direction3D
/** specifies a 3-dimensional vector.
*/
published struct Direction3D
{
- // DocMerge: empty anyway
double DirectionX;
// DOCUMENTATION OMITTED FOR Direction3D::DirectionY
-
- // DocMerge: empty anyway
double DirectionY;
// DOCUMENTATION OMITTED FOR Direction3D::DirectionZ
-
- // DocMerge: empty anyway
double DirectionZ;
};
diff --git a/offapi/com/sun/star/drawing/DrawPage.idl b/offapi/com/sun/star/drawing/DrawPage.idl
index 4aa0042f25c5..bba8b71a115f 100644
--- a/offapi/com/sun/star/drawing/DrawPage.idl
+++ b/offapi/com/sun/star/drawing/DrawPage.idl
@@ -28,8 +28,6 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: service com::sun::star::drawing::DrawPage
/** This service specifies a page for the actual draw pages to contain
the drawings.
@see GenericDrawPage
@@ -38,15 +36,11 @@
published service DrawPage
{
-
- // DocMerge from xml: service com::sun::star::drawing::DrawPage: service com::sun::star::drawing::GenericDrawPage
/** This service describes the base functionality that every
draw/master page has.
*/
service com::sun::star::drawing::GenericDrawPage;
-
- // DocMerge from xml: service com::sun::star::drawing::DrawPage: interface com::sun::star::drawing::XMasterPageTarget
/** provides the link to a <type>MasterPage</type>.
*/
interface com::sun::star::drawing::XMasterPageTarget;
diff --git a/offapi/com/sun/star/drawing/DrawPages.idl b/offapi/com/sun/star/drawing/DrawPages.idl
index 78442ac81d5f..ede769622917 100644
--- a/offapi/com/sun/star/drawing/DrawPages.idl
+++ b/offapi/com/sun/star/drawing/DrawPages.idl
@@ -29,8 +29,6 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: service com::sun::star::drawing::DrawPages
/** provides access to a container of <type>DrawPage</type>s
and makes it possible for you to manipulate them.
diff --git a/offapi/com/sun/star/drawing/DrawViewMode.idl b/offapi/com/sun/star/drawing/DrawViewMode.idl
index de32403992b0..7e0ed15be9c4 100644
--- a/offapi/com/sun/star/drawing/DrawViewMode.idl
+++ b/offapi/com/sun/star/drawing/DrawViewMode.idl
@@ -23,8 +23,6 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::DrawViewMode
/** This enumeration specifies the view mode of a view in a presentation
document.
@@ -32,20 +30,14 @@
*/
published enum DrawViewMode
{
-
- // DocMerge from xml: value com::sun::star::drawing::DrawViewMode::DRAW
/** The view shows the drawing pages.
*/
DRAW,
-
- // DocMerge from xml: value com::sun::star::drawing::DrawViewMode::NOTES
/** The view shows the notes pages.
*/
NOTES,
-
- // DocMerge from xml: value com::sun::star::drawing::DrawViewMode::HANDOUT
/** The view shows the handout pages,
*/
HANDOUT
diff --git a/offapi/com/sun/star/drawing/FillStyle.idl b/offapi/com/sun/star/drawing/FillStyle.idl
index 3344ff7ce8cd..ffe03da469b8 100644
--- a/offapi/com/sun/star/drawing/FillStyle.idl
+++ b/offapi/com/sun/star/drawing/FillStyle.idl
@@ -23,43 +23,31 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::FillStyle
/** specifies how an area will be filled.
*/
published enum FillStyle
{
// DOCUMENTATION OMITTED FOR FillStyle:: NONE,
-
- // DocMerge from xml: value com::sun::star::drawing::FillStyle::NONE
/** the area is not filled.
*/
NONE,
// DOCUMENTATION OMITTED FOR FillStyle:: SOLID,
-
- // DocMerge from xml: value com::sun::star::drawing::FillStyle::SOLID
/** use a solid color to fill the area.
*/
SOLID,
// DOCUMENTATION OMITTED FOR FillStyle:: GRADIENT,
-
- // DocMerge from xml: value com::sun::star::drawing::FillStyle::GRADIENT
/** use a gradient color to fill the area.
*/
GRADIENT,
// DOCUMENTATION OMITTED FOR FillStyle:: HATCH,
-
- // DocMerge from xml: value com::sun::star::drawing::FillStyle::HATCH
/** use a hatch to fill the area.
*/
HATCH,
// DOCUMENTATION OMITTED FOR FillStyle:: BITMAP
-
- // DocMerge from xml: value com::sun::star::drawing::FillStyle::BITMAP
/** use a bitmap to fill the area.
*/
BITMAP
diff --git a/offapi/com/sun/star/drawing/GenericDrawPage.idl b/offapi/com/sun/star/drawing/GenericDrawPage.idl
index 3e3c5ee8ca7b..dab995e29e34 100644
--- a/offapi/com/sun/star/drawing/GenericDrawPage.idl
+++ b/offapi/com/sun/star/drawing/GenericDrawPage.idl
@@ -38,8 +38,6 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: service com::sun::star::drawing::GenericDrawPage
/** This abstract service is implemented by every page of a
<type>DrawingDocument</type>.
@@ -62,8 +60,6 @@
published service GenericDrawPage
{
-
- // DocMerge from xml: service com::sun::star::drawing::GenericDrawPage: interface com::sun::star::drawing::XShapes
/** manages the <type>Shape</type>s of this page.
<p>It also lets you add new <type>Shape</type>s. The program currently
@@ -74,86 +70,60 @@ published service GenericDrawPage
*/
interface com::sun::star::drawing::XShapes;
-
- // DocMerge from xml: service com::sun::star::drawing::GenericDrawPage: interface com::sun::star::drawing::XShapeGrouper
/** With this interface you can group/ungroup a collection of
<type>Shape</type>s.
*/
interface com::sun::star::drawing::XShapeGrouper;
-
- // DocMerge from xml: service com::sun::star::drawing::GenericDrawPage: interface com::sun::star::drawing::XShapeCombiner
/** With this interface you can combine/split a collection of
<type>Shape</type>s.
*/
[optional] interface com::sun::star::drawing::XShapeCombiner;
-
- // DocMerge from xml: service com::sun::star::drawing::GenericDrawPage: interface com::sun::star::drawing::XShapeBinder
/** With this interface you can bind/unbind a collection of
<type>Shape</type>s.
*/
[optional] interface com::sun::star::drawing::XShapeBinder;
-
- // DocMerge from xml: service com::sun::star::drawing::GenericDrawPage: interface com::sun::star::container::XNamed
/** Gets or sets the name of this page.
<p>Duplicated page names inside a document are not allowed.
*/
[optional] interface com::sun::star::container::XNamed;
-
- // DocMerge from xml: service com::sun::star::drawing::GenericDrawPage: interface com::sun::star::beans::XPropertySet
/** gives you access to the properties of this
<type>DrawPage</type>.
*/
[optional] interface com::sun::star::beans::XPropertySet;
-
- // DocMerge from xml: property com::sun::star::drawing::GenericDrawPage::BorderBottom
/** This is the border at the bottom.
*/
[optional, property] long BorderBottom;
-
- // DocMerge from xml: property com::sun::star::drawing::GenericDrawPage::BorderLeft
/** This is the border at the left.
*/
[optional, property] long BorderLeft;
-
- // DocMerge from xml: property com::sun::star::drawing::GenericDrawPage::BorderRight
/** This is the border at the right.
*/
[optional, property] long BorderRight;
-
- // DocMerge from xml: property com::sun::star::drawing::GenericDrawPage::BorderTop
/** This is the border at the top.
*/
[optional, property] long BorderTop;
-
- // DocMerge from xml: property com::sun::star::drawing::GenericDrawPage::Height
/** This is the height.
*/
[optional, property] long Height;
-
- // DocMerge from xml: property com::sun::star::drawing::GenericDrawPage::Width
/** This is the width.
*/
[optional, property] long Width;
-
- // DocMerge from xml: property com::sun::star::drawing::GenericDrawPage::Number
/** This is the number of this page, starting with 1.
*/
[optional, readonly, property] short Number;
-
- // DocMerge from xml: property com::sun::star::drawing::GenericDrawPage::Orientation
/** This is the orientation of this page.
*/
[optional, property] com::sun::star::view::PaperOrientation Orientation;
diff --git a/offapi/com/sun/star/drawing/GluePoint.idl b/offapi/com/sun/star/drawing/GluePoint.idl
index 67d75c39e703..7f1d486e4d1c 100644
--- a/offapi/com/sun/star/drawing/GluePoint.idl
+++ b/offapi/com/sun/star/drawing/GluePoint.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: struct com::sun::star::drawing::GluePoint
/** A <type>GluePoint</type> could be attached to a shape or to a page.
@@ -40,27 +38,20 @@
*/
published struct GluePoint
{
- // DocMerge from xml: field com::sun::star::drawing::GluePoint::Position
/** This is the position of this <type>GluePoint</type>.
*/
com::sun::star::awt::Point Position;
-
- // DocMerge from xml: field com::sun::star::drawing::GluePoint::EscapeDirection
/** This is the direction in which the connector line leaves the
<type>GluePoint</type>.
*/
short EscapeDirection;
-
- // DocMerge from xml: field com::sun::star::drawing::GluePoint::PositionAbsolute
/** If this is <TRUE/>, then the position of this <type>GluePoint</type> is
absolute on a page and is not relative to a shape.
*/
boolean PositionAbsolute;
-
- // DocMerge from xml: field com::sun::star::drawing::GluePoint::Alignment
/** The alignment of a <code>GluePoint</code> defines how the position of
the point is affected by resizing the parent <code>Shape</code>.
*/
diff --git a/offapi/com/sun/star/drawing/Hatch.idl b/offapi/com/sun/star/drawing/Hatch.idl
index 99d4a9460cf1..2bada9607bf5 100644
--- a/offapi/com/sun/star/drawing/Hatch.idl
+++ b/offapi/com/sun/star/drawing/Hatch.idl
@@ -27,34 +27,25 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: struct com::sun::star::drawing::Hatch
/** This struct defines the appearance of a hatch.
<p>A hatch is a texture made of straight lines.</p>
*/
published struct Hatch
{
- // DocMerge from xml: field com::sun::star::drawing::Hatch::Style
/** The <type>HatchStyle</type> defines the kind of lines used to draw
this hatch.
*/
com::sun::star::drawing::HatchStyle Style;
-
- // DocMerge from xml: field com::sun::star::drawing::Hatch::Color
/** This is the color of the hatch lines.
*/
com::sun::star::util::Color Color;
-
- // DocMerge from xml: field com::sun::star::drawing::Hatch::Distance
/** This is the distance between the lines in the hatch.
*/
long Distance;
-
- // DocMerge from xml: field com::sun::star::drawing::Hatch::Angle
/** You can rotate the lines of the hatch with this angle.
*/
long Angle;
diff --git a/offapi/com/sun/star/drawing/HatchStyle.idl b/offapi/com/sun/star/drawing/HatchStyle.idl
index eb57c14a2e74..b274880a65f1 100644
--- a/offapi/com/sun/star/drawing/HatchStyle.idl
+++ b/offapi/com/sun/star/drawing/HatchStyle.idl
@@ -23,26 +23,18 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::HatchStyle
/** The <type>HatchStyle</type> defines the style of the lines in a hatch.
*/
published enum HatchStyle
{
-
- // DocMerge from xml: value com::sun::star::drawing::HatchStyle::SINGLE
/** the hatch consists of a single horizontal line
*/
SINGLE,
-
- // DocMerge from xml: value com::sun::star::drawing::HatchStyle::DOUBLE
/** the hatch has a horizontal and a vertical line
*/
DOUBLE,
-
- // DocMerge from xml: value com::sun::star::drawing::HatchStyle::TRIPLE
/** the hatch has a horizontal, a vertical and a diagonal line
*/
TRIPLE
diff --git a/offapi/com/sun/star/drawing/HomogenMatrix.idl b/offapi/com/sun/star/drawing/HomogenMatrix.idl
index 26aea224980f..b5eab618e6bf 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrix.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrix.idl
@@ -25,28 +25,19 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: struct com::sun::star::drawing::HomogenMatrix
/** specifies a homogeneous matrix by three homogeneous lines
*/
published struct HomogenMatrix
{
- // DocMerge: empty anyway
com::sun::star::drawing::HomogenMatrixLine Line1;
// DOCUMENTATION OMITTED FOR HomogenMatrix::Line2
-
- // DocMerge: empty anyway
com::sun::star::drawing::HomogenMatrixLine Line2;
// DOCUMENTATION OMITTED FOR HomogenMatrix::Line3
-
- // DocMerge: empty anyway
com::sun::star::drawing::HomogenMatrixLine Line3;
// DOCUMENTATION OMITTED FOR HomogenMatrix::Line4
-
- // DocMerge: empty anyway
com::sun::star::drawing::HomogenMatrixLine Line4;
};
diff --git a/offapi/com/sun/star/drawing/HomogenMatrix3.idl b/offapi/com/sun/star/drawing/HomogenMatrix3.idl
index b2bfbaee72b4..62a2403aa108 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrix3.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrix3.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: struct com::sun::star::drawing::HomogenMatrix
/** specifies a homogeneous matrix by three homogeneous lines
*/
published struct HomogenMatrix3
diff --git a/offapi/com/sun/star/drawing/HomogenMatrix4.idl b/offapi/com/sun/star/drawing/HomogenMatrix4.idl
index 3a1cb26eac07..082c638aa703 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrix4.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrix4.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: struct com::sun::star::drawing::HomogenMatrix
/** specifies a homogeneous matrix by four homogeneous lines.
*/
published struct HomogenMatrix4
diff --git a/offapi/com/sun/star/drawing/HomogenMatrixLine.idl b/offapi/com/sun/star/drawing/HomogenMatrixLine.idl
index be1bf11a97ce..783f34729abd 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrixLine.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrixLine.idl
@@ -23,28 +23,19 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: struct com::sun::star::drawing::HomogenMatrixLine
/** specifies a single line for a <type>HomogenMatrix</type>.
*/
published struct HomogenMatrixLine
{
- // DocMerge: empty anyway
double Column1;
// DOCUMENTATION OMITTED FOR HomogenMatrixLine::Column2
-
- // DocMerge: empty anyway
double Column2;
// DOCUMENTATION OMITTED FOR HomogenMatrixLine::Column3
-
- // DocMerge: empty anyway
double Column3;
// DOCUMENTATION OMITTED FOR HomogenMatrixLine::Column4
-
- // DocMerge: empty anyway
double Column4;
};
diff --git a/offapi/com/sun/star/drawing/HorizontalDimensioning.idl b/offapi/com/sun/star/drawing/HorizontalDimensioning.idl
index 235be8e043d1..4a01570254e3 100644
--- a/offapi/com/sun/star/drawing/HorizontalDimensioning.idl
+++ b/offapi/com/sun/star/drawing/HorizontalDimensioning.idl
@@ -23,34 +23,24 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::HorizontalDimensioning
/** The <type>HorizontalDimensioning</type> specifies the horizontal position
of the text of a dimensioning shape.
*/
published enum HorizontalDimensioning
{
-
- // DocMerge from xml: value com::sun::star::drawing::HorizontalDimensioning::AUTO
/** Set this to have the application select the best horizontal
position for the text.
*/
AUTO,
-
- // DocMerge from xml: value com::sun::star::drawing::HorizontalDimensioning::LEFT
/** The text is positioned to the left.
*/
LEFT,
-
- // DocMerge from xml: value com::sun::star::drawing::HorizontalDimensioning::CENTERED
/** The text is positioned at the center.
*/
CENTERED,
-
- // DocMerge from xml: value com::sun::star::drawing::HorizontalDimensioning::RIGHT
/** The text is positioned to the right.
*/
RIGHT
diff --git a/offapi/com/sun/star/drawing/Layer.idl b/offapi/com/sun/star/drawing/Layer.idl
index c4d60a58aaad..8d7d0b30175b 100644
--- a/offapi/com/sun/star/drawing/Layer.idl
+++ b/offapi/com/sun/star/drawing/Layer.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: service com::sun::star::drawing::Layer
/** A layer is an entity inside a document which contains shapes.
@@ -45,36 +43,26 @@
published service Layer
{
-
- // DocMerge from xml: service com::sun::star::drawing::Layer: interface com::sun::star::beans::XPropertySet
/** The properties in this set affect all <type>Shape</type>s attached to
this Layer.
*/
interface com::sun::star::beans::XPropertySet;
-
- // DocMerge from xml: property com::sun::star::drawing::Layer::Name
/** The name of a <type>Layer</type> is used to identify the
<type>Layer</type> in the user interface.
*/
[property] string Name;
-
- // DocMerge from xml: property com::sun::star::drawing::Layer::IsVisible
/** If a <type>Layer</type> is not visible, the objects in this
<type>Layer</type> are not shown in the user interface.
*/
[property] boolean IsVisible;
-
- // DocMerge from xml: property com::sun::star::drawing::Layer::IsPrintable
/** If a <type>Layer</type> is not printable, the objects in
this <type>Layer</type> are not printed.
*/
[property] boolean IsPrintable;
-
- // DocMerge from xml: property com::sun::star::drawing::Layer::IsLocked
/** If a <type>Layer</type> is locked, the objects in this
<type>Layer</type> cannot be edited in the user interface.
*/
diff --git a/offapi/com/sun/star/drawing/LayerManager.idl b/offapi/com/sun/star/drawing/LayerManager.idl
index a83d6f8e5210..d58241015f08 100644
--- a/offapi/com/sun/star/drawing/LayerManager.idl
+++ b/offapi/com/sun/star/drawing/LayerManager.idl
@@ -27,8 +27,6 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: service com::sun::star::drawing::LayerManager
/** This service is provided by documents to support <type>Layer</type>s.
@see DrawingDocument
@@ -36,8 +34,6 @@
published service LayerManager
{
-
- // DocMerge from xml: service com::sun::star::drawing::LayerManager: interface com::sun::star::drawing::XLayerManager
/** gives you access to the existing <type>Layer</type>s by
index and makes it possible to add and remove <type>Layer</type>s and
to attach <type>Shape</type>s to <type>Layer</type>s.
@@ -47,8 +43,6 @@ published service LayerManager
*/
interface com::sun::star::drawing::XLayerManager;
-
- // DocMerge from xml: service com::sun::star::drawing::LayerManager: interface com::sun::star::container::XNameAccess
/** gives access to the existing <type>Layer</type>s by name.
<p>The contents of the collection all support <type>Layer</type>
diff --git a/offapi/com/sun/star/drawing/LayerType.idl b/offapi/com/sun/star/drawing/LayerType.idl
index 94c5baf6fc47..1d3ff0ad15e6 100644
--- a/offapi/com/sun/star/drawing/LayerType.idl
+++ b/offapi/com/sun/star/drawing/LayerType.idl
@@ -23,32 +23,22 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::LayerType
/** This enumeration specifies the type of a drawing layer.
*/
published enum LayerType
{
-
- // DocMerge from xml: value com::sun::star::drawing::LayerType::LAYOUT
/** This is the layer for all standard shapes.
*/
LAYOUT,
-
- // DocMerge from xml: value com::sun::star::drawing::LayerType::CONTROLSA
/** This is the layer for the controls.
*/
CONTROLSA,
-
- // DocMerge from xml: value com::sun::star::drawing::LayerType::DIMENSIONIANG_LINES
/** This is the layer for all measure shapes.
*/
DIMENSIONIANG_LINES,
-
- // DocMerge from xml: value com::sun::star::drawing::LayerType::USER_DEFINED
/** There can be zero or more layers of this type.
*/
USER_DEFINED
diff --git a/offapi/com/sun/star/drawing/LineCap.idl b/offapi/com/sun/star/drawing/LineCap.idl
index fda6e7a77aec..b5dd5e78e399 100644
--- a/offapi/com/sun/star/drawing/LineCap.idl
+++ b/offapi/com/sun/star/drawing/LineCap.idl
@@ -22,24 +22,16 @@
//=============================================================================
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::LineCap
/** The <type>LineCap</type> defines rendering of ends of thick lines
*/
published enum LineCap
{
-
- // DocMerge from xml: value com::sun::star::drawing::LineCap::BUTT
/** the line will end without any additional shape
*/
BUTT,
-
- // DocMerge from xml: value com::sun::star::drawing::LineCap::ROUND
/** the line will get a half cirle as additional cap
*/
ROUND,
-
- // DocMerge from xml: value com::sun::star::drawing::LineCap::SQUARE
/** the line will get a half square as additional cap
*/
SQUARE
diff --git a/offapi/com/sun/star/drawing/LineDash.idl b/offapi/com/sun/star/drawing/LineDash.idl
index 750820feeb37..1633895c2553 100644
--- a/offapi/com/sun/star/drawing/LineDash.idl
+++ b/offapi/com/sun/star/drawing/LineDash.idl
@@ -25,43 +25,30 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: struct com::sun::star::drawing::LineDash
/** A <type>LineDash</type> defines a non-continuous line.
*/
published struct LineDash
{
- // DocMerge from xml: field com::sun::star::drawing::LineDash::Style
/** This sets the style of this <type>LineDash</type>.
*/
com::sun::star::drawing::DashStyle Style;
-
- // DocMerge from xml: field com::sun::star::drawing::LineDash::Dots
/** This is the number of dots in this <type>LineDash</type>.
*/
short Dots;
-
- // DocMerge from xml: field com::sun::star::drawing::LineDash::DotLen
/** This is the length of a dot.
*/
long DotLen;
-
- // DocMerge from xml: field com::sun::star::drawing::LineDash::Dashes
/** This is the number of dashes.
*/
short Dashes;
-
- // DocMerge from xml: field com::sun::star::drawing::LineDash::DashLen
/** This is the length of a single dash.
*/
long DashLen;
-
- // DocMerge from xml: field com::sun::star::drawing::LineDash::Distance
/** This is the distance between the dots.
*/
long Distance;
diff --git a/offapi/com/sun/star/drawing/LineEndType.idl b/offapi/com/sun/star/drawing/LineEndType.idl
index 0b40541a8085..bd51467cb5f3 100644
--- a/offapi/com/sun/star/drawing/LineEndType.idl
+++ b/offapi/com/sun/star/drawing/LineEndType.idl
@@ -23,8 +23,6 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::LineEndType
/** The <type>LineEndType</type> specifies the appearance of the bullet at the
end of a line.
@@ -33,36 +31,26 @@
published enum LineEndType
{
// DOCUMENTATION OMITTED FOR LineEndType:: NONE,
-
- // DocMerge from xml: value com::sun::star::drawing::LineEndType::NONE
/** the line has no special end.
*/
NONE,
// DOCUMENTATION OMITTED FOR LineEndType:: ARROW,
-
- // DocMerge from xml: value com::sun::star::drawing::LineEndType::ARROW
/** the line uses an arrow for the line end.
*/
ARROW,
// DOCUMENTATION OMITTED FOR LineEndType:: CIRCLE,
-
- // DocMerge from xml: value com::sun::star::drawing::LineEndType::CIRCLE
/** the line uses a circle for the line end.
*/
CIRCLE,
// DOCUMENTATION OMITTED FOR LineEndType:: SQUARE,
-
- // DocMerge from xml: value com::sun::star::drawing::LineEndType::SQUARE
/** the line uses a square for the line end.
*/
SQUARE,
// DOCUMENTATION OMITTED FOR LineEndType:: SPECIAL
-
- // DocMerge from xml: value com::sun::star::drawing::LineEndType::SPECIAL
/** deprecated
*/
SPECIAL
diff --git a/offapi/com/sun/star/drawing/LineJoint.idl b/offapi/com/sun/star/drawing/LineJoint.idl
index b7c1993ac7c9..f51f1b9f8934 100644
--- a/offapi/com/sun/star/drawing/LineJoint.idl
+++ b/offapi/com/sun/star/drawing/LineJoint.idl
@@ -23,34 +23,22 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::LineJoint
/** The <type>LineJoint</type> defines rendering of joints between thick lines
*/
published enum LineJoint
{
-
- // DocMerge from xml: value com::sun::star::drawing::LineJoint::NONE
/** the joint between lines will not be connected
*/
NONE,
-
- // DocMerge from xml: value com::sun::star::drawing::LineJoint::MIDDLE
/** the middle value between the joints is used
*/
MIDDLE,
-
- // DocMerge from xml: value com::sun::star::drawing::LineJoint::BEVEL
/** the edges of the thick lines will be joined by lines
*/
BEVEL,
-
- // DocMerge from xml: value com::sun::star::drawing::LineJoint::MITER
/** the lines join at intersections
*/
MITER,
-
- // DocMerge from xml: value com::sun::star::drawing::LineJoint::ROUND
/** the lines join with an arc
*/
ROUND
diff --git a/offapi/com/sun/star/drawing/LineStyle.idl b/offapi/com/sun/star/drawing/LineStyle.idl
index f0929a6fdbb9..260981a34e5e 100644
--- a/offapi/com/sun/star/drawing/LineStyle.idl
+++ b/offapi/com/sun/star/drawing/LineStyle.idl
@@ -23,30 +23,22 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::LineStyle
/** specifies the appearance of the lines of a
shape.
*/
published enum LineStyle
{
// DOCUMENTATION OMITTED FOR LineStyle:: NONE,
-
- // DocMerge from xml: value com::sun::star::drawing::LineStyle::NONE
/** the line is hidden.
*/
NONE,
// DOCUMENTATION OMITTED FOR LineStyle:: SOLID,
-
- // DocMerge from xml: value com::sun::star::drawing::LineStyle::SOLID
/** the line is solid.
*/
SOLID,
// DOCUMENTATION OMITTED FOR LineStyle:: DASH
-
- // DocMerge from xml: value com::sun::star::drawing::LineStyle::DASH
/** the line use dashes.
*/
DASH
diff --git a/offapi/com/sun/star/drawing/MasterPage.idl b/offapi/com/sun/star/drawing/MasterPage.idl
index 0a6908c8a725..8f92600828ce 100644
--- a/offapi/com/sun/star/drawing/MasterPage.idl
+++ b/offapi/com/sun/star/drawing/MasterPage.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: service com::sun::star::drawing::MasterPage
/** This service is a single master page inside a drawing document.
@@ -48,8 +46,6 @@
published service MasterPage
{
-
- // DocMerge from xml: service com::sun::star::drawing::MasterPage: service com::sun::star::drawing::GenericDrawPage
/** This service describes the base functionality that every
draw/master page has.
*/
diff --git a/offapi/com/sun/star/drawing/MeasureKind.idl b/offapi/com/sun/star/drawing/MeasureKind.idl
index 82cb58952de8..96b8426b5784 100644
--- a/offapi/com/sun/star/drawing/MeasureKind.idl
+++ b/offapi/com/sun/star/drawing/MeasureKind.idl
@@ -23,8 +23,6 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::MeasureKind
/** determines whether a measured shape is a standard
measure or a radius measure.
@@ -33,15 +31,11 @@
published enum MeasureKind
{
// DOCUMENTATION OMITTED FOR MeasureKind:: STANDARD,
-
- // DocMerge from xml: value com::sun::star::drawing::MeasureKind::STANDARD
/** use the length measurement.
*/
STANDARD,
// DOCUMENTATION OMITTED FOR MeasureKind:: RADIUS
-
- // DocMerge from xml: value com::sun::star::drawing::MeasureKind::RADIUS
/** use the radius measurement.
This option cannot be used from the GUI Interface.
*/
diff --git a/offapi/com/sun/star/drawing/MeasureTextHorzPos.idl b/offapi/com/sun/star/drawing/MeasureTextHorzPos.idl
index c661ef3bc950..0c8c6437dc60 100644
--- a/offapi/com/sun/star/drawing/MeasureTextHorzPos.idl
+++ b/offapi/com/sun/star/drawing/MeasureTextHorzPos.idl
@@ -23,31 +23,21 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::MeasureTextHorzPos
/** This enumeration defines the relative horizontal placement of the text
inside a measure shape.
*/
published enum MeasureTextHorzPos
{
// DOCUMENTATION OMITTED FOR MeasureTextHorzPos:: AUTO,
-
- // DocMerge: empty anyway
AUTO,
// DOCUMENTATION OMITTED FOR MeasureTextHorzPos:: LEFTOUTSIDE,
-
- // DocMerge: empty anyway
LEFTOUTSIDE,
// DOCUMENTATION OMITTED FOR MeasureTextHorzPos:: INSIDE,
-
- // DocMerge: empty anyway
INSIDE,
// DOCUMENTATION OMITTED FOR MeasureTextHorzPos:: RIGHTOUTSIDE
-
- // DocMerge: empty anyway
RIGHTOUTSIDE
};
diff --git a/offapi/com/sun/star/drawing/MeasureTextVertPos.idl b/offapi/com/sun/star/drawing/MeasureTextVertPos.idl
index b0d52b88e83a..416747d4ea30 100644
--- a/offapi/com/sun/star/drawing/MeasureTextVertPos.idl
+++ b/offapi/com/sun/star/drawing/MeasureTextVertPos.idl
@@ -23,36 +23,24 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::MeasureTextVertPos
/** This enumeration defines the relative vertical placement of the text
inside a measure shape.
*/
published enum MeasureTextVertPos
{
// DOCUMENTATION OMITTED FOR MeasureTextVertPos:: AUTO,
-
- // DocMerge: empty anyway
AUTO,
// DOCUMENTATION OMITTED FOR MeasureTextVertPos:: EAST,
-
- // DocMerge: empty anyway
EAST,
// DOCUMENTATION OMITTED FOR MeasureTextVertPos:: BREAKEDLINE,
-
- // DocMerge: empty anyway
BREAKEDLINE,
// DOCUMENTATION OMITTED FOR MeasureTextVertPos:: WEST,
-
- // DocMerge: empty anyway
WEST,
// DOCUMENTATION OMITTED FOR MeasureTextVertPos:: CENTERED
-
- // DocMerge: empty anyway
CENTERED
};
diff --git a/offapi/com/sun/star/drawing/MirrorAxis.idl b/offapi/com/sun/star/drawing/MirrorAxis.idl
index 7aa492cfbb1a..6faf02d2ff6e 100644
--- a/offapi/com/sun/star/drawing/MirrorAxis.idl
+++ b/offapi/com/sun/star/drawing/MirrorAxis.idl
@@ -23,20 +23,14 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::MirrorAxis
/** defines an axis for simple mirroring.
*/
published enum MirrorAxis
{
-
- // DocMerge from xml: value com::sun::star::drawing::MirrorAxis::VERTICAL
/** mirror to the vertical axis
*/
VERTICAL,
-
- // DocMerge from xml: value com::sun::star::drawing::MirrorAxis::HORIZONTAL
/** mirror to the horizontal axis
*/
HORIZONTAL
diff --git a/offapi/com/sun/star/drawing/NormalsKind.idl b/offapi/com/sun/star/drawing/NormalsKind.idl
index 1fa77501d78b..0d87a9e98515 100644
--- a/offapi/com/sun/star/drawing/NormalsKind.idl
+++ b/offapi/com/sun/star/drawing/NormalsKind.idl
@@ -23,28 +23,20 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::NormalsKind
/** specifies in which way the standard normals
for an object are produced.
*/
published enum NormalsKind
{
-
- // DocMerge from xml: value com::sun::star::drawing::NormalsKind::SPECIFIC
/** does not produce standard normals, but leaves
the object-specific ones untouched.
*/
SPECIFIC,
-
- // DocMerge from xml: value com::sun::star::drawing::NormalsKind::FLAT
/** forces one normal per flat part.
*/
FLAT,
-
- // DocMerge from xml: value com::sun::star::drawing::NormalsKind::SPHERE
/** forces normals to think that the object is a
sphere.
*/
diff --git a/offapi/com/sun/star/drawing/PageShape.idl b/offapi/com/sun/star/drawing/PageShape.idl
index 845a8ee823da..15b6db12bf5c 100644
--- a/offapi/com/sun/star/drawing/PageShape.idl
+++ b/offapi/com/sun/star/drawing/PageShape.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: service com::sun::star::drawing::PageShape
/** This service is for a page shape.
A page shape displays a preview of another page. These shapes
are used inside notes pages to preview the corresponding
@@ -35,7 +33,6 @@
*/
published service PageShape
{
- // DocMerge: empty anyway
service com::sun::star::drawing::Shape;
/** this is the page number that is used for the preview.
diff --git a/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl b/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl
index 951a1e7dc793..6ab6bad93ff8 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl
@@ -27,18 +27,13 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: struct com::sun::star::drawing::PolyPolygonBezierCoords
/** specifies the coordinates for a poly polygon Bezier.
*/
published struct PolyPolygonBezierCoords
{
- // DocMerge: empty anyway
com::sun::star::drawing::PointSequenceSequence Coordinates;
// DOCUMENTATION OMITTED FOR PolyPolygonBezierCoords::Flags
-
- // DocMerge: empty anyway
com::sun::star::drawing::FlagSequenceSequence Flags;
};
diff --git a/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl b/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl
index ea5a509ad497..eccb58783ded 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl
@@ -36,8 +36,6 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: service com::sun::star::drawing::PolyPolygonBezierShape
/** This service specifies a poly-polygon Bezier shape.
*/
published service PolyPolygonBezierShape
diff --git a/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl b/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl
index 2ef29b1afacb..bee4170d1893 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl
@@ -25,23 +25,16 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: struct com::sun::star::drawing::PolyPolygonShape3D
/** specifies the coordinates of a 3-dimensional poly polygon.
*/
published struct PolyPolygonShape3D
{
- // DocMerge: empty anyway
com::sun::star::drawing::DoubleSequenceSequence SequenceX;
// DOCUMENTATION OMITTED FOR PolyPolygonShape3D::SequenceY
-
- // DocMerge: empty anyway
com::sun::star::drawing::DoubleSequenceSequence SequenceY;
// DOCUMENTATION OMITTED FOR PolyPolygonShape3D::SequenceZ
-
- // DocMerge: empty anyway
com::sun::star::drawing::DoubleSequenceSequence SequenceZ;
};
diff --git a/offapi/com/sun/star/drawing/PolygonFlags.idl b/offapi/com/sun/star/drawing/PolygonFlags.idl
index b1ccf8ab895b..a5c41d21d583 100644
--- a/offapi/com/sun/star/drawing/PolygonFlags.idl
+++ b/offapi/com/sun/star/drawing/PolygonFlags.idl
@@ -23,36 +23,26 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::PolygonFlags
/** defines how a Bezier curve goes through a point.
*/
published enum PolygonFlags
{
// DOCUMENTATION OMITTED FOR PolygonFlags:: NORMAL,
-
- // DocMerge from xml: value com::sun::star::drawing::PolygonFlags::NORMAL
/** the point is normal, from the curve discussion view.
*/
NORMAL,
// DOCUMENTATION OMITTED FOR PolygonFlags:: SMOOTH,
-
- // DocMerge from xml: value com::sun::star::drawing::PolygonFlags::SMOOTH
/** the point is smooth, the first derivation from the curve discussion view.
*/
SMOOTH,
// DOCUMENTATION OMITTED FOR PolygonFlags:: CONTROL,
-
- // DocMerge from xml: value com::sun::star::drawing::PolygonFlags::CONTROL
/** the point is a control point, to control the curve from the user interface.
*/
CONTROL,
// DOCUMENTATION OMITTED FOR PolygonFlags:: SYMMETRIC
-
- // DocMerge from xml: value com::sun::star::drawing::PolygonFlags::SYMMETRIC
/** the point is symmetric, the second derivation from the curve discussion view.
*/
SYMMETRIC
diff --git a/offapi/com/sun/star/drawing/PolygonKind.idl b/offapi/com/sun/star/drawing/PolygonKind.idl
index 784e14b36bd2..485aafe9dd46 100644
--- a/offapi/com/sun/star/drawing/PolygonKind.idl
+++ b/offapi/com/sun/star/drawing/PolygonKind.idl
@@ -23,62 +23,42 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::PolygonKind
/** This enumeration defines the type of polygon.
*/
published enum PolygonKind
{
-
- // DocMerge from xml: value com::sun::star::drawing::PolygonKind::LINE
/** This is the PolygonKind for a LineShape.
*/
LINE,
-
- // DocMerge from xml: value com::sun::star::drawing::PolygonKind::POLY
/** This is the PolygonKind for a PolyPolygonShape.
*/
POLY,
-
- // DocMerge from xml: value com::sun::star::drawing::PolygonKind::PLIN
/** This is the PolygonKind for a PolyLineShape.
*/
PLIN,
-
- // DocMerge from xml: value com::sun::star::drawing::PolygonKind::PATHLINE
/** This is the PolygonKind for an OpenBezierShape.
*/
PATHLINE,
-
- // DocMerge from xml: value com::sun::star::drawing::PolygonKind::PATHFILL
/** This is the PolygonKind for a ClosedBezierShape.
*/
PATHFILL,
-
- // DocMerge from xml: value com::sun::star::drawing::PolygonKind::FREELINE
/** This is the PolygonKind for an OpenFreeHandShape.
*/
FREELINE,
-
- // DocMerge from xml: value com::sun::star::drawing::PolygonKind::FREEFILL
/** This is the PolygonKind for a ClosedFreeHandShape.
*/
FREEFILL,
-
- // DocMerge from xml: value com::sun::star::drawing::PolygonKind::PATHPOLY
/** This is the PolygonKind for a PolyPolygonPathShape.
*/
PATHPOLY,
-
- // DocMerge from xml: value com::sun::star::drawing::PolygonKind::PATHPLIN
/** This is the PolygonKind for a PolyLinePathShape.
*/
PATHPLIN
diff --git a/offapi/com/sun/star/drawing/Position3D.idl b/offapi/com/sun/star/drawing/Position3D.idl
index be000ddf952b..91866d5cd9e9 100644
--- a/offapi/com/sun/star/drawing/Position3D.idl
+++ b/offapi/com/sun/star/drawing/Position3D.idl
@@ -23,27 +23,20 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: struct com::sun::star::drawing::Position3D
/** specifies a 3-dimensional point.
*/
published struct Position3D
{
- // DocMerge from xml: field com::sun::star::drawing::Position3D::PositionX
/** the position on the X-Axis in the 3D room in 100th of millimeters
*/
double PositionX;
// DOCUMENTATION OMITTED FOR Position3D::PositionY
-
- // DocMerge from xml: field com::sun::star::drawing::Position3D::PositionY
/** the position on the Y-Axis in the 3D room in 100th of millimeters
*/
double PositionY;
// DOCUMENTATION OMITTED FOR Position3D::PositionZ
-
- // DocMerge from xml: field com::sun::star::drawing::Position3D::PositionZ
/** the position on the Z-Axis in the 3D room in 100th of millimeters
*/
double PositionZ;
diff --git a/offapi/com/sun/star/drawing/ProjectionMode.idl b/offapi/com/sun/star/drawing/ProjectionMode.idl
index 718bd807bf9c..572ca397ad7c 100644
--- a/offapi/com/sun/star/drawing/ProjectionMode.idl
+++ b/offapi/com/sun/star/drawing/ProjectionMode.idl
@@ -23,23 +23,17 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::ProjectionMode
/** defines whether the 3D objects are to be
drawn in perspective or parallel projection.
*/
published enum ProjectionMode
{
// DOCUMENTATION OMITTED FOR ProjectionMode:: PARALLEL,
-
- // DocMerge from xml: value com::sun::star::drawing::ProjectionMode::PARALLEL
/** the 3D objects are drawn in the parallel projection.
*/
PARALLEL,
// DOCUMENTATION OMITTED FOR ProjectionMode:: PERSPECTIVE
-
- // DocMerge from xml: value com::sun::star::drawing::ProjectionMode::PERSPECTIVE
/** the 3D objects are drawn in the perspective projection.
*/
PERSPECTIVE
diff --git a/offapi/com/sun/star/drawing/RectanglePoint.idl b/offapi/com/sun/star/drawing/RectanglePoint.idl
index 6aba58df2e71..1e818acbbb14 100644
--- a/offapi/com/sun/star/drawing/RectanglePoint.idl
+++ b/offapi/com/sun/star/drawing/RectanglePoint.idl
@@ -23,71 +23,51 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::RectanglePoint
/** specifies one of nine points in a rectangle.
*/
published enum RectanglePoint
{
// DOCUMENTATION OMITTED FOR RectanglePoint:: LEFT_TOP,
-
- // DocMerge from xml: value com::sun::star::drawing::RectanglePoint::LEFT_TOP
/** specify to the point on the left side from the top of the rectangle.
*/
LEFT_TOP,
// DOCUMENTATION OMITTED FOR RectanglePoint:: MIDDLE_TOP,
-
- // DocMerge from xml: value com::sun::star::drawing::RectanglePoint::MIDDLE_TOP
/** specify to the point on the middle of the top from the rectangle.
*/
MIDDLE_TOP,
// DOCUMENTATION OMITTED FOR RectanglePoint:: RIGHT_TOP,
-
- // DocMerge from xml: value com::sun::star::drawing::RectanglePoint::RIGHT_TOP
/** specify to the point on the right side from the top of the rectangle.
*/
RIGHT_TOP,
// DOCUMENTATION OMITTED FOR RectanglePoint:: LEFT_MIDDLE,
-
- // DocMerge from xml: value com::sun::star::drawing::RectanglePoint::LEFT_MIDDLE
/** specify to the point on the middle of the left side from the rectangle.
*/
LEFT_MIDDLE,
// DOCUMENTATION OMITTED FOR RectanglePoint:: MIDDLE_MIDDLE,
-
- // DocMerge from xml: value com::sun::star::drawing::RectanglePoint::MIDDLE_MIDDLE
/** specify to the point on the center from the rectangle.
*/
MIDDLE_MIDDLE,
// DOCUMENTATION OMITTED FOR RectanglePoint:: RIGHT_MIDDLE,
-
- // DocMerge from xml: value com::sun::star::drawing::RectanglePoint::RIGHT_MIDDLE
/** specify to the point on the middle of the right side from the rectangle.
*/
RIGHT_MIDDLE,
// DOCUMENTATION OMITTED FOR RectanglePoint:: LEFT_BOTTOM,
-
- // DocMerge from xml: value com::sun::star::drawing::RectanglePoint::LEFT_BOTTOM
/** specify to the point on the bottom of the left side from the rectangle.
*/
LEFT_BOTTOM,
// DOCUMENTATION OMITTED FOR RectanglePoint:: MIDDLE_BOTTOM,
-
- // DocMerge from xml: value com::sun::star::drawing::RectanglePoint::MIDDLE_BOTTOM
/** specify to the point on the middle of the bottom from the rectangle.
*/
MIDDLE_BOTTOM,
// DOCUMENTATION OMITTED FOR RectanglePoint:: RIGHT_BOTTOM
-
- // DocMerge from xml: value com::sun::star::drawing::RectanglePoint::RIGHT_BOTTOM
/** specify to the point on the bottom of the right side from the rectangle.
*/
RIGHT_BOTTOM
diff --git a/offapi/com/sun/star/drawing/ShadeMode.idl b/offapi/com/sun/star/drawing/ShadeMode.idl
index 9bda5675a73c..50fc0b127386 100644
--- a/offapi/com/sun/star/drawing/ShadeMode.idl
+++ b/offapi/com/sun/star/drawing/ShadeMode.idl
@@ -23,21 +23,15 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::ShadeMode
/** The <type>ShadeMode</type> determines the quality of displaying the object.
*/
published enum ShadeMode
{
-
- // DocMerge from xml: value com::sun::star::drawing::ShadeMode::FLAT
/** With <const>FLAT</const> shading, the faces of the object are
rendered in a solid color.
*/
FLAT,
-
- // DocMerge from xml: value com::sun::star::drawing::ShadeMode::PHONG
/** With <const>PHONG</const> shading, the normal itself is interpolated
to get more realistic colors and light reflections.
*/
@@ -49,8 +43,6 @@ published enum ShadeMode
*/
SMOOTH,
-
- // DocMerge: empty anyway
/** <const>DRAFT</const> is a special mode which uses a BSP tree and
triangle subdivision for displaying.
*/
diff --git a/offapi/com/sun/star/drawing/Shapes.idl b/offapi/com/sun/star/drawing/Shapes.idl
index f65849fe67da..0f6e7c6ebe61 100644
--- a/offapi/com/sun/star/drawing/Shapes.idl
+++ b/offapi/com/sun/star/drawing/Shapes.idl
@@ -25,13 +25,10 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: service com::sun::star::drawing::Shapes
/** This service is for a generic collection of shapes.
*/
published service Shapes
{
- // DocMerge: empty anyway
interface com::sun::star::drawing::XShapes;
};
diff --git a/offapi/com/sun/star/drawing/SnapObjectType.idl b/offapi/com/sun/star/drawing/SnapObjectType.idl
index eb38dbf48810..9bf98db22b97 100644
--- a/offapi/com/sun/star/drawing/SnapObjectType.idl
+++ b/offapi/com/sun/star/drawing/SnapObjectType.idl
@@ -23,25 +23,17 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::SnapObjectType
/** @deprecated
*/
published enum SnapObjectType
{
// DOCUMENTATION OMITTED FOR SnapObjectType:: POINT,
-
- // DocMerge: empty anyway
POINT,
// DOCUMENTATION OMITTED FOR SnapObjectType:: VERTICAL,
-
- // DocMerge: empty anyway
VERTICAL,
// DOCUMENTATION OMITTED FOR SnapObjectType:: HORIZONTAL
-
- // DocMerge: empty anyway
HORIZONTAL
};
diff --git a/offapi/com/sun/star/drawing/TextAdjust.idl b/offapi/com/sun/star/drawing/TextAdjust.idl
index 7520fa44c619..bb13ae42b626 100644
--- a/offapi/com/sun/star/drawing/TextAdjust.idl
+++ b/offapi/com/sun/star/drawing/TextAdjust.idl
@@ -23,8 +23,6 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::TextAdjust
/** This enumeration specifies the position of a text inside a shape in
relation to the shape.
@@ -34,32 +32,22 @@
*/
published enum TextAdjust
{
-
- // DocMerge from xml: value com::sun::star::drawing::TextAdjust::LEFT
/** The left edge of the text is adjusted to the left edge of the shape.
*/
LEFT,
-
- // DocMerge from xml: value com::sun::star::drawing::TextAdjust::CENTER
/** The text is centered inside the shape.
*/
CENTER,
-
- // DocMerge from xml: value com::sun::star::drawing::TextAdjust::RIGHT
/** The right edge of the text is adjusted to the right edge of the shape.
*/
RIGHT,
-
- // DocMerge from xml: value com::sun::star::drawing::TextAdjust::BLOCK
/** The text extends from the left to the right edge of the shape.
*/
BLOCK,
-
- // DocMerge from xml: value com::sun::star::drawing::TextAdjust::STRETCH
/** The text is stretched so that the longest line goes from the left
to the right edge of the shape.
*/
diff --git a/offapi/com/sun/star/drawing/TextAnimationDirection.idl b/offapi/com/sun/star/drawing/TextAnimationDirection.idl
index dda9d94ed60e..267cf99d8afc 100644
--- a/offapi/com/sun/star/drawing/TextAnimationDirection.idl
+++ b/offapi/com/sun/star/drawing/TextAnimationDirection.idl
@@ -23,30 +23,20 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::TextAnimationDirection
/** This enumeration defines the movement direction of a scrolltext.
*/
published enum TextAnimationDirection
{
// DOCUMENTATION OMITTED FOR TextAnimationDirection:: LEFT,
-
- // DocMerge: empty anyway
LEFT,
// DOCUMENTATION OMITTED FOR TextAnimationDirection:: RIGHT,
-
- // DocMerge: empty anyway
RIGHT,
// DOCUMENTATION OMITTED FOR TextAnimationDirection:: UP,
-
- // DocMerge: empty anyway
UP,
// DOCUMENTATION OMITTED FOR TextAnimationDirection:: DOWN
-
- // DocMerge: empty anyway
DOWN
};
diff --git a/offapi/com/sun/star/drawing/TextAnimationKind.idl b/offapi/com/sun/star/drawing/TextAnimationKind.idl
index df33e20a537a..12f10a44b8e5 100644
--- a/offapi/com/sun/star/drawing/TextAnimationKind.idl
+++ b/offapi/com/sun/star/drawing/TextAnimationKind.idl
@@ -23,38 +23,26 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::TextAnimationKind
/** This enumeration specifies the type of animation for a text.
*/
published enum TextAnimationKind
{
-
- // DocMerge from xml: value com::sun::star::drawing::TextAnimationKind::NONE
/** Don't animate this text.
*/
NONE,
-
- // DocMerge from xml: value com::sun::star::drawing::TextAnimationKind::BLINK
/** Let this text switch its state from visible to invisible continuously.
*/
BLINK,
-
- // DocMerge from xml: value com::sun::star::drawing::TextAnimationKind::SCROLL
/** Let this text scroll.
*/
SCROLL,
-
- // DocMerge from xml: value com::sun::star::drawing::TextAnimationKind::ALTERNATE
/** Scroll the text from one side to the other and back.
*/
ALTERNATE,
-
- // DocMerge from xml: value com::sun::star::drawing::TextAnimationKind::SLIDE
/** Scroll the text from one side to the final position and stop there.
*/
SLIDE
diff --git a/offapi/com/sun/star/drawing/TextFitToSizeType.idl b/offapi/com/sun/star/drawing/TextFitToSizeType.idl
index 9df49337e454..3e285f74cf06 100644
--- a/offapi/com/sun/star/drawing/TextFitToSizeType.idl
+++ b/offapi/com/sun/star/drawing/TextFitToSizeType.idl
@@ -23,8 +23,6 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::TextFitToSizeType
/** This enumeration specifies how the text within a shape relates to the
size of the shape.
*/
diff --git a/offapi/com/sun/star/drawing/TextProperties.idl b/offapi/com/sun/star/drawing/TextProperties.idl
index 6aab0e3112ec..ddde3987cf88 100644
--- a/offapi/com/sun/star/drawing/TextProperties.idl
+++ b/offapi/com/sun/star/drawing/TextProperties.idl
@@ -114,8 +114,6 @@ published service TextProperties
*/
[property] boolean TextAutoGrowWidth;
-
- // DocMerge from xml: property com::sun::star::drawing::Text::TextContourFrame
/** If this value is <TRUE/>, the left edge of every line of text is
aligned with the left edge of this <type>Shape</type>.
*/
diff --git a/offapi/com/sun/star/drawing/TextVerticalAdjust.idl b/offapi/com/sun/star/drawing/TextVerticalAdjust.idl
index 8ee5abd8055d..d799472c2ef8 100644
--- a/offapi/com/sun/star/drawing/TextVerticalAdjust.idl
+++ b/offapi/com/sun/star/drawing/TextVerticalAdjust.idl
@@ -30,20 +30,14 @@
*/
published enum TextVerticalAdjust
{
-
- // DocMerge from xml: value com::sun::star::drawing::TextAdjust::LEFT
/** The top edge of the text is adjusted to the top edge of the shape.
*/
TOP,
-
- // DocMerge from xml: value com::sun::star::drawing::TextAdjust::CENTER
/** The text is centered inside the shape.
*/
CENTER,
-
- // DocMerge from xml: value com::sun::star::drawing::TextAdjust::RIGHT
/** The bottom edge of the text is adjusted to the bottom edge of the shape.
*/
BOTTOM,
diff --git a/offapi/com/sun/star/drawing/TextureKind.idl b/offapi/com/sun/star/drawing/TextureKind.idl
index 7fa8ec3f909e..26df3ddd1d15 100644
--- a/offapi/com/sun/star/drawing/TextureKind.idl
+++ b/offapi/com/sun/star/drawing/TextureKind.idl
@@ -23,23 +23,17 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::TextureKind
/** These enumeration values specify how the texture is applied.
@deprecated
*/
published enum TextureKind
{
-
- // DocMerge from xml: value com::sun::star::drawing::TextureKind::LUMINANCE
/** With <type>TextureKind</type> <const>LUMINANCE</const>, the texture
and the lighting information are mixed to produce the image, so a
lit, textured object is achieved.
*/
LUMINANCE,
-
- // DocMerge from xml: value com::sun::star::drawing::TextureKind::COLOR
/** With this mode the lighting is ignored and only the
texture color information is used.
*/
diff --git a/offapi/com/sun/star/drawing/TextureMode.idl b/offapi/com/sun/star/drawing/TextureMode.idl
index 5a0badd53b63..1aa72debd0c8 100644
--- a/offapi/com/sun/star/drawing/TextureMode.idl
+++ b/offapi/com/sun/star/drawing/TextureMode.idl
@@ -23,27 +23,19 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::TextureMode
/** The <type>TextureMode</type> defines in which way the texture color data
replaces the object color data.
*/
published enum TextureMode
{
-
- // DocMerge from xml: value com::sun::star::drawing::TextureMode::REPLACE
/** This is the standard mode.
*/
REPLACE,
-
- // DocMerge from xml: value com::sun::star::drawing::TextureMode::MODULATE
/** This mixes up colors in a way defined by the texture bitmap.
*/
MODULATE,
-
- // DocMerge from xml: value com::sun::star::drawing::TextureMode::BLEND
/** This mixes both data sources in a fixed ratio.
*/
BLEND
diff --git a/offapi/com/sun/star/drawing/TextureProjectionMode.idl b/offapi/com/sun/star/drawing/TextureProjectionMode.idl
index ecc0b3c98a2e..41328e1172ac 100644
--- a/offapi/com/sun/star/drawing/TextureProjectionMode.idl
+++ b/offapi/com/sun/star/drawing/TextureProjectionMode.idl
@@ -23,8 +23,6 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::TextureProjectionMode
/** defines how the texture is mapped to the object.
@@ -33,22 +31,16 @@
*/
published enum TextureProjectionMode
{
-
- // DocMerge from xml: value com::sun::star::drawing::TextureProjectionMode::OBJECTSPECIFIC
/** This value specifies that the standard object projection method is
used.
*/
OBJECTSPECIFIC,
-
- // DocMerge from xml: value com::sun::star::drawing::TextureProjectionMode::PARALLEL
/** This value specifies a flat parallel projection in the specified
degree of freedom (X or Y).
*/
PARALLEL,
-
- // DocMerge from xml: value com::sun::star::drawing::TextureProjectionMode::SPHERE
/** This value forces projection to wrapping in X and/or Y.
*/
SPHERE
diff --git a/offapi/com/sun/star/drawing/VerticalDimensioning.idl b/offapi/com/sun/star/drawing/VerticalDimensioning.idl
index 16f73a55575c..1ec5314d2bd2 100644
--- a/offapi/com/sun/star/drawing/VerticalDimensioning.idl
+++ b/offapi/com/sun/star/drawing/VerticalDimensioning.idl
@@ -23,34 +23,24 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: enum com::sun::star::drawing::VerticalDimensioning
/** specifies the vertical position of
the text of a dimensioning shape.
*/
published enum VerticalDimensioning
{
-
- // DocMerge from xml: value com::sun::star::drawing::VerticalDimensioning::AUTO
/** Set this to have the application select the best horizontal
position for the text.
*/
AUTO,
-
- // DocMerge from xml: value com::sun::star::drawing::VerticalDimensioning::TOP
/** The text is positioned above the main line.
*/
TOP,
-
- // DocMerge from xml: value com::sun::star::drawing::VerticalDimensioning::CENTERED
/** The text is positioned over the main line.
*/
CENTERED,
-
- // DocMerge from xml: value com::sun::star::drawing::VerticalDimensioning::BOTTOM
/** The text is positioned below the main line.
*/
BOTTOM
diff --git a/offapi/com/sun/star/drawing/XConnectableShape.idl b/offapi/com/sun/star/drawing/XConnectableShape.idl
index b5fc4b0f5b46..52db01c4c930 100644
--- a/offapi/com/sun/star/drawing/XConnectableShape.idl
+++ b/offapi/com/sun/star/drawing/XConnectableShape.idl
@@ -33,15 +33,11 @@
published interface XConnectableShape: com::sun::star::uno::XInterface
{
// DOCUMENTATION OMITTED FOR XConnectableShape::canConnect
-
- // DocMerge: empty anyway
boolean canConnect( [in] com::sun::star::awt::Point nPos,
[in] boolean bCreateGluePoint,
[in] long nMaxDist );
// DOCUMENTATION OMITTED FOR XConnectableShape::doConnect
-
- // DocMerge: empty anyway
boolean doConnect( [in] com::sun::star::awt::Point nPos,
[in] boolean bCreateGluePoint,
[in] long nMaxDist );
diff --git a/offapi/com/sun/star/drawing/XConnectorShape.idl b/offapi/com/sun/star/drawing/XConnectorShape.idl
index 3b5e7169c4d4..299634b90aab 100644
--- a/offapi/com/sun/star/drawing/XConnectorShape.idl
+++ b/offapi/com/sun/star/drawing/XConnectorShape.idl
@@ -34,29 +34,21 @@
*/
published interface XConnectorShape: com::sun::star::drawing::XShape
{
-
- // DocMerge from xml: method com::sun::star::drawing::XConnectorShape::connectStart
/** connects the start of this instance
*/
void connectStart( [in] com::sun::star::drawing::XConnectableShape xShape,
[in] com::sun::star::drawing::ConnectionType nPos );
-
- // DocMerge from xml: method com::sun::star::drawing::XConnectorShape::connectEnd
/** connects the end of this instance.
*/
void connectEnd( [in] com::sun::star::drawing::XConnectableShape xShape,
[in] com::sun::star::drawing::ConnectionType nPos );
-
- // DocMerge from xml: method com::sun::star::drawing::XConnectorShape::disconnectBegin
/** disconnects the given <type>Shape</type> from the start of
this instance.
*/
void disconnectBegin( [in] com::sun::star::drawing::XConnectableShape xShape );
-
- // DocMerge from xml: method com::sun::star::drawing::XConnectorShape::disconnectEnd
/** disconnects the given <type>Shape</type> from the end of
this instance.
*/
diff --git a/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl b/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl
index f6f2b8d9fdf8..3bb732743c01 100644
--- a/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl
@@ -29,8 +29,6 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: interface com::sun::star::drawing::XDrawPageSummarizer
/** is implemented by documents that can create summaries
of their <type>DrawPage</type>s.
@@ -38,8 +36,6 @@
*/
published interface XDrawPageSummarizer: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::drawing::XDrawPageSummarizer::summarize
/** creates a new <type>DrawPage</type> with a summary of all
<type>DrawPage</type>s in the given collection.
*/
diff --git a/offapi/com/sun/star/drawing/XDrawPageSupplier.idl b/offapi/com/sun/star/drawing/XDrawPageSupplier.idl
index 4ed0e6c73483..f20bd9cdb155 100644
--- a/offapi/com/sun/star/drawing/XDrawPageSupplier.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageSupplier.idl
@@ -27,8 +27,6 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: interface com::sun::star::drawing::XDrawPageSupplier
/** represents something that provides a <type>DrawPage</type>.
<p>This interface is provided if the container only supports exactly
@@ -40,8 +38,6 @@
*/
published interface XDrawPageSupplier: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::drawing::XDrawPageSupplier::getDrawPage
/** returns the <type>DrawPage</type>.
*/
com::sun::star::drawing::XDrawPage getDrawPage();
diff --git a/offapi/com/sun/star/drawing/XShapeAligner.idl b/offapi/com/sun/star/drawing/XShapeAligner.idl
index 47945ebf0332..97642697dbb0 100644
--- a/offapi/com/sun/star/drawing/XShapeAligner.idl
+++ b/offapi/com/sun/star/drawing/XShapeAligner.idl
@@ -29,8 +29,6 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: interface com::sun::star::drawing::XShapeAligner
/** Objects implementing this interface can be used to align
<type>Shape</type>s.
@@ -38,8 +36,6 @@
*/
published interface XShapeAligner: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::drawing::XShapeAligner::alignShapes
/** aligns the specified <type>Shape</type>s.
*/
void alignShapes( [inout] com::sun::star::drawing::XShapes aShapes,
diff --git a/offapi/com/sun/star/drawing/XShapeArranger.idl b/offapi/com/sun/star/drawing/XShapeArranger.idl
index c0615e16f4ea..742a0b84d3ec 100644
--- a/offapi/com/sun/star/drawing/XShapeArranger.idl
+++ b/offapi/com/sun/star/drawing/XShapeArranger.idl
@@ -31,8 +31,6 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: interface com::sun::star::drawing::XShapeArranger
/** Objects implementing this interface can be used to arrange
<type>Shape</type>s.
@@ -40,48 +38,36 @@
*/
published interface XShapeArranger: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::drawing::XShapeArranger::arrange
/** applies the specified <type>Arrangement</type> to
the specified collection of <type>Shape</type>s.
*/
void arrange( [in] com::sun::star::drawing::XShapes xShapes,
[in] com::sun::star::drawing::Arrangement eType );
-
- // DocMerge from xml: method com::sun::star::drawing::XShapeArranger::bringToFront
/** moves the specified <type>Shape</type>s by a specified number
of objects more to the front.
*/
void bringToFront( [in] com::sun::star::drawing::XShapes xShapes,
[in] short nSteps );
-
- // DocMerge from xml: method com::sun::star::drawing::XShapeArranger::sendToBack
/** moves the specified <type>Shape</type>s
<var>nSteps</var> objects more to the back.
*/
void sendToBack( [in] com::sun::star::drawing::XShapes xShapes,
[in] short nSteps );
-
- // DocMerge from xml: method com::sun::star::drawing::XShapeArranger::setBehindShape
/** moves the specified collection of <type>Shape</type>s
behind the specified single <type>Shape</type>.
*/
void setBehindShape( [in] com::sun::star::drawing::XShapes xShapes,
[in] com::sun::star::drawing::XShape xShape );
-
- // DocMerge from xml: method com::sun::star::drawing::XShapeArranger::setInFrontOf
/** moves the specified collection of <type>Shape</type>s in
front of the specified single <type>Shape</type>.
*/
void setInFrontOf( [in] com::sun::star::drawing::XShapes xShapes,
[in] com::sun::star::drawing::XShape xShape );
-
- // DocMerge from xml: method com::sun::star::drawing::XShapeArranger::reverseOrder
/** reverses the order of the specified collection of
<type>Shape</type>s.
*/
diff --git a/offapi/com/sun/star/drawing/XShapeGroup.idl b/offapi/com/sun/star/drawing/XShapeGroup.idl
index 45d8323cc941..a3165d52428e 100644
--- a/offapi/com/sun/star/drawing/XShapeGroup.idl
+++ b/offapi/com/sun/star/drawing/XShapeGroup.idl
@@ -33,8 +33,6 @@
*/
published interface XShapeGroup: com::sun::star::drawing::XShape
{
-
- // DocMerge from xml: method com::sun::star::drawing::XShapeGroup::enterGroup
/** enters the group which enables the editing function
for the parts of a grouped <type>Shape</type>. Then the parts can
be edited instead of the group as a whole.
@@ -47,8 +45,6 @@ published interface XShapeGroup: com::sun::star::drawing::XShape
*/
void enterGroup();
-
- // DocMerge from xml: method com::sun::star::drawing::XShapeGroup::leaveGroup
/** leaves the group, which disables the editing function
for the parts of a grouped <type>Shape</type>. Then only the
group as a whole can be edited.
diff --git a/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl b/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl
index 6f15aeb3f2f7..8969c417e9b0 100644
--- a/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl
+++ b/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl
@@ -25,15 +25,11 @@
module com { module sun { module star { module drawing {
-
-// DocMerge from xml: interface com::sun::star::drawing::XUniversalShapeDescriptor
/** @deprecated
*/
published interface XUniversalShapeDescriptor: com::sun::star::drawing::XShapeDescriptor
{
// DOCUMENTATION OMITTED FOR XUniversalShapeDescriptor::setShapeType
-
- // DocMerge: empty anyway
void setShapeType( [in] string aShapeTypeName );
};
diff --git a/offapi/com/sun/star/form/DataSelectionType.idl b/offapi/com/sun/star/form/DataSelectionType.idl
index d5505afd70e0..ab8acb907dde 100644
--- a/offapi/com/sun/star/form/DataSelectionType.idl
+++ b/offapi/com/sun/star/form/DataSelectionType.idl
@@ -23,8 +23,6 @@
module com { module sun { module star { module form {
-
-// DocMerge from xml: enum com::sun::star::form::DataSelectionType
/** describes the type of datasource used for a form.
<p>Please do <em><b>not</b></em> use anymore, this enum is deprecated.
@deprecated
diff --git a/offapi/com/sun/star/form/ErrorEvent.idl b/offapi/com/sun/star/form/ErrorEvent.idl
index 5f8630b829e8..757591e0e324 100644
--- a/offapi/com/sun/star/form/ErrorEvent.idl
+++ b/offapi/com/sun/star/form/ErrorEvent.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module form {
-
-// DocMerge from xml: struct com::sun::star::form::ErrorEvent
/** occurs in case of fired database exceptions triggered by
a database form.
<p>Please do <em><b>not</b></em> use anymore, this struct is deprecated.
diff --git a/offapi/com/sun/star/frame/DispatchStatement.idl b/offapi/com/sun/star/frame/DispatchStatement.idl
index 2465a602d62f..28a33cf4098a 100644
--- a/offapi/com/sun/star/frame/DispatchStatement.idl
+++ b/offapi/com/sun/star/frame/DispatchStatement.idl
@@ -24,15 +24,12 @@
module com { module sun { module star { module frame {
-
-// DocMerge from xml: struct com::sun::star::frame::DispatchStatement
/** represents a dispatch statement from a recorded macro
@since OOo 1.1.2
*/
published struct DispatchStatement
{
- // DocMerge from xml: field com::sun::star::frame::DispatchStatement::aCommand
/** specifies the dispatch command
<p>
@@ -42,8 +39,6 @@ published struct DispatchStatement
string aCommand;
-
- // DocMerge from xml: field com::sun::star::frame::DispatchStatement::aTarget
/** specifies the frame target
<p>
@@ -52,8 +47,6 @@ published struct DispatchStatement
*/
string aTarget;
-
- // DocMerge from xml: field com::sun::star::frame::DispatchStatement::aArgs
/** specifies the dispatch command arguments
<p>
@@ -62,8 +55,6 @@ published struct DispatchStatement
*/
sequence < com::sun::star::beans::PropertyValue > aArgs;
-
- // DocMerge from xml: field com::sun::star::frame::DispatchStatement::nFlags
/** specifies the optional search flags
<p>
That means the <var>SearchFlags</var> parameter of a corresponding <member>XDispatchProvider::queryDispatch()</member> request.
@@ -71,8 +62,6 @@ published struct DispatchStatement
*/
long nFlags;
-
- // DocMerge from xml: field com::sun::star::frame::DispatchStatement::bIsComment
/** specifies if this statement should be recorded as commented out or not
@see XDispatchRecorder::recordDispatchAsComment()
diff --git a/offapi/com/sun/star/frame/DoubleInitializationException.idl b/offapi/com/sun/star/frame/DoubleInitializationException.idl
index 935397df0d56..52fbd8ea6935 100644
--- a/offapi/com/sun/star/frame/DoubleInitializationException.idl
+++ b/offapi/com/sun/star/frame/DoubleInitializationException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module frame {
-
-// DocMerge from xml: exception com::sun::star::frame::DoubleInitializationException
/** This exception can be thrown in case an object is initialized second time.
@since OOo 1.1.2
diff --git a/offapi/com/sun/star/frame/IllegalArgumentIOException.idl b/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
index 8e0626d24d2b..a943fb387fd1 100644
--- a/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
+++ b/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module frame {
-
-// DocMerge from xml: exception com::sun::star::frame::IllegalArgumentIOException
/** This exception can be thrown in case arguments are wrong.
@since OOo 1.1.2
diff --git a/offapi/com/sun/star/mozilla/MenuMultipleChange.idl b/offapi/com/sun/star/mozilla/MenuMultipleChange.idl
index 9ad42904b00d..b27a05a28784 100644
--- a/offapi/com/sun/star/mozilla/MenuMultipleChange.idl
+++ b/offapi/com/sun/star/mozilla/MenuMultipleChange.idl
@@ -27,61 +27,42 @@
module com { module sun { module star { module mozilla {
-
-// DocMerge from idl: struct com::sun::star::mozilla::MenuMultipleChange
/** Explains properties of a menu item
*/
published struct MenuMultipleChange
{
- // DocMerge from xml: field com::sun::star::mozilla::MenuMultipleChange::ID
/** unique ID of this menu item
*/
short ID;
-
- // DocMerge from xml: field com::sun::star::mozilla::MenuMultipleChange::GroupID
/** unique ID of the group this menu item belongs to
*/
short GroupID;
-
- // DocMerge from xml: field com::sun::star::mozilla::MenuMultipleChange::PreItemID
/** unique ID of the item directly above this menu item, used for fuzzy placement
*/
short PreItemID;
-
- // DocMerge from xml: field com::sun::star::mozilla::MenuMultipleChange::ItemText
/** text of the menu item
*/
string ItemText;
-
- // DocMerge from xml: field com::sun::star::mozilla::MenuMultipleChange::IsVisible
/** true if visible
*/
boolean IsVisible;
-
- // DocMerge from xml: field com::sun::star::mozilla::MenuMultipleChange::IsActive
/** true if active, so clickable
*/
boolean IsActive;
-
- // DocMerge from xml: field com::sun::star::mozilla::MenuMultipleChange::IsCheckable
/** true if checkable, so there can be a checkmark
*/
boolean IsCheckable;
-
- // DocMerge from xml: field com::sun::star::mozilla::MenuMultipleChange::IsChecked
/** true if there is a checkmark
*/
boolean IsChecked;
-
- // DocMerge from idl: field com::sun::star::mozilla::MenuMultipleChange::Image
/** sequence of bytes representing a possible image
*/
sequence<byte> Image;
diff --git a/offapi/com/sun/star/mozilla/MenuProxy.idl b/offapi/com/sun/star/mozilla/MenuProxy.idl
index bcb71a6fa516..106a99933d2f 100644
--- a/offapi/com/sun/star/mozilla/MenuProxy.idl
+++ b/offapi/com/sun/star/mozilla/MenuProxy.idl
@@ -27,15 +27,11 @@
module com { module sun { module star { module mozilla {
-
-// DocMerge from idl: service com::sun::star::mozilla::MenuProxy
/** Allows to execute dispatch for a menu item
and handles listeners for changes in menu items.
*/
published service MenuProxy
{
-
- // DocMerge from xml: service com::sun::star::mozilla::MenuProxy: interface com::sun::star::mozilla::XMenuProxy
/** @see XMenuProxy
*/
interface XMenuProxy;
diff --git a/offapi/com/sun/star/mozilla/MenuProxyListener.idl b/offapi/com/sun/star/mozilla/MenuProxyListener.idl
index 79c76dd09f84..185d56de4381 100644
--- a/offapi/com/sun/star/mozilla/MenuProxyListener.idl
+++ b/offapi/com/sun/star/mozilla/MenuProxyListener.idl
@@ -27,14 +27,10 @@
module com { module sun { module star { module mozilla {
-
-// DocMerge from xml: service com::sun::star::mozilla::MenuProxyListener
/** Listens for changes in menu items.
*/
published service MenuProxyListener
{
-
- // DocMerge from xml: service com::sun::star::mozilla::MenuProxyListener: interface com::sun::star::mozilla::XMenuProxyListener
/** @see XMenuProxyListener
*/
interface XMenuProxyListener;
diff --git a/offapi/com/sun/star/mozilla/MenuSingleChange.idl b/offapi/com/sun/star/mozilla/MenuSingleChange.idl
index d664fede77a0..aeca14fc8842 100644
--- a/offapi/com/sun/star/mozilla/MenuSingleChange.idl
+++ b/offapi/com/sun/star/mozilla/MenuSingleChange.idl
@@ -27,25 +27,18 @@
module com { module sun { module star { module mozilla {
-
-// DocMerge from idl: struct com::sun::star::mozilla::MenuSingleChange
/** Explains a change for a menu item
*/
published struct MenuSingleChange
{
- // DocMerge from xml: field com::sun::star::mozilla::MenuSingleChange::ID
/** unique ID of this menu item
*/
short ID;
-
- // DocMerge from xml: field com::sun::star::mozilla::MenuSingleChange::ChangeID
/** ID identifying the type of change in the any type change
*/
short ChangeID;
-
- // DocMerge from xml: field com::sun::star::mozilla::MenuSingleChange::Change
/** value of change
*/
any Change;
diff --git a/offapi/com/sun/star/mozilla/XCloseSessionListener.idl b/offapi/com/sun/star/mozilla/XCloseSessionListener.idl
index dee9330c408c..3747b8292cac 100644
--- a/offapi/com/sun/star/mozilla/XCloseSessionListener.idl
+++ b/offapi/com/sun/star/mozilla/XCloseSessionListener.idl
@@ -25,15 +25,11 @@
module com { module sun { module star { module mozilla {
-
-// DocMerge from xml: interface com::sun::star::mozilla::XCloseSessionListener
/** Listener for closing of the corresponding session.
*/
published interface XCloseSessionListener: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::mozilla::XCloseSessionListener::sessionClosed
/** Notifies a closesession listener that the corresponding session was logged out
@param sessionData [in]: the data identifying the session that was closed
diff --git a/offapi/com/sun/star/mozilla/XMenuProxy.idl b/offapi/com/sun/star/mozilla/XMenuProxy.idl
index 7492756faf3c..999e01084dc5 100644
--- a/offapi/com/sun/star/mozilla/XMenuProxy.idl
+++ b/offapi/com/sun/star/mozilla/XMenuProxy.idl
@@ -29,15 +29,11 @@
module com { module sun { module star { module mozilla {
-
-// DocMerge from xml: interface com::sun::star::mozilla::XMenuProxy
/** Allows to execute dispatch for a menu item
and handles listeners for changes in menu items.
*/
published interface XMenuProxy: com::sun::star::lang::XComponent
{
-
- // DocMerge from xml: method com::sun::star::mozilla::XMenuProxy::executeMenuItem
/** Executes dispatch for the given menu id
@param ID [in]: the menu item
@@ -45,8 +41,6 @@ published interface XMenuProxy: com::sun::star::lang::XComponent
*/
void executeMenuItem([in] short ID);
-
- // DocMerge from xml: method com::sun::star::mozilla::XMenuProxy::addMenuProxyListener
/** Registers an event listener, which will be called when the menu changes
@param xListener [in]: the listener to be set
@@ -54,8 +48,6 @@ published interface XMenuProxy: com::sun::star::lang::XComponent
*/
void addMenuProxyListener([in] XMenuProxyListener xListener );
-
- // DocMerge from xml: method com::sun::star::mozilla::XMenuProxy::removeMenuProxyListener
/** Unregisters an event listener which was registered with
<member>XMenuProxy::addMenuProxyListener()</member>.
diff --git a/offapi/com/sun/star/mozilla/XMenuProxyListener.idl b/offapi/com/sun/star/mozilla/XMenuProxyListener.idl
index 68ca230f5f4b..911d63ac5be3 100644
--- a/offapi/com/sun/star/mozilla/XMenuProxyListener.idl
+++ b/offapi/com/sun/star/mozilla/XMenuProxyListener.idl
@@ -31,28 +31,20 @@
module com { module sun { module star { module mozilla {
-
-// DocMerge from xml: interface com::sun::star::mozilla::XMenuProxyListener
/** Listens for changes in menu items.
*/
published interface XMenuProxyListener: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::mozilla::XMenuProxyListener::menuChangedMultiple
/** is called, if the content or graphical representation/state of the menu changes
completely, for one or more menu items
*/
void menuChangedMultiple([in] sequence<MenuMultipleChange> MenuMultipleChanges);
-
- // DocMerge from xml: method com::sun::star::mozilla::XMenuProxyListener::menuChangedSingle
/** is called, if the content or graphical representation/state of the menu changes,
by one property for one or more menu items
*/
void menuChangedSingle([in] sequence<MenuSingleChange> MenuSingleChanges);
-
- // DocMerge from xml: method com::sun::star::mozilla::XMenuProxyListener::menuItemDeleted
/** is called, if one menu item designated by the ID, is deleted.
@param ID [in]: the menu item
diff --git a/offapi/com/sun/star/mozilla/XPluginInstance.idl b/offapi/com/sun/star/mozilla/XPluginInstance.idl
index 87eaf3f24135..40730a67fde3 100644
--- a/offapi/com/sun/star/mozilla/XPluginInstance.idl
+++ b/offapi/com/sun/star/mozilla/XPluginInstance.idl
@@ -26,24 +26,18 @@
module com { module sun { module star { module mozilla {
-
-// DocMerge from xml: method com::sun::star::mozilla::XPluginInstance::start
/** Allows to control an office side plugin instance and to communicate with it.
This interface is oriented for communication with browsers plugins.
*/
published interface XPluginInstance: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::mozilla::XPluginInstance::start
/** Starts plugin operation. This is called after a plugin instance is
created.
*/
void start();
-
- // DocMerge from xml: method com::sun::star::mozilla::XPluginInstance::stop
/** Stops plugin operation. This is called when the user goes to another web
page. The <member>XPluginInstance::destroy</member> method is directly called
afterwards.
@@ -51,8 +45,6 @@ published interface XPluginInstance: com::sun::star::uno::XInterface
void stop();
-
- // DocMerge from xml: method com::sun::star::mozilla::XPluginInstance::destroy
/** Destroy the plugin instance. This method is called when it is no
longer possible to return to the plugin instance, because it was
destroyed by the browser (e.g., window close).
@@ -60,8 +52,6 @@ published interface XPluginInstance: com::sun::star::uno::XInterface
void destroy();
-
- // DocMerge from xml: method com::sun::star::mozilla::XPluginInstance::createWindow
/** Creates a new window for plugin operation.
@param PlatformParentData [in]: platform dependent window data
@@ -71,8 +61,6 @@ published interface XPluginInstance: com::sun::star::uno::XInterface
void createWindow( [in] any PlatformParentData, [in] boolean embedded );
-
- // DocMerge from xml: method com::sun::star::mozilla::XPluginInstance::newStream
/** Notifies the plugin of a new stream to display.
@param MIMEDesc [in]: the MIMEtype of the data stream
@@ -91,8 +79,6 @@ published interface XPluginInstance: com::sun::star::uno::XInterface
);
-
- // DocMerge from xml: method com::sun::star::mozilla::XPluginInstance::newURL
/** Notifies the plugin of a new url to open as document.
@param MIMEDesc [in]: the MIMEtype of the data stream
@@ -104,8 +90,6 @@ published interface XPluginInstance: com::sun::star::uno::XInterface
void newURL( [in] string MIMEDesc, [in] string theURL, [in] string filter, [in] any sessionData );
-
- // DocMerge from idl: method com::sun::star::mozilla::XPluginInstance::getHttpServerURL
/** Retrieves the URL of the HTTP Load balancing Slave.
@param aURL [out]: the full qualified host name of the LBS
diff --git a/offapi/com/sun/star/mozilla/XPluginInstanceNotifySink.idl b/offapi/com/sun/star/mozilla/XPluginInstanceNotifySink.idl
index fea102d1bd42..085da0565f89 100644
--- a/offapi/com/sun/star/mozilla/XPluginInstanceNotifySink.idl
+++ b/offapi/com/sun/star/mozilla/XPluginInstanceNotifySink.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module mozilla {
-
-// DocMerge from xml: interface com::sun::star::mozilla::XPluginInstanceNotifySink
/** Allows a plugin to get notification from office side
about status of new document opening.
This interface is oriented for communication with browsers plugins.
@@ -34,8 +32,6 @@
published interface XPluginInstanceNotifySink: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::mozilla::XPluginInstanceNotifySink::notifyURL
/** Notifies the plugin that a getURL / postURL operation on the
corresponding XPluginInstancePeer was finished.
diff --git a/offapi/com/sun/star/mozilla/XPluginInstancePeer.idl b/offapi/com/sun/star/mozilla/XPluginInstancePeer.idl
index f2006d6dfb31..66e14e180180 100644
--- a/offapi/com/sun/star/mozilla/XPluginInstancePeer.idl
+++ b/offapi/com/sun/star/mozilla/XPluginInstancePeer.idl
@@ -34,16 +34,12 @@
published interface XPluginInstanceNotifySink;
-
-// DocMerge from xml: interface com::sun::star::mozilla::XPluginInstancePeer
/** Allows to communicate with a plugin from the office side.
This interface is oriented for communication with browsers plugins.
*/
published interface XPluginInstancePeer: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::mozilla::XPluginInstancePeer::setWindowSize
/** Alters the plugin's window size in the browser window.
@param width [in]: the new window width
@@ -54,8 +50,6 @@ published interface XPluginInstancePeer: com::sun::star::uno::XInterface
boolean setWindowSize( [in] long width, [in] long heigth );
-
- // DocMerge from xml: method com::sun::star::mozilla::XPluginInstancePeer::showStatusMessage
/** Show status / hint message in browser's message area.
@param message [in]: the string to be displayed
@@ -63,8 +57,6 @@ published interface XPluginInstancePeer: com::sun::star::uno::XInterface
void showStatusMessage( [in] string message );
-
- // DocMerge from xml: method com::sun::star::mozilla::XPluginInstancePeer::enableScripting
/** Indicates to the plugin that the document was loaded successfully and scripting
interfaces are now available.
@@ -75,8 +67,6 @@ published interface XPluginInstancePeer: com::sun::star::uno::XInterface
void enableScripting( [in] com::sun::star::uno::XInterface document, [in] com::sun::star::lang::XMultiServiceFactory servicemanager );
-
- // DocMerge from xml: method com::sun::star::mozilla::XPluginInstancePeer::newStream
/** Creates a new stream of data produced by the plug-in and consumed by
the browser.
@@ -92,8 +82,6 @@ published interface XPluginInstancePeer: com::sun::star::uno::XInterface
);
-
- // DocMerge from xml: method com::sun::star::mozilla::XPluginInstancePeer::getURL
/** Fetches an URL into the target window. The parameters and their meaning map to the
corresponding Netscape-API call.
@@ -113,8 +101,6 @@ published interface XPluginInstancePeer: com::sun::star::uno::XInterface
);
-
- // DocMerge from xml: method com::sun::star::mozilla::XPluginInstancePeer::postURL
/** Posts to a URL with post data and/or post headers. The parameters and their meaning
map to the corresponding Netscape-API call.
diff --git a/offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl b/offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl
index 6d7146ee6d07..65ecbb2d58dc 100644
--- a/offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl
+++ b/offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl
@@ -25,16 +25,12 @@
module com { module sun { module star { module mozilla {
-
-// DocMerge from xml: interface com::sun::star::mozilla::XPluginInstanceSyncPeer
/** This interface is an extension for <type>XPluginInstancePeer</type> interface.
An object can support this interface in addition to <type>XPluginInstancePeer</type> interface.
*/
published interface XPluginInstanceSyncPeer : com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::mozilla::XPluginInstanceSyncPeer::openNewBrowserWindow
/** Opens a new browser window with a plugin instance synchronously.
@param aInstance [out]: new plugin instance in case of success
diff --git a/offapi/com/sun/star/mozilla/XPluginWindowPeer.idl b/offapi/com/sun/star/mozilla/XPluginWindowPeer.idl
index 6f1e54aa9f2f..de9c21b0da1e 100644
--- a/offapi/com/sun/star/mozilla/XPluginWindowPeer.idl
+++ b/offapi/com/sun/star/mozilla/XPluginWindowPeer.idl
@@ -24,16 +24,12 @@
module com { module sun { module star { module mozilla {
-
-// DocMerge from xml: interface com::sun::star::mozilla::XPluginWindowPeer
/** Allows to notify a plugin from the office side about plugin window's child window creation.
This interface is oriented for communication with browsers plugins.
*/
published interface XPluginWindowPeer: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::mozilla::XPluginWindowPeer::setChildWindow
/** Notifies the peer of the created child window.
@param SystemWindowData [in]: platform dependent window data
diff --git a/offapi/com/sun/star/mozilla/XProfileManager.idl b/offapi/com/sun/star/mozilla/XProfileManager.idl
index 611e4915baa8..fc5a8adf799d 100644
--- a/offapi/com/sun/star/mozilla/XProfileManager.idl
+++ b/offapi/com/sun/star/mozilla/XProfileManager.idl
@@ -36,8 +36,6 @@
*/
published interface XProfileManager: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::mozilla::XProfileManager::bootupProfile
/** attempts to init XPCOM runtime using given profile.
@param product
diff --git a/offapi/com/sun/star/mozilla/XProxyRunner.idl b/offapi/com/sun/star/mozilla/XProxyRunner.idl
index 66d4cc0f1fd5..d3974e17e107 100644
--- a/offapi/com/sun/star/mozilla/XProxyRunner.idl
+++ b/offapi/com/sun/star/mozilla/XProxyRunner.idl
@@ -27,7 +27,6 @@
published interface XCodeProxy;
-// DocMerge from xml: interface com::sun::star::mozilla::XProxyRunner
/** is the interface run Mozilla XPCOM code in a managed environment
@see com::sun::star::mozilla::XProfileDiscover
@@ -35,8 +34,6 @@ published interface XCodeProxy;
*/
published interface XProxyRunner: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::mozilla::XProxyRunner::Run
/** attempts to Run XPCOM code in a managed environment
@param aCode
diff --git a/offapi/com/sun/star/packages/EncryptionNotAllowedException.idl b/offapi/com/sun/star/packages/EncryptionNotAllowedException.idl
index ab091b24b8ac..e42e53e423ca 100644
--- a/offapi/com/sun/star/packages/EncryptionNotAllowedException.idl
+++ b/offapi/com/sun/star/packages/EncryptionNotAllowedException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module packages {
-
-// DocMerge from xml: exception com::sun::star::packages::EncryptionNotAllowedException
/** This exception can be thrown in case object is encrypted when it is not allowed
*/
exception EncryptionNotAllowedException: com::sun::star::uno::Exception
diff --git a/offapi/com/sun/star/packages/NoEncryptionException.idl b/offapi/com/sun/star/packages/NoEncryptionException.idl
index 9c1a3a66ffc1..c98ca62b7b32 100644
--- a/offapi/com/sun/star/packages/NoEncryptionException.idl
+++ b/offapi/com/sun/star/packages/NoEncryptionException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module packages {
-
-// DocMerge from xml: exception com::sun::star::packages::NoEncryptionException
/** This exception can be thrown in case object is not encrypted one as expected.
*/
published exception NoEncryptionException: com::sun::star::uno::Exception
diff --git a/offapi/com/sun/star/packages/NoRawFormatException.idl b/offapi/com/sun/star/packages/NoRawFormatException.idl
index dbfb7d8170eb..2bd981f36759 100644
--- a/offapi/com/sun/star/packages/NoRawFormatException.idl
+++ b/offapi/com/sun/star/packages/NoRawFormatException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module packages {
-
-// DocMerge from xml: exception com::sun::star::packages::NoRawFormatException
/** This exception can be thrown in case provided stream is not a raw stream
representing encrypted package stream.
*/
diff --git a/offapi/com/sun/star/packages/WrongPasswordException.idl b/offapi/com/sun/star/packages/WrongPasswordException.idl
index f32ef85e59c9..e0b16d5da1c7 100644
--- a/offapi/com/sun/star/packages/WrongPasswordException.idl
+++ b/offapi/com/sun/star/packages/WrongPasswordException.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module packages {
-
-// DocMerge from xml: exception com::sun::star::packages::WrongPasswordException
/** This exception can be thrown in case wrong password was provided.
*/
published exception WrongPasswordException: com::sun::star::uno::Exception
diff --git a/offapi/com/sun/star/presentation/AnimationEffect.idl b/offapi/com/sun/star/presentation/AnimationEffect.idl
index ecffed058227..b5a97322c91e 100644
--- a/offapi/com/sun/star/presentation/AnimationEffect.idl
+++ b/offapi/com/sun/star/presentation/AnimationEffect.idl
@@ -23,793 +23,567 @@
module com { module sun { module star { module presentation {
-
-// DocMerge from xml: enum com::sun::star::presentation::AnimationEffect
/** specifies the animation effects for animating
text or objects.
*/
published enum AnimationEffect
{
// DOCUMENTATION OMITTED FOR AnimationEffect:: NONE,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::NONE
/** use no animation effects.
*/
NONE,
// DOCUMENTATION OMITTED FOR AnimationEffect:: FADE_FROM_LEFT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_LEFT
/** use the animation effect "Fade from Left".
*/
FADE_FROM_LEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: FADE_FROM_TOP,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_TOP
/** use the animation effect "Fade from Top".
*/
FADE_FROM_TOP,
// DOCUMENTATION OMITTED FOR AnimationEffect:: FADE_FROM_RIGHT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_RIGHT
/** use the animation effect "Fade from Right".
*/
FADE_FROM_RIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: FADE_FROM_BOTTOM,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_BOTTOM
/** use the animation effect "Fade from Bottom".
*/
FADE_FROM_BOTTOM,
// DOCUMENTATION OMITTED FOR AnimationEffect:: FADE_TO_CENTER,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_TO_CENTER
/** use the animation effect "Fade to Center".
*/
FADE_TO_CENTER,
// DOCUMENTATION OMITTED FOR AnimationEffect:: FADE_FROM_CENTER,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_CENTER
/** use the animation effect "Fade from Center".
*/
FADE_FROM_CENTER,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_FROM_LEFT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_FROM_LEFT
/** use the animation effect "Move from Left".
*/
MOVE_FROM_LEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_FROM_TOP,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_FROM_TOP
/** use the animation effect "Move from Top".
*/
MOVE_FROM_TOP,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_FROM_RIGHT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_FROM_RIGHT
/** use the animation effect "Move from Right".
*/
MOVE_FROM_RIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_FROM_BOTTOM,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_FROM_BOTTOM
/** use the animation effect "Move from Bottom".
*/
MOVE_FROM_BOTTOM,
// DOCUMENTATION OMITTED FOR AnimationEffect:: VERTICAL_STRIPES,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::VERTICAL_STRIPES
/** use the animation effect "Vertical Stripes".
*/
VERTICAL_STRIPES,
// DOCUMENTATION OMITTED FOR AnimationEffect:: HORIZONTAL_STRIPES,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::HORIZONTAL_STRIPES
/** use the animation effect "Horizontal Stripes".
*/
HORIZONTAL_STRIPES,
// DOCUMENTATION OMITTED FOR AnimationEffect:: CLOCKWISE,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::CLOCKWISE
/** use the animation effect "Clockwise".
*/
CLOCKWISE,
// DOCUMENTATION OMITTED FOR AnimationEffect:: COUNTERCLOCKWISE,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::COUNTERCLOCKWISE
/** use the animation effect "Counter Clockwise".
*/
COUNTERCLOCKWISE,
// DOCUMENTATION OMITTED FOR AnimationEffect:: FADE_FROM_UPPERLEFT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_UPPERLEFT
/** use the animation effect "Fade from Upper Left".
*/
FADE_FROM_UPPERLEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: FADE_FROM_UPPERRIGHT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_UPPERRIGHT
/** use the animation effect "Fade from Upper Right".
*/
FADE_FROM_UPPERRIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: FADE_FROM_LOWERLEFT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_LOWERLEFT
/** use the animation effect "Fade from Lower Left".
*/
FADE_FROM_LOWERLEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: FADE_FROM_LOWERRIGHT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_LOWERRIGHT
/** use the animation effect "Fade from Lower Right".
*/
FADE_FROM_LOWERRIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: CLOSE_VERTICAL,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::CLOSE_VERTICAL
/** use the animation effect "Close Vertical".
*/
CLOSE_VERTICAL,
// DOCUMENTATION OMITTED FOR AnimationEffect:: CLOSE_HORIZONTAL,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::CLOSE_HORIZONTAL
/** use the animation effect "Close Horizontal".
*/
CLOSE_HORIZONTAL,
// DOCUMENTATION OMITTED FOR AnimationEffect:: OPEN_VERTICAL,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::OPEN_VERTICAL
/** use the animation effect "Open Vertical".
*/
OPEN_VERTICAL,
// DOCUMENTATION OMITTED FOR AnimationEffect:: OPEN_HORIZONTAL,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::OPEN_HORIZONTAL
/** use the animation effect "Open Horizontal".
*/
OPEN_HORIZONTAL,
// DOCUMENTATION OMITTED FOR AnimationEffect:: PATH,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::PATH
/** use the animation effect "Path".
*/
PATH,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_TO_LEFT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_TO_LEFT
/** use the animation effect "Move to Left".
*/
MOVE_TO_LEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_TO_TOP,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_TO_TOP
/** use the animation effect "Move to Top".
*/
MOVE_TO_TOP,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_TO_RIGHT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_TO_RIGHT
/** use the animation effect "Move to Right".
*/
MOVE_TO_RIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_TO_BOTTOM,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_TO_BOTTOM
/** use the animation effect "Move to Bottom".
*/
MOVE_TO_BOTTOM,
// DOCUMENTATION OMITTED FOR AnimationEffect:: SPIRALIN_LEFT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::SPIRALIN_LEFT
/** use the animation effect "Spiral Inward Left".
*/
SPIRALIN_LEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: SPIRALIN_RIGHT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::SPIRALIN_RIGHT
/** use the animation effect "Spiral Inward Right".
*/
SPIRALIN_RIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: SPIRALOUT_LEFT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::SPIRALOUT_LEFT
/** use the animation effect "Spiral Outward Left".
*/
SPIRALOUT_LEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: SPIRALOUT_RIGHT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::SPIRALOUT_RIGHT
/** use the animation effect "Spiral Outward Right".
*/
SPIRALOUT_RIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: DISSOLVE,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::DISSOLVE
/** use the animation effect "Spiral Inward Left".
*/
DISSOLVE,
// DOCUMENTATION OMITTED FOR AnimationEffect:: WAVYLINE_FROM_LEFT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::WAVYLINE_FROM_LEFT
/** use the animation effect "Wavy Line from Left".
*/
WAVYLINE_FROM_LEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: WAVYLINE_FROM_TOP,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::WAVYLINE_FROM_TOP
/** use the animation effect "Wavy Line from Top".
*/
WAVYLINE_FROM_TOP,
// DOCUMENTATION OMITTED FOR AnimationEffect:: WAVYLINE_FROM_RIGHT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::WAVYLINE_FROM_RIGHT
/** use the animation effect "Wavy Line from Right".
*/
WAVYLINE_FROM_RIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: WAVYLINE_FROM_BOTTOM,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::WAVYLINE_FROM_BOTTOM
/** use the animation effect "Wavy Line from Button".
*/
WAVYLINE_FROM_BOTTOM,
// DOCUMENTATION OMITTED FOR AnimationEffect:: RANDOM,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::RANDOM
/** use the animation effect "Random".
*/
RANDOM,
// DOCUMENTATION OMITTED FOR AnimationEffect:: VERTICAL_LINES,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::VERTICAL_LINES
/** use the animation effect "Vertical Lines".
*/
VERTICAL_LINES,
// DOCUMENTATION OMITTED FOR AnimationEffect:: HORIZONTAL_LINES,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::HORIZONTAL_LINES
/** use the animation effect "Horizontal Lines".
*/
HORIZONTAL_LINES,
// DOCUMENTATION OMITTED FOR AnimationEffect:: LASER_FROM_LEFT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::LASER_FROM_LEFT
/** use the animation effect "Wavy Line from Left".
*/
LASER_FROM_LEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: LASER_FROM_TOP,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::LASER_FROM_TOP
/** use the animation effect "Laser from Top".
*/
LASER_FROM_TOP,
// DOCUMENTATION OMITTED FOR AnimationEffect:: LASER_FROM_RIGHT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::LASER_FROM_RIGHT
/** use the animation effect "Laser from Right".
*/
LASER_FROM_RIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: LASER_FROM_BOTTOM,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::LASER_FROM_BOTTOM
/** use the animation effect "Laser from Bottom".
*/
LASER_FROM_BOTTOM,
// DOCUMENTATION OMITTED FOR AnimationEffect:: LASER_FROM_UPPERLEFT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::LASER_FROM_UPPERLEFT
/** use the animation effect "Laser from Upper Left".
*/
LASER_FROM_UPPERLEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: LASER_FROM_UPPERRIGHT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::LASER_FROM_UPPERRIGHT
/** use the animation effect "Laser from Upper Right".
*/
LASER_FROM_UPPERRIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: LASER_FROM_LOWERLEFT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::LASER_FROM_LOWERLEFT
/** use the animation effect "Laser from Lower Left".
*/
LASER_FROM_LOWERLEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: LASER_FROM_LOWERRIGHT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::LASER_FROM_LOWERRIGHT
/** use the animation effect "Laser from Lower Right".
*/
LASER_FROM_LOWERRIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: APPEAR,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::APPEAR
/** use the animation effect "Appear".
*/
APPEAR,
// DOCUMENTATION OMITTED FOR AnimationEffect:: HIDE
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::HIDE
/** use the animation effect "Hide".
*/
HIDE,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_FROM_UPPERLEFT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_FROM_UPPERLEFT
/** use the animation effect "Move from Upper Left".
*/
MOVE_FROM_UPPERLEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_FROM_UPPERRIGHT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_FROM_UPPERRIGHT
/** use the animation effect "Move from Upper Right".
*/
MOVE_FROM_UPPERRIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_FROM_LOWERRIGHT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_FROM_LOWERRIGHT
/** use the animation effect "Move from Lower Right".
*/
MOVE_FROM_LOWERRIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_FROM_LOWERLEFT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_FROM_LOWERLEFT
/** use the animation effect "Move from Lower Left".
*/
MOVE_FROM_LOWERLEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_TO_UPPERLEFT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_TO_UPPERLEFT
/** use the animation effect "Move to Upper Left".
*/
MOVE_TO_UPPERLEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_TO_UPPERRIGHT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_TO_UPPERRIGHT
/** use the animation effect "Move to Upper Right".
*/
MOVE_TO_UPPERRIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_TO_LOWERRIGHT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_TO_LOWERRIGHT
/** use the animation effect "Move to Lower Right".
*/
MOVE_TO_LOWERRIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_TO_LOWERLEFT,
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_TO_LOWERLEFT
/** use the animation effect "Move to Lower Left".
*/
MOVE_TO_LOWERLEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_SHORT_FROM_LEFT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_FROM_LEFT
/** use the animation effect "Move Short from Left".
*/
MOVE_SHORT_FROM_LEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_SHORT_FROM_UPPERLEFT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_FROM_UPPERLEFT
/** use the animation effect "Move Short from Upper Left".
*/
MOVE_SHORT_FROM_UPPERLEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_SHORT_FROM_TOP
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_FROM_TOP
/** use the animation effect "Move Short from Top".
*/
MOVE_SHORT_FROM_TOP,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_SHORT_FROM_UPPERRIGHT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_FROM_UPPERRIGHT
/** use the animation effect "Move Short from Upper Right".
*/
MOVE_SHORT_FROM_UPPERRIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_SHORT_FROM_RIGHT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_FROM_RIGHT
/** use the animation effect "Move Short from Right".
*/
MOVE_SHORT_FROM_RIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_SHORT_FROM_LOWERRIGHT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_FROM_LOWERRIGHT
/** use the animation effect "Move Short from Lower Right".
*/
MOVE_SHORT_FROM_LOWERRIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_SHORT_FROM_BOTTOM
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_FROM_BOTTOM
/** use the animation effect "Move Short from Bottom".
*/
MOVE_SHORT_FROM_BOTTOM,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_SHORT_FROM_LOWERLEFT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_FROM_LOWERLEFT
/** use the animation effect "Move Short from Lower Left".
*/
MOVE_SHORT_FROM_LOWERLEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_SHORT_TO_LEFT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_TO_LEFT
/** use the animation effect "Move Short to Left".
*/
MOVE_SHORT_TO_LEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_SHORT_TO_UPPERLEFT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_TO_UPPERLEFT
/** use the animation effect "Move Short to Upper Left".
*/
MOVE_SHORT_TO_UPPERLEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_SHORT_TO_TOP
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_TO_TOP
/** use the animation effect "Move Short to Top".
*/
MOVE_SHORT_TO_TOP,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_SHORT_TO_UPPERRIGHT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_TO_UPPERRIGHT
/** use the animation effect "Move Short to Upper Right".
*/
MOVE_SHORT_TO_UPPERRIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_SHORT_TO_RIGHT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_TO_RIGHT
/** use the animation effect "Move Short to Right".
*/
MOVE_SHORT_TO_RIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_SHORT_TO_LOWERRIGHT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_TO_LOWERRIGHT
/** use the animation effect "Move Short to Lower Right".
*/
MOVE_SHORT_TO_LOWERRIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_SHORT_TO_BOTTOM
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_TO_BOTTOM
/** use the animation effect "Move Short to Bottom".
*/
MOVE_SHORT_TO_BOTTOM,
// DOCUMENTATION OMITTED FOR AnimationEffect:: MOVE_SHORT_TO_LOWERLEFT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_TO_LOWERLEFT
/** use the animation effect "Move Short to Lower Left".
*/
MOVE_SHORT_TO_LOWERLEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: VERTICAL_CHECKERBOARD
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::VERTICAL_CHECKERBOARD
/** use the animation effect "Vertical Checkerboard".
*/
VERTICAL_CHECKERBOARD,
// DOCUMENTATION OMITTED FOR AnimationEffect:: HORIZONTAL_CHECKERBOARD
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::HORIZONTAL_CHECKERBOARD
/** use the animation effect "Horizontal Checkerboard".
*/
HORIZONTAL_CHECKERBOARD,
// DOCUMENTATION OMITTED FOR AnimationEffect:: HORIZONTAL_ROTATE
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::HORIZONTAL_ROTATE
/** use the animation effect "Horizontal Rotate".
*/
HORIZONTAL_ROTATE,
// DOCUMENTATION OMITTED FOR AnimationEffect:: VERTICAL_ROTATE
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::VERTICAL_ROTATE
/** use the animation effect "Vertical Rotate".
*/
VERTICAL_ROTATE,
// DOCUMENTATION OMITTED FOR AnimationEffect:: HORIZONTAL_STRETCH
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::HORIZONTAL_STRETCH
/** use the animation effect "Horizontal Stretch".
*/
HORIZONTAL_STRETCH,
// DOCUMENTATION OMITTED FOR AnimationEffect:: VERTICAL_STRETCH
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::VERTICAL_STRETCH
/** use the animation effect "Vertical Stretch".
*/
VERTICAL_STRETCH,
// DOCUMENTATION OMITTED FOR AnimationEffect:: STRETCH_FROM_LEFT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::STRETCH_FROM_LEFT
/** use the animation effect "Stretch From Left".
*/
STRETCH_FROM_LEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: STRETCH_FROM_UPPERLEFT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::STRETCH_FROM_UPPERLEFT
/** use the animation effect "Stretch From Upper Left".
*/
STRETCH_FROM_UPPERLEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: STRETCH_FROM_TOP
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::STRETCH_FROM_TOP
/** use the animation effect "Stretch From Top".
*/
STRETCH_FROM_TOP,
// DOCUMENTATION OMITTED FOR AnimationEffect:: STRETCH_FROM_UPPERRIGHT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::STRETCH_FROM_UPPERRIGHT
/** use the animation effect "Stretch From Upper Right".
*/
STRETCH_FROM_UPPERRIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: STRETCH_FROM_RIGHT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::STRETCH_FROM_RIGHT
/** use the animation effect "Stretch From Right".
*/
STRETCH_FROM_RIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: STRETCH_FROM_LOWERRIGHT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::STRETCH_FROM_LOWERRIGHT
/** use the animation effect "Stretch From Lower Right".
*/
STRETCH_FROM_LOWERRIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: STRETCH_FROM_BOTTOM
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::STRETCH_FROM_BOTTOM
/** use the animation effect "Stretch From Bottom".
*/
STRETCH_FROM_BOTTOM,
// DOCUMENTATION OMITTED FOR AnimationEffect:: STRETCH_FROM_LOWERLEFT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::STRETCH_FROM_LOWERLEFT
/** use the animation effect "Stretch From Lower Left".
*/
STRETCH_FROM_LOWERLEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN
/** use the animation effect "Zoom In".
*/
ZOOM_IN,
// DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_SMALL
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_SMALL
/** use the animation effect "Zoom In Small".
*/
ZOOM_IN_SMALL,
// DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_SPIRAL
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_SPIRAL
/** use the animation effect "Zoom In Spiral".
*/
ZOOM_IN_SPIRAL,
// DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT
/** use the animation effect "Zoom Out".
*/
ZOOM_OUT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_SMALL
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_SMALL
/** use the animation effect "Zoom Out Small".
*/
ZOOM_OUT_SMALL,
// DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_SPIRAL
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_SPIRAL
/** use the animation effect "Zoom Out Spiral".
*/
ZOOM_OUT_SPIRAL,
// DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_LEFT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_LEFT
/** use the animation effect "Zoom In From Left".
*/
ZOOM_IN_FROM_LEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_UPPERLEFT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_UPPERLEFT
/** use the animation effect "Zoom In From Upper Left".
*/
ZOOM_IN_FROM_UPPERLEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_TOP
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_TOP
/** use the animation effect "Zoom In From Top".
*/
ZOOM_IN_FROM_TOP,
// DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_UPPERRIGHT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_UPPERRIGHT
/** use the animation effect "Zoom In From Upper Right".
*/
ZOOM_IN_FROM_UPPERRIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_RIGHT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_RIGHT
/** use the animation effect "Zoom In From Right".
*/
ZOOM_IN_FROM_RIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_LOWERRIGHT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_LOWERRIGHT
/** use the animation effect "Zoom In From Lower Right".
*/
ZOOM_IN_FROM_LOWERRIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_BOTTOM
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_BOTTOM
/** use the animation effect "Zoom In From Bottom".
*/
ZOOM_IN_FROM_BOTTOM,
// DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_LOWERLEFT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_LOWERLEFT
/** use the animation effect "Zoom In From Lower Left".
*/
ZOOM_IN_FROM_LOWERLEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_CENTER
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_CENTER
/** use the animation effect "Zoom In From Center".
*/
ZOOM_IN_FROM_CENTER,
// DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_LEFT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_LEFT
/** use the animation effect "Zoom Out From Left".
*/
ZOOM_OUT_FROM_LEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_UPPERLEFT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_UPPERLEFT
/** use the animation effect "Zoom Out From Upper Left".
*/
ZOOM_OUT_FROM_UPPERLEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_TOP
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_TOP
/** use the animation effect "Zoom Out From Top".
*/
ZOOM_OUT_FROM_TOP,
// DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_UPPERRIGHT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_UPPERRIGHT
/** use the animation effect "Zoom Out From Upper Right".
*/
ZOOM_OUT_FROM_UPPERRIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_RIGHT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_RIGHT
/** use the animation effect "Zoom Out From Right".
*/
ZOOM_OUT_FROM_RIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_LOWERRIGHT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_LOWERRIGHT
/** use the animation effect "Zoom Out From Lower Right".
*/
ZOOM_OUT_FROM_LOWERRIGHT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_BOTTOM
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_BOTTOM
/** use the animation effect "Zoom Out From Bottom".
*/
ZOOM_OUT_FROM_BOTTOM,
// DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_LOWERLEFT
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_LOWERLEFT
/** use the animation effect "Zoom Out From Lower Left".
*/
ZOOM_OUT_FROM_LOWERLEFT,
// DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_CENTER
-
- // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_CENTER
/** use the animation effect "Zoom Out From Center".
*/
ZOOM_OUT_FROM_CENTER
diff --git a/offapi/com/sun/star/resource/XLocale.idl b/offapi/com/sun/star/resource/XLocale.idl
index 48bff0f5fe63..80be59373e6f 100644
--- a/offapi/com/sun/star/resource/XLocale.idl
+++ b/offapi/com/sun/star/resource/XLocale.idl
@@ -29,16 +29,12 @@
module com { module sun { module star { module resource {
-
-// DocMerge from xml: interface com::sun::star::resource::XLocale
/** offers some operations on <type scope="com::sun::star::lang">Locale</type>
structures.@see XResourceBundle
@see Locale
*/
published interface XLocale: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::resource::XLocale::create
/** creates a locale from language, country, and variant.
<p>NOTE: ISO 639 is not a stable standard; some of the
@@ -55,8 +51,6 @@ published interface XLocale: com::sun::star::uno::XInterface
[in] string aCountry,
[in] string aVariant );
-
- // DocMerge from xml: method com::sun::star::resource::XLocale::getDefault
/** the common method of getting the current default locale.
<p>It is used for the presentation (for menus, dialogs, etc.).
@@ -72,8 +66,6 @@ published interface XLocale: com::sun::star::uno::XInterface
*/
com::sun::star::lang::Locale getDefault();
-
- // DocMerge from xml: method com::sun::star::resource::XLocale::setDefault
/** sets the default locale for the whole environment.
<p>It is normally set once at the beginning of an application,
@@ -84,53 +76,39 @@ published interface XLocale: com::sun::star::uno::XInterface
*/
void setDefault( [in] com::sun::star::lang::Locale newLocale );
-
- // DocMerge from idl: method com::sun::star::resource::XLocale::getAvailableLocales
/** @returns
a sequence of all locales which are available in the system.
*/
sequence<com::sun::star::lang::Locale> getAvailableLocales();
-
- // DocMerge from idl: method com::sun::star::resource::XLocale::getISOCountries
/** @returns
a sequence of all ISO country codes known to the component.
*/
sequence<string> getISOCountries();
-
- // DocMerge from idl: method com::sun::star::resource::XLocale::getISOLanguages
/** @returns
a sequence of all ISO language codes known to the component.
*/
sequence<string> getISOLanguages();
-
- // DocMerge from idl: method com::sun::star::resource::XLocale::getLanguagesForCountry
/** @returns
a sequence for language codes which are valid within the
given country.
*/
sequence<string> getLanguagesForCountry( [in] string country );
-
- // DocMerge from idl: method com::sun::star::resource::XLocale::getISO3Language
/** @returns
the ISO language code for the specified locale.
*/
string getISO3Language( [in] com::sun::star::lang::Locale locale )
raises( com::sun::star::resource::MissingResourceException );
-
- // DocMerge from idl: method com::sun::star::resource::XLocale::getISO3Country
/** @returns
the ISO country code for the specified locale.
*/
string getISO3Country( [in] com::sun::star::lang::Locale locale )
raises( com::sun::star::resource::MissingResourceException );
-
- // DocMerge from idl: method com::sun::star::resource::XLocale::getDisplayLanguage_Default
/** @returns
language code for display of field to user. If the localized
name is not found, returns the ISO code. The desired user language
@@ -139,8 +117,6 @@ published interface XLocale: com::sun::star::uno::XInterface
string getDisplayLanguage_Default( [in] com::sun::star::lang::Locale locale );
-
- // DocMerge from idl: method com::sun::star::resource::XLocale::getDisplayLanguage
/** @return
language code for display of field to user. If the localized
name is not found, returns the ISO codes.
@@ -154,8 +130,6 @@ published interface XLocale: com::sun::star::uno::XInterface
string getDisplayLanguage( [in] com::sun::star::lang::Locale locale,
[in] com::sun::star::lang::Locale inLocale );
-
- // DocMerge from idl: method com::sun::star::resource::XLocale::getDisplayCountry_Default
/** @returns
country code for display of field to user. If the localized
name is not found, returns the ISO code. The desired user country
@@ -163,8 +137,6 @@ published interface XLocale: com::sun::star::uno::XInterface
*/
string getDisplayCountry_Default( [in] com::sun::star::lang::Locale locale );
-
- // DocMerge from idl: method com::sun::star::resource::XLocale::getDisplayCountry
/** @returns
country code for display of field to user. If the localized
name is not found, returns the ISO codes.
@@ -175,16 +147,12 @@ published interface XLocale: com::sun::star::uno::XInterface
string getDisplayCountry( [in] com::sun::star::lang::Locale locale,
[in] com::sun::star::lang::Locale inLocale );
-
- // DocMerge from idl: method com::sun::star::resource::XLocale::getDisplayVariant_Default
/** @returns
variant code for display of field to user. The desired user variant
is from the default locale.
*/
string getDisplayVariant_Default( [in] com::sun::star::lang::Locale locale );
-
- // DocMerge from idl: method com::sun::star::resource::XLocale::getDisplayVariant
/** @returns
variant code for display of field to user. If the localized
name is not found, returns the ISO codes.
@@ -195,8 +163,6 @@ published interface XLocale: com::sun::star::uno::XInterface
string getDisplayVariant( [in] com::sun::star::lang::Locale locale,
[in] com::sun::star::lang::Locale inLocale );
-
- // DocMerge from idl: method com::sun::star::resource::XLocale::getDisplayName_Default
/** @returns
a string to display the entire locale to user. If the localized
name is not found, uses the ISO codes. The default locale is used
@@ -204,8 +170,6 @@ published interface XLocale: com::sun::star::uno::XInterface
*/
string getDisplayName_Default( [in] com::sun::star::lang::Locale locale );
-
- // DocMerge from idl: method com::sun::star::resource::XLocale::getDisplayName
/** @returns
a string to display the entire locale to user. If the localized
name is not found, uses the ISO codes.
@@ -216,8 +180,6 @@ published interface XLocale: com::sun::star::uno::XInterface
string getDisplayName( [in] com::sun::star::lang::Locale locale,
[in] com::sun::star::lang::Locale inLocale );
-
- // DocMerge from idl: method com::sun::star::resource::XLocale::equals
/** @returns
<TRUE/> if the <type scope="com::sun::star::lang">Locale</type> <var>l1</var> is equal to the
other one.
diff --git a/offapi/com/sun/star/sheet/DatabaseRange.idl b/offapi/com/sun/star/sheet/DatabaseRange.idl
index 1ba7ecaf01ed..156f28c75d22 100644
--- a/offapi/com/sun/star/sheet/DatabaseRange.idl
+++ b/offapi/com/sun/star/sheet/DatabaseRange.idl
@@ -40,36 +40,23 @@
*/
published service DatabaseRange
{
- // DocMerge: empty anyway
interface com::sun::star::sheet::XDatabaseRange;
-
- // DocMerge: empty anyway
interface com::sun::star::sheet::XCellRangeReferrer;
-
- // DocMerge: empty anyway
interface com::sun::star::beans::XPropertySet;
-
- // DocMerge: empty anyway
interface com::sun::star::container::XNamed;
[optional] interface com::sun::star::util::XRefreshable;
-
- // DocMerge from xml: property com::sun::star::sheet::DatabaseRange::MoveCells
/** if this property is set, columns or rows are inserted or deleted
when the size of the range is changed by an update operation.
*/
[property] boolean MoveCells;
-
- // DocMerge from xml: property com::sun::star::sheet::DatabaseRange::KeepFormats
/** if this property is set, cell formats are extended
when the size of the range is changed by an update operation.
*/
[property] boolean KeepFormats;
-
- // DocMerge from xml: property com::sun::star::sheet::DatabaseRange::StripData
/** if this property is set, the cell contents within the database
range are left out when the document is saved.
*/
diff --git a/offapi/com/sun/star/style/BreakType.idl b/offapi/com/sun/star/style/BreakType.idl
index 38602693adfb..2af3ff7de9d1 100644
--- a/offapi/com/sun/star/style/BreakType.idl
+++ b/offapi/com/sun/star/style/BreakType.idl
@@ -23,21 +23,15 @@
module com { module sun { module star { module style {
-
-// DocMerge from xml: enum com::sun::star::style::BreakType
/** These enumeration values are used to specify if and how a page or
column break is applied.
*/
published enum BreakType
{
-
- // DocMerge from xml: value com::sun::star::style::BreakType::NONE
/** No column or page break is applied.
*/
NONE,
-
- // DocMerge from xml: value com::sun::star::style::BreakType::COLUMN_BEFORE
/** A column break is applied before the object to which it belongs.
@@ -47,8 +41,6 @@ published enum BreakType
*/
COLUMN_BEFORE,
-
- // DocMerge from xml: value com::sun::star::style::BreakType::COLUMN_AFTER
/** A column break is applied after the object to which it belongs.
@@ -58,8 +50,6 @@ published enum BreakType
*/
COLUMN_AFTER,
-
- // DocMerge from xml: value com::sun::star::style::BreakType::COLUMN_BOTH
/** A column break is applied before and after the object to which
it belongs.
@@ -69,8 +59,6 @@ published enum BreakType
*/
COLUMN_BOTH,
-
- // DocMerge from xml: value com::sun::star::style::BreakType::PAGE_BEFORE
/** A page break is applied before the object to which it belongs.
@@ -80,8 +68,6 @@ published enum BreakType
*/
PAGE_BEFORE,
-
- // DocMerge from xml: value com::sun::star::style::BreakType::PAGE_AFTER
/** A page break is applied after the object to which it belongs.
@@ -91,8 +77,6 @@ published enum BreakType
*/
PAGE_AFTER,
-
- // DocMerge from xml: value com::sun::star::style::BreakType::PAGE_BOTH
/** A page break is applied before and after the object to which
it belongs.
diff --git a/offapi/com/sun/star/style/CaseMap.idl b/offapi/com/sun/star/style/CaseMap.idl
index 18fef81e8e65..4ced7d697b39 100644
--- a/offapi/com/sun/star/style/CaseMap.idl
+++ b/offapi/com/sun/star/style/CaseMap.idl
@@ -23,39 +23,27 @@
module com { module sun { module star { module style {
-
-// DocMerge from idl: constants com::sun::star::style::CaseMap
/** These constants are used to specify a case-related mapping for
formatting and displaying characters.
*/
published constants CaseMap
{
-
- // DocMerge from idl: value com::sun::star::style::CaseMap::NONE
/** The case of the characters is unchanged.
*/
const short NONE = 0;
-
- // DocMerge from idl: value com::sun::star::style::CaseMap::UPPERCASE
/** All characters are put in upper case.
*/
const short UPPERCASE = 1;
-
- // DocMerge from idl: value com::sun::star::style::CaseMap::LOWERCASE
/** All characters are put in lower case.
*/
const short LOWERCASE = 2;
-
- // DocMerge from idl: value com::sun::star::style::CaseMap::TITLE
/** The first character of each word is put in upper case.
*/
const short TITLE = 3;
-
- // DocMerge from idl: value com::sun::star::style::CaseMap::SMALLCAPS
/** All characters are put in upper case, but with a smaller font height.
*/
const short SMALLCAPS = 4;
diff --git a/offapi/com/sun/star/style/DropCapFormat.idl b/offapi/com/sun/star/style/DropCapFormat.idl
index 113e3d1acb68..745fd50bfad2 100644
--- a/offapi/com/sun/star/style/DropCapFormat.idl
+++ b/offapi/com/sun/star/style/DropCapFormat.idl
@@ -23,25 +23,18 @@
module com { module sun { module star { module style {
-
-// DocMerge from xml: struct com::sun::star::style::DropCapFormat
/** This struct describes drop caps at a paragraph object.
*/
published struct DropCapFormat
{
- // DocMerge from xml: field com::sun::star::style::DropCapFormat::Lines
/** This is the number of lines used for a drop cap.
*/
byte Lines;
-
- // DocMerge from xml: field com::sun::star::style::DropCapFormat::Count
/** This is the number of characters in the drop cap.
*/
byte Count;
-
- // DocMerge from xml: field com::sun::star::style::DropCapFormat::Distance
/** This is the distance between the drop cap in the following text.
*/
short Distance;
diff --git a/offapi/com/sun/star/style/GraphicLocation.idl b/offapi/com/sun/star/style/GraphicLocation.idl
index 4e49d276a80a..62c3a425e555 100644
--- a/offapi/com/sun/star/style/GraphicLocation.idl
+++ b/offapi/com/sun/star/style/GraphicLocation.idl
@@ -23,81 +23,55 @@
module com { module sun { module star { module style {
-
-// DocMerge from xml: enum com::sun::star::style::GraphicLocation
/** These enumeration values are used to specify the location of a
graphic object within its surroundings.
*/
published enum GraphicLocation
{
-
- // DocMerge from xml: value com::sun::star::style::GraphicLocation::NONE
/** This value specifies that a location is not yet assigned.
*/
NONE,
-
- // DocMerge from xml: value com::sun::star::style::GraphicLocation::LEFT_TOP
/** The graphic is located in the top left corner.
*/
LEFT_TOP,
-
- // DocMerge from xml: value com::sun::star::style::GraphicLocation::MIDDLE_TOP
/** The graphic is located in the middle of the top edge.
*/
MIDDLE_TOP,
-
- // DocMerge from xml: value com::sun::star::style::GraphicLocation::RIGHT_TOP
/** The graphic is located in the top right corner.
*/
RIGHT_TOP,
-
- // DocMerge from xml: value com::sun::star::style::GraphicLocation::LEFT_MIDDLE
/** The graphic is located in the middle of the left edge.
*/
LEFT_MIDDLE,
-
- // DocMerge from xml: value com::sun::star::style::GraphicLocation::MIDDLE_MIDDLE
/** The graphic is located at the center of the surrounding object.
*/
MIDDLE_MIDDLE,
-
- // DocMerge from xml: value com::sun::star::style::GraphicLocation::RIGHT_MIDDLE
/** The graphic is located in the middle of the right edge.
*/
RIGHT_MIDDLE,
-
- // DocMerge from xml: value com::sun::star::style::GraphicLocation::LEFT_BOTTOM
/** The graphic is located in the bottom left corner.
*/
LEFT_BOTTOM,
-
- // DocMerge from xml: value com::sun::star::style::GraphicLocation::MIDDLE_BOTTOM
/** The graphic is located in the middle of the bottom edge.
*/
MIDDLE_BOTTOM,
-
- // DocMerge from xml: value com::sun::star::style::GraphicLocation::RIGHT_BOTTOM
/** The graphic is located in the bottom right corner.
*/
RIGHT_BOTTOM,
-
- // DocMerge from xml: value com::sun::star::style::GraphicLocation::AREA
/** The graphic is scaled to fill the whole surrounding area.
*/
AREA,
-
- // DocMerge from xml: value com::sun::star::style::GraphicLocation::TILED
/** The graphic is repeatedly spread over the surrounding object
like tiles.
*/
diff --git a/offapi/com/sun/star/style/HorizontalAlignment.idl b/offapi/com/sun/star/style/HorizontalAlignment.idl
index 707007ae83f8..eef361dbb8d4 100644
--- a/offapi/com/sun/star/style/HorizontalAlignment.idl
+++ b/offapi/com/sun/star/style/HorizontalAlignment.idl
@@ -23,30 +23,22 @@
module com { module sun { module star { module style {
-
-// DocMerge from xml: enum com::sun::star::style::HorizontalAlignment
/** values specify the horizontal alignment of
an object within a container object.
*/
published enum HorizontalAlignment
{
// DOCUMENTATION OMITTED FOR HorizontalAlignment:: LEFT,
-
- // DocMerge from xml: value com::sun::star::style::HorizontalAlignment::LEFT
/** set the horizontal alignment to the left margin from the container object
*/
LEFT,
// DOCUMENTATION OMITTED FOR HorizontalAlignment:: CENTER,
-
- // DocMerge from xml: value com::sun::star::style::HorizontalAlignment::CENTER
/** set the horizontal alignment to the center between the margins from the container object
*/
CENTER,
// DOCUMENTATION OMITTED FOR HorizontalAlignment:: RIGHT
-
- // DocMerge from xml: value com::sun::star::style::HorizontalAlignment::RIGHT
/** set the horizontal alignment to the right margin from the container object
*/
RIGHT
diff --git a/offapi/com/sun/star/style/LineNumberPosition.idl b/offapi/com/sun/star/style/LineNumberPosition.idl
index d8c48fa19446..c7bd23567cd8 100644
--- a/offapi/com/sun/star/style/LineNumberPosition.idl
+++ b/offapi/com/sun/star/style/LineNumberPosition.idl
@@ -23,33 +23,23 @@
module com { module sun { module star { module style {
-
-// DocMerge from idl: constants com::sun::star::style::LineNumberPosition
/** These constants are used to specify the position of the numbering
of lines.
*/
published constants LineNumberPosition
{
-
- // DocMerge from idl: value com::sun::star::style::LineNumberPosition::LEFT
/** the number occurs on the left side of the pages.
*/
const short LEFT = 0;
-
- // DocMerge from idl: value com::sun::star::style::LineNumberPosition::RIGHT
/** the number occurs on the right side of the pages.
*/
const short RIGHT = 1;
-
- // DocMerge from idl: value com::sun::star::style::LineNumberPosition::INSIDE
/** the number occurs alternating on the inner side of the pages.
*/
const short INSIDE = 2;
-
- // DocMerge from idl: value com::sun::star::style::LineNumberPosition::OUTSIDE
/** the number occurs alternating on the outside side of the pages.
*/
const short OUTSIDE = 3;
diff --git a/offapi/com/sun/star/style/LineSpacing.idl b/offapi/com/sun/star/style/LineSpacing.idl
index 5011af6c80e7..70804d26e2de 100644
--- a/offapi/com/sun/star/style/LineSpacing.idl
+++ b/offapi/com/sun/star/style/LineSpacing.idl
@@ -23,19 +23,14 @@
module com { module sun { module star { module style {
-
-// DocMerge from xml: struct com::sun::star::style::LineSpacing
/** This structure is used to specify the height of a text line.@see LineSpacingMode
*/
published struct LineSpacing
{
- // DocMerge from xml: field com::sun::star::style::LineSpacing::Mode
/** This value specifies the way the height is specified.
*/
short Mode;
-
- // DocMerge from xml: field com::sun::star::style::LineSpacing::Height
/** This value specifies the height in regard to <var>Mode</var>.
*/
short Height;
diff --git a/offapi/com/sun/star/style/LineSpacingMode.idl b/offapi/com/sun/star/style/LineSpacingMode.idl
index 9404adf3857a..5d3575f77654 100644
--- a/offapi/com/sun/star/style/LineSpacingMode.idl
+++ b/offapi/com/sun/star/style/LineSpacingMode.idl
@@ -23,32 +23,22 @@
module com { module sun { module star { module style {
-
-// DocMerge from idl: constants com::sun::star::style::LineSpacingMode
/** These constants specify the interpretation of LineHeight.
*/
published constants LineSpacingMode
{
-
- // DocMerge from idl: value com::sun::star::style::LineSpacingMode::PROP
/** This constant specifies the height value as a proportional value.
*/
const short PROP = 0;
-
- // DocMerge from idl: value com::sun::star::style::LineSpacingMode::MINIMUM
/** This constant specifies the height as the minimum line height.
*/
const short MINIMUM = 1;
-
- // DocMerge from idl: value com::sun::star::style::LineSpacingMode::LEADING
/** This constant specifies the height value as the distance to the previous line.
*/
const short LEADING = 2;
-
- // DocMerge from idl: value com::sun::star::style::LineSpacingMode::FIX
/** This constant specifies the height value as a fixed line height.
*/
const short FIX = 3;
diff --git a/offapi/com/sun/star/style/NumberingAlignment.idl b/offapi/com/sun/star/style/NumberingAlignment.idl
index 0ec037fb1086..b30082d42157 100644
--- a/offapi/com/sun/star/style/NumberingAlignment.idl
+++ b/offapi/com/sun/star/style/NumberingAlignment.idl
@@ -25,32 +25,22 @@
module com { module sun { module star { module style {
-
-// DocMerge from xml: service com::sun::star::style::NumberingAlignment
/** specify the alignment of a numbering level.
*/
published service NumberingAlignment
{
-
- // DocMerge from xml: property com::sun::star::style::NumberingAlignment::Alignment
/** set the alignment from the numbering. Use the com::sun::star::style::HorizontalAlignment enum to change the alignment.
*/
[property] com::sun::star::style::HorizontalAlignment Alignment;
-
- // DocMerge from xml: property com::sun::star::style::NumberingAlignment::TextMarginDistance
/** the minimum distance between the numbering symbol and the following text.
*/
[property] short TextMarginDistance;
-
- // DocMerge from xml: property com::sun::star::style::NumberingAlignment::TextNumberingDistance
/** the distance between left margin and the numbering symbol.
*/
[property] short TextNumberingDistance;
-
- // DocMerge from xml: property com::sun::star::style::NumberingAlignment::Insertion
/** the distance between the numbering symbol and text.
*/
[property] short Insertion;
diff --git a/offapi/com/sun/star/style/NumberingLevel.idl b/offapi/com/sun/star/style/NumberingLevel.idl
index d2309f18b189..fac43e5e82b3 100644
--- a/offapi/com/sun/star/style/NumberingLevel.idl
+++ b/offapi/com/sun/star/style/NumberingLevel.idl
@@ -23,8 +23,6 @@
module com { module sun { module star { module style {
-
-// DocMerge from xml: service com::sun::star::style::NumberingLevel
/** These properties describe the numbering of a paragraph.
@@ -35,57 +33,39 @@
*/
published service NumberingLevel
{
-
- // DocMerge from xml: property com::sun::star::style::NumberingLevel::NumberingType
/** specifies the type of numbering.@see NumberingType
*/
[property] short NumberingType;
-
- // DocMerge from xml: property com::sun::star::style::NumberingLevel::ParentNumbering
/** specifies the number of higher numbering levels that
are included in the representation of the current number.
*/
[property] short ParentNumbering;
-
- // DocMerge from xml: property com::sun::star::style::NumberingLevel::Prefix
/** This prefix is inserted in front of the numbering symbol(s).
*/
[property] string Prefix;
-
- // DocMerge from xml: property com::sun::star::style::NumberingLevel::Suffix
/** This suffix is inserted after the numbering symbol(s).
*/
[property] string Suffix;
-
- // DocMerge from xml: property com::sun::star::style::NumberingLevel::CharStyleName
/** This is the name of the character style that is used for the symbol(s).
*/
[property] string CharStyleName;
-
- // DocMerge from xml: property com::sun::star::style::NumberingLevel::BulletId
/** The bullet symbol with this code in the assigned font is used.
*/
[property] short BulletId;
-
- // DocMerge from xml: property com::sun::star::style::NumberingLevel::BulletFontName
/** This is the name of the font that is used for the bullet.
*/
[property] string BulletFontName;
-
- // DocMerge from xml: property com::sun::star::style::NumberingLevel::GraphicURL
/** This is the URL of a graphic file to use as a symbol.
*/
[property] string GraphicURL;
-
- // DocMerge from xml: property com::sun::star::style::NumberingLevel::StartWith
/** This specifies the start value for the numbering.
*/
[property] short StartWith;
diff --git a/offapi/com/sun/star/style/NumberingRule.idl b/offapi/com/sun/star/style/NumberingRule.idl
index 242ebdefa096..bdd160093564 100644
--- a/offapi/com/sun/star/style/NumberingRule.idl
+++ b/offapi/com/sun/star/style/NumberingRule.idl
@@ -27,8 +27,6 @@
module com { module sun { module star { module style {
-
-// DocMerge from xml: service com::sun::star::style::NumberingRule
/** specifies a rule to format numberings.
<p>It is normally represented by a sequence of
@@ -36,10 +34,7 @@
*/
published service NumberingRule
{
- // DocMerge: empty anyway
service com::sun::star::style::NumberingAlignment;
-
- // DocMerge: empty anyway
service com::sun::star::style::NumberingLevel;
};
diff --git a/offapi/com/sun/star/style/ParagraphAdjust.idl b/offapi/com/sun/star/style/ParagraphAdjust.idl
index 6a1d7cc6137f..630a15fcde69 100644
--- a/offapi/com/sun/star/style/ParagraphAdjust.idl
+++ b/offapi/com/sun/star/style/ParagraphAdjust.idl
@@ -23,38 +23,26 @@
module com { module sun { module star { module style {
-
-// DocMerge from xml: enum com::sun::star::style::ParagraphAdjust
/** These enumeration values describe the formatting of a text paragraph.
*/
published enum ParagraphAdjust
{
-
- // DocMerge from xml: value com::sun::star::style::ParagraphAdjust::LEFT
/** adjusted to the left border
*/
LEFT,
-
- // DocMerge from xml: value com::sun::star::style::ParagraphAdjust::RIGHT
/** adjusted to the right border
*/
RIGHT,
-
- // DocMerge from xml: value com::sun::star::style::ParagraphAdjust::BLOCK
/** adjusted to both borders / stretched, except for last line
*/
BLOCK,
-
- // DocMerge from xml: value com::sun::star::style::ParagraphAdjust::CENTER
/** adjusted to the center
*/
CENTER,
-
- // DocMerge from xml: value com::sun::star::style::ParagraphAdjust::STRETCH
/** adjusted to both borders / stretched, including last line
*/
STRETCH
diff --git a/offapi/com/sun/star/style/ParagraphStyleCategory.idl b/offapi/com/sun/star/style/ParagraphStyleCategory.idl
index d8d4ea46641b..5595296dc324 100644
--- a/offapi/com/sun/star/style/ParagraphStyleCategory.idl
+++ b/offapi/com/sun/star/style/ParagraphStyleCategory.idl
@@ -22,39 +22,25 @@
module com { module sun { module star { module style {
-
-// DocMerge from idl: constants com::sun::star::style::ParagraphStyleCategory
/** These constants are used to specify the category of paragraph styles in text documents.
*/
published constants ParagraphStyleCategory
{
-
- // DocMerge from idl: value com::sun::star::style::ParagraphStyleCategory::TEXT
/** is applied to styles that are used for common text.
*/
const short TEXT = 0;
-
- // DocMerge from idl: value com::sun::star::style::ParagraphStyleCategory::CHAPTER
/** is applied to styles that are used as headings.
*/
const short CHAPTER = 1;
-
- // DocMerge from idl: value com::sun::star::style::ParagraphStyleCategory::LIST
/** is applied to styles that used in numberings and lists.
*/
const short LIST = 2;
-
- // DocMerge from idl: value com::sun::star::style::ParagraphStyleCategory::INDEX
/** is applied to styles that are used in indexes.
*/
const short INDEX = 3;
-
- // DocMerge from idl: value com::sun::star::style::ParagraphStyleCategory::EXTRA
/** is applied to styles that are used in special regions like headers, footers, and footnote text.
*/
const short EXTRA = 4;
-
- // DocMerge from idl: value com::sun::star::style::ParagraphStyleCategory::HTML
/** is applied to styles that are used to support HTML.
*/
const short HTML = 5;
diff --git a/offapi/com/sun/star/style/StyleFamilies.idl b/offapi/com/sun/star/style/StyleFamilies.idl
index e239affcfd0a..70dd9013a851 100644
--- a/offapi/com/sun/star/style/StyleFamilies.idl
+++ b/offapi/com/sun/star/style/StyleFamilies.idl
@@ -27,8 +27,6 @@
module com { module sun { module star { module style {
-
-// DocMerge from xml: service com::sun::star::style::StyleFamilies
/** This service contains the collection of style families within the
container document.
@@ -75,8 +73,6 @@
published service StyleFamilies
{
-
- // DocMerge from xml: service com::sun::star::style::StyleFamilies: interface com::sun::star::container::XNameAccess
/** This mandatory interface makes it possible to get access to the
style families by their names.
@@ -84,8 +80,6 @@ published service StyleFamilies
*/
interface com::sun::star::container::XNameAccess;
-
- // DocMerge from xml: service com::sun::star::style::StyleFamilies: interface com::sun::star::container::XIndexAccess
/** This optional interface makes it possible to get access to the
style families by index.
diff --git a/offapi/com/sun/star/style/StyleFamily.idl b/offapi/com/sun/star/style/StyleFamily.idl
index 4ff5a292272b..1da948070437 100644
--- a/offapi/com/sun/star/style/StyleFamily.idl
+++ b/offapi/com/sun/star/style/StyleFamily.idl
@@ -27,15 +27,11 @@
module com { module sun { module star { module style {
-
-// DocMerge from xml: service com::sun::star::style::StyleFamily
/** This service is a container of style sheets of the same style family.@see StyleFamilies
*/
published service StyleFamily
{
-
- // DocMerge from xml: service com::sun::star::style::StyleFamily: interface com::sun::star::container::XNameAccess
/** This mandatory interface makes it possible to access
the style sheets within this family by name.
@@ -44,8 +40,6 @@ published service StyleFamily
*/
interface com::sun::star::container::XNameAccess;
-
- // DocMerge from xml: service com::sun::star::style::StyleFamily: interface com::sun::star::container::XNameContainer
/** This optional interface makes it possible to add and
remove the style sheets within this family by name.
@@ -53,8 +47,6 @@ published service StyleFamily
<type>Style</type> and are accessed via an <type>XStyle</type>.
*/
[optional] interface com::sun::star::container::XNameContainer;
-
- // DocMerge from xml: service com::sun::star::style::StyleFamily: interface com::sun::star::container::XIndexAccess
/** This optional interface makes it possible to access the style sheets
within this family by index.
diff --git a/offapi/com/sun/star/style/TabAlign.idl b/offapi/com/sun/star/style/TabAlign.idl
index 60e3a0e6a230..df2e5e87c366 100644
--- a/offapi/com/sun/star/style/TabAlign.idl
+++ b/offapi/com/sun/star/style/TabAlign.idl
@@ -23,43 +23,31 @@
module com { module sun { module star { module style {
-
-// DocMerge from xml: enum com::sun::star::style::TabAlign
/** These enumeration values are used to specify the alignment of
the text range delimited by a tabulator.
*/
published enum TabAlign
{
-
- // DocMerge from xml: value com::sun::star::style::TabAlign::LEFT
/** The text range is left-aligned between the previous tabulator
(or the left border, if none) and this tabulator.
*/
LEFT,
-
- // DocMerge from xml: value com::sun::star::style::TabAlign::CENTER
/** The text range is centered between the previous tabulator
(or the left border, if none) and this tabulator.
*/
CENTER,
-
- // DocMerge from xml: value com::sun::star::style::TabAlign::RIGHT
/** The text range is right-aligned between the previous tabulator
(or the left border, if none) and this tabulator.
*/
RIGHT,
-
- // DocMerge from xml: value com::sun::star::style::TabAlign::DECIMAL
/** The decimal point of the text range to the left of this
tabulator is aligned to the position of this tabulator.
*/
DECIMAL,
-
- // DocMerge from xml: value com::sun::star::style::TabAlign::DEFAULT
/** The default alignment for tabulators is applied.
*/
DEFAULT
diff --git a/offapi/com/sun/star/style/TabStop.idl b/offapi/com/sun/star/style/TabStop.idl
index 6671202f89e7..991a9c119ab5 100644
--- a/offapi/com/sun/star/style/TabStop.idl
+++ b/offapi/com/sun/star/style/TabStop.idl
@@ -25,33 +25,24 @@
module com { module sun { module star { module style {
-
-// DocMerge from xml: struct com::sun::star::style::TabStop
/** This structure is used to specify a single tabulator stop.
*/
published struct TabStop
{
- // DocMerge from xml: field com::sun::star::style::TabStop::Position
/** This field specifies the position of the tabulator in relation
to the left border.
*/
long Position;
-
- // DocMerge from xml: field com::sun::star::style::TabStop::Alignment
/** This field specifies the alignment of the text range before the
tabulator.
*/
com::sun::star::style::TabAlign Alignment;
-
- // DocMerge from xml: field com::sun::star::style::TabStop::DecimalChar
/** This field specifies which delimiter is used for the decimal.
*/
char DecimalChar;
-
- // DocMerge from xml: field com::sun::star::style::TabStop::FillChar
/** This field specifies the character that is used to fill up the
space between the text in the text range and the tabulators.
*/
diff --git a/offapi/com/sun/star/style/VerticalAlignment.idl b/offapi/com/sun/star/style/VerticalAlignment.idl
index 32aa14bfd3c5..e488886c296f 100644
--- a/offapi/com/sun/star/style/VerticalAlignment.idl
+++ b/offapi/com/sun/star/style/VerticalAlignment.idl
@@ -23,30 +23,22 @@
module com { module sun { module star { module style {
-
-// DocMerge from xml: enum com::sun::star::style::VerticalAlignment
/** specify the horizontal alignment of
an object within a container object.
*/
published enum VerticalAlignment
{
// DOCUMENTATION OMITTING FOR VerticalAlignment:: TOP,
-
- // DocMerge from xml: value com::sun::star::style::VerticalAlignment::TOP
/** set the vertical alignment to the center between the top and bottom margins from the container object.
*/
TOP,
// DOCUMENTATION OMITTING FOR VerticalAlignment:: MIDDLE,
-
- // DocMerge from xml: value com::sun::star::style::VerticalAlignment::MIDDLE
/** set the vertical alignment to the top margin from the container object.
*/
MIDDLE,
// DOCUMENTATION OMITTING FOR VerticalAlignment:: BOTTOM
-
- // DocMerge from xml: value com::sun::star::style::VerticalAlignment::BOTTOM
/** set the vertical alignment to the bottom margin from the container object.
*/
BOTTOM
diff --git a/offapi/com/sun/star/style/XAutoStyleFamily.idl b/offapi/com/sun/star/style/XAutoStyleFamily.idl
index 8d30235d0e94..c6357a6036ba 100644
--- a/offapi/com/sun/star/style/XAutoStyleFamily.idl
+++ b/offapi/com/sun/star/style/XAutoStyleFamily.idl
@@ -26,8 +26,6 @@
module com { module sun { module star { module style {
-
-// DocMerge from xml: service com::sun::star::style::StyleFamilies
/** This service contains the collection of automatic style families within the
container document.
diff --git a/offapi/com/sun/star/style/XAutoStylesSupplier.idl b/offapi/com/sun/star/style/XAutoStylesSupplier.idl
index 04c4b8df4a3e..b89b386d7e4c 100644
--- a/offapi/com/sun/star/style/XAutoStylesSupplier.idl
+++ b/offapi/com/sun/star/style/XAutoStylesSupplier.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module style {
-
-// DocMerge from xml: interface com::sun::star::style::XStyleFamiliesSupplier
/** This interface provides access to the style families within the
container document.
*/
diff --git a/offapi/com/sun/star/style/XStyleFamiliesSupplier.idl b/offapi/com/sun/star/style/XStyleFamiliesSupplier.idl
index 766678a01d96..c68709d2bd2a 100644
--- a/offapi/com/sun/star/style/XStyleFamiliesSupplier.idl
+++ b/offapi/com/sun/star/style/XStyleFamiliesSupplier.idl
@@ -27,15 +27,11 @@
module com { module sun { module star { module style {
-
-// DocMerge from xml: interface com::sun::star::style::XStyleFamiliesSupplier
/** This interface provides access to the style families within the
container document.
*/
published interface XStyleFamiliesSupplier: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::style::XStyleFamiliesSupplier::getStyleFamilies
/** This method returns the collection of style families available
in the container document.@see StyleFamilies
*/
diff --git a/offapi/com/sun/star/style/XStyleLoader.idl b/offapi/com/sun/star/style/XStyleLoader.idl
index 4e1e273ef272..c9fa61d06b96 100644
--- a/offapi/com/sun/star/style/XStyleLoader.idl
+++ b/offapi/com/sun/star/style/XStyleLoader.idl
@@ -27,14 +27,10 @@
module com { module sun { module star { module style {
-
-// DocMerge from xml: interface com::sun::star::style::XStyleLoader
/** enables the object to import styles from documents.
*/
published interface XStyleLoader: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::style::XStyleLoader::loadStylesFromURL
/** loads styles from a document at the given URL.
<p>
If <var>OverwriteStyles</var> is <TRUE/>, then all styles
diff --git a/offapi/com/sun/star/svg/XSVGPrinter.idl b/offapi/com/sun/star/svg/XSVGPrinter.idl
index cafff844d9c4..e8f4df1523b1 100644
--- a/offapi/com/sun/star/svg/XSVGPrinter.idl
+++ b/offapi/com/sun/star/svg/XSVGPrinter.idl
@@ -29,17 +29,12 @@
*/
published interface XSVGPrinter: com::sun::star::uno::XInterface
{
- // DocMerge: empty anyway
boolean startJob( [in] com::sun::star::xml::sax::XDocumentHandler aHandler,
[in] sequence< byte > aJobSetup,
[in] string aJobName,
[in] unsigned long nCopies,
[in] boolean bCollate );
-
- // DocMerge: empty anyway
void printPage( [in] sequence< byte > aPrintPage );
-
- // DocMerge: empty anyway
void endJob();
};
diff --git a/offapi/com/sun/star/svg/XSVGWriter.idl b/offapi/com/sun/star/svg/XSVGWriter.idl
index da0002d20402..639b4751a2cd 100644
--- a/offapi/com/sun/star/svg/XSVGWriter.idl
+++ b/offapi/com/sun/star/svg/XSVGWriter.idl
@@ -29,7 +29,6 @@
*/
published interface XSVGWriter: com::sun::star::uno::XInterface
{
- // DocMerge: empty anyway
void write( [in] com::sun::star::xml::sax::XDocumentHandler aHandler,
[in] sequence< byte > aMtf );
};
diff --git a/offapi/com/sun/star/task/ClassifiedInteractionRequest.idl b/offapi/com/sun/star/task/ClassifiedInteractionRequest.idl
index 40051056bed4..bfc323b953cd 100644
--- a/offapi/com/sun/star/task/ClassifiedInteractionRequest.idl
+++ b/offapi/com/sun/star/task/ClassifiedInteractionRequest.idl
@@ -27,14 +27,10 @@
module com { module sun { module star { module task {
-
-// DocMerge from xml: exception com::sun::star::task::ClassifiedInteractionRequest
/** A classified interaction request.
*/
published exception ClassifiedInteractionRequest: com::sun::star::uno::Exception
{
-
- // DocMerge from xml: field com::sun::star::task::ClassifiedInteractionRequest::Classification
/** The classification of the request.
*/
com::sun::star::task::InteractionClassification Classification;
diff --git a/offapi/com/sun/star/task/InteractionClassification.idl b/offapi/com/sun/star/task/InteractionClassification.idl
index fab5ac676974..fda9e2fc379c 100644
--- a/offapi/com/sun/star/task/InteractionClassification.idl
+++ b/offapi/com/sun/star/task/InteractionClassification.idl
@@ -23,8 +23,6 @@
module com { module sun { module star { module task {
-
-// DocMerge from xml: enum com::sun::star::task::InteractionClassification
/** A classification of interaction requests.
@see com::sun::star::task::ClassifiedInteractionRequest
@@ -32,20 +30,14 @@
*/
published enum InteractionClassification
{
-
- // DocMerge from xml: value com::sun::star::task::InteractionClassification::ERROR
/** An error.
*/
ERROR,
-
- // DocMerge from xml: value com::sun::star::task::InteractionClassification::WARNING
/** A warning, less severe than an error.
*/
WARNING,
-
- // DocMerge from xml: value com::sun::star::task::InteractionClassification::INFO
/** Some information for the client/user (which will typically lead to the
selection of an
<type scope="com::sun::star::task">XInteractionApprove</type>
@@ -53,8 +45,6 @@ published enum InteractionClassification
*/
INFO,
-
- // DocMerge from xml: value com::sun::star::task::InteractionClassification::QUERY
/** A query for the client/user (which will typically lead to the
selection of an
<type scope="com::sun::star::task">XInteractionApprove</type> or
diff --git a/offapi/com/sun/star/task/XInteractionApprove.idl b/offapi/com/sun/star/task/XInteractionApprove.idl
index 0244a73829a2..1fba7fc5de59 100644
--- a/offapi/com/sun/star/task/XInteractionApprove.idl
+++ b/offapi/com/sun/star/task/XInteractionApprove.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module task {
-
-// DocMerge from xml: interface com::sun::star::task::XInteractionApprove
/** An interaction continuation specifying "approval".
*/
published interface XInteractionApprove: com::sun::star::task::XInteractionContinuation
diff --git a/offapi/com/sun/star/task/XInteractionDisapprove.idl b/offapi/com/sun/star/task/XInteractionDisapprove.idl
index 6ebc6a67b448..d16bbc514f85 100644
--- a/offapi/com/sun/star/task/XInteractionDisapprove.idl
+++ b/offapi/com/sun/star/task/XInteractionDisapprove.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module task {
-
-// DocMerge from xml: interface com::sun::star::task::XInteractionDisapprove
/** An interaction continuation specifying "disapproval".
*/
published interface XInteractionDisapprove: com::sun::star::task::XInteractionContinuation
diff --git a/offapi/com/sun/star/text/AutoTextContainer.idl b/offapi/com/sun/star/text/AutoTextContainer.idl
index 357555d048f2..66e427164573 100644
--- a/offapi/com/sun/star/text/AutoTextContainer.idl
+++ b/offapi/com/sun/star/text/AutoTextContainer.idl
@@ -26,13 +26,10 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::AutoTextContainer
/** provides access to groups of text blocks.
*/
published service AutoTextContainer
{
- // DocMerge: empty anyway
interface com::sun::star::text::XAutoTextContainer;
[optional] interface com::sun::star::container::XIndexAccess;
diff --git a/offapi/com/sun/star/text/AutoTextEntry.idl b/offapi/com/sun/star/text/AutoTextEntry.idl
index 01d08ab66b2d..dffe7885307b 100644
--- a/offapi/com/sun/star/text/AutoTextEntry.idl
+++ b/offapi/com/sun/star/text/AutoTextEntry.idl
@@ -26,8 +26,6 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::AutoTextEntry
/** provides access to a text block in a group of
an <type>AutoTextContainer</type>.
@see com::sun::star::text::AutoTextContainer
@@ -35,11 +33,8 @@
*/
published service AutoTextEntry
{
- // DocMerge: empty anyway
interface com::sun::star::text::XAutoTextEntry;
-
- // DocMerge from xml: service com::sun::star::text::AutoTextEntry: interface com::sun::star::text::XText
/** provides access to the <type>Text</type> of this entry.
*/
interface com::sun::star::text::XText;
diff --git a/offapi/com/sun/star/text/AutoTextGroup.idl b/offapi/com/sun/star/text/AutoTextGroup.idl
index 0b33d17546ce..82d60f03f16f 100644
--- a/offapi/com/sun/star/text/AutoTextGroup.idl
+++ b/offapi/com/sun/star/text/AutoTextGroup.idl
@@ -29,20 +29,13 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::AutoTextGroup
/** provides access to text blocks in a group.@see com::sun::star::text::AutoTextContainer
*/
published service AutoTextGroup
{
- // DocMerge: empty anyway
interface com::sun::star::text::XAutoTextGroup;
-
- // DocMerge: empty anyway
interface com::sun::star::container::XIndexAccess;
-
- // DocMerge from xml: service com::sun::star::text::AutoTextGroup: interface com::sun::star::container::XNamed
/** provides access to the name of the group.
*/
interface com::sun::star::container::XNamed;
diff --git a/offapi/com/sun/star/text/BaseIndex.idl b/offapi/com/sun/star/text/BaseIndex.idl
index 0a6274ade6ad..cd42ebb777f1 100644
--- a/offapi/com/sun/star/text/BaseIndex.idl
+++ b/offapi/com/sun/star/text/BaseIndex.idl
@@ -33,8 +33,6 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::BaseIndex
/** specifies the basic service of different indexes within a document.@see com::sun::star::text::DocumentIndex
@see com::sun::star::text::ContentIndex
@see com::sun::star::text::UserDefinedIndex
@@ -44,88 +42,49 @@
*/
published service BaseIndex
{
- // DocMerge: empty anyway
interface com::sun::star::text::XDocumentIndex;
/** @since LibreOffice 4.0 */
[optional] interface com::sun::star::util::XRefreshable;
/** contains the title of the index.*/
-
- // DocMerge: empty anyway
[property] string Title;
/** determines if the index is protected.*/
-
- // DocMerge: empty anyway
[property] boolean IsProtected;
/** contains the name of the paragraph style that is applied to the heading.*/
-
- // DocMerge: empty anyway
[property] string ParaStyleHeading;
/** contains the name of the paragraph style that is applied to the 1st level.*/
-
- // DocMerge: empty anyway
[property] string ParaStyleLevel1;
/** contains the name of the paragraph style that is applied to the 2nd level.*/
-
- // DocMerge: empty anyway
[optional, property] string ParaStyleLevel2;
/** contains the name of the paragraph style that is applied to the 3rd level.*/
-
- // DocMerge: empty anyway
[optional, property] string ParaStyleLevel3;
/** contains the name of the paragraph style that is applied to the 4th level.*/
-
- // DocMerge: empty anyway
[optional, property] string ParaStyleLevel4;
/** contains the name of the paragraph style that is applied to the 5th level.*/
-
- // DocMerge: empty anyway
[optional, property] string ParaStyleLevel5;
/** contains the name of the paragraph style that is applied to the 6th level.*/
-
- // DocMerge: empty anyway
[optional, property] string ParaStyleLevel6;
/** contains the name of the paragraph style that is applied to the 7th level.*/
-
- // DocMerge: empty anyway
[optional, property] string ParaStyleLevel7;
/** contains the name of the paragraph style that is applied to the 8th level.*/
-
- // DocMerge: empty anyway
[optional, property] string ParaStyleLevel8;
/** contains the name of the paragraph style that is applied to the 9th level.*/
-
- // DocMerge: empty anyway
[optional, property] string ParaStyleLevel9;
/** contains the name of the paragraph style that is applied to the 10th level.*/
-
- // DocMerge: empty anyway
[optional, property] string ParaStyleLevel10;
/** contains the name of the paragraph style that is applied to the separator level.*/
-
- // DocMerge: empty anyway
[optional, property] string ParaStyleSeparator;
/** contains the column interface.*/
-
- // DocMerge: empty anyway
[property] XTextColumns TextColumns;
/** contains the URL of a graphic file that is displayed as background graphic*/
-
- // DocMerge: empty anyway
[property] string BackGraphicURL;
/** contains the name of the filter of the graphic file that is
displayed as background graphic*/
-
- // DocMerge: empty anyway
[property] string BackGraphicFilter;
-
- // DocMerge from xml: property com::sun::star::text::BaseIndex::BackGraphicLocation
/** determines the position of the background graphic.@see GraphicLocation
*/
[property] com::sun::star::style::GraphicLocation BackGraphicLocation;
-
- // DocMerge from xml: property com::sun::star::text::BaseIndex::BackTransparent
/** specifies the color of the background.
*/
[property] com::sun::star::util::Color BackColor;
@@ -140,7 +99,6 @@ published service BaseIndex
</p>
@see DocumentIndexLevelFormat
*/
- // DocMerge: empty anyway
[optional, property] com::sun::star::container::XIndexReplace LevelFormat;
/** determines if the content of the document index is created from the
complete document content or from the current chapter only.
diff --git a/offapi/com/sun/star/text/Bibliography.idl b/offapi/com/sun/star/text/Bibliography.idl
index b4281e1f0eab..f5e6efedb649 100644
--- a/offapi/com/sun/star/text/Bibliography.idl
+++ b/offapi/com/sun/star/text/Bibliography.idl
@@ -26,13 +26,10 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::Bibliography
/** specifies service of bibliography within a text document.@see com::sun::star::text::BaseIndex
*/
published service Bibliography
{
- // DocMerge: empty anyway
service com::sun::star::text::BaseIndex;
/** contains the locale of the index.
*/
diff --git a/offapi/com/sun/star/text/BibliographyDataField.idl b/offapi/com/sun/star/text/BibliographyDataField.idl
index e3920d625011..6934bf8872e7 100644
--- a/offapi/com/sun/star/text/BibliographyDataField.idl
+++ b/offapi/com/sun/star/text/BibliographyDataField.idl
@@ -21,8 +21,6 @@
module com { module sun { module star { module text {
-
-// DocMerge from idl: constants com::sun::star::text::BibliographyDataField
/** These values define parts of bibliographic data. They are used to create a
bibliography in a text document.
<p> Depending on the type of the data some of the fields will usually be left empty.
@@ -30,160 +28,98 @@
*/
published constants BibliographyDataField
{
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::IDENTIFIER
/** This field contains a unique identifier for the bibliographic data.
*/
const short IDENTIFIER = 0;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::BIBILIOGRAPHIC_TYPE
/** This field contains the type of the bibliographic reference. It is of the
type BibliographyDataType.
@see BibliographyDataType
*/
const short BIBILIOGRAPHIC_TYPE = 1;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::ADDRESS
/** This field contains the address of the publisher.
*/
const short ADDRESS = 2;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::ANNOTE
/** This field contains an annotation.
*/
const short ANNOTE = 3;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::AUTHOR
/** This field contains the name(s) of the author(s)
*/
const short AUTHOR = 4;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::BOOKTITLE
/** This field contains the title of the book.
*/
const short BOOKTITLE = 5;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::CHAPTER
/** This field contains the name or number of the chapter.
*/
const short CHAPTER = 6;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::EDITION
/** This field contains the number or name of the edition.
*/
const short EDITION = 7;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::EDITOR
/** This field contains the name(s) of the editor(s)
*/
const short EDITOR = 8;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::HOWPUBLISHED
/** This field contains a description of the type of the publishing.
*/
const short HOWPUBLISHED = 9;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::INSTITUTION
/** This field contains the name of the institution where the publishing was created.
*/
const short INSTITUTION = 10;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::JOURNAL
/** This field contains the name of the journal.
*/
const short JOURNAL = 11;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::MONTH
/** This field contains number or name of the month of the publishing.
*/
const short MONTH = 12;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::NOTE
/** This field contains a note.
*/
const short NOTE = 13;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::NUMBER
/** This field contains the number of the publishing.
*/
const short NUMBER = 14;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::ORGANIZATIONS
/** This field contains the name of the organizations where the publishing was created.
*/
const short ORGANIZATIONS = 15;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::PAGES
/** This field contains the number(s) of the page(s) of the reference into a publishing.
*/
const short PAGES = 16;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::PUBLISHER
/** This field contains the name of the publisher.
*/
const short PUBLISHER = 17;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::SCHOOL
/** This field contains the name of the university or school where the publishing was created.
*/
const short SCHOOL = 18;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::SERIES
/** This field contains the series of the publishing.
*/
const short SERIES = 19;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::TITLE
/** This field contains the title of the publishing.
*/
const short TITLE = 20;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::REPORT_TYPE
/** This field contains a description of the type of the report.
*/
const short REPORT_TYPE = 21;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::VOLUME
/** This field contains the volume of the publishing.
*/
const short VOLUME = 22;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::YEAR
/** This field contains the year when the publishing was created.
*/
const short YEAR = 23;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::URL
/** This field contains URL of the publishing.
*/
const short URL = 24;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::CUSTOM1
/** This field contains user defined data.
*/
const short CUSTOM1 = 25;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::CUSTOM2
/** This field contains user defined data.
*/
const short CUSTOM2 = 26;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::CUSTOM3
/** This field contains user defined data.
*/
const short CUSTOM3 = 27;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::CUSTOM4
/** This field contains user defined data.
*/
const short CUSTOM4 = 28;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::CUSTOM5
/** This field contains user defined data.
*/
const short CUSTOM5 = 29;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataField::ISBN
/** This field contains the ISBN data of the publishing.
*/
const short ISBN = 30;
diff --git a/offapi/com/sun/star/text/BibliographyDataType.idl b/offapi/com/sun/star/text/BibliographyDataType.idl
index b7e7c84f25b4..9d2d690f01d4 100644
--- a/offapi/com/sun/star/text/BibliographyDataType.idl
+++ b/offapi/com/sun/star/text/BibliographyDataType.idl
@@ -21,120 +21,74 @@
module com { module sun { module star { module text {
-
-// DocMerge from idl: constants com::sun::star::text::BibliographyDataType
/** These values define the type of bibliographic data like book, journal, magazine, etc.
*/
published constants BibliographyDataType
{
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataType::ARTICLE
/** An article from a journal or magazine.
*/
const short ARTICLE = 0;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataType::BOOK
/** A book with an explicit publisher.
*/
const short BOOK = 1;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataType::BOOKLET
/** A work that is printed and bound, but without a named publisher or sponsoring institution.
*/
const short BOOKLET = 2;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataType::CONFERENCE
/** An article in the proceedings of a conference. This entry is identical to the "inproceedings"
entry and is included for compatibility with BiBTex.
*/
const short CONFERENCE = 3;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataType::INBOOK
/** A part of a book, which may be a chapter and/or a range of pages.
*/
const short INBOOK = 4;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataType::INCOLLECTION
/** A part of a book with its own title.
*/
const short INCOLLECTION = 5;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataType::INPROCEEDINGS
/** An article in the proceedings of a conference.
*/
const short INPROCEEDINGS = 6;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataType::JOURNAL
/** A journal or magazine.
*/
const short JOURNAL = 7;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataType::MANUAL
/** Technical documentation.
*/
const short MANUAL = 8;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataType::MASTERSTHESIS
/** A Master's thesis.
*/
const short MASTERSTHESIS = 9;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataType::MISC
/** This type is used when nothing else seems appropriate.
*/
const short MISC = 10;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataType::PHDTHESIS
/** A PhD thesis.
*/
const short PHDTHESIS = 11;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataType::PROCEEDINGS
/** The proceedings of a conference.
*/
const short PROCEEDINGS = 12;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataType::TECHREPORT
/** A report published by a school or other institution, usually numbered within a series.
*/
const short TECHREPORT = 13;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataType::UNPUBLISHED
/** A document with an author and title, but not formally published.
*/
const short UNPUBLISHED = 14;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataType::EMAIL
/** An eMail document
*/
const short EMAIL = 15;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataType::WWW
/** A Web document
*/
const short WWW = 16;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataType::CUSTOM1
/** A user defined document type
*/
const short CUSTOM1 = 17;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataType::CUSTOM2
/** A user defined document type
*/
const short CUSTOM2 = 18;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataType::CUSTOM3
/** A user defined document type
*/
const short CUSTOM3 = 19;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataType::CUSTOM4
/** A user defined document type
*/
const short CUSTOM4 = 20;
-
- // DocMerge from idl: value com::sun::star::text::BibliographyDataType::CUSTOM5
/** A user defined document type
*/
const short CUSTOM5 = 21;
diff --git a/offapi/com/sun/star/text/Bookmark.idl b/offapi/com/sun/star/text/Bookmark.idl
index ca1483e57384..61d369cd827c 100644
--- a/offapi/com/sun/star/text/Bookmark.idl
+++ b/offapi/com/sun/star/text/Bookmark.idl
@@ -27,18 +27,13 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::Bookmark
/** A bookmark is a <type>TextContent</type>, which is like a jump
target or a label.
*/
published service Bookmark
{
- // DocMerge: empty anyway
service com::sun::star::text::TextContent;
-
- // DocMerge from xml: service com::sun::star::text::Bookmark: interface com::sun::star::container::XNamed
/** This interface specifies the name of the bookmark.
*/
interface com::sun::star::container::XNamed;
diff --git a/offapi/com/sun/star/text/Bookmarks.idl b/offapi/com/sun/star/text/Bookmarks.idl
index 3dfd2f7986eb..90273b73fba9 100644
--- a/offapi/com/sun/star/text/Bookmarks.idl
+++ b/offapi/com/sun/star/text/Bookmarks.idl
@@ -26,15 +26,11 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::Bookmarks
/** This service specifies a collection of <type>Bookmark</type>s.
*/
published service Bookmarks
{
-
- // DocMerge from xml: service com::sun::star::text::Bookmarks: interface com::sun::star::container::XNameAccess
/** makes it possible to access the bookmarks by their names.
<p>All contents support the service <type>Bookmark</type>.
diff --git a/offapi/com/sun/star/text/ChapterFormat.idl b/offapi/com/sun/star/text/ChapterFormat.idl
index 03e5abd12253..a0f135d0d45f 100644
--- a/offapi/com/sun/star/text/ChapterFormat.idl
+++ b/offapi/com/sun/star/text/ChapterFormat.idl
@@ -23,39 +23,27 @@
module com { module sun { module star { module text {
-
-// DocMerge from idl: constants com::sun::star::text::ChapterFormat
/** These constants define the display format of the chapter number in a
chapter text field.
*/
published constants ChapterFormat
{
-
- // DocMerge from idl: value com::sun::star::text::ChapterFormat::NAME
/** The title of the chapter is displayed.
*/
const short NAME = 0;
-
- // DocMerge from idl: value com::sun::star::text::ChapterFormat::NUMBER
/** The number including prefix and suffix of the chapter is displayed.
*/
const short NUMBER = 1;
-
- // DocMerge from idl: value com::sun::star::text::ChapterFormat::NAME_NUMBER
/** The title and number including prefix and suffix of the chapter are displayed.
*/
const short NAME_NUMBER = 2;
-
- // DocMerge from idl: value com::sun::star::text::ChapterFormat::NO_PREFIX_SUFFIX
/** The name and number of the chapter are displayed.
*/
const short NO_PREFIX_SUFFIX = 3;
-
- // DocMerge from idl: value com::sun::star::text::ChapterFormat::DIGIT
/** The number of the chapter is displayed.
*/
const short DIGIT = 4;
diff --git a/offapi/com/sun/star/text/ChapterNumberingRule.idl b/offapi/com/sun/star/text/ChapterNumberingRule.idl
index 3a2bd61a3f25..eacefecc1ed7 100644
--- a/offapi/com/sun/star/text/ChapterNumberingRule.idl
+++ b/offapi/com/sun/star/text/ChapterNumberingRule.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::ChapterNumberingRule
/** describes the rules for chapter numbering in a text document.
@@ -50,11 +48,8 @@
*/
published service ChapterNumberingRule
{
- // DocMerge: empty anyway
service com::sun::star::style::NumberingRule;
-
- // DocMerge from xml: property com::sun::star::text::ChapterNumberingRule::HeadingStyleName
/** contains the name of the paragraph style that marks this heading
level.
diff --git a/offapi/com/sun/star/text/ContentIndex.idl b/offapi/com/sun/star/text/ContentIndex.idl
index cdb41e18cc87..99ef0f51b3ad 100644
--- a/offapi/com/sun/star/text/ContentIndex.idl
+++ b/offapi/com/sun/star/text/ContentIndex.idl
@@ -31,7 +31,6 @@ module com { module sun { module star { module text {
*/
published service ContentIndex
{
- // DocMerge: empty anyway
service com::sun::star::text::BaseIndex;
/** determines the depth of outline levels that are included into the content index.*/
diff --git a/offapi/com/sun/star/text/ContentIndexMark.idl b/offapi/com/sun/star/text/ContentIndexMark.idl
index 46b6d21aef23..a6e0e7343fde 100644
--- a/offapi/com/sun/star/text/ContentIndexMark.idl
+++ b/offapi/com/sun/star/text/ContentIndexMark.idl
@@ -26,8 +26,6 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::DocumentIndexMark
/** is a <type>TextRange</type> which is explicitly marked
as an index entry for a <type>ContentIndex</type>.
*/
diff --git a/offapi/com/sun/star/text/ControlCharacter.idl b/offapi/com/sun/star/text/ControlCharacter.idl
index 6b1f567fead4..c6aa8a08a13d 100644
--- a/offapi/com/sun/star/text/ControlCharacter.idl
+++ b/offapi/com/sun/star/text/ControlCharacter.idl
@@ -23,34 +23,24 @@
module com { module sun { module star { module text {
-
-// DocMerge from idl: constants com::sun::star::text::ControlCharacter
/** These constants are the codes for inserting control characters
using <method>XSimpleText::insertControlCharacter</method> interface.
*/
published constants ControlCharacter
{
-
- // DocMerge from idl: value com::sun::star::text::ControlCharacter::PARAGRAPH_BREAK
/** This control character starts a new paragraph.
*/
const short PARAGRAPH_BREAK = 0;
-
- // DocMerge from idl: value com::sun::star::text::ControlCharacter::LINE_BREAK
/** This control character starts a new line in a paragraph.
*/
const short LINE_BREAK = 1;
-
- // DocMerge from idl: value com::sun::star::text::ControlCharacter::HARD_HYPHEN
/** This control character equals a dash but prevents this
position from being hyphenated.
*/
const short HARD_HYPHEN = 2;
-
- // DocMerge from idl: value com::sun::star::text::ControlCharacter::SOFT_HYPHEN
/** This control character defines a special position as a
hyphenation point. If a word containing a soft hyphen
must be split at the end of a line, then this position
@@ -58,8 +48,6 @@ published constants ControlCharacter
*/
const short SOFT_HYPHEN = 3;
-
- // DocMerge from idl: value com::sun::star::text::ControlCharacter::HARD_SPACE
/** This control character is used to link two words and
prevents this concatenation from being hyphenated.
It is printed as a space.
diff --git a/offapi/com/sun/star/text/DependentTextField.idl b/offapi/com/sun/star/text/DependentTextField.idl
index 725d1ed6be48..6d1f44deb29c 100644
--- a/offapi/com/sun/star/text/DependentTextField.idl
+++ b/offapi/com/sun/star/text/DependentTextField.idl
@@ -27,18 +27,13 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::DependentTextField
/** is a <type>TextField</type> which is not specified by itself,
but dependent on a <type>TextFieldMaster</type>.@see TextFieldMaster
*/
published service DependentTextField
{
- // DocMerge: empty anyway
service com::sun::star::text::TextField;
-
- // DocMerge from xml: service com::sun::star::text::DependentTextField: interface com::sun::star::text::XDependentTextField
/** This interface makes it possible to attach a
<type>TextFieldMaster</type> to this <type>TextField</type>.
*/
diff --git a/offapi/com/sun/star/text/DocumentIndexLevelFormat.idl b/offapi/com/sun/star/text/DocumentIndexLevelFormat.idl
index 281f8181bcb1..a58c57f86434 100644
--- a/offapi/com/sun/star/text/DocumentIndexLevelFormat.idl
+++ b/offapi/com/sun/star/text/DocumentIndexLevelFormat.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::DocumentIndexLevelFormat
/** This service provides access to the structure of the levels of document indexes.
@@ -123,7 +121,6 @@
*/
published service DocumentIndexLevelFormat
{
- // DocMerge: empty anyway
interface com::sun::star::container::XIndexReplace;
diff --git a/offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl b/offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl
index e673700025e6..46e44ea258a3 100644
--- a/offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl
+++ b/offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl
@@ -24,14 +24,11 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::DocumentIndexParagraphStyles
/** provides access to the names of paragraph styles that are included
in content indexes of user defined indexes. The element type is sequence of string.
*/
published service DocumentIndexParagraphStyles
{
- // DocMerge: empty anyway
interface com::sun::star::container::XIndexReplace;
};
diff --git a/offapi/com/sun/star/text/DocumentStatistic.idl b/offapi/com/sun/star/text/DocumentStatistic.idl
index 1106192472c5..8ab15a62827e 100644
--- a/offapi/com/sun/star/text/DocumentStatistic.idl
+++ b/offapi/com/sun/star/text/DocumentStatistic.idl
@@ -23,31 +23,21 @@
module com { module sun { module star { module text {
-
-// DocMerge from idl: constants com::sun::star::text::DocumentStatistic
/** These constants are used to specify the type of a document statistic
field.
*/
published constants DocumentStatistic
{
// The text field displays the number of pages of the document.
-
- // DocMerge: empty anyway
const short PAGES = 0;
// The text field displays the number of paragraphs of the document.
-
- // DocMerge: empty anyway
const short PARAS = 1;
// The text field words the number of paragraphs of the document.
-
- // DocMerge: empty anyway
const short WORDS = 2;
// The text field characters the number of paragraphs of the document.
-
- // DocMerge: empty anyway
const short CHARS = 3;
};
diff --git a/offapi/com/sun/star/text/FilenameDisplayFormat.idl b/offapi/com/sun/star/text/FilenameDisplayFormat.idl
index 321b5fee8dba..8d78303bbd89 100644
--- a/offapi/com/sun/star/text/FilenameDisplayFormat.idl
+++ b/offapi/com/sun/star/text/FilenameDisplayFormat.idl
@@ -23,33 +23,23 @@
module com { module sun { module star { module text {
-
-// DocMerge from idl: constants com::sun::star::text::FilenameDisplayFormat
/** These constants are used to specify which parts of an URL are displayed
in a field.
*/
published constants FilenameDisplayFormat
{
-
- // DocMerge from idl: value com::sun::star::text::FilenameDisplayFormat::FULL
/** The content of the URL is completely displayed.
*/
const short FULL = 0;
-
- // DocMerge from idl: value com::sun::star::text::FilenameDisplayFormat::PATH
/** Only the path of the file is displayed.
*/
const short PATH = 1;
-
- // DocMerge from idl: value com::sun::star::text::FilenameDisplayFormat::NAME
/** Only the name of the file without the file extension is displayed.
*/
const short NAME = 2;
-
- // DocMerge from idl: value com::sun::star::text::FilenameDisplayFormat::NAME_AND_EXT
/** The file name including the file extension is displayed.
*/
const short NAME_AND_EXT = 3;
diff --git a/offapi/com/sun/star/text/FootnoteNumbering.idl b/offapi/com/sun/star/text/FootnoteNumbering.idl
index 40ca95b6d2ae..36a933afb786 100644
--- a/offapi/com/sun/star/text/FootnoteNumbering.idl
+++ b/offapi/com/sun/star/text/FootnoteNumbering.idl
@@ -23,27 +23,19 @@
module com { module sun { module star { module text {
-
-// DocMerge from idl: constants com::sun::star::text::FootnoteNumbering
/** These constants are used to specify the footnote numbering.
*/
published constants FootnoteNumbering
{
-
- // DocMerge from idl: value com::sun::star::text::FootnoteNumbering::PER_PAGE
/** The counter of the automatic footnote numbering restarts each page.
*/
const short PER_PAGE = 0;
-
- // DocMerge from idl: value com::sun::star::text::FootnoteNumbering::PER_CHAPTER
/** The counter of the automatic footnote numbering restarts each
chapter.
*/
const short PER_CHAPTER = 1;
-
- // DocMerge from idl: value com::sun::star::text::FootnoteNumbering::PER_DOCUMENT
/** The counter of the automatic footnote numbering does not restart.
*/
const short PER_DOCUMENT = 2;
diff --git a/offapi/com/sun/star/text/Footnotes.idl b/offapi/com/sun/star/text/Footnotes.idl
index b1e43b1c114e..f17540f52a71 100644
--- a/offapi/com/sun/star/text/Footnotes.idl
+++ b/offapi/com/sun/star/text/Footnotes.idl
@@ -25,16 +25,12 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::Footnotes
/** provides access to the footnotes or endnotes of a (text)
document.
*/
published service Footnotes
{
-
- // DocMerge from xml: service com::sun::star::text::Footnotes: interface com::sun::star::container::XIndexAccess
/** provides access to the footnotes of the document.
*/
interface com::sun::star::container::XIndexAccess;
diff --git a/offapi/com/sun/star/text/GraphicCrop.idl b/offapi/com/sun/star/text/GraphicCrop.idl
index c6f5a99ad3ac..efd7cce55757 100644
--- a/offapi/com/sun/star/text/GraphicCrop.idl
+++ b/offapi/com/sun/star/text/GraphicCrop.idl
@@ -23,8 +23,6 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: struct com::sun::star::text::GraphicCrop
/** describes the cropping of graphic objects.
Cropping means to show only parts of the object.
@@ -43,25 +41,18 @@
*/
published struct GraphicCrop
{
- // DocMerge from xml: field com::sun::star::text::GraphicCrop::Top
/** contains the top value to cut (if negative) or to extend (if positive)
*/
long Top;
-
- // DocMerge from xml: field com::sun::star::text::GraphicCrop::Bottom
/** contains the bottom value to cut (if negative) or to extend (if positive)
*/
long Bottom;
-
- // DocMerge from xml: field com::sun::star::text::GraphicCrop::Left
/** contains the left value to cut (if negative) or to extend (if positive)
*/
long Left;
-
- // DocMerge from xml: field com::sun::star::text::GraphicCrop::Right
/** contains the right value to cut (if negative) or to extend (if positive)
*/
long Right;
diff --git a/offapi/com/sun/star/text/HoriOrientation.idl b/offapi/com/sun/star/text/HoriOrientation.idl
index ed8684d72e3b..66c8b2211da3 100644
--- a/offapi/com/sun/star/text/HoriOrientation.idl
+++ b/offapi/com/sun/star/text/HoriOrientation.idl
@@ -23,14 +23,10 @@
module com { module sun { module star { module text {
-
-// DocMerge from idl: constants com::sun::star::text::HoriOrientation
/** These enumeration values specify the horizontal orientation.
*/
published constants HoriOrientation
{
-
- // DocMerge from idl: value com::sun::star::text::HoriOrientation::NONE
/** no hard alignment is applied.
<p>For text tables this means that the tables position is
@@ -41,44 +37,30 @@ published constants HoriOrientation
*/
const short NONE = 0;
-
- // DocMerge from idl: value com::sun::star::text::HoriOrientation::RIGHT
/** The object is aligned at the right side.
*/
const short RIGHT = 1;
-
- // DocMerge from idl: value com::sun::star::text::HoriOrientation::CENTER
/** The object is aligned at the middle.
*/
const short CENTER = 2;
-
- // DocMerge from idl: value com::sun::star::text::HoriOrientation::LEFT
/** The object is aligned at the left side.
*/
const short LEFT = 3;
-
- // DocMerge from idl: value com::sun::star::text::HoriOrientation::INSIDE
/** TODO
*/
const short INSIDE = 4;
-
- // DocMerge from idl: value com::sun::star::text::HoriOrientation::OUTSIDE
/** TODO
*/
const short OUTSIDE = 5;
-
- // DocMerge from idl: value com::sun::star::text::HoriOrientation::FULL
/** The object uses the full space (for text tables only).
*/
const short FULL = 6;
-
- // DocMerge from idl: value com::sun::star::text::HoriOrientation::LEFT_AND_WIDTH
/** The left offset and the width of the object are defined.
<p> For text tables this means that the tables position is
defined by the left margin and the width.
diff --git a/offapi/com/sun/star/text/HoriOrientationFormat.idl b/offapi/com/sun/star/text/HoriOrientationFormat.idl
index ede483715b88..f6d345a17802 100644
--- a/offapi/com/sun/star/text/HoriOrientationFormat.idl
+++ b/offapi/com/sun/star/text/HoriOrientationFormat.idl
@@ -23,8 +23,6 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: struct com::sun::star::text::HoriOrientationFormat
/** describes the horizontal orientation of an object.
@@ -40,27 +38,20 @@
*/
published struct HoriOrientationFormat
{
- // DocMerge from xml: field com::sun::star::text::HoriOrientationFormat::XPos
/** contains the distance from the left border. Only valid if
the property HorizontalOrientation contains the value HORI_NONE.
*/
long XPos;
-
- // DocMerge from xml: field com::sun::star::text::HoriOrientationFormat::HorizontalOrientation
/** determines the horizontal alignment of an object.
The values refer to com::sun::star::HoriOrientation.
*/
short HorizontalOrientation;
-
- // DocMerge from xml: field com::sun::star::text::HoriOrientationFormat::HorizontalRelation
/** determines the reference position of the horizontal alignment.@see com::sun::star::text::RelOrientation
*/
short HorizontalRelation;
-
- // DocMerge from xml: field com::sun::star::text::HoriOrientationFormat::PositionToggle
/** determines if the orientation toggles between left and right pages.
*/
boolean PositionToggle;
diff --git a/offapi/com/sun/star/text/HorizontalAdjust.idl b/offapi/com/sun/star/text/HorizontalAdjust.idl
index d721c6c92b3f..16867a283b27 100644
--- a/offapi/com/sun/star/text/HorizontalAdjust.idl
+++ b/offapi/com/sun/star/text/HorizontalAdjust.idl
@@ -23,26 +23,18 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: enum com::sun::star::text::HorizontalAdjust
/** enumeration values define the horizontal adjustments of objects.
*/
published enum HorizontalAdjust
{
-
- // DocMerge from xml: value com::sun::star::text::HorizontalAdjust::LEFT
/** the object is left adjusted.
*/
LEFT,
-
- // DocMerge from xml: value com::sun::star::text::HorizontalAdjust::CENTER
/** the object is adjusted to the center.
*/
CENTER,
-
- // DocMerge from xml: value com::sun::star::text::HorizontalAdjust::RIGHT
/** the object is right adjusted.
*/
RIGHT
diff --git a/offapi/com/sun/star/text/InvalidTextContentException.idl b/offapi/com/sun/star/text/InvalidTextContentException.idl
index ce65c29a5c37..3619c7471f9a 100644
--- a/offapi/com/sun/star/text/InvalidTextContentException.idl
+++ b/offapi/com/sun/star/text/InvalidTextContentException.idl
@@ -27,16 +27,12 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: exception com::sun::star::text::InvalidTextContentException
/** is thrown whenever a method gets a <type>TextContent</type>
as an actual argument when the text content cannot be used for that
operation.
*/
published exception InvalidTextContentException: com::sun::star::uno::Exception
{
-
- // DocMerge from xml: field com::sun::star::text::InvalidTextContentException::TextContent
/** contains the interface of the text content that caused the exception.
*/
com::sun::star::text::XTextContent TextContent;
diff --git a/offapi/com/sun/star/text/LineNumberingProperties.idl b/offapi/com/sun/star/text/LineNumberingProperties.idl
index 288bbcd695bc..6c0f3cc47609 100644
--- a/offapi/com/sun/star/text/LineNumberingProperties.idl
+++ b/offapi/com/sun/star/text/LineNumberingProperties.idl
@@ -24,8 +24,6 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::LineNumberingProperties
/** provides access to the settings of the line numbering.
*/
published service LineNumberingProperties
diff --git a/offapi/com/sun/star/text/NotePrintMode.idl b/offapi/com/sun/star/text/NotePrintMode.idl
index 7471343bb8f6..7096d82095c0 100644
--- a/offapi/com/sun/star/text/NotePrintMode.idl
+++ b/offapi/com/sun/star/text/NotePrintMode.idl
@@ -23,33 +23,23 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: enum com::sun::star::text::NotePrintMode
/** enumeration values are used to define the printing of notes in a
document.
*/
published enum NotePrintMode
{
-
- // DocMerge from xml: value com::sun::star::text::NotePrintMode::NOT
/** Notes are not printed.
*/
NOT,
-
- // DocMerge from xml: value com::sun::star::text::NotePrintMode::ONLY
/** Only notes are printed.
*/
ONLY,
-
- // DocMerge from xml: value com::sun::star::text::NotePrintMode::DOC_END
/** Notes are collected at the end of the document.
*/
DOC_END,
-
- // DocMerge from xml: value com::sun::star::text::NotePrintMode::PAGE_END
/** Notes are collected at the end of a page and printed on an inserted page.
*/
PAGE_END
diff --git a/offapi/com/sun/star/text/ObjectIndex.idl b/offapi/com/sun/star/text/ObjectIndex.idl
index 8710b084b781..a37282507876 100644
--- a/offapi/com/sun/star/text/ObjectIndex.idl
+++ b/offapi/com/sun/star/text/ObjectIndex.idl
@@ -26,38 +26,29 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::ObjectIndex
/** specifies service of object indexes within a document.@see com::sun::star::text::BaseIndex
*/
published service ObjectIndex
{
- // DocMerge: empty anyway
service com::sun::star::text::BaseIndex;
/** Determines if star office math objects are included in the office.
*/
- // DocMerge: empty anyway
[optional, property] boolean CreateFromStarMath;//objects
/** Determines if star office image objects are included in the office.
*/
- // DocMerge: empty anyway
[optional, property] boolean CreateFromStarImage;//objects
/** Determines if star office chart objects are included in the office.
*/
- // DocMerge: empty anyway
[optional, property] boolean CreateFromStarChart;//objects
/** Determines if star office calc objects are included in the office.
*/
- // DocMerge: empty anyway
[optional, property] boolean CreateFromStarCalc;//objects
/** Determines if star office draw objects are included in the office.
*/
- // DocMerge: empty anyway
[optional, property] boolean CreateFromStarDraw;//objects
/** Determines if external embedded objects are included in the office.
*/
- // DocMerge: empty anyway
[optional, property] boolean CreateFromOtherEmbeddedObjects;//objects
};
diff --git a/offapi/com/sun/star/text/PageFootnoteInfo.idl b/offapi/com/sun/star/text/PageFootnoteInfo.idl
index 40f78c767e52..ed25fa967549 100644
--- a/offapi/com/sun/star/text/PageFootnoteInfo.idl
+++ b/offapi/com/sun/star/text/PageFootnoteInfo.idl
@@ -25,15 +25,11 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::PageFootnoteInfo
/** specifies the properties of the footnote area of a page or a
page style.
*/
published service PageFootnoteInfo
{
-
- // DocMerge from xml: property com::sun::star::text::PageFootnoteInfo::FootnoteHeight
/** contains the maximum height of the footnote section.
@@ -42,38 +38,26 @@ published service PageFootnoteInfo
*/
[property] long FootnoteHeight;
-
- // DocMerge from xml: property com::sun::star::text::PageFootnoteInfo::FootnoteSeparatorLineWidth
/** contains the relative width of the footnote separator line.
*/
[property] long FootnoteSeparatorLineWidth;
-
- // DocMerge from xml: property com::sun::star::text::PageFootnoteInfo::FootnoteTopDistance
/** contains the distance between the text and footnote section.
*/
[property] long FootnoteTopDistance;
-
- // DocMerge from xml: property com::sun::star::text::PageFootnoteInfo::FootnoteBottomDistance
/** contains the distance between the separator line and the footnote section.
*/
[property] long FootnoteBottomDistance;
-
- // DocMerge from xml: property com::sun::star::text::PageFootnoteInfo::FootnoteSeparatorLineWidthPercent
/** contains the relative width of the footnote separator line.
*/
[property] short FootnoteSeparatorLineWidthPercent;
-
- // DocMerge from xml: property com::sun::star::text::PageFootnoteInfo::FootnoteSeparatorLineAdjust
/** contains the adjustment of the footnote separator line.
*/
[property] com::sun::star::text::HorizontalAdjust FootnoteSeparatorLineAdjust;
-
- // DocMerge from xml: property com::sun::star::text::PageFootnoteInfo::FootnoteSeparatorLinePenWidth
/** contains the width of the pen for the footnote separator line.
*/
[property] short FootnoteSeparatorLinePenWidth;
diff --git a/offapi/com/sun/star/text/PageNumberType.idl b/offapi/com/sun/star/text/PageNumberType.idl
index c65fb0437c30..b1999315dd40 100644
--- a/offapi/com/sun/star/text/PageNumberType.idl
+++ b/offapi/com/sun/star/text/PageNumberType.idl
@@ -23,8 +23,6 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: enum com::sun::star::text::PageNumberType
/** determines which page number is displayed in a page number text field.
*/
published enum PageNumberType
diff --git a/offapi/com/sun/star/text/PagePrintSettings.idl b/offapi/com/sun/star/text/PagePrintSettings.idl
index 90288ddb4071..b44c0411a023 100644
--- a/offapi/com/sun/star/text/PagePrintSettings.idl
+++ b/offapi/com/sun/star/text/PagePrintSettings.idl
@@ -23,63 +23,43 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::PagePrintSettings
/** These properties describe the way the <type>XPagePrintable</type> interface
prints the page on one printer page.
*/
published service PagePrintSettings
{
-
- // DocMerge from xml: property com::sun::star::text::PagePrintSettings::PageRows
/** contains the number of pages per printed column of pages.
*/
[property] short PageRows;
-
- // DocMerge from xml: property com::sun::star::text::PagePrintSettings::PageColumns
/** contains the number of pages per printed row of pages.
*/
[property] short PageColumns;
-
- // DocMerge from xml: property com::sun::star::text::PagePrintSettings::LeftMargin
/** contains the left margin of the printer page.
*/
[property] long LeftMargin;
-
- // DocMerge from xml: property com::sun::star::text::PagePrintSettings::RightMargin
/** contains the right margin of the printer page.
*/
[property] long RightMargin;
-
- // DocMerge from xml: property com::sun::star::text::PagePrintSettings::TopMargin
/** contains the top margin of the printer page.
*/
[property] long TopMargin;
-
- // DocMerge from xml: property com::sun::star::text::PagePrintSettings::BottomMargin
/** contains the right margin of the printer page.
*/
[property] long BottomMargin;
-
- // DocMerge from xml: property com::sun::star::text::PagePrintSettings::HoriMargin
/** contains the margin between the rows of printed pages.
*/
[property] long HoriMargin;
-
- // DocMerge from xml: property com::sun::star::text::PagePrintSettings::VertMargin
/** contains the margin between the columns of printed pages.
*/
[property] long VertMargin;
-
- // DocMerge from xml: property com::sun::star::text::PagePrintSettings::IsLandscape
/** defines if the printer page is used in landscape format.
*/
[property] boolean IsLandscape;
diff --git a/offapi/com/sun/star/text/Paragraph.idl b/offapi/com/sun/star/text/Paragraph.idl
index 333d2fcb6ec6..be370a46fcd6 100644
--- a/offapi/com/sun/star/text/Paragraph.idl
+++ b/offapi/com/sun/star/text/Paragraph.idl
@@ -36,8 +36,6 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::Paragraph
/** is a piece of text which can take its own paragraph-specific
attributes (technically, properties).
*/
@@ -64,12 +62,8 @@ published service Paragraph
/** This service is present when the paragraph object refers
to a text table */
[optional] service com::sun::star::text::TextTable;
-
- // DocMerge: empty anyway
service com::sun::star::text::TextContent;
-
- // DocMerge from xml: service com::sun::star::text::Paragraph: interface com::sun::star::beans::XPropertySet
/** This interface gives access to the properties of the paragraph
itself (or its style sheet). So this interface may show
property values which are not valid for any of the
@@ -78,16 +72,12 @@ published service Paragraph
*/
interface com::sun::star::beans::XPropertySet;
-
- // DocMerge from xml: service com::sun::star::text::Paragraph: interface com::sun::star::beans::XPropertyState
/** This interface gives access to the state of the property values
in these properties. So, it is possible to determine if a specific
properties value is defined in the paragraph or its style sheet.
*/
interface com::sun::star::beans::XPropertyState;
-
- // DocMerge from xml: service com::sun::star::text::Paragraph: interface com::sun::star::container::XEnumerationAccess
/** This interface enumerates the text portions of this paragraph.
<p>A text portion is defined as the largest possible <type>TextRange</type>
diff --git a/offapi/com/sun/star/text/ParagraphEnumeration.idl b/offapi/com/sun/star/text/ParagraphEnumeration.idl
index 8f744e3c3b38..371212e57339 100644
--- a/offapi/com/sun/star/text/ParagraphEnumeration.idl
+++ b/offapi/com/sun/star/text/ParagraphEnumeration.idl
@@ -25,16 +25,12 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::ParagraphEnumeration
/** provides access to the paragraphs of an <type>XText</type>
interface.
*/
published service ParagraphEnumeration
{
-
- // DocMerge from xml: service com::sun::star::text::ParagraphEnumeration: interface com::sun::star::container::XEnumeration
/** provides access to the paragraph objects.
*/
interface com::sun::star::container::XEnumeration;
diff --git a/offapi/com/sun/star/text/PlaceholderType.idl b/offapi/com/sun/star/text/PlaceholderType.idl
index 34ec630d085e..1a3473f0786b 100644
--- a/offapi/com/sun/star/text/PlaceholderType.idl
+++ b/offapi/com/sun/star/text/PlaceholderType.idl
@@ -23,38 +23,26 @@
module com { module sun { module star { module text {
-
-// DocMerge from idl: constants com::sun::star::text::PlaceholderType
/** These constants define how the place-holder text fields act in a document.
*/
published constants PlaceholderType
{
-
- // DocMerge from idl: value com::sun::star::text::PlaceholderType::TEXT
/** The field represents a piece of text.
*/
const short TEXT = 0;
-
- // DocMerge from idl: value com::sun::star::text::PlaceholderType::TABLE
/** The field initiates the insertion of a text table.
*/
const short TABLE = 1;
-
- // DocMerge from idl: value com::sun::star::text::PlaceholderType::TEXTFRAME
/** The field initiates the insertion of a text frame.
*/
const short TEXTFRAME = 2;
-
- // DocMerge from idl: value com::sun::star::text::PlaceholderType::GRAPHIC
/** The field initiates the insertion of a graphic object.
*/
const short GRAPHIC = 3;
-
- // DocMerge from idl: value com::sun::star::text::PlaceholderType::OBJECT
/** The field initiates the insertion of an embedded object.
*/
const short OBJECT = 4;
diff --git a/offapi/com/sun/star/text/PrintSettings.idl b/offapi/com/sun/star/text/PrintSettings.idl
index 5c19ca5b652e..313274212546 100644
--- a/offapi/com/sun/star/text/PrintSettings.idl
+++ b/offapi/com/sun/star/text/PrintSettings.idl
@@ -25,56 +25,38 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::PrintSettings
/** These properties describe the printing of the content of a text document.
*/
published service PrintSettings
{
-
- // DocMerge from xml: property com::sun::star::text::PrintSettings::PrintGraphics
/** determines if graphic objects are printed
*/
[property] boolean PrintGraphics;
-
- // DocMerge from xml: property com::sun::star::text::PrintSettings::PrintTables
/** determines if text tables are printed.
*/
[property] boolean PrintTables;
-
- // DocMerge from xml: property com::sun::star::text::PrintSettings::PrintDrawings
/** determines if shapes are printed.
*/
[property] boolean PrintDrawings;
-
- // DocMerge from xml: property com::sun::star::text::PrintSettings::PrintLeftPage
/** determines if left pages are printed.
*/
[property] boolean PrintLeftPages;
-
- // DocMerge from xml: property com::sun::star::text::PrintSettings::PrintRightPage
/** determines if right pages are printed.
*/
[property] boolean PrintRightPages;
-
- // DocMerge from xml: property com::sun::star::text::PrintSettings::PrintControls
/** determines if control shapes are printed.
*/
[property] boolean PrintControls;
-
- // DocMerge from xml: property com::sun::star::text::PrintSettings::PrintReverse
/** determines if the pages are printed in the reverse order, starting with the last page.
*/
[property] boolean PrintReversed;
-
- // DocMerge from xml: property com::sun::star::text::PrintSettings::PaperFromSetup
/** specifies if the printer paper tray selection of the system
printer is used.
@@ -85,32 +67,22 @@ published service PrintSettings
*/
[property] boolean PrintPaperFromSetup;
-
- // DocMerge from xml: property com::sun::star::text::PrintSettings::FaxName
/** contains the name of the fax.
*/
[property] string PrintFaxName;
-
- // DocMerge from xml: property com::sun::star::text::PrintSettings::PrintNotes
/** determines how notes are printed.@see NotePrintMode
*/
[property] com::sun::star::text::NotePrintMode PrintAnnotationMode;
-
- // DocMerge from xml: property com::sun::star::text::PrintSettings::PrintProspect
/** determines if prospect printing is used.
*/
[property] boolean PrintProspect;
-
- // DocMerge from xml: property com::sun::star::text::PrintSettings::PrintBackground
/** determines if the background color / background graphic of pages is printed.
*/
[property] boolean PrintPageBackground;
-
- // DocMerge from xml: property com::sun::star::text::PrintSettings::PrintBlackFont
/** determines if characters are always printed in black.
*/
[property] boolean PrintBlackFonts;
diff --git a/offapi/com/sun/star/text/RelOrientation.idl b/offapi/com/sun/star/text/RelOrientation.idl
index d0445c08ee44..10f53878fe23 100644
--- a/offapi/com/sun/star/text/RelOrientation.idl
+++ b/offapi/com/sun/star/text/RelOrientation.idl
@@ -23,63 +23,43 @@
module com { module sun { module star { module text {
-
-// DocMerge from idl: constants com::sun::star::text::RelOrientation
/** These values define the reference position of relative orientations.
*/
published constants RelOrientation
{
-
- // DocMerge from idl: value com::sun::star::text::RelOrientation::FRAME
/** paragraph, including margins
*/
const short FRAME = 0;
-
- // DocMerge from idl: value com::sun::star::text::RelOrientation::PRINT_AREA
/** paragraph, without margins
*/
const short PRINT_AREA = 1;
-
- // DocMerge from idl: value com::sun::star::text::RelOrientation::CHAR
/** at a character
*/
const short CHAR = 2;
-
- // DocMerge from idl: value com::sun::star::text::RelOrientation::PAGE_LEFT
/** inside the left page margin
*/
const short PAGE_LEFT = 3;
-
- // DocMerge from idl: value com::sun::star::text::RelOrientation::PAGE_RIGHT
/** inside the right page margin
*/
const short PAGE_RIGHT = 4;
-
- // DocMerge from idl: value com::sun::star::text::RelOrientation::FRAME_LEFT
/** inside the left paragraph margin
*/
const short FRAME_LEFT = 5;
-
- // DocMerge from idl: value com::sun::star::text::RelOrientation::FRAME_RIGHT
/** inside the right paragraph margin
*/
const short FRAME_RIGHT = 6;
-
- // DocMerge from idl: value com::sun::star::text::RelOrientation::PAGE_FRAME
/** page includes margins for page-anchored frames identical with
<const>RelOrientation::FRAME</const>
*/
const short PAGE_FRAME = 7;
-
- // DocMerge from idl: value com::sun::star::text::RelOrientation::PAGE_PRINT_AREA
/** page without borders (for page anchored frames identical with
<const>RelOrientation::PRINT_AREA</const>).
diff --git a/offapi/com/sun/star/text/SectionFileLink.idl b/offapi/com/sun/star/text/SectionFileLink.idl
index 275141b10d74..4744ea1d5cc2 100644
--- a/offapi/com/sun/star/text/SectionFileLink.idl
+++ b/offapi/com/sun/star/text/SectionFileLink.idl
@@ -23,8 +23,6 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: struct com::sun::star::text::SectionFileLink
/** describes the link for a text section.
@@ -45,13 +43,10 @@
*/
published struct SectionFileLink
{
- // DocMerge from xml: field com::sun::star::text::SectionFileLink::FileURL
/** contains the URL of the linked file.
*/
string FileURL;
-
- // DocMerge from xml: field com::sun::star::text::SectionFileLink::FilterName
/** contains the name of the file filter that is used to load the linked file.
*/
string FilterName;
diff --git a/offapi/com/sun/star/text/SetVariableType.idl b/offapi/com/sun/star/text/SetVariableType.idl
index d02748ff21c1..b45af88c4e4a 100644
--- a/offapi/com/sun/star/text/SetVariableType.idl
+++ b/offapi/com/sun/star/text/SetVariableType.idl
@@ -23,29 +23,19 @@
module com { module sun { module star { module text {
-
-// DocMerge from idl: constants com::sun::star::text::SetVariableType
/** These constants define the type of a variable text field.
*/
published constants SetVariableType
{
-
- // DocMerge from idl: value com::sun::star::text::SetVariableType::VAR
/** specifies a simple variable.
*/
const short VAR = 0;
-
- // DocMerge from idl: value com::sun::star::text::SetVariableType::SEQUENCE
/** specifies a number sequence field.
*/
const short SEQUENCE = 1;
-
- // DocMerge from idl: value com::sun::star::text::SetVariableType::FORMULA
/** specifies a formula field.
*/
const short FORMULA = 2;
-
- // DocMerge from idl: value com::sun::star::text::SetVariableType::STRING
/** specifies a string field.
*/
const short STRING = 3;
diff --git a/offapi/com/sun/star/text/SizeType.idl b/offapi/com/sun/star/text/SizeType.idl
index eb4f55d86cf8..4849838a3c7b 100644
--- a/offapi/com/sun/star/text/SizeType.idl
+++ b/offapi/com/sun/star/text/SizeType.idl
@@ -23,8 +23,6 @@
module com { module sun { module star { module text {
-
-// DocMerge from idl: constants com::sun::star::text::SizeType
/** The height value of objects like text frames or table rows may
be interpreted in different ways.
@@ -36,17 +34,11 @@
published constants SizeType
{
// The height of the object is determined by the content only.
-
- // DocMerge: empty anyway
const short VARIABLE = 0;
// The height property determines the height of the object.
-
- // DocMerge: empty anyway
const short FIX = 1;
-
- // DocMerge from idl: value com::sun::star::text::SizeType::MIN
/** The height property determines the minimum height of the object, but the
actual height will be increased if the content demands it.
*/
diff --git a/offapi/com/sun/star/text/TemplateDisplayFormat.idl b/offapi/com/sun/star/text/TemplateDisplayFormat.idl
index ccf34c9683cf..853f05a563e1 100644
--- a/offapi/com/sun/star/text/TemplateDisplayFormat.idl
+++ b/offapi/com/sun/star/text/TemplateDisplayFormat.idl
@@ -23,45 +23,31 @@
module com { module sun { module star { module text {
-
-// DocMerge from idl: constants com::sun::star::text::TemplateDisplayFormat
/** These constants are used to specify which information about a template is
displayed in a field.
*/
published constants TemplateDisplayFormat
{
// The complete path of the file will be displayed.
-
- // DocMerge: empty anyway
const short FULL = 0;
// Only the path of the template file will be displayed.
-
- // DocMerge: empty anyway
const short PATH = 1;
-
- // DocMerge from idl: value com::sun::star::text::TemplateDisplayFormat::NAME
/** Only the file name, without file extension, of the template
file will be displayed.
*/
const short NAME = 2;
-
- // DocMerge from idl: value com::sun::star::text::TemplateDisplayFormat::NAME_AND_EXT
/** The file name and the file extension of the template
file will be displayed.
*/
const short NAME_AND_EXT = 3;
-
- // DocMerge from idl: value com::sun::star::text::TemplateDisplayFormat::AREA
/** The name of the template area is displayed.
*/
const short AREA = 4;
-
- // DocMerge from idl: value com::sun::star::text::TemplateDisplayFormat::TITLE
/** The title of the template file is displayed.
*/
const short TITLE = 5;
diff --git a/offapi/com/sun/star/text/TextColumn.idl b/offapi/com/sun/star/text/TextColumn.idl
index 21f03a1802a3..871d7b6a7334 100644
--- a/offapi/com/sun/star/text/TextColumn.idl
+++ b/offapi/com/sun/star/text/TextColumn.idl
@@ -23,13 +23,10 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: struct com::sun::star::text::TextColumn
/** defines a single text column.
*/
published struct TextColumn
{
- // DocMerge from xml: field com::sun::star::text::TextColumn::Width
/** contains the relative width of the column, including both margins.
@@ -37,8 +34,6 @@ published struct TextColumn
*/
long Width;
-
- // DocMerge from xml: field com::sun::star::text::TextColumn::LeftMargin
/** contains the left margin of the column.
@@ -47,8 +42,6 @@ published struct TextColumn
*/
long LeftMargin;
-
- // DocMerge from xml: field com::sun::star::text::TextColumn::RightMargin
/** contains the right margin of the column.
diff --git a/offapi/com/sun/star/text/TextColumns.idl b/offapi/com/sun/star/text/TextColumns.idl
index f799b272ca97..52de4fef724b 100644
--- a/offapi/com/sun/star/text/TextColumns.idl
+++ b/offapi/com/sun/star/text/TextColumns.idl
@@ -26,13 +26,10 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::TextColumns
/** provides access to columns in text (e.g., in TextFrames ).
*/
published service TextColumns
{
- // DocMerge: empty anyway
interface com::sun::star::text::XTextColumns;
/** determines whether the columns all have equal width. This flag is set if XTextColumns::setColumnCount() is called
diff --git a/offapi/com/sun/star/text/TextContentAnchorType.idl b/offapi/com/sun/star/text/TextContentAnchorType.idl
index 423801f073b3..24755529318d 100644
--- a/offapi/com/sun/star/text/TextContentAnchorType.idl
+++ b/offapi/com/sun/star/text/TextContentAnchorType.idl
@@ -23,21 +23,15 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: enum com::sun::star::text::TextContentAnchorType
/** specify how the text content is attached to its
surrounding text.
*/
published enum TextContentAnchorType
{
-
- // DocMerge from xml: value com::sun::star::text::TextContentAnchorType::AT_PARAGRAPH
/** The anchor of the object is set at the top left position of the paragraph.
*/
AT_PARAGRAPH,
-
- // DocMerge from xml: value com::sun::star::text::TextContentAnchorType::AS_CHARACTER
/** The object is anchored instead of a character.
@@ -46,8 +40,6 @@ published enum TextContentAnchorType
*/
AS_CHARACTER,
-
- // DocMerge from xml: value com::sun::star::text::TextContentAnchorType::AT_PAGE
/** The object is anchored to the page.
@@ -56,14 +48,10 @@ published enum TextContentAnchorType
*/
AT_PAGE,
-
- // DocMerge from xml: value com::sun::star::text::TextContentAnchorType::AT_FRAME
/** The object is anchored to a text frame.
*/
AT_FRAME,
-
- // DocMerge from xml: value com::sun::star::text::TextContentAnchorType::AT_CHARACTER
/** The object is anchored to a character.
diff --git a/offapi/com/sun/star/text/TextContentCollection.idl b/offapi/com/sun/star/text/TextContentCollection.idl
index 3e0c43526b95..b008f3edd67f 100644
--- a/offapi/com/sun/star/text/TextContentCollection.idl
+++ b/offapi/com/sun/star/text/TextContentCollection.idl
@@ -27,22 +27,16 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::TextContentCollection
/** Objects of this type are collections of text contents of the same type.@see Text
*/
published service TextContentCollection
{
-
- // DocMerge from xml: service com::sun::star::text::TextContentCollection: interface com::sun::star::container::XNameAccess
/** Each text content is accessible by its name, which is unique
within the collection.
*/
interface com::sun::star::container::XNameAccess;
-
- // DocMerge from xml: service com::sun::star::text::TextContentCollection: interface com::sun::star::container::XContainer
/** The insertion and removal of text contents of this type are
broadcasted via this interface.
*/
diff --git a/offapi/com/sun/star/text/TextCursor.idl b/offapi/com/sun/star/text/TextCursor.idl
index e1724201ad8e..c9c12d23eb36 100644
--- a/offapi/com/sun/star/text/TextCursor.idl
+++ b/offapi/com/sun/star/text/TextCursor.idl
@@ -34,52 +34,35 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::TextCursor
/** A <type>TextCursor</type> is a <type>TextRange</type> which can be moved
within a <type>Text</type> object.
@see TextRange
*/
published service TextCursor
{
- // DocMerge: empty anyway
service com::sun::star::text::TextRange;
interface com::sun::star::text::XTextCursor;
-
- // DocMerge: empty anyway
[optional] interface com::sun::star::text::XWordCursor;
-
- // DocMerge: empty anyway
[optional] interface com::sun::star::text::XSentenceCursor;
-
- // DocMerge: empty anyway
[optional] interface com::sun::star::text::XParagraphCursor;
-
- // DocMerge from xml: service com::sun::star::text::TextCursor: interface com::sun::star::beans::XPropertySet
/** This interface gives access to the properties of the range that is
selected by the cursor.
*/
interface com::sun::star::beans::XPropertySet;
-
- // DocMerge from xml: service com::sun::star::text::TextCursor: interface com::sun::star::beans::XPropertyState
/** This interface gives access to the state of the properties of the
range that is selected by the cursor.
*/
interface com::sun::star::beans::XPropertyState;
interface com::sun::star::beans::XMultiPropertyStates;
-
- // DocMerge from xml: service com::sun::star::text::TextCursor: interface com::sun::star::document::XDocumentInsertable
/** This optional interface makes it possible to insert a document
from an external source at the cursor position.
*/
[optional] interface com::sun::star::document::XDocumentInsertable;
-
- // DocMerge from xml: service com::sun::star::text::TextCursor: interface com::sun::star::util::XSortable
/** This optional interface makes it possible to sort the contents at
the cursor position.
*/
diff --git a/offapi/com/sun/star/text/TextEmbeddedObject.idl b/offapi/com/sun/star/text/TextEmbeddedObject.idl
index 40f91d7cbe98..a6315e733360 100644
--- a/offapi/com/sun/star/text/TextEmbeddedObject.idl
+++ b/offapi/com/sun/star/text/TextEmbeddedObject.idl
@@ -27,8 +27,6 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::TextEmbeddedObject
/** provides access to the properties and methods of an embedded object.
*/
published service TextEmbeddedObject
@@ -37,7 +35,6 @@ published service TextEmbeddedObject
graphic objects and embedded objects.
*/
service BaseFrame;
- // DocMerge: empty anyway
interface com::sun::star::document::XEmbeddedObjectSupplier;
/* If you get this property you get the CLSID of the OLE2 document stream
contained in this OLE2 shape. If you set it, an empty OLE2 document stream
diff --git a/offapi/com/sun/star/text/TextFieldMasters.idl b/offapi/com/sun/star/text/TextFieldMasters.idl
index ffa371d888b1..1ed037483ddd 100644
--- a/offapi/com/sun/star/text/TextFieldMasters.idl
+++ b/offapi/com/sun/star/text/TextFieldMasters.idl
@@ -24,16 +24,12 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::TextFieldMasters
/** This is a collection of instances of <type>TextFieldMaster</type>, defined
in a context (e.g. in a document).
*/
published service TextFieldMasters
{
-
- // DocMerge from xml: service com::sun::star::text::TextFieldMasters: interface com::sun::star::container::XNameAccess
/** This interface makes it possible to access the instances of service
<type>TextFieldMaster</type> defined in this context (e.g. this
document).
diff --git a/offapi/com/sun/star/text/TextFields.idl b/offapi/com/sun/star/text/TextFields.idl
index 2695ee4a923d..835d58e4db85 100644
--- a/offapi/com/sun/star/text/TextFields.idl
+++ b/offapi/com/sun/star/text/TextFields.idl
@@ -25,14 +25,10 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::TextFields
/** This is a collection of <type>TextField</type> instances.
*/
published service TextFields
{
-
- // DocMerge from xml: service com::sun::star::text::TextFields: interface com::sun::star::container::XEnumerationAccess
/** This interface makes it possible to create an enumeration through
all text fields in this container.
diff --git a/offapi/com/sun/star/text/TextFrames.idl b/offapi/com/sun/star/text/TextFrames.idl
index e15defcc1721..40064f107f5a 100644
--- a/offapi/com/sun/star/text/TextFrames.idl
+++ b/offapi/com/sun/star/text/TextFrames.idl
@@ -27,16 +27,12 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::TextFrames
/** This is the collection of all <type>TextFrame</type> instances within a
context (e.g. a document).
*/
published service TextFrames
{
-
- // DocMerge from xml: service com::sun::star::text::TextFrames: interface com::sun::star::container::XNameAccess
/** This interface makes it possible to access all <type>TextFrame</type>
instances within this context (e.g. a document) by its name.
@@ -52,8 +48,6 @@ published service TextFrames
*/
interface com::sun::star::container::XIndexAccess;
-
- // DocMerge from xml: service com::sun::star::text::TextFrames: interface com::sun::star::container::XContainer
/** This optional interface makes it possible to register for events
which occur upon insertion and removal of <type>TextFrame</type>
instances.
diff --git a/offapi/com/sun/star/text/TextLayoutCursor.idl b/offapi/com/sun/star/text/TextLayoutCursor.idl
index c24a830a5be9..624336eec02f 100644
--- a/offapi/com/sun/star/text/TextLayoutCursor.idl
+++ b/offapi/com/sun/star/text/TextLayoutCursor.idl
@@ -26,17 +26,12 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::TextLayoutCursor
/** A <type>TextLayoutCursor</type> is a <type>TextRange</type> which can
travel within a layout of a <type>Text</type> object.
*/
published service TextLayoutCursor
{
- // DocMerge: empty anyway
service com::sun::star::text::TextCursor;
-
- // DocMerge: empty anyway
interface com::sun::star::text::XPageCursor;
};
diff --git a/offapi/com/sun/star/text/TextRanges.idl b/offapi/com/sun/star/text/TextRanges.idl
index be92862f78ed..f31b273ce51c 100644
--- a/offapi/com/sun/star/text/TextRanges.idl
+++ b/offapi/com/sun/star/text/TextRanges.idl
@@ -25,13 +25,10 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::TextRanges
/** provides a container for <type>XTextRange</type> objects.
*/
published service TextRanges
{
- // DocMerge: empty anyway
interface com::sun::star::container::XIndexAccess;
};
diff --git a/offapi/com/sun/star/text/TextSections.idl b/offapi/com/sun/star/text/TextSections.idl
index de975d17b8d2..06dd8f169348 100644
--- a/offapi/com/sun/star/text/TextSections.idl
+++ b/offapi/com/sun/star/text/TextSections.idl
@@ -27,16 +27,11 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::TextSections
/** provides access to the text sections in a text document.
*/
published service TextSections
{
- // DocMerge: empty anyway
interface com::sun::star::container::XIndexAccess;
-
- // DocMerge: empty anyway
interface com::sun::star::container::XNameAccess;
};
diff --git a/offapi/com/sun/star/text/TextSortDescriptor.idl b/offapi/com/sun/star/text/TextSortDescriptor.idl
index 0976d9776a1a..7f901dabe0fb 100644
--- a/offapi/com/sun/star/text/TextSortDescriptor.idl
+++ b/offapi/com/sun/star/text/TextSortDescriptor.idl
@@ -25,84 +25,59 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::TextSortDescriptor
/** describes sort criteria for sorting text.
@deprecated
*/
published service TextSortDescriptor
{
- // DocMerge: empty anyway
service com::sun::star::util::SortDescriptor;
-
- // DocMerge from xml: property com::sun::star::text::TextSortDescriptor::Delimiter
/** contains the character that marks the separation of columns.
*/
[property] char Delimiter;
-
- // DocMerge from xml: property com::sun::star::text::TextSortDescriptor::IsSortInTable
/** determines if the content of a table is to be sorted.
*/
[property] boolean IsSortInTable;
-
- // DocMerge from xml: property com::sun::star::text::TextSortDescriptor::SortRowOrColumnNo0
/** contains the row or column index used in the first search key.
*/
[property] long SortRowOrColumnNo0;
-
- // DocMerge from xml: property com::sun::star::text::TextSortDescriptor::IsSortNumeric0
/** determines if the sorting in the first search key is done
numeric or alphanumeric order.
*/
[property] boolean IsSortNumeric0;
-
- // DocMerge from xml: property com::sun::star::text::TextSortDescriptor::IsSortAscending0
/** determines if the sorting in the first search key is done
in ascending or descending order.
*/
[property] boolean IsSortAscending0;
-
- // DocMerge from xml: property com::sun::star::text::TextSortDescriptor::SortRowOrColumnNo1
/** contains the row or column index used in the second search key.
*/
[property] long SortRowOrColumnNo1;
-
- // DocMerge from xml: property com::sun::star::text::TextSortDescriptor::IsSortNumeric1
/** determines if the sorting in the second search key is done
in numeric or alphanumeric order.
*/
[property] boolean IsSortNumeric1;
-
- // DocMerge from xml: property com::sun::star::text::TextSortDescriptor::IsSortAscending1
/** determines if the sorting in the second search key is done
in ascending or descending order.
*/
[property] boolean IsSortAscending1;
-
- // DocMerge from xml: property com::sun::star::text::TextSortDescriptor::SortRowOrColumnNo2
/** contains the row or column index used in the third search key.
*/
[property] long SortRowOrColumnNo2;
-
- // DocMerge from xml: property com::sun::star::text::TextSortDescriptor::IsSortNumeric2
/** determines if the sorting in the third search key is done
in numeric or alphanumeric order.
*/
[property] boolean IsSortNumeric2;
-
- // DocMerge from xml: property com::sun::star::text::TextSortDescriptor::IsSortAscending2
/** determines if the sorting in the third search key is done
in ascending or descending order.
*/
diff --git a/offapi/com/sun/star/text/TextTables.idl b/offapi/com/sun/star/text/TextTables.idl
index 1eaf1a7d233d..0885de6ed25d 100644
--- a/offapi/com/sun/star/text/TextTables.idl
+++ b/offapi/com/sun/star/text/TextTables.idl
@@ -27,16 +27,11 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::TextTables
/** provides access to all tables in a document.
*/
published service TextTables
{
- // DocMerge: empty anyway
interface com::sun::star::container::XIndexAccess;
-
- // DocMerge: empty anyway
interface com::sun::star::container::XNameAccess;
};
diff --git a/offapi/com/sun/star/text/TextViewCursor.idl b/offapi/com/sun/star/text/TextViewCursor.idl
index 1b6afc73df2a..fd3cf61f52ce 100644
--- a/offapi/com/sun/star/text/TextViewCursor.idl
+++ b/offapi/com/sun/star/text/TextViewCursor.idl
@@ -26,18 +26,13 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::TextViewCursor
/** A <type>TextViewCursor</type> is a <type>TextRange</type> which can travel
within a view of a <type>Text</type> object.
@see TextDocumentView
*/
published service TextViewCursor
{
- // DocMerge: empty anyway
service com::sun::star::text::TextLayoutCursor;
-
- // DocMerge: empty anyway
interface com::sun::star::view::XScreenCursor;
};
diff --git a/offapi/com/sun/star/text/UserDataPart.idl b/offapi/com/sun/star/text/UserDataPart.idl
index afc2490fb3e6..a9f7a4045ad8 100644
--- a/offapi/com/sun/star/text/UserDataPart.idl
+++ b/offapi/com/sun/star/text/UserDataPart.idl
@@ -23,99 +23,67 @@
module com { module sun { module star { module text {
-
-// DocMerge from idl: constants com::sun::star::text::UserDataPart
/** These constants define which part of the user data is displayed in a
user data text field (service "sun.one.text.TextField.ExtendedUser")
*/
published constants UserDataPart
{
-
- // DocMerge from idl: value com::sun::star::text::UserDataPart::COMPANY
/** The field shows the company name.
*/
const short COMPANY = 0;
-
- // DocMerge from idl: value com::sun::star::text::UserDataPart::FIRSTNAME
/** The field shows the first name.
*/
const short FIRSTNAME = 1;
-
- // DocMerge from idl: value com::sun::star::text::UserDataPart::NAME
/** The field shows the name.
*/
const short NAME = 2;
-
- // DocMerge from idl: value com::sun::star::text::UserDataPart::SHORTCUT
/** The field shows the initials.
*/
const short SHORTCUT = 3;
-
- // DocMerge from idl: value com::sun::star::text::UserDataPart::STREET
/** The field shows the street.
*/
const short STREET = 4;
-
- // DocMerge from idl: value com::sun::star::text::UserDataPart::COUNTRY
/** The field shows the country.
*/
const short COUNTRY = 5;
-
- // DocMerge from idl: value com::sun::star::text::UserDataPart::ZIP
/** The field shows the zip code.
*/
const short ZIP = 6;
-
- // DocMerge from idl: value com::sun::star::text::UserDataPart::CITY
/** The field shows the city.
*/
const short CITY = 7;
-
- // DocMerge from idl: value com::sun::star::text::UserDataPart::TITLE
/** The field shows the title.
*/
const short TITLE = 8;
-
- // DocMerge from idl: value com::sun::star::text::UserDataPart::POSITION
/** The field shows the position.
*/
const short POSITION = 9;
-
- // DocMerge from idl: value com::sun::star::text::UserDataPart::PHONE_PRIVATE
/** The field shows the no of the private phone.
*/
const short PHONE_PRIVATE = 10;
-
- // DocMerge from idl: value com::sun::star::text::UserDataPart::PHONE_COMPANY
/** The field shows the number of the business phone.
*/
const short PHONE_COMPANY = 11;
-
- // DocMerge from idl: value com::sun::star::text::UserDataPart::FAX
/** The field shows the fax no.
*/
const short FAX = 12;
-
- // DocMerge from idl: value com::sun::star::text::UserDataPart::EMAIL
/** The field shows the e-Mail.
*/
const short EMAIL = 13;
-
- // DocMerge from idl: value com::sun::star::text::UserDataPart::STATE
/** The field shows the state.
*/
const short STATE = 14;
diff --git a/offapi/com/sun/star/text/UserFieldFormat.idl b/offapi/com/sun/star/text/UserFieldFormat.idl
index fe1b0e79bcd1..2ff364478810 100644
--- a/offapi/com/sun/star/text/UserFieldFormat.idl
+++ b/offapi/com/sun/star/text/UserFieldFormat.idl
@@ -23,27 +23,19 @@
module com { module sun { module star { module text {
-
-// DocMerge from idl: constants com::sun::star::text::UserFieldFormat
/** These constants describe how the content of a user text field is
formatted.
*/
published constants UserFieldFormat
{
-
- // DocMerge from idl: value com::sun::star::text::UserFieldFormat::SYSTEM
/** The number format of the operating system is used.
*/
const short SYSTEM = 0;
-
- // DocMerge from idl: value com::sun::star::text::UserFieldFormat::TEXT
/** The content is formatted as text.
*/
const short TEXT = 1;
-
- // DocMerge from idl: value com::sun::star::text::UserFieldFormat::NUM
/** The number format of the property "NumberFormat" is used.
*/
const short NUM = 2;
diff --git a/offapi/com/sun/star/text/VertOrientation.idl b/offapi/com/sun/star/text/VertOrientation.idl
index 02985ea89e65..30b9e256aa11 100644
--- a/offapi/com/sun/star/text/VertOrientation.idl
+++ b/offapi/com/sun/star/text/VertOrientation.idl
@@ -23,68 +23,46 @@
module com { module sun { module star { module text {
-
-// DocMerge from idl: constants com::sun::star::text::VertOrientation
/** These enumeration values are used to specify the vertical orientation.
*/
published constants VertOrientation
{
-
- // DocMerge from idl: value com::sun::star::text::VertOrientation::NONE
/** no hard alignment
*/
const short NONE = 0;
-
- // DocMerge from idl: value com::sun::star::text::VertOrientation::TOP
/** aligned at the top
*/
const short TOP = 1;
-
- // DocMerge from idl: value com::sun::star::text::VertOrientation::CENTER
/** aligned at the center
*/
const short CENTER = 2;
-
- // DocMerge from idl: value com::sun::star::text::VertOrientation::BOTTOM
/** aligned at the bottom
*/
const short BOTTOM = 3;
-
- // DocMerge from idl: value com::sun::star::text::VertOrientation::CHAR_TOP
/** aligned at the top of a character (anchored to character)
*/
const short CHAR_TOP = 4;
-
- // DocMerge from idl: value com::sun::star::text::VertOrientation::CHAR_CENTER
/** aligned at the center of a character (anchored to character )
*/
const short CHAR_CENTER = 5;
-
- // DocMerge from idl: value com::sun::star::text::VertOrientation::CHAR_BOTTOM
/** aligned at the bottom of a character (anchored to character )
*/
const short CHAR_BOTTOM = 6;
-
- // DocMerge from idl: value com::sun::star::text::VertOrientation::LINE_TOP
/** aligned at the top of the line (anchored to character )
*/
const short LINE_TOP = 7;
-
- // DocMerge from idl: value com::sun::star::text::VertOrientation::LINE_CENTER
/** aligned at the center of the line (anchored to character )
*/
const short LINE_CENTER = 8;
-
- // DocMerge from idl: value com::sun::star::text::VertOrientation::LINE_BOTTOM
/** aligned at the bottom of the line (anchored to character )
*/
const short LINE_BOTTOM = 9;
diff --git a/offapi/com/sun/star/text/VertOrientationFormat.idl b/offapi/com/sun/star/text/VertOrientationFormat.idl
index 762ac153f5d6..174f97f7d08b 100644
--- a/offapi/com/sun/star/text/VertOrientationFormat.idl
+++ b/offapi/com/sun/star/text/VertOrientationFormat.idl
@@ -23,8 +23,6 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: struct com::sun::star::text::VertOrientationFormat
/** describes the vertical orientation of an object.
@@ -36,21 +34,16 @@
*/
published struct VertOrientationFormat
{
- // DocMerge from xml: field com::sun::star::text::VertOrientationFormat::YPos
/** contains the distance from top. Only valid if the property
VerticalOrientation contains the value VERT_NONE.
*/
long YPos;
-
- // DocMerge from xml: field com::sun::star::text::VertOrientationFormat::VerticalOrientation
/** determines the vertical alignment of an object.
The values refer to com::sun::star::VertOrientation.
*/
short VerticalOrientation;
-
- // DocMerge from xml: field com::sun::star::text::VertOrientationFormat::VerticalRelation
/** determines the reference position of the vertical alignment.@see com::sun::star::text::RelOrientation
*/
short VerticalRelation;
diff --git a/offapi/com/sun/star/text/ViewSettings.idl b/offapi/com/sun/star/text/ViewSettings.idl
index b3f8e69de1d1..5fcb7907d041 100644
--- a/offapi/com/sun/star/text/ViewSettings.idl
+++ b/offapi/com/sun/star/text/ViewSettings.idl
@@ -26,60 +26,41 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: service com::sun::star::text::ViewSettings
/** provides access to the settings of the controller of a text document.
*/
published service ViewSettings
{
- // DocMerge: empty anyway
interface com::sun::star::beans::XPropertySet;
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowAnnotations
/** If this property is <TRUE/>, annotations (notes) are visible.
*/
[property] boolean ShowAnnotations;
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowBreaks
/** If this property is <TRUE/>, paragraph line breaks are visible.
*/
[property] boolean ShowBreaks;
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowFieldCommandsShowDrawings
/** If this property is <TRUE/>, shapes are visible.
*/
[property] boolean ShowDrawings;
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowFieldCommands
/** If this property is <TRUE/>, text fields are shown with their commands; otherwise
the content is visible.
*/
[property] boolean ShowFieldCommands;
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowFootnoteBackground
/** If this property is <TRUE/>, footnotes symbols are displayed with gray background.
*/
[property] boolean ShowFootnoteBackground;
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowGraphics
/** If this property is <TRUE/>, graphic objects are visible.
*/
[property] boolean ShowGraphics;
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowHiddenParagraphs
/** If this property is <TRUE/>, hidden paragraphs are displayed.
*/
[property] boolean ShowHiddenParagraphs;
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowHiddenText
/** If this property is <TRUE/>, hidden text is displayed.
*/
[property] boolean ShowHiddenText;
@@ -101,81 +82,55 @@ published service ViewSettings
*/
[property] boolean ShowHoriScrollBar;
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowIndexMarkBackground
/** If this property is <TRUE/>, index marks are displayed with gray background.
*/
[property] boolean ShowIndexMarkBackground;
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowParaBreaks
/** If this property is <TRUE/>, paragraph breaks are visible.
*/
[property] boolean ShowParaBreaks;
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowProtectedSpaces
/** If this property is <TRUE/>, protected spaces (hard spaces) are displayed with gray
background.
*/
[property] boolean ShowProtectedSpaces;
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowSoftHyphens
/** If this property is <TRUE/>, soft hyphens are displayed with gray background.
*/
[property] boolean ShowSoftHyphens;
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowSpaces
/** If this property is <TRUE/>, spaces are displayed with dots.
*/
[property] boolean ShowSpaces;
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowTableBoundaries
/** If this property is <TRUE/>, table boundaries are displayed.
*/
[property] boolean ShowTableBoundaries;
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowTables
/** If this property is <TRUE/>, tables are visible.
*/
[property] boolean ShowTables;
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowTabstops
/** If this property is <TRUE/>, tab stops are visible.
*/
[property] boolean ShowTabstops;
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowTextBoundaries
/** If this property is <TRUE/>, text boundaries are displayed.
*/
[property] boolean ShowTextBoundaries;
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowTextFieldBackground
/** If this property is <TRUE/>, text fields are displayed with gray background.
*/
[property] boolean ShowTextFieldBackground;
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowVertRuler
/** If this property is <TRUE/>, the vertical ruler is displayed.
*/
[property] boolean ShowVertRuler;
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowVertScrollBar
/** If this property is <TRUE/>, the vertical scroll bar is displayed.
*/
[property] boolean ShowVertScrollBar;
-
- // DocMerge from xml: property com::sun::star::text::ViewSettings::SmoothScrolling
/** If this property is <TRUE/>, smooth scrolling is active.
*/
[property] boolean SmoothScrolling;
diff --git a/offapi/com/sun/star/text/WrapTextMode.idl b/offapi/com/sun/star/text/WrapTextMode.idl
index 479cc17bcea9..a65dd8fae8e8 100644
--- a/offapi/com/sun/star/text/WrapTextMode.idl
+++ b/offapi/com/sun/star/text/WrapTextMode.idl
@@ -23,45 +23,31 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: enum com::sun::star::text::WrapTextMode
/** enumeration values specify the text wrap around objects in a text.
*/
published enum WrapTextMode
{
-
- // DocMerge from xml: value com::sun::star::text::WrapTextMode::NONE
/** text does not flow around the object.
*/
NONE,
-
- // DocMerge from xml: value com::sun::star::text::WrapTextMode::THROUGHT
/** text flow ignores the object.
*/
THROUGHT,
-
- // DocMerge from xml: value com::sun::star::text::WrapTextMode::PARALLEL
/** text flows to the left and right of the object.
*/
PARALLEL,
-
- // DocMerge from xml: value com::sun::star::text::WrapTextMode::DYNAMIC
/** text flow depends on the situation. The text formatting
decides the best way.
*/
DYNAMIC,
-
- // DocMerge from xml: value com::sun::star::text::WrapTextMode::LEFT
/** text flows to the left side of the object.
*/
LEFT,
-
- // DocMerge from xml: value com::sun::star::text::WrapTextMode::RIGHT
/** text flows to the right side of the object.
*/
RIGHT
diff --git a/offapi/com/sun/star/text/XAutoTextContainer.idl b/offapi/com/sun/star/text/XAutoTextContainer.idl
index 06fb5d1f2a7b..49385d10491a 100644
--- a/offapi/com/sun/star/text/XAutoTextContainer.idl
+++ b/offapi/com/sun/star/text/XAutoTextContainer.idl
@@ -33,8 +33,6 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XAutoTextContainer
/** handles blocks of <type>AutoTextEntry</type>.
@@ -60,16 +58,12 @@
*/
published interface XAutoTextContainer: com::sun::star::container::XNameAccess
{
-
- // DocMerge from xml: method com::sun::star::text::XAutoTextContainer::insertNewByName
/** creates a new AutoText group.
*/
com::sun::star::text::XAutoTextGroup insertNewByName( [in] string aGroupName )
raises( com::sun::star::lang::IllegalArgumentException,
com::sun::star::container::ElementExistException );
-
- // DocMerge from xml: method com::sun::star::text::XAutoTextContainer::removeByName
/** deletes the specified AutoText group.
*/
void removeByName( [in] string aGroupName )
diff --git a/offapi/com/sun/star/text/XAutoTextEntry.idl b/offapi/com/sun/star/text/XAutoTextEntry.idl
index 754a4271d511..46d0c15762cc 100644
--- a/offapi/com/sun/star/text/XAutoTextEntry.idl
+++ b/offapi/com/sun/star/text/XAutoTextEntry.idl
@@ -27,8 +27,6 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XAutoTextEntry
/** identifies an autotext entry.
@@ -47,8 +45,6 @@
*/
published interface XAutoTextEntry: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::text::XAutoTextEntry::applyTo
/** inserts the contents represented by this auto text entry at the
specified text range.
*/
diff --git a/offapi/com/sun/star/text/XAutoTextGroup.idl b/offapi/com/sun/star/text/XAutoTextGroup.idl
index 214bde5ed073..943545c76221 100644
--- a/offapi/com/sun/star/text/XAutoTextGroup.idl
+++ b/offapi/com/sun/star/text/XAutoTextGroup.idl
@@ -37,21 +37,15 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XAutoTextGroup
/** The interface provide methods to insert, rename and delete autotext entries from the current autotext group.
*/
published interface XAutoTextGroup: com::sun::star::container::XNameAccess
{
-
- // DocMerge from idl: method com::sun::star::text::XAutoTextGroup::getTitles
/** returns the titles of all autotext entries. The order of the entries
corresponds to the output of the function getElementNames().
*/
sequence<string> getTitles();
-
- // DocMerge from xml: method com::sun::star::text::XAutoTextGroup::renameByName
/** renames an entry in the autotext group.
@@ -67,8 +61,6 @@ published interface XAutoTextGroup: com::sun::star::container::XNameAccess
com::sun::star::container::ElementExistException,
com::sun::star::io::IOException );
-
- // DocMerge from xml: method com::sun::star::text::XAutoTextGroup::insertNewByName
/** creates a new <type>AutoTextEntry</type> entry.
*/
com::sun::star::text::XAutoTextEntry insertNewByName( [in] string aName,
@@ -76,8 +68,6 @@ published interface XAutoTextGroup: com::sun::star::container::XNameAccess
[in] com::sun::star::text::XTextRange xTextRange )
raises( com::sun::star::container::ElementExistException );
-
- // DocMerge from xml: method com::sun::star::text::XAutoTextGroup::removeByName
/** removes the specified autotext entry.
*/
void removeByName( [in] string aEntryName )
diff --git a/offapi/com/sun/star/text/XBookmarkInsertTool.idl b/offapi/com/sun/star/text/XBookmarkInsertTool.idl
index c9aee88960d1..4ed608f436e8 100644
--- a/offapi/com/sun/star/text/XBookmarkInsertTool.idl
+++ b/offapi/com/sun/star/text/XBookmarkInsertTool.idl
@@ -29,14 +29,10 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XBookmarkInsertTool
/** offers an easy way to insert bookmarks by name.@see Text
*/
published interface XBookmarkInsertTool: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::text::XBookmarkInsertTool::insertNewBookmark
/** inserts a bookmark at the specified text position.
*/
com::sun::star::text::XTextContent insertNewBookmark( [in] com::sun::star::text::XTextRange xTextRange,
diff --git a/offapi/com/sun/star/text/XBookmarksSupplier.idl b/offapi/com/sun/star/text/XBookmarksSupplier.idl
index 2acbc29f5a9b..33ed71e5d83f 100644
--- a/offapi/com/sun/star/text/XBookmarksSupplier.idl
+++ b/offapi/com/sun/star/text/XBookmarksSupplier.idl
@@ -27,14 +27,10 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XBookmarksSupplier
/** provides access to the collection of all bookmarks within this text container.
*/
published interface XBookmarksSupplier: com::sun::star::uno::XInterface
{
-
- // DocMerge from idl: method com::sun::star::text::XBookmarksSupplier::getBookmarks
/** @returns
the collection of all <type>Bookmark</type> instances which are
within this context and which support the <type>Bookmarks</type> service.
diff --git a/offapi/com/sun/star/text/XChapterNumberingSupplier.idl b/offapi/com/sun/star/text/XChapterNumberingSupplier.idl
index 34c3da8efc01..d050098183ef 100644
--- a/offapi/com/sun/star/text/XChapterNumberingSupplier.idl
+++ b/offapi/com/sun/star/text/XChapterNumberingSupplier.idl
@@ -27,15 +27,11 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XChapterNumberingSupplier
/** contains the settings of the chapter numbering in a text
document.
*/
published interface XChapterNumberingSupplier: com::sun::star::uno::XInterface
{
-
- // DocMerge from idl: method com::sun::star::text::XChapterNumberingSupplier::getChapterNumberingRules
/** @returns
the collection of numbering rules for this document.
diff --git a/offapi/com/sun/star/text/XDocumentIndex.idl b/offapi/com/sun/star/text/XDocumentIndex.idl
index a1c7b3c1cf2f..19855bebe115 100644
--- a/offapi/com/sun/star/text/XDocumentIndex.idl
+++ b/offapi/com/sun/star/text/XDocumentIndex.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XDocumentIndex
/** This is the main interface for a document index.
@@ -47,14 +45,10 @@
*/
published interface XDocumentIndex: com::sun::star::text::XTextContent
{
-
- // DocMerge from xml: method com::sun::star::text::XDocumentIndex::getServiceName
/** returns the service name that was used to create this document index type.
*/
string getServiceName();
-
- // DocMerge from xml: method com::sun::star::text::XDocumentIndex::update
/** initiates an update to the document index.
*/
void update();
diff --git a/offapi/com/sun/star/text/XDocumentIndexMark.idl b/offapi/com/sun/star/text/XDocumentIndexMark.idl
index 193c039289ba..172212599136 100644
--- a/offapi/com/sun/star/text/XDocumentIndexMark.idl
+++ b/offapi/com/sun/star/text/XDocumentIndexMark.idl
@@ -25,14 +25,10 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XDocumentIndexMark
/** gives access to the mark of a document index entry.@see DocumentIndexMark
*/
published interface XDocumentIndexMark: com::sun::star::text::XTextContent
{
-
- // DocMerge from idl: method com::sun::star::text::XDocumentIndexMark::getMarkEntry
/** @returns
the explicitly set string for the index mark.
@@ -40,8 +36,6 @@ published interface XDocumentIndexMark: com::sun::star::text::XTextContent
*/
string getMarkEntry();
-
- // DocMerge from xml: method com::sun::star::text::XDocumentIndexMark::setMarkEntry
/** sets an explicit string for this index mark to use
in the index.
diff --git a/offapi/com/sun/star/text/XDocumentIndexesSupplier.idl b/offapi/com/sun/star/text/XDocumentIndexesSupplier.idl
index f2ffc7e2ea78..68ed1ee6ff9c 100644
--- a/offapi/com/sun/star/text/XDocumentIndexesSupplier.idl
+++ b/offapi/com/sun/star/text/XDocumentIndexesSupplier.idl
@@ -27,8 +27,6 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XDocumentIndexesSupplier
/** gives access to the collection of document indexes.
@@ -37,8 +35,6 @@
*/
published interface XDocumentIndexesSupplier: com::sun::star::uno::XInterface
{
-
- // DocMerge from idl: method com::sun::star::text::XDocumentIndexesSupplier::getDocumentIndexes
/** @returns
the collection of "DocumentIndexes" currently contained in the object.
*/
diff --git a/offapi/com/sun/star/text/XEndnotesSettingsSupplier.idl b/offapi/com/sun/star/text/XEndnotesSettingsSupplier.idl
index ca8e664b47bc..0f53cb350740 100644
--- a/offapi/com/sun/star/text/XEndnotesSettingsSupplier.idl
+++ b/offapi/com/sun/star/text/XEndnotesSettingsSupplier.idl
@@ -27,15 +27,11 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XEndnotesSettingsSupplier
/** makes it possible to access the <type>FootnoteSettings</type>
within the context (e.g. document).
*/
published interface XEndnotesSettingsSupplier: com::sun::star::uno::XInterface
{
-
- // DocMerge from idl: method com::sun::star::text::XEndnotesSettingsSupplier::getEndnotesSettings
/** @returns
<type>EndnoteSettings</type> of the object.
*/
diff --git a/offapi/com/sun/star/text/XEndnotesSupplier.idl b/offapi/com/sun/star/text/XEndnotesSupplier.idl
index 7d149d000ca6..812bf28fac64 100644
--- a/offapi/com/sun/star/text/XEndnotesSupplier.idl
+++ b/offapi/com/sun/star/text/XEndnotesSupplier.idl
@@ -29,22 +29,16 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XEndnotesSupplier
/** makes it possible to access the endnotes within the
context (e.g. document).
*/
published interface XEndnotesSupplier: com::sun::star::uno::XInterface
{
-
- // DocMerge from idl: method com::sun::star::text::XEndnotesSupplier::getEndnotes
/** @returns
a collection of endnotes.
*/
com::sun::star::container::XIndexAccess getEndnotes();
-
- // DocMerge from idl: method com::sun::star::text::XEndnotesSupplier::getEndnoteSettings
/** @returns
the endnote settings of the document.
*/
diff --git a/offapi/com/sun/star/text/XFootnote.idl b/offapi/com/sun/star/text/XFootnote.idl
index fa3e9a868d64..4fb215980b4f 100644
--- a/offapi/com/sun/star/text/XFootnote.idl
+++ b/offapi/com/sun/star/text/XFootnote.idl
@@ -25,22 +25,16 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XFootnote
/** specifies a footnote within a Text.@see Footnote
*/
published interface XFootnote: com::sun::star::text::XTextContent
{
-
- // DocMerge from idl: method com::sun::star::text::XFootnote::getLabel
/** @returns the label of the footnote.
@see XFootnote::setLabel
*/
string getLabel();
-
- // DocMerge from xml: method com::sun::star::text::XFootnote::setLabel
/** sets the label of the footnote.
*/
void setLabel( [in] string aLabel );
diff --git a/offapi/com/sun/star/text/XFootnotesSettingsSupplier.idl b/offapi/com/sun/star/text/XFootnotesSettingsSupplier.idl
index 25ea096e25cd..6a5d5ccf808f 100644
--- a/offapi/com/sun/star/text/XFootnotesSettingsSupplier.idl
+++ b/offapi/com/sun/star/text/XFootnotesSettingsSupplier.idl
@@ -27,15 +27,11 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XFootnotesSettingsSupplier
/** makes it possible to access the <type>FootnoteSettings</type>
with the context (e.g. document).
*/
published interface XFootnotesSettingsSupplier: com::sun::star::uno::XInterface
{
-
- // DocMerge from idl: method com::sun::star::text::XFootnotesSettingsSupplier::getFootnotesSettings
/** @returns
<type>FootnoteSettings</type> of the object.
*/
diff --git a/offapi/com/sun/star/text/XFootnotesSupplier.idl b/offapi/com/sun/star/text/XFootnotesSupplier.idl
index e723dda373e9..fdbd5b4c9273 100644
--- a/offapi/com/sun/star/text/XFootnotesSupplier.idl
+++ b/offapi/com/sun/star/text/XFootnotesSupplier.idl
@@ -29,21 +29,15 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XFootnotesSupplier
/** makes it possible to access the footnotes within
the context (e.g. document).
*/
published interface XFootnotesSupplier: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::text::XFootnotesSupplier::getFootnotes
/** returns a collection of footnotes.
*/
com::sun::star::container::XIndexAccess getFootnotes();
-
- // DocMerge from idl: method com::sun::star::text::XFootnotesSupplier::getFootnoteSettings
/** @returns
the footnotes settings of the document.
*/
diff --git a/offapi/com/sun/star/text/XPageCursor.idl b/offapi/com/sun/star/text/XPageCursor.idl
index 6c54097cdf18..9d65b326acd0 100644
--- a/offapi/com/sun/star/text/XPageCursor.idl
+++ b/offapi/com/sun/star/text/XPageCursor.idl
@@ -25,63 +25,45 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XPageCursor
/** makes it possible to perform cursor movements between pages.
*/
published interface XPageCursor: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::text::XPageCursor::jumpToFirstPage
/** moves the cursor to the first page.
*/
boolean jumpToFirstPage();
-
- // DocMerge from xml: method com::sun::star::text::XPageCursor::jumpToLastPage
/** moves the cursor to the last page.
*/
boolean jumpToLastPage();
-
- // DocMerge from xml: method com::sun::star::text::XPageCursor::jumpToPage
/** moves the cursor to the specified page.
*/
boolean jumpToPage( [in] short nPage );
-
- // DocMerge from idl: method com::sun::star::text::XPageCursor::getPage
/** @returns
the number of the page within the document of this cursor.
*/
short getPage();
-
- // DocMerge from xml: method com::sun::star::text::XPageCursor::jumpToNextPage
/** moves the cursor to the next page.
@see XPageCursor::jumpToPreviousPage
*/
boolean jumpToNextPage();
-
- // DocMerge from xml: method com::sun::star::text::XPageCursor::jumpToPreviousPage
/** moves the cursor to the previous page.
@see XPageCursor::jumpToNextPage
*/
boolean jumpToPreviousPage();
-
- // DocMerge from xml: method com::sun::star::text::XPageCursor::jumpToEndOfPage
/** moves the cursor to the end of the current page.
@see XPageCursor::jumpToEndOfPreviousPage
*/
boolean jumpToEndOfPage();
-
- // DocMerge from xml: method com::sun::star::text::XPageCursor::jumpToStartOfPage
/** moves the cursor to the start of the current page.
*/
boolean jumpToStartOfPage();
diff --git a/offapi/com/sun/star/text/XPagePrintable.idl b/offapi/com/sun/star/text/XPagePrintable.idl
index ff2f1d8c66ed..c794c7a76853 100644
--- a/offapi/com/sun/star/text/XPagePrintable.idl
+++ b/offapi/com/sun/star/text/XPagePrintable.idl
@@ -56,8 +56,6 @@ published interface XPagePrintable: com::sun::star::uno::XInterface
*/
void setPagePrintSettings( [in] sequence<com::sun::star::beans::PropertyValue> aSettings );
-
- // DocMerge from xml: method com::sun::star::text::XPagePrintable::printPages
/** prints the pages according to the <type>PagePrintSettings</type>.
@see com::sun::star::view::PrintOptions
diff --git a/offapi/com/sun/star/text/XReferenceMarksSupplier.idl b/offapi/com/sun/star/text/XReferenceMarksSupplier.idl
index 6c82cef828c3..7daaf16eb79d 100644
--- a/offapi/com/sun/star/text/XReferenceMarksSupplier.idl
+++ b/offapi/com/sun/star/text/XReferenceMarksSupplier.idl
@@ -27,8 +27,6 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XReferenceMarksSupplier
/** provides access to the reference marks within this context (i.e. document).
@@ -40,8 +38,6 @@
*/
published interface XReferenceMarksSupplier: com::sun::star::uno::XInterface
{
-
- // DocMerge from idl: method com::sun::star::text::XReferenceMarksSupplier::getReferenceMarks
/** @returns
the collection of reference marks.
*/
diff --git a/offapi/com/sun/star/text/XRelativeTextContentInsert.idl b/offapi/com/sun/star/text/XRelativeTextContentInsert.idl
index ca3f20cb0412..55480d0ce44d 100644
--- a/offapi/com/sun/star/text/XRelativeTextContentInsert.idl
+++ b/offapi/com/sun/star/text/XRelativeTextContentInsert.idl
@@ -27,8 +27,6 @@
published interface XTextContent;
-
-// DocMerge from xml: interface com::sun::star::text::XRelativeTextContentInsert
/** makes it possible to insert new text contents before or
after existing text contents.
@@ -42,8 +40,6 @@
*/
published interface XRelativeTextContentInsert: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::text::XRelativeTextContentInsert::insertTextContentBefore
/** inserts text the new text content before of the successor argument.
<p> This is helpful to insert paragraphs before of text tables. </p>
@@ -52,8 +48,6 @@ published interface XRelativeTextContentInsert: com::sun::star::uno::XInterface
[in] XTextContent xNewContent,
[in] XTextContent xSuccessor )
raises( com::sun::star::lang::IllegalArgumentException );
-
- // DocMerge from xml: method com::sun::star::text::XRelativeTextContentInsert::insertTextContentAfter
/** inserts text the new text content after the predecessor argument.
<p> This is helpful to insert paragraphs after text tables especially in
diff --git a/offapi/com/sun/star/text/XRelativeTextContentRemove.idl b/offapi/com/sun/star/text/XRelativeTextContentRemove.idl
index 9a472ab17322..effc949466b3 100644
--- a/offapi/com/sun/star/text/XRelativeTextContentRemove.idl
+++ b/offapi/com/sun/star/text/XRelativeTextContentRemove.idl
@@ -26,8 +26,6 @@
module com { module sun { module star { module text {
published interface XTextContent;
-
-// DocMerge from xml: interface com::sun::star::text::XRelativeTextContentRemove
/** makes it possible to remove text contents before or
after existing text contents.
@@ -41,8 +39,6 @@
*/
published interface XRelativeTextContentRemove: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::text::XRelativeTextContentRemove::removeTextContentBefore
/** removes the text content that precedes the argument.
<p> This is helpful to remove empty paragraphs before text tables. </p>
@@ -50,8 +46,6 @@ published interface XRelativeTextContentRemove: com::sun::star::uno::XInterface
void removeTextContentBefore(
[in] XTextContent xSuccessor )
raises( com::sun::star::lang::IllegalArgumentException );
-
- // DocMerge from xml: method com::sun::star::text::XRelativeTextContentRemove::removeTextContentAfter
/** removes the text content that follows the argument.
<p> This is helpful to remove empty paragraphs following text tables especially in
diff --git a/offapi/com/sun/star/text/XTextColumns.idl b/offapi/com/sun/star/text/XTextColumns.idl
index 9292c1497d74..e92a248b1b8e 100644
--- a/offapi/com/sun/star/text/XTextColumns.idl
+++ b/offapi/com/sun/star/text/XTextColumns.idl
@@ -27,8 +27,6 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XTextColumns
/** manages columns within the object.
@@ -41,8 +39,6 @@
*/
published interface XTextColumns: com::sun::star::uno::XInterface
{
-
- // DocMerge from idl: method com::sun::star::text::XTextColumns::getReferenceValue
/** @returns
the sum of all values.
@@ -50,15 +46,11 @@ published interface XTextColumns: com::sun::star::uno::XInterface
*/
long getReferenceValue();
-
- // DocMerge from idl: method com::sun::star::text::XTextColumns::getColumnCount
/** @returns
the number of columns.
*/
short getColumnCount();
-
- // DocMerge from xml: method com::sun::star::text::XTextColumns::setColumnCount
/** sets the number of columns.
@@ -67,15 +59,11 @@ published interface XTextColumns: com::sun::star::uno::XInterface
*/
void setColumnCount( [in] short nColumns );
-
- // DocMerge from idl: method com::sun::star::text::XTextColumns::getColumns
/** returns the column description of the object.
@see TextColumn
*/
sequence<com::sun::star::text::TextColumn> getColumns();
-
- // DocMerge from xml: method com::sun::star::text::XTextColumns::setColumns
/** sets the descriptors of all columns.
diff --git a/offapi/com/sun/star/text/XTextDocument.idl b/offapi/com/sun/star/text/XTextDocument.idl
index 04a6c8be6433..d6f9776591f2 100644
--- a/offapi/com/sun/star/text/XTextDocument.idl
+++ b/offapi/com/sun/star/text/XTextDocument.idl
@@ -27,14 +27,10 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XTextDocument
/** is the main interface of a text document.@see com::sun::star::text::TextDocument
*/
published interface XTextDocument: com::sun::star::frame::XModel
{
-
- // DocMerge from idl: method com::sun::star::text::XTextDocument::getText
/** @returns
the major <type scope="com::sun::star::text">Text</type> of the text document.
@@ -45,8 +41,6 @@ published interface XTextDocument: com::sun::star::frame::XModel
*/
com::sun::star::text::XText getText();
-
- // DocMerge from xml: method com::sun::star::text::XTextDocument::reformat
/** reformats the contents of the document.
*/
void reformat();
diff --git a/offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier.idl b/offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier.idl
index 174f2d3d1e8b..950aa6e68865 100644
--- a/offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier.idl
+++ b/offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier.idl
@@ -27,15 +27,11 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XTextEmbeddedObjectsSupplier
/** provides the collection of all embedded objects within this context
(i.e. this document).
*/
published interface XTextEmbeddedObjectsSupplier: com::sun::star::uno::XInterface
{
-
- // DocMerge from idl: method com::sun::star::text::XTextEmbeddedObjectsSupplier::getEmbeddedObjects
/** @returns
the collection of embedded objects.
*/
diff --git a/offapi/com/sun/star/text/XTextField.idl b/offapi/com/sun/star/text/XTextField.idl
index b17df24e1e98..176a85d09121 100644
--- a/offapi/com/sun/star/text/XTextField.idl
+++ b/offapi/com/sun/star/text/XTextField.idl
@@ -25,8 +25,6 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XTextField
/** is the base interface for all text fields.
@@ -38,8 +36,6 @@
*/
published interface XTextField: com::sun::star::text::XTextContent
{
-
- // DocMerge from idl: method com::sun::star::text::XTextField::getPresentation
/** @returns the display string of the text field either as the command
of the field or as the output string.
@param bShowCommand
diff --git a/offapi/com/sun/star/text/XTextFieldsSupplier.idl b/offapi/com/sun/star/text/XTextFieldsSupplier.idl
index ed8c2e239e9f..b84ac523e438 100644
--- a/offapi/com/sun/star/text/XTextFieldsSupplier.idl
+++ b/offapi/com/sun/star/text/XTextFieldsSupplier.idl
@@ -27,24 +27,18 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XTextFieldsSupplier
/** makes it possible to access the text fields used in this context
(e.g. this document).@see com::sun::star::sheet::SpreadsheetDocument
@see TextDocument
*/
published interface XTextFieldsSupplier: com::sun::star::uno::XInterface
{
-
- // DocMerge from idl: method com::sun::star::text::XTextFieldsSupplier::getTextFields
/** @returns
the collection of <type>TextField</type> instances
in this context (i.e. this document).
*/
com::sun::star::container::XEnumerationAccess getTextFields();
-
- // DocMerge from idl: method com::sun::star::text::XTextFieldsSupplier::getTextFieldMasters
/** @returns
the collection of <type>TextFieldMaster</type> instances
which are defined in this context (i.e. this document).
diff --git a/offapi/com/sun/star/text/XTextFrame.idl b/offapi/com/sun/star/text/XTextFrame.idl
index cfd819b21ceb..93629c56a8d2 100644
--- a/offapi/com/sun/star/text/XTextFrame.idl
+++ b/offapi/com/sun/star/text/XTextFrame.idl
@@ -26,15 +26,11 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XTextFrame
/** provides access to the <type>Text</type> of a <type>TextFrame</type>.
@see TextFrame
*/
published interface XTextFrame: com::sun::star::text::XTextContent
{
-
- // DocMerge from idl: method com::sun::star::text::XTextFrame::getText
/** @returns
the text within this frame. The returned interface belongs
to an object which implements the service <type>Text</type>.
diff --git a/offapi/com/sun/star/text/XTextFramesSupplier.idl b/offapi/com/sun/star/text/XTextFramesSupplier.idl
index 903c2f883474..e8d2ccc46a7d 100644
--- a/offapi/com/sun/star/text/XTextFramesSupplier.idl
+++ b/offapi/com/sun/star/text/XTextFramesSupplier.idl
@@ -27,15 +27,11 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XTextFramesSupplier
/** makes it possible to access the <type>TextFrame</type> instances in this
context (e.g. document).
*/
published interface XTextFramesSupplier: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::text::XTextFramesSupplier::getTextFrames
/** returns a collection of text frames.
*/
com::sun::star::container::XNameAccess getTextFrames();
diff --git a/offapi/com/sun/star/text/XTextGraphicObjectsSupplier.idl b/offapi/com/sun/star/text/XTextGraphicObjectsSupplier.idl
index 8c67c6e17632..fc7635ae8b14 100644
--- a/offapi/com/sun/star/text/XTextGraphicObjectsSupplier.idl
+++ b/offapi/com/sun/star/text/XTextGraphicObjectsSupplier.idl
@@ -27,15 +27,11 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XTextGraphicObjectsSupplier
/** provides access to the collection of all embedded and linked graphics
within this context (i.e. within this document).
*/
published interface XTextGraphicObjectsSupplier: com::sun::star::uno::XInterface
{
-
- // DocMerge from idl: method com::sun::star::text::XTextGraphicObjectsSupplier::getGraphicObjects
/** @returns
the collection of graphic objects in this object (document).
*/
diff --git a/offapi/com/sun/star/text/XTextRange.idl b/offapi/com/sun/star/text/XTextRange.idl
index d08e8ef19862..e53e2392591c 100644
--- a/offapi/com/sun/star/text/XTextRange.idl
+++ b/offapi/com/sun/star/text/XTextRange.idl
@@ -26,8 +26,6 @@
published interface XText;
-
-// DocMerge from xml: interface com::sun::star::text::XTextRange
/** describes the object's position in a text.
@@ -38,36 +36,26 @@
*/
published interface XTextRange: com::sun::star::uno::XInterface
{
-
- // DocMerge from idl: method com::sun::star::text::XTextRange::getText
/** @returns
the text interface in which the text position is contained.
*/
XText getText();
-
- // DocMerge from idl: method com::sun::star::text::XTextRange::getStart
/** @returns
a text range which contains only the start of this text range.
*/
XTextRange getStart();
-
- // DocMerge from idl: method com::sun::star::text::XTextRange::getEnd
/** @returns
a text range which contains only the end of this text range.
*/
XTextRange getEnd();
-
- // DocMerge from idl: method com::sun::star::text::XTextRange::getString
/** @returns
the string that is included in this text range.
*/
string getString();
-
- // DocMerge from xml: method com::sun::star::text::XTextRange::setString
/** the whole string of characters of this piece of text is replaced.
diff --git a/offapi/com/sun/star/text/XTextRangeCompare.idl b/offapi/com/sun/star/text/XTextRangeCompare.idl
index e8f0ff45794d..d027dec2bd9d 100644
--- a/offapi/com/sun/star/text/XTextRangeCompare.idl
+++ b/offapi/com/sun/star/text/XTextRangeCompare.idl
@@ -29,8 +29,6 @@
published interface XText;
published interface XTextRange;
-
-// DocMerge from xml: interface com::sun::star::text::XTextRangeCompare
/** compares the positions of two <type>TextRange</type>s within a
<type>Text</type>.
@@ -42,8 +40,6 @@
*/
published interface XTextRangeCompare: com::sun::star::uno::XInterface
{
-
- // DocMerge from idl: method com::sun::star::text::XTextRangeCompare::compareRegionStarts
/** @returns
1 if <var>xR1</var> starts before <var>xR2</var>,
0 if <var>xR1</var> starts at the same position as <var>xR2</var> and
@@ -56,8 +52,6 @@ published interface XTextRangeCompare: com::sun::star::uno::XInterface
short compareRegionStarts( [in] XTextRange xR1, [in] XTextRange xR2 )
raises( com::sun::star::lang::IllegalArgumentException );
-
- // DocMerge from idl: method com::sun::star::text::XTextRangeCompare::compareRegionEnds
/** @returns
1, if <var>xR1</var> ends before <var>xR2</var>,
0, if <var>xR1</var> ends at the same position as <var>xR2</var> and
diff --git a/offapi/com/sun/star/text/XTextRangeMover.idl b/offapi/com/sun/star/text/XTextRangeMover.idl
index c18b75540d91..afaf4115eb06 100644
--- a/offapi/com/sun/star/text/XTextRangeMover.idl
+++ b/offapi/com/sun/star/text/XTextRangeMover.idl
@@ -27,8 +27,6 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XTextRangeMover
/** makes it possible to move a text range (e.g. a paragraph by itself)
within this text.
@@ -41,8 +39,6 @@
*/
published interface XTextRangeMover: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::text::XTextRangeMover::moveTextRange
/** moves the contents to which <var>xRange</var> refers forward or
backward.
*/
diff --git a/offapi/com/sun/star/text/XTextSection.idl b/offapi/com/sun/star/text/XTextSection.idl
index 5d2c45134153..ad054bf4df97 100644
--- a/offapi/com/sun/star/text/XTextSection.idl
+++ b/offapi/com/sun/star/text/XTextSection.idl
@@ -25,21 +25,15 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XTextSection
/** provide special data of a <type>TextSection</type>.@see TextSection
*/
published interface XTextSection: com::sun::star::text::XTextContent
{
-
- // DocMerge from xml: method com::sun::star::text::XTextSection::getParentSection
/** If the object is a child section, then this method returns
the parent text section.
*/
com::sun::star::text::XTextSection getParentSection();
-
- // DocMerge from idl: method com::sun::star::text::XTextSection::getChildSections
/** @returns
all text sections that are children of this text section (recursive).
*/
diff --git a/offapi/com/sun/star/text/XTextSectionsSupplier.idl b/offapi/com/sun/star/text/XTextSectionsSupplier.idl
index 0a0457bd9050..58ed2fd47b66 100644
--- a/offapi/com/sun/star/text/XTextSectionsSupplier.idl
+++ b/offapi/com/sun/star/text/XTextSectionsSupplier.idl
@@ -27,14 +27,10 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XTextSectionsSupplier
/** manages the text sections within the context (i.e. the document).
*/
published interface XTextSectionsSupplier: com::sun::star::uno::XInterface
{
-
- // DocMerge from idl: method com::sun::star::text::XTextSectionsSupplier::getTextSections
/** @returns
the collection of text sections.
*/
diff --git a/offapi/com/sun/star/text/XTextShapesSupplier.idl b/offapi/com/sun/star/text/XTextShapesSupplier.idl
index 2a03b963694b..e86da0567e4c 100644
--- a/offapi/com/sun/star/text/XTextShapesSupplier.idl
+++ b/offapi/com/sun/star/text/XTextShapesSupplier.idl
@@ -27,14 +27,10 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XTextShapesSupplier
/** provides the collection of <type scope="com::sun::star::drawing">TextShape</type>s.
*/
published interface XTextShapesSupplier: com::sun::star::uno::XInterface
{
-
- // DocMerge from xml: method com::sun::star::text::XTextShapesSupplier::getShapes
/** returns the collection of shapes.
@see com::sun::star::drawing::DrawPage
diff --git a/offapi/com/sun/star/text/XTextViewCursor.idl b/offapi/com/sun/star/text/XTextViewCursor.idl
index 5080cd8b0282..1e3b03623a76 100644
--- a/offapi/com/sun/star/text/XTextViewCursor.idl
+++ b/offapi/com/sun/star/text/XTextViewCursor.idl
@@ -27,27 +27,19 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XTextViewCursor
/** describes a cursor in a text document's view.
*/
published interface XTextViewCursor: com::sun::star::text::XTextCursor
{
-
- // DocMerge from idl: method com::sun::star::text::XTextViewCursor::isVisible
/** @returns
<TRUE/> if this cursor is visible for the user.
*/
boolean isVisible();
-
- // DocMerge from xml: method com::sun::star::text::XTextViewCursor::setVisible
/** shows or hides this cursor for the user.
*/
void setVisible( [in] boolean bVisible );
-
- // DocMerge from idl: method com::sun::star::text::XTextViewCursor::getPosition
/** @returns
the cursor's coordinates relative to the top left position of
the first page of the document.
diff --git a/offapi/com/sun/star/text/XTextViewCursorSupplier.idl b/offapi/com/sun/star/text/XTextViewCursorSupplier.idl
index 6e32f5dab35e..01af60e63f1d 100644
--- a/offapi/com/sun/star/text/XTextViewCursorSupplier.idl
+++ b/offapi/com/sun/star/text/XTextViewCursorSupplier.idl
@@ -27,8 +27,6 @@
module com { module sun { module star { module text {
-
-// DocMerge from xml: interface com::sun::star::text::XTextViewCursorSupplier
/** supplies access to the cursor in the view.
@@ -40,8 +38,6 @@
*/
published interface XTextViewCursorSupplier: com::sun::star::uno::XInterface
{
-
- // DocMerge from idl: method com::sun::star::text::XTextViewCursorSupplier::getViewCursor
/** @returns
the cursor of the document view.
*/
diff --git a/offapi/com/sun/star/util/XImportable.idl b/offapi/com/sun/star/util/XImportable.idl
index 41193fe4ce0f..6fa6b4ee7ea1 100644
--- a/offapi/com/sun/star/util/XImportable.idl
+++ b/offapi/com/sun/star/util/XImportable.idl
@@ -27,21 +27,15 @@
module com { module sun { module star { module util {
-
-// DocMerge from xml: interface com::sun::star::util::XImportable
/** makes it possible to import files into the object.
*/
published interface XImportable: com::sun::star::uno::XInterface
{
-
- // DocMerge from idl: method com::sun::star::util::XImportable::createImportDescriptor
/** @returns
a descriptor which contains the arguments for an import.
*/
sequence<com::sun::star::beans::PropertyValue> createImportDescriptor( [in] boolean bEmpty );
-
- // DocMerge from xml: method com::sun::star::util::XImportable::doImport
/** imports data from an external database.
*/
void doImport( [in] sequence<com::sun::star::beans::PropertyValue> aDescriptor );