diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-09-29 17:27:46 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-10-25 13:41:49 +0100 |
| commit | 987651a7fc5908fe39046e215bd7ffa2e43049df (patch) | |
| tree | 26d1a36b329fa0c277a33d1f4fef1c687232591a /vcl/headless | |
| parent | d6a013d804cc2cd75991ac680eb7b9cce98126e3 (diff) | |
misc cross-platform dependency / build issue redux
Diffstat (limited to 'vcl/headless')
| -rw-r--r-- | vcl/headless/svpdummies.cxx | 17 | ||||
| -rw-r--r-- | vcl/headless/svpframe.cxx | 13 | ||||
| -rw-r--r-- | vcl/headless/svpgdi.cxx | 2 | ||||
| -rw-r--r-- | vcl/headless/svpprn.cxx | 4 |
4 files changed, 12 insertions, 24 deletions
diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx index 272f06c7030a..32646b81276e 100644 --- a/vcl/headless/svpdummies.cxx +++ b/vcl/headless/svpdummies.cxx @@ -26,24 +26,17 @@ * ************************************************************************/ +#include <string.h> +#include <rtl/ustrbuf.hxx> #include "headless/svpdummies.hxx" #include "headless/svpinst.hxx" -#include <rtl/ustrbuf.hxx> // SalObject SvpSalObject::SvpSalObject() { - m_aSystemChildData.nSize = sizeof( SystemChildData ); - m_aSystemChildData.pDisplay = NULL; - m_aSystemChildData.aWindow = 0; - m_aSystemChildData.pSalFrame = 0; - m_aSystemChildData.pWidget = 0; - m_aSystemChildData.pVisual = 0; - m_aSystemChildData.nDepth = 0; - m_aSystemChildData.aColormap = 0; - m_aSystemChildData.pAppContext = NULL; - m_aSystemChildData.aShellWindow = 0; - m_aSystemChildData.pShellWidget = NULL; + // fast and easy cross-platform wiping of the data + memset( (void *)&m_aSystemChildData, 0, sizeof( SystemChildData ) ); + m_aSystemChildData.nSize = sizeof( SystemChildData ); } SvpSalObject::~SvpSalObject() diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx index 8ff0e5ecf377..864dd2ccee60 100644 --- a/vcl/headless/svpframe.cxx +++ b/vcl/headless/svpframe.cxx @@ -26,6 +26,7 @@ * ************************************************************************/ +#include <string.h> #include "headless/svpframe.hxx" #include "headless/svpinst.hxx" #include "headless/svpgdi.hxx" @@ -51,17 +52,13 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance, m_nMaxWidth( 0 ), m_nMaxHeight( 0 ) { + // fast and easy cross-platform wiping of the data + memset( (void *)&m_aSystemChildData, 0, sizeof( SystemChildData ) ); m_aSystemChildData.nSize = sizeof( SystemChildData ); - m_aSystemChildData.pDisplay = NULL; - m_aSystemChildData.aWindow = 0; +#if defined( UNX ) // FIXME: prolly redundant m_aSystemChildData.pSalFrame = this; - m_aSystemChildData.pWidget = NULL; - m_aSystemChildData.pVisual = NULL; m_aSystemChildData.nDepth = 24; - m_aSystemChildData.aColormap = 0; - m_aSystemChildData.pAppContext = NULL; - m_aSystemChildData.aShellWindow = 0; - m_aSystemChildData.pShellWidget = NULL; +#endif if( m_pParent ) m_pParent->m_aChildren.push_back( this ); diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index c415774d1bb5..8912acc4b878 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -228,7 +228,9 @@ SvpSalGraphics::ClipUndoHandle SvpSalGraphics::ensureClipFor( const basegfx::B2I if( nHit == 0 ) { // degenerate case - we're all clipped ... hmm. +#if defined( UNX ) fprintf (stderr, "FIXME: denegerate case detected ...\n"); +#endif } else if( nHit == 1 ) { diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx index 452f8ab2f940..ded175afea94 100644 --- a/vcl/headless/svpprn.cxx +++ b/vcl/headless/svpprn.cxx @@ -29,10 +29,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <unistd.h> -#include <sys/stat.h> -#include <sys/wait.h> - #include "vcl/svapp.hxx" #include "vcl/timer.hxx" #include "vcl/printerinfomanager.hxx" |