diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2011-02-15 00:48:10 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2011-02-15 13:27:10 +0100 |
| commit | 984f42952960948080af6845f133b21053fa027c (patch) | |
| tree | 258875bdc37e839c9c51721e1459b296fd452aaa | |
| parent | cc47386e393f56a38b3331d415ddf6bb0746bfc4 (diff) | |
Remove HP9000
| -rw-r--r-- | basic/source/classes/disas.cxx | 16 | ||||
| -rw-r--r-- | svx/inc/svx/xbitmap.hxx | 4 |
2 files changed, 2 insertions, 18 deletions
diff --git a/basic/source/classes/disas.cxx b/basic/source/classes/disas.cxx index 1d8e8ed14fa7..f0d1bf100b76 100644 --- a/basic/source/classes/disas.cxx +++ b/basic/source/classes/disas.cxx @@ -598,13 +598,6 @@ void SbiDisas::OffOp( String& rText ) } // Data type -#ifdef HP9000 // TODO: remove this! -static char* SbiDisas_TypeOp_pTypes[13] = { - "Empty","Null","Integer","Long","Single","Double", - "Currency","Date","String","Object","Error","Boolean", - "Variant" }; -#define pTypes SbiDisas_TypeOp_pTypes -#endif void SbiDisas::TypeOp( String& rText ) { // From 1996-01-19: type can contain flag for BYVAL (StepARGTYP) @@ -615,12 +608,6 @@ void SbiDisas::TypeOp( String& rText ) } if( nOp1 < 13 ) { -#ifndef HP9000 - static char pTypes[][13] = { - "Empty","Null","Integer","Long","Single","Double", - "Currency","Date","String","Object","Error","Boolean", - "Variant" }; -#endif rText.AppendAscii( pTypes[ nOp1 ] ); } else @@ -629,9 +616,6 @@ void SbiDisas::TypeOp( String& rText ) rText += (USHORT)nOp1; } } -#ifdef HP9000 -#undef pTypes -#endif // TRUE-Label, condition Opcode void SbiDisas::CaseOp( String& rText ) diff --git a/svx/inc/svx/xbitmap.hxx b/svx/inc/svx/xbitmap.hxx index 2381633f5888..febb2a10d35d 100644 --- a/svx/inc/svx/xbitmap.hxx +++ b/svx/inc/svx/xbitmap.hxx @@ -39,7 +39,7 @@ // class XOBitmap //--------------- -#if defined HP9000 || defined SINIX +#if defined SINIX static Size aXOBitmapDefaultSize( 8, 8 ); #endif @@ -59,7 +59,7 @@ public: XOBitmap(); XOBitmap( const GraphicObject& rGraphicObject, XBitmapStyle eStyle = XBITMAP_TILE ); XOBitmap( const Bitmap& rBitmap, XBitmapStyle eStyle = XBITMAP_TILE ); -#if defined HP9000 || defined SINIX +#if defined SINIX XOBitmap( const USHORT* pArray, const Color& aPixelColor, const Color& aBckgrColor, const Size& rSize = aXOBitmapDefaultSize, XBitmapStyle eStyle = XBITMAP_TILE ); |