diff options
author | Mikhail Voytenko <mav@openoffice.org> | 2011-01-06 14:57:12 +0100 |
---|---|---|
committer | Mikhail Voytenko <mav@openoffice.org> | 2011-01-06 14:57:12 +0100 |
commit | 6d7dde7dd2b4ecb94b71c5966391c2e21ea5b241 (patch) | |
tree | e3efbed0fc671065b511db10ff1b519f1246b767 /sdext/source | |
parent | 3bad0bebcf2bf6e8927042e0f98ed4a37ac0ffe7 (diff) | |
parent | a23aac32c22c6106b72dcc2f621be535314cbc6e (diff) |
removetooltypes01: rebase to DEV300_m96
Diffstat (limited to 'sdext/source')
-rwxr-xr-x | sdext/source/minimizer/description.xml | 2 | ||||
-rw-r--r-- | sdext/source/pdfimport/config/pdf_import_filter.xcu | 6 | ||||
-rwxr-xr-x | sdext/source/presenter/description.xml | 2 | ||||
-rw-r--r-- | sdext/source/presenter/makefile.mk | 3 | ||||
-rw-r--r-- | sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu | 3 |
5 files changed, 11 insertions, 5 deletions
diff --git a/sdext/source/minimizer/description.xml b/sdext/source/minimizer/description.xml index 64a67a05b343..a4f172d0ebe6 100755 --- a/sdext/source/minimizer/description.xml +++ b/sdext/source/minimizer/description.xml @@ -17,7 +17,7 @@ </simple-license> </registration> - <version value="1.0.2"/> + <version value="1.0.3"/> <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"/> diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml index ede52f0bf1bb..19fefec6de8a 100755 --- a/sdext/source/presenter/description.xml +++ b/sdext/source/presenter/description.xml @@ -8,7 +8,7 @@ <identifier value="com.sun.PresenterScreen-UPDATED_PLATFORM" /> <dependencies> - <OpenOffice.org-minimal-version value="3.2" dep:name="OpenOffice.org 3.2"/> + <OpenOffice.org-minimal-version value="3.3" dep:name="OpenOffice.org 3.3"/> </dependencies> <registration> diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index 997d43054d3b..e751a6e500ff 100644 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -307,8 +307,11 @@ $(ZIP1DIR)/help/%/com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp : $(COMMON @-$(MKDIRHIER) $(@:d) $(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/" | sed 's/@PRESENTEREXTENSIONPRODUCTNAME@/Presenter Console/g' > $@ +.IF "$(ZIP1TARGETN)"!="" $(ZIP1TARGETN) : $(HELPLINKALLTARGETS) +.ENDIF # "$(ZIP1TARGETN)"!="" + $(COMPONENT_BITMAPS) : bitmaps$/$$(@:f) @-$(MKDIRHIER) $(@:d) +$(COPY) $< $@ diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu b/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu index ba743328e811..1241a72a0243 100644 --- a/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu +++ b/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu @@ -5,6 +5,9 @@ <prop oor:name="Service"> <value>com.sun.star.comp.Draw.framework.PresenterScreenJob</value> </prop> + <prop oor:name="Context"> + <value>com.sun.star.presentation.PresentationDocument</value> + </prop> </node> </node> <node oor:name="Events"> |