summaryrefslogtreecommitdiffstats
path: root/offapi
diff options
context:
space:
mode:
authorMihaela Kedikova <misheto@openoffice.org>2010-10-14 13:49:43 +0200
committerMihaela Kedikova <misheto@openoffice.org>2010-10-14 13:49:43 +0200
commitcaf47dc9ccd4ba898834b96ca193914ac1e85f68 (patch)
treee117ce4865cd30772c3d19ec301ac19100f14389 /offapi
parenttabcontrol: fix some compile errors (diff)
parent#i10000# (diff)
downloadcore-caf47dc9ccd4ba898834b96ca193914ac1e85f68.tar.gz
core-caf47dc9ccd4ba898834b96ca193914ac1e85f68.zip
tabcontrol: merge with DEV300_m89
Diffstat (limited to 'offapi')
-rw-r--r--offapi/com/sun/star/awt/UnoControlComboBoxModel.idl6
-rw-r--r--offapi/com/sun/star/awt/UnoControlListBoxModel.idl11
-rw-r--r--offapi/com/sun/star/awt/XDialogProvider2.idl22
-rw-r--r--offapi/com/sun/star/awt/XStyleChangeListener.idl54
-rw-r--r--offapi/com/sun/star/awt/XStyleSettings.idl239
-rw-r--r--offapi/com/sun/star/awt/XStyleSettingsSupplier.idl53
-rw-r--r--offapi/com/sun/star/awt/makefile.mk5
-rw-r--r--offapi/com/sun/star/configuration/XUpdate.idl6
-rw-r--r--offapi/com/sun/star/deployment/ExtensionRemovedException.idl5
-rw-r--r--offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl5
-rw-r--r--offapi/com/sun/star/deployment/Prerequisites.idl5
-rw-r--r--offapi/com/sun/star/script/XLibraryContainer3.idl5
-rw-r--r--offapi/com/sun/star/script/makefile.mk4
-rwxr-xr-xoffapi/com/sun/star/script/vba/VBAEventId.idl140
-rwxr-xr-xoffapi/com/sun/star/script/vba/VBAEventProcessor.idl49
-rwxr-xr-xoffapi/com/sun/star/script/vba/VBASpreadsheetEventProcessor.idl50
-rwxr-xr-xoffapi/com/sun/star/script/vba/VBATextEventProcessor.idl50
-rw-r--r--offapi/com/sun/star/script/vba/XVBACompatibility.idl (renamed from offapi/com/sun/star/script/XVBACompat.idl)27
-rwxr-xr-xoffapi/com/sun/star/script/vba/XVBAEventProcessor.idl106
-rw-r--r--offapi/com/sun/star/script/vba/XVBAModuleInfo.idl (renamed from offapi/com/sun/star/script/XVBAModuleInfo.idl)48
-rwxr-xr-xoffapi/com/sun/star/script/vba/makefile.mk52
-rw-r--r--offapi/com/sun/star/sheet/DataPilotSourceDimension.idl8
-rw-r--r--offapi/com/sun/star/sheet/DimensionFlags.idl74
-rw-r--r--offapi/com/sun/star/sheet/makefile.mk1
-rwxr-xr-x[-rw-r--r--]offapi/com/sun/star/text/PrintPreviewSettings.idl2
-rw-r--r--offapi/com/sun/star/util/Color.idl8
-rw-r--r--offapi/prj/build.lst3
-rw-r--r--offapi/prj/d.lst2
-rw-r--r--offapi/type_reference/typelibrary_history.txt4
-rw-r--r--offapi/type_reference/types.rdbbin7307264 -> 7307264 bytes
-rw-r--r--offapi/util/makefile.mk1
31 files changed, 984 insertions, 61 deletions
diff --git a/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl b/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
index 83057417edbf..eedd7b78c346 100644
--- a/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
@@ -39,6 +39,7 @@
#include <com/sun/star/util/Color.idl>
#endif
+#include <com/sun/star/awt/XItemList.idl>
//=============================================================================
@@ -225,6 +226,11 @@ published service UnoControlComboBoxModel
this is possible.</p>
*/
[optional, property] short MouseWheelBehavior;
+
+ /** allows mmanipulating the list of items in the combo box more fine-grained than the
+ <member>StringItemList</member> property.
+ */
+ [optional] interface XItemList;
};
//=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlListBoxModel.idl b/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
index 1cd36de93231..1ecf338bf095 100644
--- a/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
@@ -213,8 +213,19 @@ published service UnoControlListBoxModel
/** allows mmanipulating the list of items in the list box more fine-grained than the
<member>StringItemList</member> property.
+
+ @since OOo 3.3
*/
[optional] interface XItemList;
+
+ /** specifies where an item separator - a horizontal line - is drawn.
+
+ <p>If this is not <NULL/>, then a horizontal line will be drawn between the item at the given position,
+ and the following item.</p>
+
+ @since OOo 3.3
+ */
+ [optional, property, maybevoid] short ItemSeparatorPos;
};
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XDialogProvider2.idl b/offapi/com/sun/star/awt/XDialogProvider2.idl
index 79e4594f65a8..c08508a58bfe 100644
--- a/offapi/com/sun/star/awt/XDialogProvider2.idl
+++ b/offapi/com/sun/star/awt/XDialogProvider2.idl
@@ -31,6 +31,9 @@
#ifndef __com_sun_star_awt_XDialogProvider_idl__
#include <com/sun/star/awt/XDialogProvider.idl>
#endif
+#ifndef __com_sun_star_beans_NamedValue_idl__
+#include <com/sun/star/beans/NamedValue.idl>
+#endif
//=============================================================================
@@ -107,6 +110,25 @@ interface XDialogProvider2 : ::com::sun::star::awt::XDialogProvider {
com::sun::star::awt::XDialog createDialogWithHandler
( [in] string URL, [in] com::sun::star::uno::XInterface xHandler )
raises ( com::sun::star::lang::IllegalArgumentException );
+
+ /** creates a dialog for the given URL, accepting additional creation parameters
+
+ <p>The arguments accepted so far are
+ <ul><li><em>ParentWindow</em> - must be a component supporting the <type>XWindowPeer</type> interface,
+ or a component supporting the <type>XControl</type> interfac, so an <code>XWindowPeer</code> can be
+ obtained from it. The given window will be used as parent window for the to-be-created dialog.</li>
+ <li><em>EventHandler</em> - specifies a component handling events in the dialog. See
+ <member>createDialogWithHandler</member> for a detailed specification of dialog event handling.</li>
+ </ul>
+ </p>
+ */
+
+ XDialog createDialogWithArguments(
+ [in] string URL,
+ [in] sequence< ::com::sun::star::beans::NamedValue > Arguments
+ )
+ raises ( com::sun::star::lang::IllegalArgumentException
+ );
};
//=============================================================================
diff --git a/offapi/com/sun/star/awt/XStyleChangeListener.idl b/offapi/com/sun/star/awt/XStyleChangeListener.idl
new file mode 100644
index 000000000000..819f211a737f
--- /dev/null
+++ b/offapi/com/sun/star/awt/XStyleChangeListener.idl
@@ -0,0 +1,54 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_awt_XStyleChangeListener_idl__
+#define __com_sun_star_awt_XStyleChangeListener_idl__
+
+#include <com/sun/star/lang/XEventListener.idl>
+
+//==================================================================================================================
+
+module com { module sun { module star { module awt {
+
+//==================================================================================================================
+
+/** to be implemented by components which wish to be notified about changes in the style of a component
+
+ @see XStyleSettings
+ */
+interface XStyleChangeListener : ::com::sun::star::lang::XEventListener
+{
+ /// called when the style settings of the observed component changed
+ void styleSettingsChanged( [in] com::sun::star::lang::EventObject Event );
+};
+
+//==================================================================================================================
+
+}; }; }; };
+
+//==================================================================================================================
+
+#endif
diff --git a/offapi/com/sun/star/awt/XStyleSettings.idl b/offapi/com/sun/star/awt/XStyleSettings.idl
new file mode 100644
index 000000000000..67c3bba7d8f1
--- /dev/null
+++ b/offapi/com/sun/star/awt/XStyleSettings.idl
@@ -0,0 +1,239 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_awt_XStyleSettings_idl__
+#define __com_sun_star_awt_XStyleSettings_idl__
+
+#include <com/sun/star/util/Color.idl>
+#include <com/sun/star/awt/FontDescriptor.idl>
+#include <com/sun/star/uno/XInterface.idl>
+
+//==================================================================================================================
+
+module com { module sun { module star { module awt {
+
+interface XStyleChangeListener;
+
+//==================================================================================================================
+
+/** provides access to certain style settings within an OpenOffice.org component, such as a window, or
+ within OpenOffice.org as a whole.
+
+ <p>Note that there are constraints for those settings. For instance, if controls are drawn with the
+ native widget framework, i.e. in the desktop theme's look, then they won't necessarily respect all
+ their style settings, because those have a lesser priority than the native look.</p>
+
+ <p>On the other hand, some settings are respected only when rendering the controls in the native
+ desktop/theme look. For instance, without native theming, buttons do not support a "roll over" mode,
+ i.e., they're painted the same way, no matter if they mouse hovers over them or not. But with native
+ theming, this changes, as here the general button look is drawn by the system's theming engine,
+ while the text is drawn by OpenOffice.org. In this case, the button respects the
+ <code>ButtonRolloverTextColor</code> when painting its text.</p>
+ */
+interface XStyleSettings
+{
+ /// specifies the color of the border of active windows
+ [attribute] ::com::sun::star::util::Color ActiveBorderColor;
+
+ ///
+ [attribute] ::com::sun::star::util::Color ActiveColor;
+
+ /// specifies the color of the active tab of a tab control
+ [attribute] ::com::sun::star::util::Color ActiveTabColor;
+
+ /// specifies the text color for active UI components
+ [attribute] ::com::sun::star::util::Color ActiveTextColor;
+
+ /// specifies the color to use for text on buttons which are hovered with the mouse
+ [attribute] ::com::sun::star::util::Color ButtonRolloverTextColor;
+
+ /// specifies the color to use for text on buttons
+ [attribute] ::com::sun::star::util::Color ButtonTextColor;
+
+ ///
+ [attribute] ::com::sun::star::util::Color CheckedColor;
+
+ /// specifies the dark portion of the shadow to use for UI elements
+ [attribute] ::com::sun::star::util::Color DarkShadowColor;
+
+ /// specifies the color of the border of inactive windows
+ [attribute] ::com::sun::star::util::Color DeactiveBorderColor;
+
+ ///
+ [attribute] ::com::sun::star::util::Color DeactiveColor;
+
+ /// specifies the text color for inactive UI components
+ [attribute] ::com::sun::star::util::Color DeactiveTextColor;
+
+ /// specifies the background color of dialogs
+ [attribute] ::com::sun::star::util::Color DialogColor;
+
+ /// specifies the text color of dialogs
+ [attribute] ::com::sun::star::util::Color DialogTextColor;
+
+ /// specifies the text color for disabled UI elements
+ [attribute] ::com::sun::star::util::Color DisableColor;
+
+ ///
+ [attribute] ::com::sun::star::util::Color FaceColor;
+
+ ///
+ [attribute, readonly] ::com::sun::star::util::Color FaceGradientColor;
+
+ /// specifies the background color for dialog input controls
+ [attribute] ::com::sun::star::util::Color FieldColor;
+
+ /// specifies the text color for dialog input controls which are hovered with the mouse
+ [attribute] ::com::sun::star::util::Color FieldRolloverTextColor;
+
+ /// specifies the text color for dialog input controls
+ [attribute] ::com::sun::star::util::Color FieldTextColor;
+
+ /// specifies the text color for dialog elements used for grouping other elements
+ [attribute] ::com::sun::star::util::Color GroupTextColor;
+
+ /// specifies the background color for dialog elements displaying help content
+ [attribute] ::com::sun::star::util::Color HelpColor;
+
+ /// specifies the text color for dialog elements displaying help content
+ [attribute] ::com::sun::star::util::Color HelpTextColor;
+
+ /// specifies the background color for UI elements which are highlighted
+ [attribute] ::com::sun::star::util::Color HighlightColor;
+
+ /// specifies the text color for UI elements which are highlighted
+ [attribute] ::com::sun::star::util::Color HighlightTextColor;
+
+ /// specifies the color of inactive tabs of a tab control
+ [attribute] ::com::sun::star::util::Color InactiveTabColor;
+
+ /// specifies the text color of dialog elements displaying some info text
+ [attribute] ::com::sun::star::util::Color InfoTextColor;
+
+ /// specifies the text color of label elements in dialogs
+ [attribute] ::com::sun::star::util::Color LabelTextColor;
+
+ ///
+ [attribute] ::com::sun::star::util::Color LightColor;
+
+ /// specifies the background color of menu bars
+ [attribute] ::com::sun::star::util::Color MenuBarColor;
+
+ /// specifies the text color of menu bars
+ [attribute] ::com::sun::star::util::Color MenuBarTextColor;
+
+ /// specifies the border color of menus
+ [attribute] ::com::sun::star::util::Color MenuBorderColor;
+
+ // specifies the background color of menus
+ [attribute] ::com::sun::star::util::Color MenuColor;
+
+ /// specifies the background color of highlighted menu items
+ [attribute] ::com::sun::star::util::Color MenuHighlightColor;
+
+ /// specifies the text color of highlighted menu items
+ [attribute] ::com::sun::star::util::Color MenuHighlightTextColor;
+
+ // specifies the text color of menus
+ [attribute] ::com::sun::star::util::Color MenuTextColor;
+
+ /// specifies the color to use for monochrome control elements such as flat borders of controls
+ [attribute] ::com::sun::star::util::Color MonoColor;
+
+ /// specifies the text color of radio buttons and check boxes
+ [attribute] ::com::sun::star::util::Color RadioCheckTextColor;
+
+ /// specifies the color of separators between UI elements
+ [attribute, readonly] ::com::sun::star::util::Color SeparatorColor;
+
+ /// specifies the color to use for UI elements
+ [attribute] ::com::sun::star::util::Color ShadowColor;
+
+ /// specifies the background color to use for non-dialog windows
+ [attribute] ::com::sun::star::util::Color WindowColor;
+
+ /// specifies the text color to use for non-dialog windows
+ [attribute] ::com::sun::star::util::Color WindowTextColor;
+
+ /// specifies the background color to use for document workspaces
+ [attribute] ::com::sun::star::util::Color WorkspaceColor;
+
+ /** controls whether the an UI component should use a high-contrast mode
+ */
+ [attribute] boolean HighContrastMode;
+
+ /// specifies the application font
+ [attribute] FontDescriptor ApplicationFont;
+
+ /// specifies the help font
+ [attribute] FontDescriptor HelpFont;
+
+ /// specifies the font to use for window titles
+ [attribute] FontDescriptor TitleFont;
+
+ /// specifies the font to use the title of floating windows
+ [attribute] FontDescriptor FloatTitleFont;
+
+ /// specifies the font to use for menus
+ [attribute] FontDescriptor MenuFont;
+
+ /// specifies the font to use for tool elements
+ [attribute] FontDescriptor ToolFont;
+
+ /// specifies the font for dialog elements used for grouping other elements
+ [attribute] FontDescriptor GroupFont;
+
+ /// specifies the font for label controls
+ [attribute] FontDescriptor LabelFont;
+
+ /// specifies the font of dialog elements displaying some info text
+ [attribute] FontDescriptor InfoFont;
+
+ /// specifies the font of radio buttons and check boxes
+ [attribute] FontDescriptor RadioCheckFont;
+
+ /// specifies the font of push buttons
+ [attribute] FontDescriptor PushButtonFont;
+
+ /// specifies the font for dialog input controls
+ [attribute] FontDescriptor FieldFont;
+
+ /// registers a listener to be notified when the style settings change
+ void addStyleChangeListener(
+ [in] XStyleChangeListener Listener );
+
+ /// registers a listener to be notified when the style settings change
+ void removeStyleChangeListener(
+ [in] XStyleChangeListener Listener );
+};
+
+//==================================================================================================================
+
+}; }; }; };
+
+//==================================================================================================================
+
+#endif
diff --git a/offapi/com/sun/star/awt/XStyleSettingsSupplier.idl b/offapi/com/sun/star/awt/XStyleSettingsSupplier.idl
new file mode 100644
index 000000000000..cb60994ff894
--- /dev/null
+++ b/offapi/com/sun/star/awt/XStyleSettingsSupplier.idl
@@ -0,0 +1,53 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_awt_XStyleSettingsSupplier_idl__
+#define __com_sun_star_awt_XStyleSettingsSupplier_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+
+//==================================================================================================================
+
+module com { module sun { module star { module awt {
+
+ interface XStyleSettings;
+
+//==================================================================================================================
+
+/** provides access to the style settings of a component
+ */
+interface XStyleSettingsSupplier
+{
+ [attribute, readonly] XStyleSettings StyleSettings;
+};
+
+//==================================================================================================================
+
+}; }; }; };
+
+//==================================================================================================================
+
+#endif
+
diff --git a/offapi/com/sun/star/awt/makefile.mk b/offapi/com/sun/star/awt/makefile.mk
index f5a73d458e1a..259b482516bc 100644
--- a/offapi/com/sun/star/awt/makefile.mk
+++ b/offapi/com/sun/star/awt/makefile.mk
@@ -279,10 +279,13 @@ IDLFILES=\
XRequestCallback.idl\
XReschedule.idl\
XScrollBar.idl\
- XSimpleTabController.idl\
+ XSimpleTabController.idl\
XSpinField.idl\
XSpinListener.idl\
XSpinValue.idl\
+ XStyleChangeListener.idl\
+ XStyleSettings.idl\
+ XStyleSettingsSupplier.idl\
XSystemChildFactory.idl\
XSystemDependentMenuPeer.idl\
XSystemDependentWindowPeer.idl\
diff --git a/offapi/com/sun/star/configuration/XUpdate.idl b/offapi/com/sun/star/configuration/XUpdate.idl
index 7514cbcb1b7f..c3316ea5dc45 100644
--- a/offapi/com/sun/star/configuration/XUpdate.idl
+++ b/offapi/com/sun/star/configuration/XUpdate.idl
@@ -40,7 +40,13 @@ module com { module sun { module star { module configuration {
*/
interface XUpdate {
void insertExtensionXcsFile([in] boolean shared, [in] string fileUri);
+
void insertExtensionXcuFile([in] boolean shared, [in] string fileUri);
+
+ void removeExtensionXcuFile([in] string fileUri);
+ // fileUri must exactly match corresponding insertExtensionXcuFile
+ // argument
+
void insertModificationXcuFile(
[in] string fileUri, [in] sequence< string > includedPaths,
[in] sequence< string > excludedPaths);
diff --git a/offapi/com/sun/star/deployment/ExtensionRemovedException.idl b/offapi/com/sun/star/deployment/ExtensionRemovedException.idl
index bb3116c9f554..1cd400e248d6 100644
--- a/offapi/com/sun/star/deployment/ExtensionRemovedException.idl
+++ b/offapi/com/sun/star/deployment/ExtensionRemovedException.idl
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: VersionException.idl,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl b/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl
index 3a2cb5e330cc..0f0407b0e989 100644
--- a/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl
+++ b/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: VersionException.idl,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/offapi/com/sun/star/deployment/Prerequisites.idl b/offapi/com/sun/star/deployment/Prerequisites.idl
index 52987ad9bd77..82999ef4a41c 100644
--- a/offapi/com/sun/star/deployment/Prerequisites.idl
+++ b/offapi/com/sun/star/deployment/Prerequisites.idl
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: KeyUsage.idl,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/offapi/com/sun/star/script/XLibraryContainer3.idl b/offapi/com/sun/star/script/XLibraryContainer3.idl
index cb3f2a5e0f6c..1045fc7a295c 100644
--- a/offapi/com/sun/star/script/XLibraryContainer3.idl
+++ b/offapi/com/sun/star/script/XLibraryContainer3.idl
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: XLibraryContainer2.idl,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/offapi/com/sun/star/script/makefile.mk b/offapi/com/sun/star/script/makefile.mk
index 24d5fcc83af4..da8e9110d1fa 100644
--- a/offapi/com/sun/star/script/makefile.mk
+++ b/offapi/com/sun/star/script/makefile.mk
@@ -49,10 +49,8 @@ IDLFILES=\
XPersistentLibraryContainer.idl\
XStorageBasedLibraryContainer.idl\
ModuleSizeExceededRequest.idl\
- XVBACompat.idl\
- XVBAModuleInfo.idl\
ModuleInfo.idl\
- ModuleType.idl\
+ ModuleType.idl
# ------------------------------------------------------------------
diff --git a/offapi/com/sun/star/script/vba/VBAEventId.idl b/offapi/com/sun/star/script/vba/VBAEventId.idl
new file mode 100755
index 000000000000..fda83a18d495
--- /dev/null
+++ b/offapi/com/sun/star/script/vba/VBAEventId.idl
@@ -0,0 +1,140 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_script_vba_VBAEventId_idl__
+#define __com_sun_star_script_vba_VBAEventId_idl__
+
+//=============================================================================
+
+module com { module sun { module star { module script { module vba {
+
+//=============================================================================
+
+/** Constants used to identify VBA document events.
+
+ <p>If one of these events is fired, a specific VBA macro in a specific
+ document code module will be executed.</p>
+
+ <p>Each event expects some specific arguments to be passed to
+ <member>XVBAEventProcessor::processVbaEvent</member>.</p>
+
+ @see XVBAEventProcessor
+ */
+constants VBAEventId
+{
+ //=========================================================================
+
+ /** An identifier not corresponding to any VBA document event. */
+ const long NO_EVENT = -1;
+
+ //=========================================================================
+ // Global events (identifiers from 1 to 999)
+
+ /** New document opened from template. No arguments. */
+ const long AUTO_NEW = 1;
+ /** Document opened (loaded). No arguments. */
+ const long AUTO_OPEN = 2;
+ /** Document about to be closed. No arguments. */
+ const long AUTO_CLOSE = 3;
+ /** Application start. No arguments. */
+ const long AUTO_EXEC = 4;
+ /** Application exit. No arguments. */
+ const long AUTO_EXIT = 5;
+
+ //=========================================================================
+ // MS Word (identifiers from 1001 to 1999)
+
+ /** New text document opened from template. No arguments. */
+ const long DOCUMENT_NEW = 1001;
+ /** Text document opened (loaded). No arguments. */
+ const long DOCUMENT_OPEN = 1002;
+ /** Document about to be closed. No arguments. */
+ const long DOCUMENT_CLOSE = 1003;
+
+ //=========================================================================
+ // MS Excel (identifiers from 2001 to 2999)
+
+ //-------------------------------------------------------------------------
+ // document events (2001-2099)
+
+ /** Document activated. No arguments. */
+ const long WORKBOOK_ACTIVATE = 2001;
+ /** Document deactivated. No arguments. */
+ const long WORKBOOK_DEACTIVATE = 2002;
+ /** Document opened (loaded). No arguments. */
+ const long WORKBOOK_OPEN = 2003;
+ /** Document about to be closed. Arguments: [out] boolean bCancel. */
+ const long WORKBOOK_BEFORECLOSE = 2004;
+ /** Document about to be printed. Arguments: [out] boolean bCancel. */
+ const long WORKBOOK_BEFOREPRINT = 2005;
+ /** Document about to be saved. Arguments: boolean bSaveAs, [out] boolean bCancel. */
+ const long WORKBOOK_BEFORESAVE = 2006;
+ /** Document has been saved. Arguments: boolean bSuccess. */
+ const long WORKBOOK_AFTERSAVE = 2007;
+ /** New sheet inserted. Arguments: short nSheet. */
+ const long WORKBOOK_NEWSHEET = 2008;
+ /** Document window has been activated. No arguments. */
+ const long WORKBOOK_WINDOWACTIVATE = 2009;
+ /** Document window has been deactivated. No arguments. */
+ const long WORKBOOK_WINDOWDEACTIVATE = 2010;
+ /** Document window has been resized. No arguments. */
+ const long WORKBOOK_WINDOWRESIZE = 2011;
+
+ //-------------------------------------------------------------------------
+ // sheet events (2101-2199)
+
+ /** Worksheet has been activated (made visible). Arguments: short nSheet. */
+ const long WORKSHEET_ACTIVATE = 2101;
+ /** Worksheet has been activated (made visible). Arguments: short nSheet. */
+ const long WORKSHEET_DEACTIVATE = 2102;
+ /** Double click in the sheet. Arguments: XRange/XSheetCellRangeContainer aRange, [out] boolean bCancel. */
+ const long WORKSHEET_BEFOREDOUBLECLICK = 2103;
+ /** Right click in the sheet. Arguments: XRange/XSheetCellRangeContainer aRange, [out] boolean bCancel. */
+ const long WORKSHEET_BEFORERIGHTCLICK = 2104;
+ /** Cells in sheet have been recalculated. Arguments: short nSheet. */
+ const long WORKSHEET_CALCULATE = 2105;
+ /** Cells in sheet have been changed. Arguments: XRange/XSheetCellRangeContainer aRange. */
+ const long WORKSHEET_CHANGE = 2106;
+ /** Selection in sheet has been changed. Arguments: XRange/XSheetCellRangeContainer aRange. */
+ const long WORKSHEET_SELECTIONCHANGE = 2107;
+ /** Hyperlink has been clicked. Arguments: XCell aCell. */
+ const long WORKSHEET_FOLLOWHYPERLINK = 2108;
+
+ //=========================================================================
+
+ /** Implementations are allowed to use identifiers above this value for any
+ internal purpose. */
+ const long USERDEFINED_START = 1000000;
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+//=============================================================================
+
+#endif
diff --git a/offapi/com/sun/star/script/vba/VBAEventProcessor.idl b/offapi/com/sun/star/script/vba/VBAEventProcessor.idl
new file mode 100755
index 000000000000..d993b37ae250
--- /dev/null
+++ b/offapi/com/sun/star/script/vba/VBAEventProcessor.idl
@@ -0,0 +1,49 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_script_vba_VBAEventProcessor_idl__
+#define __com_sun_star_script_vba_VBAEventProcessor_idl__
+
+#include <com/sun/star/script/vba/XVBAEventProcessor.idl>
+
+//=============================================================================
+
+module com { module sun { module star { module script { module vba {
+
+//=============================================================================
+
+service VBAEventProcessor : XVBAEventProcessor
+{
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+//=============================================================================
+
+#endif
diff --git a/offapi/com/sun/star/script/vba/VBASpreadsheetEventProcessor.idl b/offapi/com/sun/star/script/vba/VBASpreadsheetEventProcessor.idl
new file mode 100755
index 000000000000..ce202da4f54c
--- /dev/null
+++ b/offapi/com/sun/star/script/vba/VBASpreadsheetEventProcessor.idl
@@ -0,0 +1,50 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_script_vba_VBASpreadsheetEventProcessor_idl__
+#define __com_sun_star_script_vba_VBASpreadsheetEventProcessor_idl__
+
+#include <com/sun/star/script/vba/VBAEventProcessor.idl>
+
+//=============================================================================
+
+module com { module sun { module star { module script { module vba {
+
+//=============================================================================
+
+service VBASpreadsheetEventProcessor
+{
+ service VBAEventProcessor;
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+//=============================================================================
+
+#endif
diff --git a/offapi/com/sun/star/script/vba/VBATextEventProcessor.idl b/offapi/com/sun/star/script/vba/VBATextEventProcessor.idl
new file mode 100755
index 000000000000..fd3c7f895d8d
--- /dev/null
+++ b/offapi/com/sun/star/script/vba/VBATextEventProcessor.idl
@@ -0,0 +1,50 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_script_vba_VBATextEventProcessor_idl__
+#define __com_sun_star_script_vba_VBATextEventProcessor_idl__
+
+#include <com/sun/star/script/vba/VBAEventProcessor.idl>
+
+//=============================================================================
+
+module com { module sun { module star { module script { module vba {
+
+//=============================================================================
+
+service VBATextEventProcessor
+{
+ service VBAEventProcessor;
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+//=============================================================================
+
+#endif
diff --git a/offapi/com/sun/star/script/XVBACompat.idl b/offapi/com/sun/star/script/vba/XVBACompatibility.idl
index 09da54eb27cd..bfa9d01655fa 100644
--- a/offapi/com/sun/star/script/XVBACompat.idl
+++ b/offapi/com/sun/star/script/vba/XVBACompatibility.idl
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: XLibraryContainer.idl,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,23 +24,27 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __com_sun_star_script_XVBACompat_idl__
-#define __com_sun_star_script_XVBACompat_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
+#ifndef __com_sun_star_script_vba_XVBACompatibility_idl__
+#define __com_sun_star_script_vba_XVBACompatibility_idl__
+
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
-module com { module sun { module star { module script {
+module com { module sun { module star { module script { module vba {
-interface XVBACompat: com::sun::star::uno::XInterface
+interface XVBACompatibility
{
+ //-------------------------------------------------------------------------
-//=============================================================================
- [attribute ] boolean VBACompatModeOn;
+ [attribute] boolean VBACompatibilityMode;
-}; }; }; };
+ //-------------------------------------------------------------------------
};
+
+}; }; }; }; };
+
+//=============================================================================
+
#endif
diff --git a/offapi/com/sun/star/script/vba/XVBAEventProcessor.idl b/offapi/com/sun/star/script/vba/XVBAEventProcessor.idl
new file mode 100755
index 000000000000..4a3534de8412
--- /dev/null
+++ b/offapi/com/sun/star/script/vba/XVBAEventProcessor.idl
@@ -0,0 +1,106 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_script_vba_XVBAEventProcessor_idl__
+#define __com_sun_star_script_vba_XVBAEventProcessor_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/lang/IllegalArgumentException.idl>
+#include <com/sun/star/script/provider/ScriptFrameworkErrorException.idl>
+#include <com/sun/star/util/VetoException.idl>
+
+//=============================================================================
+
+module com { module sun { module star { module script { module vba {
+
+//=============================================================================
+
+/** Executes VBA event handlers.
+ */
+interface XVBAEventProcessor
+{
+ //-------------------------------------------------------------------------
+
+ /** Returns whether a VBA event handler exists.
+
+ @param nEventId
+ The identifier of the event. Must be a constant from <type>VBAEventId</type>.
+
+ @param aArgs
+ Additional arguments needed to identify some event handlers, e.g. a
+ sheet index for spreadsheet events.
+
+ @return
+ <TRUE/>, if the VBA event handler exists.
+
+ @throws <type scope="::com::sun::star::lang">IllegalArgumentException</type>
+ if the passed event identifier is not supported, or if the passed
+ specifier is required but invalid.
+ **/
+ boolean hasVbaEventHandler( [in] long nEventId, [in] sequence< any > aArgs )
+ raises (::com::sun::star::lang::IllegalArgumentException);
+
+ //-------------------------------------------------------------------------
+
+ /** Executes a VBA event handler.
+
+ @param nEventId
+ The identifier of the event. Must be a constant from <type>VBAEventId</type>.
+
+ @param aArgs
+ The input arguments needed to create the argument list of the VBA
+ event handler.
+
+ @throws <type scope="::com::sun::star::lang">IllegalArgumentException</type>
+ if the passed event identifier is not supported, or if the passed
+ arguments do not conform to the arguments expected by the specified
+ event.
+
+ @throws <type scope="::com::sun::star::script::provider">ScriptFrameworkErrorException</type>
+ if the VBA event handler could not be invoked. Reasons may be, that
+ handling of VBA events is not enabled, that the VBA event handler
+ macro has not been found, or that the execution of the macro has
+ been aborted with an error.
+
+ @throws <type scope="::com::sun::star::util">VetoException</type>
+ if the VBA event handler has indicated to veto the event.
+ **/
+ void processVbaEvent( [in] long nEventId, [in] sequence< any > aArgs )
+ raises (::com::sun::star::lang::IllegalArgumentException,
+ ::com::sun::star::script::provider::ScriptFrameworkErrorException,
+ ::com::sun::star::util::VetoException);
+
+ //-------------------------------------------------------------------------
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+//=============================================================================
+
+#endif
diff --git a/offapi/com/sun/star/script/XVBAModuleInfo.idl b/offapi/com/sun/star/script/vba/XVBAModuleInfo.idl
index f9c4e64223c3..9954281a5a71 100644
--- a/offapi/com/sun/star/script/XVBAModuleInfo.idl
+++ b/offapi/com/sun/star/script/vba/XVBAModuleInfo.idl
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: XLibraryContainer.idl,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,47 +24,52 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef __com_sun_star_script_XVBACompat_idl__
-#define __com_sun_star_script_XVBACompat_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
+#ifndef __com_sun_star_script_vba_XVBAModuleInfo_idl__
+#define __com_sun_star_script_vba_XVBAModuleInfo_idl__
+
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_script_ModuleInfo_idl__
#include <com/sun/star/script/ModuleInfo.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_ElementExistException_idl__
#include <com/sun/star/container/ElementExistException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
//=============================================================================
-module com { module sun { module star { module script {
+module com { module sun { module star { module script { module vba {
-interface XVBAModuleInfo: com::sun::star::uno::XInterface
+interface XVBAModuleInfo
{
+ //-------------------------------------------------------------------------
- com::sun::star::script::ModuleInfo getModuleInfo( [in] string ModuleName )
+ com::sun::star::script::ModuleInfo getModuleInfo( [in] string ModuleName )
raises( com::sun::star::container::NoSuchElementException,
com::sun::star::lang::WrappedTargetException );
- boolean hasModuleInfo( [in] string ModuleName );
+
+ //-------------------------------------------------------------------------
+
+ boolean hasModuleInfo( [in] string ModuleName );
+
+ //-------------------------------------------------------------------------
+
void insertModuleInfo( [in] string ModuleName,
[in] com::sun::star::script::ModuleInfo ModuleInfo )
raises( com::sun::star::lang::IllegalArgumentException,
com::sun::star::container::ElementExistException,
com::sun::star::lang::WrappedTargetException );
+
+ //-------------------------------------------------------------------------
+
void removeModuleInfo( [in] string ModuleName )
raises( com::sun::star::container::NoSuchElementException,
com::sun::star::lang::WrappedTargetException );
-}; }; }; };
+
+ //-------------------------------------------------------------------------
};
+
+}; }; }; }; };
+
+//=============================================================================
+
#endif
diff --git a/offapi/com/sun/star/script/vba/makefile.mk b/offapi/com/sun/star/script/vba/makefile.mk
new file mode 100755
index 000000000000..4657b587d7d8
--- /dev/null
+++ b/offapi/com/sun/star/script/vba/makefile.mk
@@ -0,0 +1,52 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..$/..$/..
+
+PRJNAME=offapi
+
+TARGET=cssscriptvba
+PACKAGE=com$/sun$/star$/script$/vba
+
+# --- Settings -----------------------------------------------------
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
+
+# ------------------------------------------------------------------------
+
+IDLFILES=\
+ VBAEventId.idl \
+ VBAEventProcessor.idl \
+ VBASpreadsheetEventProcessor.idl \
+ VBATextEventProcessor.idl \
+ XVBACompatibility.idl \
+ XVBAEventProcessor.idl \
+ XVBAModuleInfo.idl
+
+# ------------------------------------------------------------------
+
+.INCLUDE : target.mk
+.INCLUDE : $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl b/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl
index bb652252c33e..9f5961731a05 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl
@@ -156,6 +156,14 @@ published service DataPilotSourceDimension
*/
[property] sequence< com::sun::star::sheet::TableFilterField > Filter;
+ //-------------------------------------------------------------------------
+
+ /** contains flags that control the usage of the dimension.
+
+ @see com::sun::star::sheet::DimensionFlags
+ */
+ [readonly, property, optional] long Flags;
+
};
//=============================================================================
diff --git a/offapi/com/sun/star/sheet/DimensionFlags.idl b/offapi/com/sun/star/sheet/DimensionFlags.idl
new file mode 100644
index 000000000000..2edb2368e863
--- /dev/null
+++ b/offapi/com/sun/star/sheet/DimensionFlags.idl
@@ -0,0 +1,74 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_sheet_DimensionFlags_idl__
+#define __com_sun_star_sheet_DimensionFlags_idl__
+
+//=============================================================================
+
+module com { module sun { module star { module sheet {
+
+//=============================================================================
+
+/** used to specify flags for a dimension in a data pilot source.
+
+ @see com::sun::star::sheet::DataPilotSourceDimension
+ */
+published constants DimensionFlags
+{
+ //-------------------------------------------------------------------------
+
+ /** The dimension cannot be used in column orientation.
+ */
+ const long NO_COLUMN_ORIENTATION = 1;
+
+ //-------------------------------------------------------------------------
+
+ /** The dimension cannot be used in row orientation.
+ */
+ const long NO_ROW_ORIENTATION = 2;
+
+ //-------------------------------------------------------------------------
+
+ /** The dimension cannot be used in page orientation.
+ */
+ const long NO_PAGE_ORIENTATION = 4;
+
+ //-------------------------------------------------------------------------
+
+ /** The dimension cannot be used in data orientation.
+ */
+ const long NO_DATA_ORIENTATION = 8;
+
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/sheet/makefile.mk b/offapi/com/sun/star/sheet/makefile.mk
index 016378178f29..65e8d5c40491 100644
--- a/offapi/com/sun/star/sheet/makefile.mk
+++ b/offapi/com/sun/star/sheet/makefile.mk
@@ -122,6 +122,7 @@ IDLFILES=\
DatabaseRange.idl\
DatabaseRanges.idl\
DatabaseRangesEnumeration.idl\
+ DimensionFlags.idl\
DocumentSettings.idl\
ExternalDocLink.idl\
ExternalDocLinks.idl\
diff --git a/offapi/com/sun/star/text/PrintPreviewSettings.idl b/offapi/com/sun/star/text/PrintPreviewSettings.idl
index 392143d061a7..e282cf76536f 100644..100755
--- a/offapi/com/sun/star/text/PrintPreviewSettings.idl
+++ b/offapi/com/sun/star/text/PrintPreviewSettings.idl
@@ -39,6 +39,8 @@
//=============================================================================
/** These properties describe the printing of the content of a text document.
+ *
+ * @deprecated since OOo 3.3
*/
published service PrintPreviewSettings
{
diff --git a/offapi/com/sun/star/util/Color.idl b/offapi/com/sun/star/util/Color.idl
index f6585e0e5723..572324a10715 100644
--- a/offapi/com/sun/star/util/Color.idl
+++ b/offapi/com/sun/star/util/Color.idl
@@ -37,10 +37,10 @@ module com { module sun { module star { module util {
<p>The byte order is from high to low:
<ol>alpha channel
- <li>red
- <li>green
- <li>blue
- </ol>
+ <li>red</li>
+ <li>green</li>
+ <li>blue</li>
+ </ol></p>
*/
published typedef long Color;
diff --git a/offapi/prj/build.lst b/offapi/prj/build.lst
index 8679d924a6c7..e5c9a72f312f 100644
--- a/offapi/prj/build.lst
+++ b/offapi/prj/build.lst
@@ -3,6 +3,7 @@ oa offapi usr1 - all oa_mkout NULL
oa offapi\com\sun\star\script nmake - all oa_script oa_embed NULL
oa offapi\com\sun\star\script\browse nmake - all oa_sfbrowse NULL
oa offapi\com\sun\star\script\provider nmake - all oa_sfprovider NULL
+oa offapi\com\sun\star\script\vba nmake - all oa_script_vba NULL
oa offapi\com\sun\star\auth nmake - all oa_auth NULL
oa offapi\com\sun\star\accessibility nmake - all oa_accessibility oa_awt NULL
oa offapi\com\sun\star\awt nmake - all oa_awt NULL
@@ -22,10 +23,10 @@ oa offapi\com\sun\star\datatransfer\dnd nmake - all oa_datatrans_dnd oa_awt NULL
oa offapi\com\sun\star\deployment nmake - all oa_deployment oa_ucb oa_xml_input NULL
oa offapi\com\sun\star\deployment\test nmake - all oa_deploymenttest oa_ucb NULL
oa offapi\com\sun\star\deployment\ui nmake - all oa_deployment_ui oa_awt oa_ui_dialogs NULL
-oa offapi\com\sun\star\embed nmake - all oa_embed NULL
oa offapi\com\sun\star\document nmake - all oa_docu oa_embed NULL
oa offapi\com\sun\star\drawing nmake - all oa_draw NULL
oa offapi\com\sun\star\drawing\framework nmake - all oa_draw_framework NULL
+oa offapi\com\sun\star\embed nmake - all oa_embed NULL
oa offapi\com\sun\star\form nmake - all oa_form oa_inspection NULL
oa offapi\com\sun\star\form\component nmake - all oa_fcomp oa_form oa_form_submission NULL
oa offapi\com\sun\star\form\inspection nmake - all oa_finsp oa_fcomp oa_inspection NULL
diff --git a/offapi/prj/d.lst b/offapi/prj/d.lst
index d87a435f25c6..a271a7159130 100644
--- a/offapi/prj/d.lst
+++ b/offapi/prj/d.lst
@@ -70,6 +70,7 @@ mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\scanner
mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\script
mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\script\browse
mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\script\provider
+mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\script\vba
mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sdb
mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sdb\application
mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sdb\tools
@@ -187,6 +188,7 @@ mkdir: %COMMON_DEST%\idl%_EXT%\drafts\com\sun\star\form
..\com\sun\star\script\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\script
..\com\sun\star\script\browse\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\script\browse
..\com\sun\star\script\provider\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\script\provider
+..\com\sun\star\script\vba\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\script\vba
..\com\sun\star\sdb\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sdb
..\com\sun\star\sdb\application\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sdb\application
..\com\sun\star\sdb\tools\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sdb\tools
diff --git a/offapi/type_reference/typelibrary_history.txt b/offapi/type_reference/typelibrary_history.txt
index 086397e8967e..7dcd438d5517 100644
--- a/offapi/type_reference/typelibrary_history.txt
+++ b/offapi/type_reference/typelibrary_history.txt
@@ -154,3 +154,7 @@
Update reference type library with the version of OOo 3.2. The new
reference type library is taken from the release source tree OOO320 m12.
+02/06/10 (JSC): TaskID=i112019
+ Update reference type library with the version of OOo 3.2.1. The new
+ reference type library is taken from the release source tree OOO320 m19.
+
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 22b8904052ff..6d9f761331f4 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb
Binary files differ
diff --git a/offapi/util/makefile.mk b/offapi/util/makefile.mk
index 3f684372676b..dd91e2d99456 100644
--- a/offapi/util/makefile.mk
+++ b/offapi/util/makefile.mk
@@ -96,6 +96,7 @@ UNOIDLDBFILES= \
$(UCR)$/cssdomevents.db \
$(UCR)$/cssscanner.db \
$(UCR)$/cssscript.db \
+ $(UCR)$/cssscriptvba.db \
$(UCR)$/csssdb.db \
$(UCR)$/csssdbc.db \
$(UCR)$/csssdbcx.db \