aw080 resync to trunk, win build working, no checks yet

48 files changed, 61 insertions, 108 deletions

diff --git a/offapi/com/sun/star/ui/ConfigurableUIElement.idl b/offapi/com/sun/star/ui/ConfigurableUIElement.idl
index 2461cc02fa3f..2e72ddcc9e13 100644
--- a/offapi/com/sun/star/ui/ConfigurableUIElement.idl
+++ b/offapi/com/sun/star/ui/ConfigurableUIElement.idl
@@ -70,7 +70,7 @@ module com { module sun { module star { module ui {
     </ul>
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 service ConfigurableUIElement
diff --git a/offapi/com/sun/star/ui/ConfigurationEvent.idl b/offapi/com/sun/star/ui/ConfigurationEvent.idl
index 94093c9df8d3..4204acad806f 100644
--- a/offapi/com/sun/star/ui/ConfigurationEvent.idl
+++ b/offapi/com/sun/star/ui/ConfigurationEvent.idl
@@ -33,7 +33,7 @@ module com { module sun { module star { module ui {
 /** this event is broadcasted by a configuration manager whenever the state of
     user interface element has changed.
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 published struct ConfigurationEvent : ::com::sun::star::container::ContainerEvent
diff --git a/offapi/com/sun/star/ui/DockingArea.idl b/offapi/com/sun/star/ui/DockingArea.idl
index e5ea894081c0..b2804609b00c 100644
--- a/offapi/com/sun/star/ui/DockingArea.idl
+++ b/offapi/com/sun/star/ui/DockingArea.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module ui {
     @see com::sun::star::frame::XLayoutManager
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 published enum DockingArea
diff --git a/offapi/com/sun/star/ui/GlobalAcceleratorConfiguration.idl b/offapi/com/sun/star/ui/GlobalAcceleratorConfiguration.idl
index a38c3a62e1b1..011f8001feab 100644
--- a/offapi/com/sun/star/ui/GlobalAcceleratorConfiguration.idl
+++ b/offapi/com/sun/star/ui/GlobalAcceleratorConfiguration.idl
@@ -36,7 +36,7 @@ module com {  module sun {  module star {  module ui {
     by using an UNO service manager. It provides then access to
     the global accelerator configuration.</p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 service GlobalAcceleratorConfiguration : XAcceleratorConfiguration
 {};
diff --git a/offapi/com/sun/star/ui/ImageType.idl b/offapi/com/sun/star/ui/ImageType.idl
index 0305a3be6e2f..822db6e13e21 100644
--- a/offapi/com/sun/star/ui/ImageType.idl
+++ b/offapi/com/sun/star/ui/ImageType.idl
@@ -32,7 +32,7 @@ module com {  module sun {  module star {  module ui {
     the current image set of an image manager.
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 constants ImageType
 {
diff --git a/offapi/com/sun/star/ui/ItemDescriptor.idl b/offapi/com/sun/star/ui/ItemDescriptor.idl
index eb62f2dcff8b..a0bfe25771dd 100644
--- a/offapi/com/sun/star/ui/ItemDescriptor.idl
+++ b/offapi/com/sun/star/ui/ItemDescriptor.idl
@@ -45,7 +45,7 @@ module com {  module sun {  module star {  module ui {
        You could have a menu or a toolbox working with the same item descriptor.
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 service ItemDescriptor
 {
diff --git a/offapi/com/sun/star/ui/ItemStyle.idl b/offapi/com/sun/star/ui/ItemStyle.idl
index b0d768b10c5d..ad6bd9e9f662 100644
--- a/offapi/com/sun/star/ui/ItemStyle.idl
+++ b/offapi/com/sun/star/ui/ItemStyle.idl
@@ -52,7 +52,7 @@ module com {  module sun {  module star {  module ui {
     </ul>
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 constants ItemStyle
 {
diff --git a/offapi/com/sun/star/ui/ItemType.idl b/offapi/com/sun/star/ui/ItemType.idl
index fd5ab332db2d..c92def5700c6 100644
--- a/offapi/com/sun/star/ui/ItemType.idl
+++ b/offapi/com/sun/star/ui/ItemType.idl
@@ -27,7 +27,7 @@ module com {  module sun {  module star {  module ui {
 
 /** Determins the type of an item.
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 constants ItemType
 {
diff --git a/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl b/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl
index 8ba9945478e8..e90dbc30e1d4 100644
--- a/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl
+++ b/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl
@@ -44,7 +44,7 @@ module com { module sun { module star { module ui {
     or Calc.
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 service ModuleUICategoryDescription
diff --git a/offapi/com/sun/star/ui/ModuleUICommandDescription.idl b/offapi/com/sun/star/ui/ModuleUICommandDescription.idl
index c71381972d88..15dffdc2d03b 100644
--- a/offapi/com/sun/star/ui/ModuleUICommandDescription.idl
+++ b/offapi/com/sun/star/ui/ModuleUICommandDescription.idl
@@ -43,7 +43,7 @@ module com { module sun { module star { module ui {
     that are part of a single OpenOffice.org module, like Writer or Calc.
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 service ModuleUICommandDescription
diff --git a/offapi/com/sun/star/ui/ModuleUIConfigurationManager.idl b/offapi/com/sun/star/ui/ModuleUIConfigurationManager.idl
index 7214ece6453a..903765dff20d 100644
--- a/offapi/com/sun/star/ui/ModuleUIConfigurationManager.idl
+++ b/offapi/com/sun/star/ui/ModuleUIConfigurationManager.idl
@@ -59,7 +59,7 @@ module com { module sun { module star { module ui {
     this layer.</br>
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 service ModuleUIConfigurationManager
diff --git a/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl b/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl
index 5232bb49d228..930133489607 100644
--- a/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl
+++ b/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl
@@ -36,7 +36,7 @@ module com { module sun { module star { module ui {
 /** specifies a central user interface configuration provider which gives
     access to module based user interface configuration managers.
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 published service ModuleUIConfigurationManagerSupplier
diff --git a/offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl b/offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl
index 67a883087039..c9d899668a60 100644
--- a/offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl
+++ b/offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl
@@ -45,7 +45,7 @@ module com { module sun { module star { module ui {
     Calc.
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 service ModuleWindowStateConfiguration
diff --git a/offapi/com/sun/star/ui/UICategoryDescription.idl b/offapi/com/sun/star/ui/UICategoryDescription.idl
index 06747c3ad6a3..8a765590cebc 100644
--- a/offapi/com/sun/star/ui/UICategoryDescription.idl
+++ b/offapi/com/sun/star/ui/UICategoryDescription.idl
@@ -42,7 +42,7 @@ module com {  module sun {  module star {  module ui {
     implementations which provides all commands to a user.
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ui/UICommandDescription.idl b/offapi/com/sun/star/ui/UICommandDescription.idl
index a902bb811535..aa5b62e10f39 100644
--- a/offapi/com/sun/star/ui/UICommandDescription.idl
+++ b/offapi/com/sun/star/ui/UICommandDescription.idl
@@ -42,7 +42,7 @@ module com { module sun { module star { module ui {
     are part of OpenOffice.org modules, like Writer or Calc.
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 service UICommandDescription
diff --git a/offapi/com/sun/star/ui/UIConfigurationManager.idl b/offapi/com/sun/star/ui/UIConfigurationManager.idl
index 70f88658c13b..cd326eec46a1 100644
--- a/offapi/com/sun/star/ui/UIConfigurationManager.idl
+++ b/offapi/com/sun/star/ui/UIConfigurationManager.idl
@@ -48,7 +48,7 @@ module com { module sun { module star { module ui {
 /** specifies a user interface configuration manager which controls
     all customizeable user interface elements of an object.
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 service UIConfigurationManager
diff --git a/offapi/com/sun/star/ui/UIElement.idl b/offapi/com/sun/star/ui/UIElement.idl
index 3230489010cf..5bcb3a7a2419 100644
--- a/offapi/com/sun/star/ui/UIElement.idl
+++ b/offapi/com/sun/star/ui/UIElement.idl
@@ -59,7 +59,7 @@ module com { module sun { module star { module ui {
     before it can be used.
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 service UIElement
diff --git a/offapi/com/sun/star/ui/UIElementFactory.idl b/offapi/com/sun/star/ui/UIElementFactory.idl
index 479489fa0fe1..7a0a1900c354 100644
--- a/offapi/com/sun/star/ui/UIElementFactory.idl
+++ b/offapi/com/sun/star/ui/UIElementFactory.idl
@@ -45,7 +45,7 @@ module com { module sun { module star { module ui {
     service to provide access to itself.
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 published service UIElementFactory
diff --git a/offapi/com/sun/star/ui/UIElementFactoryManager.idl b/offapi/com/sun/star/ui/UIElementFactoryManager.idl
index fdff6a73cb80..73151edfbb76 100644
--- a/offapi/com/sun/star/ui/UIElementFactoryManager.idl
+++ b/offapi/com/sun/star/ui/UIElementFactoryManager.idl
@@ -45,7 +45,7 @@ module com { module sun { module star { module ui {
     <type scope="com::sun::star::lang">ServiceManager</type>.
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 service UIElementFactoryManager
diff --git a/offapi/com/sun/star/ui/UIElementSettings.idl b/offapi/com/sun/star/ui/UIElementSettings.idl
index e6d4caf1d46c..8727fe55badb 100644
--- a/offapi/com/sun/star/ui/UIElementSettings.idl
+++ b/offapi/com/sun/star/ui/UIElementSettings.idl
@@ -47,7 +47,7 @@ module com {  module sun {  module star {  module ui {
     although limitations based on the real user interface element may be visible.
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 service UIElementSettings
 {
diff --git a/offapi/com/sun/star/ui/UIElementType.idl b/offapi/com/sun/star/ui/UIElementType.idl
index 90be6d4bc28f..9955b2f1f114 100644
--- a/offapi/com/sun/star/ui/UIElementType.idl
+++ b/offapi/com/sun/star/ui/UIElementType.idl
@@ -28,7 +28,7 @@ module com {  module sun {  module star {  module ui {
 /** determine the type of a user interface element which is controlled
     by a layout manager.
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 constants UIElementType
 {
diff --git a/offapi/com/sun/star/ui/WindowContentFactory.idl b/offapi/com/sun/star/ui/WindowContentFactory.idl
index 39131f6b7068..c858e2c70105 100644
--- a/offapi/com/sun/star/ui/WindowContentFactory.idl
+++ b/offapi/com/sun/star/ui/WindowContentFactory.idl
@@ -43,7 +43,7 @@ module com { module sun { module star { module ui {
     The specific type of the created window depends on the provided arguments.
     </p>
 
-    @since OOo 3.1
+    @since OpenOffice 3.1
 */
 
 service WindowContentFactory : com::sun::star::lang::XSingleComponentFactory
diff --git a/offapi/com/sun/star/ui/WindowStateConfiguration.idl b/offapi/com/sun/star/ui/WindowStateConfiguration.idl
index bd8f9e7ef45e..5fe820f01fc6 100644
--- a/offapi/com/sun/star/ui/WindowStateConfiguration.idl
+++ b/offapi/com/sun/star/ui/WindowStateConfiguration.idl
@@ -44,7 +44,7 @@ module com { module sun { module star { module ui {
     part of OpenOffice.org modules, like Writer or Calc.
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 published service WindowStateConfiguration
diff --git a/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl b/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl
index 1543177811e2..5278659b6824 100644
--- a/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl
+++ b/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl
@@ -73,7 +73,7 @@ module com {  module sun {  module star {  module ui {
     @see    AcceleratorConfiguration
     @see    <type scope="dom::sun::star::util">XFlushable</type>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 interface XAcceleratorConfiguration
 {
diff --git a/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl b/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl
index f5776abc8e76..7ca9f7ee8613 100644
--- a/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl
+++ b/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl
@@ -55,7 +55,7 @@ module com { module sun { module star { module ui {
     @see com::sun::star::frame::XFrame
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 
diff --git a/offapi/com/sun/star/ui/XModuleUIConfigurationManager.idl b/offapi/com/sun/star/ui/XModuleUIConfigurationManager.idl
index 59e5d921528c..8c07813b8758 100644
--- a/offapi/com/sun/star/ui/XModuleUIConfigurationManager.idl
+++ b/offapi/com/sun/star/ui/XModuleUIConfigurationManager.idl
@@ -65,7 +65,7 @@ module com { module sun { module star { module ui {
               configuration manager uses.</br>
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 interface XModuleUIConfigurationManager : ::com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl b/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl
index 51f7bcd7851f..21042037bd58 100644
--- a/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl
+++ b/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module ui {
 /** allows to retrieve user interface configuration managers related to
     OpenOffice.org modules.
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 published interface XModuleUIConfigurationManagerSupplier : ::com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/ui/XStatusbarItem.idl b/offapi/com/sun/star/ui/XStatusbarItem.idl
index 49e71e235f43..a1395e24d08a 100644
--- a/offapi/com/sun/star/ui/XStatusbarItem.idl
+++ b/offapi/com/sun/star/ui/XStatusbarItem.idl
@@ -31,7 +31,7 @@ module com {  module sun {  module star {  module ui {
 
     @see <type scope="com::sun::star::frame">XStatusbarController</type>
 
-    @since Apache OpenOffice 4.0
+    @since OpenOffice 4.0
 */
 interface XStatusbarItem
 {
diff --git a/offapi/com/sun/star/ui/XUIConfiguration.idl b/offapi/com/sun/star/ui/XUIConfiguration.idl
index 28cd23aaa2f9..d1fbcaa4abc5 100644
--- a/offapi/com/sun/star/ui/XUIConfiguration.idl
+++ b/offapi/com/sun/star/ui/XUIConfiguration.idl
@@ -43,7 +43,7 @@ module com { module sun { module star { module ui {
     <p>This can be useful for UI to enable/disable some functions without
     actually accessing the data.</p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 published interface XUIConfiguration : ::com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/ui/XUIConfigurationListener.idl b/offapi/com/sun/star/ui/XUIConfigurationListener.idl
index b73beb5b3236..c389d36c581c 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationListener.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationListener.idl
@@ -41,7 +41,7 @@ module com { module sun { module star { module ui {
 /** supplies information about changes of a user interface
     configuration manager.
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 published interface XUIConfigurationListener : com::sun::star::lang::XEventListener
diff --git a/offapi/com/sun/star/ui/XUIConfigurationManager.idl b/offapi/com/sun/star/ui/XUIConfigurationManager.idl
index e55a27d27449..ca8ba47d74d4 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationManager.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationManager.idl
@@ -66,7 +66,7 @@ module com { module sun { module star { module ui {
     controls the structure of all customizable user interface
     elements.
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 published interface XUIConfigurationManager : ::com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl b/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl
index ee7a09af550f..5da41e81545e 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl
@@ -33,7 +33,7 @@ module com { module sun { module star { module ui {
 /** allows to retrieve the user interface configuration manager related to
     an object.
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 published interface XUIConfigurationManagerSupplier : ::com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl b/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl
index 961852517f49..ce85f255530b 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl
@@ -34,7 +34,7 @@ module com { module sun { module star { module ui {
     interface configuration data to a storage and to retrieve information
     about the current state.
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 published interface XUIConfigurationPersistence : ::com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/ui/XUIConfigurationStorage.idl b/offapi/com/sun/star/ui/XUIConfigurationStorage.idl
index 7001986d1053..c53ca56a2654 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationStorage.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationStorage.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module ui {
 /** supplies functions to change or get information about the storage
     of a user interface configuration manager.
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 interface XUIConfigurationStorage : ::com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/ui/XUIElementFactory.idl b/offapi/com/sun/star/ui/XUIElementFactory.idl
index cb7f8d88cfbb..f5bf4cf64cee 100644
--- a/offapi/com/sun/star/ui/XUIElementFactory.idl
+++ b/offapi/com/sun/star/ui/XUIElementFactory.idl
@@ -63,7 +63,7 @@ module com { module sun { module star { module ui {
     </ul>
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 published interface XUIElementFactory : ::com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl b/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl
index 78817a28ed43..931c098594d7 100644
--- a/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl
+++ b/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl
@@ -72,7 +72,7 @@ module com { module sun { module star { module ui {
     </ul>
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 
 interface XUIElementFactoryRegistration : com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/ui/XUIElementSettings.idl b/offapi/com/sun/star/ui/XUIElementSettings.idl
index fa45ca9a1f81..a008029a8952 100644
--- a/offapi/com/sun/star/ui/XUIElementSettings.idl
+++ b/offapi/com/sun/star/ui/XUIElementSettings.idl
@@ -41,7 +41,7 @@ module com { module sun { module star { module ui {
 /** provides functions to retrieve and change user interface element structure
     data and to update its visible representation.
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 published interface XUIElementSettings : com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/ui/XUIFunctionListener.idl b/offapi/com/sun/star/ui/XUIFunctionListener.idl
index 3882a5675ab4..fa00c837989a 100644
--- a/offapi/com/sun/star/ui/XUIFunctionListener.idl
+++ b/offapi/com/sun/star/ui/XUIFunctionListener.idl
@@ -35,7 +35,7 @@
 /** special interface to receive notification that a user interface
     element will execute a function.
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 interface XUIFunctionListener : com::sun::star::lang::XEventListener
 {
diff --git a/offapi/com/sun/star/ui/dialogs/CommonFilePickerElementIds.idl b/offapi/com/sun/star/ui/dialogs/CommonFilePickerElementIds.idl
index 32011a63f0fc..77e612c0cc54 100644
--- a/offapi/com/sun/star/ui/dialogs/CommonFilePickerElementIds.idl
+++ b/offapi/com/sun/star/ui/dialogs/CommonFilePickerElementIds.idl
@@ -63,14 +63,14 @@ published constants CommonFilePickerElementIds
     //---------------------------------------------------------------------
     /** The label of the filter listbox of a FilePicker dialog.
 
-        @since OOo 1.1.2
+        @since OpenOffice 1.1.2
     */
     const short LISTBOX_FILTER_LABEL = 6;
 
     //---------------------------------------------------------------------
     /** The label of the file name listbox of a FilePicker dialog.
 
-        @since OOo 1.1.2
+        @since OpenOffice 1.1.2
     */
     const short EDIT_FILEURL_LABEL = 7;
 };
diff --git a/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl b/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl
index a9c56637ff69..d7521323b71f 100644
--- a/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl
+++ b/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl
@@ -55,7 +55,7 @@ module com { module sun { module star { module ui { module dialogs {
 
     <p>Otherwise, the filter operation is canceled.</p>
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
  */
 published service FilterOptionsDialog
 {
diff --git a/offapi/com/sun/star/ui/dialogs/Wizard.idl b/offapi/com/sun/star/ui/dialogs/Wizard.idl
index d3d449d81a58..2c3e9326e706 100644
--- a/offapi/com/sun/star/ui/dialogs/Wizard.idl
+++ b/offapi/com/sun/star/ui/dialogs/Wizard.idl
@@ -19,25 +19,21 @@
  *
  *************************************************************/
 
-
-
 #ifndef __com_sun_star_ui_dialogs_Wizard_idl__
 #define __com_sun_star_ui_dialogs_Wizard_idl__
 
 #include <com/sun/star/ui/dialogs/XWizard.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 
-//==================================================================================================================
-
 module com { module sun { module star { module ui { module dialogs {
 
-published interface XWizardController;
-
-//==================================================================================================================
+interface XWizardController;
 
 /** provides a framework for implementing a wizard dialog.
+
+    @since OpenOffice 3.3
  */
-published service Wizard : XWizard
+service Wizard : XWizard
 {
     /** creates a wizard with a single execution path
         @param PageIds
@@ -63,10 +59,6 @@ published service Wizard : XWizard
             );
 };
 
-//==================================================================================================================
-
 }; }; }; }; };
 
-//==================================================================================================================
-
 #endif
diff --git a/offapi/com/sun/star/ui/dialogs/WizardButton.idl b/offapi/com/sun/star/ui/dialogs/WizardButton.idl
index 59863dd5ac73..46a59073cdd7 100644
--- a/offapi/com/sun/star/ui/dialogs/WizardButton.idl
+++ b/offapi/com/sun/star/ui/dialogs/WizardButton.idl
@@ -19,18 +19,14 @@
  *
  *************************************************************/
 
-
-
 #ifndef __com_sun_star_ui_dialogs_WizardButton_idl__
 #define __com_sun_star_ui_dialogs_WizardButton_idl__
 
-//==================================================================================================================
-
 module com { module sun { module star { module ui { module dialogs {
 
-//==================================================================================================================
-
 /** denotes the buttons found in a <type>Wizard</type>
+
+    @since OpenOffice 3.3
  */
 constants WizardButton
 {
@@ -48,10 +44,6 @@ constants WizardButton
     const short HELP = 5;
 };
 
-//==================================================================================================================
-
 }; }; }; }; };
 
-//==================================================================================================================
-
 #endif
diff --git a/offapi/com/sun/star/ui/dialogs/WizardTravelType.idl b/offapi/com/sun/star/ui/dialogs/WizardTravelType.idl
index b1d96be07974..51883ad76844 100644
--- a/offapi/com/sun/star/ui/dialogs/WizardTravelType.idl
+++ b/offapi/com/sun/star/ui/dialogs/WizardTravelType.idl
@@ -19,18 +19,14 @@
  *
  *************************************************************/
 
-
-
 #ifndef __com_sun_star_ui_dialogs_WizardTravelType_idl__
 #define __com_sun_star_ui_dialogs_WizardTravelType_idl__
 
-//==================================================================================================================
-
 module com { module sun { module star { module ui { module dialogs {
 
-//==================================================================================================================
-
 /** denotes ways to leave a <type>Wizard</type>'s page
+
+    @since OpenOffice 3.3
  */
 constants WizardTravelType
 {
@@ -42,10 +38,6 @@ constants WizardTravelType
     const short FINISH = 3;
 };
 
-//==================================================================================================================
-
 }; }; }; }; };
 
-//==================================================================================================================
-
 #endif
diff --git a/offapi/com/sun/star/ui/dialogs/XControlAccess.idl b/offapi/com/sun/star/ui/dialogs/XControlAccess.idl
index 1c0819e7c0e3..6521f89d1f20 100644
--- a/offapi/com/sun/star/ui/dialogs/XControlAccess.idl
+++ b/offapi/com/sun/star/ui/dialogs/XControlAccess.idl
@@ -47,7 +47,7 @@ module com { module sun { module star { module ui { module dialogs {
     @see com::sun::star::ui::dialogs::FilePicker
     @see com::sun::star::ui::dialogs::FilePicker
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
 */
 published interface XControlAccess: com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/ui/dialogs/XControlInformation.idl b/offapi/com/sun/star/ui/dialogs/XControlInformation.idl
index 893bb489b0b6..d7af6528b636 100644
--- a/offapi/com/sun/star/ui/dialogs/XControlInformation.idl
+++ b/offapi/com/sun/star/ui/dialogs/XControlInformation.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module ui { module dialogs {
 /** Interface to query for controls and control properties supported by the
     implementing instance.
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
 */
 published interface XControlInformation: com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/ui/dialogs/XWizard.idl b/offapi/com/sun/star/ui/dialogs/XWizard.idl
index d913ce5f8d50..9767a5604566 100644
--- a/offapi/com/sun/star/ui/dialogs/XWizard.idl
+++ b/offapi/com/sun/star/ui/dialogs/XWizard.idl
@@ -19,8 +19,6 @@
  *
  *************************************************************/
 
-
-
 #ifndef __com_sun_star_ui_dialogs_XWizard_idl__
 #define __com_sun_star_ui_dialogs_XWizard_idl__
 
@@ -29,12 +27,9 @@
 #include <com/sun/star/container/NoSuchElementException.idl>
 #include <com/sun/star/awt/XWindow.idl>
 
-//==================================================================================================================
 module com { module sun { module star { module ui { module dialogs {
 
-//==================================================================================================================
-
-published interface XWizardPage;
+interface XWizardPage;
 
 /** is the main interface implemented by the <type>Wizard</type> services.
 
@@ -75,8 +70,10 @@ published interface XWizardPage;
 
     @see XWizardController
     @see XWizardPage
+
+    @since OpenOffice 3.3
  */
-published interface XWizard
+interface XWizard
 {
     interface   XExecutableDialog;
 
@@ -216,10 +213,6 @@ published interface XWizard
                 ,   ::com::sun::star::util::InvalidStateException );
 };
 
-//==================================================================================================================
-
 }; }; }; }; };
 
-//==================================================================================================================
-
 #endif
diff --git a/offapi/com/sun/star/ui/dialogs/XWizardController.idl b/offapi/com/sun/star/ui/dialogs/XWizardController.idl
index 65741bfb6b97..aa4625cb480a 100644
--- a/offapi/com/sun/star/ui/dialogs/XWizardController.idl
+++ b/offapi/com/sun/star/ui/dialogs/XWizardController.idl
@@ -19,22 +19,18 @@
  *
  *************************************************************/
 
-
-
 #ifndef __com_sun_star_ui_dialogs_XWizardController_idl__
 #define __com_sun_star_ui_dialogs_XWizardController_idl__
 
 #include <com/sun/star/ui/dialogs/XWizardPage.idl>
 
-//==================================================================================================================
-
 module com { module sun { module star { module ui { module dialogs {
 
-//==================================================================================================================
-
 /** is the interface of a client-provided controller of a custom <type>Wizard</type>.
+
+    @since OpenOffice 3.3
  */
-published interface XWizardController
+interface XWizardController
 {
     /** creates a page
 
@@ -73,10 +69,6 @@ published interface XWizardController
     boolean confirmFinish();
 };
 
-//==================================================================================================================
-
 }; }; }; }; };
 
-//==================================================================================================================
-
 #endif
diff --git a/offapi/com/sun/star/ui/dialogs/XWizardPage.idl b/offapi/com/sun/star/ui/dialogs/XWizardPage.idl
index 915f884e36b8..18749a3aa6da 100644
--- a/offapi/com/sun/star/ui/dialogs/XWizardPage.idl
+++ b/offapi/com/sun/star/ui/dialogs/XWizardPage.idl
@@ -19,22 +19,18 @@
  *
  *************************************************************/
 
-
-
 #ifndef __com_sun_star_ui_dialogs_XWizardPage_idl__
 #define __com_sun_star_ui_dialogs_XWizardPage_idl__
 
 #include <com/sun/star/awt/XWindow.idl>
 
-//==================================================================================================================
-
 module com { module sun { module star { module ui { module dialogs {
 
-//==================================================================================================================
-
 /** is a single page of a <type>Wizard</type>
+
+    @since OpenOffice 3.3
  */
-published interface XWizardPage : ::com::sun::star::lang::XComponent
+interface XWizardPage : ::com::sun::star::lang::XComponent
 {
     /** provides read-only access to the window of the page
     */
@@ -74,10 +70,6 @@ published interface XWizardPage : ::com::sun::star::lang::XComponent
     boolean canAdvance();
 };
 
-//==================================================================================================================
-
 }; }; }; }; };
 
-//==================================================================================================================
-
 #endif