INTEGRATION: CWS xf02bigcleanup (1.6.4); FILE MERGED

2008/01/23 15:49:31 hbrinkm 1.6.4.1: #i85380# applied patch by pavel
This commit is contained in:
Vladimir Glazounov 2008-01-24 14:57:59 +00:00
parent d7432ed509
commit b1efeac65a

View file

@ -4,9 +4,9 @@
* *
* $RCSfile: WW8PropertySetImpl.cxx,v $ * $RCSfile: WW8PropertySetImpl.cxx,v $
* *
* $Revision: 1.6 $ * $Revision: 1.7 $
* *
* last change: $Author: obo $ $Date: 2008-01-10 11:48:58 $ * last change: $Author: vg $ $Date: 2008-01-24 15:57:59 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -197,7 +197,7 @@ string WW8PropertyImpl::toString() const
aResult += "<sprmcommon"; aResult += "<sprmcommon";
char sBuffer[256]; char sBuffer[256];
snprintf(sBuffer, sizeof(sBuffer), " id=\"%lx\"", getId()); snprintf(sBuffer, sizeof(sBuffer), " id=\"%" SAL_PRIuUINT32 "\"", getId());
aResult += sBuffer; aResult += sBuffer;
aResult += " name=\""; aResult += " name=\"";
aResult += (*SprmIdToString::Instance())(getId()); aResult += (*SprmIdToString::Instance())(getId());
@ -206,9 +206,9 @@ string WW8PropertyImpl::toString() const
aResult += sBuffer; aResult += sBuffer;
snprintf(sBuffer, sizeof(sBuffer), " spra=\"%x\"", get_spra()); snprintf(sBuffer, sizeof(sBuffer), " spra=\"%x\"", get_spra());
aResult += sBuffer; aResult += sBuffer;
snprintf(sBuffer, sizeof(sBuffer), " size=\"%lx\"", getByteLength()); snprintf(sBuffer, sizeof(sBuffer), " size=\"%" SAL_PRIxUINT32 "\"", getByteLength());
aResult += sBuffer; aResult += sBuffer;
snprintf(sBuffer, sizeof(sBuffer), " param=\"%lx\"", getParam()); snprintf(sBuffer, sizeof(sBuffer), " param=\"%" SAL_PRIxUINT32 "\"", getParam());
aResult += sBuffer; aResult += sBuffer;
aResult += ">\n"; aResult += ">\n";
@ -402,7 +402,7 @@ string WW8PropertySetIteratorImpl::toString() const
char sBuffer[256]; char sBuffer[256];
snprintf(sBuffer, sizeof(sBuffer), "(%ld)", mnOffset); snprintf(sBuffer, sizeof(sBuffer), "(%" SAL_PRIuUINT32 ")", mnOffset);
sResult += sBuffer; sResult += sBuffer;
return sResult; return sResult;