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

[kyoshida svn gnome org]

Author: kyoshida
Date: Fri Dec 19 03:07:10 2008
New Revision: 14893
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14893&view=rev

Log:
2008-12-18  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/csv-import-preserve-options-sc.diff: forgot to save 
	the check box state to the configuration directory.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/csv-import-preserve-options-sc.diff

Modified: trunk/patches/dev300/csv-import-preserve-options-sc.diff
==============================================================================
--- trunk/patches/dev300/csv-import-preserve-options-sc.diff	(original)
+++ trunk/patches/dev300/csv-import-preserve-options-sc.diff	Fri Dec 19 03:07:10 2008
@@ -273,7 +273,7 @@
  // ============================================================================
  
  void lcl_FillCombo( ComboBox& rCombo, const String& rList, sal_Unicode cSelect )
-@@ -98,11 +118,78 @@ sal_Unicode lcl_CharFromCombo( ComboBox& rCombo, const String& rList )
+@@ -98,11 +118,82 @@ sal_Unicode lcl_CharFromCombo( ComboBox& rCombo, const String& rList )
  	return c;
  }
  
@@ -313,6 +313,9 @@
 +
 +    if( pProperties[5].hasValue() )
 +        pProperties[5] >>= nCharSet;
++ 
++    if ( pProperties[6].hasValue() )
++        pProperties[6] >>= bQuotedAsText;
 +}
 +
 +static void save_Separators( String maSeparators, String maTxtSep, bool bMergeDelimiters, bool bQuotedAsText,
@@ -341,6 +344,7 @@
 +    ScUnoHelpFunctions::SetBoolInAny( pProperties[3], bFixedWidth );
 +    pProperties[4] <<= nFromRow;
 +    pProperties[5] <<= nCharSet;
++    pProperties[6] <<= static_cast<sal_Bool>(bQuotedAsText);
 +
 +    aItem.PutProperties(aNames, aValues);
 +}