ooo-build r13705 - in trunk: . patches/dev300

[strba svn gnome org]

Author: strba
Date: Thu Aug 28 11:05:49 2008
New Revision: 13705
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13705&view=rev

Log:
proper fix for a TOC update crash + fix some uninitialized values

Added:
   trunk/patches/dev300/sw-source-filter-xml-xmltbli-uninitializedvalue.diff
   trunk/patches/dev300/vcl-salnativewidgets-uninitializedvalues.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/sw-updateindex-crash.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Aug 28 11:05:49 2008
@@ -2471,6 +2471,10 @@
 
 sw-updateindex-crash.diff, n#388069, fridrich
 
+sw-source-filter-xml-xmltbli-uninitializedvalue.diff, fridrich
+
+vcl-salnativewidgets-uninitializedvalues.diff, fridrich
+
 [ LocalizeFixes ]
 # it is Y axis, not X one [in Spanish]
 chart2-es-eje-Y.diff, i#83821, rengelha

Added: trunk/patches/dev300/sw-source-filter-xml-xmltbli-uninitializedvalue.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/sw-source-filter-xml-xmltbli-uninitializedvalue.diff	Thu Aug 28 11:05:49 2008
@@ -0,0 +1,10 @@
+--- sw/source/filter/xml/xmltbli.cxx	2008-08-25 08:36:07.000000000 +0200
++++ sw/source/filter/xml/xmltbli.cxx	2008-08-28 09:51:39.000000000 +0200
+@@ -1390,6 +1390,7 @@
+ 	pDDESource(NULL),
+ 	bFirstSection( sal_False ),
+ 	bRelWidth( sal_True ),
++    bHasSubTables( sal_False ),
+ 	nHeaderRows( 0 ),
+ 	nCurRow( 0UL ),
+ 	nCurCol( 0UL ),

Modified: trunk/patches/dev300/sw-updateindex-crash.diff
==============================================================================
--- trunk/patches/dev300/sw-updateindex-crash.diff	(original)
+++ trunk/patches/dev300/sw-updateindex-crash.diff	Thu Aug 28 11:05:49 2008
@@ -1,11 +1,29 @@
---- sw/source/core/attr/calbck.cxx	2008-08-26 14:24:54.000000000 +0200
-+++ sw/source/core/attr/calbck.cxx	2008-08-26 14:25:07.000000000 +0200
-@@ -98,7 +98,7 @@
- 		return;
+--- sw/source/core/doc/doctxm.cxx	2008-07-02 12:33:42.000000000 +0200
++++ sw/source/core/doc/doctxm.cxx	2008-08-28 09:53:27.000000000 +0200
+@@ -2113,7 +2113,7 @@
  
- 	SwPtrMsgPoolItem *pDead = (SwPtrMsgPoolItem *)pOld;
--	if(pDead->pObject == pRegisteredIn)
-+	if(pRegisteredIn && pDead->pObject == pRegisteredIn)
+ 	// Platzhalter loeschen
+ 	SwIndex aPos(pNd, nStartPos);
+-	const SwFmtCharFmt* pPageNoCharFmt = 0;
++	SwCharFmt* pPageNoCharFmt = 0;
+ 	SwpHints* pHints = pNd->GetpSwpHints();
+ 	if(pHints)
+ 		for(USHORT nHintIdx = 0; nHintIdx < pHints->GetStartCount(); nHintIdx++)
+@@ -2124,7 +2124,7 @@
+ 				(nStartPos + 2) <= nTmpEnd &&
+ 				pAttr->Which() == RES_TXTATR_CHARFMT)
+ 			{
+-				pPageNoCharFmt = &pAttr->GetCharFmt();
++				pPageNoCharFmt = pAttr->GetCharFmt().GetCharFmt();
+ 				break;
+ 			}
+ 		}
+@@ -2205,7 +2205,7 @@
+ 	pNd->Insert( aNumStr, aPos, INS_EMPTYEXPAND );
+ 	if(pPageNoCharFmt)
  	{
- 		SwModify *pAbove = (SwModify*)pRegisteredIn->GetRegisteredIn();
- 		if(pAbove)
+-        SwFmtCharFmt aCharFmt(pPageNoCharFmt->GetCharFmt());
++        SwFmtCharFmt aCharFmt(pPageNoCharFmt);
+         pNd->InsertItem(aCharFmt, nStartPos, nStartPos + aNumStr.Len(), nsSetAttrMode::SETATTR_DONTEXPAND);
+     }
+ 

Added: trunk/patches/dev300/vcl-salnativewidgets-uninitializedvalues.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/vcl-salnativewidgets-uninitializedvalues.diff	Thu Aug 28 11:05:49 2008
@@ -0,0 +1,17 @@
+--- vcl/inc/vcl/salnativewidgets.hxx	2008-08-28 10:28:54.000000000 +0200
++++ vcl/inc/vcl/salnativewidgets.hxx	2008-08-28 10:40:17.000000000 +0200
+@@ -402,10 +402,10 @@
+ 								{ mTristate = nTristate; mString = sString; mNumber = nNumeric; mOptionalVal = aOptVal; };
+ 		inline ImplControlValue( ButtonValue nTristate, rtl::OUString sString, long nNumeric ) \
+ 								{ mTristate = nTristate; mString = sString; mNumber = nNumeric; mOptionalVal = NULL; };
+-		inline ImplControlValue( ButtonValue nTristate )	{ mTristate = nTristate; mOptionalVal = NULL; };
+-		inline ImplControlValue( rtl::OUString sString )	{ mString = sString; mOptionalVal = NULL; };
+-		inline ImplControlValue( long nNumeric )		{ mNumber = nNumeric; mOptionalVal = NULL; };
+-		inline ImplControlValue( void * aOptVal ) 		{ mOptionalVal = aOptVal; };
++		inline ImplControlValue( ButtonValue nTristate )	{ mTristate = nTristate; mNumber = 0; mOptionalVal = NULL; };
++		inline ImplControlValue( rtl::OUString sString )	{ mTristate = BUTTONVALUE_DONTKNOW; mNumber = 0; mString = sString; mOptionalVal = NULL; };
++		inline ImplControlValue( long nNumeric )		{ mTristate = BUTTONVALUE_DONTKNOW; mNumber = nNumeric; mOptionalVal = NULL; };
++		inline ImplControlValue( void * aOptVal ) 		{ mTristate = BUTTONVALUE_DONTKNOW; mNumber = 0; mOptionalVal = aOptVal; };
+ 		inline ImplControlValue() { mTristate = BUTTONVALUE_DONTKNOW; mNumber = 0; mOptionalVal = NULL; };
+ 		inline ~ImplControlValue() { mOptionalVal = NULL; };
+