[Libreoffice-commits] core.git: 2 commits - offapi/com sd/source udkapi/com

Tor Lillqvist tml at iki.fi
Wed Mar 13 01:58:00 PDT 2013


 offapi/com/sun/star/drawing/Alignment.idl                              |   20 
 offapi/com/sun/star/drawing/Arrangement.idl                            |   10 
 offapi/com/sun/star/drawing/BezierPoint.idl                            |    7 
 offapi/com/sun/star/drawing/CircleKind.idl                             |   10 
 offapi/com/sun/star/drawing/ColorMode.idl                              |   10 
 offapi/com/sun/star/drawing/ConnectionType.idl                         |   14 
 offapi/com/sun/star/drawing/ConnectorType.idl                          |   10 
 offapi/com/sun/star/drawing/DashStyle.idl                              |   10 
 offapi/com/sun/star/drawing/Direction3D.idl                            |    7 
 offapi/com/sun/star/drawing/DrawPage.idl                               |    6 
 offapi/com/sun/star/drawing/DrawPages.idl                              |    2 
 offapi/com/sun/star/drawing/DrawViewMode.idl                           |    8 
 offapi/com/sun/star/drawing/FillStyle.idl                              |   12 
 offapi/com/sun/star/drawing/GenericDrawPage.idl                        |   30 -
 offapi/com/sun/star/drawing/GluePoint.idl                              |    9 
 offapi/com/sun/star/drawing/Hatch.idl                                  |    9 
 offapi/com/sun/star/drawing/HatchStyle.idl                             |    8 
 offapi/com/sun/star/drawing/HomogenMatrix.idl                          |    9 
 offapi/com/sun/star/drawing/HomogenMatrix3.idl                         |    2 
 offapi/com/sun/star/drawing/HomogenMatrix4.idl                         |    2 
 offapi/com/sun/star/drawing/HomogenMatrixLine.idl                      |    9 
 offapi/com/sun/star/drawing/HorizontalDimensioning.idl                 |   10 
 offapi/com/sun/star/drawing/Layer.idl                                  |   12 
 offapi/com/sun/star/drawing/LayerManager.idl                           |    6 
 offapi/com/sun/star/drawing/LayerType.idl                              |   10 
 offapi/com/sun/star/drawing/LineCap.idl                                |    8 
 offapi/com/sun/star/drawing/LineDash.idl                               |   13 
 offapi/com/sun/star/drawing/LineEndType.idl                            |   12 
 offapi/com/sun/star/drawing/LineJoint.idl                              |   12 
 offapi/com/sun/star/drawing/LineStyle.idl                              |    8 
 offapi/com/sun/star/drawing/MasterPage.idl                             |    4 
 offapi/com/sun/star/drawing/MeasureKind.idl                            |    6 
 offapi/com/sun/star/drawing/MeasureTextHorzPos.idl                     |   10 
 offapi/com/sun/star/drawing/MeasureTextVertPos.idl                     |   12 
 offapi/com/sun/star/drawing/MirrorAxis.idl                             |    6 
 offapi/com/sun/star/drawing/NormalsKind.idl                            |    8 
 offapi/com/sun/star/drawing/PageShape.idl                              |    3 
 offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl                |    5 
 offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl                 |    2 
 offapi/com/sun/star/drawing/PolyPolygonShape3D.idl                     |    7 
 offapi/com/sun/star/drawing/PolygonFlags.idl                           |   10 
 offapi/com/sun/star/drawing/PolygonKind.idl                            |   20 
 offapi/com/sun/star/drawing/Position3D.idl                             |    7 
 offapi/com/sun/star/drawing/ProjectionMode.idl                         |    6 
 offapi/com/sun/star/drawing/RectanglePoint.idl                         |   20 
 offapi/com/sun/star/drawing/ShadeMode.idl                              |    8 
 offapi/com/sun/star/drawing/Shapes.idl                                 |    3 
 offapi/com/sun/star/drawing/SnapObjectType.idl                         |    8 
 offapi/com/sun/star/drawing/TextAdjust.idl                             |   12 
 offapi/com/sun/star/drawing/TextAnimationDirection.idl                 |   10 
 offapi/com/sun/star/drawing/TextAnimationKind.idl                      |   12 
 offapi/com/sun/star/drawing/TextFitToSizeType.idl                      |    2 
 offapi/com/sun/star/drawing/TextProperties.idl                         |    2 
 offapi/com/sun/star/drawing/TextVerticalAdjust.idl                     |    6 
 offapi/com/sun/star/drawing/TextureKind.idl                            |    6 
 offapi/com/sun/star/drawing/TextureMode.idl                            |    8 
 offapi/com/sun/star/drawing/TextureProjectionMode.idl                  |    8 
 offapi/com/sun/star/drawing/VerticalDimensioning.idl                   |   10 
 offapi/com/sun/star/drawing/XConnectableShape.idl                      |    4 
 offapi/com/sun/star/drawing/XConnectorShape.idl                        |    8 
 offapi/com/sun/star/drawing/XDrawPageSummarizer.idl                    |    4 
 offapi/com/sun/star/drawing/XDrawPageSupplier.idl                      |    4 
 offapi/com/sun/star/drawing/XShapeAligner.idl                          |    4 
 offapi/com/sun/star/drawing/XShapeArranger.idl                         |   14 
 offapi/com/sun/star/drawing/XShapeGroup.idl                            |    4 
 offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl              |    4 
 offapi/com/sun/star/form/DataSelectionType.idl                         |    2 
 offapi/com/sun/star/form/ErrorEvent.idl                                |    2 
 offapi/com/sun/star/frame/DispatchStatement.idl                        |   11 
 offapi/com/sun/star/frame/DoubleInitializationException.idl            |    2 
 offapi/com/sun/star/frame/IllegalArgumentIOException.idl               |    2 
 offapi/com/sun/star/mozilla/MenuMultipleChange.idl                     |   19 
 offapi/com/sun/star/mozilla/MenuProxy.idl                              |    4 
 offapi/com/sun/star/mozilla/MenuProxyListener.idl                      |    4 
 offapi/com/sun/star/mozilla/MenuSingleChange.idl                       |    7 
 offapi/com/sun/star/mozilla/XCloseSessionListener.idl                  |    4 
 offapi/com/sun/star/mozilla/XMenuProxy.idl                             |    8 
 offapi/com/sun/star/mozilla/XMenuProxyListener.idl                     |    8 
 offapi/com/sun/star/mozilla/XPluginInstance.idl                        |   16 
 offapi/com/sun/star/mozilla/XPluginInstanceNotifySink.idl              |    4 
 offapi/com/sun/star/mozilla/XPluginInstancePeer.idl                    |   14 
 offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl                |    4 
 offapi/com/sun/star/mozilla/XPluginWindowPeer.idl                      |    4 
 offapi/com/sun/star/mozilla/XProfileManager.idl                        |    2 
 offapi/com/sun/star/mozilla/XProxyRunner.idl                           |    3 
 offapi/com/sun/star/packages/EncryptionNotAllowedException.idl         |    2 
 offapi/com/sun/star/packages/NoEncryptionException.idl                 |    2 
 offapi/com/sun/star/packages/NoRawFormatException.idl                  |    2 
 offapi/com/sun/star/packages/WrongPasswordException.idl                |    2 
 offapi/com/sun/star/presentation/AnimationEffect.idl                   |  226 ----------
 offapi/com/sun/star/resource/XLocale.idl                               |   38 -
 offapi/com/sun/star/sheet/DatabaseRange.idl                            |   13 
 offapi/com/sun/star/style/BreakType.idl                                |   16 
 offapi/com/sun/star/style/CaseMap.idl                                  |   12 
 offapi/com/sun/star/style/DropCapFormat.idl                            |    7 
 offapi/com/sun/star/style/GraphicLocation.idl                          |   26 -
 offapi/com/sun/star/style/HorizontalAlignment.idl                      |    8 
 offapi/com/sun/star/style/LineNumberPosition.idl                       |   10 
 offapi/com/sun/star/style/LineSpacing.idl                              |    5 
 offapi/com/sun/star/style/LineSpacingMode.idl                          |   10 
 offapi/com/sun/star/style/NumberingAlignment.idl                       |   10 
 offapi/com/sun/star/style/NumberingLevel.idl                           |   20 
 offapi/com/sun/star/style/NumberingRule.idl                            |    5 
 offapi/com/sun/star/style/ParagraphAdjust.idl                          |   12 
 offapi/com/sun/star/style/ParagraphStyleCategory.idl                   |   14 
 offapi/com/sun/star/style/StyleFamilies.idl                            |    6 
 offapi/com/sun/star/style/StyleFamily.idl                              |    8 
 offapi/com/sun/star/style/TabAlign.idl                                 |   12 
 offapi/com/sun/star/style/TabStop.idl                                  |    9 
 offapi/com/sun/star/style/VerticalAlignment.idl                        |    8 
 offapi/com/sun/star/style/XAutoStyleFamily.idl                         |    2 
 offapi/com/sun/star/style/XAutoStylesSupplier.idl                      |    2 
 offapi/com/sun/star/style/XStyleFamiliesSupplier.idl                   |    4 
 offapi/com/sun/star/style/XStyleLoader.idl                             |    4 
 offapi/com/sun/star/svg/XSVGPrinter.idl                                |    5 
 offapi/com/sun/star/svg/XSVGWriter.idl                                 |    1 
 offapi/com/sun/star/task/ClassifiedInteractionRequest.idl              |    4 
 offapi/com/sun/star/task/InteractionClassification.idl                 |   10 
 offapi/com/sun/star/task/XInteractionApprove.idl                       |    2 
 offapi/com/sun/star/task/XInteractionDisapprove.idl                    |    2 
 offapi/com/sun/star/text/AutoTextContainer.idl                         |    3 
 offapi/com/sun/star/text/AutoTextEntry.idl                             |    5 
 offapi/com/sun/star/text/AutoTextGroup.idl                             |    7 
 offapi/com/sun/star/text/BaseIndex.idl                                 |   42 -
 offapi/com/sun/star/text/Bibliography.idl                              |    3 
 offapi/com/sun/star/text/BibliographyDataField.idl                     |   64 --
 offapi/com/sun/star/text/BibliographyDataType.idl                      |   46 --
 offapi/com/sun/star/text/Bookmark.idl                                  |    5 
 offapi/com/sun/star/text/Bookmarks.idl                                 |    4 
 offapi/com/sun/star/text/ChapterFormat.idl                             |   12 
 offapi/com/sun/star/text/ChapterNumberingRule.idl                      |    5 
 offapi/com/sun/star/text/ContentIndex.idl                              |    1 
 offapi/com/sun/star/text/ContentIndexMark.idl                          |    2 
 offapi/com/sun/star/text/ControlCharacter.idl                          |   12 
 offapi/com/sun/star/text/DependentTextField.idl                        |    5 
 offapi/com/sun/star/text/DocumentIndexLevelFormat.idl                  |    3 
 offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl              |    3 
 offapi/com/sun/star/text/DocumentStatistic.idl                         |   10 
 offapi/com/sun/star/text/FilenameDisplayFormat.idl                     |   10 
 offapi/com/sun/star/text/FootnoteNumbering.idl                         |    8 
 offapi/com/sun/star/text/Footnotes.idl                                 |    4 
 offapi/com/sun/star/text/GraphicCrop.idl                               |    9 
 offapi/com/sun/star/text/HoriOrientation.idl                           |   18 
 offapi/com/sun/star/text/HoriOrientationFormat.idl                     |    9 
 offapi/com/sun/star/text/HorizontalAdjust.idl                          |    8 
 offapi/com/sun/star/text/InvalidTextContentException.idl               |    4 
 offapi/com/sun/star/text/LineNumberingProperties.idl                   |    2 
 offapi/com/sun/star/text/NotePrintMode.idl                             |   10 
 offapi/com/sun/star/text/ObjectIndex.idl                               |    9 
 offapi/com/sun/star/text/PageFootnoteInfo.idl                          |   16 
 offapi/com/sun/star/text/PageNumberType.idl                            |    2 
 offapi/com/sun/star/text/PagePrintSettings.idl                         |   20 
 offapi/com/sun/star/text/Paragraph.idl                                 |   10 
 offapi/com/sun/star/text/ParagraphEnumeration.idl                      |    4 
 offapi/com/sun/star/text/PlaceholderType.idl                           |   12 
 offapi/com/sun/star/text/PrintSettings.idl                             |   28 -
 offapi/com/sun/star/text/RelOrientation.idl                            |   20 
 offapi/com/sun/star/text/SectionFileLink.idl                           |    5 
 offapi/com/sun/star/text/SetVariableType.idl                           |   10 
 offapi/com/sun/star/text/SizeType.idl                                  |    8 
 offapi/com/sun/star/text/TemplateDisplayFormat.idl                     |   14 
 offapi/com/sun/star/text/TextColumn.idl                                |    7 
 offapi/com/sun/star/text/TextColumns.idl                               |    3 
 offapi/com/sun/star/text/TextContentAnchorType.idl                     |   12 
 offapi/com/sun/star/text/TextContentCollection.idl                     |    6 
 offapi/com/sun/star/text/TextCursor.idl                                |   17 
 offapi/com/sun/star/text/TextEmbeddedObject.idl                        |    3 
 offapi/com/sun/star/text/TextFieldMasters.idl                          |    4 
 offapi/com/sun/star/text/TextFields.idl                                |    4 
 offapi/com/sun/star/text/TextFrames.idl                                |    6 
 offapi/com/sun/star/text/TextLayoutCursor.idl                          |    5 
 offapi/com/sun/star/text/TextRanges.idl                                |    3 
 offapi/com/sun/star/text/TextSections.idl                              |    5 
 offapi/com/sun/star/text/TextSortDescriptor.idl                        |   25 -
 offapi/com/sun/star/text/TextTables.idl                                |    5 
 offapi/com/sun/star/text/TextViewCursor.idl                            |    5 
 offapi/com/sun/star/text/UserDataPart.idl                              |   32 -
 offapi/com/sun/star/text/UserFieldFormat.idl                           |    8 
 offapi/com/sun/star/text/VertOrientation.idl                           |   22 
 offapi/com/sun/star/text/VertOrientationFormat.idl                     |    7 
 offapi/com/sun/star/text/ViewSettings.idl                              |   45 -
 offapi/com/sun/star/text/WrapTextMode.idl                              |   14 
 offapi/com/sun/star/text/XAutoTextContainer.idl                        |    6 
 offapi/com/sun/star/text/XAutoTextEntry.idl                            |    4 
 offapi/com/sun/star/text/XAutoTextGroup.idl                            |   10 
 offapi/com/sun/star/text/XBookmarkInsertTool.idl                       |    4 
 offapi/com/sun/star/text/XBookmarksSupplier.idl                        |    4 
 offapi/com/sun/star/text/XChapterNumberingSupplier.idl                 |    4 
 offapi/com/sun/star/text/XDocumentIndex.idl                            |    6 
 offapi/com/sun/star/text/XDocumentIndexMark.idl                        |    6 
 offapi/com/sun/star/text/XDocumentIndexesSupplier.idl                  |    4 
 offapi/com/sun/star/text/XEndnotesSettingsSupplier.idl                 |    4 
 offapi/com/sun/star/text/XEndnotesSupplier.idl                         |    6 
 offapi/com/sun/star/text/XFootnote.idl                                 |    6 
 offapi/com/sun/star/text/XFootnotesSettingsSupplier.idl                |    4 
 offapi/com/sun/star/text/XFootnotesSupplier.idl                        |    6 
 offapi/com/sun/star/text/XPageCursor.idl                               |   18 
 offapi/com/sun/star/text/XPagePrintable.idl                            |    2 
 offapi/com/sun/star/text/XReferenceMarksSupplier.idl                   |    4 
 offapi/com/sun/star/text/XRelativeTextContentInsert.idl                |    6 
 offapi/com/sun/star/text/XRelativeTextContentRemove.idl                |    6 
 offapi/com/sun/star/text/XTextColumns.idl                              |   12 
 offapi/com/sun/star/text/XTextDocument.idl                             |    6 
 offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier.idl              |    4 
 offapi/com/sun/star/text/XTextField.idl                                |    4 
 offapi/com/sun/star/text/XTextFieldsSupplier.idl                       |    6 
 offapi/com/sun/star/text/XTextFrame.idl                                |    4 
 offapi/com/sun/star/text/XTextFramesSupplier.idl                       |    4 
 offapi/com/sun/star/text/XTextGraphicObjectsSupplier.idl               |    4 
 offapi/com/sun/star/text/XTextRange.idl                                |   12 
 offapi/com/sun/star/text/XTextRangeCompare.idl                         |    6 
 offapi/com/sun/star/text/XTextRangeMover.idl                           |    4 
 offapi/com/sun/star/text/XTextSection.idl                              |    6 
 offapi/com/sun/star/text/XTextSectionsSupplier.idl                     |    4 
 offapi/com/sun/star/text/XTextShapesSupplier.idl                       |    4 
 offapi/com/sun/star/text/XTextViewCursor.idl                           |    8 
 offapi/com/sun/star/text/XTextViewCursorSupplier.idl                   |    4 
 offapi/com/sun/star/util/XImportable.idl                               |    6 
 sd/source/filter/eppt/pptx-text.cxx                                    |   17 
 udkapi/com/sun/star/beans/XIntrospection.idl                           |    4 
 udkapi/com/sun/star/bridge/ModelDependent.idl                          |   10 
 udkapi/com/sun/star/connection/XAcceptor.idl                           |    1 
 udkapi/com/sun/star/connection/XConnection.idl                         |    2 
 udkapi/com/sun/star/connection/XConnector.idl                          |    2 
 udkapi/com/sun/star/container/XContentEnumerationAccess.idl            |    2 
 udkapi/com/sun/star/container/XIndexAccess.idl                         |    2 
 udkapi/com/sun/star/io/AlreadyConnectedException.idl                   |    2 
 udkapi/com/sun/star/io/BufferSizeExceededException.idl                 |    2 
 udkapi/com/sun/star/io/ConnectException.idl                            |    2 
 udkapi/com/sun/star/io/DataInputStream.idl                             |    2 
 udkapi/com/sun/star/io/DataOutputStream.idl                            |    2 
 udkapi/com/sun/star/io/DataTransferEvent.idl                           |    4 
 udkapi/com/sun/star/io/IOException.idl                                 |    2 
 udkapi/com/sun/star/io/NoRouteToHostException.idl                      |    2 
 udkapi/com/sun/star/io/NotConnectedException.idl                       |    2 
 udkapi/com/sun/star/io/ObjectInputStream.idl                           |    2 
 udkapi/com/sun/star/io/ObjectOutputStream.idl                          |    2 
 udkapi/com/sun/star/io/Pipe.idl                                        |    2 
 udkapi/com/sun/star/io/Pump.idl                                        |    2 
 udkapi/com/sun/star/io/SequenceInputStream.idl                         |    2 
 udkapi/com/sun/star/io/SocketException.idl                             |    2 
 udkapi/com/sun/star/io/UnexpectedEOFException.idl                      |    2 
 udkapi/com/sun/star/io/UnknownHostException.idl                        |    2 
 udkapi/com/sun/star/io/WrongFormatException.idl                        |    2 
 udkapi/com/sun/star/io/XActiveDataControl.idl                          |   10 
 udkapi/com/sun/star/io/XActiveDataSink.idl                             |    6 
 udkapi/com/sun/star/io/XActiveDataSource.idl                           |    6 
 udkapi/com/sun/star/io/XActiveDataStreamer.idl                         |    6 
 udkapi/com/sun/star/io/XConnectable.idl                                |   10 
 udkapi/com/sun/star/io/XDataExporter.idl                               |    6 
 udkapi/com/sun/star/io/XDataImporter.idl                               |    6 
 udkapi/com/sun/star/io/XDataInputStream.idl                            |   20 
 udkapi/com/sun/star/io/XDataOutputStream.idl                           |   20 
 udkapi/com/sun/star/io/XDataTransferEventListener.idl                  |    6 
 udkapi/com/sun/star/io/XInputStream.idl                                |   12 
 udkapi/com/sun/star/io/XMarkableStream.idl                             |   10 
 udkapi/com/sun/star/io/XOutputStream.idl                               |    8 
 udkapi/com/sun/star/io/XPersist.idl                                    |    6 
 udkapi/com/sun/star/io/XPersistObject.idl                              |    4 
 udkapi/com/sun/star/io/XSeekable.idl                                   |    8 
 udkapi/com/sun/star/io/XStream.idl                                     |    6 
 udkapi/com/sun/star/io/XStreamListener.idl                             |   10 
 udkapi/com/sun/star/java/XJavaThreadRegister_11.idl                    |    8 
 udkapi/com/sun/star/java/XJavaVM.idl                                   |    8 
 udkapi/com/sun/star/lang/ArrayIndexOutOfBoundsException.idl            |    2 
 udkapi/com/sun/star/lang/ClassNotFoundException.idl                    |    2 
 udkapi/com/sun/star/lang/DisposedException.idl                         |    2 
 udkapi/com/sun/star/lang/EventObject.idl                               |    3 
 udkapi/com/sun/star/lang/IllegalAccessException.idl                    |    2 
 udkapi/com/sun/star/lang/IndexOutOfBoundsException.idl                 |    2 
 udkapi/com/sun/star/lang/InvalidListenerException.idl                  |    2 
 udkapi/com/sun/star/lang/ListenerExistException.idl                    |    2 
 udkapi/com/sun/star/lang/Locale.idl                                    |    7 
 udkapi/com/sun/star/lang/NoSuchFieldException.idl                      |    2 
 udkapi/com/sun/star/lang/NoSuchMethodException.idl                     |    2 
 udkapi/com/sun/star/lang/NullPointerException.idl                      |    2 
 udkapi/com/sun/star/lang/ServiceNotRegisteredException.idl             |    2 
 udkapi/com/sun/star/lang/SystemDependent.idl                           |   18 
 udkapi/com/sun/star/lang/WrappedTargetException.idl                    |    4 
 udkapi/com/sun/star/lang/XComponent.idl                                |    8 
 udkapi/com/sun/star/lang/XConnectionPoint.idl                          |   12 
 udkapi/com/sun/star/lang/XConnectionPointContainer.idl                 |   10 
 udkapi/com/sun/star/lang/XEventListener.idl                            |    4 
 udkapi/com/sun/star/lang/XInitialization.idl                           |    4 
 udkapi/com/sun/star/lang/XLocalizable.idl                              |    6 
 udkapi/com/sun/star/lang/XServiceName.idl                              |    4 
 udkapi/com/sun/star/registry/CannotRegisterImplementationException.idl |    2 
 udkapi/com/sun/star/registry/DefaultRegistry.idl                       |    3 
 udkapi/com/sun/star/registry/ImplementationRegistration.idl            |    2 
 udkapi/com/sun/star/registry/InvalidRegistryException.idl              |    2 
 udkapi/com/sun/star/registry/InvalidValueException.idl                 |    2 
 udkapi/com/sun/star/registry/MergeConflictException.idl                |    2 
 udkapi/com/sun/star/registry/NestedRegistry.idl                        |    5 
 udkapi/com/sun/star/registry/RegistryKeyType.idl                       |    6 
 udkapi/com/sun/star/registry/RegistryValueType.idl                     |   18 
 udkapi/com/sun/star/registry/SimpleRegistry.idl                        |    2 
 udkapi/com/sun/star/registry/XImplementationRegistration.idl           |   10 
 udkapi/com/sun/star/script/Engine.idl                                  |    2 
 udkapi/com/sun/star/script/XDebugging.idl                              |    2 
 udkapi/com/sun/star/task/XInteractionAbort.idl                         |    2 
 udkapi/com/sun/star/task/XInteractionContinuation.idl                  |    2 
 udkapi/com/sun/star/task/XInteractionHandler.idl                       |    4 
 udkapi/com/sun/star/task/XInteractionRequest.idl                       |    4 
 udkapi/com/sun/star/task/XInteractionRetry.idl                         |    2 
 udkapi/com/sun/star/uno/Exception.idl                                  |    2 
 udkapi/com/sun/star/uno/XAdapter.idl                                   |    6 
 udkapi/com/sun/star/uno/XInterface.idl                                 |    4 
 udkapi/com/sun/star/uno/XReference.idl                                 |    4 
 udkapi/com/sun/star/uno/XWeak.idl                                      |    4 
 309 files changed, 2 insertions(+), 2565 deletions(-)

New commits:
commit 7bd108e7586bab6f1ae50b0a2ce9715d8df0fd49
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Mar 13 10:54:39 2013 +0200

    Revert "WaE: enumeration value not handled in switch"
    
    I think the intent is to handle all the other values in that case, so just use
    a "default:" case then, instead of trying (and failing) to list all other enum
    values.
    
    This reverts commit 0451325ae7456da5812564428d73b0226606450f.
    
    Change-Id: Idda7f24c901364394be1859f2cd6598803799423

diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index 534a31b..0d0cf17 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -878,7 +878,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1
                 PortionObj* pPortion = front();
                 CalculateGraphicBulletSize( ( pPortion ) ? pPortion->mnCharHeight : 24 );
 
-                switch( nNumberingType )
+                switch( (SvxExtNumType)nNumberingType )
                 {
                     case SVX_NUM_NUMBER_NONE : nParaFlags |= 0xf; break;
 
@@ -896,20 +896,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1
                             nParaFlags |= 0x90; // we define the font and charset
                         }
                     }
-                    case SVX_NUM_CHARS_UPPER_LETTER :       // count from a-z, aa - az, ba - bz, ...
-                    case SVX_NUM_CHARS_LOWER_LETTER :
-                    case SVX_NUM_ROMAN_UPPER :
-                    case SVX_NUM_ROMAN_LOWER :
-                    case SVX_NUM_ARABIC :
-                    case SVX_NUM_PAGEDESC :                 // numbering from the page template
-                    case SVX_NUM_BITMAP :
-                    case SVX_NUM_CHARS_UPPER_LETTER_N :     // count from a-z, aa-zz, aaa-zzz
-                    case SVX_NUM_CHARS_LOWER_LETTER_N :
-                    case SVX_NUM_NUMBER_UPPER_ZH:
-                    case SVX_NUM_CIRCLE_NUMBER:
-                    case SVX_NUM_NUMBER_UPPER_ZH_TW:
-                    case SVX_NUM_NUMBER_LOWER_ZH:
-                    case SVX_NUM_FULL_WIDTH_ARABIC:
+                    default:
                     {
                         if ( nNumberingType != SVX_NUM_CHAR_SPECIAL )
                         {
commit d1449a9b990bf054adeb66c2bab871ce396cca18
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Mar 13 10:32:24 2013 +0200

    Bin pointless "DocMerge" comment lines
    
    Change-Id: I8eb2116b39929770f00e30d5ab9ca2c28c988e35

diff --git a/offapi/com/sun/star/drawing/Alignment.idl b/offapi/com/sun/star/drawing/Alignment.idl
index 8d74dd0..20b38ed 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 4234c42..131d632 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 d4564a2..b06b435 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 8495366..a640a05 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 53a40a1..df688b6 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 1a066c3..7d04ea7 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 35a2108..1d4d704 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 06f89ad..8b82175 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 c348340..6c5b573 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 4aa0042..bba8b71 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 78442ac..ede7696 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 de32403..7e0ed15 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 3344ff7..ffe03da 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 3e3c5ee..dab995e 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 67d75c3..7f1d486 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 99d4a94..2bada96 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 eb57c14..b274880 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 26aea22..b5eab61 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 b2bfbae..62a2403 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 3a1cb26..082c638 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 be1bf11..783f347 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 235be8e..4a01570 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 c4d60a5..8d7d0b3 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 a83d6f8..d582410 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 94c5baf..1d3ff0a 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 fda6e7a..b5dd5e7 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 750820f..1633895 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 0b40541..bd51467 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 b7c1993..f51f1b9 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 f0929a6..260981a 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 0a6908c..8f92600 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 82cb589..96b8426 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 c661ef3..0c8c643 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 b0d52b8..416747d 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 7aa492c..6faf02d 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 1fa7750..0d87a9e 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 845a8ee..15b6db1 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 951a1e7..6ab6bad 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 ea5a509..eccb587 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 2ef29b1..bee4170 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 b1ccf8a..a5c41d2 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 784e14b..485aafe 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 be000dd..91866d5 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 718bd80..572ca39 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 6aba58d..1e818ac 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 9bda567..50fc0b1 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 f65849f..0f6e7c6 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 eb38dbf..9bf98db 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 7520fa4..bb13ae4 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 dda9d94..267cf99 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 df33e20..12f10a44 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 9df4933..3e285f7 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 6aab0e3..ddde398 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 8ee5abd..d799472 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 7fa8ec3..26df3dd 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 5a0badd..1aa72de 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 ecc0b3c..41328e1 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 16f73a5..1ec5314 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 b5fc4b0..52db01c 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 3b5e716..299634b 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 f6f2b8d..3bb7327 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 4ed0e6c..f20bd9c 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 47945eb..9764269 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 c0615e1..742a0b8 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 45d8323..a3165d5 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 6f15aeb..8969c41 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 d5505af..ab8acb9 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 5f8630b..757591e 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 2465a60..28a33cf 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 935397d..52fbd8e 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 8e0626d..a943fb3 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 9ad4290..b27a05a 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 bcb71a6..106a999 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 79c76dd..185d56d 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 d664fed..aeca14f 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 dee9330..3747b82 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 7492756..999e010 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 68ca230..911d63a 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 87eaf3f..40730a6 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 fea102d..085da05 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 f2006d6..66e14e1 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 6d7146e..65ecbb2 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 6f1e54a..de9c21b 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 611e491..fc5a8ad 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 66d4cc0..d3974e1 100644
--- a/offapi/com/sun/star/mozilla/XProxyRunner.idl
+++ b/offapi/com/sun/star/mozilla/XProxyRunner.idl
@@ -27,7 +27,6 @@
 
 
 published interface XCodeProxy;

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list