[Libreoffice-commits] .: filter/source officecfg/registry sfx2/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Aug 22 06:50:43 PDT 2012
filter/source/config/cache/constant.hxx | 2 +-
filter/source/config/cache/filtercache.cxx | 2 +-
filter/source/config/fragments/filters/Text.xcu | 2 +-
filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu | 2 +-
filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu | 2 +-
filter/source/config/fragments/filters/Text__encoded_.xcu | 2 +-
filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu | 2 +-
filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu | 2 +-
officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs | 2 +-
sfx2/source/bastyp/fltfnc.cxx | 3 ++-
10 files changed, 11 insertions(+), 10 deletions(-)
New commits:
commit 45b03c888042052a47cb79bc5a2837d04e115c5e
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Wed Aug 22 09:46:57 2012 -0400
fdo#52451: Some name changes to be consistent with other prop names.
We use IMPORT EXPORT flags, so let's stick with the term 'Export' as
opposed to 'FileSave'. Also, the file type's extensions are given
without the star-dot (*.), so let's strip that as well.
Change-Id: Ibde05058f7acb6ae149382009e78f3f10a71d543
diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx
index 22d1074..7d27ffc 100644
--- a/filter/source/config/cache/constant.hxx
+++ b/filter/source/config/cache/constant.hxx
@@ -69,7 +69,7 @@
#define PROPNAME_USERDATA "UserData"
#define PROPNAME_TEMPLATENAME "TemplateName"
#define PROPNAME_FILEFORMATVERSION "FileFormatVersion"
-#define PROPNAME_FILESAVEEXTENSION "FileSaveExtension"
+#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 2a93c4f..e9dc2cf 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -1834,7 +1834,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_FILESAVEEXTENSION] = xItem->getByName(PROPNAME_FILESAVEEXTENSION);
+ 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 0da24d7..4629f89 100644
--- a/filter/source/config/fragments/filters/Text.xcu
+++ b/filter/source/config/fragments/filters/Text.xcu
@@ -4,7 +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="FileSaveExtension"><value>*.txt</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 bbc8392..0332e3e 100644
--- a/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu
+++ b/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu
@@ -4,7 +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="FileSaveExtension"><value>*.txt</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 a866ff1..498057c 100644
--- a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu
+++ b/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu
@@ -4,7 +4,7 @@
<prop oor:name="FilterService"/>
<prop oor:name="UserData"><value></value></prop>
<prop oor:name="FileFormatVersion"><value>0</value></prop>
- <prop oor:name="FileSaveExtension"><value>*.csv</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 af51016..af05106 100644
--- a/filter/source/config/fragments/filters/Text__encoded_.xcu
+++ b/filter/source/config/fragments/filters/Text__encoded_.xcu
@@ -4,7 +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="FileSaveExtension"><value>*.txt</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 d534352..239ce31 100644
--- a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu
+++ b/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu
@@ -4,7 +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="FileSaveExtension"><value>*.txt</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 895b9f2..3bde7e7 100644
--- a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu
+++ b/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu
@@ -4,7 +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="FileSaveExtension"><value>*.txt</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/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs b/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs
index 1de918a..ce76d8a 100644
--- a/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs
+++ b/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs
@@ -69,7 +69,7 @@
<prop oor:name="UIName" oor:localized="true" oor:type="xs:string">
<info><desc>Localized name of the filter, whch can be shown at the UI.</desc></info>
</prop>
- <prop oor:name="FileSaveExtension" oor:type="xs:string" oor:nillable="true">
+ <prop oor:name="ExportExtension" oor:type="xs:string" oor:nillable="true">
<info><desc>Extension to use when exporting content using this filter. When this value is not given, it is inferred from the Type associated with this filter.</desc></info>
</prop>
</group>
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index b1c4723..14df8c4 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -979,11 +979,12 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
{
lFilterProperties[nFilterProperty].Value >>= sServiceName;
}
- else if (lFilterProperties[nFilterProperty].Name == "FileSaveExtension")
+ else if (lFilterProperties[nFilterProperty].Name == "ExportExtension")
{
// Extension preferred by the filter. This takes precedence
// over those that are given in the file format type.
lFilterProperties[nFilterProperty].Value >>= sExtension;
+ sExtension = OUString("*.") + sExtension;
}
else if ( lFilterProperties[nFilterProperty].Name == "Type" )
{
More information about the Libreoffice-commits
mailing list