[ooo-build-commit] .: patches/dev300

[Cédric Bosdonnat]

 patches/dev300/cjk-insert-forbidden-characters-into-i18npool.diff |   13 ------
 patches/dev300/xmloff-import-crash-fix-for-i90562.diff            |   19 ----------
 2 files changed, 32 deletions(-)

New commits:
commit aea81dc8c340518595445871bca3dd2843d32915
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Fri Apr 23 21:32:01 2010 +0200

    Removed useless patches: both upstreamed
    
    * patches/dev300/cjk-insert-forbidden-characters-into-i18npool.diff:
    * patches/dev300/xmloff-import-crash-fix-for-i90562.diff:

diff --git a/patches/dev300/cjk-insert-forbidden-characters-into-i18npool.diff b/patches/dev300/cjk-insert-forbidden-characters-into-i18npool.diff
deleted file mode 100644
index 783cbb1..0000000
--- a/patches/dev300/cjk-insert-forbidden-characters-into-i18npool.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- i18npool/source/localedata/data/zh_CN.xml-orig	2008-05-26 17:43:55.000000000 +0800
-+++ i18npool/source/localedata/data/zh_CN.xml	2008-05-27 11:05:35.000000000 +0800
-@@ -428,9 +428,9 @@
- </LC_TRANSLITERATION>
- <LC_MISC>
- <ForbiddenCharacters>
--<ForbiddenLineBeginCharacters>:!),.:;?]}¢'"ã€ã€‚ã€‰ã€‹ã€ã€ã€‘ã€•ã€—ã€žï¸°ï¸±ï¸³ï¹ï½¤ï¹’ï¹”ï¹•ï¹–ï¹—ï¹šï¹œï¹žï¼ï¼‰ï¼Œï¼Žï¼šï¼›ï¼Ÿï½œï½ï¸´ï¸¶ï¸¸ï¸ºï¸¼ï¸¾ï¹€ï¹‚ï¹„ï¹ï½¤ï½žï¿ ã€…â€–â€¢Â·Ë‡Ë‰â€•--′</ForbiddenLineBeginCharacters>
--<ForbiddenLineEndCharacters>([{£¥'"‵〈《「『【〔〖（［｛￡￥〝︵︷︹︻︽︿﹁﹃﹙﹛﹝（｛</ForbiddenLineEndCharacters>
-+<ForbiddenLineBeginCharacters>:!),.:;?]}¢'"ã€ã€‚ã€‰ã€‹ã€ã€ã€‘ã€•ã€—ã€žï¸°ï¸±ï¸³ï¹ï½¤ï¹’ï¹”ï¹•ï¹–ï¹—ï¹šï¹œï¹žï¼ï¼‰ï¼Œï¼Žï¼šï¼›ï¼Ÿï½œï½ï¸´ï¸¶ï¸¸ï¸ºï¸¼ï¸¾ï¹€ï¹‚ï¹„ï¹ï½¤ï½žï¿ ã€…â€–â€¢Â·Ë‡Ë‰â€•--′’”</ForbiddenLineBeginCharacters>
-+<ForbiddenLineEndCharacters>([{£¥'"‵〈《「『【〔〖（［｛￡￥〝︵︷︹︻︽︿﹁﹃﹙﹛﹝（｛“‘</ForbiddenLineEndCharacters>
- <LineBreakHangingCharacters>!,.:;?、。！，．：；？</LineBreakHangingCharacters>
- </ForbiddenCharacters>
- <ReservedWords>
diff --git a/patches/dev300/xmloff-import-crash-fix-for-i90562.diff b/patches/dev300/xmloff-import-crash-fix-for-i90562.diff
deleted file mode 100644
index eb52173..0000000
--- a/patches/dev300/xmloff-import-crash-fix-for-i90562.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: xmloff/source/forms/elementimport.cxx
-===================================================================
-RCS file: /cvs/xml/xmloff/source/forms/elementimport.cxx,v
-retrieving revision 1.58
-diff -u -r1.58 elementimport.cxx
---- xmloff/source/forms/elementimport.cxx	31 Jul 2007 13:40:33 -0000	1.58
-+++ xmloff/source/forms/elementimport.cxx	10 Jun 2008 15:04:45 -0000
-@@ -598,7 +598,10 @@
- 	//---------------------------------------------------------------------
- 	void OElementImport::simulateDefaultedAttribute(const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, const sal_Char* _pAttributeDefault)
- 	{
--		Reference< XPropertySetInfo > xPropsInfo = m_xElement->getPropertySetInfo();
-+		Reference< XPropertySetInfo > xPropsInfo;
-+		if ( m_xElement.is()) { 
-+		    xPropsInfo=m_xElement->getPropertySetInfo();
-+		}
- 		OSL_ENSURE( xPropsInfo.is(), "OPropertyImport::simulateDefaultedAttribute: the component should be more gossipy about it's properties!" );
- 
- 		if ( !xPropsInfo.is() || xPropsInfo->hasPropertyByName( _rPropertyName ) )