[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 3 commits - binfilter/bf_sfx2 binfilter/inc binfilter/legacysmgr lotuswordpro/prj lotuswordpro/source lotuswordpro/util writerperfect/prj writerperfect/source writerperfect/util
Michael Meeks
mmeeks at kemper.freedesktop.org
Fri Apr 1 14:36:41 PDT 2011
binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx | 51 ----------
binfilter/inc/legacysmgr/legacy_binfilters_smgr.hxx | 4
binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx | 6 -
lotuswordpro/prj/d.lst | 1
lotuswordpro/source/filter/genericfilter.cxx | 29 -----
lotuswordpro/util/lwpfilter.component | 8 +
lotuswordpro/util/makefile.mk | 8 +
writerperfect/prj/d.lst | 2
writerperfect/source/wpgimp/wpgimport_genericfilter.cxx | 29 -----
writerperfect/source/wpsimp/makefile.mk | 1
writerperfect/source/wpsimp/msworks_genericfilter.cxx | 29 -----
writerperfect/util/makefile.mk | 14 ++
writerperfect/util/msworksfilter.component | 8 +
writerperfect/util/wpgfilter.component | 8 +
14 files changed, 48 insertions(+), 150 deletions(-)
New commits:
commit d864fbb7f86e313746600178a883fa63633f876c
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Apr 1 22:33:13 2011 +0100
remove obsolete component_writeInfo methods
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx
index 090d945..bd1c9aa 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx
@@ -887,57 +887,6 @@ static const String sUnpacked = String::CreateFromAscii( "Unpacked" );
extern "C" {
/*N*/
-/*N*/ sal_Bool SAL_CALL sfx2_component_writeInfo( void* /*pServiceManager*/ ,
-/*N*/ void* pRegistryKey )
-/*N*/ {
-/*N*/ ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > xKey( reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >( pRegistryKey ) ) ;
-/*N*/
-/*N*/ // Eigentliche Implementierung und ihre Services registrieren
-/*N*/ ::rtl::OUString aImpl;
-/*N*/ ::rtl::OUString aTempStr;
-/*N*/ ::rtl::OUString aKeyStr;
-/*N*/ Reference< XRegistryKey > xNewKey;
-/*N*/ Reference< XRegistryKey > xLoaderKey;
-/*N*/
-/*N*/ // global app event broadcaster
-/*N*/ aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-/*N*/ aImpl += SfxGlobalEvents_Impl::impl_getStaticImplementationName();
-/*N*/
-/*N*/ aTempStr = aImpl;
-/*N*/ aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-/*N*/ xNewKey = xKey->createKey( aTempStr );
-/*N*/ xNewKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.GlobalEventBroadcaster" )) );
-/*N*/
-/*N*/ // standalone document info
-/*N*/ aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-/*N*/ aImpl += SfxStandaloneDocumentInfoObject::impl_getStaticImplementationName();
-/*N*/
-/*N*/ aTempStr = aImpl;
-/*N*/ aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-/*N*/ xNewKey = xKey->createKey( aTempStr );
-/*N*/ xNewKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.StandaloneDocumentInfo" )) );
-/*N*/
-/*N*/ // script library container service
-/*N*/ aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-/*N*/ aImpl += SfxScriptLibraryContainer::impl_getStaticImplementationName();
-/*N*/
-/*N*/ aTempStr = aImpl;
-/*N*/ aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-/*N*/ xNewKey = xKey->createKey( aTempStr );
-/*N*/ xNewKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.ScriptLibraryContainer" )) );
-/*N*/
-/*N*/ // dialog library container service
-/*N*/ aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-/*N*/ aImpl += SfxDialogLibraryContainer::impl_getStaticImplementationName();
-/*N*/
-/*N*/ aTempStr = aImpl;
-/*N*/ aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-/*N*/ xNewKey = xKey->createKey( aTempStr );
-/*N*/ xNewKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.DialogLibraryContainer" )) );
-/*N*/
-/*N*/ return sal_True;
-/*N*/ }
-/*N*/
/*N*/ void* SAL_CALL sfx2_component_getFactory( const sal_Char* pImplementationName ,
/*N*/ void* pServiceManager ,
/*N*/ void* /*pRegistryKey*/ )
diff --git a/binfilter/inc/legacysmgr/legacy_binfilters_smgr.hxx b/binfilter/inc/legacysmgr/legacy_binfilters_smgr.hxx
index dcae20f..a119523 100644
--- a/binfilter/inc/legacysmgr/legacy_binfilters_smgr.hxx
+++ b/binfilter/inc/legacysmgr/legacy_binfilters_smgr.hxx
@@ -15,12 +15,8 @@ namespace legacy_binfilters
extern "C"
{
-//==================================================================================================
void SAL_CALL legacy_component_getImplementationEnvironment(
sal_Char const ** ppEnvTypeName, uno_Environment ** ppEnv );
-//==================================================================================================
-sal_Bool SAL_CALL legacysmgr_component_writeInfo(
- ::com::sun::star::lang::XMultiServiceFactory * smgr, ::com::sun::star::registry::XRegistryKey * key );
void * SAL_CALL legacysmgr_component_getFactory(
sal_Char const * implName, ::com::sun::star::lang::XMultiServiceFactory * smgr, ::com::sun::star::registry::XRegistryKey * key );
}
diff --git a/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx b/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx
index ddbb52d..bf87dba 100644
--- a/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx
+++ b/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx
@@ -1985,12 +1985,6 @@ using namespace ::legacy_binfilters;
extern "C"
{
-sal_Bool SAL_CALL legacysmgr_component_writeInfo(
- lang::XMultiServiceFactory * smgr, registry::XRegistryKey * key )
-{
- // #i30331#
- return component_writeInfoHelper( smgr, key, s_entries );
-}
#if defined(SOLARIS) && defined(INTEL)
#pragma optimize ( "", on )
#endif
commit 25cd17cd8a94d9a70130a24f8c3c526f69105d14
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Apr 1 22:32:09 2011 +0100
register msworks and wpg filter components
diff --git a/writerperfect/prj/d.lst b/writerperfect/prj/d.lst
index 8b281c5..c414fc6 100644
--- a/writerperfect/prj/d.lst
+++ b/writerperfect/prj/d.lst
@@ -2,4 +2,4 @@
..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
..\%__SRC%\bin\wpftgo.dll %_DEST%\bin%_EXT%\wpftgo.dll
..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\misc\wpft.component %_DEST%\xml%_EXT%\wpft.component
+..\%__SRC%\misc\*.component %_DEST%\xml%_EXT%\*.component
diff --git a/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx b/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx
index 210d5ef..2ab4fae 100644
--- a/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx
+++ b/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx
@@ -41,40 +41,11 @@ using namespace ::com::sun::star::registry;
extern "C"
{
-//==================================================================================================
void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-//==================================================================================================
-sal_Bool SAL_CALL component_writeInfo(
- void * /* pServiceManager */, void * pRegistryKey )
-{
- if (pRegistryKey)
- {
- try
- {
- sal_Int32 nPos = 0;
- Reference< XRegistryKey > xNewKey(
- reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( WPGImportFilter_getImplementationName() ) );
- xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
-
- const Sequence< OUString > & rSNL = WPGImportFilter_getSupportedServiceNames();
- const OUString * pArray = rSNL.getConstArray();
- for ( nPos = rSNL.getLength(); nPos--; )
- xNewKey->createKey( pArray[nPos] );
-
- return sal_True;
- }
- catch (InvalidRegistryException &)
- {
- OSL_FAIL( "### InvalidRegistryException!" );
- }
- }
- return sal_False;
-}
-//==================================================================================================
void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
{
diff --git a/writerperfect/source/wpsimp/makefile.mk b/writerperfect/source/wpsimp/makefile.mk
index da17e80..c3dfe20 100644
--- a/writerperfect/source/wpsimp/makefile.mk
+++ b/writerperfect/source/wpsimp/makefile.mk
@@ -27,3 +27,4 @@ SLOFILES= \
$(SLO)$/msworks_genericfilter.obj
.INCLUDE : target.mk
+
diff --git a/writerperfect/source/wpsimp/msworks_genericfilter.cxx b/writerperfect/source/wpsimp/msworks_genericfilter.cxx
index a736bff..8b37d45 100644
--- a/writerperfect/source/wpsimp/msworks_genericfilter.cxx
+++ b/writerperfect/source/wpsimp/msworks_genericfilter.cxx
@@ -41,40 +41,11 @@ using namespace ::com::sun::star::registry;
extern "C"
{
-//==================================================================================================
void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-//==================================================================================================
-sal_Bool SAL_CALL component_writeInfo(
- void * /* pServiceManager */, void * pRegistryKey )
-{
- if (pRegistryKey)
- {
- try
- {
- sal_Int32 nPos = 0;
- Reference< XRegistryKey > xNewKey(
- reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( MSWorksImportFilter_getImplementationName() ) );
- xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
-
- const Sequence< OUString > & rSNL = MSWorksImportFilter_getSupportedServiceNames();
- const OUString * pArray = rSNL.getConstArray();
- for ( nPos = rSNL.getLength(); nPos--; )
- xNewKey->createKey( pArray[nPos] );
-
- return sal_True;
- }
- catch (InvalidRegistryException &)
- {
- OSL_FAIL( "### InvalidRegistryException!" );
- }
- }
- return sal_False;
-}
-//==================================================================================================
void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
{
diff --git a/writerperfect/util/makefile.mk b/writerperfect/util/makefile.mk
index c202bf3..d5d296d 100644
--- a/writerperfect/util/makefile.mk
+++ b/writerperfect/util/makefile.mk
@@ -120,10 +120,22 @@ DEF3NAME = $(SHL3TARGET)
.INCLUDE : target.mk
-ALLTAR : $(MISC)/wpft.component
+ALLTAR : $(MISC)/wpft.component $(MISC)/wpgfilter.component $(MISC)/msworksfilter.component
$(MISC)/wpft.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
wpft.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt wpft.component
+
+$(MISC)/wpgfilter.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ wpgfilter.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL3TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt wpgfilter.component
+
+$(MISC)/msworksfilter.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ msworksfilter.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt msworksfilter.component
diff --git a/writerperfect/util/msworksfilter.component b/writerperfect/util/msworksfilter.component
new file mode 100644
index 0000000..769eaf3
--- /dev/null
+++ b/writerperfect/util/msworksfilter.component
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.Writer.MSWorksImportFilter">
+ <service name="com.sun.star.document.ImportFilter"/>
+ <service name="com.sun.star.document.ExtendedTypeDetection"/>
+ </implementation>
+</component>
diff --git a/writerperfect/util/wpgfilter.component b/writerperfect/util/wpgfilter.component
new file mode 100644
index 0000000..f571959
--- /dev/null
+++ b/writerperfect/util/wpgfilter.component
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.Draw.WPGImportFilter">
+ <service name="com.sun.star.document.ImportFilter"/>
+ <service name="com.sun.star.document.ExtendedTypeDetection"/>
+ </implementation>
+</component>
commit c1e39ca4de615b4ef4152748d1c90a45eeb2cc92
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Apr 1 22:31:53 2011 +0100
register lotuswordpro filter component
diff --git a/lotuswordpro/prj/d.lst b/lotuswordpro/prj/d.lst
index 48efbc1..1346575 100644
--- a/lotuswordpro/prj/d.lst
+++ b/lotuswordpro/prj/d.lst
@@ -1,3 +1,4 @@
..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so
..\%__SRC%\bin\*.dll %_DEST%\lib%_EXT%\*.dll
..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
+..\%__SRC%\misc\*.component %_DEST%\xml%_EXT%\*.component
diff --git a/lotuswordpro/source/filter/genericfilter.cxx b/lotuswordpro/source/filter/genericfilter.cxx
index 7bec7a6..0594500 100644
--- a/lotuswordpro/source/filter/genericfilter.cxx
+++ b/lotuswordpro/source/filter/genericfilter.cxx
@@ -19,40 +19,11 @@ using namespace ::com::sun::star::registry;
extern "C"
{
-//==================================================================================================
void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-//==================================================================================================
-sal_Bool SAL_CALL component_writeInfo(
- void * /*pServiceManager*/, void * pRegistryKey )
-{
- if (pRegistryKey)
- {
- try
- {
- sal_Int32 nPos = 0;
- Reference< XRegistryKey > xNewKey(
- reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( LotusWordProImportFilter_getImplementationName() ) );
- xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
-
- const Sequence< OUString > & rSNL = LotusWordProImportFilter_getSupportedServiceNames();
- const OUString * pArray = rSNL.getConstArray();
- for ( nPos = rSNL.getLength(); nPos--; )
- xNewKey->createKey( pArray[nPos] );
-
- return sal_True;
- }
- catch (InvalidRegistryException &)
- {
- OSL_FAIL( "### InvalidRegistryException!" );
- }
- }
- return sal_False;
-}
-//==================================================================================================
void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
diff --git a/lotuswordpro/util/lwpfilter.component b/lotuswordpro/util/lwpfilter.component
new file mode 100644
index 0000000..030c759
--- /dev/null
+++ b/lotuswordpro/util/lwpfilter.component
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.Writer.LotusWordProImportFilter">
+ <service name="com.sun.star.document.ImportFilter"/>
+ <service name="com.sun.star.document.ExtendedTypeDetection"/>
+ </implementation>
+</component>
diff --git a/lotuswordpro/util/makefile.mk b/lotuswordpro/util/makefile.mk
index 7b34a03..640ba29 100644
--- a/lotuswordpro/util/makefile.mk
+++ b/lotuswordpro/util/makefile.mk
@@ -35,3 +35,11 @@ SHL1VERSIONMAP=$(TARGET).map
DEF1NAME=$(SHL1TARGET)
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/lwpfilter.component
+
+$(MISC)/lwpfilter.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ lwpfilter.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt lwpfilter.component
More information about the Libreoffice-commits
mailing list