merge the formfield patch from ooo-build
[ooovba.git] / applied_patches / 0152-calc-external-defined-names-enable.diff
blob3281cc30bcee888e1a2619616ec7fa13ead70595
1 diff --git sc/source/filter/excel/excform8.cxx sc/source/filter/excel/excform8.cxx
2 index 2580ef8..1ece12d 100644
3 --- sc/source/filter/excel/excform8.cxx
4 +++ sc/source/filter/excel/excform8.cxx
5 @@ -642,7 +642,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
6 * external name reference can be stored in ODF,
7 * which remains to be done for #i3740#. Until then
8 * create a #NAME? token. */
9 -#if 0
10 +#if 1
11 sal_uInt16 nFileId;
12 if (!GetExternalFileIdFromXti(nXtiIndex, nFileId) || !pExtName->HasFormulaTokens())
14 diff --git sc/source/core/tool/compiler.cxx sc/source/core/tool/compiler.cxx
15 index 4cb6bdd..ad87394 100644
16 --- sc/source/core/tool/compiler.cxx
17 +++ sc/source/core/tool/compiler.cxx
18 @@ -2909,7 +2909,7 @@ bool ScCompiler::IsExternalNamedRange( const String& rSymbol )
19 * spec first. Until then don't pretend to support external names that
20 * wouldn't survive a save and reload cycle, return false instead. */
22 -#if 0
23 +#if 1
24 if (!pConv)
25 return false;