Commit Graph

11 Commits

Author SHA1 Message Date
c73745117d re-base on ALv2 code. Includes:
linecap: Reintegrating finished LineCap feature
    Work contributed by Regina Henschel
    http://svn.apache.org/viewvc?view=revision&revision=1232507

    i118815 - Deprecate service due to removed implementation
    Patch contributed by Ariel Constenla-Haile
    http://svn.apache.org/viewvc?view=revision&revision=1233320

    i118814 - Allow set timeout in Mail API
    Patch contributed by Ariel Constenla-Haile
    http://svn.apache.org/viewvc?view=revision&revision=1235679

    included in the Apache baseline:
    dr80: #i117511# remove some assertions in xlsx/xlsb import filters
    Patch contributed by Daniel Rentz
2012-09-27 11:35:06 +01:00
78cca63070 Revert publishing of lots of UNO types.
See issue i#117329

This reverts commit fb2b2be1bf566b5ef4d308332dbbdfe7012f6f1c.
This reverts commit 0b494e0cb9eb6652d00397fb6ca8d9b6709e4cb5.
This reverts commit 3e396922c2926165d680e8051c3d9247ea4aaf78.
This reverts commit 0461d179dddc2caab6315e6f7ec7bb3804dd017a.
This reverts commit 0f79c68194206864c993cd0fb01a485d2db2664f.
This reverts commit 65162840e329afee6f401f5a91273c2dbd1bbdf8.

Conflicts:
	offapi/com/sun/star/drawing/XSlidePreviewCache.idl
	offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
	offapi/com/sun/star/rendering/FontInfo.idl
	offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl
	offapi/com/sun/star/rendering/XColorSpace.idl
	offapi/com/sun/star/report/XFixedLine.idl
	offapi/com/sun/star/report/XFixedText.idl
	offapi/com/sun/star/report/XFormattedField.idl
	offapi/com/sun/star/report/XFunctionsSupplier.idl
	offapi/com/sun/star/report/XImageControl.idl
	offapi/com/sun/star/report/XReportControlFormat.idl
	offapi/com/sun/star/report/XReportDefinition.idl
	offapi/com/sun/star/xml/crypto/SEInitializer.idl
2012-01-26 22:11:48 +01:00
91894d52b6 add mode-lines to .idl files 2012-01-05 09:18:17 +00:00
4430b3f234 Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
	offapi/com/sun/star/awt/XCallback.idl
	offapi/com/sun/star/awt/XContainerWindowEventHandler.idl
	offapi/com/sun/star/awt/XContainerWindowProvider.idl
	offapi/com/sun/star/awt/XDialogEventHandler.idl
	offapi/com/sun/star/awt/XDialogProvider.idl
	offapi/com/sun/star/awt/XRequestCallback.idl
	offapi/com/sun/star/awt/XUnitConversion.idl
	offapi/com/sun/star/awt/grid/GridColumnEvent.idl
	offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl
	offapi/com/sun/star/awt/tree/ExpandVetoException.idl
	offapi/com/sun/star/awt/tree/TreeDataModelEvent.idl
	offapi/com/sun/star/awt/tree/TreeExpansionEvent.idl
	offapi/com/sun/star/awt/tree/XMutableTreeDataModel.idl
	offapi/com/sun/star/awt/tree/XMutableTreeNode.idl
	offapi/com/sun/star/awt/tree/XTreeControl.idl
	offapi/com/sun/star/awt/tree/XTreeDataModel.idl
	offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
	offapi/com/sun/star/awt/tree/XTreeEditListener.idl
	offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl
	offapi/com/sun/star/awt/tree/XTreeNode.idl
	offapi/com/sun/star/document/DocumentEvent.idl
	offapi/com/sun/star/document/XDocumentEventListener.idl
	offapi/com/sun/star/frame/XLayoutManagerListener.idl
	offapi/com/sun/star/geometry/XMapping2D.idl
	offapi/com/sun/star/inspection/XObjectInspectorUI.idl
	offapi/com/sun/star/inspection/XPropertyControl.idl
	offapi/com/sun/star/inspection/XPropertyControlFactory.idl
	offapi/com/sun/star/inspection/XPropertyControlObserver.idl
	offapi/com/sun/star/inspection/XPropertyHandler.idl
	offapi/com/sun/star/inspection/XStringRepresentation.idl
	offapi/com/sun/star/logging/LogRecord.idl
	offapi/com/sun/star/logging/XLogFormatter.idl
	offapi/com/sun/star/logging/XLogHandler.idl
	offapi/com/sun/star/logging/XLogger.idl
	offapi/com/sun/star/presentation/XSlideShowListener.idl
	offapi/com/sun/star/presentation/XSlideShowView.idl
	offapi/com/sun/star/rendering/FontInfo.idl
	offapi/com/sun/star/rendering/StrokeAttributes.idl
	offapi/com/sun/star/rendering/VolatileContentDestroyedException.idl
	offapi/com/sun/star/rendering/XAnimatedSprite.idl
	offapi/com/sun/star/rendering/XAnimation.idl
	offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl
	offapi/com/sun/star/rendering/XBitmapCanvas.idl
	offapi/com/sun/star/rendering/XBufferController.idl
	offapi/com/sun/star/rendering/XCachedPrimitive.idl
	offapi/com/sun/star/rendering/XCanvas.idl
	offapi/com/sun/star/rendering/XCanvasFont.idl
	offapi/com/sun/star/rendering/XColorSpace.idl
	offapi/com/sun/star/rendering/XCustomSprite.idl
	offapi/com/sun/star/rendering/XGraphicDevice.idl
	offapi/com/sun/star/rendering/XLinePolyPolygon2D.idl
	offapi/com/sun/star/rendering/XParametricPolyPolygon2D.idl
	offapi/com/sun/star/rendering/XPolyPolygon2D.idl
	offapi/com/sun/star/rendering/XSprite.idl
	offapi/com/sun/star/rendering/XSpriteCanvas.idl
	offapi/com/sun/star/rendering/XTextLayout.idl
	offapi/com/sun/star/report/XFixedLine.idl
	offapi/com/sun/star/report/XFixedText.idl
	offapi/com/sun/star/report/XFormatCondition.idl
	offapi/com/sun/star/report/XFormattedField.idl
	offapi/com/sun/star/report/XFunction.idl
	offapi/com/sun/star/report/XFunctions.idl
	offapi/com/sun/star/report/XFunctionsSupplier.idl
	offapi/com/sun/star/report/XGroup.idl
	offapi/com/sun/star/report/XGroups.idl
	offapi/com/sun/star/report/XImageControl.idl
	offapi/com/sun/star/report/XReportComponent.idl
	offapi/com/sun/star/report/XReportControlModel.idl
	offapi/com/sun/star/report/XReportDefinition.idl
	offapi/com/sun/star/report/XSection.idl
	offapi/com/sun/star/report/XShape.idl
	offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl
	offapi/com/sun/star/resource/XStringResourceResolver.idl
	offapi/com/sun/star/resource/XStringResourceWithLocation.idl
	offapi/com/sun/star/sdb/XDocumentDataSource.idl
	offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
	offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
	offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
	offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
	offapi/com/sun/star/sdb/tools/XConnectionTools.idl
	offapi/com/sun/star/security/SecurityInfrastructureException.idl
	offapi/com/sun/star/ui/XUIConfigurationManager.idl
	offapi/com/sun/star/ui/XUIElement.idl
	offapi/com/sun/star/ui/XUIElementSettings.idl
	offapi/com/sun/star/util/XModifiable2.idl
	offapi/com/sun/star/view/XMultiSelectionSupplier.idl
	offapi/com/sun/star/xml/crypto/SEInitializer.idl
	offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
2011-05-27 20:47:59 +02:00
45e7a5b78c Strip include guards in idl files 2011-04-02 00:08:53 +02:00
3e396922c2 #i117329# - Publishing of UNO types, 4th wave. 2011-03-18 15:55:57 +01:00
7c80db2eb3 changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00
eb5d0996e4 INTEGRATION: CWS canvas05 (1.3.386); FILE MERGED
2008/04/21 07:37:09 thb 1.3.386.2: RESYNC: (1.3-1.4); FILE MERGED
2007/10/01 13:33:54 thb 1.3.386.1: #i79437# Merge from CWS picom
2008-06-24 10:30:20 +00:00
119b6ba0a1 INTEGRATION: CWS changefileheader (1.3.500); FILE MERGED
2008/03/31 16:02:43 rt 1.3.500.1: #i87441# Change license header to LPGL v3.
2008-04-11 00:50:09 +00:00
917fe411b4 INTEGRATION: CWS ooo19126 (1.2.56); FILE MERGED
2005/09/05 12:25:10 rt 1.2.56.1: #i54170# Change license header: remove SISSL
2005-09-08 02:02:00 +00:00
f9767eb655 INTEGRATION: CWS presfixes01 (1.1.2); FILE ADDED
2005/02/16 11:27:26 fs 1.1.2.1: moved from drafts.css.rendering to css.rendering
2005-03-10 11:36:04 +00:00