rpms/openoffice.org/devel planned.workspace.defaultdoclang.patch, 1.5, 1.6

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9454

Modified Files:
	planned.workspace.defaultdoclang.patch 
Log Message:
adjust patch

planned.workspace.defaultdoclang.patch:

Index: planned.workspace.defaultdoclang.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/planned.workspace.defaultdoclang.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- planned.workspace.defaultdoclang.patch	11 Mar 2009 09:28:03 -0000	1.5
+++ planned.workspace.defaultdoclang.patch	12 Mar 2009 12:39:47 -0000	1.6
@@ -957,22 +957,23 @@
      LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType);
      // For obsolete and to be replaced languages check whether an entry of the 
      // replacement already exists and if so don't add an entry with identical 
-@@ -330,6 +338,14 @@
+@@ -329,6 +337,15 @@
+ 	String aStrEntry = m_pLangTable->GetString( nLang );
  	if (LANGUAGE_NONE == nLang && m_bHasLangNone && m_bLangNoneIsLangAll)
  		aStrEntry = m_aAllString;
- 
++
 +    LanguageType nRealLang = nLang;
 +    if (nRealLang == LANGUAGE_SYSTEM)
 +    {
 +        nRealLang = MsLangId::resolveSystemLanguageByScriptType(nRealLang, nType);
 +        aStrEntry.AppendAscii(" - ");
-+	aStrEntry.Append(m_pLangTable->GetString( nRealLang ));
++        aStrEntry.Append(m_pLangTable->GetString( nRealLang ));
 +    }
 +
+     aStrEntry = ApplyLreOrRleEmbedding( aStrEntry );
+ 
  	USHORT nAt = 0;
- 	if ( m_bWithCheckmark )
- 	{
-@@ -342,7 +358,7 @@
+@@ -343,7 +360,7 @@
                  m_pSpellUsedLang = new Sequence< INT16 >( xSpell->getLanguages() );
          }
          bFound = m_pSpellUsedLang ?
@@ -981,7 +982,7 @@
  
          nAt = ImplInsertImgEntry( aStrEntry, nPos, bFound );
  	}
-@@ -355,6 +371,13 @@
+@@ -356,6 +373,13 @@
  
  //------------------------------------------------------------------------