Manage to use orcus to import ods, xlsx, and csv.

But this occasionally crashes.

Change-Id: I0a18d0e210639b43b89b966a54de541b9a43e329

2 files changed, 16 insertions, 7 deletions

diff --git a/sfx2/inc/sfx2/docfilt.hxx b/sfx2/inc/sfx2/docfilt.hxx
index 8400e5a6b16e..cc6f6b8c1971 100644
--- a/sfx2/inc/sfx2/docfilt.hxx
+++ b/sfx2/inc/sfx2/docfilt.hxx
@@ -34,12 +34,12 @@
 
 #include <sfx2/sfxdefs.hxx>
 
-//========================================================================
 class SfxFilterContainer;
 class SotStorage;
+
 class SFX2_DLLPUBLIC SfxFilter
 {
-friend class SfxFilterContainer;
+    friend class SfxFilterContainer;
 
     WildCard        aWildCard;
 
@@ -47,17 +47,25 @@ friend class SfxFilterContainer;
     OUString aUserData;
     OUString aServiceName;
     OUString aMimeType;
-    OUString aFilterName;
+    OUString maFilterName;
     OUString aPattern;
     OUString aUIName;
     OUString aDefaultTemplate;
 
+    /**
+     * Custom provider name in case the filter is provided via external
+     * libraries.  Empty for conventional filter types.
+     */
+    OUString maProvider;
+
     SfxFilterFlags  nFormatType;
     sal_uIntPtr     nVersion;
     sal_uIntPtr     lFormat;
     sal_uInt16      nDocIcon;
 
 public:
+    SfxFilter( const OUString& rProvider, const OUString& rFilterName );
+
     SfxFilter( const OUString &rName,
                const OUString &rWildCard,
                SfxFilterFlags nFormatType,
@@ -77,9 +85,9 @@ public:
     bool CanExport() const { return nFormatType & SFX_FILTER_EXPORT; }
     bool IsInternal() const { return nFormatType & SFX_FILTER_INTERNAL; }
     SfxFilterFlags  GetFilterFlags() const  { return nFormatType; }
-    const OUString& GetFilterName() const { return aFilterName; }
+    const OUString& GetFilterName() const { return maFilterName; }
     const OUString& GetMimeType() const { return aMimeType; }
-    const OUString& GetName() const { return  aFilterName; }
+    const OUString& GetName() const { return  maFilterName; }
     const WildCard& GetWildcard() const { return aWildCard; }
     const OUString& GetRealTypeName() const { return aTypeName; }
     sal_uIntPtr         GetFormat() const { return lFormat; }
@@ -98,6 +106,7 @@ public:
     OUString GetSuffixes() const;
     OUString GetDefaultExtension() const;
     const OUString& GetServiceName() const { return aServiceName; }
+    const OUString& GetProviderName() const;
 
     static const SfxFilter* GetDefaultFilter( const String& rName );
     static const SfxFilter* GetFilterByName( const String& rName );
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index 5f1018e6ad6e..4c366a56710f 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -308,7 +308,7 @@ public:
     bool                        DoInitUnitTest();
     sal_Bool                    DoInitNew( SfxMedium* pMedium=0 );
     sal_Bool                    DoLoad( SfxMedium* pMedium );
-    bool                        DoLoadExternal(SfxMedium* pMed, const OUString& rProvider);
+    bool                        DoLoadExternal( SfxMedium* pMed );
     sal_Bool                    DoSave();
     sal_Bool                    DoSaveAs( SfxMedium &rNewStor );
     sal_Bool                    DoSaveObjectAs( SfxMedium &rNewStor, sal_Bool bCommit );
@@ -329,7 +329,7 @@ public:
     virtual sal_Bool            SwitchPersistance(
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
     virtual void                UpdateLinks();
-    virtual bool                LoadExternal(SfxMedium& rMedium, const OUString& rProvider);
+    virtual bool                LoadExternal( SfxMedium& rMedium );
     /**
      * Called when the Options dialog is dismissed with the OK button, to
      * handle potentially conflicting option settings.