ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

sb129: #i113189# change UNO components to use passive registration

Browse Source
This commit is contained in:
sb
2010-09-10 13:10:07 +02:00
parent ec38ffb432
commit 5dbc43ead1
152 changed files with 2189 additions and 1302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UnoControls/prj/d.lst
+1
View File
@@ -3,3 +3,4 @@
..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
..\%__SRC%\misc\ctl.component %_DEST%\xml%_EXT%\ctl.component
UnoControls/source/base/registercontrols.cxx
-100
View File
@@ -92,59 +92,6 @@ using namespace ::com::sun::star::registry ;
return Reference< XInterface >( *(OWeakObject*)(new CLASS( rServiceManager )) ); \
}
//******************************************************************************************************************************
#define COMPONENT_INFO(CLASS) \
\
AS_DBG_OUT ( "\tCOMPONENT_INFO():\t[start]\n" ) \
try \
{ \
/* Set default result of follow operations !!! */ \
bReturn = sal_False ; \
\
/* Do the follow only, if given key is valid ! */ \
if ( xKey.is () ) \
{ \
AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txkey is valid ...\n" ) \
/* Build new keyname */ \
sKeyName = OUString::createFromAscii( "/" ) ; \
sKeyName += CLASS::impl_getStaticImplementationName() ; \
sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ); \
\
/* Create new key with new name. */ \
xNewKey = xKey->createKey( sKeyName ); \
\
/* If this new key valid ... */ \
if ( xNewKey.is () ) \
{ \
AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txNewkey is valid ...\n" ) \
/* Get information about supported services. */ \
seqServiceNames = CLASS::impl_getStaticSupportedServiceNames() ; \
pArray = seqServiceNames.getArray() ; \
nLength = seqServiceNames.getLength() ; \
nCounter = 0 ; \
\
AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\tloop ..." ) \
/* Then set this information on this key. */ \
for ( nCounter = 0; nCounter < nLength; ++nCounter ) \
{ \
xNewKey->createKey( pArray [nCounter] ); \
} \
AS_DBG_OUT ( " OK\n" ) \
\
/* Result of this operations = OK. */ \
bReturn = sal_True ; \
} \
AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\t... leave xNewKey\n" ) \
} \
AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\t... leave xKey\n" ) \
} \
catch( InvalidRegistryException& ) \
{ \
AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\tInvalidRegistryException detected!!!\n" ) \
bReturn = sal_False ; \
} \
AS_DBG_OUT ( "\tCOMPONENT_INFO():\t[end]\n" )
//******************************************************************************************************************************
#define CREATEFACTORY_ONEINSTANCE(CLASS) \
\
@@ -217,53 +164,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_
*ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
}
//______________________________________________________________________________________________________________
// write component info to registry
//______________________________________________________________________________________________________________
extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/ ,
void* pRegistryKey )
{
AS_DBG_OUT ( "component_writeInfo():\t[start]\n" )
// Set default return value for this operation - if it failed.
sal_Bool bReturn = sal_False ;
if ( pRegistryKey != NULL )
{
AS_DBG_OUT ( "component_writeInfo():\t\tpRegistryKey is valid ... enter scope\n" )
// Define variables for following macros!
// bReturn is set automaticly.
Reference< XRegistryKey > xKey( reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ;
Reference< XRegistryKey > xNewKey ;
Sequence< OUString > seqServiceNames ;
const OUString* pArray ;
sal_Int32 nLength ;
sal_Int32 nCounter ;
OUString sKeyName ;
//=============================================================================
// Add new macro line to register new services.
//
// !!! ATTENTION !!!
// Write no ";" at end of line! (see macro)
//=============================================================================
COMPONENT_INFO ( FrameControl )
COMPONENT_INFO ( ProgressBar )
COMPONENT_INFO ( ProgressMonitor )
COMPONENT_INFO ( StatusIndicator )
//=============================================================================
AS_DBG_OUT ( "component_writeInfo():\t\t... leave pRegistryKey scope\n" )
}
AS_DBG_OUT ( "component_writeInfo():\t[end]\n" )
// Return with result of this operation.
return bReturn ;
}
//______________________________________________________________________________________________________________
// create right component factory
//______________________________________________________________________________________________________________
UnoControls/util/ctl.component
+43
View File
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="stardiv.UnoControls.FrameControl">
<service name="com.sun.star.frame.FrameControl"/>
</implementation>
<implementation name="stardiv.UnoControls.ProgressBar">
<service name="com.sun.star.awt.XProgressBar"/>
</implementation>
<implementation name="stardiv.UnoControls.ProgressMonitor">
<service name="com.sun.star.awt.XProgressMonitor"/>
</implementation>
<implementation name="stardiv.UnoControls.StatusIndicator">
<service name="com.sun.star.task.XStatusIndicator"/>
</implementation>
</component>
UnoControls/util/makefile.mk
+8
View File
@@ -59,3 +59,11 @@ SHL1LIBS= $(LIB1TARGET)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
ALLTAR : $(MISC)/ctl.component
$(MISC)/ctl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
ctl.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt ctl.component
accessibility/bridge/org/openoffice/accessibility/AccessBridge.java
-5
View File
@@ -142,11 +142,6 @@ public class AccessBridge {
return xSingleServiceFactory;
}
public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) {
return FactoryHelper.writeRegistryServiceInfo(AccessBridge.class.getName(),
_AccessBridge._serviceName, regKey);
}
static public class _AccessBridge implements XTopWindowListener,
XInitialization, XComponent {
static final String _serviceName = "com.sun.star.accessibility.AccessBridge";
accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge.component
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.Java2"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="org.openoffice.accessibility.AccessBridge">
<service name="com.sun.star.accessibility.AccessBridge"/>
</implementation>
</component>
accessibility/bridge/org/openoffice/accessibility/makefile.mk
+7
View File
@@ -53,3 +53,10 @@ CUSTOMMANIFESTFILE = manifest
.INCLUDE : target.mk
ALLTAR : $(MISC)/java_uno_accessbridge.component
$(MISC)/java_uno_accessbridge.component .ERRREMOVE : \
$(SOLARENV)/bin/createcomponent.xslt java_uno_accessbridge.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt java_uno_accessbridge.component
accessibility/prj/d.lst
+1 -1
View File
@@ -5,4 +5,4 @@
..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
..\%__SRC%\misc\java_uno_accessbridge.component %_DEST%\xml\java_uno_accessbridge.component
basctl/prj/d.lst
+1
View File
@@ -21,3 +21,4 @@ mkdir: %_DEST%\inc%_EXT%\basctl
..\uiconfig\basicide\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE\menubar\*.xml
..\uiconfig\basicide\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE\toolbar\*.xml
..\uiconfig\basicide\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE\statusbar\*.xml
..\%__SRC%\misc\basctl.component %_DEST%\xml%_EXT%\basctl.component
basctl/source/basicide/register.cxx
-22
View File
@@ -52,28 +52,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
*ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
}
SAL_DLLPUBLIC_EXPORT
sal_Bool SAL_CALL component_writeInfo( void* pServiceManager ,
void* pRegistryKey )
{
(void)pServiceManager;
Reference< ::registry::XRegistryKey >
xKey( reinterpret_cast< ::registry::XRegistryKey* >( pRegistryKey ) ) ;
OUString aDelimiter( RTL_CONSTASCII_USTRINGPARAM("/") );
OUString aUnoServices( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") );
sal_Int32 i;
Reference< ::registry::XRegistryKey > xNewKey;
xNewKey = xKey->createKey( aDelimiter + SIDEModel::getImplementationName_Static() + aUnoServices );
Sequence< OUString > aServices = SIDEModel::getSupportedServiceNames_Static();
for(i = 0; i < aServices.getLength(); i++ )
xNewKey->createKey( aServices.getConstArray()[i] );
return sal_True;
}
SAL_DLLPUBLIC_EXPORT
void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
void* pServiceManager,
basctl/util/basctl.component
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.basic.BasicIDE">
<service name="com.sun.star.script.BasicIDE"/>
</implementation>
</component>
basctl/util/basctl.map
-1
View File
@@ -4,7 +4,6 @@ UDK_3_0_0 {
basicide_macro_organizer;
basicide_handle_basic_error;
component_getImplementationEnvironment;
component_writeInfo;
component_getFactory;
local:
*;
basctl/util/makefile.mk
+8
View File
@@ -103,3 +103,11 @@ RESLIB1SRSFILES= $(SRSFILELIST)
.ENDIF # "$(header)" == ""
ALLTAR : $(MISC)/basctl.component
$(MISC)/basctl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
basctl.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt basctl.component
embedserv/prj/d.lst
+1
View File
@@ -1 +1,2 @@
..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
..\%__SRC%\misc\emser.component %_DEST%\xml%_EXT%\emser.component
embedserv/source/embed/register.cxx
+1 -29
View File
@@ -95,34 +95,6 @@ void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServic
return pRet;
}
sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey )
{
if (pRegistryKey)
{
try
{
uno::Reference< registry::XRegistryKey > xKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ) );
uno::Reference< registry::XRegistryKey > xNewKey;
xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
EmbedServer_getImplementationName() +
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
uno::Sequence< ::rtl::OUString > rServices = EmbedServer_getSupportedServiceNames();
for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ )
xNewKey->createKey( rServices.getConstArray()[ind] );
return sal_True;
}
catch (registry::InvalidRegistryException &)
{
OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
}
}
return sal_False;
}
} // extern "C"
// Fix strange warnings about some
@@ -130,4 +102,4 @@ sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegis
// warning C4505: 'xxx' : unreferenced local function has been removed
#if defined(_MSC_VER)
#pragma warning(disable: 4505)
#endif
#endif
embedserv/util/emser.component
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.ole.EmbedServer">
<service name="com.sun.star.document.OleEmbeddedServerRegistration"/>
</implementation>
</component>
embedserv/util/exports.dxp
-1
View File
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
component_writeInfo
component_getFactory
embedserv/util/makefile.mk
+8
View File
@@ -94,3 +94,11 @@ DEF1EXPORTFILE= exports.dxp
.INCLUDE : target.mk
ALLTAR : $(MISC)/emser.component
$(MISC)/emser.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
emser.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt emser.component
extensions/prj/d.lst
+17
View File
@@ -22,6 +22,7 @@ mkdir: %_DEST%\bin%_EXT%\so
..\%__SRC%\bin\npsoplugin_so.dll %_DEST%\bin%_EXT%\so\npsoplugin.dll
..\%__SRC%\bin\x64\so_activex.dll %_DEST%\bin%_EXT%\so_activex_x64.dll
..\%__SRC%\bin\mdibundle.zip %_DEST%\bin%_EXT%\mdibundle.zip
..\%__SRC%\misc\oleautobridge.component %_DEST%\xml%_EXT%\oleautobridge.component
..\source\bibliography\uiconfig\sbibliography\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sbibliography\menubar\*.xml
@@ -39,3 +40,19 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Logging
..\%__SRC%\misc\registry\spool\org\openoffice\Office\Logging\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Logging
..\%__SRC%\bin\*.oxt %_DEST%\pck%_EXT%\*
..\%__SRC%\misc\abp.component %_DEST%\xml%_EXT%\abp.component
..\%__SRC%\misc\bib.component %_DEST%\xml%_EXT%\bib.component
..\%__SRC%\misc\dbp.component %_DEST%\xml%_EXT%\dbp.component
..\%__SRC%\misc\ldapbe2.component %_DEST%\xml%_EXT%\ldapbe2.component
..\%__SRC%\misc\log.component %_DEST%\xml%_EXT%\log.component
..\%__SRC%\misc\oooimprovecore.component %_DEST%\xml%_EXT%\oooimprovecore.component
..\%__SRC%\misc\oooimprovement.component %_DEST%\xml%_EXT%\oooimprovement.component
..\%__SRC%\misc\pcr.component %_DEST%\xml%_EXT%\pcr.component
..\%__SRC%\misc\pl.component %_DEST%\xml%_EXT%\pl.component
..\%__SRC%\misc\preload.component %_DEST%\xml%_EXT%\preload.component
..\%__SRC%\misc\res.component %_DEST%\xml%_EXT%\res.component
..\%__SRC%\misc\scn.component %_DEST%\xml%_EXT%\scn.component
..\%__SRC%\misc\updatefeed.component %_DEST%\xml%_EXT%\updatefeed.component
..\%__SRC%\misc\updchk.component %_DEST%\xml%_EXT%\updchk.component
..\%__SRC%\misc\updchk.uno.component %_DEST%\xml%_EXT%\updchk.uno.component
..\%__SRC%\misc\xmx.component %_DEST%\xml%_EXT%\xmx.component
extensions/source/abpilot/abp.component
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="org.openoffice.comp.abp.OAddressBookSourcePilot">
<service name="com.sun.star.ui.dialogs.AddressBookSourcePilot"/>
</implementation>
</component>
extensions/source/abpilot/abpservices.cxx
-21
View File
@@ -65,27 +65,6 @@ component_getImplementationEnvironment(
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
void* pServiceManager,
void* pRegistryKey
)
{
if (pRegistryKey)
try
{
return ::abp::OModule::writeComponentInfos(
static_cast<XMultiServiceFactory*>(pServiceManager),
static_cast<XRegistryKey*>(pRegistryKey));
}
catch (InvalidRegistryException& )
{
OSL_ASSERT("abp::component_writeInfo: could not create a registry key (InvalidRegistryException) !");
}
return sal_False;
}
//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
extensions/source/abpilot/exports.dxp
-1
View File
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
component_writeInfo
component_getFactory
extensions/source/abpilot/makefile.mk
+8
View File
@@ -104,3 +104,11 @@ DEF1EXPORTFILE= exports.dxp
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
ALLTAR : $(MISC)/abp.component
$(MISC)/abp.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
abp.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt abp.component
extensions/source/bibliography/bib.component
+35
View File
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.extensions.Bibliography">
<service name="com.sun.star.frame.Bibliography"/>
<service name="com.sun.star.frame.FrameLoader"/>
</implementation>
</component>
extensions/source/bibliography/bibload.cxx
-30
View File
@@ -225,36 +225,6 @@ extern "C"
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
sal_Bool SAL_CALL component_writeInfo( void * //pServiceManager
, registry::XRegistryKey * pRegistryKey )
{
try
{
rtl::OUString sKey = rtl::OUString::createFromAscii("/");
sKey += BibliographyLoader::getImplementationName_Static();
//creates the impl key: /com.sun.star.extensions.Bibliography
Reference< registry::XRegistryKey > xImplKey = pRegistryKey->createKey(sKey);
//sKey += rtl::OUString::createFromAscii("/UNO/SERVICES");
Reference< registry::XRegistryKey > xNewKey = xImplKey->createKey( C2U("/UNO/SERVICES") );
Sequence< rtl::OUString > aServices = BibliographyLoader::getSupportedServiceNames_Static();
for( INT32 i = 0; i < aServices.getLength(); i++ )
xNewKey->createKey( aServices.getConstArray()[i]);
xNewKey = xImplKey->createKey( C2U("/UNO/Loader"));
Reference< registry::XRegistryKey > xPatternKey = xImplKey->createKey( C2U("/Loader/Pattern" ));
xPatternKey->setAsciiValue( C2U( ".component:Bibliography/*" ) );
return sal_True;
}
catch (Exception &)
{
return sal_False;
}
}
void * SAL_CALL component_getFactory(
const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * /*pRegistryKey*/ )
{
extensions/source/bibliography/makefile.mk
+8
View File
@@ -89,3 +89,11 @@ DEF1NAME= $(SHL1TARGET)
.INCLUDE : target.mk
ALLTAR : $(MISC)/bib.component
$(MISC)/bib.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
bib.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt bib.component
extensions/source/config/ldap/componentdef.cxx
-7
View File
@@ -62,13 +62,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
}
//------------------------------------------------------------------------------
extern "C" sal_Bool SAL_CALL component_writeInfo(void *aServiceManager,
void *aRegistryKey) {
return cppu::component_writeInfoHelper(
aServiceManager, aRegistryKey, kImplementations_entries);
}
//------------------------------------------------------------------------------
extern "C" void *component_getFactory(const sal_Char *aImplementationName,
void *aServiceManager,
void *aRegistryKey) {
extensions/source/config/ldap/exports.dxp
-1
View File
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
component_writeInfo
component_getFactory
extensions/source/config/ldap/ldapbe2.component
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.configuration.backend.LdapUserProfileBe">
<service name="com.sun.star.configuration.backend.LdapUserProfileBe"/>
</implementation>
</component>
extensions/source/config/ldap/makefile.mk
+8
View File
@@ -95,3 +95,11 @@ DEF1DES=Configuration: LDAP User Profile Backend
.INCLUDE : target.mk
.INCLUDE : $(PRJ)$/util$/target.pmk
ALLTAR : $(MISC)/ldapbe2.component
$(MISC)/ldapbe2.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
ldapbe2.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt ldapbe2.component
extensions/source/dbpilots/dbp.component
+40
View File
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="org.openoffice.comp.dbp.OGridWizard">
<service name="com.sun.star.sdb.GridControlAutoPilot"/>
</implementation>
<implementation name="org.openoffice.comp.dbp.OGroupBoxWizard">
<service name="com.sun.star.sdb.GroupBoxAutoPilot"/>
</implementation>
<implementation name="org.openoffice.comp.dbp.OListComboWizard">
<service name="com.sun.star.sdb.ListComboBoxAutoPilot"/>
</implementation>
</component>
extensions/source/dbpilots/dbpservices.cxx
-21
View File
@@ -69,27 +69,6 @@ component_getImplementationEnvironment(
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
void* pServiceManager,
void* pRegistryKey
)
{
if (pRegistryKey)
try
{
return ::dbp::OModule::writeComponentInfos(
static_cast<XMultiServiceFactory*>(pServiceManager),
static_cast<XRegistryKey*>(pRegistryKey));
}
catch (InvalidRegistryException& )
{
OSL_ASSERT("dbp::component_writeInfo: could not create a registry key (InvalidRegistryException) !");
}
return sal_False;
}
//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
extensions/source/dbpilots/makefile.mk
+8
View File
@@ -101,3 +101,11 @@ DEF1NAME= $(SHL1TARGET)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
ALLTAR : $(MISC)/dbp.component
$(MISC)/dbp.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
dbp.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt dbp.component
extensions/source/inc/componentmodule.cxx
-48
View File
@@ -237,54 +237,6 @@ namespace COMPMOD_NAMESPACE
}
}
//--------------------------------------------------------------------------
sal_Bool OModule::writeComponentInfos(
const Reference< XMultiServiceFactory >& /*_rxServiceManager*/,
const Reference< XRegistryKey >& _rxRootKey)
{
OSL_ENSURE(_rxRootKey.is(), "OModule::writeComponentInfos : invalid argument !");
if (!s_pImplementationNames)
{
OSL_ASSERT("OModule::writeComponentInfos : have no class infos ! Are you sure called this method at the right time ?");
return sal_True;
}
OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
"OModule::writeComponentInfos : inconsistent state (the pointers) !");
OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
&& (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
&& (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
"OModule::writeComponentInfos : inconsistent state !");
sal_Int32 nLen = s_pImplementationNames->getLength();
const ::rtl::OUString* pImplName = s_pImplementationNames->getConstArray();
const Sequence< ::rtl::OUString >* pServices = s_pSupportedServices->getConstArray();
::rtl::OUString sRootKey("/", 1, RTL_TEXTENCODING_ASCII_US);
for (sal_Int32 i=0; i<nLen; ++i, ++pImplName, ++pServices)
{
::rtl::OUString aMainKeyName(sRootKey);
aMainKeyName += *pImplName;
aMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES");
try
{
Reference< XRegistryKey > xNewKey( _rxRootKey->createKey(aMainKeyName) );
const ::rtl::OUString* pService = pServices->getConstArray();
for (sal_Int32 j=0; j<pServices->getLength(); ++j, ++pService)
xNewKey->createKey(*pService);
}
catch(Exception&)
{
OSL_ASSERT("OModule::writeComponentInfos : something went wrong while creating the keys !");
return sal_False;
}
}
return sal_True;
}
//--------------------------------------------------------------------------
Reference< XInterface > OModule::getComponentFactory(
const ::rtl::OUString& _rImplementationName,
extensions/source/inc/componentmodule.hxx
-15
View File
@@ -121,21 +121,6 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
static void revokeComponent(
const ::rtl::OUString& _rImplementationName);
/** write the registration information of all known components
<p>writes the registration information of all components which are currently registered into the
specified registry.<p/>
<p>Usually used from within component_writeInfo.<p/>
@param _rxServiceManager
the service manager
@param _rRootKey
the registry key under which the information will be stored
@return
sal_True if the registration of all implementations was successfull, sal_False otherwise
*/
static sal_Bool writeComponentInfos(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceManager,
const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey >& _rRootKey);
/** creates a Factory for the component with the given implementation name.
<p>Usually used from within component_getFactory.<p/>
@param _rxServiceManager
extensions/source/logging/log.component
+47
View File
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.extensions.ConsoleHandler">
<service name="com.sun.star.logging.ConsoleHandler"/>
</implementation>
<implementation name="com.sun.star.comp.extensions.CsvFormatter">
<service name="com.sun.star.logging.CsvFormatter"/>
</implementation>
<implementation name="com.sun.star.comp.extensions.FileHandler">
<service name="com.sun.star.logging.FileHandler"/>
</implementation>
<implementation name="com.sun.star.comp.extensions.LoggerPool">
<service name="com.sun.star.logging.LoggerPool"/>
<singleton name="com.sun.star.logging.LoggerPool"/>
</implementation>
<implementation name="com.sun.star.comp.extensions.PlainTextFormatter">
<service name="com.sun.star.logging.PlainTextFormatter"/>
</implementation>
</component>
extensions/source/logging/makefile.mk
+8
View File
@@ -74,3 +74,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map
.INCLUDE : target.mk
ALLTAR : $(MISC)/log.component
$(MISC)/log.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
log.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt log.component
extensions/source/ole/makefile.mk
+7
View File
@@ -129,3 +129,10 @@ DEF2EXPORTFILE=$(TARGET).dxp
.INCLUDE : target.mk
ALLTAR : $(MISC)/oleautobridge.component
$(MISC)/oleautobridge.component .ERRREMOVE : \
$(SOLARENV)/bin/createcomponent.xslt oleautobridge.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt oleautobridge.component
extensions/source/ole/oleautobridge.component
+46
View File
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.ole.OleClient">
<service name="com.sun.star.bridge.OleObjectFactory"/>
<service name="com.sun.star.bridge.oleautomation.Factory"/>
</implementation>
<implementation name="com.sun.star.comp.ole.OleConverter2">
<service name="com.sun.star.bridge.OleBridgeSupplier2"/>
<service name="com.sun.star.bridge.oleautomation.BridgeSupplier"/>
</implementation>
<implementation name="com.sun.star.comp.ole.OleConverterVar1">
<service name="com.sun.star.bridge.OleBridgeSupplierVar1"/>
</implementation>
<implementation name="com.sun.star.comp.ole.OleServer">
<service name="com.sun.star.bridge.OleApplicationRegistration"/>
<service name="com.sun.star.bridge.oleautomation.ApplicationRegistration"/>
</implementation>
</component>
extensions/source/ole/oleautobridge.uno.dxp
-1
View File
@@ -1,4 +1,3 @@
component_writeInfo @100
component_getFactory @101
component_getImplementationEnvironment @102
component_canUnload @103
extensions/source/ole/servreg.cxx
-41
View File
@@ -119,47 +119,6 @@ extern "C" void * SAL_CALL component_getFactory(
}
extern "C" sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey )
{
if (pRegistryKey)
{
try
{
//deprecated
Reference<XRegistryKey> xNewKey =
reinterpret_cast<XRegistryKey*>( pRegistryKey)->createKey(reinterpret_cast<const sal_Unicode*>(L"/com.sun.star.comp.ole.OleConverter2/UNO/SERVICES"));
xNewKey->createKey(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.bridge.OleBridgeSupplier2"));
xNewKey->createKey(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.bridge.oleautomation.BridgeSupplier"));
//deprecated
xNewKey =
reinterpret_cast<XRegistryKey*>( pRegistryKey)->createKey(reinterpret_cast<const sal_Unicode*>(L"/com.sun.star.comp.ole.OleConverterVar1/UNO/SERVICES"));
xNewKey->createKey(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.bridge.OleBridgeSupplierVar1"));
//deprecated
xNewKey =
reinterpret_cast<XRegistryKey*>( pRegistryKey)->createKey(reinterpret_cast<const sal_Unicode*>(L"/com.sun.star.comp.ole.OleClient/UNO/SERVICES"));
xNewKey->createKey(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.bridge.OleObjectFactory"));
xNewKey->createKey(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.bridge.oleautomation.Factory"));
//deprecated
xNewKey =
reinterpret_cast<XRegistryKey*>( pRegistryKey)->createKey(reinterpret_cast<const sal_Unicode*>(L"/com.sun.star.comp.ole.OleServer/UNO/SERVICES"));
xNewKey->createKey(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.bridge.OleApplicationRegistration"));
xNewKey->createKey(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.bridge.oleautomation.ApplicationRegistration"));
return sal_True;
}
catch (InvalidRegistryException &)
{
OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
}
}
return sal_False;
}
extern "C" void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
extensions/source/oooimprovecore/makefile.mk
+8
View File
@@ -75,3 +75,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map
.INCLUDE : target.mk
ALLTAR : $(MISC)/oooimprovecore.component
$(MISC)/oooimprovecore.component .ERRREMOVE : \
$(SOLARENV)/bin/createcomponent.xslt oooimprovecore.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt oooimprovecore.component
extensions/source/oooimprovecore/oooimprovecore.component
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.extensions.oooimprovecore.Core">
<service name="com.sun.star.oooimprovement.Core"/>
</implementation>
</component>
extensions/source/oooimprovement/makefile.mk
+8
View File
@@ -102,3 +102,11 @@ $(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-oooimprovement.xcu : $(XCU_SOURCEDIR)$/Jo
$(SPOOLDIR)$/$(PACKAGEDIR)$/Logging$/Logging-oooimprovement.xcu : $(XCU_SOURCEDIR)$/Logging.xcu
@-$(MKDIRHIER) $(@:d)
@$(COPY) $< $@
ALLTAR : $(MISC)/oooimprovement.component
$(MISC)/oooimprovement.component .ERRREMOVE : \
$(SOLARENV)/bin/createcomponent.xslt oooimprovement.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt oooimprovement.component
extensions/source/oooimprovement/oooimprovement.component
+40
View File
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.extensions.oooimprovement.CoreController">
<service name="com.sun.star.oooimprovement.CoreController"/>
</implementation>
<implementation name="com.sun.star.comp.extensions.oooimprovement.InviteJob">
<service name="com.sun.star.task.XAsyncJob"/>
</implementation>
<implementation name="com.sun.star.comp.extensions.oooimprovement.OnLogRotateJob">
<service name="com.sun.star.task.XAsyncJob"/>
</implementation>
</component>
extensions/source/oooimprovement/oooimprovement_exports.cxx
-22
View File
@@ -65,28 +65,6 @@ extern "C"
void SAL_CALL component_getImplementationEnvironment(const sal_Char** env_type_name, uno_Environment**)
{ *env_type_name = CPPU_CURRENT_LANGUAGE_BINDING_NAME; }
sal_Bool SAL_CALL component_writeInfo(void*, void* p_reg_key)
{
if (!p_reg_key) return sal_False;
try
{
Reference<XRegistryKey> reg_key(reinterpret_cast<XRegistryKey*>(p_reg_key), UNO_QUERY);
writeInfo(reg_key,
CoreController::getImplementationName_static(),
CoreController::getSupportedServiceNames_static()[0]);
writeInfo(reg_key,
OnLogRotateJob::getImplementationName_static(),
OnLogRotateJob::getSupportedServiceNames_static()[0]);
writeInfo(reg_key,
InviteJob::getImplementationName_static(),
InviteJob::getSupportedServiceNames_static()[0]);
return sal_True;
}
catch(const InvalidRegistryException&)
{ OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); }
return sal_False;
}
void* SAL_CALL component_getFactory(const sal_Char* pImplName, void* pServiceManager, void*)
{
if ( !pServiceManager || !pImplName ) return 0;
extensions/source/plugin/base/service.cxx
-27
View File
@@ -54,33 +54,6 @@ extern "C" {
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pXUnoKey )
{
if( pXUnoKey )
{
try
{
Reference< ::com::sun::star::registry::XRegistryKey > xKey( reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >( pXUnoKey ) );
::rtl::OUString aImplName = ::rtl::OUString::createFromAscii( "/" );
aImplName += XPluginManager_Impl::getImplementationName_Static();
aImplName += ::rtl::OUString::createFromAscii( "/UNO/SERVICES/com.sun.star.plugin.PluginManager" );
xKey->createKey( aImplName );
aImplName = ::rtl::OUString::createFromAscii( "/" );
aImplName += PluginModel::getImplementationName_Static();
aImplName += ::rtl::OUString::createFromAscii( "/UNO/SERVICES/com.sun.star.plugin.PluginModel" );
xKey->createKey( aImplName );
return sal_True;
}
catch( ::com::sun::star::registry::InvalidRegistryException& )
{
}
}
return sal_False;
}
void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pXUnoSMgr,
extensions/source/plugin/util/makefile.mk
+8
View File
@@ -107,3 +107,11 @@ SHL1STDLIBS+=$(SHL1OWNLIBS)
ALLTAR : $(MISC)/pl.component
$(MISC)/pl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
pl.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt pl.component
extensions/source/plugin/util/pl.component
+37
View File
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.extensions.PluginManager">
<service name="com.sun.star.plugin.PluginManager"/>
</implementation>
<implementation name="com.sun.star.extensions.PluginModel">
<service name="com.sun.star.plugin.PluginModel"/>
</implementation>
</component>
extensions/source/preload/makefile.mk
+8
View File
@@ -83,3 +83,11 @@ DEF1NAME= $(SHL1TARGET)
.INCLUDE : target.mk
ALLTAR : $(MISC)/preload.component
$(MISC)/preload.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
preload.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt preload.component
extensions/source/preload/preload.component
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="org.openoffice.comp.preload.OEMPreloadWizard">
<service name="org.openoffice.comp.preload.OEMPreloadWizard"/>
</implementation>
</component>
extensions/source/preload/services.cxx
-21
View File
@@ -65,27 +65,6 @@ component_getImplementationEnvironment(
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
void* pServiceManager,
void* pRegistryKey
)
{
if (pRegistryKey)
try
{
return ::preload::OModule::writeComponentInfos(
static_cast<XMultiServiceFactory*>(pServiceManager),
static_cast<XRegistryKey*>(pRegistryKey));
}
catch (InvalidRegistryException& )
{
OSL_ASSERT("preload::component_writeInfo: could not create a registry key (InvalidRegistryException) !");
}
return sal_False;
}
//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
extensions/source/propctrlr/makefile.mk
+8
View File
@@ -144,3 +144,11 @@ DEF1NAME= $(SHL1TARGET)
.INCLUDE : target.mk
ALLTAR : $(MISC)/pcr.component
$(MISC)/pcr.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
pcr.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt pcr.component
extensions/source/propctrlr/pcr.component
+91
View File
@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="StringRepresentation">
<service name="com.sun.star.inspection.StringRepresentation"/>
</implementation>
<implementation name="com.sun.star.comp.extensions.ButtonNavigationHandler">
<service name="com.sun.star.form.inspection.ButtonNavigationHandler"/>
</implementation>
<implementation name="com.sun.star.comp.extensions.CellBindingPropertyHandler">
<service name="com.sun.star.form.inspection.CellBindingPropertyHandler"/>
</implementation>
<implementation name="com.sun.star.comp.extensions.EFormsPropertyHandler">
<service name="com.sun.star.form.inspection.XMLFormsPropertyHandler"/>
</implementation>
<implementation name="com.sun.star.comp.extensions.EditPropertyHandler">
<service name="com.sun.star.form.inspection.EditPropertyHandler"/>
</implementation>
<implementation name="com.sun.star.comp.extensions.EventHandler">
<service name="com.sun.star.form.inspection.EventHandler"/>
</implementation>
<implementation name="com.sun.star.comp.extensions.FormComponentPropertyHandler">
<service name="com.sun.star.form.inspection.FormComponentPropertyHandler"/>
</implementation>
<implementation name="com.sun.star.comp.extensions.FormGeometryHandler">
<service name="com.sun.star.form.inspection.FormGeometryHandler"/>
</implementation>
<implementation name="com.sun.star.comp.extensions.GenericPropertyHandler">
<service name="com.sun.star.inspection.GenericPropertyHandler"/>
</implementation>
<implementation name="com.sun.star.comp.extensions.SubmissionPropertyHandler">
<service name="com.sun.star.form.inspection.SubmissionPropertyHandler"/>
</implementation>
<implementation name="com.sun.star.comp.extensions.XSDValidationPropertyHandler">
<service name="com.sun.star.form.inspection.XSDValidationPropertyHandler"/>
</implementation>
<implementation name="org.openoffice.comp.extensions.DefaultFormComponentInspectorModel">
<service name="com.sun.star.form.inspection.DefaultFormComponentInspectorModel"/>
</implementation>
<implementation name="org.openoffice.comp.extensions.DefaultHelpProvider">
<service name="com.sun.star.inspection.DefaultHelpProvider"/>
</implementation>
<implementation name="org.openoffice.comp.extensions.DialogController">
<service name="com.sun.star.awt.PropertyBrowserController"/>
</implementation>
<implementation name="org.openoffice.comp.extensions.FormController">
<service name="com.sun.star.form.PropertyBrowserController"/>
</implementation>
<implementation name="org.openoffice.comp.extensions.ObjectInspector">
<service name="com.sun.star.inspection.ObjectInspector"/>
</implementation>
<implementation name="org.openoffice.comp.extensions.ObjectInspectorModel">
<service name="com.sun.star.inspection.ObjectInspectorModel"/>
</implementation>
<implementation name="org.openoffice.comp.form.ui.MasterDetailLinkDialog">
<service name="com.sun.star.form.MasterDetailLinkDialog"/>
</implementation>
<implementation name="org.openoffice.comp.form.ui.OControlFontDialog">
<service name="com.sun.star.form.ControlFontDialog"/>
</implementation>
<implementation name="org.openoffice.comp.form.ui.OTabOrderDialog">
<service name="com.sun.star.form.ui.TabOrderDialog"/>
</implementation>
</component>
extensions/source/propctrlr/pcrservices.cxx
-21
View File
@@ -103,27 +103,6 @@ component_getImplementationEnvironment(
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
void* pServiceManager,
void* pRegistryKey
)
{
if (pRegistryKey)
try
{
return ::pcr::PcrModule::getInstance().writeComponentInfos(
static_cast<XMultiServiceFactory*>(pServiceManager),
static_cast<XRegistryKey*>(pRegistryKey));
}
catch (InvalidRegistryException& )
{
OSL_ASSERT("pcr::component_writeInfo: could not create a registry key (InvalidRegistryException) !");
}
return sal_False;
}
//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
extensions/source/resource/exports.dxp
-1
View File
@@ -1,3 +1,2 @@
component_writeInfo
component_getImplementationEnvironment
component_getFactory
extensions/source/resource/makefile.mk
+8
View File
@@ -74,3 +74,11 @@ DEF1EXPORTFILE= exports.dxp
.INCLUDE : target.mk
.INCLUDE : $(PRJ)$/util$/target.pmk
ALLTAR : $(MISC)/res.component
$(MISC)/res.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
res.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt res.component
extensions/source/resource/res.component
+38
View File
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.extensions.ResourceService">
<service name="com.sun.star.resource.VclStringResourceLoader"/>
</implementation>
<implementation name="com.sun.star.comp.resource.OpenOfficeResourceLoader">
<service name="com.sun.star.resource.OfficeResourceLoader"/>
<singleton name="com.sun.star.resource.OfficeResourceLoader"/>
</implementation>
</component>
extensions/source/resource/res_services.cxx
-42
View File
@@ -29,12 +29,7 @@
#include "precompiled_extensions.hxx"
#include "res_services.hxx"
/** === begin UNO includes === **/
#include <com/sun/star/registry/XRegistryKey.hpp>
/** === end UNO includes === **/
/** === begin UNO using === **/
using ::com::sun::star::registry::XRegistryKey;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Exception;
@@ -64,43 +59,6 @@ void SAL_CALL component_getImplementationEnvironment(
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, XRegistryKey * pRegistryKey )
{
try
{
::std::vector< ::res::ComponentInfo > aComponentInfos( ::res::getComponentInfos() );
for ( ::std::vector< ::res::ComponentInfo >::const_iterator loop = aComponentInfos.begin();
loop != aComponentInfos.end();
++loop
)
{
Reference< XRegistryKey > xNewKey =
pRegistryKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") )
+ loop->sImplementationName + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ) ) );
for( sal_Int32 i = 0; i < loop->aSupportedServices.getLength(); ++i )
xNewKey->createKey( loop->aSupportedServices.getConstArray()[i]);
if ( loop->sSingletonName.getLength() )
{
OSL_ENSURE( loop->aSupportedServices.getLength() == 1, "singletons must support exactly one service!" );
xNewKey = pRegistryKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") )
+ loop->sImplementationName + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SINGLETONS/" ) )
+ loop->sSingletonName );
xNewKey->setStringValue( loop->aSupportedServices[ 0 ] );
}
}
return sal_True;
}
catch (Exception &)
{
// not allowed to throw an exception over the c function.
//OSL_ENSURE( sal_False, "Exception cannot register component!" );
return sal_False;
}
}
void * SAL_CALL component_getFactory(
const sal_Char * pImplName, XMultiServiceFactory * /*pServiceManager*/, void * /*pRegistryKey*/ )
{
extensions/source/scanner/exports.dxp
-1
View File
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
component_writeInfo
component_getFactory
extensions/source/scanner/makefile.mk
+8
View File
@@ -98,3 +98,11 @@ DEF1EXPORTFILE=exports.dxp
.INCLUDE : target.mk
ALLTAR : $(MISC)/scn.component
$(MISC)/scn.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
scn.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt scn.component
extensions/source/scanner/scn.component
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.scanner.ScannerManager">
<service name="com.sun.star.scanner.ScannerManager"/>
</implementation>
</component>
extensions/source/scanner/scnserv.cxx
-31
View File
@@ -45,37 +45,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char*
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
// -----------------------
// - component_writeInfo -
// -----------------------
extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
{
sal_Bool bRet = sal_False;
if( pRegistryKey )
{
try
{
::rtl::OUString aImplName( '/' );
aImplName += ScannerManager::getImplementationName_Static();
aImplName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES/" ) );
aImplName += ScannerManager::getImplementationName_Static();
REF( XRegistryKey ) xNewKey1( static_cast< XRegistryKey* >( pRegistryKey )->createKey( aImplName ) );
bRet = sal_True;
}
catch( InvalidRegistryException& )
{
OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
}
}
return bRet;
}
// ------------------------
// - component_getFactory -
// ------------------------
extensions/source/svg/svguno.cxx
-30
View File
@@ -60,36 +60,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
// -----------------------
// - component_writeInfo -
// -----------------------
extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
{
sal_Bool bRet = sal_False;
if( pRegistryKey )
{
try
{
REF( NMSP_REGISTRY::XRegistryKey ) xNewKey1(
static_cast< NMSP_REGISTRY::XRegistryKey* >( pRegistryKey )->createKey(
B2UCONST( "/com.sun.star.comp.extensions.SVGWriter/UNO/SERVICES/com.sun.star.svg.SVGWriter" ) ) );
REF( NMSP_REGISTRY::XRegistryKey ) xNewKey2(
static_cast< NMSP_REGISTRY::XRegistryKey* >( pRegistryKey )->createKey(
B2UCONST( "/com.sun.star.comp.extensions.SVGPrinter/UNO/SERVICES/com.sun.star.svg.SVGPrinter" ) ) );
bRet = sal_True;
}
catch( NMSP_REGISTRY::InvalidRegistryException& )
{
OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
}
}
return bRet;
}
// ------------------------
// - component_getFactory -
// ------------------------
extensions/source/update/check/makefile.mk
+8
View File
@@ -132,3 +132,11 @@ $(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-onlineupdate.xcu : $(XCU_SOURCEDIR)$/Jobs
@$(COPY) $< $@
# @$(PERL) transform.pl < $< > $@
ALLTAR : $(MISC)/updchk.uno.component
$(MISC)/updchk.uno.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
updchk.uno.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt updchk.uno.component
extensions/source/update/check/updatecheckjob.cxx
-12
View File
@@ -388,18 +388,6 @@ component_getImplementationEnvironment( const sal_Char **aEnvTypeName, uno_Envir
//------------------------------------------------------------------------------
extern "C" sal_Bool SAL_CALL
component_writeInfo(void *pServiceManager, void *pRegistryKey)
{
return cppu::component_writeInfoHelper(
pServiceManager,
pRegistryKey,
kImplementations_entries
);
}
//------------------------------------------------------------------------------
extern "C" void *
component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
{
extensions/source/update/check/updchk.uno.component
+37
View File
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="vnd.sun.UpdateCheck">
<service name="com.sun.star.setup.UpdateCheck"/>
</implementation>
<implementation name="vnd.sun.UpdateCheckConfig">
<service name="com.sun.star.setup.UpdateCheckConfig"/>
</implementation>
</component>
extensions/source/update/feed/makefile.mk
+8
View File
@@ -62,3 +62,11 @@ DEF1NAME=$(SHL1TARGET)
.INCLUDE : target.mk
ALLTAR : $(MISC)/updatefeed.component
$(MISC)/updatefeed.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
updatefeed.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt updatefeed.component
extensions/source/update/feed/updatefeed.component
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="vnd.sun.UpdateInformationProvider">
<service name="com.sun.star.deployment.UpdateInformationProvider"/>
</implementation>
</component>
extensions/source/update/feed/updatefeed.cxx
-12
View File
@@ -851,18 +851,6 @@ component_getImplementationEnvironment( const sal_Char **aEnvTypeName, uno_Envir
//------------------------------------------------------------------------------
extern "C" sal_Bool SAL_CALL
component_writeInfo(void *pServiceManager, void *pRegistryKey)
{
return cppu::component_writeInfoHelper(
pServiceManager,
pRegistryKey,
kImplementations_entries
);
}
//------------------------------------------------------------------------------
extern "C" void *
component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
{
extensions/source/update/ui/makefile.mk
+8
View File
@@ -72,3 +72,11 @@ DEF1NAME=$(SHL1TARGET)
.INCLUDE : target.mk
ALLTAR : $(MISC)/updchk.component
$(MISC)/updchk.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
updchk.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt updchk.component
extensions/source/update/ui/updatecheckui.cxx
-12
View File
@@ -1059,18 +1059,6 @@ component_getImplementationEnvironment( const sal_Char **aEnvTypeName, uno_Envir
//------------------------------------------------------------------------------
extern "C" sal_Bool SAL_CALL
component_writeInfo(void *pServiceManager, void *pRegistryKey)
{
return cppu::component_writeInfoHelper(
pServiceManager,
pRegistryKey,
kImplementations_entries
);
}
//------------------------------------------------------------------------------
extern "C" void *
component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
{
extensions/source/update/ui/updchk.component
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="vnd.sun.UpdateCheckUI">
<service name="com.sun.star.setup.UpdateCheckUI"/>
</implementation>
</component>
extensions/source/xmlextract/makefile.mk
+8
View File
@@ -63,3 +63,11 @@ SHL1LIBS= $(SLB)$/$(TARGET).lib
# --- Targets ----------------------------------
.INCLUDE : target.mk
ALLTAR : $(MISC)/xmx.component
$(MISC)/xmx.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
xmx.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt xmx.component
extensions/source/xmlextract/xmx.component
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.io.XMLExtractor">
<service name="com.sun.star.io.XMLExtractor"/>
</implementation>
</component>
extensions/source/xmlextract/xmxuno.cxx
-21
View File
@@ -52,27 +52,6 @@ void SAL_CALL component_getImplementationEnvironment(
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//==================================================================================================
sal_Bool SAL_CALL component_writeInfo(
void * /*pServiceManager*/, void * pRegistryKey )
{
if (pRegistryKey)
{
try
{
REF( NMSP_REGISTRY::XRegistryKey ) xNewKey(
reinterpret_cast< NMSP_REGISTRY::XRegistryKey * >( pRegistryKey )->createKey(
NMSP_RTL::OUString( RTL_CONSTASCII_USTRINGPARAM("/com.sun.star.comp.io.XMLExtractor/UNO/SERVICES/com.sun.star.io.XMLExtractor") ) ) );
return sal_True;
}
catch (NMSP_REGISTRY::InvalidRegistryException &)
{
OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
}
}
return sal_False;
}
//==================================================================================================
void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
forms/prj/d.lst
+1
View File
@@ -5,3 +5,4 @@
..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin
..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
..\util\*.xml %_DEST%\xml%_EXT%\*.xml
..\%__SRC%\misc\frm.component %_DEST%\xml%_EXT%\frm.component
forms/source/inc/forms_module.hxx
-15
View File
@@ -101,21 +101,6 @@ namespace FORMS_MODULE_NAMESPACE
static void revokeComponent(
const ::rtl::OUString& _rImplementationName);
/** write the registration information of all known components
<p>writes the registration information of all components which are currently registered into the
specified registry.<p/>
<p>Usually used from within component_writeInfo.<p/>
@param _rxServiceManager
the service manager
@param _rRootKey
the registry key under which the information will be stored
@return
sal_True if the registration of all implementations was successfull, sal_False otherwise
*/
static sal_Bool writeComponentInfos(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceManager,
const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey >& _rRootKey);
/** creates a Factory for the component with the given implementation name.
<p>Usually used from within component_getFactory.<p/>
@param _rxServiceManager
forms/source/inc/forms_module_impl.hxx
-48
View File
@@ -106,54 +106,6 @@ namespace FORMS_MODULE_NAMESPACE
}
}
//--------------------------------------------------------------------------
sal_Bool OFormsModule::writeComponentInfos(
const Reference< XMultiServiceFactory >& /*_rxServiceManager*/,
const Reference< XRegistryKey >& _rxRootKey)
{
OSL_ENSURE(_rxRootKey.is(), "OFormsModule::writeComponentInfos : invalid argument !");
if (!s_pImplementationNames)
{
OSL_ASSERT("OFormsModule::writeComponentInfos : have no class infos ! Are you sure called this method at the right time ?");
return sal_True;
}
OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
"OFormsModule::writeComponentInfos : inconsistent state (the pointers) !");
OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
&& (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
&& (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
"OFormsModule::writeComponentInfos : inconsistent state !");
sal_Int32 nLen = s_pImplementationNames->getLength();
const ::rtl::OUString* pImplName = s_pImplementationNames->getConstArray();
const Sequence< ::rtl::OUString >* pServices = s_pSupportedServices->getConstArray();
::rtl::OUString sRootKey("/", 1, RTL_TEXTENCODING_ASCII_US);
for (sal_Int32 i=0; i<nLen; ++i, ++pImplName, ++pServices)
{
::rtl::OUString aMainKeyName(sRootKey);
aMainKeyName += *pImplName;
aMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES");
try
{
Reference< XRegistryKey > xNewKey( _rxRootKey->createKey(aMainKeyName) );
const ::rtl::OUString* pService = pServices->getConstArray();
for (sal_Int32 j=0; j<pServices->getLength(); ++j, ++pService)
xNewKey->createKey(*pService);
}
catch(Exception&)
{
OSL_ASSERT("OFormsModule::writeComponentInfos : something went wrong while creating the keys !");
return sal_False;
}
}
return sal_True;
}
//--------------------------------------------------------------------------
Reference< XInterface > OFormsModule::getComponentFactory(
const ::rtl::OUString& _rImplementationName,
forms/source/misc/services.cxx
-67
View File
@@ -283,22 +283,6 @@ void ensureClassInfos()
}
//---------------------------------------------------------------------------------------
void registerServiceProvider(const ::rtl::OUString& _rServiceImplName, const Sequence< ::rtl::OUString >& _rServices, XRegistryKey* _pKey)
{
::rtl::OUString sMainKeyName = ::rtl::OUString::createFromAscii("/");
sMainKeyName += _rServiceImplName;
sMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES");
Reference< XRegistryKey > xNewKey = _pKey->createKey(sMainKeyName);
OSL_ENSURE(xNewKey.is(), "forms::registerProvider : could not create a registry key !");
if (!xNewKey.is())
return;
const ::rtl::OUString* pSupportedServices = _rServices.getConstArray();
for (sal_Int32 i=0; i<_rServices.getLength(); ++i, ++pSupportedServices)
xNewKey->createKey(*pSupportedServices);
}
//=======================================================================================
extern "C"
{
@@ -341,57 +325,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const
*_ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//---------------------------------------------------------------------------------------
SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* _pServiceManager, XRegistryKey* _pRegistryKey)
{
if (_pRegistryKey)
{
try
{
// ========================================================================
// the real way - use the OModule
createRegistryInfo_FORMS();
if ( !::frm::OFormsModule::writeComponentInfos(
static_cast<XMultiServiceFactory*>( _pServiceManager ),
static_cast<XRegistryKey*>( _pRegistryKey ) )
)
return sal_False;
// ========================================================================
// a lot of stuff which is implemented "manually" here in this file
// collect the class infos
ensureClassInfos();
// both our static sequences should have the same length ...
sal_Int32 nClasses = s_aClassImplementationNames.getLength();
OSL_ENSURE(s_aClassServiceNames.getLength() == nClasses,
"forms::component_writeInfo : invalid class infos !");
// loop through the sequences and register the service providers
const ::rtl::OUString* pClasses = s_aClassImplementationNames.getConstArray();
const Sequence< ::rtl::OUString >* pServices = s_aClassServiceNames.getConstArray();
for (sal_Int32 i=0; i<nClasses; ++i, ++pClasses, ++pServices)
registerServiceProvider(*pClasses, *pServices, _pRegistryKey);
s_aClassImplementationNames.realloc(0);
s_aClassServiceNames.realloc(0);
s_aFactories.realloc(0);
return sal_True;
}
catch ( InvalidRegistryException& )
{
OSL_ENSURE(sal_False, "forms::component_writeInfo : InvalidRegistryException !");
}
}
s_aClassImplementationNames.realloc(0);
s_aClassServiceNames.realloc(0);
s_aFactories.realloc(0);
return sal_False;
}
//---------------------------------------------------------------------------------------
SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* _pImplName, XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
{
forms/util/frm.component
+259
View File
@@ -0,0 +1,259 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.form.ONavigationBarControl">
<service name="com.sun.star.awt.UnoControl"/>
<service name="com.sun.star.form.control.NavigationToolBar"/>
</implementation>
<implementation name="com.sun.star.comp.form.ONavigationBarModel">
<service name="com.sun.star.awt.UnoControlModel"/>
<service name="com.sun.star.form.FormComponent"/>
<service name="com.sun.star.form.FormControlModel"/>
<service name="com.sun.star.form.component.NavigationToolBar"/>
</implementation>
<implementation name="com.sun.star.comp.form.ORichTextControl">
<service name="com.sun.star.awt.UnoControl"/>
<service name="com.sun.star.awt.UnoControlEdit"/>
<service name="com.sun.star.form.control.RichTextControl"/>
</implementation>
<implementation name="com.sun.star.comp.forms.FormOperations">
<service name="com.sun.star.form.runtime.FormOperations"/>
</implementation>
<implementation name="com.sun.star.comp.forms.ODatabaseForm">
<service name="com.sun.star.form.FormComponent"/>
<service name="com.sun.star.form.FormComponents"/>
<service name="com.sun.star.form.component.DataForm"/>
<service name="com.sun.star.form.component.Form"/>
<service name="com.sun.star.form.component.HTMLForm"/>
<service name="stardiv.one.form.component.Form"/>
</implementation>
<implementation name="com.sun.star.comp.forms.OFilterControl">
<service name="com.sun.star.awt.UnoControl"/>
<service name="com.sun.star.form.control.FilterControl"/>
</implementation>
<implementation name="com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted">
<service name="com.sun.star.form.binding.BindableDatabaseFormattedField"/>
<service name="com.sun.star.form.component.DatabaseFormattedField"/>
<service name="com.sun.star.form.component.FormattedField"/>
<service name="stardiv.one.form.component.FormattedField"/>
</implementation>
<implementation name="com.sun.star.comp.forms.ORichTextModel">
<service name="com.sun.star.form.FormComponent"/>
<service name="com.sun.star.form.FormControlModel"/>
<service name="com.sun.star.form.component.RichTextControl"/>
<service name="com.sun.star.style.CharacterProperties"/>
<service name="com.sun.star.style.CharacterPropertiesAsian"/>
<service name="com.sun.star.style.CharacterPropertiesComplex"/>
<service name="com.sun.star.style.ParagraphProperties"/>
<service name="com.sun.star.style.ParagraphPropertiesComplex"/>
<service name="com.sun.star.text.TextRange"/>
</implementation>
<implementation name="com.sun.star.comp.forms.OScrollBarModel">
<service name="com.sun.star.form.FormComponent"/>
<service name="com.sun.star.form.FormControlModel"/>
<service name="com.sun.star.form.binding.BindableIntegerValueRange"/>
<service name="com.sun.star.form.component.ScrollBar"/>
</implementation>
<implementation name="com.sun.star.comp.forms.OSpinButtonModel">
<service name="com.sun.star.form.FormComponent"/>
<service name="com.sun.star.form.FormControlModel"/>
<service name="com.sun.star.form.binding.BindableIntegerValueRange"/>
<service name="com.sun.star.form.component.SpinButton"/>
</implementation>
<implementation name="com.sun.star.comp.xml.xpath.XFormsExtension">
<service name="com.sun.star.xml.xpath.XPathExtension"/>
</implementation>
<implementation name="com.sun.star.form.ImageProducer">
<service name="com.sun.star.awt.ImageProducer"/>
</implementation>
<implementation name="com.sun.star.form.Model">
<service name="com.sun.star.xforms.Model"/>
</implementation>
<implementation name="com.sun.star.form.OButtonControl">
<service name="com.sun.star.form.control.CommandButton"/>
<service name="stardiv.one.form.control.CommandButton"/>
</implementation>
<implementation name="com.sun.star.form.OButtonModel">
<service name="com.sun.star.form.component.CommandButton"/>
<service name="stardiv.one.form.component.CommandButton"/>
</implementation>
<implementation name="com.sun.star.form.OCheckBoxControl">
<service name="com.sun.star.form.control.CheckBox"/>
<service name="stardiv.one.form.control.CheckBox"/>
</implementation>
<implementation name="com.sun.star.form.OCheckBoxModel">
<service name="com.sun.star.form.binding.BindableDatabaseCheckBox"/>
<service name="com.sun.star.form.component.CheckBox"/>
<service name="com.sun.star.form.component.DatabaseCheckBox"/>
<service name="stardiv.one.form.component.CheckBox"/>
</implementation>
<implementation name="com.sun.star.form.OComboBoxControl">
<service name="com.sun.star.form.control.ComboBox"/>
<service name="stardiv.one.form.control.ComboBox"/>
</implementation>
<implementation name="com.sun.star.form.OComboBoxModel">
<service name="com.sun.star.form.binding.BindableDatabaseComboBox"/>
<service name="com.sun.star.form.component.ComboBox"/>
<service name="com.sun.star.form.component.DatabaseComboBox"/>
<service name="stardiv.one.form.component.ComboBox"/>
</implementation>
<implementation name="com.sun.star.form.OCurrencyControl">
<service name="com.sun.star.form.control.CurrencyField"/>
<service name="stardiv.one.form.control.CurrencyField"/>
</implementation>
<implementation name="com.sun.star.form.OCurrencyModel">
<service name="com.sun.star.form.component.CurrencyField"/>
<service name="com.sun.star.form.component.DatabaseCurrencyField"/>
<service name="stardiv.one.form.component.CurrencyField"/>
</implementation>
<implementation name="com.sun.star.form.ODateControl">
<service name="com.sun.star.form.control.DateField"/>
<service name="stardiv.one.form.control.DateField"/>
</implementation>
<implementation name="com.sun.star.form.ODateModel">
<service name="com.sun.star.form.component.DatabaseDateField"/>
<service name="com.sun.star.form.component.DateField"/>
<service name="stardiv.one.form.component.DateField"/>
</implementation>
<implementation name="com.sun.star.form.OEditControl">
<service name="com.sun.star.form.control.TextField"/>
<service name="stardiv.one.form.control.Edit"/>
<service name="stardiv.one.form.control.TextField"/>
</implementation>
<implementation name="com.sun.star.form.OEditModel">
<service name="com.sun.star.form.binding.BindableDatabaseTextField"/>
<service name="com.sun.star.form.component.DatabaseTextField"/>
<service name="com.sun.star.form.component.TextField"/>
<service name="stardiv.one.form.component.TextField"/>
</implementation>
<implementation name="com.sun.star.form.OFileControlModel">
<service name="com.sun.star.form.component.FileControl"/>
<service name="stardiv.one.form.component.FileControl"/>
</implementation>
<implementation name="com.sun.star.form.OFixedTextModel">
<service name="com.sun.star.form.component.FixedText"/>
<service name="stardiv.one.form.component.FixedText"/>
</implementation>
<implementation name="com.sun.star.form.OFormattedControl">
<service name="com.sun.star.form.control.FormattedField"/>
<service name="stardiv.one.form.control.FormattedField"/>
</implementation>
<implementation name="com.sun.star.form.OFormattedFieldWrapper">
<service name="stardiv.one.form.component.Edit"/>
</implementation>
<implementation name="com.sun.star.form.OFormsCollection">
<service name="com.sun.star.form.Forms"/>
</implementation>
<implementation name="com.sun.star.form.OGridControlModel">
<service name="com.sun.star.form.component.GridControl"/>
<service name="stardiv.one.form.component.Grid"/>
<service name="stardiv.one.form.component.GridControl"/>
</implementation>
<implementation name="com.sun.star.form.OGroupBoxControl">
<service name="com.sun.star.form.control.GroupBox"/>
<service name="stardiv.one.form.control.GroupBox"/>
</implementation>
<implementation name="com.sun.star.form.OGroupBoxModel">
<service name="com.sun.star.form.component.GroupBox"/>
<service name="stardiv.one.form.component.GroupBox"/>
</implementation>
<implementation name="com.sun.star.form.OHiddenModel">
<service name="com.sun.star.form.component.HiddenControl"/>
<service name="stardiv.one.form.component.Hidden"/>
<service name="stardiv.one.form.component.HiddenControl"/>
</implementation>
<implementation name="com.sun.star.form.OImageButtonControl">
<service name="com.sun.star.form.control.ImageButton"/>
<service name="stardiv.one.form.control.ImageButton"/>
</implementation>
<implementation name="com.sun.star.form.OImageButtonModel">
<service name="com.sun.star.form.component.ImageButton"/>
<service name="stardiv.one.form.component.ImageButton"/>
</implementation>
<implementation name="com.sun.star.form.OImageControlControl">
<service name="com.sun.star.form.control.ImageControl"/>
<service name="stardiv.one.form.control.ImageControl"/>
</implementation>
<implementation name="com.sun.star.form.OImageControlModel">
<service name="com.sun.star.form.component.DatabaseImageControl"/>
<service name="stardiv.one.form.component.ImageControl"/>
</implementation>
<implementation name="com.sun.star.form.OListBoxControl">
<service name="com.sun.star.form.control.ListBox"/>
<service name="stardiv.one.form.control.ListBox"/>
</implementation>
<implementation name="com.sun.star.form.OListBoxModel">
<service name="com.sun.star.form.binding.BindableDatabaseListBox"/>
<service name="com.sun.star.form.component.DatabaseListBox"/>
<service name="com.sun.star.form.component.ListBox"/>
<service name="stardiv.one.form.component.ListBox"/>
</implementation>
<implementation name="com.sun.star.form.ONumericControl">
<service name="com.sun.star.form.control.NumericField"/>
<service name="stardiv.one.form.control.NumericField"/>
</implementation>
<implementation name="com.sun.star.form.ONumericModel">
<service name="com.sun.star.form.binding.BindableDatabaseNumericField"/>
<service name="com.sun.star.form.component.DatabaseNumericField"/>
<service name="com.sun.star.form.component.NumericField"/>
<service name="stardiv.one.form.component.NumericField"/>
</implementation>
<implementation name="com.sun.star.form.OPatternControl">
<service name="com.sun.star.form.control.PatternField"/>
<service name="stardiv.one.form.control.PatternField"/>
</implementation>
<implementation name="com.sun.star.form.OPatternModel">
<service name="com.sun.star.form.component.DatabasePatternField"/>
<service name="com.sun.star.form.component.PatternField"/>
<service name="stardiv.one.form.component.PatternField"/>
</implementation>
<implementation name="com.sun.star.form.ORadioButtonControl">
<service name="com.sun.star.form.control.RadioButton"/>
<service name="stardiv.one.form.control.RadioButton"/>
</implementation>
<implementation name="com.sun.star.form.ORadioButtonModel">
<service name="com.sun.star.form.binding.BindableDatabaseRadioButton"/>
<service name="com.sun.star.form.component.DatabaseRadioButton"/>
<service name="com.sun.star.form.component.RadioButton"/>
<service name="stardiv.one.form.component.RadioButton"/>
</implementation>
<implementation name="com.sun.star.form.OTimeControl">
<service name="com.sun.star.form.control.TimeField"/>
<service name="stardiv.one.form.control.TimeField"/>
</implementation>
<implementation name="com.sun.star.form.OTimeModel">
<service name="com.sun.star.form.component.DatabaseTimeField"/>
<service name="com.sun.star.form.component.TimeField"/>
<service name="stardiv.one.form.component.TimeField"/>
</implementation>
<implementation name="com.sun.star.form.XForms">
<service name="com.sun.star.xforms.XForms"/>
</implementation>
</component>
forms/util/frm.dxp
-1
View File
@@ -1,3 +1,2 @@
component_writeInfo
component_getImplementationEnvironment
component_getFactory
forms/util/makefile.mk
+8
View File
@@ -112,3 +112,11 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
@echo NavigationToolBar >>$@
@echo ONavigationBar >>$@
ALLTAR : $(MISC)/frm.component
$(MISC)/frm.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
frm.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt frm.component
lingucomponent/prj/d.lst
+5
View File
@@ -46,3 +46,8 @@ mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice
mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office
..\config\*.xcu %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office\*.xcu
..\%__SRC%\misc\MacOSXSpell.component %_DEST%\xml%_EXT%\MacOSXSpell.component
..\%__SRC%\misc\guesslang.component %_DEST%\xml%_EXT%\guesslang.component
..\%__SRC%\misc\hyphen.component %_DEST%\xml%_EXT%\hyphen.component
..\%__SRC%\misc\lnth.component %_DEST%\xml%_EXT%\lnth.component
..\%__SRC%\misc\spell.component %_DEST%\xml%_EXT%\spell.component
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/exports.dxp
-1
View File
@@ -1,3 +1,2 @@
component_getFactory
component_getImplementationEnvironment
component_writeInfo
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx
-9
View File
@@ -42,9 +42,6 @@ using namespace com::sun::star::registry;
// declaration of external RegEntry-functions defined by the service objects
//
extern sal_Bool SAL_CALL Hyphenator_writeInfo(
void * /*pServiceManager*/, XRegistryKey * pRegistryKey );
extern void * SAL_CALL Hyphenator_getFactory(
const sal_Char * pImplName,
XMultiServiceFactory * pServiceManager,
@@ -57,12 +54,6 @@ extern void * SAL_CALL Hyphenator_getFactory(
extern "C"
{
sal_Bool SAL_CALL component_writeInfo(
void * pServiceManager, XRegistryKey * pRegistryKey )
{
return Hyphenator_writeInfo( pServiceManager, pRegistryKey );
}
void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.component
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="org.openoffice.lingu.LibHnjHyphenator">
<service name="com.sun.star.linguistic2.Hyphenator"/>
</implementation>
</component>
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
-26
View File
@@ -927,32 +927,6 @@ Sequence< OUString > Hyphenator::getSupportedServiceNames_Static()
return aSNS;
}
sal_Bool SAL_CALL Hyphenator_writeInfo(
void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey )
{
try
{
String aImpl( '/' );
aImpl += Hyphenator::getImplementationName_Static().getStr();
aImpl.AppendAscii( "/UNO/SERVICES" );
Reference< registry::XRegistryKey > xNewKey =
pRegistryKey->createKey( aImpl );
Sequence< OUString > aServices =
Hyphenator::getSupportedServiceNames_Static();
for( INT32 i = 0; i < aServices.getLength(); i++ )
xNewKey->createKey( aServices.getConstArray()[i] );
return sal_True;
}
catch(Exception &)
{
return sal_False;
}
}
void * SAL_CALL Hyphenator_getFactory( const sal_Char * pImplName,
XMultiServiceFactory * pServiceManager, void * )
{
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
+8
View File
@@ -91,3 +91,11 @@ DEF1EXPORTFILE= exports.dxp
.INCLUDE : target.mk
ALLTAR : $(MISC)/hyphen.component
$(MISC)/hyphen.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
hyphen.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt hyphen.component
lingucomponent/source/languageguessing/guesslang.component
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.lingu2.LanguageGuessing">
<service name="com.sun.star.linguistic2.LanguageGuessing"/>
</implementation>
</component>
lingucomponent/source/languageguessing/guesslang.cxx
-7
View File
@@ -465,13 +465,6 @@ void SAL_CALL component_getImplementationEnvironment(
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
sal_Bool SAL_CALL component_writeInfo(
XMultiServiceFactory * xMgr, registry::XRegistryKey * xRegistry )
{
return ::cppu::component_writeInfoHelper(
xMgr, xRegistry, s_component_entries );
}
void * SAL_CALL component_getFactory(
sal_Char const * implName, lang::XMultiServiceFactory * xMgr,
registry::XRegistryKey * xRegistry )
lingucomponent/source/languageguessing/makefile.mk
+8
View File
@@ -78,3 +78,11 @@ DEF1NAME =$(SHL1TARGET)
.INCLUDE : target.mk
ALLTAR : $(MISC)/guesslang.component
$(MISC)/guesslang.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
guesslang.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt guesslang.component
lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="org.openoffice.lingu.MacOSXSpellChecker">
<service name="com.sun.star.linguistic2.SpellChecker"/>
</implementation>
</component>
lingucomponent/source/spellcheck/macosxspell/macreg.cxx
-9
View File
@@ -42,9 +42,6 @@ using namespace com::sun::star::registry;
// declaration of external RegEntry-functions defined by the service objects
//
extern sal_Bool SAL_CALL MacSpellChecker_writeInfo(
void * /*pServiceManager*/, XRegistryKey * pRegistryKey );
extern void * SAL_CALL MacSpellChecker_getFactory(
const sal_Char * pImplName,
XMultiServiceFactory * pServiceManager,
@@ -57,12 +54,6 @@ extern void * SAL_CALL MacSpellChecker_getFactory(
extern "C"
{
sal_Bool SAL_CALL component_writeInfo(
void * pServiceManager, XRegistryKey * pRegistryKey )
{
return MacSpellChecker_writeInfo( pServiceManager, pRegistryKey );
}
void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
-26
View File
@@ -644,32 +644,6 @@ Sequence< OUString > MacSpellChecker::getSupportedServiceNames_Static()
return aSNS;
}
sal_Bool SAL_CALL MacSpellChecker_writeInfo(
void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey )
{
try
{
String aImpl( '/' );
aImpl += MacSpellChecker::getImplementationName_Static().getStr();
aImpl.AppendAscii( "/UNO/SERVICES" );
Reference< registry::XRegistryKey > xNewKey =
pRegistryKey->createKey( aImpl );
Sequence< OUString > aServices =
MacSpellChecker::getSupportedServiceNames_Static();
for( INT32 i = 0; i < aServices.getLength(); i++ )
xNewKey->createKey( aServices.getConstArray()[i] );
return sal_True;
}
catch(Exception &)
{
return sal_False;
}
}
void * SAL_CALL MacSpellChecker_getFactory( const sal_Char * pImplName,
XMultiServiceFactory * pServiceManager, void * )
{
lingucomponent/source/spellcheck/macosxspell/makefile.mk
+8
View File
@@ -91,3 +91,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map
dummy:
@echo " Nothing to build for GUIBASE=$(GUIBASE)"
.ENDIF
ALLTAR : $(MISC)/MacOSXSpell.component
$(MISC)/MacOSXSpell.component .ERRREMOVE : \
$(SOLARENV)/bin/createcomponent.xslt MacOSXSpell.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt MacOSXSpell.component
lingucomponent/source/spellcheck/spell/exports.dxp
-1
View File
@@ -1,3 +1,2 @@
component_getFactory
component_getImplementationEnvironment
component_writeInfo
lingucomponent/source/spellcheck/spell/makefile.mk
+8
View File
@@ -85,3 +85,11 @@ DEF1EXPORTFILE= exports.dxp
.INCLUDE : target.mk
ALLTAR : $(MISC)/spell.component
$(MISC)/spell.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
spell.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt spell.component
lingucomponent/source/spellcheck/spell/spell.component
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* 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.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="org.openoffice.lingu.MySpellSpellChecker">
<service name="com.sun.star.linguistic2.SpellChecker"/>
</implementation>
</component>
lingucomponent/source/spellcheck/spell/sreg.cxx
-9
View File
@@ -42,9 +42,6 @@ using namespace com::sun::star::registry;
// declaration of external RegEntry-functions defined by the service objects
//
extern sal_Bool SAL_CALL SpellChecker_writeInfo(
void * /*pServiceManager*/, XRegistryKey * pRegistryKey );
extern void * SAL_CALL SpellChecker_getFactory(
const sal_Char * pImplName,
XMultiServiceFactory * pServiceManager,
@@ -56,12 +53,6 @@ extern void * SAL_CALL SpellChecker_getFactory(
extern "C"
{
sal_Bool SAL_CALL component_writeInfo(
void * pServiceManager, XRegistryKey * pRegistryKey )
{
return SpellChecker_writeInfo( pServiceManager, pRegistryKey );
}
void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{

Some files were not shown because too many files have changed in this diff Show More