diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-01-28 12:59:35 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-01-28 12:59:35 +0000 |
| commit | 75cca1a1ca1dadc4a1ae38257875f9bfbd3e86be (patch) | |
| tree | fe066b39b12385ee67f136b6471c648a1ff7dc1c /basic | |
| parent | 510484ab40f1934f8c649c39162b036dc0e3f120 (diff) | |
INTEGRATION: CWS ab42 (1.25.46); FILE MERGED
2008/01/14 10:38:49 ab 1.25.46.2: #i82830# Use SAL_PRIXUINT32
2007/12/21 14:21:02 ab 1.25.46.1: #i81123# PATCH: signed/unsigned stuff for ppc
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/classes/disas.cxx | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/basic/source/classes/disas.cxx b/basic/source/classes/disas.cxx index 7356b4fcf7ec..0bc58c2ba52e 100644 --- a/basic/source/classes/disas.cxx +++ b/basic/source/classes/disas.cxx @@ -4,9 +4,9 @@ * * $RCSfile: disas.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: hr $ $Date: 2007-08-03 09:54:50 $ + * last change: $Author: vg $ $Date: 2008-01-28 13:59:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -347,24 +347,14 @@ void SbiDisas::Disas( String& r ) aText.ConvertLineEnd(); } -#ifdef HP9000 -const char* SbiDisas_DisasLine_pMask[] = { - "%04X ", - "%04X %02X ", - "%04X %02X %04X ", - "%04X %02X %04X %04X " }; -#define pMask SbiDisas_DisasLine_pMask -#endif BOOL SbiDisas::DisasLine( String& rText ) { char cBuf[ 30 ]; -#ifndef HP9000 const char* pMask[] = { - "%04X ", - "%04X %02X ", - "%04X %02X %04X ", - "%04X %02X %04X %04X " }; -#endif + "%08" SAL_PRIXUINT32 " ", + "%08" SAL_PRIXUINT32 " %02X ", + "%08" SAL_PRIXUINT32 " %02X %04X ", + "%08" SAL_PRIXUINT32 " %02X %04X %04X " }; rText.Erase(); if( !Fetch() ) return FALSE; @@ -430,8 +420,7 @@ BOOL SbiDisas::DisasLine( String& rText ) else { // fix warning (now error) for "Lbl%04lX" format - // nPC is now a sal_Int32 - snprintf( cBuf, sizeof(cBuf), "Lbl%08lX", nPC ); + snprintf( cBuf, sizeof(cBuf), "Lbl%08" SAL_PRIXUINT32, nPC ); rText.AppendAscii( cBuf ); } rText += ':'; @@ -454,9 +443,6 @@ BOOL SbiDisas::DisasLine( String& rText ) } return TRUE; } -#ifdef HP9000 -#undef pMask -#endif // Auslesen aus StringPool |