[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                                       |    2 
 patches/dev300/codemaker-function-template-generators.diff |   85 -------------
 2 files changed, 87 deletions(-)

New commits:
commit 4c003965edd750830f988ee9a2f937c7008ed8b7
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Sep 2 11:00:34 2009 +0300

    codemaker-function-template-generators.diff is upstream

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9dc540a..37eb863 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2892,8 +2892,6 @@ win32-tooltips.diff, tml
 [ Fixes ]
 # fix problem with calling private and protected members in layout code
 sfx2-privateprotectedpublic.diff
-# add make_pair<>()-like type generator functions to generated header files
-codemaker-function-template-generators.diff, i#98625, thorsten
 # UI + core to make OLE editing optionally outplace
 optional-outplace-ole.diff, i#98970, thorsten
 # UI + core to have in-slideshow user drawing configurable (color &
diff --git a/patches/dev300/codemaker-function-template-generators.diff b/patches/dev300/codemaker-function-template-generators.diff
deleted file mode 100644
index b6688dd..0000000
--- a/patches/dev300/codemaker-function-template-generators.diff
+++ /dev/null
@@ -1,85 +0,0 @@
-diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
-index 69fa71a..5da6316 100644
---- codemaker/source/cppumaker/cpputype.cxx
-+++ codemaker/source/cppumaker/cpputype.cxx
-@@ -2389,7 +2389,7 @@ sal_Bool StructureType::dumpDeclaration(FileStream& o)
-     o << " {\n";
-     inc();
-     o << indent() << "inline " << m_name << "() SAL_THROW(());\n";
--    sal_uInt16 members = m_reader.getFieldCount();
-+    const sal_uInt16 members = m_reader.getFieldCount();
-     if (members > 0 || getInheritedMemberCount() > 0) {
-         o << "\n" << indent() << "inline " << m_name << "(";
-         bool prev = dumpSuperMember(o, base, true);
-@@ -2445,6 +2445,58 @@ sal_Bool StructureType::dumpDeclaration(FileStream& o)
-     dec();
-     o << "};\n\n";
- 
-+    if (isPolymorphic() && (members > 0 || getInheritedMemberCount() > 0)) {
-+        o << indent();
-+        dumpTemplateHead(o);
-+        o << "\n";
-+        o << indent();
-+        o << "inline " << m_name;
-+        dumpTemplateParameters(o);
-+        o << "\n";
-+        o << indent();
-+        o << "make_" << m_name << "(";
-+        bool prev = dumpSuperMember(o, base, true);
-+        for (sal_uInt16 i = 0; i < members; ++i) {
-+            if (prev) {
-+                o << ", ";
-+            }
-+            prev = true;
-+            rtl::OString type(
-+                rtl::OUStringToOString(
-+                    m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8));
-+            if ((m_reader.getFieldFlags(i) & RT_ACCESS_PARAMETERIZED_TYPE) != 0)
-+            {
-+                dumpTypeParameterName(o, type);
-+                o << " const &";
-+            } else {
-+                dumpType(o, type, true, true);
-+            }
-+            o << " "
-+              << rtl::OUStringToOString(
-+                  m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
-+        }
-+        o << ") SAL_THROW(())\n";
-+        o << indent() << "{\n";
-+        inc();
-+        o << indent() << "return " << m_name;
-+        dumpTemplateParameters(o);
-+        o << "(\n";
-+        inc();
-+        prev = dumpSuperMember(o, base, false);
-+        for (sal_uInt16 i = 0; i < members; ++i) {
-+            if (prev) {
-+                o << ",\n";
-+            }
-+            prev = true;
-+            o << indent() << rtl::OUStringToOString(
-+                m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
-+        }
-+        o << ");\n";
-+        dec();
-+        dec();
-+        o << indent() << "}\n\n";
-+    }
-+
- 	o << "#ifdef SAL_W32\n"
- 	  << "#   pragma pack(pop)\n"
- 	  << "#elif defined(SAL_OS2)\n"
-diff --git a/codemaker/test/cppumaker/types.idl b/codemaker/test/cppumaker/types.idl
-index 972f579..962aca8 100644
---- codemaker/test/cppumaker/types.idl
-+++ codemaker/test/cppumaker/types.idl
-@@ -28,8 +28,6 @@
-  *
-  ************************************************************************/
- 
--/*TODO: Do not depend on types for which C++ header files are only generated
--  later in the build process in offuh: */
- #include "com/sun/star/lang/ClassNotFoundException.idl"
- #include "com/sun/star/lang/IllegalAccessException.idl"
- #include "com/sun/star/lang/Locale.idl"