summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Repository.mk2
-rw-r--r--sdext/Extension_presenter.mk2
-rw-r--r--sdext/Library_presenter.mk2
-rw-r--r--sdext/Module_sdext.mk1
-rw-r--r--sdext/Rdb_presenter.mk34
-rw-r--r--sdext/source/minimizer/pppoptimizeruno.cxx36
-rw-r--r--sdext/source/presenter/manifest.xml4
-rw-r--r--sdext/source/presenter/presenter.component10
8 files changed, 52 insertions, 39 deletions
diff --git a/Repository.mk b/Repository.mk
index e3b0196d2c35..37a872cc34fb 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -494,7 +494,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
nullcanvas \
OGLTrans \
passwordcontainer \
- PresenterScreen \
simplecanvas \
slideshow \
stringresource \
@@ -559,6 +558,7 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
$(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \
pdfimport \
+ PresenterScreen \
SunPresentationMinimizer \
))
diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk
index a0932f91d8c8..66596643d2c9 100644
--- a/sdext/Extension_presenter.mk
+++ b/sdext/Extension_presenter.mk
@@ -35,6 +35,8 @@ $(eval $(call gb_Extension_add_files,presenter-screen,,\
$(call gb_Library_get_target,PresenterScreen) \
))
+$(eval $(call gb_Extension_add_file,presenter-screen,components.rdb,$(call gb_Rdb_get_target,presenter)))
+
$(eval $(call gb_Extension_add_files,presenter-screen,bitmaps,\
$(SRCDIR)/icon-themes/galaxy/desktop/res/extension_32.png \
$(SRCDIR)/sdext/source/presenter/bitmaps/Background.png \
diff --git a/sdext/Library_presenter.mk b/sdext/Library_presenter.mk
index c6232deaf722..29dcde58954f 100644
--- a/sdext/Library_presenter.mk
+++ b/sdext/Library_presenter.mk
@@ -27,6 +27,8 @@
$(eval $(call gb_Library_Library,PresenterScreen))
+$(eval $(call gb_Library_set_componentfile,PresenterScreen,sdext/source/presenter/presenter))
+
$(eval $(call gb_Library_use_api,PresenterScreen,\
offapi \
udkapi \
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index 8d45d0288b11..62809846dc0d 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -60,6 +60,7 @@ $(eval $(call gb_Module_add_targets,sdext,\
CustomTarget_presenter \
Extension_presenter \
Library_presenter \
+ Rdb_presenter \
Zip_presenter \
))
endif
diff --git a/sdext/Rdb_presenter.mk b/sdext/Rdb_presenter.mk
new file mode 100644
index 000000000000..c1d4125202b7
--- /dev/null
+++ b/sdext/Rdb_presenter.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,presenter))
+
+$(eval $(call gb_Rdb_add_components,presenter,\
+ sdext/source/presenter/presenter \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx b/sdext/source/minimizer/pppoptimizeruno.cxx
index c95e82805e1f..515baf3648f9 100644
--- a/sdext/source/minimizer/pppoptimizeruno.cxx
+++ b/sdext/source/minimizer/pppoptimizeruno.cxx
@@ -42,42 +42,6 @@ using namespace ::com::sun::star::registry;
extern "C"
{
- SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
- SAL_UNUSED_PARAMETER void* /*pServiceManager*/, void* pRegistryKey )
- {
- if (pRegistryKey)
- {
- try
- {
- Reference< XRegistryKey > xNewKey;
- sal_Int32 nPos;
-
- xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( PPPOptimizer_getImplementationName() );
- xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
- const Sequence< OUString > & rSNL1 = PPPOptimizer_getSupportedServiceNames();
- const OUString * pArray1 = rSNL1.getConstArray();
- for ( nPos = rSNL1.getLength(); nPos--; )
- xNewKey->createKey( pArray1[nPos] );
-
- xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( PPPOptimizerDialog_getImplementationName() );
- xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
- const Sequence< OUString > & rSNL2 = PPPOptimizerDialog_getSupportedServiceNames();
- const OUString * pArray2 = rSNL2.getConstArray();
- for ( nPos = rSNL2.getLength(); nPos--; )
- xNewKey->createKey( pArray2[nPos] );
-
- return sal_True;
- }
- catch (InvalidRegistryException &)
- {
- OSL_FAIL( "### InvalidRegistryException!" );
- }
- }
- return sal_False;
- }
-
- // -------------------------------------------------------------------------
-
SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager,
SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ )
diff --git a/sdext/source/presenter/manifest.xml b/sdext/source/presenter/manifest.xml
index e1d1e2bde90f..705ac2cdd0f5 100644
--- a/sdext/source/presenter/manifest.xml
+++ b/sdext/source/presenter/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="PresenterScreen.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-data"
manifest:full-path="registry/data/org/openoffice/Office/Jobs.xcu"/>
<manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
diff --git a/sdext/source/presenter/presenter.component b/sdext/source/presenter/presenter.component
new file mode 100644
index 000000000000..4dfd7cc403e4
--- /dev/null
+++ b/sdext/source/presenter/presenter.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.Draw.framework.PresenterScreenJob">
+ <service name="com.sun.star.drawing.framework.PresenterScreenJob"/>
+ </implementation>
+ <implementation name="vnd.sun.star.sdext.presenter.PresenterProtocolHandler">
+ <service name="com.sun.star.frame.ProtocolHandler"/>
+ </implementation>
+</component>
generated by cgit (git 2.34.1) at 2025-02-10 23:29:16 +0000