[Libreoffice-commits] core.git: 4 commits - codemaker/source cppuhelper/source cppu/source idlc/source include/typelib offapi/UnoApi_offapi.mk udkapi/com udkapi/type_reference udkapi/UnoApi_udkapi.mk
Stephan Bergmann
sbergman at redhat.com
Wed Sep 4 05:38:18 PDT 2013
codemaker/source/cppumaker/cpputype.cxx | 7 +-
cppu/source/threadpool/current.cxx | 2
cppu/source/typelib/static_types.cxx | 3 -
cppu/source/typelib/typelib.cxx | 22 +++++---
cppuhelper/source/tdmgr.cxx | 4 -
idlc/source/scanner.l | 3 -
include/typelib/typedescription.h | 23 +++++---
include/typelib/uik.h | 2
offapi/UnoApi_offapi.mk | 8 ---
udkapi/UnoApi_udkapi.mk | 3 -
udkapi/com/sun/star/modules.idl | 83 ++++++++++++++++++++++++++++++++
udkapi/com/sun/star/udk-modules.idl | 83 --------------------------------
udkapi/com/sun/star/uno/Uik.idl | 10 +--
udkapi/type_reference/udkapi.rdb |binary
14 files changed, 123 insertions(+), 130 deletions(-)
New commits:
commit 45b2346dcf6b695feb7ebeeb70e50b1c048853b6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Sep 4 14:34:26 2013 +0200
No need to list documentation-only module.idl files in UnoApi_*.mk
...doxygen still picks them up, as it traverses the complete udkapi/ and offapi/
soruce trees. (And rename udk-modules.idl to modules.idl for consistency.)
Change-Id: Ic52c333756810c285059f03edc207a0913ead160
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 5d1a6d9..de408c0 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -481,9 +481,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/xslt,\
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star,\
- modules \
-))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/accessibility,\
Accessible \
AccessibleContext \
@@ -822,7 +819,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/drawing
TextProperties \
TextShape \
TransparencyGradientTable \
- modules \
))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/embed,\
BaseStorage \
@@ -839,7 +835,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form,\
FormController \
FormControllerDispatcher \
PropertyBrowserController \
- modules \
))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/binding,\
BindableControlModel \
@@ -1037,9 +1032,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/present
$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/rendering,\
BitmapCanvas \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/report,\
- modules \
-))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/report/inspection,\
DataProviderHandler \
ReportComponentHandler \
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index 8a89327..8a99513 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -27,9 +27,6 @@ $(eval $(call gb_UnoApi_set_include,udkapi,\
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star,\
- udk-modules \
-))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/beans,\
PropertySet \
))
diff --git a/udkapi/com/sun/star/udk-modules.idl b/udkapi/com/sun/star/modules.idl
similarity index 100%
rename from udkapi/com/sun/star/udk-modules.idl
rename to udkapi/com/sun/star/modules.idl
commit e03211460a2d2451135527107c7ddbd2e93acba9
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Sep 4 14:28:15 2013 +0200
[API CHANGE] Fix deprecated struct css.uno.Uik member identifiers
UNOIDL identifiers starting with a lowercase letter and containing hyphens are
reserved for the implementation. It would be good to be able to enforce that in
code parsing UNOIDL files, but some existing identifiers violate that.
In the case of the published, deprecated css.uno.Uik, the change is incompatible
in theory but arguably irrelevant in practice.
Change-Id: I61f66e2d73c6aca5498ae566758893b546eb81d5
diff --git a/udkapi/com/sun/star/uno/Uik.idl b/udkapi/com/sun/star/uno/Uik.idl
index f3a6358..82f6a7a 100644
--- a/udkapi/com/sun/star/uno/Uik.idl
+++ b/udkapi/com/sun/star/uno/Uik.idl
@@ -32,23 +32,23 @@ published struct Uik
{
/** specifies a 4 byte data block.
*/
- unsigned long m_Data1;
+ unsigned long Data1;
/** specifies a 2 byte data block.
*/
- unsigned short m_Data2;
+ unsigned short Data2;
/** specifies a 2 byte data block.
*/
- unsigned short m_Data3;
+ unsigned short Data3;
/** specifies a 4 byte data block.
*/
- unsigned long m_Data4;
+ unsigned long Data4;
/** specifies a 4 byte data block.
*/
- unsigned long m_Data5;
+ unsigned long Data5;
};
diff --git a/udkapi/type_reference/udkapi.rdb b/udkapi/type_reference/udkapi.rdb
index f1f890b..e49de5f 100644
Binary files a/udkapi/type_reference/udkapi.rdb and b/udkapi/type_reference/udkapi.rdb differ
commit 2618ff47344e423470ab60c5e034d30163b3f29b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Sep 4 14:25:39 2013 +0200
UNO interface UIKs are unused for a very long time
...so mark them as @deprecated more thoroughly and always force them to zero.
Change-Id: I5db2dab924fc5a4145a0e5dd055b654985ce2ef9
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index 9848f57..b03e472 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -1250,10 +1250,9 @@ void InterfaceType::dumpComprehensiveGetCppuType(FileStream & out) {
out << "\n" << indent() << "typelib_typedescription_newMIInterface(\n";
inc();
out << indent() << "&pTD,\n" << indent()
- << ("sTypeName.pData, 0x00000000, 0x0000, 0x0000, 0x00000000,"
- " 0x00000000,\n") // UIK
- << indent() << entity_->getDirectMandatoryBases().size()
- << ", aSuperTypes,\n" << indent() << count << ",\n" << indent()
+ << "sTypeName.pData, 0, 0, 0, 0, 0,\n" << indent()
+ << entity_->getDirectMandatoryBases().size() << ", aSuperTypes,\n"
+ << indent() << count << ",\n" << indent()
<< (count == 0 ? "0" : "pMembers") << " );\n\n";
dec();
out << indent()
diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx
index d8b6727..227a9ab 100644
--- a/cppu/source/threadpool/current.cxx
+++ b/cppu/source/threadpool/current.cxx
@@ -56,7 +56,7 @@ static typelib_InterfaceTypeDescription * get_type_XCurrentContext()
sMethodName0.pData );
typelib_typedescription_newInterface(
&pTD,
- sTypeName.pData, 0x00000000, 0x0000, 0x0000, 0x00000000, 0x00000000,
+ sTypeName.pData, 0, 0, 0, 0, 0,
* typelib_static_type_getByTypeClass( typelib_TypeClass_INTERFACE ),
1,
pMembers );
diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx
index f12cf1f..83f52ab 100644
--- a/cppu/source/typelib/static_types.cxx
+++ b/cppu/source/typelib/static_types.cxx
@@ -204,8 +204,7 @@ CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_
&pMembers[2], typelib_TypeClass_INTERFACE_METHOD, sMethodName2.pData );
::typelib_typedescription_newInterface(
- &pTD, sTypeName.pData, 0xe227a391, 0x33d6, 0x11d1, 0xaabe00a0, 0x249d5590,
- 0, 3, pMembers );
+ &pTD, sTypeName.pData, 0, 0, 0, 0, 0, 0, 3, pMembers );
::typelib_typedescription_register( (typelib_TypeDescription **)&pTD );
::typelib_typedescriptionreference_acquire(
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index b8cba63..d2f9aee 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -1043,15 +1043,17 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newArray(
extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterface(
typelib_InterfaceTypeDescription ** ppRet,
rtl_uString * pTypeName,
- sal_uInt32 nUik1, sal_uInt16 nUik2, sal_uInt16 nUik3, sal_uInt32 nUik4, sal_uInt32 nUik5,
+ SAL_UNUSED_PARAMETER sal_uInt32, SAL_UNUSED_PARAMETER sal_uInt16,
+ SAL_UNUSED_PARAMETER sal_uInt16, SAL_UNUSED_PARAMETER sal_uInt32,
+ SAL_UNUSED_PARAMETER sal_uInt32,
typelib_TypeDescriptionReference * pBaseInterface,
sal_Int32 nMembers,
typelib_TypeDescriptionReference ** ppMembers )
SAL_THROW_EXTERN_C()
{
typelib_typedescription_newMIInterface(
- ppRet, pTypeName, nUik1, nUik2, nUik3, nUik4, nUik5,
- pBaseInterface == 0 ? 0 : 1, &pBaseInterface, nMembers, ppMembers);
+ ppRet, pTypeName, 0, 0, 0, 0, 0, pBaseInterface == 0 ? 0 : 1,
+ &pBaseInterface, nMembers, ppMembers);
}
//------------------------------------------------------------------------
@@ -1128,7 +1130,9 @@ void BaseList::calculate(
extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newMIInterface(
typelib_InterfaceTypeDescription ** ppRet,
rtl_uString * pTypeName,
- sal_uInt32 nUik1, sal_uInt16 nUik2, sal_uInt16 nUik3, sal_uInt32 nUik4, sal_uInt32 nUik5,
+ SAL_UNUSED_PARAMETER sal_uInt32, SAL_UNUSED_PARAMETER sal_uInt16,
+ SAL_UNUSED_PARAMETER sal_uInt16, SAL_UNUSED_PARAMETER sal_uInt32,
+ SAL_UNUSED_PARAMETER sal_uInt32,
sal_Int32 nBaseInterfaces,
typelib_TypeDescriptionReference ** ppBaseInterfaces,
sal_Int32 nMembers,
@@ -1167,11 +1171,11 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newMIInterface(
pITD->pBaseTypeDescription = pITD->ppBaseTypes[0];
}
// set the
- pITD->aUik.m_Data1 = nUik1;
- pITD->aUik.m_Data2 = nUik2;
- pITD->aUik.m_Data3 = nUik3;
- pITD->aUik.m_Data4 = nUik4;
- pITD->aUik.m_Data5 = nUik5;
+ pITD->aUik.m_Data1 = 0;
+ pITD->aUik.m_Data2 = 0;
+ pITD->aUik.m_Data3 = 0;
+ pITD->aUik.m_Data4 = 0;
+ pITD->aUik.m_Data5 = 0;
BaseList aBaseList(pITD);
pITD->nAllMembers = nMembers + aBaseList.getBaseMembers();
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx
index 76c6558..023e112 100644
--- a/cppuhelper/source/tdmgr.cxx
+++ b/cppuhelper/source/tdmgr.cxx
@@ -451,12 +451,10 @@ inline static typelib_TypeDescription * createCTD(
aMemberTypeName.pData );
}
- Uik uik = xType->getUik();
-
typelib_typedescription_newMIInterface(
(typelib_InterfaceTypeDescription **)&pRet,
aTypeName.pData,
- uik.m_Data1, uik.m_Data2, uik.m_Data3, uik.m_Data4, uik.m_Data5,
+ 0, 0, 0, 0, 0,
nBases, pBaseTypeRefs,
nMembers, ppMemberRefs );
diff --git a/include/typelib/typedescription.h b/include/typelib/typedescription.h
index 3195870..6f9ee33 100644
--- a/include/typelib/typedescription.h
+++ b/include/typelib/typedescription.h
@@ -434,6 +434,9 @@ typedef struct _typelib_InterfaceTypeDescription
*/
struct _typelib_InterfaceTypeDescription * pBaseTypeDescription;
/** unique identifier of interface
+
+ @deprecated
+ should always contain all-zeros
*/
typelib_Uik aUik;
/** number of members
@@ -647,11 +650,11 @@ CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newStruct(
@param ppRet inout interface type description
@param pTypeName the fully qualified name of the interface.
- @param nUik1 uik part
- @param nUik2 uik part
- @param nUik3 uik part
- @param nUik4 uik part
- @param nUik5 uik part
+ @param nUik1 uik part; deprecated and ignored, should always be 0
+ @param nUik2 uik part; deprecated and ignored, should always be 0
+ @param nUik3 uik part; deprecated and ignored, should always be 0
+ @param nUik4 uik part; deprecated and ignored, should always be 0
+ @param nUik5 uik part; deprecated and ignored, should always be 0
@param pBaseInterface base interface type, else 0
@param nMembers number of members
@param ppMembers members; attributes or methods
@@ -672,11 +675,11 @@ CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterface(
@param ppRet inout interface type description
@param pTypeName the fully qualified name of the interface.
- @param nUik1 uik part
- @param nUik2 uik part
- @param nUik3 uik part
- @param nUik4 uik part
- @param nUik5 uik part
+ @param nUik1 uik part; deprecated and ignored, should always be 0
+ @param nUik2 uik part; deprecated and ignored, should always be 0
+ @param nUik3 uik part; deprecated and ignored, should always be 0
+ @param nUik4 uik part; deprecated and ignored, should always be 0
+ @param nUik5 uik part; deprecated and ignored, should always be 0
@param nBaseInterfaces number of base interface types
@param ppBaseInterfaces base interface types
@param nMembers number of members
diff --git a/include/typelib/uik.h b/include/typelib/uik.h
index 097f237..ff8064f 100644
--- a/include/typelib/uik.h
+++ b/include/typelib/uik.h
@@ -26,6 +26,8 @@
#endif
/** Binary typelib uik struct. Internally not used anymore.
+
+ @deprecated
*/
typedef struct _typelib_Uik
{
commit 71ac97f709441bbcdbeaa2010cb63a782b61e1fa
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Sep 4 14:22:11 2013 +0200
Minor clean up
Remove an odd {1} repeat count, and remove the "."{DIGIT}+ pattern that is
already covered by the following {DIGIT}*"."{DIGIT}+ pattern.
Change-Id: If99dfe10a5e37225355472bf4deceb34c0a92eb9
diff --git a/idlc/source/scanner.l b/idlc/source/scanner.l
index d13160e..ba6f4d6 100644
--- a/idlc/source/scanner.l
+++ b/idlc/source/scanner.l
@@ -359,8 +359,7 @@ published return IDL_PUBLISHED;
return asciiToInteger(yytext, &yylval.ival, &yylval.uval);
}
-("-")?{DIGIT}+(e|E){1}(("+"|"-")?{DIGIT}+)+(f|F)? |
-("-")?"."{DIGIT}+((e|E)("+"|"-")?{DIGIT}+)?(f|F)? |
+("-")?{DIGIT}+(e|E)(("+"|"-")?{DIGIT}+)?(f|F)? |
("-")?{DIGIT}*"."{DIGIT}+((e|E)("+"|"-")?{DIGIT}+)?(f|F)? {
yylval.dval = asciiToFloat( yytext );
return IDL_FLOATING_PT_LITERAL;
More information about the Libreoffice-commits
mailing list