summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2000-12-13 10:16:37 +0000
committerMathias Bauer <mba@openoffice.org>2000-12-13 10:16:37 +0000
commit6b13b9a9a01c15858b9b2fca4f7d601ad5526aad (patch)
tree01e4c1bfb7d818f872f6e0b74bd61698a60d9f44 /svtools
parent166e73ea986ef55b6043bac2fd7d4e7eddb6d062 (diff)
#81872#: move SpecialConfigManager to svl
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/uno/makefile.mk15
-rw-r--r--svtools/source/uno/registerservices.cxx33
2 files changed, 15 insertions, 33 deletions
diff --git a/svtools/source/uno/makefile.mk b/svtools/source/uno/makefile.mk
index 0164a6986353..cb5158ad43cb 100644
--- a/svtools/source/uno/makefile.mk
+++ b/svtools/source/uno/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.3 $
+# $Revision: 1.4 $
#
-# last change: $Author: fs $ $Date: 2000-11-24 12:36:52 $
+# last change: $Author: mba $ $Date: 2000-12-13 11:16:37 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -240,6 +240,7 @@ SLOFILES= \
$(SLO)$/addrtempuno.obj \
$(SLO)$/genericunodialog.obj \
$(SLO)$/registerservices.obj \
+ $(SLO)$/registerlight.obj \
$(SLO)$/unoifac3.obj \
$(SLO)$/unoifac2.obj \
$(SLO)$/unoiface.obj \
@@ -253,7 +254,15 @@ SLOFILES+=$(SLO)$/staticmbuno.obj
.ENDIF
LIB1TARGET= $(SLB)$/$(TARGET).lib
-LIB1OBJFILES= $(SLOFILES)
+LIB1OBJFILES= \
+ $(SLO)$/addrtempuno.obj \
+ $(SLO)$/genericunodialog.obj \
+ $(SLO)$/registerservices.obj \
+ $(SLO)$/unoifac3.obj \
+ $(SLO)$/unoifac2.obj \
+ $(SLO)$/unoiface.obj \
+ $(SLO)$/imgprod.obj
+
.ENDIF
diff --git a/svtools/source/uno/registerservices.cxx b/svtools/source/uno/registerservices.cxx
index 8177b639c392..abecb4074e77 100644
--- a/svtools/source/uno/registerservices.cxx
+++ b/svtools/source/uno/registerservices.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: registerservices.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: fs $ $Date: 2000-11-24 12:37:19 $
+ * last change: $Author: mba $ $Date: 2000-12-13 11:16:04 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -81,8 +81,6 @@
#include <unoifac3.hxx>
#include <unoiface.hxx>
-#include <pathoptions.hxx>
-
#include <toolkit/helper/macros.hxx>
#define IMPL_CREATEINSTANCE( ImplName ) \
@@ -100,7 +98,6 @@
}
// -------------------------------------------------------------------------------------
-IMPL_CREATEINSTANCE( PathService )
IMPL_CREATEINSTANCE( SvtTextLoader )
IMPL_CREATEINSTANCE( ExtVCLXToolkit )
DECLARE_CREATEINSTANCE( SvNumberFormatsSupplierServiceObject )
@@ -137,26 +134,8 @@ sal_Bool SAL_CALL component_writeInfo( void* _pServiceManager, void* _pRegistryK
xNewKey = pRegistryKey->createKey( ::rtl::OUString::createFromAscii( "/org.openoffice.comp.svt.OAddressBookSourceDialogUno/UNO/SERVICES" ) );
xNewKey->createKey( ::rtl::OUString::createFromAscii( "com.sun.star.ui.AddressBookSourceDialog" ) );
-
- xNewKey = pRegistryKey->createKey( ::rtl::OUString::createFromAscii( "/com.sun.star.comp.svtools.PathService/UNO/SERVICES" ) );
- xNewKey->createKey( ::rtl::OUString::createFromAscii( "com.sun.star.config.SpecialConfigManager" ) );
-
-// !!!
-/*
- ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > xKey;
- uno2smart(xKey, *xUnoKey);
-
- ::rtl::OUString aImpl( L"/" );
- aImpl += SvUnoAttributeContainer::getStaticImplementationName();
- aImpl += L"/UNO/SERVICES";
- ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > xNewKey = xKey->createKey( aImpl );
- ::com::sun::star::uno::Sequence <::rtl::OUString> aSequ = SvUnoAttributeContainer::getStaticSupportedServiceNames();
- const ::rtl::OUString* pArray = aSequ.getConstArray();
- for( sal_Int32 i = 0; i < aSequ.getLength(); i++ )
- xNewKey->createKey( pArray[i] );
-*/
-
}
+
return sal_True;
}
@@ -194,12 +173,6 @@ void* SAL_CALL component_getFactory( const sal_Char* sImplementationName, void*
aServiceNames.getArray()[0] = ::rtl::OUString::createFromAscii( "com.sun.star.ui.AddressBookSourceDialog" );
xFactory = ::cppu::createSingleFactory( pServiceManager, ::rtl::OUString::createFromAscii( sImplementationName ), svt::OAddressBookSourceDialogUno_CreateInstance, aServiceNames );
}
- else if ( rtl_str_compare( sImplementationName, "com.sun.star.comp.svtools.PathService" ) == 0 )
- {
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aServiceNames(1);
- aServiceNames.getArray()[0] = ::rtl::OUString::createFromAscii( "com.sun.star.config.SpecialConfigManager" );
- xFactory = ::cppu::createSingleFactory( pServiceManager, ::rtl::OUString::createFromAscii( sImplementationName ), PathService_CreateInstance, aServiceNames );
- }
if ( xFactory.is() )
{