Index: inc/toolkit/awt/vclxprinter.hxx
===================================================================
RCS file: /cvs/gsl/toolkit/inc/toolkit/awt/vclxprinter.hxx,v
retrieving revision 1.5
diff -b -w -U 3 -r1.5 vclxprinter.hxx
--- inc/toolkit/awt/vclxprinter.hxx	11 Apr 2008 08:47:32 -0000	1.5
+++ inc/toolkit/awt/vclxprinter.hxx	21 Aug 2008 18:36:31 -0000
@@ -37,10 +37,14 @@
 #include <com/sun/star/awt/XPrinterServer.hpp>
 #include <com/sun/star/awt/XInfoPrinter.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase2.hxx>
 #include <osl/mutex.hxx>

+#include <toolkit/helper/macros.hxx>
 #include <toolkit/helper/mutexandbroadcasthelper.hxx>
+#include <toolkit/helper/servicenames.hxx>
 #include <cppuhelper/propshlp.hxx>

 class Printer;
@@ -203,12 +207,14 @@
 //	----------------------------------------------------
 //	class VCLXPrinterServer
 //	----------------------------------------------------
-
-class VCLXPrinterServer :	public ::com::sun::star::awt::XPrinterServer,
-							public	::cppu::OWeakObject
+typedef ::cppu::WeakImplHelper2<
+                                   ::com::sun::star::awt::XPrinterServer,
+                                   ::com::sun::star::lang::XServiceInfo
+                               >   TVCLXPrinterServer_Base;
+class VCLXPrinterServer :	public TVCLXPrinterServer_Base
 {
 public:
-
+/*
 	// ::com::sun::star::uno::XInterface
     ::com::sun::star::uno::Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
 	void										SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
@@ -217,11 +223,14 @@
     // ::com::sun::star::lang::XTypeProvider
 	::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
 	::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
-
+*/
 	// ::com::sun::star::awt::XPrinterServer
     ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getPrinterNames(  ) throw(::com::sun::star::uno::RuntimeException);
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPrinter > SAL_CALL createPrinter( const ::rtl::OUString& printerName ) throw(::com::sun::star::uno::RuntimeException);
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XInfoPrinter > SAL_CALL createInfoPrinter( const ::rtl::OUString& printerName ) throw(::com::sun::star::uno::RuntimeException);
+
+    DECLIMPL_SERVICEINFO( VCLXPrinterServer, szServiceName2_PrinterServer )
+
 };


Index: source/awt/vclxprinter.cxx
===================================================================
RCS file: /cvs/gsl/toolkit/source/awt/vclxprinter.cxx,v
retrieving revision 1.10
diff -b -w -U 3 -r1.10 vclxprinter.cxx
--- source/awt/vclxprinter.cxx	11 Apr 2008 09:19:01 -0000	1.10
+++ source/awt/vclxprinter.cxx	21 Aug 2008 18:36:34 -0000
@@ -414,6 +414,7 @@
 //	class VCLXPrinterServer
 //	----------------------------------------------------

+/*
 // ::com::sun::star::uno::XInterface
 ::com::sun::star::uno::Any VCLXPrinterServer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
@@ -426,6 +427,7 @@
 IMPL_XTYPEPROVIDER_START( VCLXPrinterServer )
 	getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPrinterServer>* ) NULL )
 IMPL_XTYPEPROVIDER_END
+*/

 // ::com::sun::star::awt::XPrinterServer
 ::com::sun::star::uno::Sequence< ::rtl::OUString > VCLXPrinterServer::getPrinterNames(  ) throw(::com::sun::star::uno::RuntimeException)