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/animations | |
| 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 'offapi/com/sun/star/animations')
| -rw-r--r-- | offapi/com/sun/star/animations/XAnimationListener.idl | 2 | ||||
| -rw-r--r-- | offapi/com/sun/star/animations/XAnimationNode.idl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/offapi/com/sun/star/animations/XAnimationListener.idl b/offapi/com/sun/star/animations/XAnimationListener.idl index d1f4f453ee60..c0582d229f8f 100644 --- a/offapi/com/sun/star/animations/XAnimationListener.idl +++ b/offapi/com/sun/star/animations/XAnimationListener.idl @@ -45,7 +45,7 @@ @since OOo 3.0 */ -interface XAnimationListener : ::com::sun::star::lang::XEventListener +published interface XAnimationListener : ::com::sun::star::lang::XEventListener { /** This event is raised when the element local timeline begins to play. <p>It will be raised each time the element begins the active duration (i.e. when it restarts, but not when it repeats).</p> diff --git a/offapi/com/sun/star/animations/XAnimationNode.idl b/offapi/com/sun/star/animations/XAnimationNode.idl index f2d5d859ce5f..d5d5a8e4c271 100644 --- a/offapi/com/sun/star/animations/XAnimationNode.idl +++ b/offapi/com/sun/star/animations/XAnimationNode.idl @@ -43,7 +43,7 @@ /** */ -interface XAnimationNode : ::com::sun::star::container::XChild +published interface XAnimationNode : ::com::sun::star::container::XChild { /** a value from <const>AnimationNodeType</const>. |