[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/size-sal-textenc.diff |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 31dea41cd3bd26ca4ce2e03bb601f6ea6dacdf0f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 27 16:57:59 2009 +0300

    Adapt size-sal-textenc.diff for dev300-m56
    
    * patches/dev300/size-sal-textenc.diff: Adapt for dev300-m56.

diff --git a/patches/dev300/size-sal-textenc.diff b/patches/dev300/size-sal-textenc.diff
index 67e0b6c..0a63257 100644
--- a/patches/dev300/size-sal-textenc.diff
+++ b/patches/dev300/size-sal-textenc.diff
@@ -454,8 +454,6 @@ index 0000000..4816f3a
 +        nEncoding < sizeof aData / sizeof aData[0] ? aData[nEncoding] : NULL;
 +	return NULL;
 +}
-diff --git sal/textenc/textenc.cxx sal/textenc/textenc.cxx
-index ef58446..8d9734a 100644
 --- sal/textenc/textenc.cxx
 +++ sal/textenc/textenc.cxx
 @@ -37,6 +37,8 @@
@@ -467,7 +465,7 @@ index ef58446..8d9734a 100644
  
  #ifndef INCLUDED_STDDEF_H
  #include <stddef.h>
-@@ -89,140 +91,69 @@ static sal_uChar const aImplA0FFSameToCharTab[SAMEA0FFCHAR_END
+@@ -89,141 +91,69 @@ static sal_uChar const aImplA0FFSameToCharTab[SAMEA0FFCHAR_END
  
  static sal_uInt16 const aImplDoubleByteIdentifierTab[1] = { 0 };
  
@@ -614,7 +612,8 @@ index ef58446..8d9734a 100644
 -            &aImplJavaUtf8TextEncodingData, /* JAVA_UTF8 */
 -            &adobeStandardEncodingData, /* ADOBE_STANDARD */
 -            &adobeSymbolEncodingData, /* ADOBE_SYMBOL */
--            &aImplPT154TextEncodingData }; /* PT154 */
+-            &aImplPT154TextEncodingData, /* PT154 */
+-            &adobeDingbatsEncodingData }; /* ADOBE_DINGBATS */
 -    return
 -        nEncoding < sizeof aData / sizeof aData[0] ? aData[nEncoding] : NULL;
 +	switch(nEncoding)