#i10000# To please SunCC, had to implement isAccelerated/getDeviceHandle on most derived device helper classes

5 files changed, 30 insertions, 9 deletions

diff --git a/canvas/inc/canvas/base/graphicdevicebase.hxx b/canvas/inc/canvas/base/graphicdevicebase.hxx
index 7d96f92e73b6..d0cd621f65a2 100644
--- a/canvas/inc/canvas/base/graphicdevicebase.hxx
+++ b/canvas/inc/canvas/base/graphicdevicebase.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: graphicdevicebase.hxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -130,14 +130,12 @@ namespace canvas
             mbDumpScreenContent(false)
         {
             maPropHelper.initProperties( PropertySetHelper::MakeMap
-#ifndef __SUNPRO_CC
                                          ("HardwareAcceleration",
                                           boost::bind(&DeviceHelper::isAccelerated,
                                                       boost::ref(maDeviceHelper)))
                                          ("DeviceHandle",
                                           boost::bind(&DeviceHelper::getDeviceHandle,
                                                       boost::ref(maDeviceHelper)))
-#endif
                                          ("SurfaceHandle",
                                           boost::bind(&DeviceHelper::getSurfaceHandle,
                                                       boost::ref(maDeviceHelper)))
@@ -146,8 +144,7 @@ namespace canvas
                                                       this),
                                           boost::bind(&ThisType::setDumpScreenContent,
                                                       this,
-                                                      _1))
-                );
+                                                      _1)));
         }
 
 #if defined __SUNPRO_CC
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx
index e7f3a9542b09..bf9e65e71545 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.cxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: cairo_spritedevicehelper.cxx,v $
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -116,6 +116,16 @@ namespace cairocanvas
         return ::com::sun::star::uno::makeAny(true);
     }
 
+    uno::Any SpriteDeviceHelper::getDeviceHandle() const
+    {
+        return DeviceHelper::getDeviceHandle();
+    }
+
+    uno::Any SpriteDeviceHelper::getSurfaceHandle() const
+    {
+        return DeviceHelper::getSurfaceHandle();
+    }
+
     void SpriteDeviceHelper::setSize( const ::basegfx::B2ISize& rSize )
     {
         OSL_TRACE("SpriteDeviceHelper::setSize(): device size %d x %d", rSize.getX(), rSize.getY() );
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.hxx b/canvas/source/cairo/cairo_spritedevicehelper.hxx
index 7c9baf9a8495..38fd95bfbb82 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.hxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: cairo_spritedevicehelper.hxx,v $
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -70,6 +70,8 @@ namespace cairocanvas
         ::sal_Bool  switchBuffer( bool, ::sal_Bool bUpdateAll );
 
         ::com::sun::star::uno::Any isAccelerated() const;
+        ::com::sun::star::uno::Any getDeviceHandle() const;
+        ::com::sun::star::uno::Any getSurfaceHandle() const;
 
         void notifySizeUpdate( const ::com::sun::star::awt::Rectangle& rBounds );
         void setSize( const ::basegfx::B2ISize& rSize );
diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx
index ea7115b7677c..2446053c2d21 100644
--- a/canvas/source/vcl/spritedevicehelper.cxx
+++ b/canvas/source/vcl/spritedevicehelper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: spritedevicehelper.cxx,v $
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -101,6 +101,16 @@ namespace vclcanvas
         DeviceHelper::disposing();
     }
 
+    uno::Any SpriteDeviceHelper::isAccelerated() const
+    {
+        return DeviceHelper::isAccelerated();
+    }
+
+    uno::Any SpriteDeviceHelper::getDeviceHandle() const
+    {
+        return DeviceHelper::getDeviceHandle();
+    }
+
     uno::Any SpriteDeviceHelper::getSurfaceHandle() const
     {
         if( !mpBackBuffer )
diff --git a/canvas/source/vcl/spritedevicehelper.hxx b/canvas/source/vcl/spritedevicehelper.hxx
index 28ed1a727893..14bdc63a4303 100644
--- a/canvas/source/vcl/spritedevicehelper.hxx
+++ b/canvas/source/vcl/spritedevicehelper.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: spritedevicehelper.hxx,v $
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -67,6 +67,8 @@ namespace vclcanvas
         ::sal_Bool  showBuffer( bool bWindowVisible, ::sal_Bool bUpdateAll );
         ::sal_Bool  switchBuffer( bool bWindowVisible, ::sal_Bool bUpdateAll );
 
+        ::com::sun::star::uno::Any isAccelerated() const;
+        ::com::sun::star::uno::Any getDeviceHandle() const;
         ::com::sun::star::uno::Any getSurfaceHandle() const;
 
         void dumpScreenContent() const;