[Libreoffice-commits] .: Branch 'libreoffice-3-4' - scaddins/source sccomp/source sc/source
Michael Meeks
mmeeks at kemper.freedesktop.org
Fri Apr 1 14:36:09 PDT 2011
sc/source/filter/excel/xestream.cxx | 24 ------------------------
scaddins/source/datefunc/datefunc.cxx | 29 -----------------------------
sccomp/source/solver/solver.cxx | 30 ------------------------------
3 files changed, 83 deletions(-)
New commits:
commit d56eb686eb6c9211f7d9b741b09c1ad5f65698a6
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Apr 1 22:33:12 2011 +0100
remove obsolete component_writeInfo methods
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 49c572a..319dfe1 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -1196,30 +1196,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 */, void* pRegistryKey )
-{
- sal_Bool bRet = false;
-
- if( pRegistryKey )
- {
- try
- {
- Reference< XRegistryKey > xNewKey1(
- static_cast< XRegistryKey* >( pRegistryKey )->createKey(
- OUString(RTL_CONSTASCII_USTRINGPARAM( IMPL_NAME "/UNO/SERVICES/" )) ) );
- xNewKey1->createKey( XlsxExport_getSupportedServiceNames().getConstArray()[0] );
-
- bRet = sal_True;
- }
- catch( InvalidRegistryException& )
- {
- OSL_ENSURE( false, "### InvalidRegistryException!" );
- }
- }
-
- return bRet;
-}
-
// ------------------------
// - component_getFactory -
// ------------------------
diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx
index 0ec01f2..c887c46 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -241,35 +241,6 @@ void SAL_CALL component_getImplementationEnvironment(
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-sal_Bool SAL_CALL component_writeInfo(
- void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey )
-{
- if (pRegistryKey)
- {
- try
- {
- OUString aImpl(RTL_CONSTASCII_USTRINGPARAM( "/" ));
- aImpl += ScaDateAddIn::getImplementationName_Static();
- aImpl += OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
-
- uno::Reference< registry::XRegistryKey > xNewKey(
- reinterpret_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( aImpl ) );
-
- uno::Sequence< OUString > aSequ = ScaDateAddIn::getSupportedServiceNames_Static();
- const OUString * pArray = aSequ.getConstArray();
- for( sal_Int32 i = 0; i < aSequ.getLength(); i++ )
- xNewKey->createKey( pArray[i] );
-
- return sal_True;
- }
- catch (registry::InvalidRegistryException&)
- {
- OSL_FAIL( "### InvalidRegistryException!" );
- }
- }
- return sal_False;
-}
-
void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx
index acf088a..82759b4 100644
--- a/sccomp/source/solver/solver.cxx
+++ b/sccomp/source/solver/solver.cxx
@@ -602,36 +602,6 @@ extern "C"
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
- // -------------------------------------------------------------------------
-
- SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
- {
- if (pRegistryKey)
- {
- try
- {
- uno::Reference<registry::XRegistryKey> xNewKey;
- sal_Int32 nPos;
-
- xNewKey = reinterpret_cast< registry::XRegistryKey * >( pRegistryKey )->createKey( SolverComponent_getImplementationName() );
- xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )) );
- const uno::Sequence< OUString > & rSNL1 = SolverComponent_getSupportedServiceNames();
- const OUString * pArray1 = rSNL1.getConstArray();
- for ( nPos = rSNL1.getLength(); nPos--; )
- xNewKey->createKey( pArray1[nPos] );
-
- return sal_True;
- }
- catch (registry::InvalidRegistryException &)
- {
- OSL_FAIL( "### InvalidRegistryException!" );
- }
- }
- return sal_False;
- }
-
- // -------------------------------------------------------------------------
-
SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
OUString aImplName( OUString::createFromAscii( pImplName ) );
More information about the Libreoffice-commits
mailing list