ooo-build r13639 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Aug 20 14:37:19 2008
New Revision: 13639
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13639&view=rev

Log:
2008-08-20  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/calc-external-defined-names.diff: don't create new
	cache tables on ods export.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/calc-external-defined-names.diff

Modified: trunk/patches/dev300/calc-external-defined-names.diff
==============================================================================
--- trunk/patches/dev300/calc-external-defined-names.diff	(original)
+++ trunk/patches/dev300/calc-external-defined-names.diff	Wed Aug 20 14:37:19 2008
@@ -207,7 +207,7 @@
  
 diff --git sc/inc/externalrefmgr.hxx sc/inc/externalrefmgr.hxx
 new file mode 100644
-index 0000000..7398ed1
+index 0000000..82f694d
 --- /dev/null
 +++ sc/inc/externalrefmgr.hxx
 @@ -0,0 +1,373 @@
@@ -390,7 +390,7 @@
 +     * 
 +     * @return pointer to the cache table instance
 +     */
-+    Table* getCacheTable(sal_uInt16 nFileId, const String& rTabName, bool bCreateNew = true);
++    Table* getCacheTable(sal_uInt16 nFileId, const String& rTabName, bool bCreateNew);
 +
 +    void clearCache(sal_uInt16 nFileId);
 +
@@ -462,7 +462,7 @@
 +    explicit ScExternalRefManager(ScDocument* pDoc);
 +    ~ScExternalRefManager();
 +
-+    ScExternalRefCache::Table* getCacheTable(sal_uInt16 nFileId, const String& rTabName);
++    ScExternalRefCache::Table* getCacheTable(sal_uInt16 nFileId, const String& rTabName, bool bCreateNew = true);
 +    void storeRangeNameTokens(sal_uInt16 nFileId, const String& rName, const ScTokenArray& rArray);
 +
 +    ScToken* getSingleRefToken(sal_uInt16 nFileId, const String& rTabName, const ScAddress& rCell, const ScAddress* pCurPos, SCTAB* pTab);
@@ -4672,7 +4672,7 @@
  {
      mxImpl->Save( rStrm );
 diff --git sc/source/filter/excel/xilink.cxx sc/source/filter/excel/xilink.cxx
-index 01932a5..b7bb04b 100644
+index 01932a5..2c50c2b 100644
 --- sc/source/filter/excel/xilink.cxx
 +++ sc/source/filter/excel/xilink.cxx
 @@ -38,6 +38,13 @@
@@ -5014,7 +5014,7 @@
 +            return;
 +        
 +        const String& rTabName = pTab->GetTabName();
-+        ScExternalRefCache::Table* pCacheTable = pRefMgr->getCacheTable(nFileId, rTabName);
++        ScExternalRefCache::Table* pCacheTable = pRefMgr->getCacheTable(nFileId, rTabName, true);
 +        pTab->LoadCachedValues(pCacheTable);
      }
  }
@@ -5938,7 +5938,7 @@
  //------------------------------------------------------------------
  
 diff --git sc/source/filter/xml/xmlexprt.cxx sc/source/filter/xml/xmlexprt.cxx
-index 52f5145..38a37d6 100644
+index 52f5145..2d173a5 100644
 --- sc/source/filter/xml/xmlexprt.cxx
 +++ sc/source/filter/xml/xmlexprt.cxx
 @@ -68,6 +68,7 @@
@@ -6367,7 +6367,7 @@
 +        for (vector<String>::const_iterator itr = pTabNames->begin(), itrEnd = pTabNames->end();
 +              itr != itrEnd; ++itr)
 +        {
-+            ScExternalRefCache::Table* pTable = pRefMgr->getCacheTable(nFileId, *itr);
++            ScExternalRefCache::Table* pTable = pRefMgr->getCacheTable(nFileId, *itr, false);
 +            if (!pTable)
 +                continue;
 +
@@ -7228,7 +7228,7 @@
  extern const XMLPropertyMapEntry aXMLScColumnStylesProperties[];
  extern const XMLPropertyMapEntry aXMLScRowStylesProperties[];
 diff --git sc/source/filter/xml/xmltabi.cxx sc/source/filter/xml/xmltabi.cxx
-index 4a0f83e..af80b31 100644
+index 4a0f83e..fcfb281 100644
 --- sc/source/filter/xml/xmltabi.cxx
 +++ sc/source/filter/xml/xmltabi.cxx
 @@ -40,6 +40,7 @@
@@ -7351,7 +7351,7 @@
 +            {
 +                ScExternalRefManager* pRefMgr = pDoc->GetExternalRefManager();
 +                pExternalRefInfo->mnFileId = pRefMgr->getExternalFileId(aExtUrl);
-+                pExternalRefInfo->mpCacheTable = pRefMgr->getCacheTable(pExternalRefInfo->mnFileId, aExtTabName);
++                pExternalRefInfo->mpCacheTable = pRefMgr->getCacheTable(pExternalRefInfo->mnFileId, aExtTabName, true);
 +            }
 +        }
 +        else
@@ -7471,7 +7471,7 @@
  
 diff --git sc/source/ui/docshell/externalrefmgr.cxx sc/source/ui/docshell/externalrefmgr.cxx
 new file mode 100644
-index 0000000..8f34a8f
+index 0000000..5648cf1
 --- /dev/null
 +++ sc/source/ui/docshell/externalrefmgr.cxx
 @@ -0,0 +1,1267 @@
@@ -8175,9 +8175,9 @@
 +    clear();
 +}
 +
-+ScExternalRefCache::Table* ScExternalRefManager::getCacheTable(sal_uInt16 nFileId, const String& rTabName)
++ScExternalRefCache::Table* ScExternalRefManager::getCacheTable(sal_uInt16 nFileId, const String& rTabName, bool bCreateNew)
 +{
-+    return maRefCache.getCacheTable(nFileId, rTabName);
++    return maRefCache.getCacheTable(nFileId, rTabName, bCreateNew);
 +}
 +
 +void ScExternalRefManager::storeRangeNameTokens(sal_uInt16 nFileId, const String& rName, const ScTokenArray& rArray)