diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2004-01-06 13:33:45 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2004-01-06 13:33:45 +0000 |
| commit | 787d91f87175d65508112d62d45546e040121f69 (patch) | |
| tree | e64d68c6c8ddf231c8f67c5c9856856c2edbeb40 /vcl | |
| parent | 535215975d16ce5cf50711b48c3fa554a6da659b (diff) | |
INTEGRATION: CWS vclcleanup02 (1.13.8); FILE MERGED
2003/12/18 09:45:30 mt 1.13.8.3: #i23061# header cleanup, remove #ifdef ???_CXX and #define ???_CXX, also removed .impl files and fixed some windows compiler warnings
2003/12/10 15:59:48 mt 1.13.8.2: #i23061# VCL cleanup, removed headers, methods and types...
2003/12/05 13:29:06 mt 1.13.8.1: #i23061# Code cleanups, fixed gcc WAll warnings, removed unused variables and unused code
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/source/app/soicon.cxx | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/vcl/unx/source/app/soicon.cxx b/vcl/unx/source/app/soicon.cxx index 54d0fa22db4e..c49faa455ba1 100644 --- a/vcl/unx/source/app/soicon.cxx +++ b/vcl/unx/source/app/soicon.cxx @@ -2,9 +2,9 @@ * * $RCSfile: soicon.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: rt $ $Date: 2003-11-25 10:42:33 $ + * last change: $Author: vg $ $Date: 2004-01-06 14:33:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,8 +59,6 @@ * ************************************************************************/ -#define _SV_SOICON_CXX - #include <dlfcn.h> #include <stdio.h> #include <string.h> @@ -121,7 +119,7 @@ static void ConvertXpm( SalDisplay* pDisplay, char *xpm[], Pixmap& aPixmap, Pixm int nWidth, nHeight, nColors, nCharsPerPixel; XColor *pColors; char *pColorAlias; - int nElement = 0,nColor = 0,i,nX,nY; + int nElement = 0,nColor = 0,nX,nY; char pColorString[256]; BOOL bTransparent = FALSE; @@ -321,9 +319,7 @@ static void NextLine( SvStream& rFile, ByteString& rLine, BOOL bXpm2Mode ) BOOL ReadXBMFile( Display* pDisplay, const String& rFile, SalBitmap*& rpBmp ) { SvFileStream aFile( rFile, STREAM_READ ); - int nBytes = 0; int nWidth= -1, nHeight=-1; - BOOL bSuccess = FALSE; rpBmp = NULL; @@ -414,10 +410,9 @@ BOOL ReadXPMFile( Display* pDisplay, const String& rFile, SvFileStream aFile( rFile, STREAM_READ ); ByteString aColorName, aColorString, aLine; int nWidth, nHeight, nColors, nCharsPerPixel; - int nElement = 0,nColor = 0, i, nX, nY; + int nColor = 0, nX, nY; UINT8* pColorTable; char* pColorAlias; - BOOL bTransparent = FALSE; BOOL bXpm2Mode = FALSE; rpBmp = rpMsk = NULL; |