sb123: merged in DEV300_m87

39 files changed, 1176 insertions, 104 deletions

diff --git a/cli_ure/version/version.txt b/cli_ure/version/version.txt
index 15dac78d4ed8..8cbdedf654d4 100644
--- a/cli_ure/version/version.txt
+++ b/cli_ure/version/version.txt
@@ -25,23 +25,23 @@
 #
 #*************************************************************************
 
-CLI_URETYPES_NEW_VERSION=1.0.6.0
-CLI_URETYPES_OLD_VERSION=1.0.0.0-1.0.5.0
-CLI_URETYPES_POLICY_VERSION=6.0.0.0	
+CLI_URETYPES_NEW_VERSION=1.0.7.0
+CLI_URETYPES_OLD_VERSION=1.0.0.0-1.0.6.0
+CLI_URETYPES_POLICY_VERSION=7.0.0.0	
 CLI_URETYPES_POLICY_ASSEMBLY=policy.1.0.cli_uretypes
 
-CLI_BASETYPES_NEW_VERSION=1.0.17.0
-CLI_BASETYPES_OLD_VERSION=1.0.0.0-1.0.16.0
-CLI_BASETYPES_POLICY_VERSION=17.0.0.0
+CLI_BASETYPES_NEW_VERSION=1.0.18.0
+CLI_BASETYPES_OLD_VERSION=1.0.0.0-1.0.17.0
+CLI_BASETYPES_POLICY_VERSION=18.0.0.0
 CLI_BASETYPES_POLICY_ASSEMBLY=policy.1.0.cli_basetypes
 
-CLI_URE_NEW_VERSION=1.0.20.0
-CLI_URE_OLD_VERSION=1.0.0.0-1.0.19.0    
-CLI_URE_POLICY_VERSION=20.0.0.0
+CLI_URE_NEW_VERSION=1.0.21.0
+CLI_URE_OLD_VERSION=1.0.0.0-1.0.20.0    
+CLI_URE_POLICY_VERSION=21.0.0.0
 CLI_URE_POLICY_ASSEMBLY=policy.1.0.cli_ure
 
-CLI_CPPUHELPER_NEW_VERSION=1.0.20.0
-CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.19.0
-CLI_CPPUHELPER_POLICY_VERSION=20.0.0.0
+CLI_CPPUHELPER_NEW_VERSION=1.0.21.0
+CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.20.0
+CLI_CPPUHELPER_POLICY_VERSION=21.0.0.0
 CLI_CPPUHELPER_POLICY_ASSEMBLY=policy.1.0.cli_cppuhelper
-
+ 
diff --git a/cpputools/source/registercomponent/registercomponent.cxx b/cpputools/source/registercomponent/registercomponent.cxx
index 70e469ddba23..c487d95c59a5 100644
--- a/cpputools/source/registercomponent/registercomponent.cxx
+++ b/cpputools/source/registercomponent/registercomponent.cxx
@@ -66,10 +66,6 @@ using com::sun::star::container::XSet;
 using com::sun::star::container::XContentEnumerationAccess;
 using com::sun::star::container::XEnumeration;
 
-#ifdef SAL_W32
-#define putenv _putenv
-#endif
-
 namespace {
 
 OUString replacePrefix(OUString const & url, OUString const & prefix) {
@@ -313,14 +309,9 @@ sal_Bool parseOptions(int ac, char* av[], Options& rOptions, sal_Bool bCmdFile)
                         i++;
                         if( i < ac )
                         {
-                            // leak this string as some platforms assume to own
-                            // the pointer
-                            sal_Char * p = (sal_Char *) rtl_allocateMemory( 13+ strlen( av[i] ) );
-                            p[0] = 0;
-                            strcat( p, "CLASSPATH=" ); // #100211# - checked
-                            strcat( p, av[i] );        // #100211# - checked
-
-                            putenv( p );
+                            rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("CLASSPATH"));
+                            rtl::OUString envValue(av[i], strlen(av[i]), osl_getThreadTextEncoding());
+                            osl_setEnvironment(envVar.pData, envValue.pData);
                         }
                         break;
                     }
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 55734fd75ca6..a6357703500c 100644
--- a/offapi/com/sun/star/awt/makefile.mk
+++ b/offapi/com/sun/star/awt/makefile.mk
@@ -278,10 +278,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/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/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 a0be2398f429..bc6dda566031 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
@@ -21,10 +22,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
@@ -105,4 +106,4 @@ oa	offapi\com\sun\star\rendering	        nmake	-	all oa_rendering oa_geometry NU
 oa	offapi\com\sun\star\rdf	                nmake	-	all oa_rdf  oa_datatransfer oa_text NULL
 oa	offapi\com\sun\star\office              nmake	-	all oa_office oa_text NULL
 oa	offapi\drafts\com\sun\star\form         nmake	-	all	oa_drafts_form NULL
-oa  offapi\util                             nmake   -   all oa_util oa_auth oa_awt oa_awttree oa_awtgrid oa_chart oa_chart2 oa_chart2_data oa_config oa_configbootstrap oa_configbackend oa_configbackend_xml oa_datatrans_clip oa_datatrans_dnd oa_datatransfer oa_docu oa_draw oa_draw_framework oa_embed oa_fcomp oa_finsp oa_fcontr oa_fieldmaster oa_form oa_xforms oa_formula oa_frame oa_i18n oa_inst oa_ldap oa_ling2 oa_logging oa_mail oa_media oa_mozilla oa_packages oa_manifest oa_zippackage oa_plug oa_pres oa_animations oa_putil oa_resrc oa_sax oa_xml_input oa_scan oa_sdb oa_sdbtools oa_sdbapp oa_sdbc oa_sdbcx oa_setup oa_sheet oa_style oa_svg oa_sync oa_sync2 oa_system oa_table oa_task oa_text oa_textfield oa_docinfo oa_ucb oa_view oa_xml oa_xml_dom oa_xml_xpath oa_xml_views oa_xml_events oa_image oa_xsd oa_inspection oa_ui oa_ui_dialogs oa_accessibility oa_form_binding oa_form_validation oa_form_submission oa_fruntime oa_geometry oa_rendering oa_sfprovider oa_sfbrowse oa_drafts_form oa_deployment oa_deploymenttest oa_deployment_ui oa_frame_status oa_gallery oa_graphic oa_security oa_crypto_sax oa_crypto oa_csax oa_wrapper oa_script oa_smarttags oa_report oa_reportins oa_reportmeta oa_rdf oa_oooimprovement oa_office oa_prestextfield oa_starme NULL
+oa  offapi\util                             nmake   -   all oa_util oa_auth oa_awt oa_awttree oa_awtgrid oa_chart oa_chart2 oa_chart2_data oa_config oa_configbootstrap oa_configbackend oa_configbackend_xml oa_datatrans_clip oa_datatrans_dnd oa_datatransfer oa_docu oa_draw oa_draw_framework oa_embed oa_fcomp oa_finsp oa_fcontr oa_fieldmaster oa_form oa_xforms oa_formula oa_frame oa_i18n oa_inst oa_ldap oa_ling2 oa_logging oa_mail oa_media oa_mozilla oa_packages oa_manifest oa_zippackage oa_plug oa_pres oa_animations oa_putil oa_resrc oa_sax oa_xml_input oa_scan oa_sdb oa_sdbtools oa_sdbapp oa_sdbc oa_sdbcx oa_setup oa_sheet oa_style oa_svg oa_sync oa_sync2 oa_system oa_table oa_task oa_text oa_textfield oa_docinfo oa_ucb oa_view oa_xml oa_xml_dom oa_xml_xpath oa_xml_views oa_xml_events oa_image oa_xsd oa_inspection oa_ui oa_ui_dialogs oa_accessibility oa_form_binding oa_form_validation oa_form_submission oa_fruntime oa_geometry oa_rendering oa_sfprovider oa_sfbrowse oa_drafts_form oa_deployment oa_deploymenttest oa_deployment_ui oa_frame_status oa_gallery oa_graphic oa_security oa_crypto_sax oa_crypto oa_csax oa_wrapper oa_script oa_script_vba oa_smarttags oa_report oa_reportins oa_reportmeta oa_rdf oa_oooimprovement oa_office oa_prestextfield oa_starme NULL
diff --git a/offapi/prj/d.lst b/offapi/prj/d.lst
index 9532cd773c6f..764521f3e944 100644
--- a/offapi/prj/d.lst
+++ b/offapi/prj/d.lst
@@ -69,6 +69,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
@@ -185,6 +186,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
diff --git a/offapi/util/makefile.mk b/offapi/util/makefile.mk
index 0ed4feba57b6..016180d7765c 100644
--- a/offapi/util/makefile.mk
+++ b/offapi/util/makefile.mk
@@ -95,6 +95,7 @@ UNOIDLDBFILES= \
     $(UCR)$/cssdomevents.db \
     $(UCR)$/cssscanner.db \
     $(UCR)$/cssscript.db \
+    $(UCR)$/cssscriptvba.db \
     $(UCR)$/csssdb.db \
     $(UCR)$/csssdbc.db \
     $(UCR)$/csssdbcx.db \
diff --git a/offuh/prj/d.lst b/offuh/prj/d.lst
index ba7343039eae..a88257dc695d 100644
--- a/offuh/prj/d.lst
+++ b/offuh/prj/d.lst
@@ -72,6 +72,7 @@ mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\sdbc
 mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\sdbcx
 mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\scanner
 mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\script
+mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\script\vba
 mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\sheet
 mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\smarttags
 mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\style
@@ -271,6 +272,8 @@ mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\rdf
 ..\%__SRC%\inc\offuh\com\sun\star\scanner\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\scanner\*.hpp
 ..\%__SRC%\inc\offuh\com\sun\star\script\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\script\*.hdl
 ..\%__SRC%\inc\offuh\com\sun\star\script\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\script\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\script\vba\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\script\vba\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\script\vba\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\script\vba\*.hpp
 ..\%__SRC%\inc\offuh\com\sun\star\sheet\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\sheet\*.hdl
 ..\%__SRC%\inc\offuh\com\sun\star\sheet\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\sheet\*.hpp
 ..\%__SRC%\inc\offuh\com\sun\star\smarttags\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\smarttags\*.hdl
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index 57e893744f5f..98d328b14a0f 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -123,8 +123,7 @@ static void setPythonHome ( const OUString & pythonHome )
 
 static void prependPythonPath( const OUString & pythonPathBootstrap )
 {
-    rtl::OStringBuffer bufPYTHONPATH( 256 );
-    bufPYTHONPATH.append( "PYTHONPATH=");
+    rtl::OUStringBuffer bufPYTHONPATH( 256 );
     sal_Int32 nIndex = 0;
     while( 1 )
     {
@@ -140,21 +139,19 @@ static void prependPythonPath( const OUString & pythonPathBootstrap )
         }
         OUString systemPath;
         osl_getSystemPathFromFileURL( fileUrl.pData, &(systemPath.pData) );
-        bufPYTHONPATH.append( rtl::OUStringToOString( systemPath.pData, osl_getThreadTextEncoding() ));
-        bufPYTHONPATH.append( SAL_PATHSEPARATOR );
+        bufPYTHONPATH.append( systemPath );
+        bufPYTHONPATH.append( static_cast<sal_Unicode>(SAL_PATHSEPARATOR) );
         if( nNew == -1 )
             break;
         nIndex = nNew + 1;
     }
     const char * oldEnv = getenv( "PYTHONPATH");
     if( oldEnv )
-        bufPYTHONPATH.append( oldEnv );
-    OString result = bufPYTHONPATH.makeStringAndClear();
-    rtl_string_acquire( result.pData );
-
-//     printf( "Setting %s\n" , result.pData->buffer );
-    putenv( result.pData->buffer );
+        bufPYTHONPATH.append( rtl::OUString(oldEnv, strlen(oldEnv), osl_getThreadTextEncoding()) );
 
+    rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("PYTHONPATH"));
+    rtl::OUString envValue(bufPYTHONPATH.makeStringAndClear());
+    osl_setEnvironment(envVar.pData, envValue.pData);
 }
 
 Reference< XInterface > CreateInstance( const Reference< XComponentContext > & ctx )
diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx
index 1082e6ff9844..ac99601f5ce5 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -31,6 +31,7 @@
 #include <cstdlib>
 #include <iostream>
 
+#include "preextstl.h"
 #include "cppunit/CompilerOutputter.h"
 #include "cppunit/TestResult.h"
 #include "cppunit/TestResultCollector.h"
@@ -38,6 +39,7 @@
 #include "cppunit/extensions/TestFactoryRegistry.h"
 #include "cppunit/plugin/PlugInManager.h"
 #include "cppunit/portability/Stream.h"
+#include "postextstl.h"
 #include "osl/thread.h"
 #include "rtl/process.h"
 #include "rtl/string.hxx"
diff --git a/sal/cppunittester/makefile.mk b/sal/cppunittester/makefile.mk
index 938b63d90ae9..61fe7868c9f3 100644
--- a/sal/cppunittester/makefile.mk
+++ b/sal/cppunittester/makefile.mk
@@ -33,6 +33,13 @@ ENABLE_EXCEPTIONS = TRUE
 
 .INCLUDE: settings.mk
 
+#building with stlport, but cppunit was not built with stlport
+.IF "$(USE_SYSTEM_STL)"!="YES"
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGSCXX+=-DADAPT_EXT_STL
+.ENDIF
+.ENDIF
+
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 OBJFILES = $(APP1OBJS)
diff --git a/sal/inc/osl/process.h b/sal/inc/osl/process.h
index 73892bccebe0..0a0d3f6eaf7c 100644
--- a/sal/inc/osl/process.h
+++ b/sal/inc/osl/process.h
@@ -388,6 +388,21 @@ void SAL_CALL osl_setCommandArgs (int argc, char **argv);
 */
 oslProcessError SAL_CALL osl_getEnvironment(rtl_uString *strVar, rtl_uString **strValue);
 
+/** Set the value of one enviroment variable.
+    @param strVar [in] denotes the name of the variable to set.
+    @param strValue [in] string of the new value of environment variable.
+
+    @since UDK 3.2.13
+*/
+oslProcessError SAL_CALL osl_setEnvironment(rtl_uString *strVar, rtl_uString *strValue);
+
+/** Unsets the value of one enviroment variable.
+    @param strVar [in] denotes the name of the variable to unset.
+
+    @since UDK 3.2.13
+*/
+oslProcessError SAL_CALL osl_clearEnvironment(rtl_uString *strVar);
+
 /** Get the working directory of the current process as a file URL.
 
     The file URL is encoded as common for the OSL file API.
diff --git a/sal/osl/os2/process_impl.cxx b/sal/osl/os2/process_impl.cxx
index 27b12bbe0f6a..be6bb1898e65 100644
--- a/sal/osl/os2/process_impl.cxx
+++ b/sal/osl/os2/process_impl.cxx
@@ -282,6 +282,98 @@ oslProcessError SAL_CALL osl_getEnvironment(rtl_uString* pustrEnvVar, rtl_uStrin
 }
 
 /***************************************
+ osl_setEnvironment().
+ **************************************/
+oslProcessError SAL_CALL osl_setEnvironment(rtl_uString* pustrEnvVar, rtl_uString* pustrValue)
+{
+    oslProcessError  result   = osl_Process_E_Unknown;
+    rtl_TextEncoding encoding = osl_getThreadTextEncoding();
+    rtl_String* pstr_env_var  = 0;
+    rtl_String* pstr_val  = 0;
+
+    OSL_PRECOND(pustrEnvVar, "osl_setEnvironment(): Invalid parameter");
+    OSL_PRECOND(pustrValue, "osl_setEnvironment(): Invalid parameter");
+
+    rtl_uString2String(
+        &pstr_env_var,
+        rtl_uString_getStr(pustrEnvVar), rtl_uString_getLength(pustrEnvVar), encoding,
+        OUSTRING_TO_OSTRING_CVTFLAGS);
+
+    rtl_uString2String(
+        &pstr_val,
+        rtl_uString_getStr(pustrValue), rtl_uString_getLength(pustrValue), encoding,
+        OUSTRING_TO_OSTRING_CVTFLAGS);
+
+    if (pstr_env_var != 0 && pstr_val != 0)
+    {
+        //Can't determine if OS/2 EMX has a working setenv or not, so use putenv,
+        //feel free to use setenv here if its available and works
+        rtl_String * pBuffer = NULL;
+
+        sal_Int32 nCapacity = rtl_stringbuffer_newFromStringBuffer( &pBuffer,
+            rtl_string_getLength(pstr_env_var) + rtl_string_getLength(pstr_val) + 1,
+            pstr_env_var );
+        rtl_stringbuffer_insert( &pBuffer, &nCapacity, pBuffer->length, "=", 1);
+        rtl_stringbuffer_insert( &pBuffer, &nCapacity, pBuffer->length,
+            rtl_string_getStr(pstr_val), rtl_string_getLength(pstr_val) );
+
+        rtl_string_acquire(pBuffer); // argument to putenv must leak on success
+
+        if (putenv(rtl_string_getStr(pBuffer)) == 0)
+            result = osl_Process_E_None;
+        else
+            rtl_string_release(pBuffer);
+    }
+
+    if (pstr_val)
+        rtl_string_release(pstr_val);
+
+    if (pstr_env_var != 0)
+        rtl_string_release(pstr_env_var);
+
+    return (result);
+}
+
+/***************************************
+ osl_clearEnvironment().
+ **************************************/
+oslProcessError SAL_CALL osl_clearEnvironment(rtl_uString* pustrEnvVar)
+{
+    oslProcessError  result   = osl_Process_E_Unknown;
+    rtl_TextEncoding encoding = osl_getThreadTextEncoding();
+    rtl_String* pstr_env_var  = 0;
+
+    OSL_PRECOND(pustrEnvVar, "osl_setEnvironment(): Invalid parameter");
+
+    rtl_uString2String(
+        &pstr_env_var,
+        rtl_uString_getStr(pustrEnvVar), rtl_uString_getLength(pustrEnvVar), encoding,
+        OUSTRING_TO_OSTRING_CVTFLAGS);
+
+    if (pstr_env_var)
+    {
+        //Can't determine if OS/2 EMX has a working unsetenv or not, so use putenv,
+        //feel free to use unsetenv here if its available and works
+        rtl_String * pBuffer = NULL;
+
+        sal_Int32 nCapacity = rtl_stringbuffer_newFromStringBuffer( &pBuffer,
+            rtl_string_getLength(pstr_env_var) + 1, pstr_env_var );
+        rtl_stringbuffer_insert( &pBuffer, &nCapacity, pBuffer->length, "=", 1);
+
+        rtl_string_acquire(pBuffer); // argument to putenv must leak on success
+
+        if (putenv(rtl_string_getStr(pBuffer)) == 0)
+            result = osl_Process_E_None;
+        else
+            rtl_string_release(pBuffer);
+
+        rtl_string_release(pstr_env_var);
+    }
+
+    return (result);
+}
+
+/***************************************
  osl_getProcessWorkingDir().
  **************************************/
 oslProcessError SAL_CALL osl_getProcessWorkingDir(rtl_uString **ppustrWorkingDir)
diff --git a/sal/osl/os2/system.h b/sal/osl/os2/system.h
index ac7e410c5a34..436ae0074a04 100644
--- a/sal/osl/os2/system.h
+++ b/sal/osl/os2/system.h
@@ -356,8 +356,7 @@ char *macxp_tempnam( const char *tmpdir, const char *prefix );
 #if !defined(_WIN32)  && !defined(_WIN16) && !defined(OS2)  && \
     !defined(LINUX)   && !defined(NETBSD) && !defined(FREEBSD) && !defined(SCO)  && \
     !defined(AIX)     && !defined(HPUX)   && \
-    !defined(SOLARIS) && !defined(MAC) && \
-    !defined(MACOSX)
+    !defined(SOLARIS) && !defined(MACOSX)
 #   error "Target plattform not specified !"
 #endif
 
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index e712b6748e7f..66c0d0f5c701 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -50,10 +50,11 @@
 #define INCLUDED_STRING_H
 #endif
 #include "osl/diagnose.h"
-#include <osl/file.h>
+#include "osl/file.h"
 #include "osl/module.h"
 #include "osl/thread.h"
 #include "rtl/ustring.hxx"
+#include "rtl/strbuf.h"
 
 #ifndef _OSL_FILE_PATH_HELPER_H_
 #include "file_path_helper.h"
@@ -324,6 +325,110 @@ oslProcessError SAL_CALL osl_getEnvironment(rtl_uString* pustrEnvVar, rtl_uStrin
 }
 
 /***************************************
+ osl_setEnvironment().
+ **************************************/
+oslProcessError SAL_CALL osl_setEnvironment(rtl_uString* pustrEnvVar, rtl_uString* pustrValue)
+{
+    oslProcessError  result   = osl_Process_E_Unknown;
+    rtl_TextEncoding encoding = osl_getThreadTextEncoding();
+    rtl_String* pstr_env_var  = 0;
+    rtl_String* pstr_val  = 0;
+
+    OSL_PRECOND(pustrEnvVar, "osl_setEnvironment(): Invalid parameter");
+    OSL_PRECOND(pustrValue, "osl_setEnvironment(): Invalid parameter");
+
+    rtl_uString2String(
+        &pstr_env_var,
+        rtl_uString_getStr(pustrEnvVar), rtl_uString_getLength(pustrEnvVar), encoding,
+        OUSTRING_TO_OSTRING_CVTFLAGS);
+
+    rtl_uString2String(
+        &pstr_val,
+        rtl_uString_getStr(pustrValue), rtl_uString_getLength(pustrValue), encoding,
+        OUSTRING_TO_OSTRING_CVTFLAGS);
+
+    if (pstr_env_var != 0 && pstr_val != 0)
+    {
+#if defined (SOLARIS)
+        rtl_String * pBuffer = NULL;
+
+        sal_Int32 nCapacity = rtl_stringbuffer_newFromStringBuffer( &pBuffer,
+            rtl_string_getLength(pstr_env_var) + rtl_string_getLength(pstr_val) + 1,
+            pstr_env_var );
+        rtl_stringbuffer_insert( &pBuffer, &nCapacity, pBuffer->length, "=", 1);
+        rtl_stringbuffer_insert( &pBuffer, &nCapacity, pBuffer->length,
+            rtl_string_getStr(pstr_val), rtl_string_getLength(pstr_val) );
+
+        rtl_string_acquire(pBuffer); // argument to putenv must leak on success
+
+        if (putenv(rtl_string_getStr(pBuffer)) == 0)
+            result = osl_Process_E_None;
+        else
+            rtl_string_release(pBuffer);
+#else
+        if (setenv(rtl_string_getStr(pstr_env_var), rtl_string_getStr(pstr_val), 1) == 0)
+            result = osl_Process_E_None;
+#endif
+    }
+
+    if (pstr_val)
+        rtl_string_release(pstr_val);
+
+    if (pstr_env_var != 0)
+        rtl_string_release(pstr_env_var);
+
+    return (result);
+}
+
+/***************************************
+ osl_clearEnvironment().
+ **************************************/
+oslProcessError SAL_CALL osl_clearEnvironment(rtl_uString* pustrEnvVar)
+{
+    oslProcessError  result   = osl_Process_E_Unknown;
+    rtl_TextEncoding encoding = osl_getThreadTextEncoding();
+    rtl_String* pstr_env_var  = 0;
+
+    OSL_PRECOND(pustrEnvVar, "osl_setEnvironment(): Invalid parameter");
+
+    rtl_uString2String(
+        &pstr_env_var,
+        rtl_uString_getStr(pustrEnvVar), rtl_uString_getLength(pustrEnvVar), encoding,
+        OUSTRING_TO_OSTRING_CVTFLAGS);
+
+    if (pstr_env_var)
+    {
+#if defined (SOLARIS)
+        rtl_String * pBuffer = NULL;
+
+        sal_Int32 nCapacity = rtl_stringbuffer_newFromStringBuffer( &pBuffer,
+            rtl_string_getLength(pstr_env_var) + 1, pstr_env_var );
+        rtl_stringbuffer_insert( &pBuffer, &nCapacity, pBuffer->length, "=", 1);
+
+        rtl_string_acquire(pBuffer); // argument to putenv must leak on success
+
+        if (putenv(rtl_string_getStr(pBuffer)) == 0)
+            result = osl_Process_E_None;
+        else
+            rtl_string_release(pBuffer);
+#elif (defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
+        //MacOSX baseline is 10.4, which has an old-school void return
+        //for unsetenv.
+                //See: http://developer.apple.com/mac/library/documentation/Darwin/Reference/ManPages/10.4/man3/unsetenv.3.html?useVersion=10.4
+        unsetenv(rtl_string_getStr(pstr_env_var));
+        result = osl_Process_E_None;
+#else
+        if (unsetenv(rtl_string_getStr(pstr_env_var)) == 0)
+            result = osl_Process_E_None;
+#endif
+        rtl_string_release(pstr_env_var);
+    }
+
+    return (result);
+}
+
+
+/***************************************
  osl_getProcessWorkingDir().
  **************************************/
 oslProcessError SAL_CALL osl_getProcessWorkingDir(rtl_uString **ppustrWorkingDir)
diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx
index 96187be7e203..521ac6f76ad4 100644
--- a/sal/osl/w32/process.cxx
+++ b/sal/osl/w32/process.cxx
@@ -413,6 +413,25 @@ oslProcessError SAL_CALL osl_getEnvironment(rtl_uString *ustrVar, rtl_uString **
     return osl_Process_E_Unknown;
 }
 
+oslProcessError SAL_CALL osl_setEnvironment(rtl_uString *ustrVar, rtl_uString *ustrValue)
+{
+    LPCWSTR lpName = reinterpret_cast<LPCWSTR>(ustrVar->buffer);
+    LPCWSTR lpValue = reinterpret_cast<LPCWSTR>(ustrValue->buffer);
+    if (SetEnvironmentVariableW(lpName, lpValue))
+        return osl_Process_E_None;
+    return osl_Process_E_Unknown;
+}
+
+oslProcessError SAL_CALL osl_clearEnvironment(rtl_uString *ustrVar)
+{
+    //If the second parameter is NULL, the variable is deleted from the current
+    //process's environment.
+    LPCWSTR lpName = reinterpret_cast<LPCWSTR>(ustrVar->buffer);
+    if (SetEnvironmentVariableW(lpName, NULL))
+        return osl_Process_E_None;
+    return osl_Process_E_Unknown;
+}
+
 /***************************************************************************
  * Current Working Directory.
  ***************************************************************************/
diff --git a/sal/osl/w32/salinit.cxx b/sal/osl/w32/salinit.cxx
index aea584f67970..ab124620a07c 100644
--- a/sal/osl/w32/salinit.cxx
+++ b/sal/osl/w32/salinit.cxx
@@ -40,6 +40,26 @@ extern "C" {
 
 void SAL_CALL sal_detail_initialize(int argc, char ** argv)
 {
+    // SetProcessDEPPolicy(PROCESS_DEP_ENABLE);
+    // SetDllDirectoryW(L"");
+    // SetSearchPathMode(
+    //   BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE | BASE_SEARCH_PATH_PERMANENT);
+    HMODULE h = GetModuleHandleW(L"kernel32.dll");
+    if (h != 0) {
+        FARPROC p = GetProcAddress(h, "SetProcessDEPPolicy");
+        if (p != 0) {
+            reinterpret_cast< BOOL (WINAPI *)(DWORD) >(p)(0x00000001);
+    }
+    p = GetProcAddress(h, "SetDllDirectoryW");
+        if (p != 0) {
+            reinterpret_cast< BOOL (WINAPI *)(LPCWSTR) >(p)(L"");
+        }
+        p = GetProcAddress(h, "SetSearchPathMode");
+        if (p != 0) {
+            reinterpret_cast< BOOL (WINAPI *)(DWORD) >(p)(0x8001);
+        }
+    }
+
     WSADATA wsaData;
     int     error;
     WORD    wVersionRequested;
diff --git a/sal/rtl/source/makefile.mk b/sal/rtl/source/makefile.mk
index 82b9394ee90c..9968d8992be4 100644
--- a/sal/rtl/source/makefile.mk
+++ b/sal/rtl/source/makefile.mk
@@ -46,7 +46,7 @@ TARGETTYPE=CUI
 
 .INCLUDE :  settings.mk
 
-.IF "$(ALLOC)" == "SYS_ALLOC" || "$(ALLOC)" == "TCMALLOC"
+.IF "$(ALLOC)" == "SYS_ALLOC" || "$(ALLOC)" == "TCMALLOC" || "$(ALLOC)" == "JEMALLOC"
 CDEFS+= -DFORCE_SYSALLOC
 .ENDIF
 
diff --git a/sal/util/sal.map b/sal/util/sal.map
index d5faa563ae3f..8b1c079ec899 100755
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -597,6 +597,13 @@ UDK_3.10 { # OOo 3.2
         rtl_math_acosh;
 } UDK_3.9;
 
+
+UDK_3.11 { # OOo 3.4
+    global:
+        osl_setEnvironment;
+        osl_clearEnvironment;
+} UDK_3.10;
+
 PRIVATE_1.0 {
     global:
         osl_detail_ObjectRegistry_storeAddresses;
diff --git a/unoil/climaker/version.txt b/unoil/climaker/version.txt
index f3c80f838ad3..2678d1bc035b 100644
--- a/unoil/climaker/version.txt
+++ b/unoil/climaker/version.txt
@@ -25,8 +25,8 @@
 #
 #*************************************************************************
 
-CLI_OOOTYPES_NEW_VERSION=1.0.6.0
-CLI_OOOTYPES_OLD_VERSION=1.0.0.0-1.0.5.0
-CLI_OOOTYPES_POLICY_VERSION=6.0.0.0	
+CLI_OOOTYPES_NEW_VERSION=1.0.7.0
+CLI_OOOTYPES_OLD_VERSION=1.0.0.0-1.0.6.0
+CLI_OOOTYPES_POLICY_VERSION=7.0.0.0	
 CLI_OOOTYPES_POLICY_ASSEMBLY=policy.1.0.cli_oootypes