[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                                         |    2 -
 patches/dev300/vcl-salnativewidgets-uninitializedvalues.diff |   17 -----------
 2 files changed, 19 deletions(-)

New commits:
commit e5b9d81ec3b651e35ad3c154407e47ef390afd1f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Sep 9 14:26:05 2009 +0300

    vcl-salnativewidgets-uninitializedvalues.diff is upstream
    
    * patches/dev300/vcl-salnativewidgets-uninitializedvalues.diff:
      Delete. Problem has been fixed upstream for some time.
    
    * patches/dev300/apply: Drop it.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 6bff5ab..bb4d480 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2793,8 +2793,6 @@ unoxml-boost-workaround.diff, thorsten
 
 sw-source-filter-xml-xmltbli-uninitializedvalue.diff, fridrich
 
-# FIXME 2008-11-26: fails for dev300-m35
-#vcl-salnativewidgets-uninitializedvalues.diff, fridrich
 
 [ LocalizeFixes ]
 # Fix Spanish translation of the autofilter menu; thanks to Eduardo Moreno
diff --git a/patches/dev300/vcl-salnativewidgets-uninitializedvalues.diff b/patches/dev300/vcl-salnativewidgets-uninitializedvalues.diff
deleted file mode 100644
index 3f21a87..0000000
--- a/patches/dev300/vcl-salnativewidgets-uninitializedvalues.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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; };
-