convert presentation minimizer to passive registration

6 files changed, 51 insertions, 2 deletions

diff --git a/sdext/Extension_minimizer.mk b/sdext/Extension_minimizer.mk
index d061599e4f60..cebdc9ca103d 100644
--- a/sdext/Extension_minimizer.mk
+++ b/sdext/Extension_minimizer.mk
@@ -35,6 +35,8 @@ $(eval $(call gb_Extension_add_files,presentation-minimizer,,\
     $(call gb_Library_get_target,SunPresentationMinimizer) \
 ))
 
+$(eval $(call gb_Extension_add_file,presentation-minimizer,components.rdb,$(call gb_Rdb_get_target,minimizer)))
+
 $(eval $(call gb_Extension_add_files,presentation-minimizer,bitmaps,\
     $(SRCDIR)/icon-themes/galaxy/desktop/res/extension_32.png \
     $(SRCDIR)/icon-themes/galaxy/minimizer/minimizepresi_80.png \
diff --git a/sdext/Library_minimizer.mk b/sdext/Library_minimizer.mk
index 141199d0e2db..5c918c390b51 100644
--- a/sdext/Library_minimizer.mk
+++ b/sdext/Library_minimizer.mk
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_Library_Library,SunPresentationMinimizer))
 
+$(eval $(call gb_Library_set_componentfile,SunPresentationMinimizer,sdext/source/minimizer/minimizer))
+
 $(eval $(call gb_Library_use_api,SunPresentationMinimizer,\
     offapi \
     udkapi \
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index 2d8b6fcc8183..8362da275b6f 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Module_add_targets,sdext,\
     Configuration_minimizer \
     Extension_minimizer \
     Library_minimizer \
+    Rdb_minimizer \
     Zip_minimizer \
 ))
 endif
diff --git a/sdext/Rdb_minimizer.mk b/sdext/Rdb_minimizer.mk
new file mode 100644
index 000000000000..43ec5de59a86
--- /dev/null
+++ b/sdext/Rdb_minimizer.mk
@@ -0,0 +1,34 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Rdb_Rdb,minimizer))
+
+$(eval $(call gb_Rdb_add_components,minimizer,\
+    sdext/source/minimizer/minimizer \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/source/minimizer/manifest.xml b/sdext/source/minimizer/manifest.xml
index 4b55ddd22f0d..5de702ca19f1 100644
--- a/sdext/source/minimizer/manifest.xml
+++ b/sdext/source/minimizer/manifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
 <manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=native"
-                       manifest:full-path="SunPresentationMinimizer.uno@SHARED_EXTENSION@"/>
+  <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-components;platform=@PLATFORM@"
+                       manifest:full-path="components.rdb"/>
   <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
                        manifest:full-path="registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs"/>
   <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
diff --git a/sdext/source/minimizer/minimizer.component b/sdext/source/minimizer/minimizer.component
new file mode 100644
index 000000000000..8a90fd22c5dc
--- /dev/null
+++ b/sdext/source/minimizer/minimizer.component
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<component xmlns="http://openoffice.org/2010/uno-components"
+        loader="com.sun.star.loader.SharedLibrary">
+    <implementation name="com.sun.star.comp.PPPOptimizerImp">
+        <service name="com.sun.star.comp.PPPOptimizer"/>
+    </implementation>
+    <implementation name="com.sun.star.comp.SunPresentationMinimizerImp">
+        <service name="com.sun.star.comp.SunPresentationMinimizer"/>
+    </implementation>
+</component>