diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-07-17 13:18:41 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-07-17 13:18:41 +0000 |
| commit | 431520418e4219957d1ad26ba50cf7e5b0c83bcd (patch) | |
| tree | 7ee26e82395fde8bbe9f1633a6722245cf7f0680 /canvas/inc | |
| parent | b2eb0891bc5411e68f47c2e606f3bf728b209c93 (diff) | |
INTEGRATION: CWS presfixes12 (1.5.18); FILE MERGED
2007/06/14 16:16:53 thb 1.5.18.1: #i58343# Removing NULL as the placeholder for empty setter method, in favor of overloading constructor and function operator - (void*) is simply not a function ptr for x86-64
Diffstat (limited to 'canvas/inc')
| -rw-r--r-- | canvas/inc/canvas/base/graphicdevicebase.hxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/canvas/inc/canvas/base/graphicdevicebase.hxx b/canvas/inc/canvas/base/graphicdevicebase.hxx index 99995557bd08..ae6e1f9d3b34 100644 --- a/canvas/inc/canvas/base/graphicdevicebase.hxx +++ b/canvas/inc/canvas/base/graphicdevicebase.hxx @@ -4,9 +4,9 @@ * * $RCSfile: graphicdevicebase.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: kz $ $Date: 2006-12-13 14:36:17 $ + * last change: $Author: obo $ $Date: 2007-07-17 14:18:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -157,12 +157,10 @@ namespace canvas maPropHelper.initProperties( PropertySetHelper::MakeMap ("DeviceHandle", boost::bind(&DeviceHelper::getDeviceHandle, - boost::ref(maDeviceHelper)), - NULL) + boost::ref(maDeviceHelper))) ("SurfaceHandle", boost::bind(&DeviceHelper::getSurfaceHandle, - boost::ref(maDeviceHelper)), - NULL) + boost::ref(maDeviceHelper))) ("DumpScreenContent", boost::bind(&ThisType::getDumpScreenContent, this), |