summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-06-16 12:44:45 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-06-16 12:44:45 +0000
commitcbd829d5e11e3673c108a97fd8dc1b5ef8a238f1 (patch)
treec3d4df7ba028a891333d932f1358c5f76198dcfa
parentd7c7ad554e52f9f720d1ae2dda4f2b052bb522c0 (diff)
INTEGRATION: CWS hr51 (1.12.10); FILE MERGED
2008/06/06 13:56:35 hr 1.12.10.1: #i88947#: fixes for compiling with SunStudio12 (WaE, compiler provided STL)
-rw-r--r--psprint/source/printergfx/bitmap_gfx.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/psprint/source/printergfx/bitmap_gfx.cxx b/psprint/source/printergfx/bitmap_gfx.cxx
index f07c04c3a029..d5889f36a0f7 100644
--- a/psprint/source/printergfx/bitmap_gfx.cxx
+++ b/psprint/source/printergfx/bitmap_gfx.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: bitmap_gfx.cxx,v $
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
* This file is part of OpenOffice.org.
*
@@ -183,7 +183,7 @@ void
Ascii85Encoder::ConvertToAscii85 ()
{
if (mnByte < 4)
- memset (mpByteBuffer + mnByte, 0, (4 - mnByte) * sizeof(sal_uInt8));
+ std::memset (mpByteBuffer + mnByte, 0, (4 - mnByte) * sizeof(sal_uInt8));
sal_uInt32 nByteValue = mpByteBuffer[0] * 256 * 256 * 256
+ mpByteBuffer[1] * 256 * 256
@@ -220,7 +220,7 @@ Ascii85Encoder::ConvertToAscii85 ()
sal_uInt32 nEolOff = mnColumn - nLineLength;
sal_uInt32 nBufOff = mnOffset - nEolOff;
- memmove (mpFileBuffer + nBufOff + 1, mpFileBuffer + nBufOff, nEolOff);
+ std::memmove (mpFileBuffer + nBufOff + 1, mpFileBuffer + nBufOff, nEolOff);
mpFileBuffer[ nBufOff ] = '\n';
mnOffset++;