diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:10:13 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:10:13 +0200 |
| commit | bef8909ce175f728d43501cfec4368eebd69cabf (patch) | |
| tree | f5ea9873e1af554d82c351acdf85619c17f01de7 /offapi/com/sun/star/task | |
| parent | Version 3.3.99.2, tag libreoffice-3.3.99.2 (3.4.0-beta2) (diff) | |
| parent | CWS-TOOLING: integrate CWS solaris11 (diff) | |
| download | core-bef8909ce175f728d43501cfec4368eebd69cabf.tar.gz core-bef8909ce175f728d43501cfec4368eebd69cabf.zip | |
Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
Conflicts:
offapi/com/sun/star/animations/XAnimationNode.idl
offapi/com/sun/star/awt/grid/XGridColumn.idl
offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
offapi/com/sun/star/frame/ModuleManager.idl
offapi/com/sun/star/frame/XLayoutManager.idl
offapi/com/sun/star/frame/XLayoutManagerListener.idl
offapi/com/sun/star/rendering/FontInfo.idl
offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl
offapi/com/sun/star/rendering/XCanvas.idl
offapi/com/sun/star/rendering/XSprite.idl
offapi/com/sun/star/report/ForceNewPage.idl
offapi/com/sun/star/report/ReportPrintOption.idl
offapi/com/sun/star/report/XFunctionsSupplier.idl
offapi/com/sun/star/report/XReportControlFormat.idl
offapi/com/sun/star/resource/StringResourceWithLocation.idl
offapi/com/sun/star/resource/XStringResourceResolver.idl
offapi/com/sun/star/resource/XStringResourceWithLocation.idl
offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
offapi/com/sun/star/security/XCertificateContainer.idl
offapi/com/sun/star/ui/UIElementFactory.idl
offapi/com/sun/star/ui/XImageManager.idl
offapi/com/sun/star/ui/XUIConfigurationManager.idl
offapi/com/sun/star/ui/XUIElementFactory.idl
offapi/com/sun/star/ui/XUIElementSettings.idl
offapi/com/sun/star/xml/crypto/SEInitializer.idl
offapi/com/sun/star/xml/crypto/XSEInitializer.idl
offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
sal/rtl/source/alloc_arena.c
udkapi/com/sun/star/task/XInteractionHandler2.idl
Diffstat (limited to 'offapi/com/sun/star/task')
| -rw-r--r-- | offapi/com/sun/star/task/ErrorCodeIOException.idl | 2 | ||||
| -rw-r--r-- | offapi/com/sun/star/task/XUrlContainer.idl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/offapi/com/sun/star/task/ErrorCodeIOException.idl b/offapi/com/sun/star/task/ErrorCodeIOException.idl index 93b8aaa67d1a..9600483fcf32 100644 --- a/offapi/com/sun/star/task/ErrorCodeIOException.idl +++ b/offapi/com/sun/star/task/ErrorCodeIOException.idl @@ -40,7 +40,7 @@ /** IOException that can carry error codes ( not only io related ). It can be used to transport the error code information. */ -exception ErrorCodeIOException : com::sun::star::io::IOException +published exception ErrorCodeIOException : com::sun::star::io::IOException { //------------------------------------------------------------------------ /** specifies the error code. diff --git a/offapi/com/sun/star/task/XUrlContainer.idl b/offapi/com/sun/star/task/XUrlContainer.idl index 84b926569dac..6e0f93d4ecd1 100644 --- a/offapi/com/sun/star/task/XUrlContainer.idl +++ b/offapi/com/sun/star/task/XUrlContainer.idl @@ -46,7 +46,7 @@ module com { module sun { module star { module task { @since OOo 3.2 */ -/*published*/ interface XUrlContainer : com::sun::star::uno::XInterface +published interface XUrlContainer : com::sun::star::uno::XInterface { //------------------------------------------------------------------------- /** Add a URL to the container. |