11 files changed, 37 insertions, 143 deletions
diff --git a/sdext/source/minimizer/description.xml b/sdext/source/minimizer/description.xml
index 54cb88762a4d..922d47096e6b 100644
--- a/sdext/source/minimizer/description.xml
+++ b/sdext/source/minimizer/description.xml
@@ -12,21 +12,26 @@
     </dependencies>
 
     <registration>
-        <simple-license accept-by="admin" default-license-id="lic-en-US">
+        <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" >
             <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
         </simple-license>
     </registration>
 
-    <version value="1.0"/>
+    <version value="1.0.2"/>
 
     <platform value="UPDATED_SUPPORTED_PLATFORM"/>
 
     <publisher>
-        <name xlink:href="http://www.sun.com/software/star/staroffice/extensions.jsp?cid=925095" lang="en">Sun Microsystems</name>
+        <name xlink:href="http://www.sun.com/software/star/staroffice/extensions.jsp?cid=925095" lang="en">Oracle</name>
     </publisher>
 
     <display-name>
         <name lang="en-US">Presentation Minimizer</name>
     </display-name>
 
+    <icon>
+      <default xlink:href="bitmaps/em47.png" />
+      <high-contrast xlink:href="bitmaps/em47_hc.png" />
+    </icon>
+
 </description>
diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx
index 832914e5c8ab..3bb42da1f2f4 100644
--- a/sdext/source/minimizer/fileopendialog.cxx
+++ b/sdext/source/minimizer/fileopendialog.cxx
@@ -33,6 +33,7 @@
 #include "pppoptimizertoken.hxx"
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
@@ -55,6 +56,7 @@
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XContainerQuery.hpp>
+#include <com/sun/star/view/XControlAccess.hpp>
 #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
 
 
@@ -63,6 +65,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::view;
 using namespace ::com::sun::star::ui::dialogs;
 
 FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxMSF ) :
@@ -75,6 +78,17 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxMSF ) :
         OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ), aInitPropSeq, rxMSF ),UNO_QUERY_THROW );
     mxFilePicker->setMultiSelectionMode( sal_False );
 
+    Reference< XFilePickerControlAccess > xAccess( mxFilePicker, UNO_QUERY );
+    if ( xAccess.is() )
+    {
+        Any aValue( static_cast< sal_Bool >( sal_True ) );
+        try
+        {
+            xAccess->setValue( ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION, 0, aValue );
+        }
+        catch( com::sun::star::uno::Exception& )
+        {}
+    }
 
     // collecting a list of impress filters
     Reference< XNameAccess > xFilters( mxMSF->getServiceManager()->createInstanceWithContext(
diff --git a/sdext/source/minimizer/help/component.txt b/sdext/source/minimizer/help/component.txt
index f6222edc2386..98f2687800ff 100755
--- a/sdext/source/minimizer/help/component.txt
+++ b/sdext/source/minimizer/help/component.txt
@@ -1,3 +1,2 @@
-The Presentation Minimizer is used to reduce the file size of the current
-presentation. Images will be compressed, and data that is no longer needed
-will be removed.
+The Presentation Minimizer is used to reduce the file size of the current presentation. Images will be compressed, and data that is no longer needed will be removed.
+The Presentation Minimizer can optimize the image quality size. Presentations designed for screen or projector do not require the same high quality as presentations designed for print.
diff --git a/sdext/source/minimizer/images/em47.png b/sdext/source/minimizer/images/em47.png
new file mode 100644
index 000000000000..a018f1710ea5
--- /dev/null
+++ b/sdext/source/minimizer/images/em47.png
diff --git a/sdext/source/minimizer/images/em47_hc.png b/sdext/source/minimizer/images/em47_hc.png
new file mode 100644
index 000000000000..418cd1479298
--- /dev/null
+++ b/sdext/source/minimizer/images/em47_hc.png
diff --git a/sdext/source/minimizer/makefile.mk b/sdext/source/minimizer/makefile.mk
index 1140494e17de..18c7a0a435c5 100644
--- a/sdext/source/minimizer/makefile.mk
+++ b/sdext/source/minimizer/makefile.mk
@@ -38,8 +38,8 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 # set in minimizer.pmk
-#EXTENSIONNAME:=SunPresentationMinimizer
-EXTENSION_ZIPNAME:=sun-presentation-minimizer
+#EXTENSIONNAME:=PresentationMinimizer
+EXTENSION_ZIPNAME:=presentation-minimizer
 
 .IF "$(ENABLE_MINIMIZER)" != "YES"
 @all:
@@ -83,11 +83,8 @@ DEF1NAME=		$(SHL1TARGET)
 
 COMPONENT_MERGED_XCU= \
     $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/Addons.xcu \
-    $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/extension$/SunPresentationMinimizer.xcu \
-    $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/UI$/ImpressWindowState.xcu
-
-COMPONENT_XCU= \
-    $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/ProtocolHandler.xcu
+    $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/ProtocolHandler.xcu \
+    $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/extension$/SunPresentationMinimizer.xcu
 
 COMPONENT_FILES= \
     $(EXTENSIONDIR)$/registry$/schema$/org$/openoffice$/Office$/extension$/SunPresentationMinimizer.xcs
@@ -98,7 +95,6 @@ COMPONENT_LIBRARIES= \
 
 # rather freestyle or common to all?
 COMPONENT_BITMAPS= \
-    $(EXTENSIONDIR)$/bitmaps$/aboutlogo.png \
     $(EXTENSIONDIR)$/bitmaps$/opt_16.png \
     $(EXTENSIONDIR)$/bitmaps$/opt_26.png \
     $(EXTENSIONDIR)$/bitmaps$/opt_16_h.png \
@@ -106,6 +102,10 @@ COMPONENT_BITMAPS= \
     $(EXTENSIONDIR)$/bitmaps$/minimizepresi_80.png \
     $(EXTENSIONDIR)$/bitmaps$/minimizepresi_80_h.png
 
+COMPONENT_IMAGES=\
+    $(EXTENSIONDIR)$/bitmaps$/em47.png \
+    $(EXTENSIONDIR)$/bitmaps$/em47_hc.png
+
 # rather freestyle or common to all?
 COMPONENT_HELP= \
     $(EXTENSIONDIR)$/help$/help_de.odt \
@@ -113,7 +113,7 @@ COMPONENT_HELP= \
     $(EXTENSIONDIR)$/help$/component.txt
 
 # make sure to add your custom files here
-EXTENSION_PACKDEPS=$(COMPONENT_BITMAPS) $(COMPONENT_HELP)
+EXTENSION_PACKDEPS=$(COMPONENT_BITMAPS) $(COMPONENT_IMAGES) $(COMPONENT_HELP)
 
 # --- Targets ----------------------------------
 
@@ -129,6 +129,10 @@ $(COMPONENT_BITMAPS) : $(SOLARSRC)$/$(RSCDEFIMG)$/minimizer$/$$(@:f)
     @@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
 
+$(COMPONENT_IMAGES) : images$/$$(@:f)
+    @@-$(MKDIRHIER) $(@:d)
+    $(COPY) $< $@
+
 $(COMPONENT_HELP) : help$/$$(@:f)
     @@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
diff --git a/sdext/source/minimizer/manifest.xml b/sdext/source/minimizer/manifest.xml
index 41587ebcfd69..eac189524f26 100644
--- a/sdext/source/minimizer/manifest.xml
+++ b/sdext/source/minimizer/manifest.xml
@@ -11,8 +11,6 @@
                        manifest:full-path="registry/data/org/openoffice/Office/Addons.xcu"/>
   <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
                        manifest:full-path="registry/data/org/openoffice/Office/ProtocolHandler.xcu"/>
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-                       manifest:full-path="registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu"/>
   <manifest:file-entry manifest:media-type="application/vnd.sun.star.package-bundle-description"
                        manifest:full-path="help/component.txt"/>
 </manifest:manifest>
diff --git a/sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu b/sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu
index 21f951a15c38..2b4465b402f1 100644
--- a/sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu
+++ b/sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu
@@ -1,24 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Addons" oor:package="org.openoffice.Office">
     <node oor:name="AddonUI">
-        <node oor:name="OfficeToolBar">
-            <node oor:name="org.openoffice.Office.SunPresentationMinimizer" oor:op="replace">
-                <node oor:name="m1" oor:op="replace">
-                    <prop oor:name="URL" oor:type="xs:string">
-                        <value>vnd.com.sun.star.comp.SunPresentationMinimizer:execute</value>
-                    </prop>
-                    <prop oor:name="Title" oor:type="xs:string">
-                        <value xml:lang="en-US">Minimize Presentation</value>
-                    </prop>
-                    <prop oor:name="Target" oor:type="xs:string">
-                        <value>_self</value>
-                    </prop>
-                    <prop oor:name="Context" oor:type="xs:string">
-                        <value>com.sun.star.presentation.PresentationDocument</value>
-                    </prop>
-                </node>
-            </node>
-        </node>
         <node oor:name="Images">
             <node oor:name="opt-image" oor:op="replace">
                 <prop oor:name="URL">
@@ -77,36 +59,6 @@
                         </node>
                     </node>
                 </node>
-                <node oor:name="Command2" oor:op="replace">
-                    <prop oor:name="MergePoint">
-                        <value>.uno:HelpMenu\.uno:About</value>
-                    </prop>
-                    <prop oor:name="MergeCommand">
-                        <value>AddBefore</value>
-                    </prop>
-                    <prop oor:name="MergeFallback">
-                        <value>AddPath</value>
-                    </prop>
-                    <prop oor:name="MergeContext">
-                        <value>com.sun.star.presentation.PresentationDocument</value>
-                    </prop>
-                    <node oor:name="MenuItems">
-                        <node oor:name="SunPresentationMinimizerAbout1" oor:op="replace">
-                            <prop oor:name="URL" oor:type="xs:string">
-                                <value>vnd.com.sun.star.comp.SunPresentationMinimizer:about</value>
-                            </prop>
-                            <prop oor:name="Title" oor:type="xs:string">
-                                <value xml:lang="en-US">About Sun Presentation Minimizer</value>
-                            </prop>
-                            <prop oor:name="Target" oor:type="xs:string">
-                                <value>_self</value>
-                            </prop>
-                            <prop oor:name="Context" oor:type="xs:string">
-                                <value>com.sun.star.presentation.PresentationDocument</value>
-                            </prop>
-                        </node>
-                    </node>
-                </node>
             </node>
         </node>
     </node>
diff --git a/sdext/source/minimizer/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/sdext/source/minimizer/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
deleted file mode 100644
index 9be906f2da42..000000000000
--- a/sdext/source/minimizer/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<oor:component-data xmlns:oor="http://openoffice.org/2001/registry"
-xmlns:xs="http://www.w3.org/2001/XMLSchema"
-oor:name="ImpressWindowState"
-oor:package="org.openoffice.Office.UI">
- <node oor:name="UIElements">
-  <node oor:name="States">
-   <node oor:name="private:resource/toolbar/addon_org.openoffice.Office.SunPresentationMinimizer" oor:op="replace">
-    <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-     <value>false</value>
-    </prop>
-    <prop oor:name="UIName" oor:type="xs:string">
-     <value xml:lang="en-US">Minimizer</value>
-    </prop>
-    <prop oor:name="Visible" oor:type="xs:boolean">
-     <value>true</value>
-    </prop>
-    <prop oor:name="Docked" oor:type="xs:boolean">
-     <value>false</value>
-    </prop>
-    <prop oor:name="Style" oor:type="xs:int">
-     <value>2</value>
-    </prop>
-   </node>
-  </node>
- </node>
-</oor:component-data>
diff --git a/sdext/source/minimizer/registry/data/org/openoffice/Office/UI/makefile.mk b/sdext/source/minimizer/registry/data/org/openoffice/Office/UI/makefile.mk
deleted file mode 100644
index c9c83d21f5c8..000000000000
--- a/sdext/source/minimizer/registry/data/org/openoffice/Office/UI/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..$/..$/..$/..$/..$/..
-
-PRJNAME=sdext
-TARGET=data_ooOUI
-PACKAGE=org.openoffice.Office.UI
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/source$/minimizer$/minimizer.pmk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCUFILES= \
-    ImpressWindowState.xcu
-
-MODULEFILES=
-
-LOCALIZEDFILES= \
-    ImpressWindowState.xcu
-
-.INCLUDE :  target.mk
diff --git a/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu b/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu
index 13a586ce109b..5cbf05be8d0a 100644
--- a/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu
+++ b/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu
@@ -6,10 +6,6 @@
     </prop>
 
     <prop oor:name="HelpFile" oor:type="xs:string">
-        <info>
-            <desc>Specifies the filename of the help document after installation,
-            the help can be found in sdext/source/minimizer/help</desc>
-        </info>
         <value xml:lang="en-US">%origin%/../../../../../../help/help_en-US.odt</value>
     </prop>