diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:58:56 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:58:56 +0100 |
commit | 761118f831295454a896a6d2921db0d8212fcd5b (patch) | |
tree | 40872f5c098ce390ef666bf86fcb124af6697989 /sdext/source/pdfimport/config | |
parent | 459cbc6cada544c9e50cf4f86dc821853f26deda (diff) | |
parent | 39250f089adfce87856a0a7a250511decd7418e2 (diff) |
Merge commit 'ooo/DEV300_m103'
Conflicts:
jfreereport/java/flute/makefile.mk
jfreereport/java/libbase/makefile.mk
jfreereport/java/libfonts/makefile.mk
jfreereport/java/libformula/makefile.mk
jfreereport/java/libloader/makefile.mk
jfreereport/java/librepository/makefile.mk
jfreereport/java/libserializer/makefile.mk
jfreereport/java/libxml/makefile.mk
jfreereport/java/sac/makefile.mk
mysqlc/source/mysqlc_connection.cxx
mysqlc/source/mysqlc_connection.hxx
mysqlc/source/mysqlc_databasemetadata.cxx
mysqlc/source/mysqlc_databasemetadata.hxx
mysqlc/source/mysqlc_driver.cxx
mysqlc/source/mysqlc_driver.hxx
mysqlc/source/mysqlc_general.hxx
mysqlc/source/mysqlc_preparedstatement.hxx
mysqlc/source/mysqlc_resultsetmetadata.hxx
mysqlc/source/mysqlc_statement.hxx
sdext/source/minimizer/impoptimizer.cxx
sdext/source/pdfimport/config/description.xml
sdext/source/pdfimport/tree/drawtreevisiting.cxx
sdext/source/presenter/PresenterWindowManager.cxx
swext/prj/build.lst
Diffstat (limited to 'sdext/source/pdfimport/config')
-rw-r--r--[-rwxr-xr-x] | sdext/source/pdfimport/config/description.xml | 2 | ||||
-rw-r--r-- | sdext/source/pdfimport/config/pdf_import_filter.xcu | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sdext/source/pdfimport/config/description.xml b/sdext/source/pdfimport/config/description.xml index a83191a58043..300bad702f60 100755..100644 --- a/sdext/source/pdfimport/config/description.xml +++ b/sdext/source/pdfimport/config/description.xml @@ -10,7 +10,7 @@ <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/> </dependencies> - <version value="1.0.3" /> + <version value="1.0.5" /> <platform value="UPDATED_SUPPORTED_PLATFORM" /> diff --git a/sdext/source/pdfimport/config/pdf_import_filter.xcu b/sdext/source/pdfimport/config/pdf_import_filter.xcu index 89ad84b7a6cf..628be6db8be9 100644 --- a/sdext/source/pdfimport/config/pdf_import_filter.xcu +++ b/sdext/source/pdfimport/config/pdf_import_filter.xcu @@ -20,7 +20,7 @@ <value>pdf_Portable_Document_Format</value> </prop> <prop oor:name="UIName"> - <value xml:lang="x-default">PDF - Portable Document Format</value> + <value xml:lang="x-default">PDF - Portable Document Format (Draw)</value> </prop> <prop oor:name="TemplateName"/> <prop oor:name="UIComponent"/> @@ -49,7 +49,7 @@ <value>pdf_Portable_Document_Format</value> </prop> <prop oor:name="UIName"> - <value xml:lang="x-default">PDF - Portable Document Format</value> + <value xml:lang="x-default">PDF - Portable Document Format (Impress)</value> </prop> <prop oor:name="TemplateName"/> <prop oor:name="UIComponent"/> @@ -78,7 +78,7 @@ <value>pdf_Portable_Document_Format</value> </prop> <prop oor:name="UIName"> - <value xml:lang="x-default">PDF - Portable Document Format</value> + <value xml:lang="x-default">PDF - Portable Document Format (Writer)</value> </prop> <prop oor:name="TemplateName"/> <prop oor:name="UIComponent"/> |