rpms/openoffice.org/devel pseudoworkspace.valgrind1.patch, NONE, 1.1 openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch, 1.2, 1.3 openoffice.org-2.0.4.ooo68919.sc.atk.patch, 1.1, 1.2 openoffice.org.spec, 1.866, 1.867
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Sep 4 08:05:44 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31860
Modified Files:
openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch
openoffice.org-2.0.4.ooo68919.sc.atk.patch openoffice.org.spec
Added Files:
pseudoworkspace.valgrind1.patch
Log Message:
valgrind fixes
pseudoworkspace.valgrind1.patch:
configmgr/source/tree/cmtree.cxx | 4
connectivity/source/drivers/evoab2/NResultSet.cxx | 6 -
framework/source/uiconfiguration/moduleimagemanager.cxx | 3
inc/SwBitArray.hxx | 0
inc/SwRewriter.hxx | 0
inc/msdffdef.hxx | 0
inc/osl/file.hxx | 0
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/core/doc/number.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/misc/transfer.cxx | 0
source/msfilter/msdffimp.cxx | 0
source/tree/cmtree.cxx | 0
source/uiconfiguration/moduleimagemanager.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/source/core/bastyp/SwBitArray.cxx | 2
sw/source/core/doc/number.cxx | 2
unx/source/app/saldisp.cxx | 0
unx/source/gdi/salvd.cxx | 0
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 -----
38 files changed, 61 insertions(+), 86 deletions(-)
--- NEW FILE pseudoworkspace.valgrind1.patch ---
Index: unx/source/gdi/salvd.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/gdi/salvd.cxx,v
retrieving revision 1.13.166.1
diff -u -r1.13.166.1 salvd.cxx
--- openoffice.org.orig/vcl/unx/source/gdi/salvd.cxx 10 Aug 2006 14:59:24 -0000 1.13.166.1
+++ openoffice.org/vcl/unx/source/gdi/salvd.cxx 26 Aug 2006 15:13:10 -0000
@@ -103,6 +103,10 @@
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
void X11SalGraphics::Init( X11SalVirtualDevice *pDevice, SalColormap* pColormap, bool bDeleteColormap )
{
+ if (m_pDeleteColormap)
+ delete m_pDeleteColormap;
+ m_pDeleteColormap = m_pColormap = 0;
+
SalDisplay *pDisplay = pDevice->GetDisplay();
int nVisualDepth = pDisplay->GetColormap().GetVisual()->GetDepth();
Index: source/drivers/evoab2/NResultSet.cxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NResultSet.cxx,v
retrieving revision 1.4
retrieving revision 1.4.104.1
diff -u -r1.4 -r1.4.104.1
--- openoffice.org.orig/connectivity/source/drivers/evoab2/NResultSet.cxx 28 Feb 2006 10:34:00 -0000 1.4
+++ openoffice.org/connectivity/source/drivers/evoab2/NResultSet.cxx 21 Aug 2006 11:44:20 -0000 1.4.104.1
@@ -259,10 +259,11 @@
if (pBook)
{
+ g_list_free(m_pContacts);
+ m_pContacts = NULL;
if( bIsWithoutWhere && !isLocal( pBook ) )
{
OSL_TRACE( "large query on non-local book - ignored" );
- m_pContacts = NULL;
::dbtools::throwGenericSQLException(
::rtl::OUString::createFromAscii(
"Use SQL Query with \"where clause\" or \"criteria\", to get the results." ), NULL );
@@ -287,7 +288,8 @@
OPropertySetHelper::disposing();
::osl::MutexGuard aGuard(m_aMutex);
-
+ g_list_free(m_pContacts);
+ m_pContacts = NULL;
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
retrieving revision 1.9
diff -u -r1.9 gconflayer.cxx
--- openoffice.org.orig/shell/openoffice.org.orig/shell/source/backends/gconfbe/gconflayer.cxx 19 Jul 2006 17:15:23 -0000 1.9
+++ openoffice.org/shell/openoffice.org/shell/source/backends/gconfbe/gconflayer.cxx 29 Aug 2006 13:35:03 -0000
@@ -189,8 +189,12 @@
GConfClient* aClient = GconfBackend::getGconfClient();
GConfValue* aGconfValue = gconf_client_get( aClient, GCONF_PROXY_MODE_KEY, NULL );
- if( ( aGconfValue != NULL ) && ( g_strcasecmp( "manual", gconf_value_get_string( aGconfValue ) ) == 0 ) )
- return sal_True;
+ if ( aGconfValue != NULL )
+ {
+ bool bOk = g_strcasecmp( "manual", gconf_value_get_string( aGconfValue ) ) == 0;
+ gconf_value_free( aGconfValue );
+ if (bOk) return sal_True;
+ }
}
break;
@@ -236,8 +240,12 @@
GConfClient* aClient = GconfBackend::getGconfClient();
GConfValue* aGconfValue = gconf_client_get( aClient, GCONF_AUTO_SAVE_KEY, NULL );
- if( ( aGconfValue != NULL ) && gconf_value_get_bool( aGconfValue ) )
- return sal_True;
+ if( ( aGconfValue != NULL ) )
+ {
+ bool bOk = gconf_value_get_bool( aGconfValue );
+ gconf_value_free( aGconfValue );
+ if (bOk) return sal_True;
+ }
}
break;
#endif // ENABLE_LOCKDOWN
@@ -275,11 +283,11 @@
for( i = 0; i < m_nConfigurationValues; i++ )
{
- aGconfValue = gconf_client_get( aClient, m_pConfigurationValuesList[i].GconfItem, NULL );
-
if( ( m_pConfigurationValuesList[i].nDependsOn != SETTINGS_LAST ) && !isDependencySatisfied( m_pConfigurationValuesList[i] ) )
continue;
+ aGconfValue = gconf_client_get( aClient, m_pConfigurationValuesList[i].GconfItem, NULL );
+
if( aGconfValue != NULL )
{
aPropInfoList[nProperties].Name = rtl::OUString::createFromAscii( m_pConfigurationValuesList[i].OOoConfItem );
@@ -291,6 +299,8 @@
else
aPropInfoList[nProperties].Value = makeAnyOfGconfValue( aGconfValue );
+ gconf_value_free( aGconfValue );
+
nProperties++;
}
}
@@ -346,6 +356,7 @@
break;
}
nHashCode = (nHashCode << 5) - nHashCode;
+ gconf_value_free( aGconfValue );
}
}
Index: source/customshapes/EnhancedCustomShapeFunctionParser.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx,v
retrieving revision 1.7
diff -u -r1.7 EnhancedCustomShapeFunctionParser.cxx
--- openoffice.org.orig/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx 10 Jul 2006 11:26:54 -0000 1.7
+++ openoffice.org/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx 30 Aug 2006 13:42:11 -0000
@@ -58,7 +58,9 @@
#endif
#include <boost/spirit/core.hpp>
+#if (OSL_DEBUG_LEVEL > 1)
#include <iostream>
+#endif
#include <functional>
#include <algorithm>
#include <stack>
Index: source/tree/cmtree.cxx
===================================================================
RCS file: /cvs/util/configmgr/source/tree/cmtree.cxx,v
retrieving revision 1.35
diff -u -r1.35 cmtree.cxx
--- openoffice.org.orig/configmgr/source/tree/cmtree.cxx 8 Sep 2005 04:16:32 -0000 1.35
+++ openoffice.org/configmgr/source/tree/cmtree.cxx 25 Aug 2006 13:44:37 -0000
@@ -68,10 +68,6 @@
#include <vector>
#define INCLUDED_VECTOR
#endif
-#ifndef INCLUDED_IOSTREAM
-#include <iostream>
-#define INCLUDED_IOSTREAM
-#endif
#ifndef INCLUDED_EXCEPTION
#include <exception>
#define INCLUDED_EXCEPTION
Index: inc/osl/file.hxx
===================================================================
RCS file: /cvs/porting/sal/inc/osl/file.hxx,v
retrieving revision 1.34
diff -u -r1.34 file.hxx
--- openoffice.org.orig/sal/inc/osl/file.hxx 8 Sep 2005 14:27:47 -0000 1.34
+++ openoffice.org/sal/inc/osl/file.hxx 25 Aug 2006 08:59:22 -0000
@@ -1784,6 +1784,11 @@
inline RC getNextItem( DirectoryItem& rItem, sal_uInt32 nHint = 0 )
{
+ if( rItem._pData )
+ {
+ osl_releaseDirectoryItem( rItem._pData );
+ rItem._pData = 0;
+ }
return ( RC) osl_getNextDirectoryItem( _pData, &rItem._pData, nHint );
}
diff -u -r1.36 saldisp.hxx
--- openoffice.org.orig/vcl/unx/inc/saldisp.hxx 14 Jul 2006 08:57:07 -0000 1.36
+++ openoffice.org/vcl/unx/inc/saldisp.hxx 26 Aug 2006 15:18:18 -0000
@@ -282,6 +282,7 @@
class AttributeProvider;
class SalUnicodeConverter;
class SalConverterCache;
+class DtIntegrator;
DECLARE_LIST( SalFontCache, ExtendedFontStruct* )
@@ -307,6 +308,7 @@
};
protected:
+ DtIntegrator *mpIntegrator;
SalXLib *pXLib_;
SalI18N_InputMethod *mpInputMethod;
SalI18N_KeyboardExtension *mpKbdExtension;
Index: unx/source/app/saldisp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/saldisp.cxx,v
retrieving revision 1.78.12.1
diff -u -r1.78.12.1 saldisp.cxx
--- openoffice.org.orig/vcl/unx/source/app/saldisp.cxx 10 Aug 2006 14:57:00 -0000 1.78.12.1
+++ openoffice.org/vcl/unx/source/app/saldisp.cxx 26 Aug 2006 15:19:16 -0000
@@ -582,6 +582,7 @@
#endif /* HAVE_LIBSN */
SalDisplay::SalDisplay( Display *display, Colormap aColMap ) :
+ mpIntegrator( NULL ),
mpInputMethod( NULL ),
mpFallbackFactory ( NULL ),
pDisp_( display ),
@@ -645,6 +646,9 @@
sn_display_unref( m_pSnDisplay );
#endif /* HAVE_LIBSN */
+ if (mpIntegrator)
+ mpIntegrator->Release();
+
if( IsDisplay() )
{
delete mpInputMethod, mpInputMethod = (SalI18N_InputMethod*)ILLEGAL_POINTER;
@@ -1155,8 +1159,8 @@
InitXinerama();
// initialize system settings update
- DtIntegrator* pIntegrator = DtIntegrator::CreateDtIntegrator();
- pIntegrator->Acquire();
+ mpIntegrator = DtIntegrator::CreateDtIntegrator();
+ mpIntegrator->Acquire();
#ifdef HAVE_LIBSN
if ( bHandleStartupNotification )
Index: osl/unx/process.c
===================================================================
RCS file: /cvs/porting/sal/osl/unx/process.c,v
retrieving revision 1.40
diff -u -r1.40 process.c
--- openoffice.org.orig/sal/osl/unx/process.c 20 Jun 2006 04:18:45 -0000 1.40
+++ openoffice.org/sal/osl/unx/process.c 1 Sep 2006 08:30:56 -0000
@@ -1171,7 +1171,7 @@
char* tmp=0;
char prstatbuf[512];
memset(prstatbuf,0,512);
- read(fd,prstatbuf,512);
+ read(fd,prstatbuf,511);
close(fd);
/*printf("%s\n\n",prstatbuf);*/
@@ -1219,7 +1219,7 @@
{
char prstatmbuf[512];
memset(prstatmbuf,0,512);
- read(fd,prstatmbuf,512);
+ read(fd,prstatmbuf,511);
close(fd);
@@ -1248,7 +1248,7 @@
char* tmp=0;
char prstatusbuf[512];
memset(prstatusbuf,0,512);
- read(fd,prstatusbuf,512);
+ read(fd,prstatusbuf,511);
close(fd);
Index: source/misc/transfer.cxx
===================================================================
RCS file: /cvs/util/svtools/source/misc/transfer.cxx,v
retrieving revision 1.73
diff -u -r1.73 transfer.cxx
--- openoffice.org.orig/svtools/source/misc/transfer.cxx 26 Jul 2006 07:28:48 -0000 1.73
+++ openoffice.org/svtools/source/misc/transfer.cxx 30 Aug 2006 13:47:54 -0000
@@ -1238,6 +1238,7 @@
::osl::MutexGuard aGuard( mpImpl->maMutex );
delete mpFormats, mpFormats = NULL;
}
+ delete mpImpl;
}
// -----------------------------------------------------------------------------
Index: inc/msdffdef.hxx
===================================================================
RCS file: /cvs/graphics/svx/inc/msdffdef.hxx,v
retrieving revision 1.9
diff -u -r1.9 msdffdef.hxx
--- openoffice.org.orig/svx/inc/msdffdef.hxx 19 Jun 2006 14:39:26 -0000 1.9
+++ openoffice.org/svx/inc/msdffdef.hxx 3 Sep 2006 14:33:52 -0000
@@ -1257,6 +1257,7 @@
UINT32 nRecLen;
ULONG nFilePos;
public:
+ DffRecordHeader() : nRecVer(0), nRecInstance(0), nImpVerInst(0), nRecType(0), nRecLen(0), nFilePos(0) {}
FASTBOOL IsContainer() const { return nRecVer == DFF_PSFLAG_CONTAINER; }
ULONG GetRecBegFilePos() const { return nFilePos; }
ULONG GetRecEndFilePos() const { return nFilePos + DFF_COMMON_RECORD_HEADER_SIZE + nRecLen; }
Index: source/msfilter/msdffimp.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/msfilter/msdffimp.cxx,v
retrieving revision 1.135
diff -u -r1.135 msdffimp.cxx
--- openoffice.org.orig/svx/source/msfilter/msdffimp.cxx 19 Jun 2006 16:19:47 -0000 1.135
+++ openoffice.org/svx/source/msfilter/msdffimp.cxx 3 Sep 2006 14:34:24 -0000
@@ -612,7 +615,7 @@
SvStream& operator>>( SvStream& rIn, DffRecordHeader& rRec )
{
rRec.nFilePos = rIn.Tell();
- UINT16 nTmp;
+ UINT16 nTmp(0);
rIn >> nTmp;
rRec.nImpVerInst = nTmp;
rRec.nRecVer = nTmp & 0x000F;
Index: inc/SwBitArray.hxx
===================================================================
RCS file: /cvs/sw/sw/inc/SwBitArray.hxx,v
retrieving revision 1.4
diff -u -r1.4 SwBitArray.hxx
--- openoffice.org.orig/sw/inc/SwBitArray.hxx 9 Sep 2005 01:29:08 -0000 1.4
+++ openoffice.org/sw/inc/SwBitArray.hxx 31 Aug 2006 13:31:25 -0000
@@ -36,7 +36,9 @@
#define _SW_BIT_ARRAY_HXX
#include <swtypes.hxx>
+#if OSL_DEBUG_LEVEL > 1
#include <iostream>
+#endif
/**
a bit array
@@ -170,6 +172,7 @@
*/
friend SwBitArray operator ~ (const SwBitArray & rA);
+#if OSL_DEBUG_LEVEL > 1
/**
output operator
@@ -180,6 +183,7 @@
*/
friend std::ostream & operator <<
(std::ostream & o, const SwBitArray & rBitArray);
+#endif
};
Index: inc/SwRewriter.hxx
===================================================================
RCS file: /cvs/sw/sw/inc/SwRewriter.hxx,v
retrieving revision 1.7
diff -u -r1.7 SwRewriter.hxx
--- openoffice.org.orig/sw/inc/SwRewriter.hxx 9 Sep 2005 01:29:39 -0000 1.7
+++ openoffice.org/sw/inc/SwRewriter.hxx 31 Aug 2006 13:31:26 -0000
@@ -37,7 +37,6 @@
#define _SW_REWRITER_HXX
#include <vector>
-#include <iostream>
#include <tools/string.hxx>
typedef std::pair<String, String> SwRewriteRule;
Index: source/core/bastyp/SwBitArray.cxx
===================================================================
RCS file: /cvs/sw/sw/source/core/bastyp/SwBitArray.cxx,v
retrieving revision 1.4
diff -u -r1.4 SwBitArray.cxx
--- openoffice.org.orig/sw/source/core/bastyp/SwBitArray.cxx 9 Sep 2005 02:58:55 -0000 1.4
+++ openoffice.org/sw/source/core/bastyp/SwBitArray.cxx 31 Aug 2006 13:34:01 -0000
@@ -156,7 +156,7 @@
return aResult;
}
-#if 1
+#if OSL_DEBUG_LEVEL > 1
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
retrieving revision 1.45
diff -u -r1.45 databases.cxx
--- openoffice.org.orig/xmlhelp/source/cxxhelp/provider/databases.cxx 20 Jun 2006 00:38:50 -0000 1.45
+++ openoffice.org/xmlhelp/source/cxxhelp/provider/databases.cxx 3 Sep 2006 13:15:31 -0000
@@ -571,7 +571,7 @@
if( aPair.second && ! it->second )
{
- Db* table = new Db( 0,DB_CXX_NO_EXCEPTIONS );
+ Db* table = new Db();
rtl::OUString fileNameOU =
getInstallPathAsSystemPath() +
@@ -794,7 +794,7 @@
fileNameOU.getLength(),
osl_getThreadTextEncoding() );
- Db table(0,DB_CXX_NO_EXCEPTIONS);
+ Db table;
if( 0 == table.open( 0,fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
{
std::vector<KeywordInfo::KeywordElement> aVector;
Index: source/cxxhelp/provider/db.cxx
===================================================================
RCS file: /cvs/util/xmlhelp/source/cxxhelp/provider/db.cxx,v
retrieving revision 1.4
diff -u -r1.4 db.cxx
--- openoffice.org.orig/xmlhelp/source/cxxhelp/provider/db.cxx 20 Jun 2006 00:39:06 -0000 1.4
+++ openoffice.org/xmlhelp/source/cxxhelp/provider/db.cxx 3 Sep 2006 13:15:31 -0000
@@ -56,44 +56,6 @@
//----------------------------------------------------------------------------
-DbEnv::DbEnv(u_int32_t flags)
-: m_pDBENV(0)
-{
- db_internal::check_error( db_env_create(&m_pDBENV,flags), "DbEnv::DbEnv" );
-}
-
-DbEnv::~DbEnv()
-{
- if (m_pDBENV)
- {
- // should not happen
- // TODO: add assert
- m_pDBENV->close(m_pDBENV,0);
- }
-}
-
-int DbEnv::open(const char *db_home, u_int32_t flags, int mode)
-{
- return db_internal::check_error( m_pDBENV->open(m_pDBENV,db_home,flags,mode), "DbEnv::open" );
-}
-
-void DbEnv::close(u_int32_t flags)
-{
- int error = m_pDBENV->close(m_pDBENV,flags);
- m_pDBENV = 0;
-
- db_internal::check_error(error, "DbEnv::close");
-}
-
-int DbEnv::set_alloc(db_malloc_fcn_type app_malloc,
- db_realloc_fcn_type app_realloc,
- db_free_fcn_type app_free)
-{
- int err = m_pDBENV->set_alloc(m_pDBENV,app_malloc,app_realloc,app_free);
- return db_internal::check_error(err,"Db::set_alloc");
-}
-//----------------------------------------------------------------------------
-
int Db::set_alloc( db_malloc_fcn_type app_malloc,
db_realloc_fcn_type app_realloc,
db_free_fcn_type app_free)
@@ -102,10 +64,9 @@
return db_internal::check_error(err,"Db::set_alloc");
}
-Db::Db(DbEnv* pDbenv,u_int32_t flags)
-: m_pDBP(0)
+Db::Db()
{
- db_internal::check_error( db_create(&m_pDBP,pDbenv ? pDbenv->m_pDBENV:0,flags),"Db::Db" );
+ db_internal::check_error( db_create(&m_pDBP,0,0),"Db::Db" );
}
Index: source/cxxhelp/provider/db.hxx
===================================================================
RCS file: /cvs/util/xmlhelp/source/cxxhelp/provider/db.hxx,v
retrieving revision 1.6
diff -u -r1.6 db.hxx
--- openoffice.org.orig/xmlhelp/source/cxxhelp/provider/db.hxx 20 Jun 2006 00:39:17 -0000 1.6
+++ openoffice.org/xmlhelp/source/cxxhelp/provider/db.hxx 3 Sep 2006 13:15:31 -0000
@@ -52,7 +52,6 @@
namespace berkeleydbproxy {
- class DbEnv;
class Dbc;
class Dbt;
@@ -81,34 +80,13 @@
{ return what_.getStr(); }
};
-
- class DbEnv : db_internal::Noncopyable
- {
- friend class Db;
-
- private:
- DB_ENV* m_pDBENV;
-
- public:
- explicit DbEnv(u_int32_t flags);
- ~DbEnv();
-
- int open(const char *db_home, u_int32_t flags, int mode);
- void close(u_int32_t flags);
-
- int set_alloc(
- db_malloc_fcn_type app_malloc,
- db_realloc_fcn_type app_realloc,
- db_free_fcn_type app_free);
- };
-
class Db : db_internal::Noncopyable
{
private:
DB* m_pDBP;
public:
- Db(DbEnv* dbbenv,u_int32_t flags);
+ Db();
~Db();
int close(u_int32_t flags);
openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch:
menubarmanager.cxx | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletion(-)
Index: openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch 30 Aug 2006 15:41:46 -0000 1.2
+++ openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch 4 Sep 2006 08:05:15 -0000 1.3
@@ -1,61 +1,70 @@
-Index: source/uielement/menubarmanager.cxx
-===================================================================
-RCS file: /cvs/framework/framework/source/uielement/menubarmanager.cxx,v
-retrieving revision 1.39
-diff -u -r1.39 menubarmanager.cxx
---- openoffice.org.orig/framework/source/uielement/menubarmanager.cxx 4 Aug 2006 11:08:22 -0000 1.39
-+++ openoffice.org/framework/source/uielement/menubarmanager.cxx 30 Aug 2006 15:36:32 -0000
-@@ -1062,6 +1062,12 @@
- }
- }
-
-+static void lcl_CheckForChildren(Menu* pMenu, USHORT nItemId)
-+{
-+ if (PopupMenu* pThisPopup = pMenu->GetPopupMenu( nItemId ))
-+ pMenu->EnableItem( nItemId, pThisPopup->GetItemCount() ? true : false );
-+}
-+
- //_________________________________________________________________________________________________________________
- // vcl handler
- //_________________________________________________________________________________________________________________
-@@ -1249,8 +1255,11 @@
- // Force update of popup menu
- pMenuItemHandler->xPopupMenuController->updatePopupMenu();
- bPopupMenu = sal_True;
-+
- }
-
-+ lcl_CheckForChildren(pMenu, pMenuItemHandler->nItemId);
-+
- if ( xMenuItemDispatch.is() )
- {
- pMenuItemHandler->xMenuItemDispatch = xMenuItemDispatch;
-@@ -1271,6 +1280,8 @@
- {
- // Force update of popup menu
- pMenuItemHandler->xPopupMenuController->updatePopupMenu();
-+ lcl_CheckForChildren(pMenu, pMenuItemHandler->nItemId);
-+
- }
- else if ( pMenuItemHandler->xMenuItemDispatch.is() )
- {
-@@ -1659,6 +1670,8 @@
- if ( CreatePopupMenuController( pItemHandler ))
- pItemHandler->xPopupMenuController->updatePopupMenu();
- }
-+
-+ lcl_CheckForChildren(pMenu, nItemId);
- }
- else if (( aItemCommand.getLength() > nAddonsURLPrefixLength ) &&
- ( aItemCommand.indexOf( ADDONSPOPUPMENU_URL_PREFIX ) == 0 ))
-@@ -1805,7 +1818,9 @@
- {
- if ( CreatePopupMenuController( pItemHandler ))
- pItemHandler->xPopupMenuController->updatePopupMenu();
-- }
-+ }
-+
-+ lcl_CheckForChildren(pMenu, pItemHandler->nItemId);
- }
-
- m_aMenuItemHandlerVector.push_back( pItemHandler );
+Index: menubarmanager.cxx
+===================================================================
+RCS file: /cvs/framework/framework/source/uielement/menubarmanager.cxx,v
+retrieving revision 1.39
+diff -u -p -r1.39 menubarmanager.cxx
+--- openoffice.org.orig/framework/source/uielement/menubarmanager.cxx 4 Aug 2006 11:08:22 -0000 1.39
++++ openoffice.org/framework/source/uielement/menubarmanager.cxx 31 Aug 2006 12:27:45 -0000
+@@ -1062,6 +1062,12 @@ void MenuBarManager::CheckAndAddMenuExte
+ }
+ }
+
++static void lcl_CheckForChildren(Menu* pMenu, USHORT nItemId)
++{
++ if (PopupMenu* pThisPopup = pMenu->GetPopupMenu( nItemId ))
++ pMenu->EnableItem( nItemId, pThisPopup->GetItemCount() ? true : false );
++}
++
+ //_________________________________________________________________________________________________________________
+ // vcl handler
+ //_________________________________________________________________________________________________________________
+@@ -1249,8 +1255,11 @@ IMPL_LINK( MenuBarManager, Activate, Men
+ // Force update of popup menu
+ pMenuItemHandler->xPopupMenuController->updatePopupMenu();
+ bPopupMenu = sal_True;
++
+ }
+
++ lcl_CheckForChildren(pMenu, pMenuItemHandler->nItemId);
++
+ if ( xMenuItemDispatch.is() )
+ {
+ pMenuItemHandler->xMenuItemDispatch = xMenuItemDispatch;
+@@ -1271,6 +1280,8 @@ IMPL_LINK( MenuBarManager, Activate, Men
+ {
+ // Force update of popup menu
+ pMenuItemHandler->xPopupMenuController->updatePopupMenu();
++ lcl_CheckForChildren(pMenu, pMenuItemHandler->nItemId);
++
+ }
+ else if ( pMenuItemHandler->xMenuItemDispatch.is() )
+ {
+@@ -1289,6 +1300,8 @@ IMPL_LINK( MenuBarManager, Activate, Men
+ {
+ }
+ }
++ else if ( pMenuItemHandler->xSubMenuManager.is() )
++ lcl_CheckForChildren(pMenu, pMenuItemHandler->nItemId);
+ }
+ }
+ }
+@@ -1659,6 +1672,8 @@ void MenuBarManager::FillMenuManager( Me
+ if ( CreatePopupMenuController( pItemHandler ))
+ pItemHandler->xPopupMenuController->updatePopupMenu();
+ }
++
++ lcl_CheckForChildren(pMenu, nItemId);
+ }
+ else if (( aItemCommand.getLength() > nAddonsURLPrefixLength ) &&
+ ( aItemCommand.indexOf( ADDONSPOPUPMENU_URL_PREFIX ) == 0 ))
+@@ -1805,7 +1820,9 @@ void MenuBarManager::FillMenuManager( Me
+ {
+ if ( CreatePopupMenuController( pItemHandler ))
+ pItemHandler->xPopupMenuController->updatePopupMenu();
+- }
++ }
++
++ lcl_CheckForChildren(pMenu, pItemHandler->nItemId);
+ }
+
+ m_aMenuItemHandlerVector.push_back( pItemHandler );
openoffice.org-2.0.4.ooo68919.sc.atk.patch:
AccessibleSpreadsheet.cxx | 7 +++----
AccessibleText.cxx | 1 -
2 files changed, 3 insertions(+), 5 deletions(-)
Index: openoffice.org-2.0.4.ooo68919.sc.atk.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.4.ooo68919.sc.atk.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.4.ooo68919.sc.atk.patch 24 Aug 2006 12:22:07 -0000 1.1
+++ openoffice.org-2.0.4.ooo68919.sc.atk.patch 4 Sep 2006 08:05:30 -0000 1.2
@@ -1,15 +1,40 @@
+Index: source/ui/Accessibility/AccessibleSpreadsheet.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx,v
+retrieving revision 1.45.42.1
+retrieving revision 1.45
+diff -u -r1.45.42.1 -r1.45
+--- openoffice.org.orig/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx 31 Aug 2006 12:54:33 -0000 1.45.42.1
++++ openoffice.org/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx 21 Jul 2006 13:07:31 -0000 1.45
+@@ -110,12 +110,11 @@
+ mpViewShell(pViewShell),
+ mpMarkedRanges(NULL),
+ mpSortedMarkedCells(NULL),
+- mpAccDoc(pAccDoc),
+- mpAccCell(NULL),
+ meSplitPos(eSplitPos),
+ mbHasSelection(sal_False),
+- mbDelIns(sal_False),
+- mbIsFocusSend(sal_False)
++ mpAccDoc(pAccDoc),
++ mbIsFocusSend(sal_False),
++ mpAccCell(NULL)
+ {
+ maVisCells = GetVisCells(GetVisArea(pViewShell, eSplitPos));
+ if (pViewShell)
Index: source/ui/Accessibility/AccessibleText.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/Accessibility/AccessibleText.cxx,v
+retrieving revision 1.35.42.1
retrieving revision 1.35
-diff -u -r1.35 AccessibleText.cxx
---- openoffice.org.orig/sc/source/ui/Accessibility/AccessibleText.cxx 21 Jul 2006 13:07:53 -0000 1.35
-+++ openoffice.org/sc/source/ui/Accessibility/AccessibleText.cxx 24 Aug 2006 12:17:06 -0000
-@@ -1190,6 +1200,7 @@
+diff -u -r1.35.42.1 -r1.35
+--- openoffice.org.orig/sc/source/ui/Accessibility/AccessibleText.cxx 31 Aug 2006 12:42:37 -0000 1.35.42.1
++++ openoffice.org/sc/source/ui/Accessibility/AccessibleText.cxx 21 Jul 2006 13:07:53 -0000 1.35
+@@ -1190,7 +1190,6 @@
DELETEZ(mpForwarder);
DELETEZ(mpEditViewForwarder);
-+ DELETEZ(mpViewForwarder);
+- DELETEZ(mpViewForwarder);
mbEditEngineCreated = sal_False;
}
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.866
retrieving revision 1.867
diff -u -r1.866 -r1.867
--- openoffice.org.spec 29 Aug 2006 15:56:15 -0000 1.866
+++ openoffice.org.spec 4 Sep 2006 08:05:30 -0000 1.867
@@ -127,6 +127,7 @@
Patch59: openoffice.org-2.0.4.ooo68919.sc.atk.patch
Patch60: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
Patch61: openoffice.org-2.0.4.ooo69068.parallelxslt.patch
+Patch62: pseudoworkspace.valgrind1.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -988,6 +989,7 @@
%patch59 -p1 -b .ooo68919.sc.atk.patch
%patch60 -p1 -b .ooo69051.vcl.singlekeypress.patch
%patch61 -p1 -b .ooo69068.parallelxslt.patch
+%patch62 -p1 -b .pseudoworkspace.valgrind1.patch
tar xzf %{SOURCE1}
@@ -2513,8 +2515,9 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
-* Tue Aug 29 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-2.3
+* Mon Sep 03 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-2.3
- rh#203872# -> openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+- add pseudoworkspace.valgrind1.patch with various valgrinded leaks
* Mon Aug 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-2.2
- rh#203063# Glyph replacement work when single run has multiple fonts
More information about the fedora-cvs-commits
mailing list