rpms/openoffice.org/devel openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch, 1.1, 1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Nov 21 16:07:29 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3846
Modified Files:
openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
Log Message:
add some more data to track this baby down
openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch:
cppuhelper/inc/cppuhelper/implbase1.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase10.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase11.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase12.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase2.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase3.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase4.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase5.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase6.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase7.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase8.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase9.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase_ex.hxx | 16 ++++++++++++++++
inc/cppuhelper/implbase1.hxx | 0
inc/cppuhelper/implbase10.hxx | 0
inc/cppuhelper/implbase11.hxx | 0
inc/cppuhelper/implbase12.hxx | 0
inc/cppuhelper/implbase2.hxx | 0
inc/cppuhelper/implbase3.hxx | 0
inc/cppuhelper/implbase4.hxx | 0
inc/cppuhelper/implbase5.hxx | 0
inc/cppuhelper/implbase6.hxx | 0
inc/cppuhelper/implbase7.hxx | 0
inc/cppuhelper/implbase8.hxx | 0
inc/cppuhelper/implbase9.hxx | 0
inc/cppuhelper/implbase_ex.hxx | 0
26 files changed, 28 insertions(+), 12 deletions(-)
Index: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch 29 Jun 2006 11:53:49 -0000 1.1
+++ openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch 21 Nov 2006 16:07:27 -0000 1.2
@@ -10,7 +10,7 @@
}
};
- return reinterpret_cast< class_data * >(&s_cd);
-+ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
++ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd), 1);
}
};
@@ -26,7 +26,7 @@
}
};
- return reinterpret_cast< class_data * >(&s_cd);
-+ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
++ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd), 10);
}
};
@@ -42,7 +42,7 @@
}
};
- return reinterpret_cast< class_data * >(&s_cd);
-+ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
++ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd), 11);
}
};
@@ -58,7 +58,7 @@
}
};
- return reinterpret_cast< class_data * >(&s_cd);
-+ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
++ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd), 12);
}
};
@@ -74,7 +74,7 @@
}
};
- return reinterpret_cast< class_data * >(&s_cd);
-+ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
++ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd), 2);
}
};
@@ -90,7 +90,7 @@
}
};
- return reinterpret_cast< class_data * >(&s_cd);
-+ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
++ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd), 3);
}
};
@@ -106,7 +106,7 @@
}
};
- return reinterpret_cast< class_data * >(&s_cd);
-+ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
++ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd), 4);
}
};
@@ -122,7 +122,7 @@
}
};
- return reinterpret_cast< class_data * >(&s_cd);
-+ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
++ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd), 5);
}
};
@@ -138,7 +138,7 @@
}
};
- return reinterpret_cast< class_data * >(&s_cd);
-+ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
++ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd), 6);
}
};
@@ -154,7 +154,7 @@
}
};
- return reinterpret_cast< class_data * >(&s_cd);
-+ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
++ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd), 7);
}
};
@@ -170,7 +170,7 @@
}
};
- return reinterpret_cast< class_data * >(&s_cd);
-+ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
++ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd), 8);
}
};
@@ -186,7 +186,7 @@
}
};
- return reinterpret_cast< class_data * >(&s_cd);
-+ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
++ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd), 9);
}
};
@@ -212,11 +212,11 @@
type_entry m_typeEntries[ 1 ];
};
+
-+template<typename Impl> class_data* class_data_fixup(class_data *s_cd)
++template<typename Impl> class_data* class_data_fixup(class_data *s_cd, int foo)
+{
+ if (!s_cd->m_typeEntries[s_cd->m_nTypes-1].m_type.getCppuType)
+ {
-+ fprintf(stderr, "Avert a fatal crash\n");
++ fprintf(stderr, "Avert a fatal crash from %d\n", foo);
+ s_cd->m_typeEntries[s_cd->m_nTypes-1].m_type.getCppuType =
+ ::com::sun::star::lang::XTypeProvider::static_type;
+ s_cd->m_typeEntries[s_cd->m_nTypes-1].m_offset =
More information about the fedora-cvs-commits
mailing list