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/beans | |
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/beans')
-rw-r--r-- | udkapi/com/sun/star/beans/Ambiguous.idl | 2 | ||||
-rw-r--r-- | udkapi/com/sun/star/beans/Defaulted.idl | 2 | ||||
-rw-r--r-- | udkapi/com/sun/star/beans/Optional.idl | 2 | ||||
-rw-r--r-- | udkapi/com/sun/star/beans/Pair.idl | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/udkapi/com/sun/star/beans/Ambiguous.idl b/udkapi/com/sun/star/beans/Ambiguous.idl index 919c7250f462..ec443e7cb5d5 100644 --- a/udkapi/com/sun/star/beans/Ambiguous.idl +++ b/udkapi/com/sun/star/beans/Ambiguous.idl @@ -37,7 +37,7 @@ module com { module sun { module star { module beans { have the <const scope="com::sun::star::beans">PropertyAttribute::MAYBEAMBIGUOUS</const>.</p> */ -struct Ambiguous<T> { +published struct Ambiguous<T> { /** The underlying value of this structure instance. diff --git a/udkapi/com/sun/star/beans/Defaulted.idl b/udkapi/com/sun/star/beans/Defaulted.idl index d67f1aacf055..7b0b09318611 100644 --- a/udkapi/com/sun/star/beans/Defaulted.idl +++ b/udkapi/com/sun/star/beans/Defaulted.idl @@ -37,7 +37,7 @@ module com { module sun { module star { module beans { have the <const scope="com::sun::star::beans">PropertyAttribute::MAYBEDEFAULT</const>.</p> */ -struct Defaulted<T> { +published struct Defaulted<T> { /** The underlying value of this structure instance. diff --git a/udkapi/com/sun/star/beans/Optional.idl b/udkapi/com/sun/star/beans/Optional.idl index fbf58b667c16..a2786e5190c1 100644 --- a/udkapi/com/sun/star/beans/Optional.idl +++ b/udkapi/com/sun/star/beans/Optional.idl @@ -39,7 +39,7 @@ module com { module sun { module star { module beans { also be useful in other situations, for example as the return type of an interface method.</p> */ -struct Optional<T> { +published struct Optional<T> { /** Marks this structure instance as having an actual value. */ diff --git a/udkapi/com/sun/star/beans/Pair.idl b/udkapi/com/sun/star/beans/Pair.idl index 0bb214fb87bb..4089300a5a44 100644 --- a/udkapi/com/sun/star/beans/Pair.idl +++ b/udkapi/com/sun/star/beans/Pair.idl @@ -40,7 +40,7 @@ module com { module sun { module star { module beans { @since OOo 3.0 */ -struct Pair<T, U> { +published struct Pair<T, U> { /// first object. T First; |