mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add xlsx and ods bits. Those file types are still not loadable.

Browse Source 
Change-Id: Icb75313a082475b73d560685fec2c2f3be8538d7
This commit is contained in:
Kohei Yoshida
2013-04-09 00:55:02 -04:00
parent 6374df20c2
commit 868ce95a3c
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
framework/source/loadenv/loadenv.cxx
View File

@@ -710,13 +710,6 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString&
namespace { namespace {
#if 0
// TODO: We will reinstate this function later, so don't remove this!
bool queryOrcusTypeAndFilter(const uno::Sequence<beans::PropertyValue>&, OUString&, OUString&)
{
return false;
}
#else
bool queryOrcusTypeAndFilter(const uno::Sequence<beans::PropertyValue>& rDescriptor, OUString& rType, OUString& rFilter) bool queryOrcusTypeAndFilter(const uno::Sequence<beans::PropertyValue>& rDescriptor, OUString& rType, OUString& rFilter)
{ {
// depending on the experimental mode // depending on the experimental mode
@@ -741,25 +734,31 @@ bool queryOrcusTypeAndFilter(const uno::Sequence<beans::PropertyValue>& rDescrip
if (aURL.isEmpty() || aURL.copy(0,8).equalsIgnoreAsciiCase("private:")) if (aURL.isEmpty() || aURL.copy(0,8).equalsIgnoreAsciiCase("private:"))
return false; return false;
if(aURL.endsWith(".gnumeric")) // TODO : Type must be set to be generic_Text (or any other type that
// exists) in order to find a usable loader. Exploit it as a temporary
// hack.
if (aURL.endsWith(".gnumeric"))
{ {
rType = "generic_Text"; rType = "generic_Text";
rFilter = "orcus-gnumeric"; rFilter = "gnumeric";
return true; return true;
} }
#if 0 else if (aURL.endsWith(".xlsx"))
else if (aURL.endsWith(".csv"))
{ {
// Use .csv as the first test file type.
rType = "generic_Text"; rType = "generic_Text";
rFilter = "orcus-test-filter"; rFilter = "xlsx";
return true;
}
else if (aURL.endsWith(".ods"))
{
rType = "generic_Text";
rFilter = "ods";
return true; return true;
} }
#endif
return false; return false;
} }
#endif
} }