diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-08-31 11:11:00 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-09-07 09:10:36 -0400 |
| commit | c28f2fbddaa5c1042d1661125dc64a397e6a65fa (patch) | |
| tree | 212529e72250890dadf9101452bba6b354fa6664 /sc/source/ui | |
| parent | c8b7e9822257938e9b1d1c6f7d93d085b06d5e96 (diff) | |
Move the orcus handling code from sc to scfilt.
Then this will be subject to on-demand loading.
Change-Id: Ibefcb77b4c8a97707f3ea177a81bd61bdc58fc31
Diffstat (limited to 'sc/source/ui')
| -rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 8 | ||||
| -rw-r--r-- | sc/source/ui/docshell/impex.cxx | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 94e51030b299..26a470c91f98 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -112,7 +112,7 @@ #include "cellsuno.hxx" #include "dpobject.hxx" #include "markdata.hxx" -#include "orcushandler.hxx" +#include "orcusfilters.hxx" #ifdef ENABLE_TELEPATHY #include "sccollaboration.hxx" @@ -1503,7 +1503,11 @@ bool ScDocShell::LoadExternal(SfxMedium& rMed, const OUString& rProvider) { if (rProvider == "orcus") { - if (!ScOrcusFilters::importCSV(aDocument, rMed.GetName())) + ScOrcusFilters* pOrcus = ScFormatFilter::Get().GetOrcusFilters(); + if (!pOrcus) + return false; + + if (!pOrcus->importCSV(aDocument, rMed.GetName())) return false; FinishedLoading(SFX_LOADED_MAINDOCUMENT | SFX_LOADED_IMAGES); diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index d1104813dfc2..f2b36a474f9a 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -2229,6 +2229,8 @@ class ScFormatFilterMissing : public ScFormatFilterPlugin { virtual FltError ScExportHTML( SvStream&, const String&, ScDocument*, const ScRange&, const CharSet, bool, const String&, String& ) RETURN_ERROR virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange&, const CharSet ) RETURN_ERROR + + virtual ScOrcusFilters* GetOrcusFilters() { return NULL; } }; extern "C" { static void SAL_CALL thisModule() {} } |