merge origin/master

11 files changed, 54 insertions, 37 deletions

diff --git a/oovbaapi/Makefile b/oovbaapi/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/oovbaapi/Makefile
+++ b/oovbaapi/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/oovbaapi/README b/oovbaapi/README
new file mode 100644
index 000000000000..c9d37eadeb3b
--- /dev/null
+++ b/oovbaapi/README
@@ -0,0 +1,5 @@
+Module for OpenOffice - VisualBasic interoperability.
+
+See also:
+[http://wiki.services.openoffice.org/wiki/VBA]
+[http://wiki.services.openoffice.org/wiki/Oovbaapi]
diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk
index b3d8e20ffe1f..6447d9b62ae0 100644
--- a/oovbaapi/UnoApi_oovbaapi.mk
+++ b/oovbaapi/UnoApi_oovbaapi.mk
@@ -75,6 +75,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba,\
     VbMsgBoxStyle \
     VbQueryClose \
     VbStrConv \
+    SystemColorConstants \
     VbTriState \
     VbVarType \
 	XApplicationBase \
diff --git a/oovbaapi/ooo/vba/SystemColorConstants.idl b/oovbaapi/ooo/vba/SystemColorConstants.idl
new file mode 100644
index 000000000000..e0760f1d6a87
--- /dev/null
+++ b/oovbaapi/ooo/vba/SystemColorConstants.idl
@@ -0,0 +1,31 @@
+module ooo { module vba {
+    constants SystemColorConstants {
+
+    const long vbScrollBars = -2147483648;// 0x80000000;
+    const long vbDesktop = -2147483647; //0x80000001;
+    const long vbActiveTitleBar = -2147483646; //0x80000002;
+    const long vbInactiveTitleBar = -2147483645; //0x80000003;
+    const long vbMenuBar = -2147483644; //0x80000004;
+    const long vbWindowBackground = -2147483643; //0x80000005;
+    const long vbWindowFrame = -2147483642; //0x80000006;
+    const long vbMenuText = -2147483641; //0x80000007;
+    const long vbWindowText = -2147483640; //0x80000008;
+    const long vbTitleBarText = -2147483639; //0x80000009;
+    const long vbActiveBorder = -2147483638; //0x8000000A;
+    const long vbInactiveBorder = -2147483637; //0x8000000B;
+    const long vbApplicationWorkspace = -2147483636; //0x8000000C;
+    const long vbHighlight = -2147483635; //0x8000000D;
+    const long vbHighlightText = -2147483634; //0x8000000E;
+    const long vbButtonFace = -2147483633; //0x8000000F;
+    const long vbButtonShadow = -2147483632; //0x80000010;
+    const long vbGrayText = -2147483631; //0x80000011;
+    const long vbButtonText = -2147483630; //0x80000012;
+    const long vbInactiveCaptionText = -2147483629; //0x80000013;
+    const long vb3DHighlight = -2147483628; //0x80000014;
+    const long vb3DDKShadow = -2147483627; //0x80000015;
+    const long vb3DLight = -2147483626; //0x80000016;
+    const long vbInfoText = -2147483625; //0x80000017;
+    const long vbInfoBackground = -2147483624; //0x80000018;
+
+    };
+}; };
diff --git a/oovbaapi/ooo/vba/XApplicationBase.idl b/oovbaapi/ooo/vba/XApplicationBase.idl
index d46eb2446e31..93f39aed3ff7 100644
--- a/oovbaapi/ooo/vba/XApplicationBase.idl
+++ b/oovbaapi/ooo/vba/XApplicationBase.idl
@@ -47,7 +47,7 @@ interface XApplicationBase
     [attribute, readonly] any VBE;
 
     void Quit();
-
+    void OnKey( [in] string Key, [in] any Procedure );
     any CommandBars( [in] any Index );
     any Run([in] string MacroName, [in] /*Optional*/ any varg1, [in] /*Optional*/ any varg2, [in] /*Optional*/ any varg3, [in] /*Optional*/ any varg4, [in] /*Optional*/ any varg5, [in] /*Optional*/ any varg6, [in] /*Optional*/ any varg7, [in] /*Optional*/ any varg8, [in] /*Optional*/ any varg9, [in] /*Optional*/ any varg10, [in] /*Optional*/ any varg11, [in] /*Optional*/ any varg12, [in] /*Optional*/ any varg13, [in] /*Optional*/ any varg14, [in] /*Optional*/ any varg15, [in] /*Optional*/ any varg16, [in] /*Optional*/ any varg17, [in] /*Optional*/ any varg18, [in] /*Optional*/ any varg19, [in] /*Optional*/ any varg20, [in] /*Optional*/ any varg21, [in] /*Optional*/ any varg22, [in] /*Optional*/ any varg23, [in] /*Optional*/ any varg24, [in] /*Optional*/ any varg25, [in] /*Optional*/ any varg26, [in] /*Optional*/ any varg27, [in] /*Optional*/ any varg28, [in] /*Optional*/ any varg29, [in] /*Optional*/ any varg30);
     void OnTime( [in] any EarliestTime, [in] string Procedure, [in] any LatestTime, [in] any Schedule );
diff --git a/oovbaapi/ooo/vba/msforms/XCheckBox.idl b/oovbaapi/ooo/vba/msforms/XCheckBox.idl
index ec2c7136383e..fc58d3e286f0 100644
--- a/oovbaapi/ooo/vba/msforms/XCheckBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XCheckBox.idl
@@ -39,6 +39,9 @@ interface XCheckBox: com::sun::star::uno::XInterface
 {
     [attribute] string Caption;
     [attribute] any Value;
+    [attribute] long BackColor;
+    [attribute] boolean AutoSize;
+    [attribute] boolean Locked;
     [attribute, readonly] XNewFont Font;
 };
 
diff --git a/oovbaapi/ooo/vba/msforms/XComboBox.idl b/oovbaapi/ooo/vba/msforms/XComboBox.idl
index 77b5e950d938..7eacf254456c 100644
--- a/oovbaapi/ooo/vba/msforms/XComboBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XComboBox.idl
@@ -49,6 +49,9 @@ interface XComboBox
     [attribute] long EnterFieldBehavior;
     [attribute] long ListStyle;
     [attribute] long TextAlign;
+    [attribute] long BackColor;
+    [attribute] boolean AutoSize;
+    [attribute] boolean Locked;
     [attribute, readonly] long TextLength;
     [attribute, readonly] XNewFont Font;
 
diff --git a/oovbaapi/ooo/vba/msforms/XCommandButton.idl b/oovbaapi/ooo/vba/msforms/XCommandButton.idl
index 0e7697cbd162..d71472e2744f 100644
--- a/oovbaapi/ooo/vba/msforms/XCommandButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XCommandButton.idl
@@ -39,11 +39,12 @@ module ooo {  module vba {  module msforms {
 interface XCommandButton
 {
     [attribute] string Caption;
-    [attribute] boolean AutoSize;
     [attribute] boolean Cancel;
     [attribute] boolean Default;
     [attribute] long BackColor;
     [attribute] long ForeColor;
+    [attribute] boolean AutoSize;
+    [attribute] boolean Locked;
     [attribute, readonly] XNewFont Font;
 };
 
diff --git a/oovbaapi/ooo/vba/msforms/XImage.idl b/oovbaapi/ooo/vba/msforms/XImage.idl
index 2c77aace76e5..ec40c4a32892 100644
--- a/oovbaapi/ooo/vba/msforms/XImage.idl
+++ b/oovbaapi/ooo/vba/msforms/XImage.idl
@@ -35,6 +35,7 @@ module ooo {  module vba {  module msforms {
 //=============================================================================
 interface XImage: com::sun::star::uno::XInterface
 {
+    [attribute] long BackColor;
 };
 
 //=============================================================================
diff --git a/oovbaapi/ooo/vba/msforms/XLabel.idl b/oovbaapi/ooo/vba/msforms/XLabel.idl
index 10a92dc20184..c0ed739312d5 100644
--- a/oovbaapi/ooo/vba/msforms/XLabel.idl
+++ b/oovbaapi/ooo/vba/msforms/XLabel.idl
@@ -42,6 +42,8 @@ interface XLabel
     [attribute] string Caption;
     [attribute] any Value;
     [attribute] string Accelerator;
+    [attribute] long BackColor;
+    [attribute] boolean AutoSize;
     [attribute, readonly] XNewFont Font;
 };
 
diff --git a/oovbaapi/ooo/vba/msforms/XTextBox.idl b/oovbaapi/ooo/vba/msforms/XTextBox.idl
index 75aaf836817f..1dceb861bdf2 100644
--- a/oovbaapi/ooo/vba/msforms/XTextBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XTextBox.idl
@@ -45,6 +45,9 @@ interface XTextBox
     [attribute] boolean Multiline;
     [attribute] long SpecialEffect;
     [attribute] long BorderStyle;
+    [attribute] long BackColor;
+    [attribute] boolean AutoSize;
+    [attribute] boolean Locked;
     [attribute, readonly] long TextLength;
     [attribute, readonly] XNewFont Font;
 };