diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 11:45:54 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 11:45:54 +0000 |
| commit | f38154c8ab278ab03bee3e926f9f3e449e2eba7d (patch) | |
| tree | 00e88518dbe82935416974cf31a44469aefd7ac4 | |
| parent | c725b3ad830b96b7c470b74a29f9c8bf01a66974 (diff) | |
INTEGRATION: CWS tl37 (1.25.32); FILE MERGED
2007/04/11 13:01:35 tl 1.25.32.2: RESYNC: (1.25-1.27); FILE MERGED
2007/02/06 19:22:51 nn 1.25.32.1: #i74099# UseInteractionHandler moved out of GuessFilter
| -rw-r--r-- | sc/source/ui/docshell/tablink.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index e8e4e3722..8984a9ba5 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -4,9 +4,9 @@ * * $RCSfile: tablink.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: vg $ $Date: 2007-02-27 13:09:55 $ + * last change: $Author: hr $ $Date: 2007-06-27 12:45:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -476,7 +476,8 @@ String ScDocumentLoader::GetOptions( SfxMedium& rMedium ) // static } BOOL ScDocumentLoader::GetFilterName( const String& rFileName, - String& rFilter, String& rOptions, BOOL bWithContent ) // static + String& rFilter, String& rOptions, + BOOL bWithContent, BOOL bWithInteraction ) // static { TypeId aScType = TYPE(ScDocShell); SfxObjectShell* pDocSh = SfxObjectShell::GetFirst( &aScType ); @@ -501,6 +502,9 @@ BOOL ScDocumentLoader::GetFilterName( const String& rFileName, SfxMedium* pMedium = new SfxMedium( rFileName, STREAM_STD_READ, FALSE ); if ( pMedium->GetError() == ERRCODE_NONE ) { + if ( bWithInteraction ) + pMedium->UseInteractionHandler(TRUE); // #i73992# no longer called from GuessFilter + SfxFilterMatcher aMatcher( String::CreateFromAscii("scalc") ); if( bWithContent ) aMatcher.GuessFilter( *pMedium, &pSfxFilter ); @@ -538,7 +542,7 @@ ScDocumentLoader::ScDocumentLoader( const String& rFileName, pMedium(0) { if ( !rFilterName.Len() ) - GetFilterName( rFileName, rFilterName, rOptions, TRUE ); + GetFilterName( rFileName, rFilterName, rOptions, TRUE, bWithInteraction ); const SfxFilter* pFilter = ScDocShell::Factory().GetFilterContainer()->GetFilter4FilterName( rFilterName ); |