Hi all,
bellow are some patches fixing minor issues with idl files.
Also I would like to ask:
1) Exceptions have message and context fields and there should be a
constructor with arguments (java.lang.String m, java.lang.Object c)
for those fields. However, this doesn't seem to be applied
consistently. Also when an exception inherits, it should have a
constructor with all fields for the super classes and itself.
However, the context field is missing in such cases. Is there some
rule to this or is it arbitrary?
2) What is the meaning of 'published' in idl files? It seems to be
ignored in javamaker, or at least everything gets generated no matter
what. For example, there are enums or constants which are not marked
as published but other public symbols depend on them. Shouldn't
those be public too then?
3) What is the meaning of simgleton referring to service referring to
interface? In the example bellow, the BrowseNodeFactory service
doesn't seem to be generated from idl files. Should this service be
bypassed and the singleton reffer directly to the interface?
module com { module sun { module star { module script { module browse {
interface XBrowseNodeFactory : ::com::sun::star::uno::XInterface {
com::sun::star::script::browse::XBrowseNode createView( [in] short
viewType );
};
}; }; }; }; };
module com { module sun { module star { module script { module browse {
service BrowseNodeFactory
{
interface XBrowseNodeFactory;
};
singleton theBrowseNodeFactory
{
service BrowseNodeFactory;
};
}; }; }; }; };
Thank you,
Tomas
>From 0f8ee80872a99fa0cf903580c00b6b0ec1bc6491 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <t...@logand.com>
Date: Mon, 16 Jan 2012 19:55:42 +0100
Subject: [PATCH 1/7] idl type reference fixed
---
offapi/com/sun/star/report/meta/XFormulaParser.idl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/offapi/com/sun/star/report/meta/XFormulaParser.idl b/offapi/com/sun/star/report/meta/XFormulaParser.idl
index bc7575b..665f307 100644
--- a/offapi/com/sun/star/report/meta/XFormulaParser.idl
+++ b/offapi/com/sun/star/report/meta/XFormulaParser.idl
@@ -55,7 +55,7 @@ interface XFormulaParser
Names and symbols not defined here lead to a parser/print error.
*/
- [attribute] sequence< sheet::FormulaOpCodeMapEntry > OpCodeMap;
+ [attribute] sequence< com::sun::star::sheet::FormulaOpCodeMapEntry > OpCodeMap;
/** return the mapper for op codes.
*/
--
1.7.5.4
>From 518fd00501fc968872691b75a901dc718afa2ff7 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <t...@logand.com>
Date: Sun, 22 Jan 2012 18:05:20 +0100
Subject: [PATCH 2/7] add missing #ifndef
---
udkapi/com/sun/star/corba/corba.idl | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/udkapi/com/sun/star/corba/corba.idl b/udkapi/com/sun/star/corba/corba.idl
index 45c239a..8f5d62b 100644
--- a/udkapi/com/sun/star/corba/corba.idl
+++ b/udkapi/com/sun/star/corba/corba.idl
@@ -25,6 +25,9 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+#ifndef __com_sun_star_corba_corba_idl__
+#define __com_sun_star_corba_corba_idl__
+
module com { module sun { module star { module corba
{
/**
@@ -103,4 +106,6 @@ module com { module sun { module star { module corba
}; }; }; };
+#endif
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--
1.7.5.4
>From b2878038a08f3511c012451ab602d713ab0e1f1c Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <t...@logand.com>
Date: Tue, 24 Jan 2012 09:45:16 +0100
Subject: [PATCH 3/7] idl fix package for CorbaString8 and CorbaUnion
---
udkapi/com/sun/star/corba/giop/giop.idl | 10 +++++-----
udkapi/com/sun/star/corba/iiop/iiop.idl | 6 +++---
udkapi/com/sun/star/corba/iop/iop.idl | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/udkapi/com/sun/star/corba/giop/giop.idl b/udkapi/com/sun/star/corba/giop/giop.idl
index 1a8da38..a5b71fd 100644
--- a/udkapi/com/sun/star/corba/giop/giop.idl
+++ b/udkapi/com/sun/star/corba/giop/giop.idl
@@ -96,7 +96,7 @@ published struct RequestHeader_1_0
unsigned long request_id;
boolean response_expected;
sequence < byte > object_key;
- CorbaString8 operation;
+ com::sun::star::corba::CorbaString8 operation;
sequence < byte > requesting_principal;
};
@@ -112,7 +112,7 @@ published struct RequestHeader_1_1
byte reserved_2;
byte reserved_3; // Added in GIOP 1.1
sequence <byte> object_key;
- CorbaString8 operation;
+ com::sun::star::corba::CorbaString8 operation;
sequence <byte> requesting_principal; // binary compatible
};
@@ -138,7 +138,7 @@ published constants TargetAddressGroup
/**
@deprecated
*/
-published struct TargetAddress : CorbaUnion
+published struct TargetAddress : com::sun::star::corba::CorbaUnion
{
short nDiscriminator;
sequence < byte > object_key; // KeyAddr
@@ -158,7 +158,7 @@ published struct RequestHeader_1_2
byte reserved_2;
byte reserved_3;
TargetAddress target;
- CorbaString8 operation;
+ com::sun::star::corba::CorbaString8 operation;
// Principal not in GIOP 1.2
com::sun::star::corba::iop::ServiceContextList service_context; // 1.2 change
};
@@ -193,7 +193,7 @@ published struct ReplyHeader_1_2
*/
published struct SystemExceptionReplyBody
{
- CorbaString8 exception_id;
+ com::sun::star::corba::CorbaString8 exception_id;
unsigned long minor_code_value;
unsigned long completion_status;
};
diff --git a/udkapi/com/sun/star/corba/iiop/iiop.idl b/udkapi/com/sun/star/corba/iiop/iiop.idl
index aa4becf..a6052bc 100644
--- a/udkapi/com/sun/star/corba/iiop/iiop.idl
+++ b/udkapi/com/sun/star/corba/iiop/iiop.idl
@@ -47,7 +47,7 @@ published struct Version
published struct ProfileBody_1_0
{// renamed from ProfileBody
Version iiop_version;
- CorbaString8 host;
+ com::sun::star::corba::CorbaString8 host;
unsigned short port;
sequence <byte> object_key;
};
@@ -58,7 +58,7 @@ published struct ProfileBody_1_0
published struct ProfileBody_1_1
{// also used for 1.2
Version iiop_version;
- CorbaString8 host;
+ com::sun::star::corba::CorbaString8 host;
unsigned short port;
sequence < byte > object_key;
// Added in 1.1 unchanged for 1.2
@@ -70,7 +70,7 @@ published struct ProfileBody_1_1
*/
published struct ListenPoint
{
- CorbaString8 host;
+ com::sun::star::corba::CorbaString8 host;
unsigned short port;
};
diff --git a/udkapi/com/sun/star/corba/iop/iop.idl b/udkapi/com/sun/star/corba/iop/iop.idl
index b748c05..2d6a7fa 100644
--- a/udkapi/com/sun/star/corba/iop/iop.idl
+++ b/udkapi/com/sun/star/corba/iop/iop.idl
@@ -62,7 +62,7 @@ module com { module sun { module star { module corba { module iop
*/
published struct IOR
{
- CorbaString8 type_id;
+ com::sun::star::corba::CorbaString8 type_id;
sequence <TaggedProfile> profiles;
};
--
1.7.5.4
>From 651e4def617d3b5b4b7da48de788bd9661e88e69 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <t...@logand.com>
Date: Wed, 25 Jan 2012 01:46:32 +0100
Subject: [PATCH 4/7] idl #ifndef fix
---
offapi/com/sun/star/xsd/WhiteSpaceTreatment.idl | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/offapi/com/sun/star/xsd/WhiteSpaceTreatment.idl b/offapi/com/sun/star/xsd/WhiteSpaceTreatment.idl
index c5d2bd8..27aec53 100644
--- a/offapi/com/sun/star/xsd/WhiteSpaceTreatment.idl
+++ b/offapi/com/sun/star/xsd/WhiteSpaceTreatment.idl
@@ -26,8 +26,8 @@
*
************************************************************************/
-#ifndef __com_sun_star_xsd_XDataType_idl__
-#define __com_sun_star_xsd_XDataType_idl__
+#ifndef __com_sun_star_xsd_WhiteSpaceTreatment_idl__
+#define __com_sun_star_xsd_WhiteSpaceTreatment_idl__
//=============================================================================
module com { module sun { module star { module xsd {
--
1.7.5.4
>From 746034d40b91c9c358d70b0fa6ba06c83ab451ea Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <t...@logand.com>
Date: Wed, 14 Mar 2012 22:04:56 +0100
Subject: [PATCH 5/7] fix idl #include guards
---
.../deployment/XPackageInformationProvider.idl | 4 ++--
.../star/i18n/XExtendedInputSequenceChecker.idl | 2 +-
offapi/com/sun/star/text/XSimpleText.idl | 2 +-
offapi/com/sun/star/ucb/NumberedSortingInfo.idl | 2 +-
offapi/com/sun/star/xml/dom/XAttr.idl | 2 +-
offapi/com/sun/star/xml/dom/XComment.idl | 2 +-
.../sun/star/xml/xpath/Libxml2ExtensionHandle.idl | 4 ++--
.../star/reflection/InvalidTypeNameException.idl | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/offapi/com/sun/star/deployment/XPackageInformationProvider.idl b/offapi/com/sun/star/deployment/XPackageInformationProvider.idl
index ef36928..a521bbc 100644
--- a/offapi/com/sun/star/deployment/XPackageInformationProvider.idl
+++ b/offapi/com/sun/star/deployment/XPackageInformationProvider.idl
@@ -26,8 +26,8 @@
*
************************************************************************/
-#ifndef __com_sun_star_deployment_XPackageInformationProvide_idl__
-#define __com_sun_star_deployment_XPackageInformationProvide_idl_
+#ifndef __com_sun_star_deployment_XPackageInformationProvider_idl__
+#define __com_sun_star_deployment_XPackageInformationProvider_idl__
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
diff --git a/offapi/com/sun/star/i18n/XExtendedInputSequenceChecker.idl b/offapi/com/sun/star/i18n/XExtendedInputSequenceChecker.idl
index 7de37fa..f7efe8b 100644
--- a/offapi/com/sun/star/i18n/XExtendedInputSequenceChecker.idl
+++ b/offapi/com/sun/star/i18n/XExtendedInputSequenceChecker.idl
@@ -26,7 +26,7 @@
*
************************************************************************/
-#ifndef __com_sun_star_i18n_XExtendedInputCSequencehecker_idl__
+#ifndef __com_sun_star_i18n_XExtendedInputSequenceChecker_idl__
#define __com_sun_star_i18n_XExtendedInputSequenceChecker_idl__
#include <com/sun/star/i18n/XInputSequenceChecker.idl>
diff --git a/offapi/com/sun/star/text/XSimpleText.idl b/offapi/com/sun/star/text/XSimpleText.idl
index d9ca15c..ef08c69 100644
--- a/offapi/com/sun/star/text/XSimpleText.idl
+++ b/offapi/com/sun/star/text/XSimpleText.idl
@@ -26,7 +26,7 @@
*
************************************************************************/
#ifndef __com_sun_star_text_XSimpleText_idl__
-#define __com_sun_star_text_XSimplText_idl__
+#define __com_sun_star_text_XSimpleText_idl__
#include <com/sun/star/text/XTextRange.idl>
diff --git a/offapi/com/sun/star/ucb/NumberedSortingInfo.idl b/offapi/com/sun/star/ucb/NumberedSortingInfo.idl
index ba3f18fc..34ee5b5 100644
--- a/offapi/com/sun/star/ucb/NumberedSortingInfo.idl
+++ b/offapi/com/sun/star/ucb/NumberedSortingInfo.idl
@@ -26,7 +26,7 @@
*
************************************************************************/
#ifndef __com_sun_star_ucb_NumberedSortingInfo_idl__
-#define __com_sun_star_ucb_NumberedSortingInfo_idl_
+#define __com_sun_star_ucb_NumberedSortingInfo_idl__
//=============================================================================
diff --git a/offapi/com/sun/star/xml/dom/XAttr.idl b/offapi/com/sun/star/xml/dom/XAttr.idl
index 15a3afe..32e98bc 100644
--- a/offapi/com/sun/star/xml/dom/XAttr.idl
+++ b/offapi/com/sun/star/xml/dom/XAttr.idl
@@ -27,7 +27,7 @@
************************************************************************/
#ifndef __com_sun_star_xml_dom_XAttr_idl__
-#define __com_sun_star_xml_sax_XAttr_idl__
+#define __com_sun_star_xml_dom_XAttr_idl__
#include <com/sun/star/xml/dom/XNode.idl>
diff --git a/offapi/com/sun/star/xml/dom/XComment.idl b/offapi/com/sun/star/xml/dom/XComment.idl
index 3c9d5df..96da7f8 100644
--- a/offapi/com/sun/star/xml/dom/XComment.idl
+++ b/offapi/com/sun/star/xml/dom/XComment.idl
@@ -27,7 +27,7 @@
************************************************************************/
#ifndef __com_sun_star_xml_dom_XComment_idl__
-#define __com_sun_star_xml_dom_XCComment_idl__
+#define __com_sun_star_xml_dom_XComment_idl__
#include <com/sun/star/xml/dom/XCharacterData.idl>
diff --git a/offapi/com/sun/star/xml/xpath/Libxml2ExtensionHandle.idl b/offapi/com/sun/star/xml/xpath/Libxml2ExtensionHandle.idl
index e368be1..e95c10d 100644
--- a/offapi/com/sun/star/xml/xpath/Libxml2ExtensionHandle.idl
+++ b/offapi/com/sun/star/xml/xpath/Libxml2ExtensionHandle.idl
@@ -26,8 +26,8 @@
*
************************************************************************/
-#ifndef __com_sun_star_xml__xpath_Libxml2ExtensionHandle_idl__
-#define __com_sun_star_xml_Libxml2ExtensionHandle_idl__
+#ifndef __com_sun_star_xml_xpath_Libxml2ExtensionHandle_idl__
+#define __com_sun_star_xml_xpath_Libxml2ExtensionHandle_idl__
//=============================================================================
diff --git a/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl b/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl
index fb2fb17..2ede2d2 100644
--- a/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl
+++ b/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl
@@ -26,7 +26,7 @@
*
************************************************************************/
-#ifndef __com_sun_star_reflection_InvaildTypeNameException_idl__
+#ifndef __com_sun_star_reflection_InvalidTypeNameException_idl__
#define __com_sun_star_reflection_InvalidTypeNameException_idl__
#include <com/sun/star/uno/Exception.idl>
--
1.7.5.4
>From a7641f530f3919dbae753de68790c185852b58fa Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <t...@logand.com>
Date: Wed, 14 Mar 2012 22:42:44 +0100
Subject: [PATCH 6/7] make #include preprocessor (cpp) compatible
---
udkapi/com/sun/star/util/logging/LoggerRemote.idl | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/udkapi/com/sun/star/util/logging/LoggerRemote.idl b/udkapi/com/sun/star/util/logging/LoggerRemote.idl
index 83c1f98..4a70089 100644
--- a/udkapi/com/sun/star/util/logging/LoggerRemote.idl
+++ b/udkapi/com/sun/star/util/logging/LoggerRemote.idl
@@ -30,8 +30,8 @@
#define __com_sun_star_webtop_Logger_idl__
#include <com/sun/star/uno/XInterface.idl>
-#include <XLogger.idl>
-#include <XLoggerRemote.idl>
+#include "XLogger.idl"
+#include "XLoggerRemote.idl"
//=============================================================================
--
1.7.5.4
>From 6792e1368e36c43156d1eda0b8377078e331f1ac Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <t...@logand.com>
Date: Thu, 19 Apr 2012 23:03:35 +0200
Subject: [PATCH 7/7] idl fix symbol references
---
.../star/datatransfer/clipboard/ClipboardEvent.idl | 2 +-
.../sun/star/datatransfer/clipboard/XClipboard.idl | 4 ++--
.../datatransfer/clipboard/XClipboardOwner.idl | 2 +-
.../datatransfer/dnd/DropTargetDragEnterEvent.idl | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl b/offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl
index e6d81f7..4d116f4 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl
@@ -47,7 +47,7 @@ published struct ClipboardEvent: com::sun::star::lang::EventObject
//-------------------------------------------------------------------------
/** The current content of the clipboard.
*/
- XTransferable Contents;
+ com::sun::star::datatransfer::XTransferable Contents;
};
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl
index 1b06c65..11c79b3 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl
@@ -54,7 +54,7 @@ published interface XClipboard: com::sun::star::uno::XInterface
@see com::sun::star::datatransfer::XTransferable
*/
- XTransferable getContents();
+ com::sun::star::datatransfer::XTransferable getContents();
//-------------------------------------------------------------------------
/** Sets the current contents of the clipboard to the specified
@@ -76,7 +76,7 @@ published interface XClipboard: com::sun::star::uno::XInterface
@see com::sun::star::datatransfer::XTransferable
@see com::sun::star::datatransfer::clipboard::XClipboardOwner
*/
- [oneway] void setContents( [in] XTransferable xTrans, [in] XClipboardOwner xClipboardOwner );
+ [oneway] void setContents( [in] com::sun::star::datatransfer::XTransferable xTrans, [in] XClipboardOwner xClipboardOwner );
//-------------------------------------------------------------------------
/** To get the name of the clipboard instance.
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl
index 6e81c20..66a5fe1 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl
@@ -59,7 +59,7 @@ published interface XClipboardOwner: com::sun::star::uno::XInterface
@see com::sun::star::datatransfer::clipboard::XClipboard
@see com::sun::star::datatransfer::XTransferable
*/
- [oneway] void lostOwnership( [in] XClipboard xClipboard, [in] XTransferable xTrans );
+ [oneway] void lostOwnership( [in] XClipboard xClipboard, [in] com::sun::star::datatransfer::XTransferable xTrans );
};
//=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl
index 98067e5..4dc018a 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl
@@ -55,7 +55,7 @@ published struct DropTargetDragEnterEvent: DropTargetDragEvent
*/
- sequence< DataFlavor > SupportedDataFlavors;
+ sequence< com::sun::star::datatransfer::DataFlavor > SupportedDataFlavors;
};
//=============================================================================
--
1.7.5.4
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
