summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-09-11 10:23:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-09-11 10:26:13 +0200
commit419d5631a5612122f3a84f7e73d7aec26885e9db (patch)
tree9ba04d3c12d3e1a08b728c0011609e905dacdb94
parent5a6272552eab140886aa0fb7dae18fc58de9fb42 (diff)
Put every UNOIDL entity into an .idl file of its own
...so that future type manager mechanisms to access entities directly from .idl files can work. Generation of C++ headers for XDrawings and XLineObjects was also (inadvertently?) missing. Change-Id: I1a1a9cc39302eede2143742e03838a83d1e3a948
-rw-r--r--oovbaapi/UnoApi_oovbaapi.mk4
-rw-r--r--oovbaapi/ooo/vba/excel/Buttons.idl40
-rw-r--r--oovbaapi/ooo/vba/excel/XDrawings.idl48
-rw-r--r--oovbaapi/ooo/vba/excel/XLineObjects.idl (renamed from oovbaapi/ooo/vba/excel/SheetObjects.idl)54
4 files changed, 96 insertions, 50 deletions
diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk
index ff32f151ade3..3f8918aaf622 100644
--- a/oovbaapi/UnoApi_oovbaapi.mk
+++ b/oovbaapi/UnoApi_oovbaapi.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba,\
))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba/excel,\
Button \
- SheetObjects \
+ Buttons \
))
$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba,\
@@ -241,6 +241,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/excel,\
XDataLabels \
XDialog \
XDialogs \
+ XDrawings \
XFont \
XFormat \
XFormatCondition \
@@ -252,6 +253,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/excel,\
XHyperlink \
XHyperlinks \
XInterior \
+ XLineObjects \
XlApplicationInternational \
XlApplyNamesOrder \
XlArabicModes \
diff --git a/oovbaapi/ooo/vba/excel/Buttons.idl b/oovbaapi/ooo/vba/excel/Buttons.idl
new file mode 100644
index 000000000000..7166ac14d60e
--- /dev/null
+++ b/oovbaapi/ooo/vba/excel/Buttons.idl
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef __ooo_vba_excel_Buttons_idl__
+#define __ooo_vba_excel_Buttons_idl__
+
+#include <ooo/vba/XCollection.idl>
+#include <ooo/vba/excel/XGraphicObjects.idl>
+
+module ooo { module vba { module excel {
+
+/** Represents the collection of drawing button controls in a spreadsheet.
+
+ <p>This service is now deprecated in VBA but kept for compatibility with old
+ VBA scripts.</p>
+*/
+service Buttons
+{
+ interface ooo::vba::XCollection;
+ interface XGraphicObjects;
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/excel/XDrawings.idl b/oovbaapi/ooo/vba/excel/XDrawings.idl
new file mode 100644
index 000000000000..6b0a3cdd2304
--- /dev/null
+++ b/oovbaapi/ooo/vba/excel/XDrawings.idl
@@ -0,0 +1,48 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef __ooo_vba_excel_XDrawings_idl__
+#define __ooo_vba_excel_XDrawings_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+
+module ooo { module vba { module excel {
+
+/** A collection providing access to all polygon objects in a single sheet.
+
+ <p>This symbol is now deprecated in VBA but kept for compatibility with old
+ VBA scripts.</p>
+ */
+interface XDrawings : com::sun::star::uno::XInterface
+{
+ /** Adds a new polygon object to the sheet this collection belongs to.
+
+ @param X1 Position of the first X coordinate in points (1/72 inch).
+ @param Y1 Position of the first Y coordinate in points (1/72 inch).
+ @param X2 Position of the last X coordinate in points (1/72 inch).
+ @param Y2 Position of the last Y coordinate in points (1/72 inch).
+ @param Closed True = outline closed (last and first point connected).
+
+ @return The created polygon object.
+ */
+ any Add( [in] any X1, [in] any Y1, [in] any X2, [in] any Y2, [in] any Closed );
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/excel/SheetObjects.idl b/oovbaapi/ooo/vba/excel/XLineObjects.idl
index 4d88ab1ac0c4..9b3cc6c58206 100644
--- a/oovbaapi/ooo/vba/excel/SheetObjects.idl
+++ b/oovbaapi/ooo/vba/excel/XLineObjects.idl
@@ -16,24 +16,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __ooo_vba_excel_SheetObjects_idl__
-#define __ooo_vba_excel_SheetObjects_idl__
+#ifndef __ooo_vba_excel_XLineObjects_idl__
+#define __ooo_vba_excel_XLineObjects_idl__
-#include <ooo/vba/XCollection.idl>
-#include <ooo/vba/excel/XGraphicObjects.idl>
-
-//=============================================================================
-
-/* Note: This file collects all compatibility interfaces for collections of
- drawing objects and drawing controls embedded in sheets. All these symbols
- are deprecated in VBA and kept for compatibility with old VBA scripts. */
-
-//=============================================================================
+#include <com/sun/star/uno/XInterface.idl>
module ooo { module vba { module excel {
-//=============================================================================
-
/** Collections that implement this interface provide access to a specific type
of drawing objects in a single sheet.
@@ -42,8 +31,8 @@ module ooo { module vba { module excel {
<ul><li>Arcs: arc objects, and</li>
<li>Lines: straight line ojects.</li></ul>
- <p>These symbols are now deprecated in VBA but kept for compatibility with
- old VBA scripts.</p>
+ <p>This symbol is now deprecated in VBA but kept for compatibility with old
+ VBA scripts.</p>
*/
interface XLineObjects : com::sun::star::uno::XInterface
{
@@ -60,39 +49,6 @@ interface XLineObjects : com::sun::star::uno::XInterface
any Add( [in] any X1, [in] any Y1, [in] any X2, [in] any Y2 );
};
-//=============================================================================
-
-/** A collection providing access to all polygon objects in a single sheet.
-
- <p>This symbol is now deprecated in VBA but kept for compatibility with old
- VBA scripts.</p>
- */
-interface XDrawings : com::sun::star::uno::XInterface
-{
- /** Adds a new polygon object to the sheet this collection belongs to.
-
- @param X1 Position of the first X coordinate in points (1/72 inch).
- @param Y1 Position of the first Y coordinate in points (1/72 inch).
- @param X2 Position of the last X coordinate in points (1/72 inch).
- @param Y2 Position of the last Y coordinate in points (1/72 inch).
- @param Closed True = outline closed (last and first point connected).
-
- @return The created polygon object.
- */
- any Add( [in] any X1, [in] any Y1, [in] any X2, [in] any Y2, [in] any Closed );
-};
-
-//=============================================================================
-
-/** Represents the collection of drawing button controls in a spreadsheet. */
-service Buttons
-{
- interface ooo::vba::XCollection;
- interface XGraphicObjects;
-};
-
-//=============================================================================
-
}; }; };
#endif