rpms/openoffice.org/devel openoffice.org.spec, 1.871, 1.872 pseudoworkspace.valgrind1.patch, 1.3, 1.4 sources, 1.197, 1.198
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Sep 15 11:07:18 UTC 2006
- Previous message (by thread): rpms/system-config-date/devel .cvsignore, 1.44, 1.45 sources, 1.47, 1.48 system-config-date.spec, 1.53, 1.54
- Next message (by thread): rpms/util-linux/devel util-linux-2.13-mount-uhelper.patch, 1.1, 1.2 util-linux.spec, 1.140, 1.141
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22946
Modified Files:
openoffice.org.spec pseudoworkspace.valgrind1.patch sources
Log Message:
2.0.4-4
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.871
retrieving revision 1.872
diff -u -r1.871 -r1.872
--- openoffice.org.spec 6 Sep 2006 14:13:45 -0000 1.871
+++ openoffice.org.spec 15 Sep 2006 11:07:16 -0000 1.872
@@ -1,5 +1,5 @@
%define oootag OOD680
-%define ooomilestone 3
+%define ooomilestone 4
%define rh_rpm_release 1
# gcc#19664#
@@ -2517,6 +2517,10 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Fri Sep 15 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-4.1
+- fix rh#206264# .ppt load crash
+- upstream release blockers
+
* Tue Sep 04 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-3.1
- add workspace.cairofixes02.patch for some cairocanvas fixing
- add openoffice.org-2.0.4.ooo69325.cairocanvas.slowfills.patch to
pseudoworkspace.valgrind1.patch:
configmgr/source/tree/cmtree.cxx | 4
connectivity/source/drivers/evoab2/NResultSet.cxx | 6 -
framework/source/uiconfiguration/moduleimagemanager.cxx | 9 ++
inc/SwBitArray.hxx | 0
inc/SwRewriter.hxx | 0
inc/msdffdef.hxx | 0
inc/osl/file.hxx | 0
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 1
osl/unx/process.c | 0
sal/inc/osl/file.hxx | 5 +
sal/osl/unx/process.c | 6 -
shell/source/backends/gconfbe/gconflayer.cxx | 23 +++--
source/backends/gconfbe/gconflayer.cxx | 0
source/core/bastyp/SwBitArray.cxx | 0
source/customshapes/EnhancedCustomShapeFunctionParser.cxx | 0
source/cxxhelp/provider/databases.cxx | 0
source/cxxhelp/provider/db.cxx | 0
source/cxxhelp/provider/db.hxx | 0
source/glyphs/gcach_ftyp.cxx | 0
source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 0
source/misc/transfer.cxx | 0
source/msfilter/msdffimp.cxx | 0
source/tree/cmtree.cxx | 0
svtools/source/misc/transfer.cxx | 1
svx/inc/msdffdef.hxx | 1
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx | 2
svx/source/msfilter/msdffimp.cxx | 2
sw/inc/SwBitArray.hxx | 4
sw/inc/SwRewriter.hxx | 1
sw/inc/numrule.hxx | 18 ++--
sw/source/core/bastyp/SwBitArray.cxx | 2
sw/source/core/doc/docnum.cxx | 5 -
sw/source/core/doc/number.cxx | 11 ++
unx/source/app/saldisp.cxx | 0
unx/source/gdi/salvd.cxx | 0
vcl/source/glyphs/gcach_ftyp.cxx | 3
vcl/unx/inc/saldisp.hxx | 2
vcl/unx/source/app/saldisp.cxx | 8 +
vcl/unx/source/gdi/salvd.cxx | 4
xmlhelp/source/cxxhelp/provider/databases.cxx | 4
xmlhelp/source/cxxhelp/provider/db.cxx | 43 ----------
xmlhelp/source/cxxhelp/provider/db.hxx | 24 -----
42 files changed, 92 insertions(+), 97 deletions(-)
Index: pseudoworkspace.valgrind1.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pseudoworkspace.valgrind1.patch 5 Sep 2006 14:36:43 -0000 1.3
+++ pseudoworkspace.valgrind1.patch 15 Sep 2006 11:07:16 -0000 1.4
@@ -47,23 +47,6 @@
m_pStatement = NULL;
m_xMetaData = NULL;
}
-Index: source/uiconfiguration/moduleimagemanager.cxx
-===================================================================
-RCS file: /cvs/framework/framework/source/uiconfiguration/moduleimagemanager.cxx,v
-retrieving revision 1.13
-diff -u -r1.13 moduleimagemanager.cxx
---- openoffice.org.orig/framework/source/uiconfiguration/moduleimagemanager.cxx 19 Jun 2006 11:31:13 -0000 1.13
-+++ openoffice.org/framework/source/uiconfiguration/moduleimagemanager.cxx 30 Aug 2006 13:19:55 -0000
-@@ -742,6 +742,9 @@
-
- ModuleImageManager::~ModuleImageManager()
- {
-+ for ( sal_Int32 n=0; n < ImageType_COUNT; n++ )
-+ delete m_pUserImageList[n];
-+ delete m_pDefaultImageList;
- }
-
- // XComponent
Index: source/backends/gconfbe/gconflayer.cxx
===================================================================
RCS file: /cvs/gsl/shell/source/backends/gconfbe/gconflayer.cxx,v
@@ -385,22 +368,6 @@
ostream & operator << (ostream & o, const SwBitArray & rBitArray)
{
char buffer[256];
-Index: source/core/doc/number.cxx
-===================================================================
-RCS file: /cvs/sw/sw/source/core/doc/number.cxx,v
-retrieving revision 1.35
-diff -u -r1.35 number.cxx
---- openoffice.org.orig/sw/source/core/doc/number.cxx 25 Jul 2006 11:47:04 -0000 1.35
-+++ openoffice.org/sw/source/core/doc/number.cxx 31 Aug 2006 13:34:49 -0000
-@@ -608,6 +608,8 @@
-
- SwNumRule::~SwNumRule()
- {
-+ delete pList;
-+
- for( USHORT n = 0; n < MAXLEVEL; ++n )
- delete aFmts[ n ];
-
Index: source/cxxhelp/provider/databases.cxx
===================================================================
RCS file: /cvs/util/xmlhelp/source/cxxhelp/provider/databases.cxx,v
@@ -575,3 +542,124 @@
using namespace utl;
using namespace osl;
using namespace rtl;
+Index: numrule.hxx
+===================================================================
+RCS file: /cvs/sw/sw/inc/numrule.hxx,v
+retrieving revision 1.28
+diff -w -u -r1.28 numrule.hxx
+--- openoffice.org.orig/sw/inc/numrule.hxx 14 Aug 2006 15:28:41 -0000 1.28
++++ openoffice.org/sw/inc/numrule.hxx 12 Sep 2006 08:55:31 -0000
+@@ -160,8 +160,11 @@
+ tPamAndNums aNumberRanges;
+ SwNumFmt* aFmts[ MAXLEVEL ];
+
+- /**
+- cache for associated text nodes
++ /** list for associated text nodes
++
++ OD 2006-09-12 #i69145#
++ It's not a cache.
++
+ */
+ SwTxtNodeTable * pList;
+
+@@ -230,12 +233,15 @@
+ */
+ const SwTxtNodeTable * GetList() const { return pList; }
+
+- /**
+- Set list of associated text nodes.
++ /** Creates list of associated text nodes.
++
++ OD 2006-09-12 #i69145#
++ Creates the list the associated text nodes by copying contents of
++ list provided by parameter <rList>
+
+- @param _pList the list of associated text nodes
++ @param _rList the list of associated text nodes
+ */
+- void SetList(SwTxtNodeTable * _pList);
++ void SetList(const SwTxtNodeTable& rList);
+
+ // #i36749#
+ /**
+Index: docnum.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/core/doc/docnum.cxx,v
+retrieving revision 1.57
+diff -w -u -r1.57 docnum.cxx
+--- openoffice.org.orig/sw/source/core/doc/docnum.cxx 14 Aug 2006 15:59:04 -0000 1.57
++++ openoffice.org/sw/source/core/doc/docnum.cxx 12 Sep 2006 08:55:40 -0000
+@@ -901,8 +901,9 @@
+
+ // --> FME 2004-11-03 #i36571# The numrule and this info structure should
+ // have different instances of the list:
+- SwTxtNodeTable* pNewList = new SwTxtNodeTable( aList );
+- pRule->SetList(pNewList);
++ // --> OD 2006-09-12 #i69145#
++ // method <SwNumRule::SetList(..)> copies content of list provided by the parameter
++ pRule->SetList( aList );
+ // <--
+ }
+
+Index: number.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/core/doc/number.cxx,v
+retrieving revision 1.36
+diff -w -u -r1.36 number.cxx
+--- openoffice.org.orig/sw/source/core/doc/number.cxx 14 Aug 2006 16:01:54 -0000 1.36
++++ openoffice.org/sw/source/core/doc/number.cxx 12 Sep 2006 08:55:40 -0000
+@@ -176,13 +176,16 @@
+ sName = rName;
+ }
+
+-void SwNumRule::SetList(SwTxtNodeTable * _pList)
++// --> OD 2006-09-12 #i69145#
++// Creates list of associated text nodes by copying contents of provided list <_pList>
++void SwNumRule::SetList( const SwTxtNodeTable& rList )
+ {
+ if (pList)
+ delete pList;
+
+- pList = _pList;
++ pList = new SwTxtNodeTable( rList );
+ }
++// <--
+
+ void SwNumRule::SetNumRuleMap(std::hash_map<String, SwNumRule *, StringHash> *
+ _pNumRuleMap)
+@@ -634,6 +637,10 @@
+ delete (*aIt).second;
+ }
+
++ // --> OD 2006-09-12 #i69145#
++ delete pList;
++ pList = 0;
++ // <--
+ }
+
+
+CVS wrapper -- version: 1.99
+Index: moduleimagemanager.cxx
+===================================================================
+RCS file: /cvs/framework/framework/source/uiconfiguration/moduleimagemanager.cxx,v
+retrieving revision 1.13
+diff -u -p -r1.13 moduleimagemanager.cxx
+--- openoffice.org.orig/framework/source/uiconfiguration/moduleimagemanager.cxx 19 Jun 2006 11:31:13 -0000 1.13
++++ openoffice.org/framework/source/uiconfiguration/moduleimagemanager.cxx 13 Sep 2006 14:32:29 -0000
+@@ -760,6 +760,15 @@ void SAL_CALL ModuleImageManager::dispos
+ m_bConfigRead = false;
+ m_bModified = false;
+ m_bDisposed = true;
++
++ // delete user and default image list on dispose
++ for ( sal_Int32 n=0; n < ImageType_COUNT; n++ )
++ {
++ delete m_pUserImageList[n];
++ m_pUserImageList[n] = 0;
++ }
++ delete m_pDefaultImageList;
++ m_pDefaultImageList = 0;
+ }
+ }
+
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- sources 15 Sep 2006 09:16:15 -0000 1.197
+++ sources 15 Sep 2006 11:07:16 -0000 1.198
@@ -11,5 +11,5 @@
0ee333127e54353d49bf30aa112faee4 openoffice.org.langpack.template.tar.gz
cba51824724ada973394d8feecdd0213 pa-IN-179.sdf
26c72b57608d21c7cccf941f1df2aea9 redhat-templates.tar.gz
-6a2e8103f113d09c1fa1f1fc2917fca0 openoffice.org-simple-crash_report.sh
3da0b91ab6058ce4f747152cb29b7aaf OOD680_m4.tar.bz2
+af01ed5bd2f33e7ddc7c8db5c06b0dac openoffice.org-simple-crash_report.sh
- Previous message (by thread): rpms/system-config-date/devel .cvsignore, 1.44, 1.45 sources, 1.47, 1.48 system-config-date.spec, 1.53, 1.54
- Next message (by thread): rpms/util-linux/devel util-linux-2.13-mount-uhelper.patch, 1.1, 1.2 util-linux.spec, 1.140, 1.141
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list