diff options
author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-08-21 21:53:52 -0400 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2012-08-22 20:55:28 +0200 |
commit | d632fa4d8fc6a42a58cb981865d6267d90951b69 (patch) | |
tree | 73219935d13668cc7d666aaf1f6e8ca00783d5ce /filter | |
parent | f49be70f1859a2734e9516a5036adb2426939e68 (diff) |
fdo#52451: Ensure that the extension for text is .txt from writer.
Added a preferred extension property to the filter which overwrites
one(s) given by the default file format type associated with it.
Normally this property is not used for the majority of the filters,
but for plain text filters, we need to use .txt when saving from
writer whereas we do .csv from calc.
(cherry picked from commit ba03f2dc817c692fa8709391ec83d8e01a0f8b28)
(cherry picked from commit 84d1ff7be178ec3572710e092e85fe548ce3042b)
(cherry picked from commit 45b03c888042052a47cb79bc5a2837d04e115c5e)
Squashed these 3 commits into 1.
Also needed rtl::OUString("*.") instead of OUString("*.") in
sfx2/source/bastyp/fltfnc.cxx
Change-Id: Ic6d769bc1180f88fd75f40909e5e054d45719178
Signed-off-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'filter')
8 files changed, 8 insertions, 0 deletions
diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx index a6e28b55554a..0102b329989c 100644 --- a/filter/source/config/cache/constant.hxx +++ b/filter/source/config/cache/constant.hxx @@ -69,6 +69,7 @@ #define PROPNAME_USERDATA "UserData" #define PROPNAME_TEMPLATENAME "TemplateName" #define PROPNAME_FILEFORMATVERSION "FileFormatVersion" +#define PROPNAME_EXPORTEXTENSION "ExportExtension" /** @short used to identify a frame loader or detect service item property against the configuration API and can be used diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index e6e1e4fd6b9c..220eeaac2551 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -1825,6 +1825,7 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container:: aItem[PROPNAME_UICOMPONENT ] = xItem->getByName(PROPNAME_UICOMPONENT ); aItem[PROPNAME_FILTERSERVICE ] = xItem->getByName(PROPNAME_FILTERSERVICE ); aItem[PROPNAME_DOCUMENTSERVICE ] = xItem->getByName(PROPNAME_DOCUMENTSERVICE ); + aItem[PROPNAME_EXPORTEXTENSION ] = xItem->getByName(PROPNAME_EXPORTEXTENSION ); // special handling for flags! Convert it from a list of names to its // int representation ... diff --git a/filter/source/config/fragments/filters/Text.xcu b/filter/source/config/fragments/filters/Text.xcu index 4a703d3ac35c..4629f89af11c 100644 --- a/filter/source/config/fragments/filters/Text.xcu +++ b/filter/source/config/fragments/filters/Text.xcu @@ -4,6 +4,7 @@ <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>TEXT</value></prop> <prop oor:name="FileFormatVersion"><value>0</value></prop> + <prop oor:name="ExportExtension"><value>txt</value></prop> <prop oor:name="Type"><value>generic_Text</value></prop> <prop oor:name="TemplateName"/> <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop> diff --git a/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu b/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu index 29ad18a64281..0332e3e65d4c 100644 --- a/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu +++ b/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu @@ -4,6 +4,7 @@ <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>TEXT</value></prop> <prop oor:name="FileFormatVersion"><value>0</value></prop> + <prop oor:name="ExportExtension"><value>txt</value></prop> <prop oor:name="Type"><value>generic_Text</value></prop> <prop oor:name="TemplateName"/> <prop oor:name="DocumentService"><value>com.sun.star.text.WebDocument</value></prop> diff --git a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu b/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu index f15fe5a3b05e..498057ca3e6c 100644 --- a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu +++ b/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu @@ -4,6 +4,7 @@ <prop oor:name="FilterService"/> <prop oor:name="UserData"><value></value></prop> <prop oor:name="FileFormatVersion"><value>0</value></prop> + <prop oor:name="ExportExtension"><value>csv</value></prop> <prop oor:name="Type"><value>generic_Text</value></prop> <prop oor:name="TemplateName"/> <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop> diff --git a/filter/source/config/fragments/filters/Text__encoded_.xcu b/filter/source/config/fragments/filters/Text__encoded_.xcu index a27c3c7cf5a1..af05106394a6 100644 --- a/filter/source/config/fragments/filters/Text__encoded_.xcu +++ b/filter/source/config/fragments/filters/Text__encoded_.xcu @@ -4,6 +4,7 @@ <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>TEXT_DLG</value></prop> <prop oor:name="FileFormatVersion"><value>0</value></prop> + <prop oor:name="ExportExtension"><value>txt</value></prop> <prop oor:name="Type"><value>generic_Text</value></prop> <prop oor:name="TemplateName"/> <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop> diff --git a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu b/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu index d4fd201ae225..239ce3135d48 100644 --- a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu +++ b/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu @@ -4,6 +4,7 @@ <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>TEXT_DLG</value></prop> <prop oor:name="FileFormatVersion"><value>0</value></prop> + <prop oor:name="ExportExtension"><value>txt</value></prop> <prop oor:name="Type"><value>generic_Text</value></prop> <prop oor:name="TemplateName"/> <prop oor:name="DocumentService"><value>com.sun.star.text.GlobalDocument</value></prop> diff --git a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu b/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu index b347977765e5..3bde7e7c0230 100644 --- a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu +++ b/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu @@ -4,6 +4,7 @@ <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>TEXT_DLG</value></prop> <prop oor:name="FileFormatVersion"><value>0</value></prop> + <prop oor:name="ExportExtension"><value>txt</value></prop> <prop oor:name="Type"><value>generic_Text</value></prop> <prop oor:name="TemplateName"/> <prop oor:name="DocumentService"><value>com.sun.star.text.WebDocument</value></prop> |