strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS xf02bigcleanup (1.4.4); FILE MERGED

Browse source 
2008/01/23 15:49:31 hbrinkm 1.4.4.1: #i85380# applied patch by pavel
This commit is contained in:
Vladimir Glazounov 2008-01-24 14:57:48 +00:00
parent 0150bf6f60
commit d7432ed509
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
writerfilter/source/doctok/WW8CpAndFc.cxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: WW8CpAndFc.cxx,v $ * $RCSfile: WW8CpAndFc.cxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: obo $ $Date: 2008-01-10 11:45:39 $ * last change: $Author: vg $ $Date: 2008-01-24 15:57:34 $
* *
* 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.
@ -59,7 +59,7 @@ string Cp::toString() const
{ {
char sBuffer[256]; char sBuffer[256];
snprintf(sBuffer, 255, "%lx", get()); snprintf(sBuffer, 255, "%" SAL_PRIxUINT32 "", get());
return string(sBuffer); return string(sBuffer);
} }
@ -83,7 +83,7 @@ string Fc::toString() const
{ {
char sBuffer[256]; char sBuffer[256];
snprintf(sBuffer, 255, "(%lx, %s)", static_cast<sal_uInt32>(get()), snprintf(sBuffer, 255, "(%" SAL_PRIxUINT32 ", %s)", static_cast<sal_uInt32>(get()),
isComplex() ? "true" : "false"); isComplex() ? "true" : "false");
return string(sBuffer); return string(sBuffer);
@ -124,7 +124,7 @@ ostream & operator << (ostream & o, const CpAndFcs & rCpAndFcs)
char sBuffer[256]; char sBuffer[256];
snprintf(sBuffer, 255, "%d", rCpAndFcs.size()); snprintf(sBuffer, 255, "%" SAL_PRI_SIZET "u", rCpAndFcs.size());
o << sBuffer; o << sBuffer;
return o; return o;

8
writerfilter/source/doctok/WW8FKPImpl.cxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: WW8FKPImpl.cxx,v $ * $RCSfile: WW8FKPImpl.cxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: obo $ $Date: 2008-01-10 11:46:44 $ * last change: $Author: vg $ $Date: 2008-01-24 15:57:48 $
* *
* 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.
@ -113,7 +113,7 @@ void WW8CHPFKPImpl::dump(OutputWithDepth<string> & o) const
char sBuffer[256]; char sBuffer[256];
snprintf(sBuffer, sizeof(sBuffer), snprintf(sBuffer, sizeof(sBuffer),
"<fkpentry fc='%lx' offsetInFkp='%x'/>", "<fkpentry fc='%" SAL_PRIxUINT32 "' offsetInFkp='%x'/>",
getFc(n).get(), 2 * getU8(getRgb() + n)); getFc(n).get(), 2 * getU8(getRgb() + n));
o.addItem(sBuffer); o.addItem(sBuffer);
@ -177,7 +177,7 @@ void WW8PAPFKPImpl::dump(OutputWithDepth<string> & o) const
char sBuffer[256]; char sBuffer[256];
snprintf(sBuffer, sizeof(sBuffer), snprintf(sBuffer, sizeof(sBuffer),
"<fkpentry fc='%lx' offsetInFKP='%x'/>", "<fkpentry fc='%" SAL_PRIxUINT32 "' offsetInFKP='%x'/>",
getFc(n).get(), 2 * getU8(getRgb() + n * 13)); getFc(n).get(), 2 * getU8(getRgb() + n * 13));
o.addItem(sBuffer); o.addItem(sBuffer);