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

INTEGRATION: CWS presentationengine01 (1.29.12); FILE MERGED

Browse Source 
2004/11/17 12:49:43 thb 1.29.12.3: RESYNC: (1.30-1.31); FILE MERGED
2004/10/12 14:54:30 thb 1.29.12.2: RESYNC: (1.29-1.30); FILE MERGED
2004/10/06 16:49:33 dbo 1.29.12.1: #i35064# fixing static variable name, static_cast of typeclass
This commit is contained in:
Rüdiger Timm
2004-11-26 16:32:44 +00:00
parent e812993267
commit 84525e3fa1
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
codemaker/source/cppumaker/cpputype.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: cpputype.cxx,v $ * $RCSfile: cpputype.cxx,v $
* *
* $Revision: 1.31 $ * $Revision: 1.32 $
* *
* last change: $Author: pjunck $ $Date: 2004-10-22 10:28:25 $ * last change: $Author: rt $ $Date: 2004-11-26 17:32:44 $
* *
* 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
@@ -783,13 +783,13 @@ void CppuType::dumpComprehensiveGetCppuType(FileStream& o)
o << "* ) SAL_THROW( () )\n{\n"; o << "* ) SAL_THROW( () )\n{\n";
inc(); inc();
o << indent() << "static ::com::sun::star::uno::Type * the_type = 0;\n"; o << indent() << "static ::com::sun::star::uno::Type * the_pType = 0;\n";
o << indent() << "if ( !the_type )\n" << indent() << "{\n"; o << indent() << "if (the_pType == 0)\n" << indent() << "{\n";
inc(); inc();
o << indent() << "::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );\n"; o << indent() << "::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );\n";
o << indent() << "if ( !the_type )\n" << indent() << "{\n"; o << indent() << "if (the_pType == 0)\n" << indent() << "{\n";
inc(); inc();
o << indent() << "::rtl::OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM(\"" o << indent() << "::rtl::OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM(\""
<< m_typeName.replace('/', '.') << "\") );\n\n"; << m_typeName.replace('/', '.') << "\") );\n\n";
@@ -878,13 +878,13 @@ void CppuType::dumpComprehensiveGetCppuType(FileStream& o)
o << indent() << "static ::com::sun::star::uno::Type the_staticType( " o << indent() << "static ::com::sun::star::uno::Type the_staticType( "
<< getTypeClass(m_typeName) << ", sTypeName );\n"; << getTypeClass(m_typeName) << ", sTypeName );\n";
o << indent() << "the_type = &the_staticType;\n"; o << indent() << "the_pType = &the_staticType;\n";
dec(); dec();
o << indent() << "}\n"; o << indent() << "}\n";
dec(); dec();
o << indent() << "}\n\n"; o << indent() << "}\n\n";
o << indent() << "return *the_type;\n"; o << indent() << "return *the_pType;\n";
dec(); dec();
o << "}\n"; o << "}\n";
} }
@@ -1700,13 +1700,13 @@ void InterfaceType::dumpComprehensiveGetCppuType(FileStream& o)
o << "* ) SAL_THROW( () )\n{\n"; o << "* ) SAL_THROW( () )\n{\n";
inc(); inc();
o << indent() << "static ::com::sun::star::uno::Type * the_type = 0;\n"; o << indent() << "static ::com::sun::star::uno::Type * the_pType = 0;\n";
o << indent() << "if ( !the_type )\n" << indent() << "{\n"; o << indent() << "if (the_pType == 0)\n" << indent() << "{\n";
inc(); inc();
o << indent() << "::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );\n"; o << indent() << "::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );\n";
o << indent() << "if ( !the_type )\n" << indent() << "{\n"; o << indent() << "if (the_pType == 0)\n" << indent() << "{\n";
inc(); inc();
o << indent() << "::rtl::OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM(\"" o << indent() << "::rtl::OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM(\""
<< m_typeName.replace('/', '.') << "\") );\n\n"; << m_typeName.replace('/', '.') << "\") );\n\n";
@@ -1780,7 +1780,7 @@ void InterfaceType::dumpComprehensiveGetCppuType(FileStream& o)
o << indent() << "static ::com::sun::star::uno::Type the_staticType( " o << indent() << "static ::com::sun::star::uno::Type the_staticType( "
<< getTypeClass(m_typeName) << ", sTypeName );\n"; << getTypeClass(m_typeName) << ", sTypeName );\n";
o << indent() << "the_type = &the_staticType;\n"; o << indent() << "the_pType = &the_staticType;\n";
StringSet aTypes; StringSet aTypes;
// type for RuntimeException is always needed // type for RuntimeException is always needed
@@ -1804,7 +1804,7 @@ void InterfaceType::dumpComprehensiveGetCppuType(FileStream& o)
o << indent() << "}\n"; o << indent() << "}\n";
dec(); dec();
o << indent() << "}\n\n" o << indent() << "}\n\n"
<< indent() << "return *the_type;\n"; << indent() << "return *the_pType;\n";
dec(); dec();
o << "}\n"; o << "}\n";
@@ -2924,12 +2924,12 @@ void StructureType::dumpNormalGetCppuType(FileStream & out) {
void StructureType::dumpComprehensiveGetCppuType(FileStream & out) { void StructureType::dumpComprehensiveGetCppuType(FileStream & out) {
dumpGetCppuTypePreamble(out); dumpGetCppuTypePreamble(out);
out << indent() << "static ::com::sun::star::uno::Type * the_type = 0;\n" out << indent() << "static ::com::sun::star::uno::Type * the_pType = 0;\n"
<< indent() << "if (the_type == 0) {\n"; << indent() << "if (the_pType == 0) {\n";
inc(); inc();
out << indent() out << indent()
<< "::osl::MutexGuard the_guard(::osl::Mutex::getGlobalMutex());\n" << "::osl::MutexGuard the_guard(::osl::Mutex::getGlobalMutex());\n"
<< indent() << "if (the_type == 0) {\n"; << indent() << "if (the_pType == 0) {\n";
inc(); inc();
if (isPolymorphic()) { if (isPolymorphic()) {
out << indent() << "::rtl::OUStringBuffer the_buffer;\n" << indent() out << indent() << "::rtl::OUStringBuffer the_buffer;\n" << indent()
@@ -2978,8 +2978,8 @@ void StructureType::dumpComprehensiveGetCppuType(FileStream & out) {
<< " = getCppuType< "; << " = getCppuType< ";
dumpTypeParameterName(out, type); dumpTypeParameterName(out, type);
out << " >();\n" << indent() << "::typelib_TypeClass the_pclass" out << " >();\n" << indent() << "::typelib_TypeClass the_pclass"
<< n << " = static_cast< ::typelib_TypeClass >(the_ptype" << n << " = (::typelib_TypeClass) the_ptype"
<< n << ".getTypeClass());\n" << indent() << n << ".getTypeClass();\n" << indent()
<< "::rtl::OUString the_pname" << n << "(the_ptype" << n << "::rtl::OUString the_pname" << n << "(the_ptype" << n
<< ".getTypeName());\n"; << ".getTypeName());\n";
} }
@@ -3051,7 +3051,7 @@ void StructureType::dumpComprehensiveGetCppuType(FileStream & out) {
out << indent() << "static ::com::sun::star::uno::Type the_staticType(" out << indent() << "static ::com::sun::star::uno::Type the_staticType("
<< getTypeClass(m_typeName) << ", the_name);\n"; << getTypeClass(m_typeName) << ", the_name);\n";
out << indent() << "OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();\n"; out << indent() << "OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();\n";
out << indent() << "the_type = &the_staticType;\n"; out << indent() << "the_pType = &the_staticType;\n";
dec(); dec();
out << indent() << "}\n"; out << indent() << "}\n";
dec(); dec();
@@ -3059,7 +3059,7 @@ void StructureType::dumpComprehensiveGetCppuType(FileStream & out) {
inc(); inc();
out << indent() << "OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();\n"; out << indent() << "OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();\n";
dec(); dec();
out << indent() << "}\n" << indent() << "return *the_type;\n"; out << indent() << "}\n" << indent() << "return *the_pType;\n";
dumpGetCppuTypePostamble(out); dumpGetCppuTypePostamble(out);
} }
@@ -3757,13 +3757,13 @@ void EnumType::dumpComprehensiveGetCppuType(FileStream& o)
o << "* ) SAL_THROW( () )\n{\n"; o << "* ) SAL_THROW( () )\n{\n";
inc(); inc();
o << indent() << "static ::com::sun::star::uno::Type * the_type = 0;\n"; o << indent() << "static ::com::sun::star::uno::Type * the_pType = 0;\n";
o << indent() << "if ( !the_type )\n" << indent() << "{\n"; o << indent() << "if (the_pType == 0)\n" << indent() << "{\n";
inc(); inc();
o << indent() << "::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );\n"; o << indent() << "::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );\n";
o << indent() << "if ( !the_type )\n" << indent() << "{\n"; o << indent() << "if (the_pType == 0)\n" << indent() << "{\n";
inc(); inc();
o << indent() << "::rtl::OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM(\"" o << indent() << "::rtl::OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM(\""
<< m_typeName.replace('/', '.') << "\") );\n\n"; << m_typeName.replace('/', '.') << "\") );\n\n";
@@ -3817,13 +3817,13 @@ void EnumType::dumpComprehensiveGetCppuType(FileStream& o)
o << indent() << "static ::com::sun::star::uno::Type the_staticType( " o << indent() << "static ::com::sun::star::uno::Type the_staticType( "
<< getTypeClass(m_typeName) << ", sTypeName );\n"; << getTypeClass(m_typeName) << ", sTypeName );\n";
o << indent() << "the_type = &the_staticType;\n"; o << indent() << "the_pType = &the_staticType;\n";
dec(); dec();
o << indent() << "}\n"; o << indent() << "}\n";
dec(); dec();
o << indent() << "}\n\n" o << indent() << "}\n\n"
<< indent() << "return *the_type;\n"; << indent() << "return *the_pType;\n";
dec(); dec();
o << "}\n"; o << "}\n";