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

[Kohei Yoshida]

 patches/dev300/calc-external-ref-decode-unicode-uri.diff |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit d26eec8db5b7d3be2f29e57e7aec24b2a9f5cd9b
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Aug 11 10:43:22 2009 -0400

    Use the original external doc URIs for single cell references as well.
    
    * patches/dev300/calc-external-ref-decode-unicode-uri.diff: I forgot
      to use original external doc URIs for single cell references; I only
      took care of range references. (i#103918)

diff --git a/patches/dev300/calc-external-ref-decode-unicode-uri.diff b/patches/dev300/calc-external-ref-decode-unicode-uri.diff
index 5c14fd5..92dec7b 100644
--- a/patches/dev300/calc-external-ref-decode-unicode-uri.diff
+++ b/patches/dev300/calc-external-ref-decode-unicode-uri.diff
@@ -71,7 +71,7 @@ index f5b6e3f..22e114d 100644
      bool hasExternalFile(const String& rFile) const;
      const SrcFileData* getExternalFileData(sal_uInt16 nFileId) const;
 diff --git sc/source/core/tool/compiler.cxx sc/source/core/tool/compiler.cxx
-index bbb62c0..f89d00b 100644
+index bbb62c0..41d7658 100644
 --- sc/source/core/tool/compiler.cxx
 +++ sc/source/core/tool/compiler.cxx
 @@ -432,6 +432,15 @@ void ScCompiler::SetGrammar( const FormulaGrammar::Grammar eGrammar )
@@ -256,9 +256,18 @@ index bbb62c0..f89d00b 100644
          mbExtendedErrorDetection( false ),
          mbRewind( false )
 diff --git sc/source/core/tool/rangeutl.cxx sc/source/core/tool/rangeutl.cxx
-index b5bdfda..bdacf29 100644
+index b5bdfda..54901c7 100644
 --- sc/source/core/tool/rangeutl.cxx
 +++ sc/source/core/tool/rangeutl.cxx
+@@ -805,7 +805,7 @@ static void lcl_appendCellAddress(
+     if (rExtInfo.mbExternal)
+     {
+         ScExternalRefManager* pRefMgr = pDoc->GetExternalRefManager();
+-        const String* pFilePath = pRefMgr->getExternalFileName(rExtInfo.mnFileId);
++        const String* pFilePath = pRefMgr->getExternalFileName(rExtInfo.mnFileId, true);
+         if (!pFilePath)
+             return;
+ 
 @@ -840,7 +840,7 @@ static void lcl_appendCellRangeAddress(
          DBG_ASSERT(rExtInfo1.mnFileId == rExtInfo2.mnFileId, "File IDs do not match between 1st and 2nd addresses.");