rpms/openoffice.org/devel openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch, NONE, 1.1 openoffice.org.spec, 1.736, 1.737
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jun 8 09:41:24 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18611
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch
Log Message:
rh#193776# openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch
openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch:
bf_linguistic/source/linguistic_misc.cxx | 0
binfilter/bf_linguistic/source/linguistic_misc.cxx | 22 +++++++++++++++++--
cppuhelper/source/implbase_ex.cxx | 6 +++++
linguistic/source/misc.cxx | 23 +++++++++++++++++---
source/implbase_ex.cxx | 0
source/misc.cxx | 0
source/ui/uno/dlelstnr.cxx | 0
sw/source/ui/uno/dlelstnr.cxx | 24 +++++++++++++++++----
8 files changed, 66 insertions(+), 9 deletions(-)
--- NEW FILE openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch ---
Index: source/implbase_ex.cxx
===================================================================
RCS file: /cvs/udk/cppuhelper/source/implbase_ex.cxx,v
retrieving revision 1.12
diff -u -r1.12 implbase_ex.cxx
--- openoffice.org.orig/cppuhelper/source/implbase_ex.cxx 5 Oct 2005 14:28:31 -0000 1.12
+++ openoffice.org/cppuhelper/source/implbase_ex.cxx 8 Jun 2006 08:55:09 -0000
@@ -124,6 +124,12 @@
for ( sal_Int32 n = cd->m_nTypes; n--; )
{
type_entry * pEntry = &pEntries[ n ];
+ if (!pEntry->m_type.getCppuType)
+ {
+ throw RuntimeException( rtl::OUString::createFromAscii(
+ "type \"<Unknown>\" is no interface type!"),
+ Reference< XInterface >() );
+ }
Type const & rType = (*pEntry->m_type.getCppuType)( 0 );
OSL_ENSURE( rType.getTypeClass() == TypeClass_INTERFACE, "### wrong helper init: expected interface!" );
OSL_ENSURE( ! isXInterface( rType.getTypeLibType()->pTypeName ), "### want to implement XInterface: template argument is XInterface?!?!?!" );
Index: bf_linguistic/source/linguistic_misc.cxx
===================================================================
RCS file: /cvs/framework/binfilter/bf_linguistic/source/linguistic_misc.cxx,v
retrieving revision 1.7
diff -u -r1.7 linguistic_misc.cxx
--- openoffice.org.orig/binfilter/bf_linguistic/source/linguistic_misc.cxx 7 Apr 2006 13:19:09 -0000 1.7
+++ openoffice.org/binfilter/bf_linguistic/source/linguistic_misc.cxx 8 Jun 2006 09:16:24 -0000
@@ -717,14 +717,32 @@
void AppExitListener::Activate()
{
if (xDesktop.is())
- xDesktop->addTerminateListener( this );
+ {
+ try
+ {
+ xDesktop->addTerminateListener( this );
+ }
+ catch (const RuntimeException&)
+ {
+ DBG_ASSERT(!this, "Strange Failure on AppExitListener::Activate");
+ }
+ }
}
void AppExitListener::Deactivate()
{
if (xDesktop.is())
- xDesktop->removeTerminateListener( this );
+ {
+ try
+ {
+ xDesktop->removeTerminateListener( this );
+ }
+ catch (const RuntimeException&)
+ {
+ DBG_ASSERT(!this, "Strange Failure on AppExitListener::DeActivate");
+ }
+ }
}
Index: source/misc.cxx
===================================================================
RCS file: /cvs/sw/linguistic/source/misc.cxx,v
retrieving revision 1.25
diff -u -r1.25 misc.cxx
--- openoffice.org.orig/linguistic/source/misc.cxx 7 Apr 2006 13:50:38 -0000 1.25
+++ openoffice.org/linguistic/source/misc.cxx 8 Jun 2006 09:02:04 -0000
@@ -854,14 +854,31 @@
void AppExitListener::Activate()
{
if (xDesktop.is())
- xDesktop->addTerminateListener( this );
+ {
+ try
+ {
+ xDesktop->addTerminateListener( this );
+ }
+ catch (const RuntimeException&)
+ {
+ DBG_ASSERT(!this, "Strange Failure on AppExitListener::Activate");
+ }
+ }
}
-
void AppExitListener::Deactivate()
{
if (xDesktop.is())
- xDesktop->removeTerminateListener( this );
+ {
+ try
+ {
+ xDesktop->removeTerminateListener( this );
+ }
+ catch (const RuntimeException&)
+ {
+ DBG_ASSERT(!this, "Strange Failure on AppExitListener::Deactivate");
+ }
+ }
}
Index: source/ui/uno/dlelstnr.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/uno/dlelstnr.cxx,v
retrieving revision 1.8
diff -u -r1.8 dlelstnr.cxx
--- openoffice.org.orig/sw/source/ui/uno/dlelstnr.cxx 9 Sep 2005 11:18:22 -0000 1.8
+++ openoffice.org/sw/source/ui/uno/dlelstnr.cxx 8 Jun 2006 09:19:43 -0000
@@ -108,8 +108,17 @@
xLngSvcMgr = Reference< XLinguServiceManager >(
xMgr->createInstance( aSvcName ), UNO_QUERY );
if (xLngSvcMgr.is())
- xLngSvcMgr->addLinguServiceManagerListener(
- (XLinguServiceEventListener *) this );
+ {
+ try
+ {
+ xLngSvcMgr->addLinguServiceManagerListener(
+ (XLinguServiceEventListener *) this );
+ }
+ catch (const RuntimeException&)
+ {
+ DBG_ASERT(!this, "addLinguServiceManagerListener");
+ }
+ }
}
}
/* -----------------------------17.03.00 09:07--------------------------------
@@ -214,9 +223,16 @@
{
if (xLngSvcMgr.is())
{
- xLngSvcMgr->removeLinguServiceManagerListener(
+ try
+ {
+ xLngSvcMgr->removeLinguServiceManagerListener(
(XLinguServiceEventListener *) this );
- xLngSvcMgr = 0;
+ xLngSvcMgr = 0;
+ }
+ catch (const RuntimeException&)
+ {
+ DBG_ASSERT(!this, "Strange Failure on removeLinguServiceManagerListener");
+ }
}
xDesktop = NULL;
}
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.736
retrieving revision 1.737
diff -u -r1.736 -r1.737
--- openoffice.org.spec 7 Jun 2006 08:51:24 -0000 1.736
+++ openoffice.org.spec 8 Jun 2006 09:41:21 -0000 1.737
@@ -103,6 +103,7 @@
Patch37: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
Patch38: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
Patch39: openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
+Patch40: openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -833,6 +834,7 @@
%patch37 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
%patch38 -p1 -b .rh192588.officecfg.defaultcairooff.patch
%patch39 -p1 -b .ooo66067.embeddedobj.crash.patch
+%patch40 -p1 -b .ooo66018.linguistic.vorcrash.patch
tar xzf %{SOURCE1}
@@ -3311,6 +3313,7 @@
- rh#185806# update croatian dictionaries, and add spanish, norwegian thesaruses
(thesari?) etc
- rh#193918# add openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
+- rh#193776# add openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch
* Fri Jun 02 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-5.2
- fontcache problem
More information about the fedora-cvs-commits
mailing list