INTEGRATION: CWS presfixes09 (1.2.32); FILE MERGED

2006/10/20 11:40:26 thb 1.2.32.4: #i10000# Removed post-merge compiler warnings; removed spurious semicolon after macro
2006/04/25 12:53:44 thb 1.2.32.3: #i63943# Handling probe construction special
2006/03/08 17:59:54 thb 1.2.32.2: #i49357# Now also providing the C lib entry points again
2006/03/06 22:49:00 thb 1.2.32.1: #i49357# Reworked canvas/window association (canvas is now window-listener, and exposes the associated window via a property)

1 files changed, 16 insertions, 23 deletions

diff --git a/canvas/source/null/null_spritecanvas.hxx b/canvas/source/null/null_spritecanvas.hxx
index ab602a2bd7f7..04ceec7737f4 100644
--- a/canvas/source/null/null_spritecanvas.hxx
+++ b/canvas/source/null/null_spritecanvas.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: null_spritecanvas.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: kz $ $Date: 2005-11-02 12:49:55 $
+ *  last change: $Author: kz $ $Date: 2006-12-13 14:45:40 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -40,10 +40,8 @@
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/awt/XWindowListener.hpp>
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
@@ -51,7 +49,7 @@
 #include <com/sun/star/rendering/XColorSpace.hpp>
 #include <com/sun/star/rendering/XParametricPolyPolygon2DFactory.hpp>
 
-#include <cppuhelper/compbase11.hxx>
+#include <cppuhelper/compbase9.hxx>
 #include <comphelper/uno3.hxx>
 
 #include <canvas/base/spritecanvasbase.hxx>
@@ -65,16 +63,14 @@
 
 namespace nullcanvas
 {
-    typedef ::cppu::WeakComponentImplHelper11< ::com::sun::star::rendering::XSpriteCanvas,
+    typedef ::cppu::WeakComponentImplHelper9<  ::com::sun::star::rendering::XSpriteCanvas,
                                                 ::com::sun::star::rendering::XIntegerBitmap,
                                                 ::com::sun::star::rendering::XGraphicDevice,
                                                ::com::sun::star::rendering::XParametricPolyPolygon2DFactory,
                                                ::com::sun::star::rendering::XBufferController,
                                                ::com::sun::star::rendering::XColorSpace,
-                                               ::com::sun::star::awt::XWindow,
+                                               ::com::sun::star::awt::XWindowListener,
                                                ::com::sun::star::beans::XPropertySet,
-                                                ::com::sun::star::lang::XInitialization,
-                                                    ::com::sun::star::lang::XServiceInfo,
                                                ::com::sun::star::lang::XServiceName >   WindowGraphicDeviceBase_Base;
     typedef ::canvas::WindowGraphicDeviceBase< ::canvas::BaseMutexHelper< WindowGraphicDeviceBase_Base >,
                                                DeviceHelper,
@@ -120,8 +116,16 @@ namespace nullcanvas
                          private UsageCounter< SpriteCanvas >
     {
     public:
-        SpriteCanvas( const ::com::sun::star::uno::Reference<
-                          ::com::sun::star::uno::XComponentContext >& rxContext );
+        SpriteCanvas( const ::com::sun::star::uno::Sequence<
+                            ::com::sun::star::uno::Any >&               aArguments,
+                      const ::com::sun::star::uno::Reference<
+                            ::com::sun::star::uno::XComponentContext >& rxContext );
+
+        void initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments );
+
+#if defined __SUNPRO_CC
+        using SpriteCanvasBaseT::disposing;
+#endif
 
         /// Dispose all internal references
         virtual void SAL_CALL disposing();
@@ -140,20 +144,9 @@ namespace nullcanvas
         // XSpriteCanvas (partial)
         virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException);
 
-        // XInitialization
-        virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw( ::com::sun::star::uno::Exception,
-                                                                                                                                   ::com::sun::star::uno::RuntimeException);
-        // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
-        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException );
-
         // XServiceName
         virtual ::rtl::OUString SAL_CALL getServiceName(  ) throw (::com::sun::star::uno::RuntimeException);
 
-        // component factory
-        static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) throw ( ::com::sun::star::uno::Exception );
-
      private:
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxComponentContext;
     };