diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 12:20:39 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 12:20:39 +0000 |
| commit | ab17dd23ce266ddcb8cd035386fa6b6e6e51f28f (patch) | |
| tree | 24ebcb33756a1abe08d4eec897f76babb9c86fa7 /sc/source/core | |
| parent | 24537816fb76b336b12813b83a0db1341bf4cbc2 (diff) | |
INTEGRATION: CWS dr32 (1.26.148); FILE MERGED
2005/01/31 14:00:13 dr 1.26.148.1: #b6219324# #i23079# #i27871# #i35812# #i37725# new ScExtDocOptions, new Excel import/export of view settings
Diffstat (limited to 'sc/source/core')
| -rw-r--r-- | sc/source/core/data/documen3.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index 4f74a6e6459d..63817da3e4a4 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: documen3.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: hr $ $Date: 2004-09-08 13:43:25 $ + * last change: $Author: vg $ $Date: 2005-02-21 13:20:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,7 +58,6 @@ * * ************************************************************************/ - // System - Includes ----------------------------------------------------- #ifdef PCH @@ -487,8 +486,8 @@ BOOL ScDocument::LinkExternalTab( SCTAB& rTab, const String& aDocTab, rTab = 0; String aFilterName; // wird vom Loader gefuellt String aOptions; // Filter-Optionen - ScDocumentLoader aLoader( aFileName, aFilterName, aOptions, - pExtDocOptions ? pExtDocOptions->nLinkCnt + 1 : 1 ); + sal_uInt32 nLinkCnt = pExtDocOptions ? pExtDocOptions->GetDocSettings().mnLinkCnt : 0; + ScDocumentLoader aLoader( aFileName, aFilterName, aOptions, nLinkCnt + 1 ); if ( aLoader.IsError() ) return FALSE; ScDocument* pSrcDoc = aLoader.GetDocument(); |