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 /udkapi/com/sun/star/io | |
| parent | 83e8a2bbe468b5439cc8e59cc04abf001677a8e6 (diff) | |
| parent | 013fa416d39f1c219722e6736b7234f944fe774f (diff) | |
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 'udkapi/com/sun/star/io')
| -rw-r--r-- | udkapi/com/sun/star/io/TempFile.idl | 2 | ||||
| -rw-r--r-- | udkapi/com/sun/star/io/XTempFile.idl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/udkapi/com/sun/star/io/TempFile.idl b/udkapi/com/sun/star/io/TempFile.idl index b00bb5099e70..06b77e2b5c20 100644 --- a/udkapi/com/sun/star/io/TempFile.idl +++ b/udkapi/com/sun/star/io/TempFile.idl @@ -36,7 +36,7 @@ module com { module sun { module star { module io { //======================================================================== /** This service allows to get access to temp files. */ -service TempFile : XTempFile; +published service TempFile : XTempFile; //========================================================================= diff --git a/udkapi/com/sun/star/io/XTempFile.idl b/udkapi/com/sun/star/io/XTempFile.idl index b1e8f158944f..bda47cffa887 100644 --- a/udkapi/com/sun/star/io/XTempFile.idl +++ b/udkapi/com/sun/star/io/XTempFile.idl @@ -38,7 +38,7 @@ module com { module sun { module star { module io { //======================================================================== /** This interface offers access to temp files. */ -interface XTempFile +published interface XTempFile { // INTERFACES // |