From 513eadd422ff6a41cfe9a16f82cf32872d729652 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Wed, 27 Nov 2013 00:04:44 +0100 Subject: resolved fdo#53103 actually use the external data filter options ScDocShell::ConvertFrom() queries the filter options from the SfxItemSet at SfxMedium, which is fine when loading the data into the table selector first, but the final load via ScAreaLink created a bare SfxMedium without options set. Do so. Additionally it may now even work that ScDocShell sets options at SfxMedium, which the ScAreaLink code prepared for but previously the SfxMedium did not have an SfxItemSet. Change-Id: I45d6a24906dc3ba41654b8c0951dd84939d8af5e --- sc/inc/tablink.hxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'sc/inc/tablink.hxx') diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx index aabb2e25dcbe..d8d173e9b744 100644 --- a/sc/inc/tablink.hxx +++ b/sc/inc/tablink.hxx @@ -72,6 +72,7 @@ public: class ScDocument; class SfxMedium; +class SfxFilter; class SC_DLLPUBLIC ScDocumentLoader { @@ -92,7 +93,12 @@ public: void ReleaseDocRef(); // without calling DoClose - static OUString GetOptions( SfxMedium& rMedium ); + /** Create SfxMedium for stream read with SfxFilter and filter options set + at the medium's SfxItemSet. + */ + static SfxMedium* CreateMedium( const OUString& rFileName, const SfxFilter* pFilter, const OUString& rOptions ); + + static OUString GetOptions( SfxMedium& rMedium ); /** Returns the filter name and options from a file name. @param bWithContent -- cgit v1.2.3