Repository.mk | 9 ++++---
sdext/Extension_minimizer.mk | 2 +
sdext/Extension_pdfimport.mk | 2 +
sdext/Extension_presenter.mk | 2 +
sdext/Library_minimizer.mk | 2 +
sdext/Library_pdfimport.mk | 2 +
sdext/Library_presenter.mk | 2 +
sdext/Module_sdext.mk | 3 ++
sdext/Rdb_minimizer.mk | 34 +++++++++++++++++++++++++++
sdext/Rdb_pdfimport.mk | 34 +++++++++++++++++++++++++++
sdext/Rdb_presenter.mk | 34 +++++++++++++++++++++++++++
sdext/source/minimizer/manifest.xml | 4 +--
sdext/source/minimizer/minimizer.component | 10 ++++++++
sdext/source/minimizer/pppoptimizeruno.cxx | 36 -----------------------------
sdext/source/pdfimport/manifest.xml | 4 +--
sdext/source/pdfimport/pdfimport.component | 19 +++++++++++++++
sdext/source/pdfimport/services.cxx | 30 ------------------------
sdext/source/presenter/manifest.xml | 4 +--
sdext/source/presenter/presenter.component | 10 ++++++++
solenv/gbuild/Helper.mk | 2 -
solenv/gbuild/Library.mk | 1
solenv/gbuild/platform/IOS_ARM_GCC.mk | 2 +
solenv/gbuild/platform/WNT_INTEL_GCC.mk | 2 +
solenv/gbuild/platform/WNT_INTEL_MSC.mk | 2 +
solenv/gbuild/platform/macosx.mk | 2 +
solenv/gbuild/platform/solaris.mk | 2 +
solenv/gbuild/platform/unxgcc.mk | 2 +
27 files changed, 182 insertions(+), 76 deletions(-)
New commits:
commit 0909f448fe2871bc7f6b410f23bdaa4d421dea9a
Author: David Tardon <dtar...@redhat.com>
Date: Thu Apr 19 12:21:43 2012 +0200
convert presenter console to passive registration
diff --git a/Repository.mk b/Repository.mk
index e3b0196..37a872c 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 a0932f9..6659664 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 c6232de..29dcde5 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 8d45d02..6280984 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 0000000..c1d4125
--- /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 <dtar...@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 c95e828..515baf3 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 e1d1e2b..705ac2c 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 0000000..4dfd7cc
--- /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>
commit abd74a8ef0ef260f901b1a03ca4dd47644e5fd46
Author: David Tardon <dtar...@redhat.com>
Date: Thu Apr 19 12:12:29 2012 +0200
convert pdfimport to passive registration
diff --git a/Repository.mk b/Repository.mk
index 6e00261..e3b0196 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -494,7 +494,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
nullcanvas \
OGLTrans \
passwordcontainer \
- pdfimport \
PresenterScreen \
simplecanvas \
slideshow \
@@ -559,6 +558,7 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
))
$(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \
+ pdfimport \
SunPresentationMinimizer \
))
diff --git a/sdext/Extension_pdfimport.mk b/sdext/Extension_pdfimport.mk
index b2a7786..0ecdff1 100644
--- a/sdext/Extension_pdfimport.mk
+++ b/sdext/Extension_pdfimport.mk
@@ -31,6 +31,8 @@ $(eval $(call
gb_Extension_Extension,pdfimport,sdext/source/pdfimport))
$(eval $(call gb_Extension_set_platform,pdfimport,$(sdext_PLATFORM)))
+$(eval $(call gb_Extension_add_file,pdfimport,components.rdb,$(call
gb_Rdb_get_target,pdfimport)))
+
$(eval $(call gb_Extension_add_files,pdfimport,,\
$(call gb_Executable_get_target,xpdfimport) \
$(call gb_Library_get_target,pdfimport) \
diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk
index 01d1431..9e54d90 100644
--- a/sdext/Library_pdfimport.mk
+++ b/sdext/Library_pdfimport.mk
@@ -27,6 +27,8 @@
$(eval $(call gb_Library_Library,pdfimport))
+$(eval $(call
gb_Library_set_componentfile,pdfimport,sdext/source/pdfimport/pdfimport))
+
$(eval $(call gb_Library_use_api,pdfimport,\
offapi \
udkapi \
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index 8362da2..8d45d02 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Module_add_targets,sdext,\
Executable_xpdfimport \
Extension_pdfimport \
Library_pdfimport \
+ Rdb_pdfimport \
StaticLibrary_pdfimport_s \
))
diff --git a/sdext/Rdb_pdfimport.mk b/sdext/Rdb_pdfimport.mk
new file mode 100644
index 0000000..6533427
--- /dev/null
+++ b/sdext/Rdb_pdfimport.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 <dtar...@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,pdfimport))
+
+$(eval $(call gb_Rdb_add_components,pdfimport,\
+ sdext/source/pdfimport/pdfimport \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/source/pdfimport/manifest.xml
b/sdext/source/pdfimport/manifest.xml
index 5a0aaa5..2264a20 100644
--- a/sdext/source/pdfimport/manifest.xml
+++ b/sdext/source/pdfimport/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="pdfimport.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.executable"
manifest:full-path="xpdfimport@EXEC_EXTENSION@"/>
<manifest:file-entry
manifest:media-type="application/vnd.sun.star.configuration-data"
diff --git a/sdext/source/pdfimport/pdfimport.component
b/sdext/source/pdfimport/pdfimport.component
new file mode 100644
index 0000000..1392302
--- /dev/null
+++ b/sdext/source/pdfimport/pdfimport.component
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<component xmlns="http://openoffice.org/2010/uno-components";
+ loader="com.sun.star.loader.SharedLibrary">
+ <implementation name="com.sun.star.comp.documents.HybridPDFImport">
+ <service name="com.sun.star.document.ImportFilter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.documents.WriterPDFImport">
+ <service name="com.sun.star.document.ImportFilter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.documents.DrawPDFImport">
+ <service name="com.sun.star.document.ImportFilter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.documents.ImpressPDFImport">
+ <service name="com.sun.star.document.ImportFilter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.documents.PDFDetector">
+ <service name="com.sun.star.document.ImportFilter"/>
+ </implementation>
+</component>
diff --git a/sdext/source/pdfimport/services.cxx
b/sdext/source/pdfimport/services.cxx
index e15d9a5..7e4da4b 100644
--- a/sdext/source/pdfimport/services.cxx
+++ b/sdext/source/pdfimport/services.cxx
@@ -119,36 +119,6 @@ namespace
}
}
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
-component_writeInfo(
- SAL_UNUSED_PARAMETER void* /*pServiceManager*/, void* pRegistryKey )
-{
- Reference< XRegistryKey > xRootKey( static_cast< XRegistryKey* >(
pRegistryKey ) );
-
- ::rtl::OUString sRootKey( "/", 1, RTL_TEXTENCODING_ASCII_US );
-
- const ComponentDescription* pComponents = lcl_getComponents();
- while ( pComponents->pAsciiServiceName != NULL )
- {
- ::rtl::OUString sMainKeyName( sRootKey );
- sMainKeyName += ::rtl::OUString::createFromAscii(
pComponents->pAsciiImplementationName );
- sMainKeyName +=
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
- try
- {
- Reference< XRegistryKey > xNewKey( xRootKey->createKey(
sMainKeyName ) );
- xNewKey->createKey( ::rtl::OUString::createFromAscii(
pComponents->pAsciiServiceName ) );
- }
- catch( Exception& )
- {
- OSL_FAIL( "OModule::writeComponentInfos: something went wrong
while creating the keys!" );
- return sal_False;
- }
- ++pComponents;
- }
- return sal_True;
-}
-
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
SAL_UNUSED_PARAMETER void* /*pServiceManager*/,
commit 6d9a524352948695e9395226c7568980fd4d5f12
Author: David Tardon <dtar...@redhat.com>
Date: Thu Apr 19 12:03:37 2012 +0200
convert presentation minimizer to passive registration
diff --git a/Repository.mk b/Repository.mk
index f0c5965..6e00261 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -499,7 +499,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
simplecanvas \
slideshow \
stringresource \
- SunPresentationMinimizer \
ucpcmis1 \
ucpexpand1 \
ucpext \
@@ -559,6 +558,10 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
sal \
))
+$(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \
+ SunPresentationMinimizer \
+))
+
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
basegfx_s \
codemaker \
diff --git a/sdext/Extension_minimizer.mk b/sdext/Extension_minimizer.mk
index d061599..cebdc9c 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 141199d..5c918c3 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 2d8b6fc..8362da2 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 0000000..43ec5de
--- /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 <dtar...@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 4b55ddd..5de702c 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 0000000..8a90fd2
--- /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>
commit 7a3095baa699462d3e8f0f920c6d681a342d4d4d
Author: David Tardon <dtar...@redhat.com>
Date: Thu Apr 19 12:02:06 2012 +0200
add layer and library group for extensions
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index e5106db..495a3e0 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -116,7 +116,7 @@ endef
define gb_Helper_init_registries
gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE
-gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO
RTLIBS RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS
+gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO
RTLIBS RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS EXTENSIONLIBS
gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
$$(foreach group,$$(gb_Executable_VALIDGROUPS),$$(eval gb_Executable_$$(group)
:=))
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index a9c1720..3601f8e 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -136,6 +136,7 @@ gb_Library__COMPONENTPREFIXES := \
NONE:vnd.sun.star.expand:\dLO_LIB_DIR/ \
OOO:vnd.sun.star.expand:\dLO_LIB_DIR/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+ OXT:./ \
define gb_Library__forward_to_Linktarget
gb_Library_$(1) = $$(call gb_LinkTarget_$(1),$$(call
gb_Library_get_linktargetname,$$(1)),$$(2),$$(3))
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 932f24a..7eebca2 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -229,6 +229,7 @@ gb_Library_FILENAMES := \
$(foreach
lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach
lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach
lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT))
\
+ $(foreach
lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \
gb_Library_LAYER := \
@@ -240,6 +241,7 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \
+ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
define gb_Library_Library_platform
$(call gb_LinkTarget_get_target,$(2)) : LAYER := $(call
gb_Library_get_layer,$(1))
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 6edece5..305abf2 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -270,6 +270,7 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
+ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
gb_Library_FILENAMES :=\
$(foreach
lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT))
\
@@ -281,6 +282,7 @@ gb_Library_FILENAMES :=\
$(foreach
lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach
lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach
lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT))
\
+ $(foreach
lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \
gb_Library_DLLFILENAMES :=\
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index a6d88ff..9ee08e2 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -432,6 +432,7 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
+ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
gb_Library_FILENAMES :=\
$(foreach
lib,$(gb_Library_TARGETS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT))
\
@@ -454,6 +455,7 @@ gb_Library_DLLFILENAMES :=\
$(foreach
lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach
lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach
lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVEREXT)) \
+ $(foreach
lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \
define gb_Library_Library_platform
$(call gb_LinkTarget_set_dlltarget,$(2),$(3))
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index e501c2b..a55af3a 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -291,6 +291,7 @@ gb_Library_FILENAMES := \
$(foreach
lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach
lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach
lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT))
\
+ $(foreach
lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \
gb_Library_LAYER := \
@@ -303,6 +304,7 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
+ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
define gb_Library_get_rpath
$(call gb_LinkTarget__get_installname,$(call
gb_Library_get_filename,$(1)),$(2),$(call
gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1))))
diff --git a/solenv/gbuild/platform/solaris.mk
b/solenv/gbuild/platform/solaris.mk
index 894841b..cc8a2a8 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -286,6 +286,7 @@ gb_Library_FILENAMES := \
$(foreach
lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach
lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach
lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT))
\
+ $(foreach
lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \
gb_Library_LAYER := \
@@ -297,6 +298,7 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
+ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
define gb_Library_get_rpath
'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call
gb_Library_get_layer,$(1)))' \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index ada3ede..31859a2 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -297,6 +297,7 @@ gb_Library_FILENAMES := \
$(foreach
lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach
lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach
lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT))
\
+ $(foreach
lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \
gb_Library_LAYER := \
@@ -308,6 +309,7 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
+ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
define gb_Library_get_rpath
'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call
gb_Library_get_layer,$(1)))' \
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
