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/deployment | |
| 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/deployment')
3 files changed, 3 insertions, 3 deletions
diff --git a/offapi/com/sun/star/deployment/DeploymentException.idl b/offapi/com/sun/star/deployment/DeploymentException.idl index fd40cf0e8aec..2b82c4621068 100644 --- a/offapi/com/sun/star/deployment/DeploymentException.idl +++ b/offapi/com/sun/star/deployment/DeploymentException.idl @@ -37,7 +37,7 @@ module com { module sun { module star { module deployment { @since OOo 2.0 */ -exception DeploymentException : com::sun::star::uno::Exception +published exception DeploymentException : com::sun::star::uno::Exception { /** reflects the cause of the error. Commonly an exception. */ diff --git a/offapi/com/sun/star/deployment/PackageInformationProvider.idl b/offapi/com/sun/star/deployment/PackageInformationProvider.idl index ae1731365e32..8f86fd4e1507 100644 --- a/offapi/com/sun/star/deployment/PackageInformationProvider.idl +++ b/offapi/com/sun/star/deployment/PackageInformationProvider.idl @@ -36,7 +36,7 @@ module com { module sun { module star { module deployment { @since OOo 2.3 */ -singleton PackageInformationProvider : XPackageInformationProvider; +published singleton PackageInformationProvider : XPackageInformationProvider; }; }; }; }; #endif diff --git a/offapi/com/sun/star/deployment/XPackageInformationProvider.idl b/offapi/com/sun/star/deployment/XPackageInformationProvider.idl index 46d304d691f8..8885fd1ccee2 100644 --- a/offapi/com/sun/star/deployment/XPackageInformationProvider.idl +++ b/offapi/com/sun/star/deployment/XPackageInformationProvider.idl @@ -38,7 +38,7 @@ module com { module sun { module star { module deployment { @since OOo 2.3 */ -interface XPackageInformationProvider +published interface XPackageInformationProvider { /** get Package information for a specific extension. |