[ooo-build-commit] Branch 'ooo-build-3-1-1' - patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                                     |    3 -
 patches/dev300/calc-external-ref-decode-unicode-uri.diff |   25 ---------------
 2 files changed, 28 deletions(-)

New commits:
commit b60f5c125dc711ee57c9d8445885d98d64875aa8
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu Aug 6 11:50:58 2009 -0400

    Revert "Decode unicode strings in external ref URIs when displaying formulas."
    
    This reverts commit 35150d2b7731574e1cb4c0fa7133b535f388f8c7.
    
    Probably not a safe enough fix for 3.1.1.  Must wait until 3.2.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index f313bff..ecfda6f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3241,9 +3241,6 @@ calc-xls-import-array-size.diff, kohei
 calc-copy-range-animated-border-sc.diff, kohei
 calc-copy-range-animated-border-svx.diff, kohei
 
-# decode unicode in external file URIs when displaying formulas.
-calc-external-ref-decode-unicode-uri.diff, i#103918, kohei
-
 [ CalcRowLimit ]
 # The work to increase Calc's row size limit, and any work associated with it.
 SectionOwner => kohei
diff --git a/patches/dev300/calc-external-ref-decode-unicode-uri.diff b/patches/dev300/calc-external-ref-decode-unicode-uri.diff
deleted file mode 100644
index 4c65ca2..0000000
--- a/patches/dev300/calc-external-ref-decode-unicode-uri.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git sc/source/core/tool/compiler.cxx sc/source/core/tool/compiler.cxx
-index bbb62c0..6bac207 100644
---- sc/source/core/tool/compiler.cxx
-+++ sc/source/core/tool/compiler.cxx
-@@ -1062,7 +1062,7 @@ struct ConventionOOO_A1 : public Convention_A1
-             String aFile;
-             const String* p = pRefMgr->getExternalFileName(nFileId);
-             if (p)
--                aFile = *p;
-+                aFile = INetURLObject::decode(*p, INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS);
-             aFile.SearchAndReplaceAllAscii("'", String::CreateFromAscii("''"));
- 
-             rBuffer.append(sal_Unicode('\''));
-@@ -1319,8 +1319,9 @@ struct ConventionXL
- 
-         rBuffer.append(sal_Unicode('['));
-         rBuffer.append(sal_Unicode('\''));
--        const sal_Unicode* pBuf = rFullName.GetBuffer();
--        xub_StrLen nLen = rFullName.Len();
-+        String aFullName = INetURLObject::decode(rFullName, INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS);
-+        const sal_Unicode* pBuf = aFullName.GetBuffer();
-+        xub_StrLen nLen = aFullName.Len();
-         for (xub_StrLen i = 0; i < nLen; ++i)
-         {
-             const sal_Unicode c = pBuf[i];