mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove Uik and throw RuntimeException

Browse Source
This commit is contained in:
Juergen Schmidt 2001-05-03 13:43:01 +00:00
parent f8ddbadad2
commit eebe9f389e
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
codemaker/source/javamaker/javatype.cxx
View File

@ -2,9 +2,9 @@
* *
* $RCSfile: javatype.cxx,v $ * $RCSfile: javatype.cxx,v $
* *
* $Revision: 1.8 $ * $Revision: 1.9 $
* *
* last change: $Author: jsc $ $Date: 2001-04-11 07:29:27 $ * last change: $Author: jsc $ $Date: 2001-05-03 14:43:01 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -839,8 +839,9 @@ sal_Bool InterfaceType::dumpFile(FileStream& o)
dumpAttributes(o, &aUnoTypeInfos); dumpAttributes(o, &aUnoTypeInfos);
dumpMethods(o, &aUnoTypeInfos); dumpMethods(o, &aUnoTypeInfos);
o << indent() << "// static Member\n" << indent() << "public static " o << indent() << "// static Member\n";
<< "com.sun.star.uno.Uik UIK = new com.sun.star.uno.Uik( "; /*
o << indent() << "public static com.sun.star.uno.Uik UIK = new com.sun.star.uno.Uik( ";
RTUik uik; RTUik uik;
m_reader.getUik(uik); m_reader.getUik(uik);
@ -848,7 +849,7 @@ sal_Bool InterfaceType::dumpFile(FileStream& o)
sprintf(buffer, "0x%.8x, (short)0x%.4x, (short)0x%.4x, 0x%.8x, 0x%.8x", sprintf(buffer, "0x%.8x, (short)0x%.4x, (short)0x%.4x, 0x%.8x, 0x%.8x",
uik.m_Data1, uik.m_Data2, uik.m_Data3, uik.m_Data4, uik.m_Data5); uik.m_Data1, uik.m_Data2, uik.m_Data3, uik.m_Data4, uik.m_Data5);
o << buffer << " );\n\n"; o << buffer << " );\n\n";
*/
o << indent() << "public static final com.sun.star.lib.uno.typeinfo.TypeInfo UNOTYPEINFO[] = "; o << indent() << "public static final com.sun.star.lib.uno.typeinfo.TypeInfo UNOTYPEINFO[] = ";
if (!aUnoTypeInfos.empty()) if (!aUnoTypeInfos.empty())
@ -911,13 +912,15 @@ void InterfaceType::dumpAttributes(FileStream& o, UnoInfoList* pUnoInfos)
o << indent() << "public "; o << indent() << "public ";
dumpType(o, fieldType); dumpType(o, fieldType);
o << " get" << fieldName << "() throws com.sun.star.uno.RuntimeException;\n"; // o << " get" << fieldName << "() throws com.sun.star.uno.RuntimeException;\n";
o << " get" << fieldName << "();\n";
if (access != RT_ACCESS_READONLY) if (access != RT_ACCESS_READONLY)
{ {
o << indent() << "public void set" << fieldName << "( "; o << indent() << "public void set" << fieldName << "( ";
dumpType(o, fieldType); dumpType(o, fieldType);
o << " _" << fieldName.toLowerCase() << " ) throws com.sun.star.uno.RuntimeException;\n"; // o << " _" << fieldName.toLowerCase() << " ) throws com.sun.star.uno.RuntimeException;\n";
o << " _" << fieldName.toLowerCase() << " );\n";
} }
if (access == RT_ACCESS_READONLY) if (access == RT_ACCESS_READONLY)
@ -1032,15 +1035,25 @@ void InterfaceType::dumpMethods(FileStream& o, UnoInfoList* pUnoInfos)
} }
o << " )"; o << " )";
o << " throws ";
OString excpName; OString excpName;
sal_Bool notFirst = sal_False;
for (j=0; j < excCount; j++) for (j=0; j < excCount; j++)
{ {
excpName = m_reader.getMethodExcType(i, j); excpName = m_reader.getMethodExcType(i, j);
if (excpName != "com/sun/star/uno/RuntimeException") if (excpName != "com/sun/star/uno/RuntimeException")
o << scopedName(m_typeName, excpName) << ", "; {
if (notFirst)
o << ", ";
else
{
o << " throws ";
notFirst = sal_True;
}
o << scopedName(m_typeName, excpName);
}
} }
o << "com.sun.star.uno.RuntimeException;\n"; // o << "com.sun.star.uno.RuntimeException;\n";
o << ";\n";
} }
if (!first) if (!first)